| 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" | |
| 18 | 17 |
| 19 namespace blink { | 18 namespace blink { |
| 20 | 19 |
| 21 CanvasSurfaceLayerBridge::CanvasSurfaceLayerBridge( | 20 CanvasSurfaceLayerBridge::CanvasSurfaceLayerBridge( |
| 22 mojom::blink::OffscreenCanvasSurfacePtr service) | 21 mojom::blink::OffscreenCanvasSurfacePtr service) |
| 23 : m_service(std::move(service)) {} | 22 : m_service(std::move(service)) {} |
| 24 | 23 |
| 25 CanvasSurfaceLayerBridge::~CanvasSurfaceLayerBridge() {} | 24 CanvasSurfaceLayerBridge::~CanvasSurfaceLayerBridge() {} |
| 26 | 25 |
| 27 bool CanvasSurfaceLayerBridge::createSurfaceLayer(int canvasWidth, | 26 bool CanvasSurfaceLayerBridge::createSurfaceLayer(int canvasWidth, |
| 28 int canvasHeight) { | 27 int canvasHeight) { |
| 29 if (!m_service->GetSurfaceId(&m_surfaceId)) | 28 if (!m_service->GetSurfaceId(&m_surfaceId)) |
| 30 return false; | 29 return false; |
| 31 | 30 |
| 32 cc::SurfaceLayer::SatisfyCallback satisfyCallback = | 31 cc::SurfaceLayer::SatisfyCallback satisfyCallback = |
| 33 convertToBaseCallback(WTF::bind( | 32 convertToBaseCallback(WTF::bind( |
| 34 &CanvasSurfaceLayerBridge::satisfyCallback, WTF::unretained(this))); | 33 &CanvasSurfaceLayerBridge::satisfyCallback, WTF::unretained(this))); |
| 35 cc::SurfaceLayer::RequireCallback requireCallback = | 34 cc::SurfaceLayer::RequireCallback requireCallback = |
| 36 convertToBaseCallback(WTF::bind( | 35 convertToBaseCallback(WTF::bind( |
| 37 &CanvasSurfaceLayerBridge::requireCallback, WTF::unretained(this))); | 36 &CanvasSurfaceLayerBridge::requireCallback, WTF::unretained(this))); |
| 38 m_surfaceLayer = cc::SurfaceLayer::Create(std::move(satisfyCallback), | 37 m_surfaceLayer = cc::SurfaceLayer::Create(std::move(satisfyCallback), |
| 39 std::move(requireCallback)); | 38 std::move(requireCallback)); |
| 40 m_surfaceLayer->SetSurfaceId(m_surfaceId, 1.f, | 39 m_surfaceLayer->SetSurfaceId(m_surfaceId, 1.f, |
| 41 gfx::Size(canvasWidth, canvasHeight)); | 40 gfx::Size(canvasWidth, canvasHeight)); |
| 42 | 41 |
| 43 m_webLayer = wrapUnique( | 42 m_webLayer = Platform::current()->compositorSupport()->createLayerFromCCLayer( |
| 44 Platform::current()->compositorSupport()->createLayerFromCCLayer( | 43 m_surfaceLayer.get()); |
| 45 m_surfaceLayer.get())); | |
| 46 GraphicsLayer::registerContentsLayer(m_webLayer.get()); | 44 GraphicsLayer::registerContentsLayer(m_webLayer.get()); |
| 47 return true; | 45 return true; |
| 48 } | 46 } |
| 49 | 47 |
| 50 void CanvasSurfaceLayerBridge::satisfyCallback( | 48 void CanvasSurfaceLayerBridge::satisfyCallback( |
| 51 const cc::SurfaceSequence& sequence) { | 49 const cc::SurfaceSequence& sequence) { |
| 52 m_service->Satisfy(sequence); | 50 m_service->Satisfy(sequence); |
| 53 } | 51 } |
| 54 | 52 |
| 55 void CanvasSurfaceLayerBridge::requireCallback( | 53 void CanvasSurfaceLayerBridge::requireCallback( |
| 56 const cc::SurfaceId& surfaceId, | 54 const cc::SurfaceId& surfaceId, |
| 57 const cc::SurfaceSequence& sequence) { | 55 const cc::SurfaceSequence& sequence) { |
| 58 m_service->Require(surfaceId, sequence); | 56 m_service->Require(surfaceId, sequence); |
| 59 } | 57 } |
| 60 | 58 |
| 61 } // namespace blink | 59 } // namespace blink |
| OLD | NEW |