Title: [165929] trunk/Source/WebCore
- Revision
- 165929
- Author
- mhahnenb...@apple.com
- Date
- 2014-03-19 16:27:50 -0700 (Wed, 19 Mar 2014)
Log Message
Build fix for iOS after r165926
* bindings/js/JSDOMWindowBase.cpp:
(WebCore::JSDOMWindowBase::commonVM):
* platform/ios/WebSafeGCActivityCallbackIOS.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165928 => 165929)
--- trunk/Source/WebCore/ChangeLog 2014-03-19 22:42:40 UTC (rev 165928)
+++ trunk/Source/WebCore/ChangeLog 2014-03-19 23:27:50 UTC (rev 165929)
@@ -1,3 +1,11 @@
+2014-03-19 Mark Hahnenberg <mhahnenb...@apple.com>
+
+ Build fix for iOS after r165926
+
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::commonVM):
+ * platform/ios/WebSafeGCActivityCallbackIOS.h:
+
2014-03-19 Eric Carlson <eric.carl...@apple.com>
Allow media engine to update HTMLMediaElement state when playing to external device
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (165928 => 165929)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2014-03-19 22:42:40 UTC (rev 165928)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2014-03-19 23:27:50 UTC (rev 165929)
@@ -214,7 +214,12 @@
#if !PLATFORM(IOS)
vm->setExclusiveThread(std::this_thread::get_id());
#else
- vm->heap.setActivityCallback(WebSafeGCActivityCallback::create(&vm->heap));
+ vm->heap.setFullActivityCallback(WebSafeFullGCActivityCallback::create(&vm->heap));
+#if ENABLE(GGC)
+ vm->heap.setEdenActivityCallback(WebSafeEdenGCActivityCallback::create(&vm->heap));
+#else
+ vm->heap.setEdenActivityCallback(vm->heap.fullActivityCallback());
+#endif
vm->heap.setIncrementalSweeper(WebSafeIncrementalSweeper::create(&vm->heap));
vm->makeUsableFromMultipleThreads();
vm->heap.machineThreads().addCurrentThread();
Modified: trunk/Source/WebCore/platform/ios/WebSafeGCActivityCallbackIOS.h (165928 => 165929)
--- trunk/Source/WebCore/platform/ios/WebSafeGCActivityCallbackIOS.h 2014-03-19 22:42:40 UTC (rev 165928)
+++ trunk/Source/WebCore/platform/ios/WebSafeGCActivityCallbackIOS.h 2014-03-19 23:27:50 UTC (rev 165929)
@@ -34,9 +34,9 @@
class WebSafeFullGCActivityCallback final : public JSC::FullGCActivityCallback {
public:
- static PassOwnPtr<WebSafeFullGCActivityCallback> create(JSC::Heap* heap)
+ static PassRefPtr<WebSafeFullGCActivityCallback> create(JSC::Heap* heap)
{
- return adoptPtr(new WebSafeFullGCActivityCallback(heap));
+ return adoptRef(new WebSafeFullGCActivityCallback(heap));
}
virtual ~WebSafeFullGCActivityCallback() override { }
@@ -50,9 +50,9 @@
class WebSafeEdenGCActivityCallback final : public JSC::EdenGCActivityCallback {
public:
- static PassOwnPtr<WebSafeEdenGCActivityCallback> create(JSC::Heap* heap)
+ static PassRefPtr<WebSafeEdenGCActivityCallback> create(JSC::Heap* heap)
{
- return adoptPtr(new WebSafeEdenGCActivityCallback(heap));
+ return adoptRef(new WebSafeEdenGCActivityCallback(heap));
}
virtual ~WebSafeEdenGCActivityCallback() override { }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
