Title: [241127] trunk
Revision
241127
Author
achristen...@apple.com
Date
2019-02-07 10:52:54 -0800 (Thu, 07 Feb 2019)

Log Message

Deprecate WKBundlePageSetDefersLoading
https://bugs.webkit.org/show_bug.cgi?id=191394

Reviewed by Dean Jackson.

Source/WebKit:

* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageSetDefersLoading):
* WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
(-[WKWebProcessPlugInBrowserContextController _defersLoading]):
(-[WKWebProcessPlugInBrowserContextController _setDefersLoading:]):
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h:

Tools:

* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::setDefersLoading):

LayoutTests:

* platform/wk2/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (241126 => 241127)


--- trunk/LayoutTests/ChangeLog	2019-02-07 18:36:36 UTC (rev 241126)
+++ trunk/LayoutTests/ChangeLog	2019-02-07 18:52:54 UTC (rev 241127)
@@ -1,3 +1,12 @@
+2019-02-07  Alex Christensen  <achristen...@webkit.org>
+
+        Deprecate WKBundlePageSetDefersLoading
+        https://bugs.webkit.org/show_bug.cgi?id=191394
+
+        Reviewed by Dean Jackson.
+
+        * platform/wk2/TestExpectations:
+
 2019-02-07  Zalan Bujtas  <za...@apple.com>
 
         [LFC][Out-of-flow] Use the containing block's padding width when computing min/max width.

Modified: trunk/LayoutTests/platform/wk2/TestExpectations (241126 => 241127)


--- trunk/LayoutTests/platform/wk2/TestExpectations	2019-02-07 18:36:36 UTC (rev 241126)
+++ trunk/LayoutTests/platform/wk2/TestExpectations	2019-02-07 18:52:54 UTC (rev 241127)
@@ -535,6 +535,9 @@
 platform/mac/fast/AppleScript/array.html
 platform/mac/fast/AppleScript/date.html
 
+# setDefersLoading is not supported in WK2.
+loader/load-defer.html [ WontFix ]
+
 # WebKitTestRunner doesn't have objCController
 platform/mac/fast/dom/objc-wrapper-identity.html
 platform/mac/fast/dom/wrapper-classes-objc.html

Modified: trunk/Source/WebKit/ChangeLog (241126 => 241127)


--- trunk/Source/WebKit/ChangeLog	2019-02-07 18:36:36 UTC (rev 241126)
+++ trunk/Source/WebKit/ChangeLog	2019-02-07 18:52:54 UTC (rev 241127)
@@ -1,5 +1,20 @@
 2019-02-07  Alex Christensen  <achristen...@webkit.org>
 
+        Deprecate WKBundlePageSetDefersLoading
+        https://bugs.webkit.org/show_bug.cgi?id=191394
+
+        Reviewed by Dean Jackson.
+
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+        (WKBundlePageSetDefersLoading):
+        * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
+        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+        (-[WKWebProcessPlugInBrowserContextController _defersLoading]):
+        (-[WKWebProcessPlugInBrowserContextController _setDefersLoading:]):
+        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h:
+
+2019-02-07  Alex Christensen  <achristen...@webkit.org>
+
         Digital crown should scroll safe browsing warning on watchOS
         https://bugs.webkit.org/show_bug.cgi?id=194363
         <rdar://problem/47348124>

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (241126 => 241127)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp	2019-02-07 18:36:36 UTC (rev 241126)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp	2019-02-07 18:52:54 UTC (rev 241127)
@@ -303,9 +303,8 @@
     WebKit::toImpl(pageRef)->stopLoading();
 }
 
-void WKBundlePageSetDefersLoading(WKBundlePageRef pageRef, bool defersLoading)
+void WKBundlePageSetDefersLoading(WKBundlePageRef, bool)
 {
-    WebKit::toImpl(pageRef)->setDefersLoading(defersLoading);
 }
 
 WKStringRef WKBundlePageCopyRenderTreeExternalRepresentation(WKBundlePageRef pageRef)

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h (241126 => 241127)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h	2019-02-07 18:36:36 UTC (rev 241126)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h	2019-02-07 18:52:54 UTC (rev 241127)
@@ -27,6 +27,7 @@
 #define WKBundlePagePrivate_h
 
 #include <WebKit/WKBase.h>
+#include <WebKit/WKDeprecated.h>
 #include <WebKit/WKEvent.h>
 #include <WebKit/WKGeometry.h>
 #include <WebKit/WKUserContentInjectedFrames.h>
@@ -37,7 +38,7 @@
 #endif
 
 WK_EXPORT void WKBundlePageStopLoading(WKBundlePageRef page);
-WK_EXPORT void WKBundlePageSetDefersLoading(WKBundlePageRef page, bool defersLoading);
+WK_EXPORT void WKBundlePageSetDefersLoading(WKBundlePageRef page, bool defersLoading) WK_C_API_DEPRECATED;
 WK_EXPORT bool WKBundlePageIsEditingCommandEnabled(WKBundlePageRef page, WKStringRef commandName);
 WK_EXPORT void WKBundlePageClearMainFrameName(WKBundlePageRef page);
 WK_EXPORT void WKBundlePageClose(WKBundlePageRef page);

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (241126 => 241127)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm	2019-02-07 18:36:36 UTC (rev 241126)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm	2019-02-07 18:52:54 UTC (rev 241127)
@@ -693,12 +693,11 @@
 
 - (BOOL)_defersLoading
 {
-    return _page->defersLoading();
+    return NO;
 }
 
 - (void)_setDefersLoading:(BOOL)defersLoading
 {
-    _page->setDefersLoading(defersLoading);
 }
 
 - (BOOL)_usesNonPersistentWebsiteDataStore

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h (241126 => 241127)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h	2019-02-07 18:36:36 UTC (rev 241126)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h	2019-02-07 18:52:54 UTC (rev 241127)
@@ -45,7 +45,7 @@
 @property (weak, setter=_setFormDelegate:) id <WKWebProcessPlugInFormDelegatePrivate> _formDelegate;
 @property (weak, setter=_setEditingDelegate:) id <WKWebProcessPlugInEditingDelegate> _editingDelegate WK_API_AVAILABLE(macosx(10.12.3), ios(10.3));
 
-@property (nonatomic, setter=_setDefersLoading:) BOOL _defersLoading;
+@property (nonatomic, setter=_setDefersLoading:) BOOL _defersLoading WK_API_DEPRECATED("No longer supported");
 
 @property (nonatomic, readonly) BOOL _usesNonPersistentWebsiteDataStore;
 

Modified: trunk/Tools/ChangeLog (241126 => 241127)


--- trunk/Tools/ChangeLog	2019-02-07 18:36:36 UTC (rev 241126)
+++ trunk/Tools/ChangeLog	2019-02-07 18:52:54 UTC (rev 241127)
@@ -1,3 +1,13 @@
+2019-02-07  Alex Christensen  <achristen...@webkit.org>
+
+        Deprecate WKBundlePageSetDefersLoading
+        https://bugs.webkit.org/show_bug.cgi?id=191394
+
+        Reviewed by Dean Jackson.
+
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::setDefersLoading):
+
 2019-02-07  Zalan Bujtas  <za...@apple.com>
 
         [LFC][Out-of-flow] Use the containing block's padding width when computing min/max width.

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (241126 => 241127)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp	2019-02-07 18:36:36 UTC (rev 241126)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp	2019-02-07 18:52:54 UTC (rev 241127)
@@ -741,9 +741,8 @@
     InjectedBundle::singleton().postNewBeforeUnloadReturnValue(!shouldStayOnPage);
 }
 
-void TestRunner::setDefersLoading(bool shouldDeferLoading)
+void TestRunner::setDefersLoading(bool)
 {
-    WKBundlePageSetDefersLoading(InjectedBundle::singleton().page()->page(), shouldDeferLoading);
 }
 
 bool TestRunner::didReceiveServerRedirectForProvisionalNavigation() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to