Changeset 95368 in webkit

Timestamp:

Sep 16, 2011 10:30:14 PM (13 years ago)

Author:

dslomov@google.com

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):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebKit.h (modified) (1 diff)
• src/WebKit.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-09-16  Dmitry Lomov  <dslomov@google.com>
+
+        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  <scheib@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebKit.h

@@ -43 +43 @@
 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

trunk/Source/WebKit/chromium/src/WebKit.cpp

@@ -69 +69 @@
 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;
@@ -89 +98 @@
     WebCore::UTF8Encoding();
 
-    v8::V8::SetEntropySource(&generateEntropy);
-    v8::V8::Initialize();
-    WebCore::V8BindingPerIsolateData::ensureInitialized(v8::Isolate::GetCurrent());
+ 
 }
+
 
 void shutdown()