Title: [171572] branches/safari-600.1-branch/Source/WebKit2
- Revision
- 171572
- Author
- lforsch...@apple.com
- Date
- 2014-07-24 18:16:25 -0700 (Thu, 24 Jul 2014)
Log Message
Merged r171570. <rdar://problem/17803170>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171571 => 171572)
--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-25 01:12:26 UTC (rev 171571)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-25 01:16:25 UTC (rev 171572)
@@ -1,5 +1,23 @@
2014-07-24 Lucas Forschler <lforsch...@apple.com>
+ Merge r171570
+
+ 2014-07-24 Tim Horton <timothy_hor...@apple.com>
+
+ Sometimes WKWebView is blank after resuming the app, until you scroll
+ https://bugs.webkit.org/show_bug.cgi?id=135275
+ <rdar://problem/17803170>
+
+ Reviewed by Benjamin Poulain.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::dispatchViewStateChange):
+ If the UI process is waiting for a didUpdateViewState, we need to *always*
+ get a reply from the Web Process, so dispatchViewStateChange should *always*
+ send SetViewState even if nothing changed (so that we get the reply).
+
+2014-07-24 Lucas Forschler <lforsch...@apple.com>
+
Merge r171560
2014-07-24 Simon Fraser <simon.fra...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (171571 => 171572)
--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-25 01:12:26 UTC (rev 171571)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-25 01:16:25 UTC (rev 171572)
@@ -1187,7 +1187,7 @@
if (m_viewWasEverInWindow && (changed & ViewState::IsInWindow) && isInWindow())
m_viewStateChangeWantsReply = true;
- if (changed)
+ if (changed || m_viewStateChangeWantsReply)
m_process->send(Messages::WebPage::SetViewState(m_viewState, m_viewStateChangeWantsReply), m_pageID);
// This must happen after the SetViewState message is sent, to ensure the page visibility event can fire.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
