Changeset 121036 in webkit
- Timestamp:
- Jun 22, 2012 10:42:18 AM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r121033 r121036 1 2012-06-22 Kenneth Russell <kbr@google.com> 2 3 Unreviewed, rolling out r121025. 4 http://trac.webkit.org/changeset/121025 5 https://bugs.webkit.org/show_bug.cgi?id=89580 6 7 Caused crash in 8 EventHandler.shouldTurnVerticalTicksIntoHorizontal webkit unit 9 test on 10.7 10 11 * page/EventHandler.cpp: 12 (WebCore::EventHandler::shouldTurnVerticalTicksIntoHorizontal): 13 (WebCore::EventHandler::handleWheelEvent): 14 * page/EventHandler.h: 15 (EventHandler): 16 * page/chromium/EventHandlerChromium.cpp: 17 (WebCore::EventHandler::shouldTurnVerticalTicksIntoHorizontal): 18 * page/gtk/EventHandlerGtk.cpp: 19 (WebCore::EventHandler::shouldTurnVerticalTicksIntoHorizontal): 20 1 21 2012-06-21 Andrey Kosyakov <caseq@chromium.org> 2 22 -
trunk/Source/WebCore/page/EventHandler.cpp
r121025 r121036 2285 2285 2286 2286 #if !PLATFORM(GTK) && !(PLATFORM(CHROMIUM) && (OS(UNIX) && !OS(DARWIN))) 2287 bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& , const PlatformWheelEvent&) const2287 bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult&) const 2288 2288 { 2289 2289 return false; … … 2340 2340 // appropriately. 2341 2341 PlatformWheelEvent event = e; 2342 if (m_baseEventType == PlatformEvent::NoType && shouldTurnVerticalTicksIntoHorizontal(result , e))2342 if (m_baseEventType == PlatformEvent::NoType && shouldTurnVerticalTicksIntoHorizontal(result)) 2343 2343 event = event.copyTurningVerticalTicksIntoHorizontalTicks(); 2344 2344 -
trunk/Source/WebCore/page/EventHandler.h
r121025 r121036 48 48 #include <wtf/HashMap.h> 49 49 #endif 50 51 class EventHandlerTest;52 50 53 51 namespace WebCore { … … 230 228 231 229 private: 232 friend class ::EventHandlerTest;233 234 230 #if ENABLE(DRAG_SUPPORT) 235 231 static DragState& dragState(); … … 271 267 bool logicalScrollOverflow(ScrollLogicalDirection, ScrollGranularity, Node* startingNode = 0); 272 268 273 bool shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& , const PlatformWheelEvent&) const;269 bool shouldTurnVerticalTicksIntoHorizontal(const HitTestResult&) const; 274 270 bool mouseDownMayStartSelect() const { return m_mouseDownMayStartSelect; } 275 271 -
trunk/Source/WebCore/page/chromium/EventHandlerChromium.cpp
r121025 r121036 159 159 // horizontal scrollbar while scrolling with the wheel. 160 160 // This code comes from gtk/EventHandlerGtk.cpp. 161 bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& result , const PlatformWheelEvent& event) const161 bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& result) const 162 162 { 163 return !event.hasPreciseScrollingDeltas() &&result.scrollbar() && result.scrollbar()->orientation() == HorizontalScrollbar;163 return result.scrollbar() && result.scrollbar()->orientation() == HorizontalScrollbar; 164 164 } 165 165 #endif -
trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp
r121025 r121036 127 127 // add the deltas and ticks here so that this behavior is consistent 128 128 // for styled scrollbars. 129 bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& result , const PlatformWheelEvent&) const129 bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& result) const 130 130 { 131 131 return result.scrollbar() && result.scrollbar()->orientation() == HorizontalScrollbar; -
trunk/Source/WebKit/chromium/ChangeLog
r121028 r121036 1 2012-06-22 Kenneth Russell <kbr@google.com> 2 3 Unreviewed, rolling out r121025. 4 http://trac.webkit.org/changeset/121025 5 https://bugs.webkit.org/show_bug.cgi?id=89580 6 7 Caused crash in 8 EventHandler.shouldTurnVerticalTicksIntoHorizontal webkit unit 9 test on 10.7 10 11 * WebKit.gypi: 12 * tests/EventHandlerTest.cpp: Removed. 13 1 14 2012-06-22 Peter Beverloo <peter@chromium.org> 2 15 -
trunk/Source/WebKit/chromium/WebKit.gypi
r121025 r121036 103 103 'tests/DragImageTest.cpp', 104 104 'tests/DrawingBufferChromiumTest.cpp', 105 'tests/EventHandlerTest.cpp',106 105 'tests/EventListenerTest.cpp', 107 106 'tests/FakeCCLayerTreeHostClient.h',
Note: See TracChangeset
for help on using the changeset viewer.