From d0825bca7fe65beaee391d30da42e937db621564 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 2 Feb 2010 14:57:50 +0000
Subject: Merge webkit.org at r54127 : Initial merge by git

Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
---
 WebKit/chromium/src/WebKit.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'WebKit/chromium/src/WebKit.cpp')

diff --git a/WebKit/chromium/src/WebKit.cpp b/WebKit/chromium/src/WebKit.cpp
index a129f85..a8e1851 100644
--- a/WebKit/chromium/src/WebKit.cpp
+++ b/WebKit/chromium/src/WebKit.cpp
@@ -33,6 +33,7 @@
 
 #include "AtomicString.h"
 #include "DOMTimer.h"
+#include "Logging.h"
 #include "Page.h"
 #include "RuntimeEnabledFeatures.h"
 #include "TextEncoding.h"
@@ -94,6 +95,13 @@ bool layoutTestMode()
     return s_layoutTestMode;
 }
 
+void enableLogChannel(const char* name)
+{
+    WTFLogChannel* channel = WebCore::getChannelFromName(name);
+    if (channel)
+        channel->state = WTFLogChannelOn;
+}
+
 void resetPluginCache(bool reloadPages)
 {
     WebCore::Page::refreshPlugins(reloadPages);
-- 
cgit v1.1