diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 00:53:26 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 00:53:26 +0000 |
| commit | 707c7bb5c5f6450a53b9825fccded29266ce29d0 (patch) | |
| tree | 0087dac187400c446f758d3e0a334f70ca26af68 /content/shell | |
| parent | 12166997824568f2186d8d5576f983b4593ff8f6 (diff) | |
| download | chromium_src-707c7bb5c5f6450a53b9825fccded29266ce29d0.zip chromium_src-707c7bb5c5f6450a53b9825fccded29266ce29d0.tar.gz chromium_src-707c7bb5c5f6450a53b9825fccded29266ce29d0.tar.bz2 | |
[content shell] remove the WebCoreTestingSupport dependency
I'll add the WebTestingSupport stuff back, once it's properly build on the webkit side
BUG=none
Review URL: https://codereview.chromium.org/11194070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/config.h | 29 | ||||
| -rw-r--r-- | content/shell/webkit_test_runner.cc | 6 |
2 files changed, 6 insertions, 29 deletions
diff --git a/content/shell/config.h b/content/shell/config.h deleted file mode 100644 index cf472af..0000000 --- a/content/shell/config.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CONTENT_SHELL_CONFIG_H_ -#define CONTENT_SHELL_CONFIG_H_ - -// Required to build WebTestingSupport. - -// To avoid confict of LOG in wtf/Assertions.h and LOG in base/logging.h, -// skip base/logging.h by defining BASE_LOGGING_H_ and define some macros -// provided by base/logging.h. -// FIXME: Remove this hack! -#include <ostream> -#define BASE_LOGGING_H_ -#define CHECK(condition) while (false && (condition)) std::cerr -#define DCHECK(condition) while (false && (condition)) std::cerr -#define DCHECK_EQ(a, b) while (false && (a) == (b)) std::cerr -#define DCHECK_NE(a, b) while (false && (a) != (b)) std::cerr - -#include <wtf/Platform.h> -#include <wtf/ExportMacros.h> - -#if OS(WINDOWS) && !COMPILER(GCC) -// Allow 'this' to be used in base member initializer list. -#pragma warning(disable : 4355) -#endif - -#endif // CONTENT_SHELL_CONFIG_H_ diff --git a/content/shell/webkit_test_runner.cc b/content/shell/webkit_test_runner.cc index 5b07f41..c813edd 100644 --- a/content/shell/webkit_test_runner.cc +++ b/content/shell/webkit_test_runner.cc @@ -18,7 +18,9 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#ifdef WEBKIT_TESTING_SUPPORT_AVAILABLE #include "third_party/WebKit/Source/WebKit/chromium/public/WebTestingSupport.h" +#endif #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" @@ -26,7 +28,9 @@ using WebKit::WebFrame; using WebKit::WebElement; using WebKit::WebRect; using WebKit::WebSize; +#ifdef WEBKIT_TESTING_SUPPORT_AVAILABLE using WebKit::WebTestingSupport; +#endif using WebKit::WebView; namespace content { @@ -131,7 +135,9 @@ WebKitTestRunner::~WebKitTestRunner() { } void WebKitTestRunner::DidClearWindowObject(WebFrame* frame) { +#ifdef WEBKIT_TESTING_SUPPORT_AVAILABLE WebTestingSupport::injectInternalsObject(frame); +#endif } void WebKitTestRunner::DidFinishLoad(WebFrame* frame) { |