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 | 17 |
18 namespace blink { | 18 namespace blink { |
19 | 19 |
20 CanvasSurfaceLayerBridge::CanvasSurfaceLayerBridge( | 20 CanvasSurfaceLayerBridge::CanvasSurfaceLayerBridge( |
21 mojom::blink::OffscreenCanvasSurfacePtr service) | 21 mojom::blink::OffscreenCanvasSurfacePtr service) |
22 : m_service(std::move(service)) {} | 22 : m_service(std::move(service)) {} |
23 | 23 |
24 CanvasSurfaceLayerBridge::~CanvasSurfaceLayerBridge() {} | 24 CanvasSurfaceLayerBridge::~CanvasSurfaceLayerBridge() {} |
25 | 25 |
26 bool CanvasSurfaceLayerBridge::createSurfaceLayer(int canvasWidth, | 26 bool CanvasSurfaceLayerBridge::createSurfaceLayer(int canvasId, |
| 27 int canvasWidth, |
27 int canvasHeight) { | 28 int canvasHeight) { |
28 if (!m_service->GetSurfaceId(&m_surfaceId)) | 29 if (!m_service->GetSurfaceId(canvasId, &m_surfaceId)) |
29 return false; | 30 return false; |
30 | 31 |
31 cc::SurfaceLayer::SatisfyCallback satisfyCallback = | 32 cc::SurfaceLayer::SatisfyCallback satisfyCallback = |
32 convertToBaseCallback(WTF::bind( | 33 convertToBaseCallback(WTF::bind( |
33 &CanvasSurfaceLayerBridge::satisfyCallback, WTF::unretained(this))); | 34 &CanvasSurfaceLayerBridge::satisfyCallback, WTF::unretained(this))); |
34 cc::SurfaceLayer::RequireCallback requireCallback = | 35 cc::SurfaceLayer::RequireCallback requireCallback = |
35 convertToBaseCallback(WTF::bind( | 36 convertToBaseCallback(WTF::bind( |
36 &CanvasSurfaceLayerBridge::requireCallback, WTF::unretained(this))); | 37 &CanvasSurfaceLayerBridge::requireCallback, WTF::unretained(this))); |
37 m_surfaceLayer = cc::SurfaceLayer::Create(std::move(satisfyCallback), | 38 m_surfaceLayer = cc::SurfaceLayer::Create(std::move(satisfyCallback), |
38 std::move(requireCallback)); | 39 std::move(requireCallback)); |
(...skipping 11 matching lines...) Expand all Loading... |
50 m_service->Satisfy(sequence); | 51 m_service->Satisfy(sequence); |
51 } | 52 } |
52 | 53 |
53 void CanvasSurfaceLayerBridge::requireCallback( | 54 void CanvasSurfaceLayerBridge::requireCallback( |
54 const cc::SurfaceId& surfaceId, | 55 const cc::SurfaceId& surfaceId, |
55 const cc::SurfaceSequence& sequence) { | 56 const cc::SurfaceSequence& sequence) { |
56 m_service->Require(surfaceId, sequence); | 57 m_service->Require(surfaceId, sequence); |
57 } | 58 } |
58 | 59 |
59 } // namespace blink | 60 } // namespace blink |
OLD | NEW |