Title: [154428] trunk/Source/WebKit2
- Revision
- 154428
- Author
- [email protected]
- Date
- 2013-08-21 16:27:23 -0700 (Wed, 21 Aug 2013)
Log Message
<https://webkit.org/b/120140> Clients expect didFirstLayout-related calls to
happen before didLayout
Reviewed by Anders Carlsson.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidLayout):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (154427 => 154428)
--- trunk/Source/WebKit2/ChangeLog 2013-08-21 23:18:21 UTC (rev 154427)
+++ trunk/Source/WebKit2/ChangeLog 2013-08-21 23:27:23 UTC (rev 154428)
@@ -1,3 +1,13 @@
+2013-08-21 Beth Dakin <[email protected]>
+
+ <https://webkit.org/b/120140> Clients expect didFirstLayout-related calls to
+ happen before didLayout
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidLayout):
+
2013-08-21 Alexey Proskuryakov <[email protected]>
REGRESSION (r145458?): WebProcess doesn't respect UI process localization
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (154427 => 154428)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-08-21 23:18:21 UTC (rev 154427)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-08-21 23:27:23 UTC (rev 154428)
@@ -539,9 +539,6 @@
RefPtr<APIObject> userData;
- webPage->injectedBundleLoaderClient().didLayout(webPage, milestones, userData);
- webPage->send(Messages::WebPageProxy::DidLayout(milestones, InjectedBundleUserMessageEncoder(userData.get())));
-
if (milestones & DidFirstLayout) {
// FIXME: We should consider removing the old didFirstLayout API since this is doing double duty with the
// new didLayout API.
@@ -561,6 +558,10 @@
#endif
}
+ // Send this after DidFirstLayout-specific calls since some clients expect to get those messages first.
+ webPage->injectedBundleLoaderClient().didLayout(webPage, milestones, userData);
+ webPage->send(Messages::WebPageProxy::DidLayout(milestones, InjectedBundleUserMessageEncoder(userData.get())));
+
if (milestones & DidFirstVisuallyNonEmptyLayout) {
// FIXME: We should consider removing the old didFirstVisuallyNonEmptyLayoutForFrame API since this is doing
// double duty with the new didLayout API.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
