Title: [125455] branches/safari-536.26-branch/Source/WebCore
- Revision
- 125455
- Author
- [email protected]
- Date
- 2012-08-13 14:51:52 -0700 (Mon, 13 Aug 2012)
Log Message
Merged r123013. <rdar://problem/12087344>
Modified Paths
Diff
Modified: branches/safari-536.26-branch/Source/WebCore/ChangeLog (125454 => 125455)
--- branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-13 21:49:18 UTC (rev 125454)
+++ branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-13 21:51:52 UTC (rev 125455)
@@ -1,5 +1,26 @@
2012-08-13 Lucas Forschler <[email protected]>
+ Merge r123013.
+
+ 2012-07-18 Oliver Hunt <[email protected]>
+
+ WebKit provides APIs that make it possible for JSC to attempt to initialise the heap without initialising threading
+ https://bugs.webkit.org/show_bug.cgi?id=91663
+
+ Reviewed by Filip Pizlo.
+
+ Initialising a JSGlobalData now requires us to have initialised JSC's threading
+ logic, as that also initialises the JSC VM runtime options. WebKit provides a
+ number of routines that make use of commonJSGlobalData() that can be used before
+ webcore has called the appropriate initialisation routine. This patch makes the
+ minimal change of ensuring that commonJSGlobalData initialises threading before
+ attempting to create the common heap.
+
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::commonJSGlobalData):
+
+2012-08-13 Lucas Forschler <[email protected]>
+
Merge r118725.
2012-05-28 Kent Tamura <[email protected]>
@@ -205123,3 +205144,4 @@
== Rolled over to ChangeLog-2011-10-19 ==
.
.
+.
Modified: branches/safari-536.26-branch/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (125454 => 125455)
--- branches/safari-536.26-branch/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2012-08-13 21:49:18 UTC (rev 125454)
+++ branches/safari-536.26-branch/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2012-08-13 21:51:52 UTC (rev 125455)
@@ -32,6 +32,7 @@
#include "JSNode.h"
#include "Logging.h"
#include "Page.h"
+#include "ScriptController.h"
#include "SecurityOrigin.h"
#include "Settings.h"
#include "WebCoreJSClientData.h"
@@ -196,6 +197,7 @@
static JSGlobalData* globalData = 0;
if (!globalData) {
+ ScriptController::initializeThreading();
globalData = JSGlobalData::createLeaked(ThreadStackTypeLarge, LargeHeap).leakRef();
globalData->timeoutChecker.setTimeoutInterval(10000); // 10 seconds
#ifndef NDEBUG
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
