Title: [163589] trunk/Source/WebCore
- Revision
- 163589
- Author
- [email protected]
- Date
- 2014-02-06 17:55:24 -0800 (Thu, 06 Feb 2014)
Log Message
Unreviewed, rolling out r163558.
http://trac.webkit.org/changeset/163558
https://bugs.webkit.org/show_bug.cgi?id=128350
Breaks scrolling on certain websites (Requested by bfulgham on
#webkit).
* page/EventHandler.cpp:
(WebCore::EventHandler::handleWheelEvent):
* page/WheelEventDeltaTracker.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163588 => 163589)
--- trunk/Source/WebCore/ChangeLog 2014-02-07 01:33:53 UTC (rev 163588)
+++ trunk/Source/WebCore/ChangeLog 2014-02-07 01:55:24 UTC (rev 163589)
@@ -1,3 +1,16 @@
+2014-02-06 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r163558.
+ http://trac.webkit.org/changeset/163558
+ https://bugs.webkit.org/show_bug.cgi?id=128350
+
+ Breaks scrolling on certain websites (Requested by bfulgham on
+ #webkit).
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleWheelEvent):
+ * page/WheelEventDeltaTracker.h:
+
2014-02-06 Chris Fleizach <[email protected]>
AX: Crash in WebCore::AXObjectCache::computedObjectAttributeCache
Modified: trunk/Source/WebCore/page/EventHandler.cpp (163588 => 163589)
--- trunk/Source/WebCore/page/EventHandler.cpp 2014-02-07 01:33:53 UTC (rev 163588)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-02-07 01:55:24 UTC (rev 163589)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2013 Apple Inc. All rights reserved.
* Copyright (C) 2006 Alexey Proskuryakov ([email protected])
* Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
*
@@ -2528,35 +2528,6 @@
// We do another check on the frame view because the event handler can run JS which results in the frame getting destroyed.
view = m_frame.view();
-
-#if PLATFORM(MAC)
- if (useLatchedWheelEventElement && m_latchedWheelEventElement == element) {
- bool enclosingFrameIsMainFrame = view ? view->frame().isMainFrame() : false;
-
- // If we are latched, and have nowhere to scroll, treat the scroll event as ended so that we don't
- // cause the scroll to break free of the current scrolling widget.
- if (!enclosingFrameIsMainFrame) {
- bool didHandleWheelEvent = view ? view->wheelEvent(event) : false;
- if (!didHandleWheelEvent) {
- // If we are just starting a scroll event, and have nowhere left to scroll, allow
- // the enclosing frame to handle the scroll.
- didHandleWheelEvent = !m_recentWheelEventDeltaTracker->isFirstWheelEvent();
- }
-
- m_isHandlingWheelEvent = false;
- return didHandleWheelEvent;
- }
-
- if (!m_recentWheelEventDeltaTracker->isFirstWheelEvent()) {
- // When the main frame is our parent, and we have been scrolling within this region, we do not
- // want to have the main frame consume any remaining scroll events. Keep them latched to this
- // element.
- m_isHandlingWheelEvent = false;
- return true;
- }
- }
-#endif
-
bool didHandleEvent = view ? view->wheelEvent(event) : false;
m_isHandlingWheelEvent = false;
return didHandleEvent;
Modified: trunk/Source/WebCore/page/WheelEventDeltaTracker.h (163588 => 163589)
--- trunk/Source/WebCore/page/WheelEventDeltaTracker.h 2014-02-07 01:33:53 UTC (rev 163588)
+++ trunk/Source/WebCore/page/WheelEventDeltaTracker.h 2014-02-07 01:55:24 UTC (rev 163589)
@@ -51,7 +51,6 @@
void endTrackingDeltas();
bool isTrackingDeltas() const { return m_isTrackingDeltas; }
- bool isFirstWheelEvent() const { return m_recentWheelEventDeltas.size() <= 1; }
void recordWheelEventDelta(const PlatformWheelEvent&);
DominantScrollGestureDirection dominantScrollGestureDirection() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
