Title: [160069] trunk/Source/WebKit2
- Revision
- 160069
- Author
- [email protected]
- Date
- 2013-12-03 21:25:13 -0800 (Tue, 03 Dec 2013)
Log 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:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160068 => 160069)
--- trunk/Source/WebKit2/ChangeLog 2013-12-04 05:24:15 UTC (rev 160068)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-04 05:25:13 UTC (rev 160069)
@@ -1,3 +1,18 @@
+2013-12-03 Simon Fraser <[email protected]>
+
+ 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 <[email protected]>
PageOverlayClientImpl should be a proper API::Client
Modified: trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp (160068 => 160069)
--- trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2013-12-04 05:24:15 UTC (rev 160068)
+++ trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2013-12-04 05:25:13 UTC (rev 160069)
@@ -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 @@
#if PLATFORM(MAC)
InitWebCoreSystemInterface();
#endif
+#if PLATFORM(IOS)
+ InitWebCoreThreadSystemInterface();
+#endif
JSC::initializeThreading();
WTF::initializeMainThread();
Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm (160068 => 160069)
--- trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm 2013-12-04 05:24:15 UTC (rev 160068)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm 2013-12-04 05:25:13 UTC (rev 160069)
@@ -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"
@@ -38,10 +38,8 @@
#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 @@
// <rdar://problem/12287363>
self.backgroundColor = [UIColor blackColor];
- InitWebCoreThreadSystemInterface();
- InitWebCoreSystemInterface();
+ InitializeWebKit2();
RunLoop::initializeMainRunLoop();
_pageClient = std::make_unique<PageClientImpl>(self);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
