Changeset 204918 in webkit


Ignore:
Timestamp:
Aug 24, 2016 12:27:24 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

WebKit2 needs layoutTestController.setDeferMainResourceDataLoad
​https://bugs.webkit.org/show_bug.cgi?id=42777

Patch by Jonathan Bedard <Jonathan Bedard> on 2016-08-24
Reviewed by Darin Adler.

The setDeferMainResourceDataLoad method was not correctly tested in DumpRenderTree and would pass even when setDeterMainResourceDataLoad was not called. Removed function and test.

Tools:

  • DumpRenderTree/TestRunner.cpp:

(setDeferMainResourceDataLoadCallback): Removed setDeferMainResourceDataLoad.

  • DumpRenderTree/TestRunner.h:

(TestRunner::deferMainResourceDataLoad): Ditto.
(TestRunner::setDeferMainResourceDataLoad): Ditto.

  • DumpRenderTree/mac/ResourceLoadDelegate.mm: Ditto.

LayoutTests:

  • fast/loader/non-deferred-substitute-load-expected.txt: Removed fast/loader/non-deferred-substitute-load.html.
  • fast/loader/non-deferred-substitute-load.html: Ditto.
  • platform/ios-simulator-wk2/TestExpectations: Ditto.
  • platform/win/TestExpectations: Ditto.
  • platform/wk2/TestExpectations: Ditto.
Location:
trunk
Files:
2 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r204915 r204918  
     12016-08-24  Jonathan Bedard  <jbedard@apple.com>
     2
     3        WebKit2 needs layoutTestController.setDeferMainResourceDataLoad
     4        https://bugs.webkit.org/show_bug.cgi?id=42777
     5
     6        Reviewed by Darin Adler.
     7
     8        The setDeferMainResourceDataLoad method was not correctly tested in DumpRenderTree and would pass even when setDeterMainResourceDataLoad was not called.  Removed function and test.
     9
     10        * fast/loader/non-deferred-substitute-load-expected.txt: Removed fast/loader/non-deferred-substitute-load.html.
     11        * fast/loader/non-deferred-substitute-load.html: Ditto.
     12        * platform/ios-simulator-wk2/TestExpectations: Ditto.
     13        * platform/win/TestExpectations: Ditto.
     14        * platform/wk2/TestExpectations: Ditto.
     15
    1162016-08-24  Chris Dumez  <cdumez@apple.com>
    217

  • trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations

    r204877 r204918  
    523523fast/images/imagemap-dynamic-area-updates.html [ Failure ]
    524524fast/inline/relative-positioned-overflow.html [ Failure ]
    525 fast/loader/non-deferred-substitute-load.html [ Failure ]
    526525fast/loader/policy-delegate-action-hit-test-zoomed.html [ Failure ]
    527526fast/loader/repeat-same-document-navigation.html [ Failure ]

  • trunk/LayoutTests/platform/win/TestExpectations

    r204891 r204918  
    25312531webkit.org/b/140866 fast/repaint/obscured-background-no-repaint.html [ Failure ]
    25322532[ Debug ] fast/repaint/animation-after-layer-scroll.html [ Failure ]
    2533 
    2534 # Main frame document does not match cached page document:
    2535 webkit.org/b/140871 [ Debug ] fast/loader/non-deferred-substitute-load.html [ Skip ]
    25362533
    25372534[ Release ] platform/win/fast/text/uniscribe-missing-glyph.html [ Failure ]

  • trunk/LayoutTests/platform/wk2/TestExpectations

    r204844 r204918  
    150150# <https://bugs.webkit.org/show_bug.cgi?id=42700>
    151151http/tests/security/setDomainRelaxationForbiddenForURLScheme.html
    152 
    153 # WebKit2 needs testRunner.setDeferMainResourceDataLoad
    154 # <https://bugs.webkit.org/show_bug.cgi?id=42777>
    155 fast/loader/non-deferred-substitute-load.html
    156152
    157153# WebKitTestRunner needs testRunner.removeAllVisitedLinks

  • trunk/Tools/ChangeLog

    r204916 r204918  
     12016-08-24  Jonathan Bedard  <jbedard@apple.com>
     2
     3        WebKit2 needs layoutTestController.setDeferMainResourceDataLoad
     4        https://bugs.webkit.org/show_bug.cgi?id=42777
     5
     6        Reviewed by Darin Adler.
     7
     8        The setDeferMainResourceDataLoad method was not correctly tested in DumpRenderTree and would pass even when setDeterMainResourceDataLoad was not called.  Removed function and test.
     9
     10        * DumpRenderTree/TestRunner.cpp:
     11        (setDeferMainResourceDataLoadCallback): Removed setDeferMainResourceDataLoad.
     12        * DumpRenderTree/TestRunner.h:
     13        (TestRunner::deferMainResourceDataLoad): Ditto.
     14        (TestRunner::setDeferMainResourceDataLoad): Ditto.
     15        * DumpRenderTree/mac/ResourceLoadDelegate.mm: Ditto.
     16
    1172016-08-23  Anders Carlsson  <andersca@apple.com>
    218

  • trunk/Tools/DumpRenderTree/TestRunner.cpp

    r204912 r204918  
    108108    , m_handlesAuthenticationChallenges(false)
    109109    , m_isPrinting(false)
    110     , m_deferMainResourceDataLoad(true)
    111110    , m_useDeferredFrameLoading(false)
    112111    , m_shouldPaintBrokenImage(true)
    … …  
    912911        controller->setDatabaseQuota(static_cast<unsigned long long>(quota));
    913912       
    914     return JSValueMakeUndefined(context);
    915 }
    916 
    917 static JSValueRef setDeferMainResourceDataLoadCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    918 {
    919     // Has Mac and Windows implementation
    920     if (argumentCount < 1)
    921         return JSValueMakeUndefined(context);
    922 
    923     TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
    924     controller->setDeferMainResourceDataLoad(JSValueToBoolean(context, arguments[0]));
    925 
    926913    return JSValueMakeUndefined(context);
    927914}
    … …  
    21512138        { "setCustomPolicyDelegate", setCustomPolicyDelegateCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    21522139        { "setDatabaseQuota", setDatabaseQuotaCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    2153         { "setDeferMainResourceDataLoad", setDeferMainResourceDataLoadCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    21542140        { "setDefersLoading", setDefersLoadingCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    21552141        { "setUseDeferredFrameLoading", setUseDeferredFrameLoadingCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

  • trunk/Tools/DumpRenderTree/TestRunner.h

    r204877 r204918  
    296296    void setDatabaseMaxQuota(double quota) { m_databaseMaxQuota = quota; }
    297297
    298     bool deferMainResourceDataLoad() const { return m_deferMainResourceDataLoad; }
    299     void setDeferMainResourceDataLoad(bool flag) { m_deferMainResourceDataLoad = flag; }
    300 
    301298    bool useDeferredFrameLoading() const { return m_useDeferredFrameLoading; }
    302299    void setUseDeferredFrameLoading(bool flag) { m_useDeferredFrameLoading = flag; }
    … …  
    432429    bool m_handlesAuthenticationChallenges;
    433430    bool m_isPrinting;
    434     bool m_deferMainResourceDataLoad;
    435431    bool m_useDeferredFrameLoading;
    436432    bool m_shouldPaintBrokenImage;

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

    r203743 r204918  
    151151    }
    152152
    153     if (!done && !gTestRunner->deferMainResourceDataLoad()) {
    154         [dataSource _setDeferMainResourceDataLoad:false];
    155     }
    156 
    157153    if (!done && gTestRunner->willSendRequestReturnsNull())
    158154        return nil;
Note: See TracChangeset for help on using the changeset viewer.