summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-16 23:18:40 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-16 23:18:40 +0000
commita003a0a48df4f1f5b266844d157f8875b2a5bf00 (patch)
tree7536b51c90fa59a4e1a75754d8c2558d60b576e1
parent94b0231a016f3136e8675d3532773342239977c3 (diff)
downloadchromium_src-a003a0a48df4f1f5b266844d157f8875b2a5bf00.zip
chromium_src-a003a0a48df4f1f5b266844d157f8875b2a5bf00.tar.gz
chromium_src-a003a0a48df4f1f5b266844d157f8875b2a5bf00.tar.bz2
Restore logging of preference errors.
Sadly, this means we again fail some tests. R=dglazkov BUG=none TEST=none Review URL: http://codereview.chromium.org/206036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26416 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xwebkit/tools/layout_tests/test_expectations.txt4
-rw-r--r--webkit/tools/test_shell/layout_test_controller.cc5
2 files changed, 7 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index b559abf..53bd6cc 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2279,6 +2279,10 @@ BUG21141 LINUX : LayoutTests/fast/forms/select-script-onchange.html = FAIL
// The test is flaky.
BUG_VICTORW : LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-sub-frame-2-level.html = PASS CRASH
+// WebKit 48098:48155
+BUG21267 : LayoutTests/fast/events/click-focus-anchor.html = FAIL
+BUG21267 : LayoutTests/fast/events/tab-focus-anchor.html = FAIL
+
BUG_JAPHET MAC : LayoutTests/animations/change-keyframes-name.html = FAIL PASS
// Flaky as of WebKit r48155
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index 2263377..d6145a4 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -963,7 +963,8 @@ void LayoutTestController::whiteListAccessFromOrigin(
}
void LayoutTestController::LogErrorToConsole(const std::string& text) {
- shell_->webView()->GetMainFrame()->addMessageToConsole(
+ shell_->delegate()->didAddMessageToConsole(
WebConsoleMessage(WebConsoleMessage::LevelError,
- WebString::fromUTF8(text)));
+ WebString::fromUTF8(text)),
+ WebString(), 0);
}