Changeset 201141 in webkit

Timestamp:

May 19, 2016, 1:40:25 AM (9 years ago)

Author:

bshafiei@apple.com

Message:

Merge r200950. rdar://problem/26287306

Location:

branches/safari-602.1.32-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)

branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-05-19  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r200950. rdar://problem/26287306
+
+    2016-05-16  Brian Burg  <bburg@apple.com>
+
+            Web Automation: WebAutomationSessionProxy.js gets injected more than once sometimes
+            https://bugs.webkit.org/show_bug.cgi?id=157716
+            <rdar://problem/26287306>
+
+            Reviewed by Timothy Hatcher.
+
+            Whenever a script was injected into a non-normal world by a WebKit client,
+            the WebProcess's WebAutomationSessionProxy singleton would get a
+            notification that the window was cleared from the relevant frame.
+            This notification happens when creating the world's window shell for
+            the first time.
+
+            This code should ignore such notifications that originate from non-main world
+            contexts. Web Inspector's instrumentation already ignored this, but
+            the automation session notification comes in via a different WebKit2 layer.
+
+            * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+            (WebKit::WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld):
+
 2016-05-19  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1580 +1580 @@
     webPage->injectedBundleLoaderClient().didClearWindowObjectForFrame(webPage, m_frame, world);
 
-    if (auto automationSessionProxy = WebProcess::singleton().automationSessionProxy())
+
+    WebAutomationSessionProxy* automationSessionProxy = WebProcess::singleton().automationSessionProxy();
+    if (automationSessionProxy && world.isNormal())
         automationSessionProxy->didClearWindowObjectForFrame(*m_frame);