| OLD | NEW | 
|---|
| 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 "config.h" | 5 #include "config.h" | 
| 6 #include "webkit/compositor_bindings/web_compositor_support_impl.h" | 6 #include "webkit/compositor_bindings/web_compositor_support_impl.h" | 
| 7 | 7 | 
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" | 
|  | 9 #include "cc/settings.h" | 
| 9 #include "webkit/compositor_bindings/web_animation_impl.h" | 10 #include "webkit/compositor_bindings/web_animation_impl.h" | 
| 10 #include "webkit/compositor_bindings/web_compositor_impl.h" | 11 #include "webkit/compositor_bindings/web_compositor_impl.h" | 
| 11 #include "webkit/compositor_bindings/web_content_layer_impl.h" | 12 #include "webkit/compositor_bindings/web_content_layer_impl.h" | 
| 12 #include "webkit/compositor_bindings/web_delegated_renderer_layer_impl.h" | 13 #include "webkit/compositor_bindings/web_delegated_renderer_layer_impl.h" | 
| 13 #include "webkit/compositor_bindings/web_external_texture_layer_impl.h" | 14 #include "webkit/compositor_bindings/web_external_texture_layer_impl.h" | 
| 14 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h" | 15 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h" | 
| 15 #include "webkit/compositor_bindings/web_image_layer_impl.h" | 16 #include "webkit/compositor_bindings/web_image_layer_impl.h" | 
| 16 #include "webkit/compositor_bindings/web_io_surface_layer_impl.h" | 17 #include "webkit/compositor_bindings/web_io_surface_layer_impl.h" | 
| 17 #include "webkit/compositor_bindings/web_layer_impl.h" | 18 #include "webkit/compositor_bindings/web_layer_impl.h" | 
| 18 #include "webkit/compositor_bindings/web_layer_tree_view_impl.h" | 19 #include "webkit/compositor_bindings/web_layer_tree_view_impl.h" | 
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 60 | 61 | 
| 61 bool WebCompositorSupportImpl::isThreadingEnabled() { | 62 bool WebCompositorSupportImpl::isThreadingEnabled() { | 
| 62   return WebCompositorImpl::isThreadingEnabled(); | 63   return WebCompositorImpl::isThreadingEnabled(); | 
| 63 } | 64 } | 
| 64 | 65 | 
| 65 void WebCompositorSupportImpl::shutdown() { | 66 void WebCompositorSupportImpl::shutdown() { | 
| 66   WebCompositorImpl::shutdown(); | 67   WebCompositorImpl::shutdown(); | 
| 67 } | 68 } | 
| 68 | 69 | 
| 69 void WebCompositorSupportImpl::setPerTilePaintingEnabled(bool enabled) { | 70 void WebCompositorSupportImpl::setPerTilePaintingEnabled(bool enabled) { | 
| 70   WebCompositorImpl::setPerTilePaintingEnabled(enabled); | 71   cc::Settings::setPerTilePaintingEnabled(enabled); | 
| 71 } | 72 } | 
| 72 | 73 | 
| 73 void WebCompositorSupportImpl::setPartialSwapEnabled(bool enabled) { | 74 void WebCompositorSupportImpl::setPartialSwapEnabled(bool enabled) { | 
| 74   WebCompositorImpl::setPartialSwapEnabled(enabled); | 75   cc::Settings::setPartialSwapEnabled(enabled); | 
| 75 } | 76 } | 
| 76 | 77 | 
| 77 void WebCompositorSupportImpl::setAcceleratedAnimationEnabled(bool enabled) { | 78 void WebCompositorSupportImpl::setAcceleratedAnimationEnabled(bool enabled) { | 
| 78   WebCompositorImpl::setAcceleratedAnimationEnabled(enabled); | 79   cc::Settings::setAcceleratedAnimationEnabled(enabled); | 
| 79 } | 80 } | 
| 80 | 81 | 
| 81 void WebCompositorSupportImpl::setPageScalePinchZoomEnabled(bool enabled) { | 82 void WebCompositorSupportImpl::setPageScalePinchZoomEnabled(bool enabled) { | 
| 82   WebCompositorImpl::setPageScalePinchZoomEnabled(enabled); | 83   cc::Settings::setPageScalePinchZoomEnabled(enabled); | 
| 83 } | 84 } | 
| 84 | 85 | 
| 85 WebLayerTreeView* WebCompositorSupportImpl::createLayerTreeView( | 86 WebLayerTreeView* WebCompositorSupportImpl::createLayerTreeView( | 
| 86     WebLayerTreeViewClient* client, const WebLayer& root, | 87     WebLayerTreeViewClient* client, const WebLayer& root, | 
| 87     const WebLayerTreeView::Settings& settings) { | 88     const WebLayerTreeView::Settings& settings) { | 
| 88   scoped_ptr<WebKit::WebLayerTreeViewImpl> layerTreeViewImpl( | 89   scoped_ptr<WebKit::WebLayerTreeViewImpl> layerTreeViewImpl( | 
| 89       new WebKit::WebLayerTreeViewImpl(client)); | 90       new WebKit::WebLayerTreeViewImpl(client)); | 
| 90   if (!layerTreeViewImpl->initialize(settings)) | 91   if (!layerTreeViewImpl->initialize(settings)) | 
| 91     return NULL; | 92     return NULL; | 
| 92   layerTreeViewImpl->setRootLayer(root); | 93   layerTreeViewImpl->setRootLayer(root); | 
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 147 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { | 148 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { | 
| 148   return new WebKit::WebFloatAnimationCurveImpl(); | 149   return new WebKit::WebFloatAnimationCurveImpl(); | 
| 149 } | 150 } | 
| 150 | 151 | 
| 151 WebTransformAnimationCurve* | 152 WebTransformAnimationCurve* | 
| 152     WebCompositorSupportImpl::createTransformAnimationCurve() { | 153     WebCompositorSupportImpl::createTransformAnimationCurve() { | 
| 153   return new WebKit::WebTransformAnimationCurveImpl(); | 154   return new WebKit::WebTransformAnimationCurveImpl(); | 
| 154 } | 155 } | 
| 155 | 156 | 
| 156 }  // namespace webkit | 157 }  // namespace webkit | 
| OLD | NEW | 
|---|