| 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_child_frame.h" | 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> |
| 8 | 9 |
| 9 #include "base/macros.h" | 10 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 11 #include "build/build_config.h" | 12 #include "build/build_config.h" |
| 12 #include "cc/surfaces/surface.h" | 13 #include "cc/surfaces/surface.h" |
| 13 #include "cc/surfaces/surface_factory.h" | 14 #include "cc/surfaces/surface_factory.h" |
| 14 #include "cc/surfaces/surface_manager.h" | 15 #include "cc/surfaces/surface_manager.h" |
| 15 #include "cc/surfaces/surface_sequence.h" | 16 #include "cc/surfaces/surface_sequence.h" |
| 16 #include "content/browser/compositor/test/no_transport_image_transport_factory.h
" | 17 #include "content/browser/compositor/test/no_transport_image_transport_factory.h
" |
| 17 #include "content/browser/frame_host/cross_process_frame_connector.h" | 18 #include "content/browser/frame_host/cross_process_frame_connector.h" |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 scoped_ptr<cc::CompositorFrame> CreateDelegatedFrame(float scale_factor, | 136 scoped_ptr<cc::CompositorFrame> CreateDelegatedFrame(float scale_factor, |
| 136 gfx::Size size, | 137 gfx::Size size, |
| 137 const gfx::Rect& damage) { | 138 const gfx::Rect& damage) { |
| 138 scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame); | 139 scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame); |
| 139 frame->metadata.device_scale_factor = scale_factor; | 140 frame->metadata.device_scale_factor = scale_factor; |
| 140 frame->delegated_frame_data.reset(new cc::DelegatedFrameData); | 141 frame->delegated_frame_data.reset(new cc::DelegatedFrameData); |
| 141 | 142 |
| 142 scoped_ptr<cc::RenderPass> pass = cc::RenderPass::Create(); | 143 scoped_ptr<cc::RenderPass> pass = cc::RenderPass::Create(); |
| 143 pass->SetNew(cc::RenderPassId(1, 1), gfx::Rect(size), damage, | 144 pass->SetNew(cc::RenderPassId(1, 1), gfx::Rect(size), damage, |
| 144 gfx::Transform()); | 145 gfx::Transform()); |
| 145 frame->delegated_frame_data->render_pass_list.push_back(pass.Pass()); | 146 frame->delegated_frame_data->render_pass_list.push_back(std::move(pass)); |
| 146 return frame; | 147 return frame; |
| 147 } | 148 } |
| 148 | 149 |
| 149 TEST_F(RenderWidgetHostViewChildFrameTest, VisibilityTest) { | 150 TEST_F(RenderWidgetHostViewChildFrameTest, VisibilityTest) { |
| 150 view_->Show(); | 151 view_->Show(); |
| 151 ASSERT_TRUE(view_->IsShowing()); | 152 ASSERT_TRUE(view_->IsShowing()); |
| 152 | 153 |
| 153 view_->Hide(); | 154 view_->Hide(); |
| 154 ASSERT_FALSE(view_->IsShowing()); | 155 ASSERT_FALSE(view_->IsShowing()); |
| 155 } | 156 } |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 test_frame_connector_->last_scale_factor_received_); | 188 test_frame_connector_->last_scale_factor_received_); |
| 188 } | 189 } |
| 189 } else { | 190 } else { |
| 190 EXPECT_TRUE(test_frame_connector_->received_delegated_frame_); | 191 EXPECT_TRUE(test_frame_connector_->received_delegated_frame_); |
| 191 EXPECT_EQ(view_size, test_frame_connector_->last_frame_size_received_); | 192 EXPECT_EQ(view_size, test_frame_connector_->last_frame_size_received_); |
| 192 EXPECT_EQ(scale_factor, test_frame_connector_->last_scale_factor_received_); | 193 EXPECT_EQ(scale_factor, test_frame_connector_->last_scale_factor_received_); |
| 193 } | 194 } |
| 194 } | 195 } |
| 195 | 196 |
| 196 } // namespace content | 197 } // namespace content |
| OLD | NEW |