Fix the iOS build.
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Feb 2015 00:15:27 +0000 (00:15 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Feb 2015 00:15:27 +0000 (00:15 +0000)
* UIProcess/ios/ViewGestureControllerIOS.mm:
(WebKit::ViewGestureController::removeSwipeSnapshot):
* UIProcess/mac/ViewGestureController.h:
This code is never used on iOS.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@180089 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm
Source/WebKit2/UIProcess/mac/ViewGestureController.h

index ae4cc13bcb42dd48b30e4a9b2874a52d50997da4..7a3d3627690ec11dd682222573d5cf6cf4c3b5cb 100644 (file)
@@ -1,3 +1,12 @@
+2015-02-13  Timothy Horton  <timothy_horton@apple.com>
+
+        Fix the iOS build.
+
+        * UIProcess/ios/ViewGestureControllerIOS.mm:
+        (WebKit::ViewGestureController::removeSwipeSnapshot):
+        * UIProcess/mac/ViewGestureController.h:
+        This code is never used on iOS.
+
 2015-02-13  Timothy Horton  <timothy_horton@apple.com>
 
         Make WebCore::IOSurface have single ownership instead of refcounting
index ed0b91ce55d751e4c1425894b45ec0e72b307684..435b01a03171fee5432a068d313d439d85edbab1 100644 (file)
@@ -344,12 +344,6 @@ void ViewGestureController::removeSwipeSnapshot()
         return;
     
     ++m_gesturePendingSnapshotRemoval;
-
-#if USE(IOSURFACE)
-    if (m_currentSwipeSnapshotSurface)
-        m_currentSwipeSnapshotSurface->setIsVolatile(true);
-    m_currentSwipeSnapshotSurface = nullptr;
-#endif
     
     [m_snapshotView removeFromSuperview];
     m_snapshotView = nullptr;
index 64619a8286575902a90eb5dee0793088b2cc63d9..7f379c73a33fc774e9ae12247fb8d7cbf571edfc 100644 (file)
@@ -159,11 +159,9 @@ private:
 
     RunLoop::Timer<ViewGestureController> m_swipeWatchdogTimer;
 
-#if USE(IOSURFACE)
+#if PLATFORM(MAC)
     RefPtr<ViewSnapshot> m_currentSwipeSnapshot;
-#endif
 
-#if PLATFORM(MAC)
     RunLoop::Timer<ViewGestureController> m_swipeWatchdogAfterFirstVisuallyNonEmptyLayoutTimer;
     RunLoop::Timer<ViewGestureController> m_swipeActiveLoadMonitoringTimer;