Title: [243991] releases/WebKitGTK/webkit-2.24/Source/WebKit
- Revision
- 243991
- Author
- carlo...@webkit.org
- Date
- 2019-04-08 03:23:31 -0700 (Mon, 08 Apr 2019)
Log Message
Merge r243860 - [ATK] Don't touch accessibility tree in WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld
https://bugs.webkit.org/show_bug.cgi?id=193914
Reviewed by Michael Catanzaro.
Move it to dispatchDidFinishDocumentLoad, since we know we have the document at that point and we can create the
root accessibility object wrapper.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidFinishDocumentLoad):
(WebKit::WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (243990 => 243991)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-04-08 10:23:26 UTC (rev 243990)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-04-08 10:23:31 UTC (rev 243991)
@@ -1,3 +1,17 @@
+2019-04-03 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [ATK] Don't touch accessibility tree in WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld
+ https://bugs.webkit.org/show_bug.cgi?id=193914
+
+ Reviewed by Michael Catanzaro.
+
+ Move it to dispatchDidFinishDocumentLoad, since we know we have the document at that point and we can create the
+ root accessibility object wrapper.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidFinishDocumentLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld):
+
2019-03-26 Tomoki Imai <tomoki.i...@sony.com>
Assertion failure !isInAcceleratedCompositingMode() in DrawingAreaProxyCoordinatedGraphics::incorporateUpdate when forceCompositingMode is turned on
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (243990 => 243991)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2019-04-08 10:23:26 UTC (rev 243990)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2019-04-08 10:23:31 UTC (rev 243991)
@@ -599,6 +599,11 @@
// Notify the UIProcess.
webPage->send(Messages::WebPageProxy::DidFinishDocumentLoadForFrame(m_frame->frameID(), navigationID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
+
+#if HAVE(ACCESSIBILITY) && PLATFORM(GTK)
+ // Ensure the accessibility hierarchy is updated.
+ webPage->updateAccessibilityTree();
+#endif
}
void WebFrameLoaderClient::dispatchDidFinishLoad()
@@ -1694,15 +1699,9 @@
webPage->injectedBundleLoaderClient().didClearWindowObjectForFrame(*webPage, *m_frame, world);
-
WebAutomationSessionProxy* automationSessionProxy = WebProcess::singleton().automationSessionProxy();
if (automationSessionProxy && world.isNormal())
automationSessionProxy->didClearWindowObjectForFrame(*m_frame);
-
-#if HAVE(ACCESSIBILITY) && PLATFORM(GTK)
- // Ensure the accessibility hierarchy is updated.
- webPage->updateAccessibilityTree();
-#endif
}
void WebFrameLoaderClient::dispatchGlobalObjectAvailable(DOMWrapperWorld& world)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
