Title: [171256] trunk/Source/WebKit2
Revision
171256
Author
[email protected]
Date
2014-07-18 17:52:18 -0700 (Fri, 18 Jul 2014)

Log Message

ASSERTion failures in ViewGestureController indicating that we're copying WebBackForwardList
https://bugs.webkit.org/show_bug.cgi?id=135080
<rdar://problem/17734714>

Reviewed by Sam Weinig.

* UIProcess/ios/ViewGestureControllerIOS.mm:
(WebKit::ViewGestureController::beginSwipeGesture):
(WebKit::ViewGestureController::canSwipeInDirection):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (171255 => 171256)


--- trunk/Source/WebKit2/ChangeLog	2014-07-19 00:51:09 UTC (rev 171255)
+++ trunk/Source/WebKit2/ChangeLog	2014-07-19 00:52:18 UTC (rev 171256)
@@ -1,3 +1,15 @@
+2014-07-18  Tim Horton  <[email protected]>
+
+        ASSERTion failures in ViewGestureController indicating that we're copying WebBackForwardList
+        https://bugs.webkit.org/show_bug.cgi?id=135080
+        <rdar://problem/17734714>
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/ios/ViewGestureControllerIOS.mm:
+        (WebKit::ViewGestureController::beginSwipeGesture):
+        (WebKit::ViewGestureController::canSwipeInDirection):
+
 2014-07-18  Yongjun Zhang  <[email protected]>
 
         _WKActivatedElementInfo.title should fallback to innerText if the link doesn't have title attribute.

Modified: trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (171255 => 171256)


--- trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm	2014-07-19 00:51:09 UTC (rev 171255)
+++ trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm	2014-07-19 00:52:18 UTC (rev 171256)
@@ -170,7 +170,7 @@
     m_webPageProxyForBackForwardListForCurrentSwipe = m_alternateBackForwardListSourceView.get() ? m_alternateBackForwardListSourceView.get()->_page : &m_webPageProxy;
     m_webPageProxyForBackForwardListForCurrentSwipe->navigationGestureDidBegin();
 
-    auto backForwardList = m_webPageProxyForBackForwardListForCurrentSwipe->backForwardList();
+    auto& backForwardList = m_webPageProxyForBackForwardListForCurrentSwipe->backForwardList();
 
     // Copy the snapshot from this view to the one that owns the back forward list, so that
     // swiping forward will have the correct snapshot.
@@ -241,7 +241,7 @@
 
 bool ViewGestureController::canSwipeInDirection(SwipeDirection direction)
 {
-    auto backForwardList = m_alternateBackForwardListSourceView.get() ? m_alternateBackForwardListSourceView.get()->_page->backForwardList() : m_webPageProxy.backForwardList();
+    auto& backForwardList = m_alternateBackForwardListSourceView.get() ? m_alternateBackForwardListSourceView.get()->_page->backForwardList() : m_webPageProxy.backForwardList();
     if (direction == SwipeDirection::Left)
         return !!backForwardList.backItem();
     return !!backForwardList.forwardItem();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to