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

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: fixes 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 316eba888d048e55534374fc6742e3552f00516e..4f3a3b8a93e5666641c4f458aff90459f31f37a8 100644
--- a/webkit/renderer/compositor_bindings/web_layer_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc
@@ -4,6 +4,7 @@
#include "webkit/renderer/compositor_bindings/web_layer_impl.h"
+#include "base/bind.h"
#include "base/strings/string_util.h"
#include "cc/animation/animation.h"
#include "cc/base/region.h"
@@ -13,6 +14,7 @@
#include "third_party/WebKit/public/platform/WebFloatPoint.h"
#include "third_party/WebKit/public/platform/WebFloatRect.h"
#include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h"
+#include "third_party/WebKit/public/platform/WebLayerScrollClient.h"
#include "third_party/WebKit/public/platform/WebSize.h"
#include "third_party/skia/include/utils/SkMatrix44.h"
#include "webkit/renderer/compositor_bindings/web_animation_impl.h"
@@ -349,7 +351,9 @@ WebKit::WebLayerPositionConstraint WebLayerImpl::positionConstraint() const {
void WebLayerImpl::setScrollClient(
WebKit::WebLayerScrollClient* scroll_client) {
- layer_->set_layer_scroll_client(scroll_client);
+ layer_->set_did_scroll_callback(
+ base::Bind(&WebKit::WebLayerScrollClient::didScroll,
+ base::Unretained(scroll_client)));
}
bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); }

Powered by Google App Engine
This is Rietveld 408576698