| 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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 | 207 |
| 208 private: | 208 private: |
| 209 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuestSurfaceTest); | 209 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuestSurfaceTest); |
| 210 }; | 210 }; |
| 211 | 211 |
| 212 namespace { | 212 namespace { |
| 213 std::unique_ptr<cc::CompositorFrame> CreateDelegatedFrame( | 213 std::unique_ptr<cc::CompositorFrame> CreateDelegatedFrame( |
| 214 float scale_factor, | 214 float scale_factor, |
| 215 gfx::Size size, | 215 gfx::Size size, |
| 216 const gfx::Rect& damage) { | 216 const gfx::Rect& damage) { |
| 217 std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame); | 217 std::unique_ptr<cc::CompositorFrame> frame(cc::CompositorFrame::Create()); |
| 218 frame->metadata.device_scale_factor = scale_factor; | 218 frame->metadata.device_scale_factor = scale_factor; |
| 219 frame->delegated_frame_data.reset(new cc::DelegatedFrameData); | 219 frame->delegated_frame_data.reset(new cc::DelegatedFrameData); |
| 220 | 220 |
| 221 std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create(); | 221 std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create(); |
| 222 pass->SetNew(cc::RenderPassId(1, 1), gfx::Rect(size), damage, | 222 pass->SetNew(cc::RenderPassId(1, 1), gfx::Rect(size), damage, |
| 223 gfx::Transform()); | 223 gfx::Transform()); |
| 224 frame->delegated_frame_data->render_pass_list.push_back(std::move(pass)); | 224 frame->delegated_frame_data->render_pass_list.push_back(std::move(pass)); |
| 225 return frame; | 225 return frame; |
| 226 } | 226 } |
| 227 } // anonymous namespace | 227 } // anonymous namespace |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 | 283 |
| 284 browser_plugin_guest_->set_attached(false); | 284 browser_plugin_guest_->set_attached(false); |
| 285 browser_plugin_guest_->ResetTestData(); | 285 browser_plugin_guest_->ResetTestData(); |
| 286 | 286 |
| 287 view_->OnSwapCompositorFrame( | 287 view_->OnSwapCompositorFrame( |
| 288 0, CreateDelegatedFrame(scale_factor, view_size, view_rect)); | 288 0, CreateDelegatedFrame(scale_factor, view_size, view_rect)); |
| 289 EXPECT_TRUE(surface_id().is_null()); | 289 EXPECT_TRUE(surface_id().is_null()); |
| 290 } | 290 } |
| 291 | 291 |
| 292 } // namespace content | 292 } // namespace content |
| OLD | NEW |