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

Unified Diff: content/browser/compositor/gpu_browser_compositor_output_surface.h

Issue 2779303002: [EXPERIMENT] Revert "Route D3D VSync signal to Compositor" (Closed)
Patch Set: Resolve merge conflict Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/compositor/gpu_browser_compositor_output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/gpu_browser_compositor_output_surface.h
diff --git a/content/browser/compositor/gpu_browser_compositor_output_surface.h b/content/browser/compositor/gpu_browser_compositor_output_surface.h
index 1212ccd0e2739d53d19024b7145659bdf7935bc5..e47ed3b8fe9eb95e003e9bb933cb856d0c379a70 100644
--- a/content/browser/compositor/gpu_browser_compositor_output_surface.h
+++ b/content/browser/compositor/gpu_browser_compositor_output_surface.h
@@ -11,7 +11,6 @@
#include "base/memory/weak_ptr.h"
#include "build/build_config.h"
#include "content/browser/compositor/browser_compositor_output_surface.h"
-#include "content/browser/compositor/gpu_vsync_begin_frame_source.h"
#include "ui/gfx/swap_result.h"
namespace display_compositor {
@@ -34,8 +33,8 @@ class ReflectorTexture;
// Adapts a WebGraphicsContext3DCommandBufferImpl into a
// cc::OutputSurface that also handles vsync parameter updates
// arriving from the GPU process.
-class GpuBrowserCompositorOutputSurface : public BrowserCompositorOutputSurface,
- public GpuVSyncControl {
+class GpuBrowserCompositorOutputSurface
+ : public BrowserCompositorOutputSurface {
public:
GpuBrowserCompositorOutputSurface(
scoped_refptr<ui::ContextProviderCommandBuffer> context,
@@ -78,9 +77,6 @@ class GpuBrowserCompositorOutputSurface : public BrowserCompositorOutputSurface,
bool SurfaceIsSuspendForRecycle() const override;
void SetDrawRectangle(const gfx::Rect& rect) override;
- // GpuVSyncControl implementation.
- void SetNeedsVSync(bool needs_vsync) override;
-
protected:
gpu::CommandBufferProxyImpl* GetCommandBufferProxy();
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/compositor/gpu_browser_compositor_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698