Changeset 160069 in webkit

Timestamp:

Dec 3, 2013, 9:25:13 PM (12 years ago)

Author:

Simon Fraser

Message:

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

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebKit2Initialize.cpp (modified) (2 diffs)
• UIProcess/API/ios/WKContentView.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

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

trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp

@@ -36 +36 @@
 #include "WebSystemInterface.h"
 #endif
+#if PLATFORM(IOS)
+#import <WebCore/WebCoreThreadSystemInterface.h>
+#endif
 
 namespace WebKit {
@@ -43 +46 @@
 #if PLATFORM(MAC)
     InitWebCoreSystemInterface();
+#endif
+#if PLATFORM(IOS)
+    InitWebCoreThreadSystemInterface();
 #endif
 

trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm

@@ -29 +29 @@
 #import "PageClientImplIOS.h"
 #import "RemoteLayerTreeDrawingAreaProxy.h"
-#import "UIWKRemoteView.h"
+#import "WebKit2Initialize.h"
 #import "WKBrowsingContextControllerInternal.h"
 #import "WKBrowsingContextGroupPrivate.h"
@@ -39 +39 @@
 #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>
 
@@ -142 +140 @@
     self.backgroundColor = [UIColor blackColor];
 
-    InitWebCoreThreadSystemInterface();
-    InitWebCoreSystemInterface();
+    InitializeWebKit2();
     RunLoop::initializeMainRunLoop();