- Revision
- 137789
- Author
- [email protected]
- Date
- 2012-12-14 16:28:29 -0800 (Fri, 14 Dec 2012)
Log Message
Unreviewed, rolling out r137765.
http://trac.webkit.org/changeset/137765
https://bugs.webkit.org/show_bug.cgi?id=105067
Breaks webkit_unit_tests and transferred flings (Requested by
jamesr_ on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-12-14
Source/Platform:
* chromium/public/WebInputHandler.h:
(WebInputHandler):
* chromium/public/WebLayerTreeView.h:
(WebLayerTreeView):
Source/WebKit/chromium:
* src/WebCompositorInputHandlerImpl.cpp:
(WebKit::WebCompositorInputHandlerImpl::WebCompositorInputHandlerImpl):
(WebKit::WebCompositorInputHandlerImpl::handleInputEventInternal):
(WebKit::WebCompositorInputHandlerImpl::handleGestureFling):
* src/WebCompositorInputHandlerImpl.h:
(WebCompositorInputHandlerImpl):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::handleGestureEvent):
(WebKit::WebViewImpl::handleKeyEvent):
(WebKit::WebViewImpl::updateAnimations):
(WebKit::WebViewImpl::didCommitLoad):
Modified Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (137788 => 137789)
--- trunk/Source/Platform/ChangeLog 2012-12-14 23:57:53 UTC (rev 137788)
+++ trunk/Source/Platform/ChangeLog 2012-12-15 00:28:29 UTC (rev 137789)
@@ -1,3 +1,17 @@
+2012-12-14 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r137765.
+ http://trac.webkit.org/changeset/137765
+ https://bugs.webkit.org/show_bug.cgi?id=105067
+
+ Breaks webkit_unit_tests and transferred flings (Requested by
+ jamesr_ on #webkit).
+
+ * chromium/public/WebInputHandler.h:
+ (WebInputHandler):
+ * chromium/public/WebLayerTreeView.h:
+ (WebLayerTreeView):
+
2012-12-14 Yusuf Ozuysal <[email protected]>
Send a message from WebViewImpl to the compositor to inform about end of flings
Modified: trunk/Source/Platform/chromium/public/WebInputHandler.h (137788 => 137789)
--- trunk/Source/Platform/chromium/public/WebInputHandler.h 2012-12-14 23:57:53 UTC (rev 137788)
+++ trunk/Source/Platform/chromium/public/WebInputHandler.h 2012-12-15 00:28:29 UTC (rev 137789)
@@ -33,7 +33,6 @@
virtual void bindToClient(WebInputHandlerClient*) = 0;
virtual void animate(double monotonicTime) = 0;
- virtual void mainThreadHasStoppedFlinging() = 0;
};
}
Modified: trunk/Source/Platform/chromium/public/WebLayerTreeView.h (137788 => 137789)
--- trunk/Source/Platform/chromium/public/WebLayerTreeView.h 2012-12-14 23:57:53 UTC (rev 137788)
+++ trunk/Source/Platform/chromium/public/WebLayerTreeView.h 2012-12-15 00:28:29 UTC (rev 137789)
@@ -158,9 +158,6 @@
// mode.
virtual void updateAnimations(double frameBeginTime) = 0;
- // Relays the end of a fling animation.
- virtual void didStopFlinging() { }
-
// Composites and attempts to read back the result into the provided
// buffer. If it wasn't possible, e.g. due to context lost, will return
// false. Pixel format is 32bit (RGBA), and the provided buffer must be
Modified: trunk/Source/WebKit/chromium/ChangeLog (137788 => 137789)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-14 23:57:53 UTC (rev 137788)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-15 00:28:29 UTC (rev 137789)
@@ -1,3 +1,24 @@
+2012-12-14 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r137765.
+ http://trac.webkit.org/changeset/137765
+ https://bugs.webkit.org/show_bug.cgi?id=105067
+
+ Breaks webkit_unit_tests and transferred flings (Requested by
+ jamesr_ on #webkit).
+
+ * src/WebCompositorInputHandlerImpl.cpp:
+ (WebKit::WebCompositorInputHandlerImpl::WebCompositorInputHandlerImpl):
+ (WebKit::WebCompositorInputHandlerImpl::handleInputEventInternal):
+ (WebKit::WebCompositorInputHandlerImpl::handleGestureFling):
+ * src/WebCompositorInputHandlerImpl.h:
+ (WebCompositorInputHandlerImpl):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::handleGestureEvent):
+ (WebKit::WebViewImpl::handleKeyEvent):
+ (WebKit::WebViewImpl::updateAnimations):
+ (WebKit::WebViewImpl::didCommitLoad):
+
2012-12-14 Fady Samuel <[email protected]>
Allow embedder to observe changes to frame names
Modified: trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp (137788 => 137789)
--- trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2012-12-14 23:57:53 UTC (rev 137788)
+++ trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2012-12-15 00:28:29 UTC (rev 137789)
@@ -71,7 +71,6 @@
#endif
, m_gestureScrollOnImplThread(false)
, m_gesturePinchOnImplThread(false)
- , m_flingActiveOnMainThread(false)
{
}
@@ -199,8 +198,6 @@
} else if (event.type == WebInputEvent::GestureFlingCancel) {
if (cancelCurrentFling())
return DidHandle;
- else if (!m_flingActiveOnMainThread)
- return DropEvent;
#if ENABLE(TOUCH_EVENT_TRACKING)
} else if (event.type == WebInputEvent::TouchStart) {
const WebTouchEvent& touchEvent = *static_cast<const WebTouchEvent*>(&event);
@@ -233,7 +230,6 @@
}
case WebInputHandlerClient::ScrollStatusOnMainThread: {
TRACE_EVENT_INSTANT0("webkit", "WebCompositorInputHandlerImpl::handleGestureFling::scrollOnMainThread");
- m_flingActiveOnMainThread = true;
return DidNotHandle;
}
case WebInputHandlerClient::ScrollStatusIgnored: {
@@ -353,9 +349,4 @@
}
}
-void WebCompositorInputHandlerImpl::mainThreadHasStoppedFlinging()
-{
- m_flingActiveOnMainThread = false;
}
-
-}
Modified: trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h (137788 => 137789)
--- trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h 2012-12-14 23:57:53 UTC (rev 137788)
+++ trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h 2012-12-15 00:28:29 UTC (rev 137789)
@@ -63,7 +63,6 @@
// WebInputHandler implementation.
virtual void bindToClient(WebInputHandlerClient*);
virtual void animate(double monotonicTime);
- virtual void mainThreadHasStoppedFlinging();
// WebGestureCurveTarget implementation.
virtual void scrollBy(const WebPoint&);
@@ -99,9 +98,6 @@
#endif
bool m_gestureScrollOnImplThread;
bool m_gesturePinchOnImplThread;
- // This is always false when there are no flings on the main thread, but conservative in the
- // sense that we might not be actually flinging when it is true.
- bool m_flingActiveOnMainThread;
static int s_nextAvailableIdentifier;
static HashSet<WebCompositorInputHandlerImpl*>* s_compositors;
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (137788 => 137789)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-12-14 23:57:53 UTC (rev 137788)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-12-15 00:28:29 UTC (rev 137789)
@@ -707,8 +707,6 @@
case WebInputEvent::GestureFlingCancel:
if (m_gestureAnimation) {
m_gestureAnimation.clear();
- if (m_layerTreeView)
- m_layerTreeView->didStopFlinging();
eventSwallowed = true;
}
break;
@@ -860,11 +858,8 @@
|| (event.type == WebInputEvent::KeyUp));
// Halt an in-progress fling on a key event.
- if (m_gestureAnimation) {
+ if (m_gestureAnimation)
m_gestureAnimation.clear();
- if (m_layerTreeView)
- m_layerTreeView->didStopFlinging();
- }
// Please refer to the comments explaining the m_suppressNextKeypressEvent
// member.
@@ -1770,11 +1765,8 @@
if (m_gestureAnimation) {
if (m_gestureAnimation->animate(monotonicFrameBeginTime))
scheduleAnimation();
- else {
+ else
m_gestureAnimation.clear();
- if (m_layerTreeView)
- m_layerTreeView->didStopFlinging();
- }
}
if (!m_page)
@@ -3654,8 +3646,6 @@
// Make sure link highlight from previous page is cleared.
m_linkHighlight.clear();
m_gestureAnimation.clear();
- if (m_layerTreeView)
- m_layerTreeView->didStopFlinging();
resetSavedScrollAndScaleState();
}
