diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
commit | 08d4a74d56ca431877819fc4566e27eafe150342 (patch) | |
tree | ebd8530838ab390c015c6b7e659a22852c1663ae /Source/WebKit/chromium/src/WebKit.cpp | |
parent | 1de6cd4794bbd5a52189384189a2b8df1848b39b (diff) | |
download | qtwebkit-08d4a74d56ca431877819fc4566e27eafe150342.tar.gz |
Imported WebKit commit 0fbd41c4e13f5a190faf160bf993eee614e6e18e (http://svn.webkit.org/repository/webkit/trunk@123477)
New snapshot that adapts to latest Qt API changes
Diffstat (limited to 'Source/WebKit/chromium/src/WebKit.cpp')
-rw-r--r-- | Source/WebKit/chromium/src/WebKit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/chromium/src/WebKit.cpp b/Source/WebKit/chromium/src/WebKit.cpp index e41ce228d..a3f0f8391 100644 --- a/Source/WebKit/chromium/src/WebKit.cpp +++ b/Source/WebKit/chromium/src/WebKit.cpp @@ -31,6 +31,7 @@ #include "config.h" #include "WebKit.h" +#include "LayoutTestSupport.h" #include "Logging.h" #include "MutationObserver.h" #include "Page.h" @@ -81,7 +82,6 @@ static WebThread::TaskObserver* s_endOfTaskRunner = 0; static bool s_webKitInitialized = false; static WebKitPlatformSupport* s_webKitPlatformSupport = 0; -static bool s_layoutTestMode = false; static bool generateEntropy(unsigned char* buffer, size_t length) { @@ -176,12 +176,12 @@ WebKitPlatformSupport* webKitPlatformSupport() void setLayoutTestMode(bool value) { - s_layoutTestMode = value; + WebCore::setIsRunningLayoutTest(value); } bool layoutTestMode() { - return s_layoutTestMode; + return WebCore::isRunningLayoutTest(); } void enableLogChannel(const char* name) |