Title: [201141] branches/safari-602.1.32-branch/Source/WebKit2
- Revision
- 201141
- Author
- [email protected]
- Date
- 2016-05-19 01:40:25 -0700 (Thu, 19 May 2016)
Log Message
Merge r200950. rdar://problem/26287306
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201140 => 201141)
--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-19 08:40:22 UTC (rev 201140)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-19 08:40:25 UTC (rev 201141)
@@ -1,5 +1,30 @@
2016-05-19 Babak Shafiei <[email protected]>
+ Merge r200950. rdar://problem/26287306
+
+ 2016-05-16 Brian Burg <[email protected]>
+
+ 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 <[email protected]>
+
Merge r200702. rdar://problem/26190121
2016-05-10 Brian Burg <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (201140 => 201141)
--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-05-19 08:40:22 UTC (rev 201140)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-05-19 08:40:25 UTC (rev 201141)
@@ -1579,7 +1579,9 @@
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);
#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
