Attachment 145512 Details for Bug 88210 – Patch

[patch] Patch

bug-88210-20120603211218.patch (text/plain), 5.78 KB, created by Ryosuke Niwa on 2012-06-03 21:08:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ryosuke Niwa

Created: 2012-06-03 21:08:42 PDT

Size: 5.78 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 119368)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2012-06-03  Ryosuke Niwa  <rniwa@webkit.org>
>+
>+        Expose layoutTestController as testRunner
>+        https://bugs.webkit.org/show_bug.cgi?id=88210
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DumpRenderTree/LayoutTestController.cpp:
>+        (LayoutTestController::makeWindowObject):
>+        * DumpRenderTree/chromium/TestShell.cpp:
>+        (TestShell::bindJSObjectsToWindow):
>+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
>+        (WebCore::DumpRenderTree::initJSObjects):
>+
> 2012-06-03  Varun Jain  <varunjain@google.com>
> 
>         [chromium] Add new gesture type (two finger tap) that triggers context menu.
>Index: Tools/DumpRenderTree/LayoutTestController.cpp
>===================================================================
>--- Tools/DumpRenderTree/LayoutTestController.cpp	(revision 119364)
>+++ Tools/DumpRenderTree/LayoutTestController.cpp	(working copy)
>@@ -2244,6 +2244,8 @@ 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();
> 
>     JSClassRef classRef = getJSClass();
>@@ -2251,6 +2253,7 @@ void LayoutTestController::makeWindowObj
>     JSClassRelease(classRef);
> 
>     JSObjectSetProperty(context, windowObject, layoutTestContollerStr.get(), layoutTestContollerObject, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, exception);
>+    JSObjectSetProperty(context, windowObject, testRunnerStr.get(), layoutTestContollerObject, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, exception);
> }
> 
> JSClassRef LayoutTestController::getJSClass()
>Index: Tools/DumpRenderTree/chromium/TestShell.cpp
>===================================================================
>--- Tools/DumpRenderTree/chromium/TestShell.cpp	(revision 119364)
>+++ Tools/DumpRenderTree/chromium/TestShell.cpp	(working copy)
>@@ -726,6 +726,7 @@ void TestShell::bindJSObjectsToWindow(We
>     m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("accessibilityController"));
>     m_gamepadController->bindToJavascript(frame, WebString::fromUTF8("gamepadController"));
>     m_layoutTestController->bindToJavascript(frame, WebString::fromUTF8("layoutTestController"));
>+    m_layoutTestController->bindToJavascript(frame, WebString::fromUTF8("testRunner"));
>     m_eventSender->bindToJavascript(frame, WebString::fromUTF8("eventSender"));
>     m_textInputController->bindToJavascript(frame, WebString::fromUTF8("textInputController"));
> }
>Index: Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
>===================================================================
>--- Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp	(revision 119364)
>+++ Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp	(working copy)
>@@ -743,6 +743,7 @@ 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);
>     frame->addToJavaScriptWindowObject(QLatin1String("GCController"), m_gcController);
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 119368)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2012-06-03  Ryosuke Niwa  <rniwa@webkit.org>
>+
>+        Expose layoutTestController as testRunner
>+        https://bugs.webkit.org/show_bug.cgi?id=88210
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add a test for testRunner object.
>+
>+        * fast/harness/testrunner-object-expected.txt: Added.
>+        * fast/harness/testrunner-object.html: Added.
>+
> 2012-06-03  Hayato Ito  <hayato@chromium.org>
> 
>         Supports traversing nodes in an orphaned shadow subtree in ComposedShadowTreeParentWalker.
>Index: LayoutTests/fast/harness/testrunner-object-expected.txt
>===================================================================
>--- LayoutTests/fast/harness/testrunner-object-expected.txt	(revision 0)
>+++ LayoutTests/fast/harness/testrunner-object-expected.txt	(revision 0)
>@@ -0,0 +1,3 @@
>+PASS - window.testRunner exists
>+Done
>+
>Index: LayoutTests/fast/harness/testrunner-object.html
>===================================================================
>--- LayoutTests/fast/harness/testrunner-object.html	(revision 0)
>+++ LayoutTests/fast/harness/testrunner-object.html	(revision 0)
>@@ -0,0 +1,28 @@
>+<!DOCTYPE html>
>+<html>
>+<body>
>+<pre><script>
>+
>+if (window.layoutTestController)
>+    layoutTestController.dumpAsText();
>+
>+if (window.testRunner)
>+    testRunner.dumpAsText();
>+
>+document.writeln(window.testRunner ? "PASS - window.testRunner exists" : "FAIL - window.testRunner doesn't");
>+if (window.layoutTestController) {
>+    for (var property in window.testRunner) {
>+        if (!(property in window.layoutTestController))
>+            document.write("Property " + property + " exists on testRunner but doesn't exist on layoutTestController");
>+    }
>+    for (var property in window.layoutTestController) {
>+        if (!(property in window.testRunner))
>+            document.write("Property " + property + " exists on layoutTestController but doesn't exist on testRunner");
>+    }
>+}
>+
>+document.writeln('Done');
>+
>+</script></pre>
>+</body>
>+</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 88210: 145512 | 145529