sync compositor: Add output_surface_id

android_webview/browser/test/rendering_test.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_TEST_RENDERING_TEST_H_
 #define ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_
 
 #include "android_webview/browser/browser_view_renderer_client.h"
 #include "android_webview/browser/test/fake_window.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 class MessageLoop;
 }
 
+namespace cc {
+class CompositorFrame;
+}
+
 namespace content {
 class TestSynchronousCompositor;
 }
 
 namespace android_webview {
 
 class BrowserViewRenderer;
 class FakeWindow;
 struct ParentCompositorDrawConstraints;
 
@@ skipping 22 matching lines @@
   void DidOnDraw(bool success) override {}
   void WillSyncOnRT(SharedRendererState* functor) override {}
   void DidSyncOnRT(SharedRendererState* functor) override {}
   void WillProcessOnRT(SharedRendererState* functor) override {}
   void DidProcessOnRT(SharedRendererState* functor) override {}
   bool WillDrawOnRT(SharedRendererState* functor,
                     AwDrawGLInfo* draw_info) override;
   void DidDrawOnRT(SharedRendererState* functor) override {}
 
  protected:
+
   RenderingTest();
   ~RenderingTest() override;
 
   virtual void SetUpTestHarness();
   virtual void StartTest();
 
   void RunTest();
   void InitializeCompositor();
   void Attach();
   void EndTest();
-  void SetCompositorFrame();
+  scoped_ptr<cc::CompositorFrame> ConstructEmptyFrame();
 
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
   scoped_ptr<BrowserViewRenderer> browser_view_renderer_;
   scoped_ptr<content::TestSynchronousCompositor> compositor_;
   scoped_ptr<FakeWindow> window_;
 
  private:
   void QuitMessageLoop();
 
   const scoped_ptr<base::MessageLoop> message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderingTest);
 };
 
 #define RENDERING_TEST_F(TEST_FIXTURE_NAME)         \
   TEST_F(TEST_FIXTURE_NAME, RunTest) { RunTest(); } \
   class NeedsSemicolon##TEST_FIXTURE_NAME {}
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_