Attachment 156506 Details for Bug 93173 – Patch

[patch] Patch

bug-93173-20120803194252.patch (text/plain), 9.95 KB, created by Ryosuke Niwa on 2012-08-03 19:43:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ryosuke Niwa

Created: 2012-08-03 19:43:13 PDT

Size: 9.95 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 124683)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,36 @@
>+2012-08-03  Ryosuke Niwa  <rniwa@webkit.org>
>+
>+        Stop exposing window.layoutTestController in layout tests in favor of window.testRunner
>+        https://bugs.webkit.org/show_bug.cgi?id=93173
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Don't expose window.layoutTestController since all layout tests use window.testRunner
>+        instead of window.layoutTestController as of r124685.
>+
>+        We can safely rename classes and files to use TestRunner once this patch is landed.
>+
>+        * DumpRenderTree/LayoutTestController.cpp:
>+        (LayoutTestController::makeWindowObject):
>+        * DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:
>+        (notifyTestCompletion):
>+        * DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp:
>+        (PluginTest::waitUntilDone):
>+        (PluginTest::notifyDone):
>+        * DumpRenderTree/TestNetscapePlugIn/Tests/mac/ConvertPoint.cpp:
>+        (ConvertPoint::NPP_SetWindow):
>+        * DumpRenderTree/TestNetscapePlugIn/main.cpp:
>+        (handleEventCarbon):
>+        (handleEventCocoa):
>+        (handleEventWin):
>+        * DumpRenderTree/chromium/TestShell.cpp:
>+        (TestShell::bindJSObjectsToWindow):
>+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
>+        (WebCore::DumpRenderTree::initJSObjects):
>+        * Scripts/bencher:
>+        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
>+        (WTR::LayoutTestController::makeWindowObject):
>+
> 2012-08-03  Yaron Friedman  <yfriedman@chromium.org>
> 
>         [Chrome-Android] - Prepare apk tests for switch to checked in SDK.
>Index: Tools/DumpRenderTree/LayoutTestController.cpp
>===================================================================
>--- Tools/DumpRenderTree/LayoutTestController.cpp	(revision 124683)
>+++ Tools/DumpRenderTree/LayoutTestController.cpp	(working copy)
>@@ -2210,7 +2210,6 @@ static void layoutTestControllerObjectFi
> 
> void LayoutTestController::makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception)
> {
>-    JSRetainPtr<JSStringRef> layoutTestContollerStr(Adopt, JSStringCreateWithUTF8CString("layoutTestController"));
>     JSRetainPtr<JSStringRef> testRunnerStr(Adopt, JSStringCreateWithUTF8CString("testRunner"));
>     ref();
>     ref();
>@@ -2219,7 +2218,6 @@ void LayoutTestController::makeWindowObj
>     JSValueRef layoutTestContollerObject = JSObjectMake(context, classRef, this);
>     JSClassRelease(classRef);
> 
>-    JSObjectSetProperty(context, windowObject, layoutTestContollerStr.get(), layoutTestContollerObject, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, exception);
>     JSObjectSetProperty(context, windowObject, testRunnerStr.get(), layoutTestContollerObject, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, exception);
> }
> 
>Index: Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp
>===================================================================
>--- Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp	(revision 124683)
>+++ Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp	(working copy)
>@@ -892,8 +892,8 @@ void notifyTestCompletion(NPP npp, NPObj
> {
>     NPVariant result;
>     NPString script;
>-    script.UTF8Characters = "javascript:window.layoutTestController.notifyDone();";
>-    script.UTF8Length = strlen("javascript:window.layoutTestController.notifyDone();");
>+    script.UTF8Characters = "javascript:window.testRunner.notifyDone();";
>+    script.UTF8Length = strlen("javascript:window.testRunner.notifyDone();");
>     browser->evaluate(npp, object, &script, &result);
>     browser->releasevariantvalue(&result);
> }
>Index: Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp
>===================================================================
>--- Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp	(revision 124683)
>+++ Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp	(working copy)
>@@ -254,12 +254,12 @@ void PluginTest::log(const char* format,
> 
> void PluginTest::waitUntilDone()
> {
>-    executeScript("layoutTestController.waitUntilDone()");
>+    executeScript("testRunner.waitUntilDone()");
> }
> 
> void PluginTest::notifyDone()
> {
>-    executeScript("layoutTestController.notifyDone()");
>+    executeScript("testRunner.notifyDone()");
> }
> 
> void PluginTest::registerCreateTestFunction(const string& identifier, CreateTestFunction createTestFunction)
>Index: Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp
>===================================================================
>--- Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp	(revision 124683)
>+++ Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp	(working copy)
>@@ -506,7 +506,7 @@ static int16_t handleEventCarbon(NPP ins
>             if (obj->testKeyboardFocusForPlugins) {
>                 obj->eventLogging = false;
>                 obj->testKeyboardFocusForPlugins = FALSE;
>-                executeScript(obj, "layoutTestController.notifyDone();");
>+                executeScript(obj, "testRunner.notifyDone();");
>             }
>             break;
>         case autoKey:
>@@ -599,7 +599,7 @@ static int16_t handleEventCocoa(NPP inst
>                 if (obj->testKeyboardFocusForPlugins) {
>                     obj->eventLogging = false;
>                     obj->testKeyboardFocusForPlugins = FALSE;
>-                    executeScript(obj, "layoutTestController.notifyDone();");
>+                    executeScript(obj, "testRunner.notifyDone();");
>                 }
>             }
>             return 1;
>@@ -723,7 +723,7 @@ static int16_t handleEventWin(NPP instan
>         if (obj->testKeyboardFocusForPlugins) {
>             obj->eventLogging = false;
>             obj->testKeyboardFocusForPlugins = FALSE;
>-            executeScript(obj, "layoutTestController.notifyDone();");
>+            executeScript(obj, "testRunner.notifyDone();");
>         }
>         break;
>     case WM_LBUTTONDOWN:
>Index: Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ConvertPoint.cpp
>===================================================================
>--- Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ConvertPoint.cpp	(revision 124683)
>+++ Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ConvertPoint.cpp	(working copy)
>@@ -74,7 +74,7 @@ private:
>         if (testConvert())
>             executeScript("document.getElementById('result').innerHTML = 'SUCCESS!'");
> 
>-        executeScript("setTimeout(function() { layoutTestController.notifyDone() }, 0)");
>+        executeScript("setTimeout(function() { testRunner.notifyDone() }, 0)");
>         return NPERR_NO_ERROR;
>     }
> };
>Index: Tools/DumpRenderTree/chromium/TestShell.cpp
>===================================================================
>--- Tools/DumpRenderTree/chromium/TestShell.cpp	(revision 124683)
>+++ Tools/DumpRenderTree/chromium/TestShell.cpp	(working copy)
>@@ -726,7 +726,6 @@ void TestShell::bindJSObjectsToWindow(We
> {
>     WebTestingSupport::injectInternalsObject(frame);
>     m_testInterfaces->bindTo(frame);
>-    m_layoutTestController->bindToJavascript(frame, WebString::fromUTF8("layoutTestController"));
>     m_layoutTestController->bindToJavascript(frame, WebString::fromUTF8("testRunner"));
> }
> 
>Index: Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
>===================================================================
>--- Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp	(revision 124683)
>+++ Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp	(working copy)
>@@ -733,7 +733,6 @@ void DumpRenderTree::initJSObjects()
> {
>     QWebFrame *frame = qobject_cast<QWebFrame*>(sender());
>     Q_ASSERT(frame);
>-    frame->addToJavaScriptWindowObject(QLatin1String("layoutTestController"), m_controller);
>     frame->addToJavaScriptWindowObject(QLatin1String("testRunner"), m_controller);
>     frame->addToJavaScriptWindowObject(QLatin1String("eventSender"), m_eventSender);
>     frame->addToJavaScriptWindowObject(QLatin1String("textInputController"), m_textInputController);
>Index: Tools/Scripts/bencher
>===================================================================
>--- Tools/Scripts/bencher	(revision 124683)
>+++ Tools/Scripts/bencher	(working copy)
>@@ -717,9 +717,9 @@ def emitBenchRunCodeFile(name, plan, ben
>     
>     preCode = Benchfile.create("bencher-pre") {
>       | file |
>-      doublePuts($stderr,file,"if (window.layoutTestController) {")
>-      doublePuts($stderr,file,"    layoutTestController.dumpAsText(window.enablePixelTesting);")
>-      doublePuts($stderr,file,"    layoutTestController.waitUntilDone();")
>+      doublePuts($stderr,file,"if (window.testRunner) {")
>+      doublePuts($stderr,file,"    testRunner.dumpAsText(window.enablePixelTesting);")
>+      doublePuts($stderr,file,"    testRunner.waitUntilDone();")
>       doublePuts($stderr,file,"}")
>       doublePuts($stderr,file,"")
>       doublePuts($stderr,file,"function debug(msg)")
>@@ -730,7 +730,7 @@ def emitBenchRunCodeFile(name, plan, ben
>       doublePuts($stderr,file,"}")
>       doublePuts($stderr,file,"")
>       doublePuts($stderr,file,"function quit() {")
>-      doublePuts($stderr,file,"    layoutTestController.notifyDone();")
>+      doublePuts($stderr,file,"    testRunner.notifyDone();")
>       doublePuts($stderr,file,"}")
>       doublePuts($stderr,file,"")
>       doublePuts($stderr,file,"__bencher_continuation=null;")
>Index: Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
>===================================================================
>--- Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp	(revision 124683)
>+++ Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp	(working copy)
>@@ -417,7 +417,6 @@ void LayoutTestController::clearBackForw
> 
> void LayoutTestController::makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception)
> {
>-    setProperty(context, windowObject, "layoutTestController", this, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, exception);
>     setProperty(context, windowObject, "testRunner", this, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, exception);
> }
>

Flags:

abarth: review+
webkit.review.bot: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 93173: 156506 | 156513