[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
pfeldman at chromium.org
pfeldman at chromium.org
Thu Oct 29 20:45:21 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit b306d92b4d5f5ee9fa78ebd854b2b41326039133
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 15 16:16:22 2009 +0000
2009-10-15 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: Enable inspector layout tests.
https://bugs.webkit.org/show_bug.cgi?id=30014
WebCore:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::evaluateForTestInFrontend):
LayoutTests:
* inspector/elements-panel-structure-expected.txt:
* inspector/elements-panel-structure.html:
* inspector/evaluate-in-frontend.js:
(evaluateInWebInspector):
(window.didEvaluateForTestInFrontend):
* platform/mac-leopard/Skipped:
* platform/mac-snowleopard/Skipped:
* platform/mac-tiger/Skipped:
* platform/mac/Skipped:
* platform/win/Skipped:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49629 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d951ef4..75300b2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2009-10-15 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: Enable inspector layout tests.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30014
+
+ * inspector/elements-panel-structure-expected.txt:
+ * inspector/elements-panel-structure.html:
+ * inspector/evaluate-in-frontend.js:
+ (evaluateInWebInspector):
+ (window.didEvaluateForTestInFrontend):
+ * platform/mac-leopard/Skipped:
+ * platform/mac-snowleopard/Skipped:
+ * platform/mac-tiger/Skipped:
+ * platform/mac/Skipped:
+ * platform/win/Skipped:
+
2009-10-15 Xan Lopez <xlopez at igalia.com>
Skip new SVG tests without expected results for GTK+.
diff --git a/LayoutTests/inspector/elements-panel-structure-expected.txt b/LayoutTests/inspector/elements-panel-structure-expected.txt
old mode 100755
new mode 100644
diff --git a/LayoutTests/inspector/elements-panel-structure.html b/LayoutTests/inspector/elements-panel-structure.html
index a54b5fc..040e5c1 100755
--- a/LayoutTests/inspector/elements-panel-structure.html
+++ b/LayoutTests/inspector/elements-panel-structure.html
@@ -8,7 +8,7 @@ function doit()
function callback(result)
{
var output = document.getElementById("output");
- output.textContent = result.replace(/\u200b/g, "").replace(/</g, "\n<");
+ output.textContent = result.replace(/\u200b/g, "").replace(/\n/g, "").replace(/<p>.*<\/body>/g, "").replace(/</g, "\n<");
notifyDone();
}
evaluateInWebInspector("WebInspector.panels.elements.treeOutline.element.textContent", callback);
diff --git a/LayoutTests/inspector/evaluate-in-frontend.js b/LayoutTests/inspector/evaluate-in-frontend.js
index 9c6397e..3522417 100755
--- a/LayoutTests/inspector/evaluate-in-frontend.js
+++ b/LayoutTests/inspector/evaluate-in-frontend.js
@@ -1,44 +1,45 @@
var lastCallId = 0;
var callbacks = {};
-function evaluateInWebInspector(script, callback)
-{
- callbacks[lastCallId] = callback;
- setTimeout(function() {
- if (window.layoutTestController) {
- layoutTestController.evaluateInWebInspector(lastCallId++, script);
- }
- }, 0);
-
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
}
-function showWebInspector()
-{
+// We ignore initial load of the page, enable inspector and initiate reload. This allows inspector controller
+// to capture events that happen during the initial page load.
+var ignoreLoad = window.location.href.indexOf("?reload") === -1;
+if (ignoreLoad) {
setTimeout(function() {
- if (window.layoutTestController) {
- layoutTestController.showWebInspector();
- }
+ layoutTestController.showWebInspector();
+ window.location.href += "?reload";
}, 0);
}
-function closeWebInspector()
+function onload()
{
+ if (ignoreLoad)
+ return;
+ var callId = lastCallId++;
setTimeout(function() {
if (window.layoutTestController) {
- layoutTestController.closeWebInspector();
+ // layoutTestController.showWebInspector();
+ layoutTestController.evaluateInWebInspector(callId, document.getElementById("frontend-script").textContent);
}
+ doit();
}, 0);
}
-function onload()
+function evaluateInWebInspector(script, callback)
{
+ var callId = lastCallId++;
+ callbacks[callId] = callback;
setTimeout(function() {
if (window.layoutTestController) {
- layoutTestController.showWebInspector();
- layoutTestController.evaluateInWebInspector(lastCallId++, document.getElementById("frontend-script").textContent);
+ layoutTestController.evaluateInWebInspector(callId, script);
}
- doit();
}, 0);
+
}
function notifyDone()
@@ -64,8 +65,3 @@ window.didEvaluateForTestInFrontend = function(callId, jsonResult)
delete callbacks[callId];
}
};
-
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
-}
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index 0d87fc7..ae2da71 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -18,9 +18,3 @@ platform/mac/fast/text/thai-combining-mark-positioning.html
# Hardware compositing is disabled for Leopard until <rdar://problem/7189153> can be fixed.
# https://bugs.webkit.org/show_bug.cgi?id=28624
transforms/3d
-
-# Disable inspector tests while fixing them in release mode
-# https://bugs.webkit.org/show_bug.cgi?id=30014
-inspector/console-tests.html
-inspector/elements-panel-structure.html
-inspector/evaluate-in-frontend.html
diff --git a/LayoutTests/platform/mac-snowleopard/Skipped b/LayoutTests/platform/mac-snowleopard/Skipped
index 38dba4d..7403b5b 100644
--- a/LayoutTests/platform/mac-snowleopard/Skipped
+++ b/LayoutTests/platform/mac-snowleopard/Skipped
@@ -44,8 +44,3 @@ media/controls-drag-timebar.html
#<rdar://problem/7144583> - Intermittent failure
svg/css/glyph-orientation-rounding-test.xhtml
-# Disable inspector tests while fixing them in release mode
-# https://bugs.webkit.org/show_bug.cgi?id=30014
-inspector/console-tests.html
-inspector/elements-panel-structure.html
-inspector/evaluate-in-frontend.html
diff --git a/LayoutTests/platform/mac-tiger/Skipped b/LayoutTests/platform/mac-tiger/Skipped
index 18eb7a8..1bd43cd 100644
--- a/LayoutTests/platform/mac-tiger/Skipped
+++ b/LayoutTests/platform/mac-tiger/Skipped
@@ -60,9 +60,3 @@ http/tests/loading/basic-auth-resend-wrong-credentials.html
# See <rdar://problem/5081884> and https://bugs.webkit.org/show_bug.cgi?id=29329
http/tests/loading/redirect-with-no-location-crash.html
-
-# Disable inspector tests while fixing them in release mode
-# https://bugs.webkit.org/show_bug.cgi?id=30014
-inspector/console-tests.html
-inspector/elements-panel-structure.html
-inspector/evaluate-in-frontend.html
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 7417a6b..1ed01d4 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -111,9 +111,3 @@ fast/loader/frames-with-unload-handlers-in-page-cache.html
# This port doesn't support detecting slow unload handlers.
fast/dom/Window/slow_unload_handler.html
-
-# Disable inspector tests while fixing them in release mode
-# https://bugs.webkit.org/show_bug.cgi?id=30014
-inspector/console-tests.html
-inspector/elements-panel-structure.html
-inspector/evaluate-in-frontend.html
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 4e87fa1..4e971d8 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -686,9 +686,3 @@ plugins/private-browsing-mode.html
# Skip these two failures I introduced this morning while I explore them.
http/tests/globalhistory/history-delegate-basic-visited-links.html
-# Disable inspector tests while fixing them in release mode
-# https://bugs.webkit.org/show_bug.cgi?id=30014
-inspector/console-tests.html
-inspector/elements-panel-structure.html
-inspector/evaluate-in-frontend.html
-
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f842a0d..308ff1c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-15 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: Enable inspector layout tests.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30014
+
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::evaluateForTestInFrontend):
+
2009-10-15 Philippe Normand <pnormand at igalia.com>
Reviewed by Gustavo Noronha.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 1ad170e..a5b8cbf 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -1580,7 +1580,7 @@ void InspectorController::didContinue()
void InspectorController::evaluateForTestInFrontend(long callId, const String& script)
{
- if (windowVisible())
+ if (m_frontend)
m_frontend->evaluateForTestInFrontend(callId, script);
else
m_pendingEvaluateTestCommands.append(pair<long, String>(callId, script));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list