| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_ | 5 #ifndef ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_ | 
| 6 #define ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_ | 6 #define ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_ | 
| 7 | 7 | 
| 8 #include "android_webview/browser/browser_view_renderer_client.h" | 8 #include "android_webview/browser/browser_view_renderer_client.h" | 
| 9 #include "android_webview/browser/test/fake_window.h" | 9 #include "android_webview/browser/test/fake_window.h" | 
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" | 
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 43                          float max_page_scale_factor) override {} | 43                          float max_page_scale_factor) override {} | 
| 44   void DidOverscroll(gfx::Vector2d overscroll_delta) override {} | 44   void DidOverscroll(gfx::Vector2d overscroll_delta) override {} | 
| 45 | 45 | 
| 46   // WindowHooks overrides. | 46   // WindowHooks overrides. | 
| 47   void WillOnDraw() override {} | 47   void WillOnDraw() override {} | 
| 48   void DidOnDraw(bool success) override {} | 48   void DidOnDraw(bool success) override {} | 
| 49   void WillSyncOnRT(SharedRendererState* functor) override {} | 49   void WillSyncOnRT(SharedRendererState* functor) override {} | 
| 50   void DidSyncOnRT(SharedRendererState* functor) override {} | 50   void DidSyncOnRT(SharedRendererState* functor) override {} | 
| 51   void WillProcessOnRT(SharedRendererState* functor) override {} | 51   void WillProcessOnRT(SharedRendererState* functor) override {} | 
| 52   void DidProcessOnRT(SharedRendererState* functor) override {} | 52   void DidProcessOnRT(SharedRendererState* functor) override {} | 
| 53   void WillDrawOnRT(SharedRendererState* functor) override {} | 53   void SetParentDrawConstraints(AwDrawGLInfo& draw_info) override; | 
|  | 54   bool WillDrawOnRT(SharedRendererState* functor) override; | 
| 54   void DidDrawOnRT(SharedRendererState* functor) override {} | 55   void DidDrawOnRT(SharedRendererState* functor) override {} | 
|  | 56   bool WillWaitForModeDrawToFinish() override; | 
| 55 | 57 | 
| 56  protected: | 58  protected: | 
| 57   RenderingTest(); | 59   RenderingTest(); | 
| 58   ~RenderingTest() override; | 60   ~RenderingTest() override; | 
| 59 | 61 | 
| 60   virtual void SetUpTestHarness(); | 62   virtual void SetUpTestHarness(); | 
| 61   virtual void StartTest(); | 63   virtual void StartTest(); | 
|  | 64   virtual void Attach(); | 
| 62 | 65 | 
| 63   void RunTest(); | 66   void RunTest(); | 
| 64   void InitializeCompositor(); | 67   void InitializeCompositor(); | 
| 65   void Attach(); |  | 
| 66   void EndTest(); | 68   void EndTest(); | 
| 67 | 69 | 
| 68   scoped_refptr<base::MessageLoopProxy> ui_proxy_; | 70   scoped_refptr<base::MessageLoopProxy> ui_proxy_; | 
| 69   scoped_ptr<BrowserViewRenderer> browser_view_renderer_; | 71   scoped_ptr<BrowserViewRenderer> browser_view_renderer_; | 
| 70   scoped_ptr<content::TestSynchronousCompositor> compositor_; | 72   scoped_ptr<content::TestSynchronousCompositor> compositor_; | 
| 71   scoped_ptr<FakeWindow> window_; | 73   scoped_ptr<FakeWindow> window_; | 
| 72 | 74 | 
| 73  private: | 75  private: | 
| 74   void QuitMessageLoop(); | 76   void QuitMessageLoop(); | 
| 75 | 77 | 
| 76   const scoped_ptr<base::MessageLoop> message_loop_; | 78   const scoped_ptr<base::MessageLoop> message_loop_; | 
| 77 | 79 | 
| 78   DISALLOW_COPY_AND_ASSIGN(RenderingTest); | 80   DISALLOW_COPY_AND_ASSIGN(RenderingTest); | 
| 79 }; | 81 }; | 
| 80 | 82 | 
| 81 #define RENDERING_TEST_F(TEST_FIXTURE_NAME)         \ | 83 #define RENDERING_TEST_F(TEST_FIXTURE_NAME)         \ | 
| 82   TEST_F(TEST_FIXTURE_NAME, RunTest) { RunTest(); } \ | 84   TEST_F(TEST_FIXTURE_NAME, RunTest) { RunTest(); } \ | 
| 83   class NeedsSemicolon##TEST_FIXTURE_NAME {} | 85   class NeedsSemicolon##TEST_FIXTURE_NAME {} | 
| 84 | 86 | 
| 85 }  // namespace android_webview | 87 }  // namespace android_webview | 
| 86 | 88 | 
| 87 #endif  // ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_ | 89 #endif  // ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_ | 
| OLD | NEW | 
|---|