| 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 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 const gfx::Rect& damage) { | 143 const gfx::Rect& damage) { |
| 144 cc::CompositorFrame frame; | 144 cc::CompositorFrame frame; |
| 145 frame.metadata.device_scale_factor = scale_factor; | 145 frame.metadata.device_scale_factor = scale_factor; |
| 146 | 146 |
| 147 std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create(); | 147 std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create(); |
| 148 pass->SetNew(1, gfx::Rect(size), damage, gfx::Transform()); | 148 pass->SetNew(1, gfx::Rect(size), damage, gfx::Transform()); |
| 149 frame.render_pass_list.push_back(std::move(pass)); | 149 frame.render_pass_list.push_back(std::move(pass)); |
| 150 return frame; | 150 return frame; |
| 151 } | 151 } |
| 152 | 152 |
| 153 TEST_F(RenderWidgetHostViewChildFrameTest, VisibilityTest) { | 153 // http://crbug.com/696919 |
| 154 #if defined(OS_WIN) |
| 155 #define MAYBE_VisibilityTest DISABLED_VisibilityTest |
| 156 #define MAYBE_SwapCompositorFrame DISABLED_SwapCompositorFrame |
| 157 #else |
| 158 #define MAYBE_VisibilityTest VisibilityTest |
| 159 #define MAYBE_SwapCompositorFrame SwapCompositorFrame |
| 160 #endif |
| 161 |
| 162 TEST_F(RenderWidgetHostViewChildFrameTest, MAYBE_VisibilityTest) { |
| 154 view_->Show(); | 163 view_->Show(); |
| 155 ASSERT_TRUE(view_->IsShowing()); | 164 ASSERT_TRUE(view_->IsShowing()); |
| 156 | 165 |
| 157 view_->Hide(); | 166 view_->Hide(); |
| 158 ASSERT_FALSE(view_->IsShowing()); | 167 ASSERT_FALSE(view_->IsShowing()); |
| 159 } | 168 } |
| 160 | 169 |
| 161 // http://crbug.com/696919 | |
| 162 #if defined(OS_WIN) | |
| 163 #define MAYBE_SwapCompositorFrame DISABLED_SwapCompositorFrame | |
| 164 #else | |
| 165 #define MAYBE_SwapCompositorFrame SwapCompositorFrame | |
| 166 #endif | |
| 167 | |
| 168 // Verify that OnSwapCompositorFrame behavior is correct when a delegated | 170 // Verify that OnSwapCompositorFrame behavior is correct when a delegated |
| 169 // frame is received from a renderer process. | 171 // frame is received from a renderer process. |
| 170 TEST_F(RenderWidgetHostViewChildFrameTest, MAYBE_SwapCompositorFrame) { | 172 TEST_F(RenderWidgetHostViewChildFrameTest, MAYBE_SwapCompositorFrame) { |
| 171 gfx::Size view_size(100, 100); | 173 gfx::Size view_size(100, 100); |
| 172 gfx::Rect view_rect(view_size); | 174 gfx::Rect view_rect(view_size); |
| 173 float scale_factor = 1.f; | 175 float scale_factor = 1.f; |
| 174 | 176 |
| 175 view_->SetSize(view_size); | 177 view_->SetSize(view_size); |
| 176 view_->Show(); | 178 view_->Show(); |
| 177 | 179 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 191 #endif | 193 #endif |
| 192 | 194 |
| 193 // Surface ID should have been passed to CrossProcessFrameConnector to | 195 // Surface ID should have been passed to CrossProcessFrameConnector to |
| 194 // be sent to the embedding renderer. | 196 // be sent to the embedding renderer. |
| 195 EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size), | 197 EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size), |
| 196 test_frame_connector_->last_surface_info_); | 198 test_frame_connector_->last_surface_info_); |
| 197 } | 199 } |
| 198 } | 200 } |
| 199 | 201 |
| 200 } // namespace content | 202 } // namespace content |
| OLD | NEW |