- Revision
- 123695
- Author
- aba...@webkit.org
- Date
- 2012-07-25 19:19:09 -0700 (Wed, 25 Jul 2012)
Log Message
TestRunner.a should contain a TestRunner object
https://bugs.webkit.org/show_bug.cgi?id=92313
Reviewed by Kent Tamura.
This patch adds a stub implementation of TestRunner, which is the new
home for our implementation of window.testRunner. A future patch will
migrate functions from LayoutTestController to TestRunner.
* DumpRenderTree/DumpRenderTree.gypi:
* DumpRenderTree/chromium/LayoutTestController.h:
* DumpRenderTree/chromium/TestRunner/TestRunner.cpp: Added.
* DumpRenderTree/chromium/TestRunner/TestRunner.h: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (123694 => 123695)
--- trunk/Tools/ChangeLog 2012-07-26 02:16:56 UTC (rev 123694)
+++ trunk/Tools/ChangeLog 2012-07-26 02:19:09 UTC (rev 123695)
@@ -1,3 +1,19 @@
+2012-07-25 Adam Barth <aba...@webkit.org>
+
+ TestRunner.a should contain a TestRunner object
+ https://bugs.webkit.org/show_bug.cgi?id=92313
+
+ Reviewed by Kent Tamura.
+
+ This patch adds a stub implementation of TestRunner, which is the new
+ home for our implementation of window.testRunner. A future patch will
+ migrate functions from LayoutTestController to TestRunner.
+
+ * DumpRenderTree/DumpRenderTree.gypi:
+ * DumpRenderTree/chromium/LayoutTestController.h:
+ * DumpRenderTree/chromium/TestRunner/TestRunner.cpp: Added.
+ * DumpRenderTree/chromium/TestRunner/TestRunner.h: Added.
+
2012-07-25 Wei James <james....@intel.com>
[Chromium] Fix infinite loop issue for chromium android layout test
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gypi (123694 => 123695)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gypi 2012-07-26 02:16:56 UTC (rev 123694)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gypi 2012-07-26 02:19:09 UTC (rev 123695)
@@ -72,6 +72,8 @@
'chromium/TestRunner/TestInterfaces.h',
'chromium/TestRunner/TextInputController.cpp',
'chromium/TestRunner/TextInputController.h',
+ 'chromium/TestRunner/TestRunner.cpp',
+ 'chromium/TestRunner/TestRunner.h',
],
'test_plugin_files': [
'TestNetscapePlugIn/PluginObject.cpp',
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h (123694 => 123695)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h 2012-07-26 02:16:56 UTC (rev 123694)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h 2012-07-26 02:19:09 UTC (rev 123695)
@@ -41,27 +41,11 @@
#ifndef LayoutTestController_h
#define LayoutTestController_h
-#include "CppBoundClass.h"
-#include "Task.h"
-#include "WebDeliveredIntentClient.h"
-#include "platform/WebArrayBufferView.h"
-#include "platform/WebString.h"
-#include "WebTextDirection.h"
-#include "platform/WebURL.h"
-#include <wtf/Deque.h>
-#include <wtf/OwnPtr.h>
+#include "TestRunner.h"
-namespace WebKit {
-class WebGeolocationClientMock;
-}
-
-namespace webkit_support {
-class ScopedTempDirectory;
-}
-
class TestShell;
-class LayoutTestController : public CppBoundClass {
+class LayoutTestController : public TestRunner {
public:
// Builds the property and method lists needed to bind this class to a JS
// object.
Added: trunk/Tools/DumpRenderTree/chromium/TestRunner/TestRunner.cpp (0 => 123695)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/TestRunner.cpp (rev 0)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/TestRunner.cpp 2012-07-26 02:19:09 UTC (rev 123695)
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2010 Pawel Hajdan (phajdan...@chromium.org)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "TestRunner.h"
+
+#include "WebAnimationController.h"
+#include "WebBindings.h"
+#include "WebConsoleMessage.h"
+#include "WebDeviceOrientation.h"
+#include "WebDeviceOrientationClientMock.h"
+#include "WebDocument.h"
+#include "WebElement.h"
+#include "WebFindOptions.h"
+#include "WebFrame.h"
+#include "WebGeolocationClientMock.h"
+#include "WebIDBFactory.h"
+#include "WebInputElement.h"
+#include "WebIntent.h"
+#include "WebIntentRequest.h"
+#include "WebKit.h"
+#include "WebNotificationPresenter.h"
+#include "WebPrintParams.h"
+#include "WebScriptSource.h"
+#include "WebSecurityPolicy.h"
+#include "WebSettings.h"
+#include "WebSurroundingText.h"
+#include "WebView.h"
+#include "WebWorkerInfo.h"
+#include "platform/WebData.h"
+#include "platform/WebSerializedScriptValue.h"
+#include "platform/WebSize.h"
+#include "platform/WebURL.h"
+#include "v8/include/v8.h"
+#include "webkit/support/webkit_support.h"
+#include <algorithm>
+#include <cctype>
+#include <clocale>
+#include <cstdlib>
+#include <limits>
+#include <sstream>
+#include <wtf/OwnArrayPtr.h>
+#include <wtf/text/WTFString.h>
+
+#if OS(LINUX) || OS(ANDROID)
+#include "linux/WebFontRendering.h"
+#endif
+
+using namespace WebCore;
+using namespace WebKit;
+using namespace std;
+
+TestRunner::TestRunner()
+{
+}
Added: trunk/Tools/DumpRenderTree/chromium/TestRunner/TestRunner.h (0 => 123695)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/TestRunner.h (rev 0)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/TestRunner.h 2012-07-26 02:19:09 UTC (rev 123695)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2010 Pawel Hajdan (phajdan...@chromium.org)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef TestRunner_h
+#define TestRunner_h
+
+#include "CppBoundClass.h"
+#include "Task.h"
+#include "WebDeliveredIntentClient.h"
+#include "WebTextDirection.h"
+#include "platform/WebArrayBufferView.h"
+#include "platform/WebString.h"
+#include "platform/WebURL.h"
+#include <wtf/Deque.h>
+#include <wtf/OwnPtr.h>
+
+namespace WebKit {
+class WebGeolocationClientMock;
+}
+
+namespace webkit_support {
+class ScopedTempDirectory;
+}
+
+class TestRunner : public CppBoundClass {
+public:
+ TestRunner();
+};
+
+#endif // TestRunner_h
