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

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

Issue 2018603002: Mac: Clean up ifdefs in output surface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporate review feedback Created 4 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 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_GPU_SURFACELESS_BROWSER_COMPOSITOR_OUTPUT_SUR FACE_H_ 5 #ifndef CONTENT_BROWSER_COMPOSITOR_GPU_SURFACELESS_BROWSER_COMPOSITOR_OUTPUT_SUR FACE_H_
6 #define CONTENT_BROWSER_COMPOSITOR_GPU_SURFACELESS_BROWSER_COMPOSITOR_OUTPUT_SUR FACE_H_ 6 #define CONTENT_BROWSER_COMPOSITOR_GPU_SURFACELESS_BROWSER_COMPOSITOR_OUTPUT_SUR FACE_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "content/browser/compositor/gpu_browser_compositor_output_surface.h" 10 #include "content/browser/compositor/gpu_browser_compositor_output_surface.h"
(...skipping 18 matching lines...) Expand all
29 gpu::SurfaceHandle surface_handle, 29 gpu::SurfaceHandle surface_handle,
30 scoped_refptr<ui::CompositorVSyncManager> vsync_manager, 30 scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
31 base::SingleThreadTaskRunner* task_runner, 31 base::SingleThreadTaskRunner* task_runner,
32 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> 32 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
33 overlay_candidate_validator, 33 overlay_candidate_validator,
34 unsigned int target, 34 unsigned int target,
35 unsigned int internalformat, 35 unsigned int internalformat,
36 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager); 36 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
37 ~GpuSurfacelessBrowserCompositorOutputSurface() override; 37 ~GpuSurfacelessBrowserCompositorOutputSurface() override;
38 38
39 private:
40 // cc::OutputSurface implementation. 39 // cc::OutputSurface implementation.
41 void SwapBuffers(cc::CompositorFrame* frame) override; 40 void SwapBuffers(cc::CompositorFrame* frame) override;
42 void OnSwapBuffersComplete() override; 41 void OnSwapBuffersComplete() override;
43 void BindFramebuffer() override; 42 void BindFramebuffer() override;
44 void Reshape(const gfx::Size& size, float scale_factor, bool alpha) override; 43 void Reshape(const gfx::Size& size, float scale_factor, bool alpha) override;
45 bool IsDisplayedAsOverlayPlane() const override; 44 bool IsDisplayedAsOverlayPlane() const override;
46 unsigned GetOverlayTextureId() const override; 45 unsigned GetOverlayTextureId() const override;
47 46
48 // BrowserCompositorOutputSurface implementation. 47 // BrowserCompositorOutputSurface implementation.
49 void OnGpuSwapBuffersCompleted( 48 void OnGpuSwapBuffersCompleted(
50 const std::vector<ui::LatencyInfo>& latency_info, 49 const std::vector<ui::LatencyInfo>& latency_info,
51 gfx::SwapResult result, 50 gfx::SwapResult result,
52 const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) override; 51 const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) override;
53 52
53 private:
54 const unsigned int internalformat_; 54 const unsigned int internalformat_;
55 std::unique_ptr<display_compositor::GLHelper> gl_helper_; 55 std::unique_ptr<display_compositor::GLHelper> gl_helper_;
56 std::unique_ptr<display_compositor::BufferQueue> buffer_queue_; 56 std::unique_ptr<display_compositor::BufferQueue> buffer_queue_;
57 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_; 57 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
58 }; 58 };
59 59
60 } // namespace content 60 } // namespace content
61 61
62 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_SURFACELESS_BROWSER_COMPOSITOR_OUTPUT_ SURFACE_H_ 62 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_SURFACELESS_BROWSER_COMPOSITOR_OUTPUT_ SURFACE_H_
OLDNEW
« no previous file with comments | « content/browser/compositor/gpu_process_transport_factory.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698