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

Side by Side Diff: mandoline/ui/aura/surface_binding.cc

Issue 1310103002: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « ipc/mojo/ipc_channel_mojo.cc ('k') | media/mojo/services/mojo_cdm.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "mandoline/ui/aura/surface_binding.h" 5 #include "mandoline/ui/aura/surface_binding.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/threading/thread_local.h" 11 #include "base/threading/thread_local.h"
12 #include "cc/output/compositor_frame.h" 12 #include "cc/output/compositor_frame.h"
13 #include "cc/output/output_surface.h" 13 #include "cc/output/output_surface.h"
14 #include "cc/output/output_surface_client.h" 14 #include "cc/output/output_surface_client.h"
15 #include "cc/output/software_output_device.h" 15 #include "cc/output/software_output_device.h"
16 #include "cc/resources/shared_bitmap_manager.h" 16 #include "cc/resources/shared_bitmap_manager.h"
17 #include "components/view_manager/public/cpp/view.h" 17 #include "components/view_manager/public/cpp/view.h"
18 #include "components/view_manager/public/cpp/view_manager.h" 18 #include "components/view_manager/public/cpp/view_manager.h"
19 #include "components/view_manager/public/interfaces/gpu.mojom.h" 19 #include "components/view_manager/public/interfaces/gpu.mojom.h"
20 #include "components/view_manager/public/interfaces/surfaces.mojom.h" 20 #include "components/view_manager/public/interfaces/surfaces.mojom.h"
21 #include "mandoline/ui/aura/window_tree_host_mojo.h" 21 #include "mandoline/ui/aura/window_tree_host_mojo.h"
22 #include "mojo/application/public/cpp/connect.h" 22 #include "mojo/application/public/cpp/connect.h"
23 #include "mojo/application/public/interfaces/shell.mojom.h" 23 #include "mojo/application/public/interfaces/shell.mojom.h"
24 #include "mojo/cc/context_provider_mojo.h" 24 #include "mojo/cc/context_provider_mojo.h"
25 #include "mojo/converters/geometry/geometry_type_converters.h" 25 #include "mojo/converters/geometry/geometry_type_converters.h"
26 #include "mojo/converters/surfaces/surfaces_type_converters.h" 26 #include "mojo/converters/surfaces/surfaces_type_converters.h"
27 #include "mojo/public/cpp/bindings/binding.h"
27 28
28 namespace mandoline { 29 namespace mandoline {
29 namespace { 30 namespace {
30 31
31 // OutputSurface --------------------------------------------------------------- 32 // OutputSurface ---------------------------------------------------------------
32 33
33 // OutputSurface implementation for a view. Pushes the surface id to View when 34 // OutputSurface implementation for a view. Pushes the surface id to View when
34 // appropriate. 35 // appropriate.
35 class OutputSurfaceImpl : public cc::OutputSurface { 36 class OutputSurfaceImpl : public cc::OutputSurface {
36 public: 37 public:
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 } 253 }
253 254
254 SurfaceBinding::~SurfaceBinding() { 255 SurfaceBinding::~SurfaceBinding() {
255 } 256 }
256 257
257 scoped_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() { 258 scoped_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
258 return state_->CreateOutputSurface(view_); 259 return state_->CreateOutputSurface(view_);
259 } 260 }
260 261
261 } // namespace mandoline 262 } // namespace mandoline
OLDNEW
« no previous file with comments | « ipc/mojo/ipc_channel_mojo.cc ('k') | media/mojo/services/mojo_cdm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698