Title: [210765] trunk/Source/WebKit2
Revision
210765
Author
[email protected]
Date
2017-01-14 01:01:11 -0800 (Sat, 14 Jan 2017)

Log Message

Remove unused WKView initializer parameter
https://bugs.webkit.org/show_bug.cgi?id=167046

Reviewed by Dan Bernstein.

* UIProcess/API/mac/WKView.mm:
(-[WKView initWithFrame:processPool:configuration:]):
(-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
(-[WKView initWithFrame:configurationRef:]):
(-[WKView initWithFrame:processPool:configuration:webView:]): Deleted.
* UIProcess/API/mac/WKViewInternal.h:
Ever since WKWebView stopped having WKView inside it, this parameter
has never been used. Now, it only leads to confusion.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (210764 => 210765)


--- trunk/Source/WebKit2/ChangeLog	2017-01-14 07:09:50 UTC (rev 210764)
+++ trunk/Source/WebKit2/ChangeLog	2017-01-14 09:01:11 UTC (rev 210765)
@@ -1,3 +1,19 @@
+2017-01-14  Tim Horton  <[email protected]>
+
+        Remove unused WKView initializer parameter
+        https://bugs.webkit.org/show_bug.cgi?id=167046
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView initWithFrame:processPool:configuration:]):
+        (-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
+        (-[WKView initWithFrame:configurationRef:]):
+        (-[WKView initWithFrame:processPool:configuration:webView:]): Deleted.
+        * UIProcess/API/mac/WKViewInternal.h:
+        Ever since WKWebView stopped having WKView inside it, this parameter
+        has never been used. Now, it only leads to confusion.
+
 2017-01-13  Joseph Pecoraro  <[email protected]>
 
         Remove ENABLE(DETAILS_ELEMENT) guards

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (210764 => 210765)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2017-01-14 07:09:50 UTC (rev 210764)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2017-01-14 09:01:11 UTC (rev 210765)
@@ -895,7 +895,7 @@
 #endif // WK_API_ENABLED
 }
 
-- (instancetype)initWithFrame:(NSRect)frame processPool:(WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView
+- (instancetype)initWithFrame:(NSRect)frame processPool:(WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration
 {
     self = [super initWithFrame:frame];
     if (!self)
@@ -904,7 +904,7 @@
     InitializeWebKit2();
 
     _data = [[WKViewData alloc] init];
-    _data->_impl = std::make_unique<WebViewImpl>(self, webView, processPool, WTFMove(configuration));
+    _data->_impl = std::make_unique<WebViewImpl>(self, nullptr, processPool, WTFMove(configuration));
 
     [self maybeInstallIconLoadingClient];
 
@@ -1099,7 +1099,7 @@
     configuration->preferenceValues().set(WebKit::WebPreferencesKey::systemLayoutDirectionKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(toUserInterfaceLayoutDirection(self.userInterfaceLayoutDirection))));
 #endif
 
-    return [self initWithFrame:frame processPool:*toImpl(contextRef) configuration:WTFMove(configuration) webView:nil];
+    return [self initWithFrame:frame processPool:*toImpl(contextRef) configuration:WTFMove(configuration)];
 }
 
 - (id)initWithFrame:(NSRect)frame configurationRef:(WKPageConfigurationRef)configurationRef
@@ -1107,7 +1107,7 @@
     Ref<API::PageConfiguration> configuration = toImpl(configurationRef)->copy();
     auto& processPool = *configuration->processPool();
 
-    return [self initWithFrame:frame processPool:processPool configuration:WTFMove(configuration) webView:nil];
+    return [self initWithFrame:frame processPool:processPool configuration:WTFMove(configuration)];
 }
 
 - (BOOL)wantsUpdateLayer

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (210764 => 210765)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h	2017-01-14 07:09:50 UTC (rev 210764)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h	2017-01-14 09:01:11 UTC (rev 210765)
@@ -31,25 +31,12 @@
 #import <wtf/RetainPtr.h>
 #import <wtf/Vector.h>
 
-namespace API {
-class PageConfiguration;
-}
-
-namespace WebKit {
-class WebProcessPool;
-}
-
-@class WKWebView;
 #if WK_API_ENABLED
 @class _WKThumbnailView;
-#endif
 
 @interface WKView ()
-#if WK_API_ENABLED
-- (instancetype)initWithFrame:(NSRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView;
 @property (nonatomic, setter=_setThumbnailView:) _WKThumbnailView *_thumbnailView;
+@end
 #endif
 
-@end
-
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to