Title: [123013] trunk/Source/WebCore
- Revision
- 123013
- Author
- [email protected]
- Date
- 2012-07-18 13:43:40 -0700 (Wed, 18 Jul 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (123012 => 123013)
--- trunk/Source/WebCore/ChangeLog 2012-07-18 20:40:30 UTC (rev 123012)
+++ trunk/Source/WebCore/ChangeLog 2012-07-18 20:43:40 UTC (rev 123013)
@@ -1,3 +1,20 @@
+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-07-18 Michael Saboff <[email protected]>
Make TextCodecUTF8 handle 8 bit data without converting to UChar's
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (123012 => 123013)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2012-07-18 20:40:30 UTC (rev 123012)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2012-07-18 20:43:40 UTC (rev 123013)
@@ -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"
@@ -208,6 +209,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
