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

Unified Diff: content/renderer/render_view_impl.cc

Issue 15002007: Delegate root layer scroll offset to android_webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase on top of crrev.com/15875009 Created 7 years, 7 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: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 10304771b1a7636484fea342cce24c2707e7bd2e..ece1b288a9e153908077f950be319255d88b7ee8 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -220,6 +220,7 @@
#include "content/renderer/android/content_detector.h"
#include "content/renderer/android/email_detector.h"
#include "content/renderer/android/phone_number_detector.h"
+#include "content/renderer/android/synchronous_compositor_impl.h"
#include "content/renderer/media/stream_texture_factory_impl_android.h"
#include "content/renderer/media/webmediaplayer_proxy_impl_android.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
@@ -2624,6 +2625,11 @@ void RenderViewImpl::didActivateCompositor(int input_handler_identifier) {
routing_id_,
compositor_->GetInputHandler(),
AsWeakPtr());
+
+ if (GetSynchronousCompositor()) {
+ input_handler_manager->SetRootLayerScrollDelegate(
+ routing_id_, GetSynchronousCompositor());
joth 2013/05/29 00:46:25 do you mean GetSynchronousCompositor() here, or so
mkosiba (inactive) 2013/05/29 13:18:24 This is fine. I just forgot to make SynchronousCom
+ }
}
#endif

Powered by Google App Engine
This is Rietveld 408576698