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

Side by Side Diff: ui/gfx/compositor/compositor.cc

Issue 9813017: aura: Enable use_canvas_skia=1 on aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comment in common.gypi. Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/common.gypi ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/compositor/compositor.h" 5 #include "ui/gfx/compositor/compositor.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/threading/thread_restrictions.h" 8 #include "base/threading/thread_restrictions.h"
9 #include "third_party/skia/include/images/SkImageEncoder.h" 9 #include "third_party/skia/include/images/SkImageEncoder.h"
10 #include "third_party/skia/include/core/SkBitmap.h" 10 #include "third_party/skia/include/core/SkBitmap.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 WebKit::WebLayerTreeView::Settings settings; 116 WebKit::WebLayerTreeView::Settings settings;
117 CommandLine* command_line = CommandLine::ForCurrentProcess(); 117 CommandLine* command_line = CommandLine::ForCurrentProcess();
118 settings.showFPSCounter = 118 settings.showFPSCounter =
119 command_line->HasSwitch(switches::kUIShowFPSCounter); 119 command_line->HasSwitch(switches::kUIShowFPSCounter);
120 settings.showPlatformLayerTree = 120 settings.showPlatformLayerTree =
121 command_line->HasSwitch(switches::kUIShowLayerTree); 121 command_line->HasSwitch(switches::kUIShowLayerTree);
122 settings.refreshRate = test_compositor_enabled ? 122 settings.refreshRate = test_compositor_enabled ?
123 kTestRefreshRate : kDefaultRefreshRate; 123 kTestRefreshRate : kDefaultRefreshRate;
124 settings.partialSwapEnabled = 124 settings.partialSwapEnabled =
125 command_line->HasSwitch(switches::kUIEnablePartialSwap); 125 command_line->HasSwitch(switches::kUIEnablePartialSwap);
126 #if defined(PER_TILE_PAINTING)
127 settings.perTilePainting = 126 settings.perTilePainting =
128 command_line->HasSwitch(switches::kUIEnablePerTilePainting); 127 command_line->HasSwitch(switches::kUIEnablePerTilePainting);
129 #endif
130 128
131 #if defined(WEBLAYERTREEVIEW_HAS_INITIALIZE) 129 #if defined(WEBLAYERTREEVIEW_HAS_INITIALIZE)
132 host_.initialize(this, root_web_layer_, settings); 130 host_.initialize(this, root_web_layer_, settings);
133 #else 131 #else
134 host_ = WebKit::WebLayerTreeView::create(this, root_web_layer_, settings); 132 host_ = WebKit::WebLayerTreeView::create(this, root_web_layer_, settings);
135 #endif 133 #endif
136 root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f)); 134 root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
137 WidgetSizeChanged(size_); 135 WidgetSizeChanged(size_);
138 } 136 }
139 137
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 332
335 COMPOSITOR_EXPORT void DisableTestCompositor() { 333 COMPOSITOR_EXPORT void DisableTestCompositor() {
336 test_compositor_enabled = false; 334 test_compositor_enabled = false;
337 } 335 }
338 336
339 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() { 337 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
340 return test_compositor_enabled; 338 return test_compositor_enabled;
341 } 339 }
342 340
343 } // namespace ui 341 } // namespace ui
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698