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" |
(...skipping 19 matching lines...) Expand all Loading... |
30 | 30 |
31 cc::SurfaceLayer::SatisfyCallback satisfyCallback = | 31 cc::SurfaceLayer::SatisfyCallback satisfyCallback = |
32 convertToBaseCallback(WTF::bind( | 32 convertToBaseCallback(WTF::bind( |
33 &CanvasSurfaceLayerBridge::satisfyCallback, WTF::unretained(this))); | 33 &CanvasSurfaceLayerBridge::satisfyCallback, WTF::unretained(this))); |
34 cc::SurfaceLayer::RequireCallback requireCallback = | 34 cc::SurfaceLayer::RequireCallback requireCallback = |
35 convertToBaseCallback(WTF::bind( | 35 convertToBaseCallback(WTF::bind( |
36 &CanvasSurfaceLayerBridge::requireCallback, WTF::unretained(this))); | 36 &CanvasSurfaceLayerBridge::requireCallback, WTF::unretained(this))); |
37 m_surfaceLayer = cc::SurfaceLayer::Create(std::move(satisfyCallback), | 37 m_surfaceLayer = cc::SurfaceLayer::Create(std::move(satisfyCallback), |
38 std::move(requireCallback)); | 38 std::move(requireCallback)); |
39 m_surfaceLayer->SetSurfaceId(m_surfaceId, 1.f, | 39 m_surfaceLayer->SetSurfaceId(m_surfaceId, 1.f, |
40 gfx::Size(canvasWidth, canvasHeight)); | 40 gfx::Size(canvasWidth, canvasHeight), |
| 41 true /* scale layer bounds with surface size */); |
41 | 42 |
42 m_webLayer = Platform::current()->compositorSupport()->createLayerFromCCLayer( | 43 m_webLayer = Platform::current()->compositorSupport()->createLayerFromCCLayer( |
43 m_surfaceLayer.get()); | 44 m_surfaceLayer.get()); |
44 GraphicsLayer::registerContentsLayer(m_webLayer.get()); | 45 GraphicsLayer::registerContentsLayer(m_webLayer.get()); |
45 return true; | 46 return true; |
46 } | 47 } |
47 | 48 |
48 void CanvasSurfaceLayerBridge::satisfyCallback( | 49 void CanvasSurfaceLayerBridge::satisfyCallback( |
49 const cc::SurfaceSequence& sequence) { | 50 const cc::SurfaceSequence& sequence) { |
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 |