Title: [171235] branches/safari-600.1-branch/Source/WebKit2
- Revision
- 171235
- Author
- [email protected]
- Date
- 2014-07-18 12:15:56 -0700 (Fri, 18 Jul 2014)
Log Message
Merged r171209. <rdar://problem/17720696>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171234 => 171235)
--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-18 19:13:24 UTC (rev 171234)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-18 19:15:56 UTC (rev 171235)
@@ -1,3 +1,19 @@
+2014-07-18 Babak Shafiei <[email protected]>
+
+ Merge r171209.
+
+ 2014-07-17 Benjamin Poulain <[email protected]>
+
+ [iOS][WK2] Fix the updateVisibleContentRects synchronization for load after r171154
+ https://bugs.webkit.org/show_bug.cgi?id=135036
+
+ Reviewed by Dan Bernstein.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::updateVisibleContentRects):
+ I forgot to update one of the condition after changing from lastTransaction to next transaction
+ in r171154.
+
2014-07-17 Lucas Forschler <[email protected]>
Rollout r171167. <rdar://problem/17716602>
Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (171234 => 171235)
--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-07-18 19:13:24 UTC (rev 171234)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-07-18 19:15:56 UTC (rev 171235)
@@ -2440,7 +2440,7 @@
void WebPage::updateVisibleContentRects(const VisibleContentRectUpdateInfo& visibleContentRectUpdateInfo)
{
// Skip any VisibleContentRectUpdate that have been queued before DidCommitLoad suppresses the updates in the UIProcess.
- if (visibleContentRectUpdateInfo.lastLayerTreeTransactionID() <= m_firstLayerTreeTransactionIDAfterDidCommitLoad)
+ if (visibleContentRectUpdateInfo.lastLayerTreeTransactionID() < m_firstLayerTreeTransactionIDAfterDidCommitLoad)
return;
m_hasReceivedVisibleContentRectsAfterDidCommitLoad = true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
