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

Unified 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: Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: webkit/renderer/compositor_bindings/web_layer_impl.cc
diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.cc b/webkit/renderer/compositor_bindings/web_layer_impl.cc
index d46b9e12980a63aa849f68d19aac84e1bfca4109..16dc1e0c121044f3d6127f17bf1aa4cfe760fc55 100644
--- a/webkit/renderer/compositor_bindings/web_layer_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc
@@ -18,6 +18,7 @@
#include "webkit/renderer/compositor_bindings/web_animation_impl.h"
#include "webkit/renderer/compositor_bindings/web_filter_operations_impl.h"
#include "webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.h"
+#include "webkit/renderer/compositor_bindings/web_to_cc_layer_scroll_client_adapter.h"
using cc::Animation;
using cc::Layer;
@@ -358,7 +359,9 @@ WebKit::WebLayerPositionConstraint WebLayerImpl::positionConstraint() const {
void WebLayerImpl::setScrollClient(
WebKit::WebLayerScrollClient* scroll_client) {
- layer_->set_layer_scroll_client(scroll_client);
+ layer_scroll_client_adapter_.reset(
+ new WebToCCLayerScrollClientAdapter(scroll_client));
+ layer_->set_layer_scroll_client(layer_scroll_client_adapter_.get());
danakj 2013/06/28 02:57:48 To do this with base::Callback, you'd add a method
danakj 2013/06/28 02:59:02 Actually, you shouldn't need the PassAlong method.
tfarina 2013/06/28 04:07:03 Done.
}
bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); }

Powered by Google App Engine
This is Rietveld 408576698