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

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

Issue 1383293002: Revert of Overlays: Remove special casing of primary overlay plane (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 "content/browser/compositor/gpu_browser_compositor_output_surface.h" 8 #include "content/browser/compositor/gpu_browser_compositor_output_surface.h"
9 9
10 namespace content { 10 namespace content {
(...skipping 16 matching lines...) Expand all
27 unsigned int internalformat, 27 unsigned int internalformat,
28 BrowserGpuMemoryBufferManager* gpu_memory_buffer_manager); 28 BrowserGpuMemoryBufferManager* gpu_memory_buffer_manager);
29 ~GpuSurfacelessBrowserCompositorOutputSurface() override; 29 ~GpuSurfacelessBrowserCompositorOutputSurface() override;
30 30
31 private: 31 private:
32 // cc::OutputSurface implementation. 32 // cc::OutputSurface implementation.
33 void SwapBuffers(cc::CompositorFrame* frame) override; 33 void SwapBuffers(cc::CompositorFrame* frame) override;
34 void OnSwapBuffersComplete() override; 34 void OnSwapBuffersComplete() override;
35 void BindFramebuffer() override; 35 void BindFramebuffer() override;
36 void Reshape(const gfx::Size& size, float scale_factor) override; 36 void Reshape(const gfx::Size& size, float scale_factor) override;
37 bool IsDisplayedAsOverlayPlane() const override;
38 unsigned GetOverlayTextureId() const override; 37 unsigned GetOverlayTextureId() const override;
39 38
40 void OnSwapBuffersCompleted(const std::vector<ui::LatencyInfo>& latency_info, 39 void OnSwapBuffersCompleted(const std::vector<ui::LatencyInfo>& latency_info,
41 gfx::SwapResult result) override; 40 gfx::SwapResult result) override;
42 #if defined(OS_MACOSX) 41 #if defined(OS_MACOSX)
43 void OnSurfaceDisplayed() override; 42 void OnSurfaceDisplayed() override;
44 #endif 43 #endif
45 44
46 unsigned int internalformat_; 45 unsigned int internalformat_;
47 scoped_ptr<GLHelper> gl_helper_; 46 scoped_ptr<GLHelper> gl_helper_;
48 scoped_ptr<BufferQueue> output_surface_; 47 scoped_ptr<BufferQueue> output_surface_;
49 BrowserGpuMemoryBufferManager* gpu_memory_buffer_manager_; 48 BrowserGpuMemoryBufferManager* gpu_memory_buffer_manager_;
50 }; 49 };
51 50
52 } // namespace content 51 } // namespace content
53 52
54 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_SURFACELESS_BROWSER_COMPOSITOR_OUTPUT_ SURFACE_H_ 53 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_SURFACELESS_BROWSER_COMPOSITOR_OUTPUT_ SURFACE_H_
OLDNEW
« no previous file with comments | « cc/output/overlay_unittest.cc ('k') | content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698