Changeset 269160 in webkit

Timestamp:

Oct 29, 2020, 12:15:49 PM (6 years ago)

Author:

sihui_liu@apple.com

Message:

Unreviewed, reverting r268192.

PLT regression - rdar://problem/70141350

Reverted changeset:

"Adjust heuristic for checking whether view reaches visually
non-empty state"
​https://bugs.webkit.org/show_bug.cgi?id=217400
​https://trac.webkit.org/changeset/268192

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/WebKit/deferred-script-load-in-empty-document.html (deleted)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/FirstVisuallyNonEmptyMilestone.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-29  Sihui Liu  <sihui_liu@apple.com>
+
+        Unreviewed, reverting r268192.
+
+        PLT regression - rdar://problem/70141350
+
+        Reverted changeset:
+
+        "Adjust heuristic for checking whether view reaches visually
+        non-empty state"
+        https://bugs.webkit.org/show_bug.cgi?id=217400
+        https://trac.webkit.org/changeset/268192
+
 2020-10-29  Said Abou-Hallawa  <said@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -4567 +4567 @@
 
             auto& resources = resourceLoader.allCachedResources();
-            bool shouldWaitForScriptIfEmpty = false;
-#if ENABLE(INTERSECTION_OBSERVER)
-            shouldWaitForScriptIfEmpty = !document.numberOfIntersectionObservers();
-#endif
-            bool isLoadingScript = false;
             for (auto& resource : resources) {
                 if (resource.value->isLoaded())
                     continue;
-                auto type = resource.value->type();
-                if (type == CachedResource::Type::CSSStyleSheet || type == CachedResource::Type::FontResource)
+                if (resource.value->type() == CachedResource::Type::CSSStyleSheet || resource.value->type() == CachedResource::Type::FontResource)
                     return true;
-                if (type == CachedResource::Type::Script)
-                    isLoadingScript = true;
             }
-
-            if (shouldWaitForScriptIfEmpty && !m_visuallyNonEmptyPixelCount && isLoadingScript)
-                return true;
-
             return false;
         };

trunk/Tools/ChangeLog

@@ +1 @@
+2020-10-29  Sihui Liu  <sihui_liu@apple.com>
+
+        Unreviewed, reverting r268192.
+
+        PLT regression - rdar://problem/70141350
+
+        Reverted changeset:
+
+        "Adjust heuristic for checking whether view reaches visually
+        non-empty state"
+        https://bugs.webkit.org/show_bug.cgi?id=217400
+        https://trac.webkit.org/changeset/268192
+
 2020-10-29  Sam Weinig  <weinig@apple.com>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -797 +797 @@
                 932AE53D1D371047005DFFAF /* focus-inputs.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93575C551D30366E000D604D /* focus-inputs.html */; };
                 933D631D1FCB76200032ECD6 /* Hasher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933D631B1FCB76180032ECD6 /* Hasher.cpp */; };
-                93494FFE252E66BA0099F171 /* deferred-script-load-in-empty-document.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93494FFD252E65440099F171 /* deferred-script-load-in-empty-document.html */; };
                 935786CC20F6A2700000CDFC /* IndexedDB.sqlite3-wal in Copy Resources */ = {isa = PBXBuildFile; fileRef = 934FA5C520F69FED0040DC1B /* IndexedDB.sqlite3-wal */; };
                 935786CD20F6A2910000CDFC /* IndexedDB.sqlite3 in Copy Resources */ = {isa = PBXBuildFile; fileRef = 934FA5C720F69FEE0040DC1B /* IndexedDB.sqlite3 */; };
@@ -1363 +1362 @@
                                 F457A9D6202D68AF00F7E9D5 /* DataTransfer.html in Copy Resources */,
                                 F4512E131F60C44600BB369E /* DataTransferItem-getAsEntry.html in Copy Resources */,
-                                93494FFE252E66BA0099F171 /* deferred-script-load-in-empty-document.html in Copy Resources */,
                                 118153442208B7AC00B2CCD2 /* deferred-script-load.html in Copy Resources */,
                                 118153462208B7E500B2CCD2 /* deferred-script.js in Copy Resources */,
@@ -2392 +2390 @@
                 9331407B17B4419000F083B1 /* DidNotHandleKeyDown.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DidNotHandleKeyDown.cpp; sourceTree = "<group>"; };
                 933D631B1FCB76180032ECD6 /* Hasher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Hasher.cpp; sourceTree = "<group>"; };
-                93494FFD252E65440099F171 /* deferred-script-load-in-empty-document.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "deferred-script-load-in-empty-document.html"; sourceTree = "<group>"; };
                 934FA5C520F69FED0040DC1B /* IndexedDB.sqlite3-wal */ = {isa = PBXFileReference; lastKnownFileType = file; path = "IndexedDB.sqlite3-wal"; sourceTree = "<group>"; };
                 934FA5C620F69FED0040DC1B /* IndexedDB.sqlite3-shm */ = {isa = PBXFileReference; lastKnownFileType = file; path = "IndexedDB.sqlite3-shm"; sourceTree = "<group>"; };
@@ -4289 +4286 @@
                                 5C9E56861DF9148E00C9EE33 /* contentBlockerCheck.html */,
                                 290F4274172A1FDE00939FF0 /* custom-protocol-sync-xhr.html */,
-                                93494FFD252E65440099F171 /* deferred-script-load-in-empty-document.html */,
                                 118153432208B7AC00B2CCD2 /* deferred-script-load.html */,
                                 118153452208B7E500B2CCD2 /* deferred-script.js */,

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FirstVisuallyNonEmptyMilestone.mm

@@ -38 +38 @@
 static bool didFirstVisuallyNonEmptyLayout;
 static bool receivedMessage;
-static bool receivedMessageBeforeFirstVisuallyNonEmptyLayout;
 
 @interface FirstPaintMessageHandler : NSObject <WKScriptMessageHandler>
@@ -56 +55 @@
 - (void)_webView:(WKWebView *)webView renderingProgressDidChange:(_WKRenderingProgressEvents)progressEvents
 {
-    if (progressEvents & _WKRenderingProgressEventFirstVisuallyNonEmptyLayout) {
-        receivedMessageBeforeFirstVisuallyNonEmptyLayout = receivedMessage;
+    if (progressEvents & _WKRenderingProgressEventFirstVisuallyNonEmptyLayout)
         didFirstVisuallyNonEmptyLayout = true;
-    }
 }
 @end
@@ -75 +72 @@
 
     receivedMessage = false;
-    receivedMessageBeforeFirstVisuallyNonEmptyLayout = false;
     didFirstVisuallyNonEmptyLayout = false;
 
@@ -82 +78 @@
     TestWebKitAPI::Util::run(&receivedMessage);
     EXPECT_TRUE(didFirstVisuallyNonEmptyLayout);
-    EXPECT_FALSE(receivedMessageBeforeFirstVisuallyNonEmptyLayout);
-}
-
-TEST(WebKit, FirstVisuallyNonEmptyMilestoneWithDeferredScriptInEmptyDocument)
-{
-    auto webViewConfiguration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    auto messageHandler = adoptNS([[FirstPaintMessageHandler alloc] init]);
-    [[webViewConfiguration userContentController] addScriptMessageHandler:messageHandler.get() name:@"firstpaint"];
-
-    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:webViewConfiguration.get()]);
-
-    RetainPtr<RenderingProgressNavigationDelegate> delegate = adoptNS([[RenderingProgressNavigationDelegate alloc] init]);
-    [webView setNavigationDelegate:delegate.get()];
-
-    receivedMessage = false;
-    receivedMessageBeforeFirstVisuallyNonEmptyLayout = false;
-    didFirstVisuallyNonEmptyLayout = false;
-
-    [webView loadRequest:[NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"deferred-script-load-in-empty-document" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]]];
-
-    TestWebKitAPI::Util::run(&didFirstVisuallyNonEmptyLayout);
-    EXPECT_TRUE(receivedMessage);
-    EXPECT_TRUE(receivedMessageBeforeFirstVisuallyNonEmptyLayout);
 }