Changeset 258558 in webkit


Ignore:
Timestamp:
Mar 17, 2020 10:14:43 AM (4 years ago)
Author:
Jacob Uphoff
Message:

Unreviewed, reverting r257844.

this revision caused a test to start timing out

Reverted changeset:

"(r256513) [ Mac ] fast/scrolling/programmatic-scroll-to-zero-
zero.html is a flaky failure"
​https://bugs.webkit.org/show_bug.cgi?id=207948
​https://trac.webkit.org/changeset/257844

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r258556 r258558  
     12020-03-17  Jacob Uphoff  <jacob_uphoff@apple.com>
     2
     3        Unreviewed, reverting r257844.
     4
     5        this revision caused a test to start timing out
     6
     7        Reverted changeset:
     8
     9        "(r256513) [ Mac ] fast/scrolling/programmatic-scroll-to-zero-
     10        zero.html is a flaky failure"
     11        https://bugs.webkit.org/show_bug.cgi?id=207948
     12        https://trac.webkit.org/changeset/257844
     13
    1142020-03-17  Jason Lawrence  <lawrence.j@apple.com>
    215

  • trunk/LayoutTests/platform/mac-wk2/TestExpectations

    r258556 r258558  
    10601060webkit.org/b/208062 http/wpt/fetch/disable-speculative-for-reload.html [ Pass Failure ]
    10611061
     1062webkit.org/b/208160 fast/scrolling/overflow-scroll-past-max.html [ Pass Failure ]
     1063
    10621064webkit.org/b/208222 [ Release ] imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html [ Pass Failure ]
    10631065

  • trunk/LayoutTests/platform/win/TestExpectations

    r258346 r258558  
    276276fast/events/wheelevent-in-vertical-scrollbar-in-rtl.html [ Failure ]
    277277scrollbars/scroll-rtl-or-bt-layer.html [ Timeout ]
    278 webkit.org/b/208559 fast/scrolling/arrow-key-scroll-in-rtl-document.html [ Skip ]
    279 webkit.org/b/208559 fast/scrolling/programmatic-scroll-to-zero-zero.html [ Skip ]
    280278
    281279# TODO Needs testRunner.enableAutoResizeMode()

  • trunk/Source/WebCore/ChangeLog

    r258549 r258558  
     12020-03-17  Jacob Uphoff  <jacob_uphoff@apple.com>
     2
     3        Unreviewed, reverting r257844.
     4
     5        this revision caused a test to start timing out
     6
     7        Reverted changeset:
     8
     9        "(r256513) [ Mac ] fast/scrolling/programmatic-scroll-to-zero-
     10        zero.html is a flaky failure"
     11        https://bugs.webkit.org/show_bug.cgi?id=207948
     12        https://trac.webkit.org/changeset/257844
     13
    1142020-03-17  Commit Queue  <commit-queue@webkit.org>
    215

  • trunk/Source/WebCore/page/EventHandler.cpp

    r258148 r258558  
    104104#include "WheelEvent.h"
    105105#include "WheelEventDeltaFilter.h"
    106 #include "WheelEventTestMonitor.h"
    107106#include "WindowsKeyboardCodes.h"
    108107#include <wtf/Assertions.h>
    … …  
    28272826#endif
    28282827
    2829 #if PLATFORM(COCOA)
    2830     WheelEventTestMonitorCompletionDeferrer deferrer(m_frame.page()->wheelEventTestMonitor().get(), this, WheelEventTestMonitor::DeferReason::HandlingWheelEventOnMainThread);
    2831 #endif
    2832 
    28332828    m_isHandlingWheelEvent = true;
    28342829    setFrameWasScrolledByUser();

  • trunk/Source/WebCore/page/FrameView.cpp

    r258511 r258558  
    24462446void FrameView::scrollOffsetChangedViaPlatformWidgetImpl(const ScrollOffset& oldOffset, const ScrollOffset& newOffset)
    24472447{
    2448 #if PLATFORM(COCOA)
    2449     WheelEventTestMonitorCompletionDeferrer deferrer(frame().page()->wheelEventTestMonitor().get(), this, WheelEventTestMonitor::DeferReason::ContentScrollInProgress);
    2450 #endif
    2451 
    24522448    updateLayerPositionsAfterScrolling();
    24532449    updateCompositingLayersAfterScrolling();

  • trunk/Source/WebCore/page/WheelEventTestMonitor.cpp

    r257844 r258558  
    5252    m_completionCallback = nullptr;
    5353    m_testForCompletionTimer.stop();
    54     m_everHadDeferral = false;
    5554    LOG_WITH_STREAM(WheelEventTestMonitor, stream << "      (=) WheelEventTestMonitor::clearAllTestDeferrals: cleared all test state.");
    5655}
    … …  
    7170        return OptionSet<DeferReason>();
    7271    }).iterator->value.add(reason);
    73 
    74     m_everHadDeferral = true;
    75 
     72   
    7673    LOG_WITH_STREAM(WheelEventTestMonitor, stream << "      (=) WheelEventTestMonitor::deferForReason: id=" << identifier << ", reason=" << reason);
    7774}
    … …  
    9996    }
    10097
    101     if (!m_everHadDeferral) {
    102         LOG_WITH_STREAM(WheelEventTestMonitor, stream << "  WheelEventTestMonitor::triggerTestTimerFired - have not yet seen any deferral reasons");
    103         return;
    104     }
    105 
    10698    auto functionCallback = WTFMove(m_completionCallback);
    10799    m_testForCompletionTimer.stop();
    … …  
    116108    switch (reason) {
    117109    case WheelEventTestMonitor::HandlingWheelEvent: ts << "handling wheel event"; break;
    118     case WheelEventTestMonitor::HandlingWheelEventOnMainThread: ts << "handling wheel event on main thread"; break;
    119110    case WheelEventTestMonitor::RubberbandInProgress: ts << "rubberbanding"; break;
    120111    case WheelEventTestMonitor::ScrollSnapInProgress: ts << "scroll-snapping"; break;

  • trunk/Source/WebCore/page/WheelEventTestMonitor.h

    r257844 r258558  
    4848   
    4949    enum DeferReason {
    50         HandlingWheelEvent              = 1 << 0,
    51         HandlingWheelEventOnMainThread  = 1 << 1,
    52         RubberbandInProgress            = 1 << 2,
    53         ScrollSnapInProgress            = 1 << 3,
    54         ScrollingThreadSyncNeeded       = 1 << 4,
    55         ContentScrollInProgress         = 1 << 5,
     50        HandlingWheelEvent          = 1 << 0,
     51        RubberbandInProgress        = 1 << 1,
     52        ScrollSnapInProgress        = 1 << 2,
     53        ScrollingThreadSyncNeeded   = 1 << 3,
     54        ContentScrollInProgress     = 1 << 4,
    5655    };
    5756    typedef const void* ScrollableAreaIdentifier;
    … …  
    6968
    7069    ScrollableAreaReasonMap m_deferCompletionReasons;
    71     bool m_everHadDeferral { false };
    72 };
    73 
    74 class WheelEventTestMonitorCompletionDeferrer {
    75 public:
    76     WheelEventTestMonitorCompletionDeferrer(WheelEventTestMonitor* monitor, WheelEventTestMonitor::ScrollableAreaIdentifier identifier, WheelEventTestMonitor::DeferReason reason)
    77         : m_monitor(monitor)
    78         , m_identifier(identifier)
    79         , m_reason(reason)
    80     {
    81         if (m_monitor)
    82             m_monitor->deferForReason(m_identifier, m_reason);
    83     }
    84    
    85     ~WheelEventTestMonitorCompletionDeferrer()
    86     {
    87         if (m_monitor)
    88             m_monitor->removeDeferralForReason(m_identifier, m_reason);
    89     }
    90 
    91 private:
    92     RefPtr<WheelEventTestMonitor> m_monitor;
    93     WheelEventTestMonitor::ScrollableAreaIdentifier m_identifier;
    94     WheelEventTestMonitor::DeferReason m_reason;
    9570};
    9671

  • trunk/Tools/ChangeLog

    r258527 r258558  
     12020-03-17  Jacob Uphoff  <jacob_uphoff@apple.com>
     2
     3        Unreviewed, reverting r257844.
     4
     5        this revision caused a test to start timing out
     6
     7        Reverted changeset:
     8
     9        "(r256513) [ Mac ] fast/scrolling/programmatic-scroll-to-zero-
     10        zero.html is a flaky failure"
     11        https://bugs.webkit.org/show_bug.cgi?id=207948
     12        https://trac.webkit.org/changeset/257844
     13
    1142020-03-16  Justin Michaud  <justin_michaud@apple.com>
    215

  • trunk/Tools/DumpRenderTree/mac/EventSendingController.mm

    r257844 r258558  
    853853{
    854854#if PLATFORM(MAC)
    855     [[[mainFrame frameView] documentView] layout];
    856 
    857855    uint32_t phase = 0;
    858856    if ([phaseName isEqualToString: @"none"])

  • trunk/Tools/DumpRenderTree/win/EventSender.cpp

    r257844 r258558  
    833833    ::GetWindowRect(webViewWindow, &rect);
    834834
    835     COMPtr<IWebFramePrivate> framePrivate;
    836     if (SUCCEEDED(frame->QueryInterface(&framePrivate)))
    837         framePrivate->layout();
    838 
    839835    if (x) {
    840836        UINT scrollChars = 1;
Note: See TracChangeset for help on using the changeset viewer.