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

Unified Diff: ui/compositor/compositor.cc

Issue 10827267: Remove unused include and always-true compile-time check (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 4 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 | « content/renderer/render_thread_impl.cc ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index deef359ae6bca44809d0dc62c61413f50425e9ca..6c7db485665139e1336b9c6717aedb5ab488dd32 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -149,13 +149,6 @@ Compositor::Compositor(CompositorDelegate* delegate,
settings.refreshRate =
test_compositor_enabled ? kTestRefreshRate : kDefaultRefreshRate;
-#if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
- settings.partialSwapEnabled =
- command_line->HasSwitch(switches::kUIEnablePartialSwap);
- settings.perTilePainting =
- command_line->HasSwitch(switches::kUIEnablePerTilePainting);
-#endif
-
host_.initialize(this, root_web_layer_, settings);
host_.setSurfaceReady();
root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
@@ -180,14 +173,12 @@ Compositor::~Compositor() {
}
void Compositor::Initialize(bool use_thread) {
-#if defined(WEBCOMPOSITOR_OWNS_SETTINGS)
CommandLine* command_line = CommandLine::ForCurrentProcess();
// These settings must be applied before we initialize the compositor.
WebKit::WebCompositor::setPartialSwapEnabled(
command_line->HasSwitch(switches::kUIEnablePartialSwap));
WebKit::WebCompositor::setPerTilePaintingEnabled(
command_line->HasSwitch(switches::kUIEnablePerTilePainting));
-#endif
if (use_thread)
g_compositor_thread = new webkit_glue::WebThreadImpl("Browser Compositor");
WebKit::WebCompositor::initialize(g_compositor_thread);
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698