Changeset 130776 in webkit


Ignore:
Timestamp:
Oct 9, 2012 10:17:50 AM (12 years ago)
Author:
Simon Fraser
Message:

Remove DRT/WTR implementations of layerTreeAsText
​https://bugs.webkit.org/show_bug.cgi?id=98697

Reviewed by Tim Horton, James Robinson, Alexey Proskuryakov.

Tools:

Remove code related to layerTreeAsText(), which is now on window.internals.

  • DumpRenderTree/TestRunner.cpp:

(TestRunner::staticFunctions):

  • DumpRenderTree/TestRunner.h:

(TestRunner):

  • DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
  • DumpRenderTree/chromium/DRTTestRunner.cpp:

(DRTTestRunner::DRTTestRunner):

  • DumpRenderTree/chromium/DRTTestRunner.h:

(DRTTestRunner):

  • DumpRenderTree/efl/TestRunnerEfl.cpp:
  • DumpRenderTree/gtk/TestRunnerGtk.cpp:
  • DumpRenderTree/mac/TestRunnerMac.mm:
  • DumpRenderTree/qt/TestRunnerQt.cpp:
  • DumpRenderTree/qt/TestRunnerQt.h:

(TestRunner):

  • DumpRenderTree/win/TestRunnerWin.cpp:
  • DumpRenderTree/wx/TestRunnerWx.cpp:
  • WebKitTestRunner/InjectedBundle/TestRunner.cpp:
  • WebKitTestRunner/InjectedBundle/TestRunner.h:

LayoutTests:

Fix a couple of tests missed in the previous chnage.

  • compositing/geometry/preserve-3d-switching.html:
  • compositing/visibility/visibility-image-layers-dynamic.html:
Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r130774 r130776  
     12012-10-08  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Remove DRT/WTR implementations of layerTreeAsText
     4        https://bugs.webkit.org/show_bug.cgi?id=98697
     5
     6        Reviewed by Tim Horton, James Robinson, Alexey Proskuryakov.
     7
     8        Fix a couple of tests missed in the previous chnage.
     9
     10        * compositing/geometry/preserve-3d-switching.html:
     11        * compositing/visibility/visibility-image-layers-dynamic.html:
     12
    1132012-10-09  Pravin D  <pravind.2k4@gmail.com>
    214

  • trunk/LayoutTests/compositing/geometry/preserve-3d-switching.html

    r130689 r130776  
    6161                document.getElementById("parent").style.webkitTransformStyle = "preserve-3d";
    6262                if (window.testRunner) {
    63                     if (testRunner.layerTreeAsText) {
    64                         var layerTree = window.internals.layerTreeAsText(document);
    65                         document.getElementById("layerTree").innerHTML = "<pre>" + layerTree + "</pre>";
    66                     }
     63                    var layerTree = window.internals.layerTreeAsText(document);
     64                    document.getElementById("layerTree").innerHTML = "<pre>" + layerTree + "</pre>";
    6765                    testRunner.notifyDone();
    6866                }

  • trunk/LayoutTests/compositing/visibility/visibility-image-layers-dynamic.html

    r130689 r130776  
    6262
    6363        if (window.testRunner)
    64           document.getElementById('layers2').innerText = testRunner.layerTreeAsText();
     64          document.getElementById('layers2').innerText = window.internals.layerTreeAsText(document);
    6565
    6666          window.setTimeout(function() {
    … …  
    6969
    7070            if (window.testRunner) {
    71               document.getElementById('layers3').innerText = testRunner.layerTreeAsText();
     71              document.getElementById('layers3').innerText = window.internals.layerTreeAsText(document);
    7272              testRunner.notifyDone();
    7373            }

  • trunk/Tools/ChangeLog

    r130770 r130776  
     12012-10-08  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Remove DRT/WTR implementations of layerTreeAsText
     4        https://bugs.webkit.org/show_bug.cgi?id=98697
     5
     6        Reviewed by Tim Horton, James Robinson, Alexey Proskuryakov.
     7
     8        Remove code related to layerTreeAsText(), which is now on window.internals.
     9
     10        * DumpRenderTree/TestRunner.cpp:
     11        (TestRunner::staticFunctions):
     12        * DumpRenderTree/TestRunner.h:
     13        (TestRunner):
     14        * DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
     15        * DumpRenderTree/chromium/DRTTestRunner.cpp:
     16        (DRTTestRunner::DRTTestRunner):
     17        * DumpRenderTree/chromium/DRTTestRunner.h:
     18        (DRTTestRunner):
     19        * DumpRenderTree/efl/TestRunnerEfl.cpp:
     20        * DumpRenderTree/gtk/TestRunnerGtk.cpp:
     21        * DumpRenderTree/mac/TestRunnerMac.mm:
     22        * DumpRenderTree/qt/TestRunnerQt.cpp:
     23        * DumpRenderTree/qt/TestRunnerQt.h:
     24        (TestRunner):
     25        * DumpRenderTree/win/TestRunnerWin.cpp:
     26        * DumpRenderTree/wx/TestRunnerWx.cpp:
     27        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
     28        * WebKitTestRunner/InjectedBundle/TestRunner.h:
     29
    1302012-10-09  Zoltan Horvath  <zoltan@webkit.org>
    231

  • trunk/Tools/DumpRenderTree/TestRunner.cpp

    r130416 r130776  
    698698    TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
    699699    return controller->computedStyleIncludingVisitedInfo(context, arguments[0]);
    700 }
    701 
    702 static JSValueRef layerTreeAsTextCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    703 {
    704     // Has mac & windows implementation
    705     TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
    706     return JSValueMakeString(context, controller->layerTreeAsText().get());
    707700}
    708701
    … …  
    22452238        { "isCommandEnabled", isCommandEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    22462239        { "keepWebHistory", keepWebHistoryCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    2247         { "layerTreeAsText", layerTreeAsTextCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    22482240        { "numberOfPendingGeolocationPermissionRequests", numberOfPendingGeolocationPermissionRequestsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    22492241        { "markerTextForListItem", markerTextForListItemCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

  • trunk/Tools/DumpRenderTree/TestRunner.h

    r130416 r130776  
    337337    void authenticateSession(JSStringRef url, JSStringRef username, JSStringRef password);
    338338
    339     JSRetainPtr<JSStringRef> layerTreeAsText() const;
    340 
    341339    JSRetainPtr<JSStringRef> markerTextForListItem(JSContextRef, JSValueRef nodeObject) const;
    342340

  • trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp

    r130538 r130776  
    586586}
    587587
    588 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
    589 {
    590     notImplemented();
    591     return 0;
    592 }
    593 
    594588JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
    595589{

  • trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp

    r129444 r130776  
    167167    bindMethod("isCommandEnabled", &DRTTestRunner::isCommandEnabled);
    168168    bindMethod("hasCustomPageSizeStyle", &DRTTestRunner::hasCustomPageSizeStyle);
    169     bindMethod("layerTreeAsText", &DRTTestRunner::layerTreeAsText);
    170169    bindMethod("loseCompositorContext", &DRTTestRunner::loseCompositorContext);
    171170    bindMethod("markerTextForListItem", &DRTTestRunner::markerTextForListItem);
    … …  
    19051904}
    19061905
    1907 void DRTTestRunner::layerTreeAsText(const CppArgumentList& args, CppVariant* result)
    1908 {
    1909     result->set(m_shell->webView()->mainFrame()->layerTreeAsText(m_showDebugLayerTree).utf8());
    1910 }
    1911 
    19121906void DRTTestRunner::loseCompositorContext(const CppArgumentList& args, CppVariant*)
    19131907{

  • trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h

    r129444 r130776  
    355355#endif
    356356    void startSpeechInput(const CppArgumentList&, CppVariant*);
    357 
    358     void layerTreeAsText(const CppArgumentList& args, CppVariant* result);
    359357
    360358    void loseCompositorContext(const CppArgumentList& args, CppVariant* result);

  • trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp

    r130416 r130776  
    118118}
    119119
    120 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
    121 {
    122     String result = DumpRenderTreeSupportEfl::layerTreeAsText(browser->mainFrame());
    123 
    124     return JSRetainPtr<JSStringRef>(Adopt, JSStringCreateWithUTF8CString(result.utf8().data()));
    125 }
    126 
    127120size_t TestRunner::webHistoryItemCount()
    128121{

  • trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp

    r130416 r130776  
    111111{
    112112    return DumpRenderTreeSupportGtk::computedStyleIncludingVisitedInfo(context, value);
    113 }
    114 
    115 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
    116 {
    117     // FIXME: implement
    118     JSRetainPtr<JSStringRef> string(Adopt, JSStringCreateWithUTF8CString(""));
    119     return string;
    120113}
    121114

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

    r130720 r130776  
    276276}
    277277
    278 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
    279 {
    280     JSRetainPtr<JSStringRef> string(Adopt, JSStringCreateWithCFString((CFStringRef)[mainFrame _layerTreeAsText]));
    281     return string;
    282 }
    283 
    284278JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
    285279{

  • trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp

    r130271 r130776  
    941941}
    942942
    943 QString TestRunner::layerTreeAsText()
    944 {
    945     return DumpRenderTreeSupportQt::layerTreeAsText(m_drt->webPage()->mainFrame());
    946 }
    947 
    948943void TestRunner::setTextDirection(const QString& directionName)
    949944{

  • trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h

    r129444 r130776  
    271271    void observeStorageTrackerNotifications(unsigned number);
    272272    void syncLocalStorage();
    273     QString layerTreeAsText();
    274273    void setTextDirection(const QString& directionName);
    275274    void goBack();

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

    r130612 r130776  
    180180}
    181181
    182 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
    183 {
    184     COMPtr<IWebFramePrivate> framePrivate(Query, frame);
    185     if (!framePrivate)
    186         return false;
    187 
    188     BSTR textBSTR = 0;
    189     HRESULT hr = framePrivate->layerTreeAsText(&textBSTR);
    190 
    191     wstring text(textBSTR, SysStringLen(textBSTR));
    192     SysFreeString(textBSTR);
    193     JSRetainPtr<JSStringRef> textValueJS(Adopt, JSStringCreateWithCharacters(text.data(), text.length()));
    194     return textValueJS;
    195 }
    196 
    197182JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
    198183{

  • trunk/Tools/DumpRenderTree/wx/TestRunnerWx.cpp

    r130416 r130776  
    498498}
    499499
    500 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
    501 {
    502     return 0;
    503 }
    504 
    505500JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
    506501{

  • trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

    r130662 r130776  
    122122        object originsWithApplicationCache();
    123123
    124         // Compositing testing.
    125         DOMString layerTreeAsText();
    126 
    127124        // Text search testing.
    128125        boolean findString(in DOMString target, in object optionsArray);

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

    r130662 r130776  
    194194}
    195195
    196 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
    197 {
    198     WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
    199     WKRetainPtr<WKStringRef> text(AdoptWK, WKBundleFrameCopyLayerTreeAsText(mainFrame));
    200     return toJS(text);
    201 }
    202 
    203196void TestRunner::addUserScript(JSStringRef source, bool runAtStart, bool allFrames)
    204197{

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

    r130662 r130776  
    133133    void suspendAnimations();
    134134   
    135     // Compositing testing.
    136     JSRetainPtr<JSStringRef> layerTreeAsText() const;
    137    
    138135    // UserContent testing.
    139136    void addUserScript(JSStringRef source, bool runAtStart, bool allFrames);
Note: See TracChangeset for help on using the changeset viewer.