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

Side by Side Diff: cc/output/compositor_frame_sink.cc

Issue 2402173002: cc: Get rid of PostSwapBuffersComplete. (Closed)
Patch Set: postswap: fix-blimp-unittest-post-swap-acks Created 4 years, 2 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
« no previous file with comments | « cc/output/compositor_frame_sink.h ('k') | cc/output/output_surface.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "cc/output/compositor_frame_sink.h" 5 #include "cc/output/compositor_frame_sink.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/threading/thread_task_runner_handle.h" 12 #include "base/threading/thread_task_runner_handle.h"
13 #include "base/trace_event/trace_event.h" 13 #include "base/trace_event/trace_event.h"
14 #include "cc/output/compositor_frame_sink_client.h" 14 #include "cc/output/compositor_frame_sink_client.h"
15 #include "gpu/GLES2/gl2extchromium.h" 15 #include "gpu/GLES2/gl2extchromium.h"
16 #include "gpu/command_buffer/client/context_support.h" 16 #include "gpu/command_buffer/client/context_support.h"
17 #include "gpu/command_buffer/client/gles2_interface.h" 17 #include "gpu/command_buffer/client/gles2_interface.h"
18 18
19 namespace cc { 19 namespace cc {
20 20
21 CompositorFrameSink::CompositorFrameSink( 21 CompositorFrameSink::CompositorFrameSink(
22 scoped_refptr<ContextProvider> context_provider, 22 scoped_refptr<ContextProvider> context_provider,
23 scoped_refptr<ContextProvider> worker_context_provider) 23 scoped_refptr<ContextProvider> worker_context_provider)
24 : context_provider_(std::move(context_provider)), 24 : context_provider_(std::move(context_provider)),
25 worker_context_provider_(std::move(worker_context_provider)), 25 worker_context_provider_(std::move(worker_context_provider)) {
26 weak_ptr_factory_(this) {
27 client_thread_checker_.DetachFromThread(); 26 client_thread_checker_.DetachFromThread();
28 } 27 }
29 28
30 CompositorFrameSink::CompositorFrameSink( 29 CompositorFrameSink::CompositorFrameSink(
31 scoped_refptr<VulkanContextProvider> vulkan_context_provider) 30 scoped_refptr<VulkanContextProvider> vulkan_context_provider)
32 : vulkan_context_provider_(vulkan_context_provider), 31 : vulkan_context_provider_(vulkan_context_provider) {
33 weak_ptr_factory_(this) {
34 client_thread_checker_.DetachFromThread(); 32 client_thread_checker_.DetachFromThread();
35 } 33 }
36 34
37 CompositorFrameSink::~CompositorFrameSink() { 35 CompositorFrameSink::~CompositorFrameSink() {
38 if (client_) 36 if (client_)
39 DetachFromClientInternal(); 37 DetachFromClientInternal();
40 } 38 }
41 39
42 bool CompositorFrameSink::BindToClient(CompositorFrameSinkClient* client) { 40 bool CompositorFrameSink::BindToClient(CompositorFrameSinkClient* client) {
43 DCHECK(client_thread_checker_.CalledOnValidThread()); 41 DCHECK(client_thread_checker_.CalledOnValidThread());
(...skipping 13 matching lines...) Expand all
57 55
58 if (!success) 56 if (!success)
59 DetachFromClient(); 57 DetachFromClient();
60 return success; 58 return success;
61 } 59 }
62 60
63 void CompositorFrameSink::DetachFromClient() { 61 void CompositorFrameSink::DetachFromClient() {
64 DetachFromClientInternal(); 62 DetachFromClientInternal();
65 } 63 }
66 64
67 void CompositorFrameSink::PostSwapBuffersComplete() {
68 base::ThreadTaskRunnerHandle::Get()->PostTask(
69 FROM_HERE, base::Bind(&CompositorFrameSink::OnSwapBuffersComplete,
70 weak_ptr_factory_.GetWeakPtr()));
71 }
72
73 // We don't post tasks bound to the client directly since they might run 65 // We don't post tasks bound to the client directly since they might run
74 // after the CompositorFrameSink has been destroyed. 66 // after the CompositorFrameSink has been destroyed.
75 void CompositorFrameSink::OnSwapBuffersComplete() { 67 void CompositorFrameSink::OnSwapBuffersComplete() {
76 client_->DidSwapBuffersComplete(); 68 client_->DidSwapBuffersComplete();
77 } 69 }
78 70
79 void CompositorFrameSink::DetachFromClientInternal() { 71 void CompositorFrameSink::DetachFromClientInternal() {
80 DCHECK(client_thread_checker_.CalledOnValidThread()); 72 DCHECK(client_thread_checker_.CalledOnValidThread());
81 DCHECK(client_); 73 DCHECK(client_);
82 74
83 if (context_provider_.get()) { 75 if (context_provider_.get()) {
84 context_provider_->SetLostContextCallback( 76 context_provider_->SetLostContextCallback(
85 ContextProvider::LostContextCallback()); 77 ContextProvider::LostContextCallback());
86 } 78 }
87 context_provider_ = nullptr; 79 context_provider_ = nullptr;
88 client_ = nullptr; 80 client_ = nullptr;
89 weak_ptr_factory_.InvalidateWeakPtrs();
90 } 81 }
91 82
92 void CompositorFrameSink::DidLoseCompositorFrameSink() { 83 void CompositorFrameSink::DidLoseCompositorFrameSink() {
93 TRACE_EVENT0("cc", "CompositorFrameSink::DidLoseCompositorFrameSink"); 84 TRACE_EVENT0("cc", "CompositorFrameSink::DidLoseCompositorFrameSink");
94 client_->DidLoseCompositorFrameSink(); 85 client_->DidLoseCompositorFrameSink();
95 } 86 }
96 87
97 } // namespace cc 88 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/compositor_frame_sink.h ('k') | cc/output/output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698