Attachment 361416 Details for Bug 191394 – Patch

[patch] Patch

bug-191394-20190207105223.patch (text/plain), 6.89 KB, created by Alex Christensen on 2019-02-07 10:52:24 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-02-07 10:52:24 PST

Size: 6.89 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 241125)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2019-02-07  Alex Christensen  <achristensen@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  <achristensen@webkit.org>
> 
>         Digital crown should scroll safe browsing warning on watchOS
>Index: Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
>===================================================================
>--- Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp	(revision 241028)
>+++ Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp	(working copy)
>@@ -303,9 +303,8 @@ void WKBundlePageStopLoading(WKBundlePag
>     WebKit::toImpl(pageRef)->stopLoading();
> }
> 
>-void WKBundlePageSetDefersLoading(WKBundlePageRef pageRef, bool defersLoading)
>+void WKBundlePageSetDefersLoading(WKBundlePageRef, bool)
> {
>-    WebKit::toImpl(pageRef)->setDefersLoading(defersLoading);
> }
> 
> WKStringRef WKBundlePageCopyRenderTreeExternalRepresentation(WKBundlePageRef pageRef)
>Index: Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
>===================================================================
>--- Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h	(revision 241028)
>+++ Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h	(working copy)
>@@ -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 @@ extern "C" {
> #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);
>Index: Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm
>===================================================================
>--- Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm	(revision 241028)
>+++ Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm	(working copy)
>@@ -693,12 +693,11 @@ - (void)_setEditingDelegate:(id <WKWebPr
> 
> - (BOOL)_defersLoading
> {
>-    return _page->defersLoading();
>+    return NO;
> }
> 
> - (void)_setDefersLoading:(BOOL)defersLoading
> {
>-    _page->setDefersLoading(defersLoading);
> }
> 
> - (BOOL)_usesNonPersistentWebsiteDataStore
>Index: Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h
>===================================================================
>--- Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h	(revision 241028)
>+++ Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h	(working copy)
>@@ -45,7 +45,7 @@ @interface WKWebProcessPlugInBrowserCont
> @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;
> 
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 241126)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2019-02-07  Alex Christensen  <achristensen@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  <zalan@apple.com>
> 
>         [LFC][Out-of-flow] Use the containing block's padding width when computing min/max width.
>Index: Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>===================================================================
>--- Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp	(revision 241028)
>+++ Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp	(working copy)
>@@ -741,9 +741,8 @@ void TestRunner::setShouldStayOnPageAfte
>     InjectedBundle::singleton().postNewBeforeUnloadReturnValue(!shouldStayOnPage);
> }
> 
>-void TestRunner::setDefersLoading(bool shouldDeferLoading)
>+void TestRunner::setDefersLoading(bool)
> {
>-    WKBundlePageSetDefersLoading(InjectedBundle::singleton().page()->page(), shouldDeferLoading);
> }
> 
> bool TestRunner::didReceiveServerRedirectForProvisionalNavigation() const
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 241126)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-02-07  Alex Christensen  <achristensen@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  <zalan@apple.com>
> 
>         [LFC][Out-of-flow] Use the containing block's padding width when computing min/max width.
>Index: LayoutTests/platform/wk2/TestExpectations
>===================================================================
>--- LayoutTests/platform/wk2/TestExpectations	(revision 241028)
>+++ LayoutTests/platform/wk2/TestExpectations	(working copy)
>@@ -535,6 +535,9 @@ platform/mac/fast/AppleScript/001.html
> 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

Actions: View | Formatted Diff | Diff

Attachments on bug 191394: 354133 | 361231 | 361250 | 361256 | 361416