sync compositor: Add output_surface_id

android_webview/browser/hardware_renderer.h

 // Copyright 2014 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_HARDWARE_RENDERER_H_
 #define ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
 
 #include "android_webview/browser/shared_renderer_state.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 35 matching lines @@
   void OutputSurfaceLost() override {}
   void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override {}
 
   // cc::SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(cc::SurfaceId surface_id,
                            cc::BeginFrameSource* begin_frame_source) override;
 
   void ReturnResourcesInChildFrame();
   void ReturnResourcesToCompositor(const cc::ReturnedResourceArray& resources,
-                                   unsigned int compositor_routing_id);
+                                   unsigned int compositor_routing_id,
+                                   uint32_t output_surface_id);
 
   SharedRendererState* shared_renderer_state_;
 
   typedef void* EGLContext;
   EGLContext last_egl_context_;
 
   // Information about last delegated frame.
   gfx::Size frame_size_;
 
   // Infromation from UI on last commit.
   gfx::Vector2d scroll_offset_;
 
   // This holds the last ChildFrame received. Contains the frame info of the
   // last frame. The |frame| member may be null if it's already submitted to
   // SurfaceFactory.
   scoped_ptr<ChildFrame> child_frame_;
 
   scoped_refptr<AwGLSurface> gl_surface_;
 
   scoped_ptr<cc::SurfaceManager> surface_manager_;
   scoped_ptr<cc::Display> display_;
   scoped_ptr<cc::SurfaceFactory> surface_factory_;
   scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   cc::SurfaceId child_id_;
   cc::SurfaceId root_id_;
   unsigned int compositor_id_;
+  uint32_t output_surface_id_;
 
   // This is owned by |display_|.
   ParentOutputSurface* output_surface_;
 
   DISALLOW_COPY_AND_ASSIGN(HardwareRenderer);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_