| OLD | NEW |
| 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 <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 void* GLSurface::GetDisplay() { | 123 void* GLSurface::GetDisplay() { |
| 124 NOTIMPLEMENTED(); | 124 NOTIMPLEMENTED(); |
| 125 return NULL; | 125 return NULL; |
| 126 } | 126 } |
| 127 | 127 |
| 128 void* GLSurface::GetConfig() { | 128 void* GLSurface::GetConfig() { |
| 129 NOTIMPLEMENTED(); | 129 NOTIMPLEMENTED(); |
| 130 return NULL; | 130 return NULL; |
| 131 } | 131 } |
| 132 | 132 |
| 133 unsigned long GLSurface::GetCompatibilityKey() { |
| 134 return 0; |
| 135 } |
| 136 |
| 133 GLSurface::Format GLSurface::GetFormat() { | 137 GLSurface::Format GLSurface::GetFormat() { |
| 134 NOTIMPLEMENTED(); | 138 NOTIMPLEMENTED(); |
| 135 return SURFACE_DEFAULT; | 139 return SURFACE_DEFAULT; |
| 136 } | 140 } |
| 137 | 141 |
| 138 gfx::VSyncProvider* GLSurface::GetVSyncProvider() { | 142 gfx::VSyncProvider* GLSurface::GetVSyncProvider() { |
| 139 return NULL; | 143 return NULL; |
| 140 } | 144 } |
| 141 | 145 |
| 142 bool GLSurface::ScheduleOverlayPlane(int z_order, | 146 bool GLSurface::ScheduleOverlayPlane(int z_order, |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 } | 317 } |
| 314 | 318 |
| 315 void* GLSurfaceAdapter::GetDisplay() { | 319 void* GLSurfaceAdapter::GetDisplay() { |
| 316 return surface_->GetDisplay(); | 320 return surface_->GetDisplay(); |
| 317 } | 321 } |
| 318 | 322 |
| 319 void* GLSurfaceAdapter::GetConfig() { | 323 void* GLSurfaceAdapter::GetConfig() { |
| 320 return surface_->GetConfig(); | 324 return surface_->GetConfig(); |
| 321 } | 325 } |
| 322 | 326 |
| 327 unsigned long GLSurfaceAdapter::GetCompatibilityKey() { |
| 328 return surface_->GetCompatibilityKey(); |
| 329 } |
| 330 |
| 323 GLSurface::Format GLSurfaceAdapter::GetFormat() { | 331 GLSurface::Format GLSurfaceAdapter::GetFormat() { |
| 324 return surface_->GetFormat(); | 332 return surface_->GetFormat(); |
| 325 } | 333 } |
| 326 | 334 |
| 327 gfx::VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() { | 335 gfx::VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() { |
| 328 return surface_->GetVSyncProvider(); | 336 return surface_->GetVSyncProvider(); |
| 329 } | 337 } |
| 330 | 338 |
| 331 bool GLSurfaceAdapter::ScheduleOverlayPlane(int z_order, | 339 bool GLSurfaceAdapter::ScheduleOverlayPlane(int z_order, |
| 332 gfx::OverlayTransform transform, | 340 gfx::OverlayTransform transform, |
| (...skipping 23 matching lines...) Expand all Loading... |
| 356 return nullptr; | 364 return nullptr; |
| 357 return surface; | 365 return surface; |
| 358 } | 366 } |
| 359 | 367 |
| 360 GLSurface::CALayerInUseQuery::CALayerInUseQuery() = default; | 368 GLSurface::CALayerInUseQuery::CALayerInUseQuery() = default; |
| 361 GLSurface::CALayerInUseQuery::CALayerInUseQuery(const CALayerInUseQuery&) = | 369 GLSurface::CALayerInUseQuery::CALayerInUseQuery(const CALayerInUseQuery&) = |
| 362 default; | 370 default; |
| 363 GLSurface::CALayerInUseQuery::~CALayerInUseQuery() = default; | 371 GLSurface::CALayerInUseQuery::~CALayerInUseQuery() = default; |
| 364 | 372 |
| 365 } // namespace gl | 373 } // namespace gl |
| OLD | NEW |