Delegate root layer scroll offset to android_webview.

content/browser/android/in_process/synchronous_compositor_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
 
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
+#include "cc/input/input_handler.h"
+#include "cc/input/layer_scroll_offset_delegate.h"
 #include "content/browser/android/in_process/synchronous_input_event_filter.h"
 #include "content/public/browser/android/synchronous_compositor_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/renderer/android/synchronous_compositor_factory.h"
+#include "content/renderer/gpu/input_handler_manager.h"
+#include "content/renderer/render_thread_impl.h"
 
 namespace content {
 
 namespace {
 
 int GetInProcessRendererId() {
   content::RenderProcessHost::iterator it =
       content::RenderProcessHost::AllHostsIterator();
   if (it.IsAtEnd()) {
     // There should always be one RPH in single process mode.
     NOTREACHED();
     return 0;
   }
 
   int id = it.GetCurrentValue()->GetID();
   it.Advance();
   DCHECK(it.IsAtEnd());  // Not multiprocess compatible.
   return id;
 }
 
-class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
+class SynchronousCompositorFactoryImpl: public SynchronousCompositorFactory {

[joth, 2013/06/06 20:19:32]

reminder: revert me

[mkosiba (inactive), 2013/06/07 16:18:27]

Thanks! Done.

  public:
   SynchronousCompositorFactoryImpl() {
     SynchronousCompositorFactory::SetInstance(this);
   }
 
   // SynchronousCompositorFactory
   virtual scoped_refptr<base::MessageLoopProxy>
       GetCompositorMessageLoop() OVERRIDE {
     return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
   }
@@ skipping 71 matching lines @@
 bool SynchronousCompositorImpl::DemandDrawHw(
       gfx::Size view_size,
       const gfx::Transform& transform,
       gfx::Rect damage_area) {
   DCHECK(CalledOnValidThread());
   DCHECK(output_surface_);
 
   return output_surface_->DemandDrawHw(view_size, transform, damage_area);
 }
 
+void SynchronousCompositorImpl::DidChangeRootLayerScrollOffset() {
+  if (input_handler_.get())
+    input_handler_->OnRootLayerDelegatedScrollOffsetChanged();
+}
+
 void SynchronousCompositorImpl::DidBindOutputSurface(
       SynchronousCompositorOutputSurface* output_surface) {
   DCHECK(CalledOnValidThread());
   output_surface_ = output_surface;
   if (compositor_client_)
     compositor_client_->DidInitializeCompositor(this);
 }
 
 void SynchronousCompositorImpl::DidDestroySynchronousOutputSurface(
        SynchronousCompositorOutputSurface* output_surface) {
   DCHECK(CalledOnValidThread());
+
   // Allow for transient hand-over when two output surfaces may refer to
   // a single delegate.
   if (output_surface_ == output_surface) {
     output_surface_ = NULL;
     if (compositor_client_)
       compositor_client_->DidDestroyCompositor(this);
     compositor_client_ = NULL;
   }
 }
 
+void SynchronousCompositorImpl::SetInputHandler(
+    base::WeakPtr<cc::InputHandler> input_handler) {
+  DCHECK(CalledOnValidThread());
+
+  if (input_handler_.get())
+    input_handler_->SetRootLayerScrollOffsetDelegate(NULL);
+
+  input_handler_ = input_handler;
+
+  if (input_handler_.get())
+    input_handler_->SetRootLayerScrollOffsetDelegate(this);
+}
+
 void SynchronousCompositorImpl::SetContinuousInvalidate(bool enable) {
   DCHECK(CalledOnValidThread());
   if (compositor_client_)
     compositor_client_->SetContinuousInvalidate(enable);
 }
 
 InputEventAckState SynchronousCompositorImpl::HandleInputEvent(
     const WebKit::WebInputEvent& input_event) {
   DCHECK(CalledOnValidThread());
   return g_factory.Get().synchronous_input_event_filter()->HandleInputEvent(
       routing_id_, input_event);
 }
 
+void SynchronousCompositorImpl::SetTotalScrollOffset(gfx::Vector2dF new_value) {
+  DCHECK(CalledOnValidThread());
+  if (compositor_client_)
+    compositor_client_->SetTotalRootLayerScrollOffset(new_value);
+}
+
+gfx::Vector2dF SynchronousCompositorImpl::GetTotalScrollOffset() {
+  DCHECK(CalledOnValidThread());
+  if (compositor_client_)
+    return compositor_client_->GetTotalRootLayerScrollOffset();
+  else
+    return gfx::Vector2dF();

[joth, 2013/06/06 20:19:32]

use { } (or nix the else caluse)

[mkosiba (inactive), 2013/06/07 16:18:27]

Done.

+}
+
 // Not using base::NonThreadSafe as we want to enforce a more exacting threading
 // requirement: SynchronousCompositorImpl() must only be used on the UI thread.
 bool SynchronousCompositorImpl::CalledOnValidThread() const {
   return BrowserThread::CurrentlyOn(BrowserThread::UI);
 }
 
 // static
 void SynchronousCompositor::SetClientForWebContents(
     WebContents* contents,
     SynchronousCompositorClient* client) {
   DCHECK(contents);
   if (client) {
     g_factory.Get();  // Ensure it's initialized.
     SynchronousCompositorImpl::CreateForWebContents(contents);
   }
   if (SynchronousCompositorImpl* instance =
       SynchronousCompositorImpl::FromWebContents(contents)) {
     instance->SetClient(client);
   }
 }
 
 }  // namespace content