Title: [95368] trunk/Source/WebKit/chromium
- Revision
- 95368
- Author
- [email protected]
- Date
- 2011-09-16 22:30:14 -0700 (Fri, 16 Sep 2011)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=67733
[Chromium] Separate WebKit initialization and V8 initialization in chromium port.
Reviewed by Darin Fisher.
* public/WebKit.h:
* src/WebKit.cpp:
(WebKit::initialize):
(WebKit::initializeWithoutV8):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (95367 => 95368)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-17 05:24:58 UTC (rev 95367)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-17 05:30:14 UTC (rev 95368)
@@ -1,3 +1,15 @@
+2011-09-16 Dmitry Lomov <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=67733
+ [Chromium] Separate WebKit initialization and V8 initialization in chromium port.
+
+ Reviewed by Darin Fisher.
+
+ * public/WebKit.h:
+ * src/WebKit.cpp:
+ (WebKit::initialize):
+ (WebKit::initializeWithoutV8):
+
2011-09-16 Vincent Scheib <[email protected]>
[Chromium] Add movementX/Y members to WebMouseEvent
Modified: trunk/Source/WebKit/chromium/public/WebKit.h (95367 => 95368)
--- trunk/Source/WebKit/chromium/public/WebKit.h 2011-09-17 05:24:58 UTC (rev 95367)
+++ trunk/Source/WebKit/chromium/public/WebKit.h 2011-09-17 05:30:14 UTC (rev 95368)
@@ -42,6 +42,13 @@
// non-null and must remain valid until the current thread calls shutdown.
WEBKIT_EXPORT void initialize(WebKitPlatformSupport*);
+// Must be called on the thread that will be the main WebKit thread before
+// using any other WebKit APIs. The provided WebKitPlatformSupport; must be
+// non-null and must remain valid until the current thread calls shutdown.
+//
+// This is a special variant of initialize that does not intitialize V8.
+WEBKIT_EXPORT void initializeWithoutV8(WebKitPlatformSupport*);
+
// Once shutdown, the WebKitPlatformSupport passed to initialize will no longer
// be accessed. No other WebKit objects should be in use when this function is
// called. Any background threads created by WebKit are promised to be
Modified: trunk/Source/WebKit/chromium/src/WebKit.cpp (95367 => 95368)
--- trunk/Source/WebKit/chromium/src/WebKit.cpp 2011-09-17 05:24:58 UTC (rev 95367)
+++ trunk/Source/WebKit/chromium/src/WebKit.cpp 2011-09-17 05:30:14 UTC (rev 95368)
@@ -68,6 +68,15 @@
void initialize(WebKitPlatformSupport* webKitPlatformSupport)
{
+ initializeWithoutV8(webKitPlatformSupport);
+
+ v8::V8::SetEntropySource(&generateEntropy);
+ v8::V8::Initialize();
+ WebCore::V8BindingPerIsolateData::ensureInitialized(v8::Isolate::GetCurrent());
+}
+
+void initializeWithoutV8(WebKitPlatformSupport* webKitPlatformSupport)
+{
ASSERT(!s_webKitInitialized);
s_webKitInitialized = true;
@@ -88,11 +97,10 @@
// this, initializing this lazily probably doesn't buy us much.
WebCore::UTF8Encoding();
- v8::V8::SetEntropySource(&generateEntropy);
- v8::V8::Initialize();
- WebCore::V8BindingPerIsolateData::ensureInitialized(v8::Isolate::GetCurrent());
+
}
+
void shutdown()
{
s_webKitPlatformSupport = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
