Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Side by Side Diff: third_party/WebKit/Source/platform/graphics/CanvasSurfaceLayerBridge.cpp

Issue 2956713003: Replaces VideoLayer with a SurfaceLayer in WebMediaPlayerImpl (Closed)
Patch Set: Replaces VideoLayer with SurfaceLayer. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/layer.h" 7 #include "cc/layers/layer.h"
8 #include "cc/layers/solid_color_layer.h" 8 #include "cc/layers/solid_color_layer.h"
9 #include "cc/layers/surface_layer.h" 9 #include "cc/layers/surface_layer.h"
10 #include "cc/surfaces/sequence_surface_reference_factory.h" 10 #include "cc/surfaces/sequence_surface_reference_factory.h"
11 #include "cc/surfaces/surface_id.h" 11 #include "cc/surfaces/surface_id.h"
12 #include "cc/surfaces/surface_info.h" 12 #include "cc/surfaces/surface_info.h"
13 #include "cc/surfaces/surface_sequence.h" 13 #include "cc/surfaces/surface_sequence.h"
14 #include "platform/graphics/GraphicsLayer.h" 14 #include "platform/graphics/GraphicsLayer.h"
15 #include "platform/graphics/SurfaceLayerBridge.h"
15 #include "platform/mojo/MojoHelper.h" 16 #include "platform/mojo/MojoHelper.h"
16 #include "platform/wtf/Functional.h" 17 #include "platform/wtf/Functional.h"
17 #include "public/platform/InterfaceProvider.h" 18 #include "public/platform/InterfaceProvider.h"
18 #include "public/platform/Platform.h" 19 #include "public/platform/Platform.h"
19 #include "public/platform/WebCompositorSupport.h" 20 #include "public/platform/WebCompositorSupport.h"
20 #include "public/platform/WebLayer.h" 21 #include "public/platform/WebLayer.h"
21 #include "public/platform/WebLayerTreeView.h" 22 #include "public/platform/WebLayerTreeView.h"
23 #include "public/platform/WebSurfaceLayerBridgeObserver.h"
22 #include "public/platform/modules/offscreencanvas/offscreen_canvas_surface.mojom -blink.h" 24 #include "public/platform/modules/offscreencanvas/offscreen_canvas_surface.mojom -blink.h"
23 #include "ui/gfx/geometry/size.h" 25 #include "ui/gfx/geometry/size.h"
24 26
25 namespace blink { 27 namespace blink {
26 28
27 namespace {
28
29 class OffscreenCanvasSurfaceReferenceFactory
30 : public cc::SequenceSurfaceReferenceFactory {
31 public:
32 OffscreenCanvasSurfaceReferenceFactory(
33 base::WeakPtr<CanvasSurfaceLayerBridge> bridge)
34 : bridge_(bridge) {}
35
36 private:
37 ~OffscreenCanvasSurfaceReferenceFactory() override = default;
38
39 // cc::SequenceSurfaceReferenceFactory implementation:
40 void RequireSequence(const cc::SurfaceId& id,
41 const cc::SurfaceSequence& sequence) const override {
42 DCHECK(bridge_);
43 bridge_->RequireCallback(id, sequence);
44 }
45
46 void SatisfySequence(const cc::SurfaceSequence& sequence) const override {
47 if (bridge_)
48 bridge_->SatisfyCallback(sequence);
49 }
50
51 base::WeakPtr<CanvasSurfaceLayerBridge> bridge_;
52
53 DISALLOW_COPY_AND_ASSIGN(OffscreenCanvasSurfaceReferenceFactory);
54 };
55
56 } // namespace
57
58 CanvasSurfaceLayerBridge::CanvasSurfaceLayerBridge( 29 CanvasSurfaceLayerBridge::CanvasSurfaceLayerBridge(
59 CanvasSurfaceLayerBridgeObserver* observer, 30 WebSurfaceLayerBridgeObserver* observer,
60 WebLayerTreeView* layer_tree_view) 31 WebLayerTreeView* layer_tree_view)
61 : weak_factory_(this), 32 : weak_factory_(this),
62 observer_(observer), 33 observer_(observer),
63 binding_(this), 34 binding_(this),
64 frame_sink_id_(Platform::Current()->GenerateFrameSinkId()), 35 frame_sink_id_(Platform::Current()->GenerateFrameSinkId()),
65 parent_frame_sink_id_(layer_tree_view ? layer_tree_view->GetFrameSinkId() 36 parent_frame_sink_id_(layer_tree_view ? layer_tree_view->GetFrameSinkId()
66 : cc::FrameSinkId()) { 37 : cc::FrameSinkId()) {
67 ref_factory_ = 38 ref_factory_ =
68 new OffscreenCanvasSurfaceReferenceFactory(weak_factory_.GetWeakPtr()); 39 new SequenceSurfaceReferenceFactoryImpl(weak_factory_.GetWeakPtr());
69 40
70 DCHECK(!service_.is_bound()); 41 DCHECK(!service_.is_bound());
71 mojom::blink::OffscreenCanvasProviderPtr provider; 42 mojom::blink::OffscreenCanvasProviderPtr provider;
72 Platform::Current()->GetInterfaceProvider()->GetInterface( 43 Platform::Current()->GetInterfaceProvider()->GetInterface(
73 mojo::MakeRequest(&provider)); 44 mojo::MakeRequest(&provider));
74 // TODO(xlai): Ensure OffscreenCanvas commit() is still functional when a 45 // TODO(xlai): Ensure OffscreenCanvas commit() is still functional when a
75 // frame-less HTML canvas's document is reparenting under another frame. 46 // frame-less HTML canvas's document is reparenting under another frame.
76 // See crbug.com/683172. 47 // See crbug.com/683172.
77 blink::mojom::blink::OffscreenCanvasSurfaceClientPtr client; 48 blink::mojom::blink::OffscreenCanvasSurfaceClientPtr client;
78 binding_.Bind(mojo::MakeRequest(&client)); 49 binding_.Bind(mojo::MakeRequest(&client));
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 service_->Satisfy(sequence); 105 service_->Satisfy(sequence);
135 } 106 }
136 107
137 void CanvasSurfaceLayerBridge::RequireCallback( 108 void CanvasSurfaceLayerBridge::RequireCallback(
138 const cc::SurfaceId& surface_id, 109 const cc::SurfaceId& surface_id,
139 const cc::SurfaceSequence& sequence) { 110 const cc::SurfaceSequence& sequence) {
140 service_->Require(surface_id, sequence); 111 service_->Require(surface_id, sequence);
141 } 112 }
142 113
143 } // namespace blink 114 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698