Title: [164966] trunk
- Revision
- 164966
- Author
- [email protected]
- Date
- 2014-03-02 19:42:43 -0800 (Sun, 02 Mar 2014)
Log Message
Web Inspector model tests load wrong inspector page under WebKitTestRunner
https://bugs.webkit.org/show_bug.cgi?id=129460
Reviewed by Dan Bernstein.
Tools:
Don't unconditionally open the inspector before running an inspector test.
Instead, the test should request that the inspector open when it's ready.
This change was lost during a rebase, but is the same change made to
DumpRenderTree.
* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::invoke):
LayoutTests:
Stop skipping inspector/test-harness-trivially-works.html.
* platform/wk2/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (164965 => 164966)
--- trunk/LayoutTests/ChangeLog 2014-03-03 03:24:58 UTC (rev 164965)
+++ trunk/LayoutTests/ChangeLog 2014-03-03 03:42:43 UTC (rev 164966)
@@ -1,3 +1,14 @@
+2014-03-02 Brian Burg <[email protected]>
+
+ Web Inspector model tests load wrong inspector page under WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=129460
+
+ Reviewed by Dan Bernstein.
+
+ Stop skipping inspector/test-harness-trivially-works.html.
+
+ * platform/wk2/TestExpectations:
+
2014-03-02 Dean Jackson <[email protected]>
Add protected casting to FilterOperation classes.
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (164965 => 164966)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2014-03-03 03:24:58 UTC (rev 164965)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2014-03-03 03:42:43 UTC (rev 164966)
@@ -243,9 +243,6 @@
webkit.org/b/127683 http/tests/navigation/new-window-redirect-history.html [ Crash ]
-# Apparent fallout from http://trac.webkit.org/changeset/164830
-webkit.org/b/129460 inspector/test-harness-trivially-works.html [ Skip ]
-
### END OF (1) Classified failures with bug reports
########################################
Modified: trunk/Tools/ChangeLog (164965 => 164966)
--- trunk/Tools/ChangeLog 2014-03-03 03:24:58 UTC (rev 164965)
+++ trunk/Tools/ChangeLog 2014-03-03 03:42:43 UTC (rev 164966)
@@ -1,3 +1,19 @@
+2014-03-02 Brian Burg <[email protected]>
+
+ Web Inspector model tests load wrong inspector page under WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=129460
+
+ Reviewed by Dan Bernstein.
+
+ Don't unconditionally open the inspector before running an inspector test.
+ Instead, the test should request that the inspector open when it's ready.
+
+ This change was lost during a rebase, but is the same change made to
+ DumpRenderTree.
+
+ * WebKitTestRunner/TestInvocation.cpp:
+ (WTR::TestInvocation::invoke):
+
2014-03-02 Darin Adler <[email protected]>
Split TextIteratorBehavior into a separate header
Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (164965 => 164966)
--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2014-03-03 03:24:58 UTC (rev 164965)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2014-03-03 03:42:43 UTC (rev 164966)
@@ -139,13 +139,6 @@
return strstr(pathOrURL, "loading/");
}
-#if ENABLE(INSPECTOR) && !PLATFORM(IOS)
-static bool shouldOpenWebInspector(const char* pathOrURL)
-{
- return strstr(pathOrURL, "inspector/") || strstr(pathOrURL, "inspector\\");
-}
-#endif
-
#if PLATFORM(COCOA)
static bool shouldUseThreadedScrolling(const char* pathOrURL)
{
@@ -237,11 +230,6 @@
if (m_error)
goto end;
-#if ENABLE(INSPECTOR) && !PLATFORM(IOS)
- if (shouldOpenWebInspector(m_pathOrURL.c_str()))
- WKInspectorShow(WKPageGetInspector(TestController::shared().mainWebView()->page()));
-#endif // ENABLE(INSPECTOR)
-
WKPageLoadURL(TestController::shared().mainWebView()->page(), m_url.get());
if (TestController::shared().useWaitToDumpWatchdogTimer()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
