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

Side by Side Diff: content/browser/compositor/delegated_frame_host.h

Issue 1131673009: Revert of Pass Surface ID namespace to renderer compositors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « no previous file | content/browser/compositor/delegated_frame_host.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_ 5 #ifndef CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_
6 #define CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_ 6 #define CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_
7 7
8 #include "cc/layers/delegated_frame_provider.h" 8 #include "cc/layers/delegated_frame_provider.h"
9 #include "cc/layers/delegated_frame_resource_collection.h" 9 #include "cc/layers/delegated_frame_resource_collection.h"
10 #include "cc/output/copy_output_result.h" 10 #include "cc/output/copy_output_result.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 void CopyFromCompositingSurfaceToVideoFrame( 108 void CopyFromCompositingSurfaceToVideoFrame(
109 const gfx::Rect& src_subrect, 109 const gfx::Rect& src_subrect,
110 const scoped_refptr<media::VideoFrame>& target, 110 const scoped_refptr<media::VideoFrame>& target,
111 const base::Callback<void(bool)>& callback); 111 const base::Callback<void(bool)>& callback);
112 bool CanCopyToVideoFrame() const; 112 bool CanCopyToVideoFrame() const;
113 bool CanSubscribeFrame() const; 113 bool CanSubscribeFrame() const;
114 void BeginFrameSubscription( 114 void BeginFrameSubscription(
115 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber); 115 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber);
116 void EndFrameSubscription(); 116 void EndFrameSubscription();
117 bool HasFrameSubscriber() const { return frame_subscriber_; } 117 bool HasFrameSubscriber() const { return frame_subscriber_; }
118 uint32_t GetSurfaceIdNamespace();
119 118
120 // Exposed for tests. 119 // Exposed for tests.
121 cc::DelegatedFrameProvider* FrameProviderForTesting() const { 120 cc::DelegatedFrameProvider* FrameProviderForTesting() const {
122 return frame_provider_.get(); 121 return frame_provider_.get();
123 } 122 }
124 cc::SurfaceId SurfaceIdForTesting() const { return surface_id_; } 123 cc::SurfaceId SurfaceIdForTesting() const { return surface_id_; }
125 void OnCompositingDidCommitForTesting(ui::Compositor* compositor) { 124 void OnCompositingDidCommitForTesting(ui::Compositor* compositor) {
126 OnCompositingDidCommit(compositor); 125 OnCompositingDidCommit(compositor);
127 } 126 }
128 bool ReleasedFrontLockActiveForTesting() const { 127 bool ReleasedFrontLockActiveForTesting() const {
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 // YUV readback pipeline. 320 // YUV readback pipeline.
322 scoped_ptr<content::ReadbackYUVInterface> 321 scoped_ptr<content::ReadbackYUVInterface>
323 yuv_readback_pipeline_; 322 yuv_readback_pipeline_;
324 323
325 scoped_ptr<DelegatedFrameEvictor> delegated_frame_evictor_; 324 scoped_ptr<DelegatedFrameEvictor> delegated_frame_evictor_;
326 }; 325 };
327 326
328 } // namespace content 327 } // namespace content
329 328
330 #endif // CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_ 329 #endif // CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/compositor/delegated_frame_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698