Changeset 259696 in webkit

Timestamp:

Apr 7, 2020, 5:43:15 PM (6 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r259650. rdar://problem/61419505

WKUserScripts deferred from injection are not injected if -[WKWebView _notifyUserScripts] is called early.
​https://bugs.webkit.org/show_bug.cgi?id=210131
rdar://problem/61368446

Reviewed by Brady Eidson.

Source/WebCore:

If Page::notifyToInjectUserScripts() is called early, before Frame::injectUserScripts() happens,
m_hasBeenNotifiedToInjectUserScripts will be false, allowing scripts to build up in m_userScriptsAwaitingNotification
and never being injected (since Page::notifyToInjectUserScripts() will not be called again).

• page/Page.cpp: (WebCore::Page::notifyToInjectUserScripts): Set m_hasBeenNotifiedToInjectUserScripts to true when called.

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm: (TEST):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@259650 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610.1.9-branch

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/Page.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm (modified) (1 diff)

branches/safari-610.1.9-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-07  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r259650. rdar://problem/61419505
+
+    WKUserScripts deferred from injection are not injected if -[WKWebView _notifyUserScripts] is called early.
+    https://bugs.webkit.org/show_bug.cgi?id=210131
+    rdar://problem/61368446
+    
+    Reviewed by Brady Eidson.
+    
+    Source/WebCore:
+    
+    If Page::notifyToInjectUserScripts() is called early, before Frame::injectUserScripts() happens,
+    m_hasBeenNotifiedToInjectUserScripts will be false, allowing scripts to build up in m_userScriptsAwaitingNotification
+    and never being injected (since Page::notifyToInjectUserScripts() will not be called again).
+    
+    * page/Page.cpp:
+    (WebCore::Page::notifyToInjectUserScripts): Set m_hasBeenNotifiedToInjectUserScripts to true when called.
+    
+    Tools:
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm:
+    (TEST):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259650 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-04-07  Timothy Hatcher  <timothy@apple.com>
+
+            WKUserScripts deferred from injection are not injected if -[WKWebView _notifyUserScripts] is called early.
+            https://bugs.webkit.org/show_bug.cgi?id=210131
+            rdar://problem/61368446
+
+            Reviewed by Brady Eidson.
+
+            If Page::notifyToInjectUserScripts() is called early, before Frame::injectUserScripts() happens,
+            m_hasBeenNotifiedToInjectUserScripts will be false, allowing scripts to build up in m_userScriptsAwaitingNotification
+            and never being injected (since Page::notifyToInjectUserScripts() will not be called again).
+
+            * page/Page.cpp:
+            (WebCore::Page::notifyToInjectUserScripts): Set m_hasBeenNotifiedToInjectUserScripts to true when called.
+
 2020-04-04  Rob Buis  <rbuis@igalia.com>
 

branches/safari-610.1.9-branch/Source/WebCore/page/Page.cpp

@@ -2480 +2480 @@
 void Page::notifyToInjectUserScripts()
 {
+    m_hasBeenNotifiedToInjectUserScripts = true;
+
     for (auto* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
         for (const auto& pair : m_userScriptsAwaitingNotification)
             frame->injectUserScriptImmediately(pair.first, pair.second.get());
     }
+
     m_userScriptsAwaitingNotification.clear();
 }

branches/safari-610.1.9-branch/Tools/ChangeLog

@@ +1 @@
+2020-04-07  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r259650. rdar://problem/61419505
+
+    WKUserScripts deferred from injection are not injected if -[WKWebView _notifyUserScripts] is called early.
+    https://bugs.webkit.org/show_bug.cgi?id=210131
+    rdar://problem/61368446
+    
+    Reviewed by Brady Eidson.
+    
+    Source/WebCore:
+    
+    If Page::notifyToInjectUserScripts() is called early, before Frame::injectUserScripts() happens,
+    m_hasBeenNotifiedToInjectUserScripts will be false, allowing scripts to build up in m_userScriptsAwaitingNotification
+    and never being injected (since Page::notifyToInjectUserScripts() will not be called again).
+    
+    * page/Page.cpp:
+    (WebCore::Page::notifyToInjectUserScripts): Set m_hasBeenNotifiedToInjectUserScripts to true when called.
+    
+    Tools:
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm:
+    (TEST):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259650 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-04-07  Timothy Hatcher  <timothy@apple.com>
+
+            WKUserScripts deferred from injection are not injected if -[WKWebView _notifyUserScripts] is called early.
+            https://bugs.webkit.org/show_bug.cgi?id=210131
+            rdar://problem/61368446
+
+            Reviewed by Brady Eidson.
+
+            * TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm:
+            (TEST):
+
 2020-04-04  Wenson Hsieh  <wenson_hsieh@apple.com>
 

branches/safari-610.1.9-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm

@@ -844 +844 @@
     EXPECT_WK_STREQ([delegate waitForAlert], "waited for notification");
     EXPECT_WK_STREQ([delegate waitForAlert], "document parsing ended");
-}
+
+    TestWKWebView *webView3 = [[TestWKWebView new] autorelease];
+    EXPECT_TRUE(webView3._deferrableUserScriptsNeedNotification);
+    [webView3.configuration.userContentController addUserScript:waitsForNotification];
+    [webView3.configuration.userContentController addUserScript:documentEnd];
+    webView3.UIDelegate = delegate;
+    [webView3 loadTestPageNamed:@"simple"];
+    [webView3 _notifyUserScripts];
+    EXPECT_FALSE(webView3._deferrableUserScriptsNeedNotification);
+    EXPECT_WK_STREQ([delegate waitForAlert], "waited for notification");
+    EXPECT_WK_STREQ([delegate waitForAlert], "document parsing ended");
+}