Changeset 196872 in webkit


Ignore:
Timestamp:
Feb 21, 2016 10:18:32 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r196866.
https://bugs.webkit.org/show_bug.cgi?id=154515

still crashy on EFL/GTK (Requested by smfr on #webkit).

Reverted changeset:

"Wheel event callback removing the window causes crash in
WebCore."
https://bugs.webkit.org/show_bug.cgi?id=150871
http://trac.webkit.org/changeset/196866

Location:
trunk
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r196866 r196872  
     12016-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
    1152016-02-20  Simon Fraser  <simon.fraser@apple.com>
    216
  • trunk/Source/WebCore/ChangeLog

    r196866 r196872  
     12016-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
    1152016-02-20  Simon Fraser  <simon.fraser@apple.com>
    216
  • trunk/Source/WebCore/page/EventHandler.cpp

    r196866 r196872  
    453453    m_capturesDragging = false;
    454454    m_capturingMouseEventsElement = nullptr;
    455     clearLatchedState();
     455#if PLATFORM(MAC)
     456    m_frame.mainFrame().resetLatchingState();
     457#endif
    456458#if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS)
    457459    m_originatingTouchPointTargets.clear();
     
    26632665    m_frame.mainFrame().resetLatchingState();
    26642666#endif
    2665     if (WheelEventDeltaFilter* filter = m_frame.mainFrame().wheelEventDeltaFilter())
    2666         filter->endFilteringDeltas();
     2667    m_frame.mainFrame().wheelEventDeltaFilter()->endFilteringDeltas();
    26672668}
    26682669
  • trunk/Source/WebCore/page/Frame.cpp

    r196866 r196872  
    252252        m_view->unscheduleRelayout();
    253253   
    254     if (m_view != view)
    255         eventHandler().clear();
     254    eventHandler().clear();
    256255
    257256    m_view = WTFMove(view);
  • trunk/Source/WebCore/page/WheelEventDeltaFilter.cpp

    r196866 r196872  
    3232
    3333#include "FloatSize.h"
    34 #include "Logging.h"
    35 #include "TextStream.h"
    3634
    3735namespace WebCore {
     
    6159FloatSize WheelEventDeltaFilter::filteredDelta() const
    6260{
    63     LOG_WITH_STREAM(Scrolling, stream << "BasicWheelEventDeltaFilter::filteredDelta returning " << m_currentFilteredDelta);
    6461    return m_currentFilteredDelta;
    6562}
  • trunk/Source/WebCore/page/mac/EventHandlerMac.mm

    r196866 r196872  
    10091009bool EventHandler::platformCompleteWheelEvent(const PlatformWheelEvent& wheelEvent, ContainerNode* scrollableContainer, ScrollableArea* scrollableArea)
    10101010{
     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());
    10111013    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;
    10151014
    10161015    ScrollLatchingState* latchingState = m_frame.mainFrame().latchingState();
  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r196866 r196872  
    23502350        return;
    23512351
    2352     LOG_WITH_STREAM(Scrolling, stream << "RenderLayer::scrollTo " << position);
    2353 
    23542352    ScrollPosition newPosition = position;
    23552353    if (box->style().overflowX() != OMARQUEE) {
Note: See TracChangeset for help on using the changeset viewer.