Diff
Modified: trunk/LayoutTests/ChangeLog (130775 => 130776)
--- trunk/LayoutTests/ChangeLog 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/LayoutTests/ChangeLog 2012-10-09 17:17:50 UTC (rev 130776)
@@ -1,3 +1,15 @@
+2012-10-08 Simon Fraser <[email protected]>
+
+ Remove DRT/WTR implementations of layerTreeAsText
+ https://bugs.webkit.org/show_bug.cgi?id=98697
+
+ Reviewed by Tim Horton, James Robinson, Alexey Proskuryakov.
+
+ Fix a couple of tests missed in the previous chnage.
+
+ * compositing/geometry/preserve-3d-switching.html:
+ * compositing/visibility/visibility-image-layers-dynamic.html:
+
2012-10-09 Pravin D <[email protected]>
max-width property is does not overriding the width properties for css tables(display:table)
Modified: trunk/LayoutTests/compositing/geometry/preserve-3d-switching.html (130775 => 130776)
--- trunk/LayoutTests/compositing/geometry/preserve-3d-switching.html 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/LayoutTests/compositing/geometry/preserve-3d-switching.html 2012-10-09 17:17:50 UTC (rev 130776)
@@ -60,10 +60,8 @@
setTimeout(function() {
document.getElementById("parent").style.webkitTransformStyle = "preserve-3d";
if (window.testRunner) {
- if (testRunner.layerTreeAsText) {
- var layerTree = window.internals.layerTreeAsText(document);
- document.getElementById("layerTree").innerHTML = "<pre>" + layerTree + "</pre>";
- }
+ var layerTree = window.internals.layerTreeAsText(document);
+ document.getElementById("layerTree").innerHTML = "<pre>" + layerTree + "</pre>";
testRunner.notifyDone();
}
}, timeout);
Modified: trunk/LayoutTests/compositing/visibility/visibility-image-layers-dynamic.html (130775 => 130776)
--- trunk/LayoutTests/compositing/visibility/visibility-image-layers-dynamic.html 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/LayoutTests/compositing/visibility/visibility-image-layers-dynamic.html 2012-10-09 17:17:50 UTC (rev 130776)
@@ -61,14 +61,14 @@
firstImage.style.visibility = 'visible';
if (window.testRunner)
- document.getElementById('layers2').innerText = testRunner.layerTreeAsText();
+ document.getElementById('layers2').innerText = window.internals.layerTreeAsText(document);
window.setTimeout(function() {
var secondContainer = document.querySelectorAll('.container')[1];
secondContainer.style.visibility = 'visible';
if (window.testRunner) {
- document.getElementById('layers3').innerText = testRunner.layerTreeAsText();
+ document.getElementById('layers3').innerText = window.internals.layerTreeAsText(document);
testRunner.notifyDone();
}
}, 0);
Modified: trunk/Tools/ChangeLog (130775 => 130776)
--- trunk/Tools/ChangeLog 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/ChangeLog 2012-10-09 17:17:50 UTC (rev 130776)
@@ -1,3 +1,32 @@
+2012-10-08 Simon Fraser <[email protected]>
+
+ Remove DRT/WTR implementations of layerTreeAsText
+ https://bugs.webkit.org/show_bug.cgi?id=98697
+
+ Reviewed by Tim Horton, James Robinson, Alexey Proskuryakov.
+
+ 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:
+
2012-10-09 Zoltan Horvath <[email protected]>
Unreviewed. Remove myself from QtWebKit2 subscriptions.
Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (130775 => 130776)
--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2012-10-09 17:17:50 UTC (rev 130776)
@@ -699,13 +699,6 @@
return controller->computedStyleIncludingVisitedInfo(context, arguments[0]);
}
-static JSValueRef layerTreeAsTextCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- // Has mac & windows implementation
- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
- return JSValueMakeString(context, controller->layerTreeAsText().get());
-}
-
static JSValueRef notifyDoneCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
// Has mac & windows implementation
@@ -2244,7 +2237,6 @@
{ "ignoreLegacyWebNotificationPermissionRequests", ignoreLegacyWebNotificationPermissionRequestsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "isCommandEnabled", isCommandEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "keepWebHistory", keepWebHistoryCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
- { "layerTreeAsText", layerTreeAsTextCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "numberOfPendingGeolocationPermissionRequests", numberOfPendingGeolocationPermissionRequestsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "markerTextForListItem", markerTextForListItemCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "notifyDone", notifyDoneCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
Modified: trunk/Tools/DumpRenderTree/TestRunner.h (130775 => 130776)
--- trunk/Tools/DumpRenderTree/TestRunner.h 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/DumpRenderTree/TestRunner.h 2012-10-09 17:17:50 UTC (rev 130776)
@@ -336,8 +336,6 @@
// Simulate a request an embedding application could make, populating per-session credential storage.
void authenticateSession(JSStringRef url, JSStringRef username, JSStringRef password);
- JSRetainPtr<JSStringRef> layerTreeAsText() const;
-
JSRetainPtr<JSStringRef> markerTextForListItem(JSContextRef, JSValueRef nodeObject) const;
JSValueRef originsWithLocalStorage(JSContextRef);
Modified: trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp (130775 => 130776)
--- trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp 2012-10-09 17:17:50 UTC (rev 130776)
@@ -585,12 +585,6 @@
return DumpRenderTreeSupport::computedStyleIncludingVisitedInfo(context, value);
}
-JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
-{
- notImplemented();
- return 0;
-}
-
JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
{
WebCore::Element* element = toElement(toJS(toJS(context), nodeObject));
Modified: trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp (130775 => 130776)
--- trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp 2012-10-09 17:17:50 UTC (rev 130776)
@@ -166,7 +166,6 @@
bindMethod("findString", &DRTTestRunner::findString);
bindMethod("isCommandEnabled", &DRTTestRunner::isCommandEnabled);
bindMethod("hasCustomPageSizeStyle", &DRTTestRunner::hasCustomPageSizeStyle);
- bindMethod("layerTreeAsText", &DRTTestRunner::layerTreeAsText);
bindMethod("loseCompositorContext", &DRTTestRunner::loseCompositorContext);
bindMethod("markerTextForListItem", &DRTTestRunner::markerTextForListItem);
bindMethod("notifyDone", &DRTTestRunner::notifyDone);
@@ -1904,11 +1903,6 @@
input->startSpeechInput();
}
-void DRTTestRunner::layerTreeAsText(const CppArgumentList& args, CppVariant* result)
-{
- result->set(m_shell->webView()->mainFrame()->layerTreeAsText(m_showDebugLayerTree).utf8());
-}
-
void DRTTestRunner::loseCompositorContext(const CppArgumentList& args, CppVariant*)
{
int numTimes;
Modified: trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h (130775 => 130776)
--- trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h 2012-10-09 17:17:50 UTC (rev 130776)
@@ -355,8 +355,6 @@
#endif
void startSpeechInput(const CppArgumentList&, CppVariant*);
- void layerTreeAsText(const CppArgumentList& args, CppVariant* result);
-
void loseCompositorContext(const CppArgumentList& args, CppVariant* result);
void markerTextForListItem(const CppArgumentList&, CppVariant*);
Modified: trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp (130775 => 130776)
--- trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp 2012-10-09 17:17:50 UTC (rev 130776)
@@ -117,13 +117,6 @@
return DumpRenderTreeSupportEfl::computedStyleIncludingVisitedInfo(context, value);
}
-JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
-{
- String result = DumpRenderTreeSupportEfl::layerTreeAsText(browser->mainFrame());
-
- return JSRetainPtr<JSStringRef>(Adopt, JSStringCreateWithUTF8CString(result.utf8().data()));
-}
-
size_t TestRunner::webHistoryItemCount()
{
const Ewk_History* history = ewk_view_history_get(browser->mainView());
Modified: trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp (130775 => 130776)
--- trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp 2012-10-09 17:17:50 UTC (rev 130776)
@@ -112,13 +112,6 @@
return DumpRenderTreeSupportGtk::computedStyleIncludingVisitedInfo(context, value);
}
-JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
-{
- // FIXME: implement
- JSRetainPtr<JSStringRef> string(Adopt, JSStringCreateWithUTF8CString(""));
- return string;
-}
-
size_t TestRunner::webHistoryItemCount()
{
WebKitWebView* webView = webkit_web_frame_get_web_view(mainFrame);
Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (130775 => 130776)
--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2012-10-09 17:17:50 UTC (rev 130776)
@@ -275,12 +275,6 @@
return [[mainFrame webView] _computedStyleIncludingVisitedInfo:context forElement:value];
}
-JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
-{
- JSRetainPtr<JSStringRef> string(Adopt, JSStringCreateWithCFString((CFStringRef)[mainFrame _layerTreeAsText]));
- return string;
-}
-
JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
{
DOMElement *element = [DOMElement _DOMElementFromJSContext:context value:nodeObject];
Modified: trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp (130775 => 130776)
--- trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp 2012-10-09 17:17:50 UTC (rev 130776)
@@ -940,11 +940,6 @@
// FIXME: Implement this.
}
-QString TestRunner::layerTreeAsText()
-{
- return DumpRenderTreeSupportQt::layerTreeAsText(m_drt->webPage()->mainFrame());
-}
-
void TestRunner::setTextDirection(const QString& directionName)
{
if (directionName == "auto")
Modified: trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h (130775 => 130776)
--- trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h 2012-10-09 17:17:50 UTC (rev 130776)
@@ -270,7 +270,6 @@
long long localStorageDiskUsageForOrigin(const QString& originIdentifier);
void observeStorageTrackerNotifications(unsigned number);
void syncLocalStorage();
- QString layerTreeAsText();
void setTextDirection(const QString& directionName);
void goBack();
void setDefersLoading(bool);
Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (130775 => 130776)
--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2012-10-09 17:17:50 UTC (rev 130776)
@@ -179,21 +179,6 @@
return JSValueMakeUndefined(context);
}
-JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
-{
- COMPtr<IWebFramePrivate> framePrivate(Query, frame);
- if (!framePrivate)
- return false;
-
- BSTR textBSTR = 0;
- HRESULT hr = framePrivate->layerTreeAsText(&textBSTR);
-
- wstring text(textBSTR, SysStringLen(textBSTR));
- SysFreeString(textBSTR);
- JSRetainPtr<JSStringRef> textValueJS(Adopt, JSStringCreateWithCharacters(text.data(), text.length()));
- return textValueJS;
-}
-
JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
{
COMPtr<IWebView> webView;
Modified: trunk/Tools/DumpRenderTree/wx/TestRunnerWx.cpp (130775 => 130776)
--- trunk/Tools/DumpRenderTree/wx/TestRunnerWx.cpp 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/DumpRenderTree/wx/TestRunnerWx.cpp 2012-10-09 17:17:50 UTC (rev 130776)
@@ -497,11 +497,6 @@
return false;
}
-JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
-{
- return 0;
-}
-
JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
{
return 0;
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (130775 => 130776)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2012-10-09 17:17:50 UTC (rev 130776)
@@ -121,9 +121,6 @@
void disallowIncreaseForApplicationCacheQuota();
object originsWithApplicationCache();
- // Compositing testing.
- DOMString layerTreeAsText();
-
// Text search testing.
boolean findString(in DOMString target, in object optionsArray);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (130775 => 130776)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-10-09 17:17:50 UTC (rev 130776)
@@ -193,13 +193,6 @@
WKBundleFrameSuspendAnimations(mainFrame);
}
-JSRetainPtr<JSStringRef> TestRunner::layerTreeAsText() const
-{
- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
- WKRetainPtr<WKStringRef> text(AdoptWK, WKBundleFrameCopyLayerTreeAsText(mainFrame));
- return toJS(text);
-}
-
void TestRunner::addUserScript(JSStringRef source, bool runAtStart, bool allFrames)
{
WKRetainPtr<WKStringRef> sourceWK = toWK(source);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (130775 => 130776)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2012-10-09 16:59:26 UTC (rev 130775)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2012-10-09 17:17:50 UTC (rev 130776)
@@ -132,9 +132,6 @@
bool pauseTransitionAtTimeOnElementWithId(JSStringRef propertyName, double time, JSStringRef elementId);
void suspendAnimations();
- // Compositing testing.
- JSRetainPtr<JSStringRef> layerTreeAsText() const;
-
// UserContent testing.
void addUserScript(JSStringRef source, bool runAtStart, bool allFrames);
void addUserStyleSheet(JSStringRef source, bool allFrames);
