summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/glue/webkit_glue.cc4
-rw-r--r--webkit/glue/webkit_glue.h3
-rw-r--r--webkit/tools/test_shell/test_shell.cc6
3 files changed, 13 insertions, 0 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 335c3b0..9b24362 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -81,6 +81,10 @@ bool IsLayoutTestMode() {
return layout_test_mode_;
}
+void EnableWebCoreNotImplementedLogging() {
+ WebCore::LogNotYetImplemented.state = WTFLogChannelOn;
+}
+
#if defined(OS_WIN)
IMLangFontLink2* GetLangFontLinkHelper() {
// TODO(hbono): http://b/1072298 Experimentally disabled this code to
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 6c685a8..a22df67 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -67,6 +67,9 @@ void SetShouldExposeGCController(bool enable);
void SetLayoutTestMode(bool enable);
bool IsLayoutTestMode();
+// Turn on the logging for notImplemented() calls from WebCore.
+void EnableWebCoreNotImplementedLogging();
+
#if defined(OS_WIN)
// Returns the com object pointer for the FontLink interface. This is the
// default way to do this operation. It can be called directly from
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 551d14c..559ab3f 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -216,6 +216,12 @@ void TestShell::InitLogging(bool suppress_error_dialogs,
// we want process and thread IDs because we may have multiple processes
logging::SetLogItems(true, true, false, true);
+
+ // Turn on logging of notImplemented()s inside WebKit, but only if we're
+ // not running layout tests (because otherwise they'd corrupt the test
+ // output).
+ if (!running_layout_tests)
+ webkit_glue::EnableWebCoreNotImplementedLogging();
}
// static