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

Side by Side Diff: ui/gl/gl_surface.cc

Issue 592933003: Fix for surfaceless implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove debug code Created 6 years, 2 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 | « ui/gl/gl_surface.h ('k') | ui/gl/gl_surface_ozone.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/gl/gl_surface.h" 5 #include "ui/gl/gl_surface.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 bool GLSurface::ScheduleOverlayPlane(int z_order, 229 bool GLSurface::ScheduleOverlayPlane(int z_order,
230 OverlayTransform transform, 230 OverlayTransform transform,
231 GLImage* image, 231 GLImage* image,
232 const Rect& bounds_rect, 232 const Rect& bounds_rect,
233 const RectF& crop_rect) { 233 const RectF& crop_rect) {
234 NOTIMPLEMENTED(); 234 NOTIMPLEMENTED();
235 return false; 235 return false;
236 } 236 }
237 237
238 bool GLSurface::IsSurfaceless() const {
239 return false;
240 }
241
238 GLSurface* GLSurface::GetCurrent() { 242 GLSurface* GLSurface::GetCurrent() {
239 return current_surface_.Pointer()->Get(); 243 return current_surface_.Pointer()->Get();
240 } 244 }
241 245
242 GLSurface::~GLSurface() { 246 GLSurface::~GLSurface() {
243 if (GetCurrent() == this) 247 if (GetCurrent() == this)
244 SetCurrent(NULL); 248 SetCurrent(NULL);
245 } 249 }
246 250
247 void GLSurface::SetCurrent(GLSurface* surface) { 251 void GLSurface::SetCurrent(GLSurface* surface) {
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 349
346 bool GLSurfaceAdapter::ScheduleOverlayPlane(int z_order, 350 bool GLSurfaceAdapter::ScheduleOverlayPlane(int z_order,
347 OverlayTransform transform, 351 OverlayTransform transform,
348 GLImage* image, 352 GLImage* image,
349 const Rect& bounds_rect, 353 const Rect& bounds_rect,
350 const RectF& crop_rect) { 354 const RectF& crop_rect) {
351 return surface_->ScheduleOverlayPlane( 355 return surface_->ScheduleOverlayPlane(
352 z_order, transform, image, bounds_rect, crop_rect); 356 z_order, transform, image, bounds_rect, crop_rect);
353 } 357 }
354 358
359 bool GLSurfaceAdapter::IsSurfaceless() const {
360 return surface_->IsSurfaceless();
361 }
362
355 GLSurfaceAdapter::~GLSurfaceAdapter() {} 363 GLSurfaceAdapter::~GLSurfaceAdapter() {}
356 364
357 } // namespace gfx 365 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_surface.h ('k') | ui/gl/gl_surface_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698