| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/gtest_prod_util.h" | 10 #include "base/gtest_prod_util.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, | 142 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, |
| 143 bool processed) OVERRIDE { } | 143 bool processed) OVERRIDE { } |
| 144 virtual void SetHasHorizontalScrollbar( | 144 virtual void SetHasHorizontalScrollbar( |
| 145 bool has_horizontal_scrollbar) OVERRIDE { } | 145 bool has_horizontal_scrollbar) OVERRIDE { } |
| 146 virtual void SetScrollOffsetPinning( | 146 virtual void SetScrollOffsetPinning( |
| 147 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE { } | 147 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE { } |
| 148 | 148 |
| 149 #if defined(USE_AURA) | 149 #if defined(USE_AURA) |
| 150 virtual void AcceleratedSurfaceNew( | 150 virtual void AcceleratedSurfaceNew( |
| 151 int32 width, int32 height, uint64* surface_id, | 151 int32 width, int32 height, uint64* surface_id, |
| 152 TransportDIB::Handle* surface_handle) OVERRIDE { } | 152 TransportDIB::Handle* surface_handle, int32 route_id, int gpu_host_id) |
| 153 OVERRIDE { } |
| 153 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE { } | 154 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE { } |
| 155 virtual void AcceleratedSurfaceRequestReleaseFront( |
| 156 uint64 surface_id, |
| 157 int retry_count, |
| 158 int request_id, |
| 159 int32 route_id, |
| 160 int gpu_host_id) OVERRIDE { } |
| 154 #endif | 161 #endif |
| 155 | 162 |
| 156 #if defined(TOOLKIT_GTK) | 163 #if defined(TOOLKIT_GTK) |
| 157 virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE { } | 164 virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE { } |
| 158 virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE { } | 165 virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE { } |
| 159 #endif // defined(TOOLKIT_GTK) | 166 #endif // defined(TOOLKIT_GTK) |
| 160 | 167 |
| 161 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; | 168 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; |
| 162 | 169 |
| 163 virtual bool LockMouse() OVERRIDE; | 170 virtual bool LockMouse() OVERRIDE; |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 TestRenderViewHost* active_test_rvh(); | 324 TestRenderViewHost* active_test_rvh(); |
| 318 TestWebContents* contents(); | 325 TestWebContents* contents(); |
| 319 | 326 |
| 320 private: | 327 private: |
| 321 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); | 328 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); |
| 322 }; | 329 }; |
| 323 | 330 |
| 324 } // namespace content | 331 } // namespace content |
| 325 | 332 |
| 326 #endif // CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ | 333 #endif // CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ |
| OLD | NEW |