Attachment 368284 Details for Bug 188357 – Patch

[patch] Patch

bug-188357-20190425162019.patch (text/plain), 7.19 KB, created by Simon Fraser (smfr) on 2019-04-25 16:20:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-04-25 16:20:20 PDT

Size: 7.19 KB

patch

obsolete

>Subversion Revision: 244668
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 392a5b91bb7cffa7a5f1952d2080cb02fa243f76..ddeb0b25e6a6ea604a0b2604163a66ffd6c137d5 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2019-04-25  Simon Fraser  <simon.fraser@apple.com>
>+
>+        REGRESSION (r234330): 3 legacy-animation-engine/compositing tests are flaky failures
>+        https://bugs.webkit.org/show_bug.cgi?id=188357
>+        <rdar://problem/42986633>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        DumpRenderTree had no code that set page.setCompositingPolicyOverride() to Normal, so some
>+        tests would fall into low memory mode and have different behavior.
>+        
>+        Fix by moving the code that calls setCompositingPolicyOverride(Normal) from the WK2 layer
>+        to Internals, so it's shared by DRT and WTR.
>+        
>+        We no longer need the WK2 C SPI glue.
>+
>+        * testing/Internals.cpp:
>+        (WebCore::Internals::resetToConsistentState):
>+
> 2019-04-25  Timothy Hatcher  <timothy@apple.com>
> 
>         Disable ContentChangeObserver on iOSMac.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 740eac9e0d5a95b6d8a9da19553cd49138f74add..cd153877265f3de39f17b65722cb68190385f1de 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,24 @@
>+2019-04-25  Simon Fraser  <simon.fraser@apple.com>
>+
>+        REGRESSION (r234330): 3 legacy-animation-engine/compositing tests are flaky failures
>+        https://bugs.webkit.org/show_bug.cgi?id=188357
>+        <rdar://problem/42986633>
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        DumpRenderTree had no code that set page.setCompositingPolicyOverride() to Normal, so some
>+        tests would fall into low memory mode and have different behavior.
>+        
>+        Fix by moving the code that calls setCompositingPolicyOverride(Normal) from the WK2 layer
>+        to Internals, so it's shared by DRT and WTR.
>+        
>+        We no longer need the WK2 C SPI glue.
>+
>+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
>+        (WKBundlePageSetEventThrottlingBehaviorOverride):
>+        (WKBundlePageSetCompositingPolicyOverride): Deleted.
>+        * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
>+
> 2019-04-25  Timothy Hatcher  <timothy@apple.com>
> 
>         Only send a synthetic mouse out event if synthetic mouse move events were sent.
>diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
>index 78d05987627c20d83ddc6fda8c9b012df291b8db..64e03d849cb3b8f5ed6551c50e587fe30d1ba755 100644
>--- a/Source/WebCore/testing/Internals.cpp
>+++ b/Source/WebCore/testing/Internals.cpp
>@@ -452,7 +452,7 @@ void Internals::resetToConsistentState(Page& page)
> 
>     page.mainFrame().setTextZoomFactor(1.0f);
> 
>-    page.setCompositingPolicyOverride(WTF::nullopt);
>+    page.setCompositingPolicyOverride(WebCore::CompositingPolicy::Normal);
> 
>     FrameView* mainFrameView = page.mainFrame().view();
>     if (mainFrameView) {
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
>index 512f7c0d97b8db415ae2cda969cd5ccf41a2b6c3..7471bcea92c4989afecb0a90873dcee62a47c4b7 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
>@@ -803,21 +803,3 @@ void WKBundlePageSetEventThrottlingBehaviorOverride(WKBundlePageRef page, WKEven
> 
>     WebKit::toImpl(page)->corePage()->setEventThrottlingBehaviorOverride(behaviorValue);
> }
>-
>-void WKBundlePageSetCompositingPolicyOverride(WKBundlePageRef page, WKCompositingPolicy* policy)
>-{
>-    Optional<WebCore::CompositingPolicy> policyValue;
>-    if (policy) {
>-        switch (*policy) {
>-        case kWKCompositingPolicyNormal:
>-            policyValue = WebCore::CompositingPolicy::Normal;
>-            break;
>-        case kWKCompositingPolicyConservative:
>-            policyValue = WebCore::CompositingPolicy::Conservative;
>-            break;
>-        }
>-    }
>-
>-    WebKit::toImpl(page)->corePage()->setCompositingPolicyOverride(policyValue);
>-}
>-
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
>index 2e407a4a79657dc078b060a65a09a928e2b83b5e..3a7b316e8b53cef223c237ac1acae442e442105d 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
>@@ -134,16 +134,6 @@ typedef uint32_t WKEventThrottlingBehavior;
> // Passing null in the second parameter clears the override.
> WK_EXPORT void WKBundlePageSetEventThrottlingBehaviorOverride(WKBundlePageRef, WKEventThrottlingBehavior*);
> 
>-enum {
>-    kWKCompositingPolicyNormal = 0,
>-    kWKCompositingPolicyConservative
>-};
>-
>-typedef uint32_t WKCompositingPolicy;
>-
>-// Passing null in the second parameter clears the override.
>-WK_EXPORT void WKBundlePageSetCompositingPolicyOverride(WKBundlePageRef, WKCompositingPolicy*);
>-
> #if TARGET_OS_IPHONE
> WK_EXPORT void WKBundlePageSetUseTestingViewportConfiguration(WKBundlePageRef, bool);
> #endif
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index b19e4488778dd71874fef1ae43b6434957ce7bef..7972e54a237e943b48360c96f39c0b08346b02a4 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,22 @@
>+2019-04-25  Simon Fraser  <simon.fraser@apple.com>
>+
>+        REGRESSION (r234330): 3 legacy-animation-engine/compositing tests are flaky failures
>+        https://bugs.webkit.org/show_bug.cgi?id=188357
>+        <rdar://problem/42986633>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        DumpRenderTree had no code that set page.setCompositingPolicyOverride() to Normal, so some
>+        tests would fall into low memory mode and have different behavior.
>+        
>+        Fix by moving the code that calls setCompositingPolicyOverride(Normal) from the WK2 layer
>+        to Internals, so it's shared by DRT and WTR.
>+        
>+        We no longer need the WK2 C SPI glue.
>+
>+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
>+        (WTR::InjectedBundlePage::prepare):
>+
> 2019-04-25  Timothy Hatcher  <timothy@apple.com>
> 
>         Disable date and time inputs on iOSMac.
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
>index ede8b58f9c07c53ef3f33d85fa5bba8bcd324b2f..4001f862b9c3156f33ca5388311c8908e4ddf312 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
>+++ b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
>@@ -420,10 +420,6 @@ void InjectedBundlePage::prepare()
>     // Force consistent "responsive" behavior for WebPage::eventThrottlingDelay() for testing. Tests can override via internals.
>     WKEventThrottlingBehavior behavior = kWKEventThrottlingBehaviorResponsive;
>     WKBundlePageSetEventThrottlingBehaviorOverride(m_page, &behavior);
>-    
>-    // Force consistent compositing behavior, even if the test runner is under memory pressure. Tests can override via internals.
>-    WKCompositingPolicy policy = kWKCompositingPolicyNormal;
>-    WKBundlePageSetCompositingPolicyOverride(m_page, &policy);
> }
> 
> void InjectedBundlePage::resetAfterTest()

Actions: View | Formatted Diff | Diff

Attachments on bug 188357: 346717 | 368284