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

Side by Side Diff: components/exo/display.cc

Issue 2066493004: exo: Remove TextureLayer implementation of Surface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « no previous file | components/exo/shell_surface_unittest.cc » ('j') | components/exo/surface.cc » ('J')
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 "components/exo/display.h" 5 #include "components/exo/display.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <utility> 8 #include <utility>
9 9
10 #include "ash/common/shell_window_ids.h" 10 #include "ash/common/shell_window_ids.h"
(...skipping 11 matching lines...) Expand all
22 #include <GLES2/gl2extchromium.h> 22 #include <GLES2/gl2extchromium.h>
23 #include "components/exo/buffer.h" 23 #include "components/exo/buffer.h"
24 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" 24 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
25 #include "third_party/khronos/GLES2/gl2.h" 25 #include "third_party/khronos/GLES2/gl2.h"
26 #include "third_party/khronos/GLES2/gl2ext.h" 26 #include "third_party/khronos/GLES2/gl2ext.h"
27 #include "ui/aura/env.h" 27 #include "ui/aura/env.h"
28 #endif 28 #endif
29 29
30 namespace exo { 30 namespace exo {
31 31
32 const char kDisableExoSurfaceLayer[] = "disable-exo-surface-layer";
33
34 //////////////////////////////////////////////////////////////////////////////// 32 ////////////////////////////////////////////////////////////////////////////////
35 // Display, public: 33 // Display, public:
36 34
37 Display::Display() { 35 Display::Display() {
38 Surface::SetUseSurfaceLayer(
39 !base::CommandLine::ForCurrentProcess()->HasSwitch(
40 kDisableExoSurfaceLayer));
41 } 36 }
reveman 2016/06/15 19:05:08 nit: move this up to previous line to be consisten
42 37
43 Display::~Display() {} 38 Display::~Display() {}
44 39
45 std::unique_ptr<Surface> Display::CreateSurface() { 40 std::unique_ptr<Surface> Display::CreateSurface() {
46 TRACE_EVENT0("exo", "Display::CreateSurface"); 41 TRACE_EVENT0("exo", "Display::CreateSurface");
47 42
48 return base::WrapUnique(new Surface); 43 return base::WrapUnique(new Surface);
49 } 44 }
50 45
51 std::unique_ptr<SharedMemory> Display::CreateSharedMemory( 46 std::unique_ptr<SharedMemory> Display::CreateSharedMemory(
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 174
180 if (surface->HasSurfaceDelegate()) { 175 if (surface->HasSurfaceDelegate()) {
181 DLOG(ERROR) << "Surface has already been assigned a role"; 176 DLOG(ERROR) << "Surface has already been assigned a role";
182 return nullptr; 177 return nullptr;
183 } 178 }
184 179
185 return base::WrapUnique(new SubSurface(surface, parent)); 180 return base::WrapUnique(new SubSurface(surface, parent));
186 } 181 }
187 182
188 } // namespace exo 183 } // namespace exo
OLDNEW
« no previous file with comments | « no previous file | components/exo/shell_surface_unittest.cc » ('j') | components/exo/surface.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698