| 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_TEST_TEST_RENDER_VIEW_HOST_H_ | 5 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ |
| 6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ | 6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/gtest_prod_util.h" | 13 #include "base/gtest_prod_util.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "build/build_config.h" | 15 #include "build/build_config.h" |
| 16 #include "cc/surfaces/surface_id_allocator.h" |
| 16 #include "content/browser/renderer_host/render_view_host_impl.h" | 17 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 17 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 18 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
| 18 #include "content/public/common/web_preferences.h" | 19 #include "content/public/common/web_preferences.h" |
| 19 #include "content/public/test/mock_render_process_host.h" | 20 #include "content/public/test/mock_render_process_host.h" |
| 20 #include "content/public/test/test_renderer_host.h" | 21 #include "content/public/test/test_renderer_host.h" |
| 21 #include "ui/base/ime/dummy_text_input_client.h" | 22 #include "ui/base/ime/dummy_text_input_client.h" |
| 22 #include "ui/base/layout.h" | 23 #include "ui/base/layout.h" |
| 23 #include "ui/base/page_transition_types.h" | 24 #include "ui/base/page_transition_types.h" |
| 24 #include "ui/gfx/geometry/vector2d_f.h" | 25 #include "ui/gfx/geometry/vector2d_f.h" |
| 25 | 26 |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 uint32_t GetSurfaceIdNamespace() override; | 133 uint32_t GetSurfaceIdNamespace() override; |
| 133 | 134 |
| 134 bool is_showing() const { return is_showing_; } | 135 bool is_showing() const { return is_showing_; } |
| 135 bool is_occluded() const { return is_occluded_; } | 136 bool is_occluded() const { return is_occluded_; } |
| 136 bool did_swap_compositor_frame() const { return did_swap_compositor_frame_; } | 137 bool did_swap_compositor_frame() const { return did_swap_compositor_frame_; } |
| 137 | 138 |
| 138 protected: | 139 protected: |
| 139 RenderWidgetHostImpl* rwh_; | 140 RenderWidgetHostImpl* rwh_; |
| 140 | 141 |
| 141 private: | 142 private: |
| 142 uint32_t surface_id_namespace_; | 143 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; |
| 143 bool is_showing_; | 144 bool is_showing_; |
| 144 bool is_occluded_; | 145 bool is_occluded_; |
| 145 bool did_swap_compositor_frame_; | 146 bool did_swap_compositor_frame_; |
| 146 ui::DummyTextInputClient text_input_client_; | 147 ui::DummyTextInputClient text_input_client_; |
| 147 }; | 148 }; |
| 148 | 149 |
| 149 #if defined(COMPILER_MSVC) | 150 #if defined(COMPILER_MSVC) |
| 150 // See comment for same warning on RenderViewHostImpl. | 151 // See comment for same warning on RenderViewHostImpl. |
| 151 #pragma warning(push) | 152 #pragma warning(push) |
| 152 #pragma warning(disable: 4250) | 153 #pragma warning(disable: 4250) |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 private: | 310 private: |
| 310 typedef std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors> | 311 typedef std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors> |
| 311 ScopedSetSupportedScaleFactors; | 312 ScopedSetSupportedScaleFactors; |
| 312 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; | 313 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; |
| 313 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); | 314 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); |
| 314 }; | 315 }; |
| 315 | 316 |
| 316 } // namespace content | 317 } // namespace content |
| 317 | 318 |
| 318 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ | 319 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ |
| OLD | NEW |