WKContentView should just use InitializeWebKit2()
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 4 Dec 2013 05:25:13 +0000 (05:25 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 4 Dec 2013 05:25:13 +0000 (05:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=125209

Reviewed by Benjamin Poulain.

Rather than calling an motley selection of init fuctions,
WKContentView should use the one true init function, InitializeWebKit2().

* Shared/WebKit2Initialize.cpp: On iOS, we need to call InitWebCoreThreadSystemInterface().
(WebKit::InitializeWebKit2):
* UIProcess/API/ios/WKContentView.mm: Remove various unused #imports.
(-[WKContentView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@160069 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebKit2Initialize.cpp
Source/WebKit2/UIProcess/API/ios/WKContentView.mm

index 3c41fa55a79c3c31ea56c8c98b34adb55a793c03..36b34c8faee5f811d9d78b7da96ccd5e389174a9 100644 (file)
@@ -1,3 +1,18 @@
+2013-12-03  Simon Fraser  <simon.fraser@apple.com>
+
+        WKContentView should just use InitializeWebKit2()
+        https://bugs.webkit.org/show_bug.cgi?id=125209
+
+        Reviewed by Benjamin Poulain.
+        
+        Rather than calling an motley selection of init fuctions,
+        WKContentView should use the one true init function, InitializeWebKit2().
+
+        * Shared/WebKit2Initialize.cpp: On iOS, we need to call InitWebCoreThreadSystemInterface().
+        (WebKit::InitializeWebKit2):
+        * UIProcess/API/ios/WKContentView.mm: Remove various unused #imports.
+        (-[WKContentView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
+
 2013-12-03  Anders Carlsson  <andersca@apple.com>
 
         PageOverlayClientImpl should be a proper API::Client
index fe9f5ae7bbf3c0a8b054ba30ebb31e649fe60c26..ef3cd948d2ccf5b14f1ae14d3afad385c9e2f4cf 100644 (file)
@@ -35,6 +35,9 @@
 #if PLATFORM(MAC)
 #include "WebSystemInterface.h"
 #endif
+#if PLATFORM(IOS)
+#import <WebCore/WebCoreThreadSystemInterface.h>
+#endif
 
 namespace WebKit {
 
@@ -43,6 +46,9 @@ void InitializeWebKit2()
 #if PLATFORM(MAC)
     InitWebCoreSystemInterface();
 #endif
+#if PLATFORM(IOS)
+    InitWebCoreThreadSystemInterface();
+#endif
 
     JSC::initializeThreading();
     WTF::initializeMainThread();
index f0748a652173603880889c010e751e5fe91a5358..ea86d2bcacd9eac3d9c9dcc25edac150da292918 100644 (file)
@@ -28,7 +28,7 @@
 
 #import "PageClientImplIOS.h"
 #import "RemoteLayerTreeDrawingAreaProxy.h"
-#import "UIWKRemoteView.h"
+#import "WebKit2Initialize.h"
 #import "WKBrowsingContextControllerInternal.h"
 #import "WKBrowsingContextGroupPrivate.h"
 #import "WKGeolocationProviderIOS.h"
 #import "WebFrameProxy.h"
 #import "WebPageGroup.h"
 #import "WebSystemInterface.h"
-#import <QuartzCore/CALayerHost.h>
 #import <UIKit/UIWindow_Private.h>
 #import <WebCore/ViewportArguments.h>
-#import <WebCore/WebCoreThreadSystemInterface.h>
 #import <wtf/RetainPtr.h>
 
 using namespace WebCore;
@@ -141,8 +139,7 @@ using namespace WebKit;
     // <rdar://problem/12287363>
     self.backgroundColor = [UIColor blackColor];
 
-    InitWebCoreThreadSystemInterface();
-    InitWebCoreSystemInterface();
+    InitializeWebKit2();
     RunLoop::initializeMainRunLoop();
 
     _pageClient = std::make_unique<PageClientImpl>(self);