Changeset 130776 in webkit
- Timestamp:
- Oct 9, 2012 10:17:50 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r130774 r130776 1 2012-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 1 13 2012-10-09 Pravin D <pravind.2k4@gmail.com> 2 14 -
trunk/LayoutTests/compositing/geometry/preserve-3d-switching.html
r130689 r130776 61 61 document.getElementById("parent").style.webkitTransformStyle = "preserve-3d"; 62 62 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>"; 67 65 testRunner.notifyDone(); 68 66 } -
trunk/LayoutTests/compositing/visibility/visibility-image-layers-dynamic.html
r130689 r130776 62 62 63 63 if (window.testRunner) 64 document.getElementById('layers2').innerText = testRunner.layerTreeAsText();64 document.getElementById('layers2').innerText = window.internals.layerTreeAsText(document); 65 65 66 66 window.setTimeout(function() { … … 69 69 70 70 if (window.testRunner) { 71 document.getElementById('layers3').innerText = testRunner.layerTreeAsText();71 document.getElementById('layers3').innerText = window.internals.layerTreeAsText(document); 72 72 testRunner.notifyDone(); 73 73 } -
trunk/Tools/ChangeLog
r130770 r130776 1 2012-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 1 30 2012-10-09 Zoltan Horvath <zoltan@webkit.org> 2 31 -
trunk/Tools/DumpRenderTree/TestRunner.cpp
r130416 r130776 698 698 TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject)); 699 699 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 implementation705 TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));706 return JSValueMakeString(context, controller->layerTreeAsText().get());707 700 } 708 701 … … 2245 2238 { "isCommandEnabled", isCommandEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 2246 2239 { "keepWebHistory", keepWebHistoryCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 2247 { "layerTreeAsText", layerTreeAsTextCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },2248 2240 { "numberOfPendingGeolocationPermissionRequests", numberOfPendingGeolocationPermissionRequestsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 2249 2241 { "markerTextForListItem", markerTextForListItemCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, -
trunk/Tools/DumpRenderTree/TestRunner.h
r130416 r130776 337 337 void authenticateSession(JSStringRef url, JSStringRef username, JSStringRef password); 338 338 339 JSRetainPtr<JSStringRef> layerTreeAsText() const;340 341 339 JSRetainPtr<JSStringRef> markerTextForListItem(JSContextRef, JSValueRef nodeObject) const; 342 340 -
trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp
r130538 r130776 586 586 } 587 587 588 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const589 {590 notImplemented();591 return 0;592 }593 594 588 JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const 595 589 { -
trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp
r129444 r130776 167 167 bindMethod("isCommandEnabled", &DRTTestRunner::isCommandEnabled); 168 168 bindMethod("hasCustomPageSizeStyle", &DRTTestRunner::hasCustomPageSizeStyle); 169 bindMethod("layerTreeAsText", &DRTTestRunner::layerTreeAsText);170 169 bindMethod("loseCompositorContext", &DRTTestRunner::loseCompositorContext); 171 170 bindMethod("markerTextForListItem", &DRTTestRunner::markerTextForListItem); … … 1905 1904 } 1906 1905 1907 void DRTTestRunner::layerTreeAsText(const CppArgumentList& args, CppVariant* result)1908 {1909 result->set(m_shell->webView()->mainFrame()->layerTreeAsText(m_showDebugLayerTree).utf8());1910 }1911 1912 1906 void DRTTestRunner::loseCompositorContext(const CppArgumentList& args, CppVariant*) 1913 1907 { -
trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h
r129444 r130776 355 355 #endif 356 356 void startSpeechInput(const CppArgumentList&, CppVariant*); 357 358 void layerTreeAsText(const CppArgumentList& args, CppVariant* result);359 357 360 358 void loseCompositorContext(const CppArgumentList& args, CppVariant* result); -
trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp
r130416 r130776 118 118 } 119 119 120 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const121 {122 String result = DumpRenderTreeSupportEfl::layerTreeAsText(browser->mainFrame());123 124 return JSRetainPtr<JSStringRef>(Adopt, JSStringCreateWithUTF8CString(result.utf8().data()));125 }126 127 120 size_t TestRunner::webHistoryItemCount() 128 121 { -
trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp
r130416 r130776 111 111 { 112 112 return DumpRenderTreeSupportGtk::computedStyleIncludingVisitedInfo(context, value); 113 }114 115 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const116 {117 // FIXME: implement118 JSRetainPtr<JSStringRef> string(Adopt, JSStringCreateWithUTF8CString(""));119 return string;120 113 } 121 114 -
trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm
r130720 r130776 276 276 } 277 277 278 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const279 {280 JSRetainPtr<JSStringRef> string(Adopt, JSStringCreateWithCFString((CFStringRef)[mainFrame _layerTreeAsText]));281 return string;282 }283 284 278 JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const 285 279 { -
trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
r130271 r130776 941 941 } 942 942 943 QString TestRunner::layerTreeAsText()944 {945 return DumpRenderTreeSupportQt::layerTreeAsText(m_drt->webPage()->mainFrame());946 }947 948 943 void TestRunner::setTextDirection(const QString& directionName) 949 944 { -
trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h
r129444 r130776 271 271 void observeStorageTrackerNotifications(unsigned number); 272 272 void syncLocalStorage(); 273 QString layerTreeAsText();274 273 void setTextDirection(const QString& directionName); 275 274 void goBack(); -
trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp
r130612 r130776 180 180 } 181 181 182 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const183 {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 197 182 JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const 198 183 { -
trunk/Tools/DumpRenderTree/wx/TestRunnerWx.cpp
r130416 r130776 498 498 } 499 499 500 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const501 {502 return 0;503 }504 505 500 JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const 506 501 { -
trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
r130662 r130776 122 122 object originsWithApplicationCache(); 123 123 124 // Compositing testing.125 DOMString layerTreeAsText();126 127 124 // Text search testing. 128 125 boolean findString(in DOMString target, in object optionsArray); -
trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
r130662 r130776 194 194 } 195 195 196 JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const197 {198 WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());199 WKRetainPtr<WKStringRef> text(AdoptWK, WKBundleFrameCopyLayerTreeAsText(mainFrame));200 return toJS(text);201 }202 203 196 void TestRunner::addUserScript(JSStringRef source, bool runAtStart, bool allFrames) 204 197 { -
trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
r130662 r130776 133 133 void suspendAnimations(); 134 134 135 // Compositing testing.136 JSRetainPtr<JSStringRef> layerTreeAsText() const;137 138 135 // UserContent testing. 139 136 void addUserScript(JSStringRef source, bool runAtStart, bool allFrames);
Note: See TracChangeset
for help on using the changeset viewer.