Changeset 196872 in webkit
- Timestamp:
- Feb 21, 2016 10:18:32 AM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r196866 r196872 1 2016-02-21 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r196866. 4 https://bugs.webkit.org/show_bug.cgi?id=154515 5 6 still crashy on EFL/GTK (Requested by smfr on #webkit). 7 8 Reverted changeset: 9 10 "Wheel event callback removing the window causes crash in 11 WebCore." 12 https://bugs.webkit.org/show_bug.cgi?id=150871 13 http://trac.webkit.org/changeset/196866 14 1 15 2016-02-20 Simon Fraser <simon.fraser@apple.com> 2 16 -
trunk/Source/WebCore/ChangeLog
r196866 r196872 1 2016-02-21 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r196866. 4 https://bugs.webkit.org/show_bug.cgi?id=154515 5 6 still crashy on EFL/GTK (Requested by smfr on #webkit). 7 8 Reverted changeset: 9 10 "Wheel event callback removing the window causes crash in 11 WebCore." 12 https://bugs.webkit.org/show_bug.cgi?id=150871 13 http://trac.webkit.org/changeset/196866 14 1 15 2016-02-20 Simon Fraser <simon.fraser@apple.com> 2 16 -
trunk/Source/WebCore/page/EventHandler.cpp
r196866 r196872 453 453 m_capturesDragging = false; 454 454 m_capturingMouseEventsElement = nullptr; 455 clearLatchedState(); 455 #if PLATFORM(MAC) 456 m_frame.mainFrame().resetLatchingState(); 457 #endif 456 458 #if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS) 457 459 m_originatingTouchPointTargets.clear(); … … 2663 2665 m_frame.mainFrame().resetLatchingState(); 2664 2666 #endif 2665 if (WheelEventDeltaFilter* filter = m_frame.mainFrame().wheelEventDeltaFilter()) 2666 filter->endFilteringDeltas(); 2667 m_frame.mainFrame().wheelEventDeltaFilter()->endFilteringDeltas(); 2667 2668 } 2668 2669 -
trunk/Source/WebCore/page/Frame.cpp
r196866 r196872 252 252 m_view->unscheduleRelayout(); 253 253 254 if (m_view != view) 255 eventHandler().clear(); 254 eventHandler().clear(); 256 255 257 256 m_view = WTFMove(view); -
trunk/Source/WebCore/page/WheelEventDeltaFilter.cpp
r196866 r196872 32 32 33 33 #include "FloatSize.h" 34 #include "Logging.h"35 #include "TextStream.h"36 34 37 35 namespace WebCore { … … 61 59 FloatSize WheelEventDeltaFilter::filteredDelta() const 62 60 { 63 LOG_WITH_STREAM(Scrolling, stream << "BasicWheelEventDeltaFilter::filteredDelta returning " << m_currentFilteredDelta);64 61 return m_currentFilteredDelta; 65 62 } -
trunk/Source/WebCore/page/mac/EventHandlerMac.mm
r196866 r196872 1009 1009 bool EventHandler::platformCompleteWheelEvent(const PlatformWheelEvent& wheelEvent, ContainerNode* scrollableContainer, ScrollableArea* scrollableArea) 1010 1010 { 1011 // We do another check on the frame view because the event handler can run JS which results in the frame getting destroyed. 1012 ASSERT(m_frame.view()); 1011 1013 FrameView* view = m_frame.view(); 1012 // We do another check on the frame view because the event handler can run JS which results in the frame getting destroyed.1013 if (!view)1014 return false;1015 1014 1016 1015 ScrollLatchingState* latchingState = m_frame.mainFrame().latchingState(); -
trunk/Source/WebCore/rendering/RenderLayer.cpp
r196866 r196872 2350 2350 return; 2351 2351 2352 LOG_WITH_STREAM(Scrolling, stream << "RenderLayer::scrollTo " << position);2353 2354 2352 ScrollPosition newPosition = position; 2355 2353 if (box->style().overflowX() != OMARQUEE) {
Note: See TracChangeset
for help on using the changeset viewer.