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

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

Issue 500953005: Remove implicit conversions from scoped_refptr to T* in content/browser/compositor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Manual corretions Created 6 years, 4 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 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 // Exposed for tests. 116 // Exposed for tests.
117 cc::DelegatedFrameProvider* FrameProviderForTesting() const { 117 cc::DelegatedFrameProvider* FrameProviderForTesting() const {
118 return frame_provider_.get(); 118 return frame_provider_.get();
119 } 119 }
120 void OnCompositingDidCommitForTesting(ui::Compositor* compositor) { 120 void OnCompositingDidCommitForTesting(ui::Compositor* compositor) {
121 OnCompositingDidCommit(compositor); 121 OnCompositingDidCommit(compositor);
122 } 122 }
123 bool ShouldCreateResizeLockForTesting() { return ShouldCreateResizeLock(); } 123 bool ShouldCreateResizeLockForTesting() { return ShouldCreateResizeLock(); }
124 bool ReleasedFrontLockActiveForTesting() const { 124 bool ReleasedFrontLockActiveForTesting() const {
125 return !!released_front_lock_; 125 return !!released_front_lock_.get();
126 } 126 }
127 127
128 private: 128 private:
129 friend class DelegatedFrameHostClient; 129 friend class DelegatedFrameHostClient;
130 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, 130 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
131 SkippedDelegatedFrames); 131 SkippedDelegatedFrames);
132 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, 132 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
133 DiscardDelegatedFramesWithLocking); 133 DiscardDelegatedFramesWithLocking);
134 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraCopyRequestTest, 134 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraCopyRequestTest,
135 DestroyedAfterCopyRequest); 135 DestroyedAfterCopyRequest);
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 // YUV readback pipeline. 306 // YUV readback pipeline.
307 scoped_ptr<content::ReadbackYUVInterface> 307 scoped_ptr<content::ReadbackYUVInterface>
308 yuv_readback_pipeline_; 308 yuv_readback_pipeline_;
309 309
310 scoped_ptr<DelegatedFrameEvictor> delegated_frame_evictor_; 310 scoped_ptr<DelegatedFrameEvictor> delegated_frame_evictor_;
311 }; 311 };
312 312
313 } // namespace content 313 } // namespace content
314 314
315 #endif // CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_ 315 #endif // CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_
OLDNEW
« no previous file with comments | « content/browser/compositor/browser_compositor_output_surface.cc ('k') | content/browser/compositor/delegated_frame_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698