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

Side by Side Diff: webkit/renderer/compositor_bindings/web_layer_impl.cc

Issue 18139004: cc: Create a LayerScrollClient interface and an adapter class in compositor_bindings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 5 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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/renderer/compositor_bindings/web_layer_impl.h" 5 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
6 6
7 #include "base/bind.h"
7 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
8 #include "cc/animation/animation.h" 9 #include "cc/animation/animation.h"
9 #include "cc/base/region.h" 10 #include "cc/base/region.h"
10 #include "cc/layers/layer.h" 11 #include "cc/layers/layer.h"
11 #include "cc/layers/layer_position_constraint.h" 12 #include "cc/layers/layer_position_constraint.h"
12 #include "third_party/WebKit/public/platform/WebCompositingReasons.h" 13 #include "third_party/WebKit/public/platform/WebCompositingReasons.h"
13 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 14 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
14 #include "third_party/WebKit/public/platform/WebFloatRect.h" 15 #include "third_party/WebKit/public/platform/WebFloatRect.h"
15 #include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h" 16 #include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h"
17 #include "third_party/WebKit/public/platform/WebLayerScrollClient.h"
16 #include "third_party/WebKit/public/platform/WebSize.h" 18 #include "third_party/WebKit/public/platform/WebSize.h"
17 #include "third_party/skia/include/utils/SkMatrix44.h" 19 #include "third_party/skia/include/utils/SkMatrix44.h"
18 #include "webkit/renderer/compositor_bindings/web_animation_impl.h" 20 #include "webkit/renderer/compositor_bindings/web_animation_impl.h"
19 #include "webkit/renderer/compositor_bindings/web_filter_operations_impl.h" 21 #include "webkit/renderer/compositor_bindings/web_filter_operations_impl.h"
20 #include "webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapt er.h" 22 #include "webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapt er.h"
21 23
22 using cc::Animation; 24 using cc::Animation;
23 using cc::Layer; 25 using cc::Layer;
24 using WebKit::WebLayer; 26 using WebKit::WebLayer;
25 using WebKit::WebFloatPoint; 27 using WebKit::WebFloatPoint;
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 const WebKit::WebLayerPositionConstraint& constraint) { 344 const WebKit::WebLayerPositionConstraint& constraint) {
343 layer_->SetPositionConstraint(ToLayerPositionConstraint(constraint)); 345 layer_->SetPositionConstraint(ToLayerPositionConstraint(constraint));
344 } 346 }
345 347
346 WebKit::WebLayerPositionConstraint WebLayerImpl::positionConstraint() const { 348 WebKit::WebLayerPositionConstraint WebLayerImpl::positionConstraint() const {
347 return ToWebLayerPositionConstraint(layer_->position_constraint()); 349 return ToWebLayerPositionConstraint(layer_->position_constraint());
348 } 350 }
349 351
350 void WebLayerImpl::setScrollClient( 352 void WebLayerImpl::setScrollClient(
351 WebKit::WebLayerScrollClient* scroll_client) { 353 WebKit::WebLayerScrollClient* scroll_client) {
352 layer_->set_layer_scroll_client(scroll_client); 354 layer_->set_did_scroll_callback(
355 base::Bind(&WebKit::WebLayerScrollClient::didScroll,
356 base::Unretained(scroll_client)));
353 } 357 }
354 358
355 bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); } 359 bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); }
356 360
357 Layer* WebLayerImpl::layer() const { return layer_.get(); } 361 Layer* WebLayerImpl::layer() const { return layer_.get(); }
358 362
359 } // namespace webkit 363 } // namespace webkit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698