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

Unified Diff: content/renderer/render_thread_impl.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/common/view_messages.h ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 93ce9fb58dc8125e3ca5c091fab3de9adb2db186..a40b54f391c4fd115fe6fd65ff2a45896dc44edf 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -74,8 +74,9 @@
#include "media/base/media.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositor.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
@@ -86,7 +87,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "ui/base/layout.h"
#include "ui/base/ui_base_switches.h"
#include "v8/include/v8.h"
@@ -255,14 +255,12 @@ void RenderThreadImpl::Init() {
if (command_line.HasSwitch(switches::kEnableGpuBenchmarking))
RegisterExtension(content::GpuBenchmarkingExtension::Get());
-#if defined(WEBCOMPOSITOR_OWNS_SETTINGS)
WebKit::WebCompositor::setAcceleratedAnimationEnabled(
!command_line.HasSwitch(switches::kDisableThreadedAnimation));
WebKit::WebCompositor::setPerTilePaintingEnabled(
command_line.HasSwitch(switches::kEnablePerTilePainting));
WebKit::WebCompositor::setPartialSwapEnabled(
command_line.HasSwitch(switches::kEnablePartialSwap));
-#endif
// Note that under Linux, the media library will normally already have
// been initialized by the Zygote before this instance became a Renderer.
« no previous file with comments | « content/common/view_messages.h ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698