Move synchronous compositor into content/browser

android_webview/browser/in_process_view_renderer.h

 // Copyright (c) 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_IN_PROCESS_IN_PROCESS_VIEW_RENDERER_H_
 #define ANDROID_WEBVIEW_BROWSER_IN_PROCESS_IN_PROCESS_VIEW_RENDERER_H_
 
 #include "android_webview/browser/browser_view_renderer_impl.h"
 
 #include "base/memory/weak_ptr.h"
-#include "content/public/renderer/android/synchronous_compositor_client.h"
+#include "content/public/browser/android/synchronous_compositor_client.h"
 
 namespace content {
 class SynchronousCompositor;
 class WebContents;
 }
 
 namespace android_webview {
 
 // Provides RenderViewHost wrapper functionality for sending WebView-specific
 // IPC messages to the renderer and from there to WebKit.
 class InProcessViewRenderer : public BrowserViewRenderer,
                               public content::SynchronousCompositorClient {
  public:
   InProcessViewRenderer(BrowserViewRenderer::Client* client,
                         JavaHelper* java_helper);
   virtual ~InProcessViewRenderer();
 
   static InProcessViewRenderer* FromWebContents(
       content::WebContents* contents);
-  static InProcessViewRenderer* FromId(
-      int render_process_id, int render_view_id);
-  void BindSynchronousCompositor(
-      content::SynchronousCompositor* compositor);
 
   // BrowserViewRenderer overrides
   virtual void SetContents(
       content::ContentViewCore* content_view_core) OVERRIDE;
   virtual bool PrepareDrawGL(int x, int y) OVERRIDE;
   virtual void DrawGL(AwDrawGLInfo* draw_info) OVERRIDE;
   virtual bool DrawSW(jobject java_canvas,
                       const gfx::Rect& clip_bounds) OVERRIDE;
   virtual base::android::ScopedJavaLocalRef<jobject> CapturePicture() OVERRIDE;
   virtual void EnableOnNewPicture(bool enabled) OVERRIDE;
   virtual void OnVisibilityChanged(
       bool view_visible, bool window_visible) OVERRIDE;
   virtual void OnSizeChanged(int width, int height) OVERRIDE;
   virtual void OnAttachedToWindow(int width, int height) OVERRIDE;
   virtual void OnDetachedFromWindow() OVERRIDE;
   virtual bool IsAttachedToWindow() OVERRIDE;
   virtual bool IsViewVisible() OVERRIDE;
   virtual gfx::Rect GetScreenRect() OVERRIDE;
 
   // SynchronousCompositorClient overrides
+  virtual void DidInitializeCompositor(
+      content::SynchronousCompositor* compositor) OVERRIDE;
   virtual void DidDestroyCompositor(
       content::SynchronousCompositor* compositor) OVERRIDE;
   virtual void SetContinuousInvalidate(bool invalidate) OVERRIDE;
 
   void WebContentsGone();
 
  private:
   void Invalidate();
   void EnsureContinuousInvalidation();
   bool DrawSWInternal(jobject java_canvas,
@@ skipping 29 matching lines @@
   gfx::Point hw_rendering_scroll_;
 
   base::WeakPtrFactory<InProcessViewRenderer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessViewRenderer);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_IN_PROCESS_IN_PROCESS_VIEW_RENDERER_H_