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

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

Issue 2647363002: mus: Remove aura version of WindowCompositorFrameSink. (Closed)
Patch Set: tot merge Created 3 years, 11 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 | « no previous file | content/browser/compositor/mus_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/mus_browser_compositor_output_surface.h
diff --git a/content/browser/compositor/mus_browser_compositor_output_surface.h b/content/browser/compositor/mus_browser_compositor_output_surface.h
index c5ee24d3aca2e3d529db4a769a69d4475104df30..2ae3a4f16903dcdc3fa30ae64161bea13555f1dd 100644
--- a/content/browser/compositor/mus_browser_compositor_output_surface.h
+++ b/content/browser/compositor/mus_browser_compositor_output_surface.h
@@ -16,13 +16,16 @@
namespace aura {
class Window;
-class WindowCompositorFrameSink;
}
namespace gpu {
class GpuMemoryBufferManager;
}
+namespace ui {
+class WindowCompositorFrameSink;
+}
+
namespace content {
// Adapts a WebGraphicsContext3DCommandBufferImpl into a
@@ -68,7 +71,7 @@ class MusBrowserCompositorOutputSurface
const gpu::Mailbox& GetMailboxFromResourceId(uint32_t id);
aura::Window* window_;
- std::unique_ptr<aura::WindowCompositorFrameSink> compositor_frame_sink_;
+ std::unique_ptr<ui::WindowCompositorFrameSink> compositor_frame_sink_;
std::vector<uint32_t> free_resource_ids_;
std::vector<gpu::Mailbox> mailboxes_;
cc::BeginFrameSource* begin_frame_source_;
« no previous file with comments | « no previous file | content/browser/compositor/mus_browser_compositor_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698