| 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 #include "content/browser/frame_host/render_widget_host_view_guest.h" | 5 #include "content/browser/frame_host/render_widget_host_view_guest.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 float scale_factor, | 131 float scale_factor, |
| 132 const cc::SurfaceSequence& sequence) override { | 132 const cc::SurfaceSequence& sequence) override { |
| 133 last_surface_id_received_ = surface_id; | 133 last_surface_id_received_ = surface_id; |
| 134 last_frame_size_received_ = frame_size; | 134 last_frame_size_received_ = frame_size; |
| 135 last_scale_factor_received_ = scale_factor; | 135 last_scale_factor_received_ = scale_factor; |
| 136 } | 136 } |
| 137 | 137 |
| 138 cc::SurfaceId last_surface_id_received_; | 138 cc::SurfaceId last_surface_id_received_; |
| 139 gfx::Size last_frame_size_received_; | 139 gfx::Size last_frame_size_received_; |
| 140 float last_scale_factor_received_; | 140 float last_scale_factor_received_; |
| 141 float update_scale_factor_received_; | |
| 142 }; | 141 }; |
| 143 | 142 |
| 144 // TODO(wjmaclean): we should restructure RenderWidgetHostViewChildFrameTest to | 143 // TODO(wjmaclean): we should restructure RenderWidgetHostViewChildFrameTest to |
| 145 // look more like this one, and then this one could be derived from it. Also, | 144 // look more like this one, and then this one could be derived from it. Also, |
| 146 // include CreateDelegatedFrame as part of the test class so we don't have to | 145 // include CreateDelegatedFrame as part of the test class so we don't have to |
| 147 // repeat it here. | 146 // repeat it here. |
| 148 class RenderWidgetHostViewGuestSurfaceTest | 147 class RenderWidgetHostViewGuestSurfaceTest |
| 149 : public testing::Test { | 148 : public testing::Test { |
| 150 public: | 149 public: |
| 151 RenderWidgetHostViewGuestSurfaceTest() | 150 RenderWidgetHostViewGuestSurfaceTest() |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 | 283 |
| 285 browser_plugin_guest_->set_attached(false); | 284 browser_plugin_guest_->set_attached(false); |
| 286 browser_plugin_guest_->ResetTestData(); | 285 browser_plugin_guest_->ResetTestData(); |
| 287 | 286 |
| 288 view_->OnSwapCompositorFrame( | 287 view_->OnSwapCompositorFrame( |
| 289 0, CreateDelegatedFrame(scale_factor, view_size, view_rect)); | 288 0, CreateDelegatedFrame(scale_factor, view_size, view_rect)); |
| 290 EXPECT_TRUE(surface_id().is_null()); | 289 EXPECT_TRUE(surface_id().is_null()); |
| 291 } | 290 } |
| 292 | 291 |
| 293 } // namespace content | 292 } // namespace content |
| OLD | NEW |