OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "platform/graphics/CanvasSurfaceLayerBridge.h" | 5 #include "platform/graphics/CanvasSurfaceLayerBridge.h" |
6 | 6 |
7 #include "cc/layers/surface_layer.h" | 7 #include "cc/layers/surface_layer.h" |
8 #include "cc/surfaces/surface_id.h" | 8 #include "cc/surfaces/surface_id.h" |
9 #include "cc/surfaces/surface_sequence.h" | 9 #include "cc/surfaces/surface_sequence.h" |
10 #include "platform/graphics/GraphicsLayer.h" | 10 #include "platform/graphics/GraphicsLayer.h" |
11 #include "platform/mojo/MojoHelper.h" | 11 #include "platform/mojo/MojoHelper.h" |
12 #include "public/platform/Platform.h" | 12 #include "public/platform/Platform.h" |
13 #include "public/platform/WebCompositorSupport.h" | 13 #include "public/platform/WebCompositorSupport.h" |
14 #include "public/platform/WebLayer.h" | 14 #include "public/platform/WebLayer.h" |
15 #include "ui/gfx/geometry/size.h" | 15 #include "ui/gfx/geometry/size.h" |
16 #include "wtf/Functional.h" | 16 #include "wtf/Functional.h" |
17 #include "wtf/PtrUtil.h" | 17 #include "wtf/PtrUtil.h" |
18 | 18 |
19 namespace blink { | 19 namespace blink { |
20 | 20 |
21 CanvasSurfaceLayerBridge::CanvasSurfaceLayerBridge(std::unique_ptr<CanvasSurface
LayerBridgeClient> client) | 21 CanvasSurfaceLayerBridge::CanvasSurfaceLayerBridge(mojom::blink::OffscreenCanvas
SurfacePtr service) |
| 22 : m_service(std::move(service)) |
22 { | 23 { |
23 m_client = std::move(client); | |
24 } | 24 } |
25 | 25 |
26 CanvasSurfaceLayerBridge::~CanvasSurfaceLayerBridge() | 26 CanvasSurfaceLayerBridge::~CanvasSurfaceLayerBridge() |
27 { | 27 { |
28 } | 28 } |
29 | 29 |
30 bool CanvasSurfaceLayerBridge::createSurfaceLayer(int canvasWidth, int canvasHei
ght) | 30 bool CanvasSurfaceLayerBridge::createSurfaceLayer(int canvasWidth, int canvasHei
ght) |
31 { | 31 { |
32 if (!m_client->syncGetSurfaceId(&m_surfaceId)) | 32 if (!m_service->GetSurfaceId(&m_surfaceId)) |
33 return false; | 33 return false; |
34 | 34 |
35 cc::SurfaceLayer::SatisfyCallback satisfyCallback = convertToBaseCallback(WT
F::bind(&CanvasSurfaceLayerBridge::satisfyCallback, WTF::unretained(this))); | 35 cc::SurfaceLayer::SatisfyCallback satisfyCallback = convertToBaseCallback(WT
F::bind(&CanvasSurfaceLayerBridge::satisfyCallback, WTF::unretained(this))); |
36 cc::SurfaceLayer::RequireCallback requireCallback = convertToBaseCallback(WT
F::bind(&CanvasSurfaceLayerBridge::requireCallback, WTF::unretained(this))); | 36 cc::SurfaceLayer::RequireCallback requireCallback = convertToBaseCallback(WT
F::bind(&CanvasSurfaceLayerBridge::requireCallback, WTF::unretained(this))); |
37 m_surfaceLayer = cc::SurfaceLayer::Create(std::move(satisfyCallback), std::m
ove(requireCallback)); | 37 m_surfaceLayer = cc::SurfaceLayer::Create(std::move(satisfyCallback), std::m
ove(requireCallback)); |
38 m_surfaceLayer->SetSurfaceId(m_surfaceId, 1.f, gfx::Size(canvasWidth, canvas
Height)); | 38 m_surfaceLayer->SetSurfaceId(m_surfaceId, 1.f, gfx::Size(canvasWidth, canvas
Height)); |
39 | 39 |
40 m_webLayer = wrapUnique(Platform::current()->compositorSupport()->createLaye
rFromCCLayer(m_surfaceLayer.get())); | 40 m_webLayer = wrapUnique(Platform::current()->compositorSupport()->createLaye
rFromCCLayer(m_surfaceLayer.get())); |
41 GraphicsLayer::registerContentsLayer(m_webLayer.get()); | 41 GraphicsLayer::registerContentsLayer(m_webLayer.get()); |
42 return true; | 42 return true; |
43 } | 43 } |
44 | 44 |
45 void CanvasSurfaceLayerBridge::satisfyCallback(const cc::SurfaceSequence& sequen
ce) | 45 void CanvasSurfaceLayerBridge::satisfyCallback(const cc::SurfaceSequence& sequen
ce) |
46 { | 46 { |
47 m_client->asyncSatisfy(sequence); | 47 m_service->Satisfy(sequence); |
48 } | 48 } |
49 | 49 |
50 void CanvasSurfaceLayerBridge::requireCallback(const cc::SurfaceId& surfaceId, c
onst cc::SurfaceSequence& sequence) | 50 void CanvasSurfaceLayerBridge::requireCallback(const cc::SurfaceId& surfaceId, c
onst cc::SurfaceSequence& sequence) |
51 { | 51 { |
52 m_client->asyncRequire(surfaceId, sequence); | 52 m_service->Require(surfaceId, sequence); |
53 } | 53 } |
54 | 54 |
55 } // namespace blink | 55 } // namespace blink |
OLD | NEW |