| 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 "examples/surfaces_app/embedder.h" | 5 #include "examples/surfaces_app/embedder.h" |
| 6 | 6 |
| 7 #include "base/bind.h" |
| 7 #include "cc/output/compositor_frame.h" | 8 #include "cc/output/compositor_frame.h" |
| 8 #include "cc/output/delegated_frame_data.h" | 9 #include "cc/output/delegated_frame_data.h" |
| 9 #include "cc/quads/render_pass.h" | 10 #include "cc/quads/render_pass.h" |
| 10 #include "cc/quads/solid_color_draw_quad.h" | 11 #include "cc/quads/solid_color_draw_quad.h" |
| 11 #include "cc/quads/surface_draw_quad.h" | 12 #include "cc/quads/surface_draw_quad.h" |
| 12 #include "examples/surfaces_app/surfaces_util.h" | 13 #include "examples/surfaces_app/surfaces_util.h" |
| 13 #include "mojo/converters/surfaces/surfaces_type_converters.h" | 14 #include "mojo/converters/surfaces/surfaces_type_converters.h" |
| 14 #include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h" | 15 #include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h" |
| 15 #include "ui/gfx/rect.h" | 16 #include "ui/gfx/rect.h" |
| 16 #include "ui/gfx/size.h" | 17 #include "ui/gfx/size.h" |
| 17 #include "ui/gfx/transform.h" | 18 #include "ui/gfx/transform.h" |
| 18 | 19 |
| 19 namespace mojo { | 20 namespace mojo { |
| 20 namespace examples { | 21 namespace examples { |
| 21 | 22 |
| 22 using cc::RenderPass; | 23 using cc::RenderPass; |
| 23 using cc::RenderPassId; | 24 using cc::RenderPassId; |
| 24 using cc::SurfaceDrawQuad; | 25 using cc::SurfaceDrawQuad; |
| 25 using cc::DrawQuad; | 26 using cc::DrawQuad; |
| 26 using cc::SolidColorDrawQuad; | 27 using cc::SolidColorDrawQuad; |
| 27 using cc::DelegatedFrameData; | 28 using cc::DelegatedFrameData; |
| 28 using cc::CompositorFrame; | 29 using cc::CompositorFrame; |
| 29 | 30 |
| 30 Embedder::Embedder(uint32_t local_id, Surface* surface) | 31 Embedder::Embedder(Display* display) |
| 31 : local_id_(local_id), surface_(surface) { | 32 : display_(display), frame_pending_(false) { |
| 32 } | 33 } |
| 33 | 34 |
| 34 Embedder::~Embedder() { | 35 Embedder::~Embedder() { |
| 35 } | 36 } |
| 36 | 37 |
| 37 void Embedder::ProduceFrame(cc::SurfaceId child_one, | 38 void Embedder::ProduceFrame(cc::SurfaceId child_one, |
| 38 cc::SurfaceId child_two, | 39 cc::SurfaceId child_two, |
| 39 const gfx::Size& child_size, | 40 const gfx::Size& child_size, |
| 40 const gfx::Size& size, | 41 const gfx::Size& size, |
| 41 int offset) { | 42 int offset) { |
| 43 DCHECK(!frame_pending_); |
| 44 |
| 42 gfx::Rect rect(size); | 45 gfx::Rect rect(size); |
| 43 RenderPassId pass_id(1, 1); | 46 RenderPassId pass_id(1, 1); |
| 44 scoped_ptr<RenderPass> pass = RenderPass::Create(); | 47 scoped_ptr<RenderPass> pass = RenderPass::Create(); |
| 45 pass->SetNew(pass_id, rect, rect, gfx::Transform()); | 48 pass->SetNew(pass_id, rect, rect, gfx::Transform()); |
| 46 | 49 |
| 47 if (!child_one.is_null()) { | 50 if (!child_one.is_null()) { |
| 48 gfx::Transform one_transform; | 51 gfx::Transform one_transform; |
| 49 one_transform.Translate(10 + child_size.width() / 2, | 52 one_transform.Translate(10 + child_size.width() / 2, |
| 50 50 + child_size.height() / 2); | 53 50 + child_size.height() / 2); |
| 51 one_transform.Translate(0, offset); | 54 one_transform.Translate(0, offset); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 rect, | 86 rect, |
| 84 SK_ColorYELLOW, | 87 SK_ColorYELLOW, |
| 85 force_anti_aliasing_off); | 88 force_anti_aliasing_off); |
| 86 | 89 |
| 87 scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData); | 90 scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData); |
| 88 delegated_frame_data->render_pass_list.push_back(pass.Pass()); | 91 delegated_frame_data->render_pass_list.push_back(pass.Pass()); |
| 89 | 92 |
| 90 scoped_ptr<CompositorFrame> frame(new CompositorFrame); | 93 scoped_ptr<CompositorFrame> frame(new CompositorFrame); |
| 91 frame->delegated_frame_data = delegated_frame_data.Pass(); | 94 frame->delegated_frame_data = delegated_frame_data.Pass(); |
| 92 | 95 |
| 93 surface_->SubmitFrame(local_id_, mojo::Frame::From(*frame), mojo::Closure()); | 96 frame_pending_ = true; |
| 97 display_->SubmitFrame(mojo::Frame::From(*frame), |
| 98 [this]() { frame_pending_ = false; }); |
| 94 } | 99 } |
| 95 | 100 |
| 96 } // namespace examples | 101 } // namespace examples |
| 97 } // namespace mojo | 102 } // namespace mojo |
| OLD | NEW |