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

Side by Side Diff: content/browser/compositor/mus_browser_compositor_output_surface.cc

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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #include "content/browser/compositor/mus_browser_compositor_output_surface.h" 5 #include "content/browser/compositor/mus_browser_compositor_output_surface.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "cc/output/compositor_frame.h" 9 #include "cc/output/compositor_frame.h"
10 #include "cc/output/output_surface_frame.h" 10 #include "cc/output/output_surface_frame.h"
11 #include "cc/quads/render_pass.h" 11 #include "cc/quads/render_pass.h"
12 #include "cc/quads/texture_draw_quad.h" 12 #include "cc/quads/texture_draw_quad.h"
13 #include "components/display_compositor/compositor_overlay_candidate_validator.h " 13 #include "components/display_compositor/compositor_overlay_candidate_validator.h "
14 #include "gpu/command_buffer/client/gles2_interface.h" 14 #include "gpu/command_buffer/client/gles2_interface.h"
15 #include "gpu/ipc/client/command_buffer_proxy_impl.h" 15 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
16 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" 16 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
17 #include "ui/aura/mus/window_compositor_frame_sink.h" 17 #include "services/ui/public/cpp/window_compositor_frame_sink.h"
18 #include "ui/aura/mus/window_port_mus.h" 18 #include "ui/aura/mus/window_port_mus.h"
19 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
20 #include "ui/display/screen.h" 20 #include "ui/display/screen.h"
21 #include "ui/gfx/geometry/dip_util.h" 21 #include "ui/gfx/geometry/dip_util.h"
22 22
23 namespace content { 23 namespace content {
24 24
25 MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface( 25 MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(
26 aura::Window* window, 26 aura::Window* window,
27 scoped_refptr<ui::ContextProviderCommandBuffer> context, 27 scoped_refptr<ui::ContextProviderCommandBuffer> context,
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 183
184 const gpu::Mailbox& MusBrowserCompositorOutputSurface::GetMailboxFromResourceId( 184 const gpu::Mailbox& MusBrowserCompositorOutputSurface::GetMailboxFromResourceId(
185 uint32_t id) { 185 uint32_t id) {
186 DCHECK_LT(id, mailboxes_.size()); 186 DCHECK_LT(id, mailboxes_.size());
187 DCHECK(std::find(free_resource_ids_.begin(), free_resource_ids_.end(), id) == 187 DCHECK(std::find(free_resource_ids_.begin(), free_resource_ids_.end(), id) ==
188 free_resource_ids_.end()); 188 free_resource_ids_.end());
189 return mailboxes_[id]; 189 return mailboxes_[id];
190 } 190 }
191 191
192 } // namespace content 192 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698