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

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

Issue 10916279: Chromium compositor change implementing page-scale driven pinch-zoom. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Change m_unpinchedViewportSize and remove unnecessary >1 page scale clamping. Created 8 years, 2 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
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 #if defined(USE_LIBCC_FOR_COMPOSITOR) 7 #if defined(USE_LIBCC_FOR_COMPOSITOR)
8 #include "config.h" 8 #include "config.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "webkit/compositor_bindings/WebLayerImpl.h" 10 #include "webkit/compositor_bindings/WebLayerImpl.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 } 114 }
115 115
116 void WebCompositorSupportImpl::setAcceleratedAnimationEnabled(bool enabled) { 116 void WebCompositorSupportImpl::setAcceleratedAnimationEnabled(bool enabled) {
117 #if defined(USE_LIBCC_FOR_COMPOSITOR) 117 #if defined(USE_LIBCC_FOR_COMPOSITOR)
118 WebCompositorImpl::setAcceleratedAnimationEnabled(enabled); 118 WebCompositorImpl::setAcceleratedAnimationEnabled(enabled);
119 #else 119 #else
120 WebCompositor::setAcceleratedAnimationEnabled(enabled); 120 WebCompositor::setAcceleratedAnimationEnabled(enabled);
121 #endif 121 #endif
122 } 122 }
123 123
124 void WebCompositorSupportImpl::setPageScalePinchZoomEnabled(bool enabled) {
125 #if defined(USE_LIBCC_FOR_COMPOSITOR)
126 WebCompositorImpl::setPageScalePinchZoomEnabled(enabled);
127 #else
128 WebCompositor::setPageScalePinchZoomEnabled(enabled);
129 #endif
130 }
124 131
125 WebLayerTreeView* WebCompositorSupportImpl::createLayerTreeView( 132 WebLayerTreeView* WebCompositorSupportImpl::createLayerTreeView(
126 WebLayerTreeViewClient* client, const WebLayer& root, 133 WebLayerTreeViewClient* client, const WebLayer& root,
127 const WebLayerTreeView::Settings& settings) { 134 const WebLayerTreeView::Settings& settings) {
128 #if defined(USE_LIBCC_FOR_COMPOSITOR) 135 #if defined(USE_LIBCC_FOR_COMPOSITOR)
129 scoped_ptr<WebKit::WebLayerTreeViewImpl> layerTreeViewImpl( 136 scoped_ptr<WebKit::WebLayerTreeViewImpl> layerTreeViewImpl(
130 new WebKit::WebLayerTreeViewImpl(client)); 137 new WebKit::WebLayerTreeViewImpl(client));
131 if (!layerTreeViewImpl->initialize(settings)) 138 if (!layerTreeViewImpl->initialize(settings))
132 return NULL; 139 return NULL;
133 layerTreeViewImpl->setRootLayer(root); 140 layerTreeViewImpl->setRootLayer(root);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 WebTransformAnimationCurve* 242 WebTransformAnimationCurve*
236 WebCompositorSupportImpl::createTransformAnimationCurve() { 243 WebCompositorSupportImpl::createTransformAnimationCurve() {
237 #if defined(USE_LIBCC_FOR_COMPOSITOR) 244 #if defined(USE_LIBCC_FOR_COMPOSITOR)
238 return new WebKit::WebTransformAnimationCurveImpl(); 245 return new WebKit::WebTransformAnimationCurveImpl();
239 #else 246 #else
240 return WebKit::WebTransformAnimationCurve::create(); 247 return WebKit::WebTransformAnimationCurve::create();
241 #endif 248 #endif
242 } 249 }
243 250
244 } // namespace webkit 251 } // namespace webkit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698