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

Side by Side Diff: webkit/compositor_bindings/web_compositor_support_impl.cc

Issue 11361223: cc: Remove cc::settings, move them to LayerTreeSettings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-unittests Created 8 years, 1 month 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
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 "webkit/compositor_bindings/web_compositor_support_impl.h" 5 #include "webkit/compositor_bindings/web_compositor_support_impl.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop_proxy.h" 9 #include "base/message_loop_proxy.h"
10 #include "cc/settings.h"
11 #include "cc/thread_impl.h" 10 #include "cc/thread_impl.h"
12 #include "webkit/compositor_bindings/web_animation_impl.h" 11 #include "webkit/compositor_bindings/web_animation_impl.h"
13 #include "webkit/compositor_bindings/web_content_layer_impl.h" 12 #include "webkit/compositor_bindings/web_content_layer_impl.h"
14 #include "webkit/compositor_bindings/web_delegated_renderer_layer_impl.h" 13 #include "webkit/compositor_bindings/web_delegated_renderer_layer_impl.h"
15 #include "webkit/compositor_bindings/web_external_texture_layer_impl.h" 14 #include "webkit/compositor_bindings/web_external_texture_layer_impl.h"
16 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h" 15 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h"
17 #include "webkit/compositor_bindings/web_image_layer_impl.h" 16 #include "webkit/compositor_bindings/web_image_layer_impl.h"
18 #include "webkit/compositor_bindings/web_io_surface_layer_impl.h" 17 #include "webkit/compositor_bindings/web_io_surface_layer_impl.h"
19 #include "webkit/compositor_bindings/web_layer_impl.h" 18 #include "webkit/compositor_bindings/web_layer_impl.h"
20 #include "webkit/compositor_bindings/web_layer_tree_view_impl.h" 19 #include "webkit/compositor_bindings/web_layer_tree_view_impl.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 return impl_thread_message_loop_proxy_; 72 return impl_thread_message_loop_proxy_;
74 } 73 }
75 74
76 void WebCompositorSupportImpl::shutdown() { 75 void WebCompositorSupportImpl::shutdown() {
77 DCHECK(initialized_); 76 DCHECK(initialized_);
78 initialized_ = false; 77 initialized_ = false;
79 impl_thread_message_loop_proxy_ = NULL; 78 impl_thread_message_loop_proxy_ = NULL;
80 } 79 }
81 80
82 void WebCompositorSupportImpl::setPerTilePaintingEnabled(bool enabled) { 81 void WebCompositorSupportImpl::setPerTilePaintingEnabled(bool enabled) {
83 cc::Settings::setPerTilePaintingEnabled(enabled); 82 NOTREACHED();
84 } 83 }
85 84
86 void WebCompositorSupportImpl::setPartialSwapEnabled(bool enabled) { 85 void WebCompositorSupportImpl::setPartialSwapEnabled(bool enabled) {
87 cc::Settings::setPartialSwapEnabled(enabled); 86 NOTREACHED();
88 } 87 }
89 88
90 void WebCompositorSupportImpl::setAcceleratedAnimationEnabled(bool enabled) { 89 void WebCompositorSupportImpl::setAcceleratedAnimationEnabled(bool enabled) {
91 cc::Settings::setAcceleratedAnimationEnabled(enabled); 90 NOTREACHED();
92 } 91 }
93 92
94 void WebCompositorSupportImpl::setPageScalePinchZoomEnabled(bool enabled) { 93 void WebCompositorSupportImpl::setPageScalePinchZoomEnabled(bool enabled) {
95 cc::Settings::setPageScalePinchZoomEnabled(enabled); 94 NOTREACHED();
96 } 95 }
97 96
98 WebLayerTreeView* WebCompositorSupportImpl::createLayerTreeView( 97 WebLayerTreeView* WebCompositorSupportImpl::createLayerTreeView(
99 WebLayerTreeViewClient* client, const WebLayer& root, 98 WebLayerTreeViewClient* client, const WebLayer& root,
100 const WebLayerTreeView::Settings& settings) { 99 const WebLayerTreeView::Settings& settings) {
101 DCHECK(initialized_); 100 DCHECK(initialized_);
102 scoped_ptr<WebKit::WebLayerTreeViewImpl> layerTreeViewImpl( 101 scoped_ptr<WebKit::WebLayerTreeViewImpl> layerTreeViewImpl(
103 new WebKit::WebLayerTreeViewImpl(client)); 102 new WebKit::WebLayerTreeViewImpl(client));
104 scoped_ptr<cc::Thread> impl_thread; 103 scoped_ptr<cc::Thread> impl_thread;
105 if (impl_thread_message_loop_proxy_) 104 if (impl_thread_message_loop_proxy_)
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { 164 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() {
166 return new WebKit::WebFloatAnimationCurveImpl(); 165 return new WebKit::WebFloatAnimationCurveImpl();
167 } 166 }
168 167
169 WebTransformAnimationCurve* 168 WebTransformAnimationCurve*
170 WebCompositorSupportImpl::createTransformAnimationCurve() { 169 WebCompositorSupportImpl::createTransformAnimationCurve() {
171 return new WebKit::WebTransformAnimationCurveImpl(); 170 return new WebKit::WebTransformAnimationCurveImpl();
172 } 171 }
173 172
174 } // namespace webkit 173 } // namespace webkit
OLDNEW
« no previous file with comments | « ppapi/shared_impl/ppapi_preferences.cc ('k') | webkit/compositor_bindings/web_layer_tree_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698