Changeset 159634 in webkit

Timestamp:

Nov 21, 2013, 10:21:02 AM (11 years ago)

Author:

Simon Fraser

Message:

Clean up WebKit2 initialization
​https://bugs.webkit.org/show_bug.cgi?id=124696

Reviewed by Sam Weinig.

Call InitializeWebKit2() everywhere we need to do one-time
initialization in WebKit2, rather than having a hotch-potch
of init code.

• Shared/APIObject.cpp:

(API::Object::Object):

• UIProcess/API/mac/WKView.mm:

(-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):

• UIProcess/Launcher/mac/ProcessLauncherMac.mm: Removed an unused #include.
• UIProcess/WebContext.cpp:

(WebKit::WebContext::create):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/APIObject.cpp (modified) (2 diffs)
• UIProcess/API/mac/WKView.mm (modified) (2 diffs)
• UIProcess/Launcher/mac/ProcessLauncherMac.mm (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-20  Simon Fraser  <simon.fraser@apple.com>
+
+        Clean up WebKit2 initialization
+        https://bugs.webkit.org/show_bug.cgi?id=124696
+
+        Reviewed by Sam Weinig.
+        
+        Call InitializeWebKit2() everywhere we need to do one-time
+        initialization in WebKit2, rather than having a hotch-potch
+        of init code.
+
+        * Shared/APIObject.cpp:
+        (API::Object::Object):
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm: Removed an unused #include.
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::create):
+
 2013-11-21  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/Shared/APIObject.cpp

@@ -32 +32 @@
 #include "APIObject.h"
 
-#include <runtime/InitializeThreading.h>
-#include <runtime/Operations.h>
-#include <wtf/MainThread.h>
+#include "WebKit2Initialize.h"
 
 namespace API {
@@ -40 +38 @@
 Object::Object()
 {
-    JSC::initializeThreading();
-    WTF::initializeMainThread();
+    WebKit::InitializeWebKit2();
 }
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -60 +60 @@
 #import "WebEventFactory.h"
 #import "WebFullScreenManagerProxy.h"
+#import "WebKit2Initialize.h"
 #import "WebPage.h"
 #import "WebPageGroup.h"
@@ -2886 +2887 @@
     [NSApp registerServicesMenuSendTypes:PasteboardTypes::forSelection() returnTypes:PasteboardTypes::forEditing()];
 
-    InitWebCoreSystemInterface();
-    RunLoop::initializeMainRunLoop();
+    InitializeWebKit2();
 
     // Legacy style scrollbars have design details that rely on tracking the mouse all the time.

trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm

@@ -33 +33 @@
 #import <mach-o/dyld.h>
 #import <mach/machine.h>
-#import <runtime/InitializeThreading.h>
 #import <servers/bootstrap.h>
 #import <spawn.h>

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -47 +47 @@
 #include "WebIconDatabase.h"
 #include "WebKeyValueStorageManager.h"
+#include "WebKit2Initialize.h"
 #include "WebMediaCacheManagerProxy.h"
 #include "WebNotificationManagerProxy.h"
@@ -61 +62 @@
 #include <WebCore/Logging.h>
 #include <WebCore/ResourceRequest.h>
-#include <runtime/InitializeThreading.h>
 #include <runtime/Operations.h>
 #include <wtf/CurrentTime.h>
@@ -103 +103 @@
 PassRefPtr<WebContext> WebContext::create(const String& injectedBundlePath)
 {
-    JSC::initializeThreading();
-    WTF::initializeMainThread();
-    RunLoop::initializeMainRunLoop();
+    InitializeWebKit2();
     return adoptRef(new WebContext(ProcessModelSharedSecondaryProcess, injectedBundlePath));
 }