sync compositor: Add output_surface_id

android_webview/browser/test/rendering_test.cc

 // 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.
 
 #include "android_webview/browser/test/rendering_test.h"
 
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
@@ skipping 49 matching lines @@
   ui_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&RenderingTest::QuitMessageLoop, base::Unretained(this)));
 }
 
 void RenderingTest::QuitMessageLoop() {
   DCHECK_EQ(base::MessageLoop::current(), message_loop_.get());
   message_loop_->QuitWhenIdle();
 }
 
-void RenderingTest::SetCompositorFrame() {
-  DCHECK(compositor_.get());
+scoped_ptr<cc::CompositorFrame> RenderingTest::ConstructEmptyFrame() {
   scoped_ptr<cc::CompositorFrame> compositor_frame(new cc::CompositorFrame);
   scoped_ptr<cc::DelegatedFrameData> frame(new cc::DelegatedFrameData);
   scoped_ptr<cc::RenderPass> root_pass(cc::RenderPass::Create());
   gfx::Rect viewport(browser_view_renderer_->size());
   root_pass->SetNew(cc::RenderPassId(1, 1), viewport, viewport,
                     gfx::Transform());
   frame->render_pass_list.push_back(std::move(root_pass));
   compositor_frame->delegated_frame_data = std::move(frame);
-  compositor_->SetHardwareFrame(std::move(compositor_frame));
+  return compositor_frame;
 }
 
 void RenderingTest::WillOnDraw() {
-  SetCompositorFrame();
+  DCHECK(compositor_);
+  compositor_->SetHardwareFrame(0u, ConstructEmptyFrame());
 }
 
 bool RenderingTest::RequestDrawGL(bool wait_for_completion) {
   window_->RequestDrawGL(wait_for_completion);
   return true;
 }
 
 bool RenderingTest::WillDrawOnRT(SharedRendererState* functor,
                                  AwDrawGLInfo* draw_info) {
   draw_info->width = window_->surface_size().width();
   draw_info->height = window_->surface_size().height();
   draw_info->is_layer = false;
   gfx::Transform transform;
   transform.matrix().asColMajorf(draw_info->transform);
   return true;
 }
 
 void RenderingTest::OnNewPicture() {
 }
 
 void RenderingTest::PostInvalidate() {
-  window_->PostInvalidate();
+  if (window_)
+    window_->PostInvalidate();
 }
 
 void RenderingTest::DetachFunctorFromView() {
 }
 
 gfx::Point RenderingTest::GetLocationOnScreen() {
   return gfx::Point();
 }
 
 }  // namespace android_webview