Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Unified Diff: ui/gfx/compositor/test/compositor_test_support.cc

Issue 9288053: Remove old (pre-webkit) compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/compositor/layer_unittest.cc ('k') | ui/gfx/compositor/test/test_compositor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/test/compositor_test_support.cc
diff --git a/ui/gfx/compositor/test/compositor_test_support.cc b/ui/gfx/compositor/test/compositor_test_support.cc
index 20b0f49c2f8f8b44544386e0145ba4c9560d5fb4..1e9b083df27f269b771d0ff55b0a840901753089 100644
--- a/ui/gfx/compositor/test/compositor_test_support.cc
+++ b/ui/gfx/compositor/test/compositor_test_support.cc
@@ -4,15 +4,12 @@
#include "ui/gfx/compositor/test/compositor_test_support.h"
-#if defined(USE_WEBKIT_COMPOSITOR)
#include "base/compiler_specific.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
#include "webkit/glue/webkitplatformsupport_impl.h"
-#endif
namespace ui {
-#if defined(USE_WEBKIT_COMPOSITOR)
class CompositorTestPlatformSupport:
public NON_EXPORTED_BASE(webkit_glue::WebKitPlatformSupportImpl) {
public:
@@ -44,23 +41,18 @@ class CompositorTestPlatformSupport:
};
static CompositorTestPlatformSupport* g_webkit_support;
-#endif
void CompositorTestSupport::Initialize() {
-#if defined(USE_WEBKIT_COMPOSITOR)
DCHECK(!g_webkit_support);
g_webkit_support = new CompositorTestPlatformSupport;
WebKit::initialize(g_webkit_support);
-#endif
}
void CompositorTestSupport::Terminate() {
-#if defined(USE_WEBKIT_COMPOSITOR)
DCHECK(g_webkit_support);
WebKit::shutdown();
delete g_webkit_support;
g_webkit_support = NULL;
-#endif
}
} // namespace ui
« no previous file with comments | « ui/gfx/compositor/layer_unittest.cc ('k') | ui/gfx/compositor/test/test_compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698