| 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 <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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 void* GLSurface::GetConfig() { | 140 void* GLSurface::GetConfig() { |
| 141 NOTIMPLEMENTED(); | 141 NOTIMPLEMENTED(); |
| 142 return NULL; | 142 return NULL; |
| 143 } | 143 } |
| 144 | 144 |
| 145 unsigned GLSurface::GetFormat() { | 145 unsigned GLSurface::GetFormat() { |
| 146 NOTIMPLEMENTED(); | 146 NOTIMPLEMENTED(); |
| 147 return 0; | 147 return 0; |
| 148 } | 148 } |
| 149 | 149 |
| 150 bool GLSurface::GetVSyncParameters(base::TimeTicks* timebase, | 150 void GLSurface::GetVSyncParameters(const UpdateVSyncCallback& callback) { |
| 151 base::TimeDelta* interval) { | |
| 152 return false; | |
| 153 } | 151 } |
| 154 | 152 |
| 155 GLSurface* GLSurface::GetCurrent() { | 153 GLSurface* GLSurface::GetCurrent() { |
| 156 return current_surface_.Pointer()->Get(); | 154 return current_surface_.Pointer()->Get(); |
| 157 } | 155 } |
| 158 | 156 |
| 159 GLSurface::~GLSurface() { | 157 GLSurface::~GLSurface() { |
| 160 if (GetCurrent() == this) | 158 if (GetCurrent() == this) |
| 161 SetCurrent(NULL); | 159 SetCurrent(NULL); |
| 162 } | 160 } |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 } | 247 } |
| 250 | 248 |
| 251 void* GLSurfaceAdapter::GetConfig() { | 249 void* GLSurfaceAdapter::GetConfig() { |
| 252 return surface_->GetConfig(); | 250 return surface_->GetConfig(); |
| 253 } | 251 } |
| 254 | 252 |
| 255 unsigned GLSurfaceAdapter::GetFormat() { | 253 unsigned GLSurfaceAdapter::GetFormat() { |
| 256 return surface_->GetFormat(); | 254 return surface_->GetFormat(); |
| 257 } | 255 } |
| 258 | 256 |
| 259 bool GLSurfaceAdapter::GetVSyncParameters(base::TimeTicks* timebase, | 257 void GLSurfaceAdapter::GetVSyncParameters(const UpdateVSyncCallback& callback) { |
| 260 base::TimeDelta* interval) { | 258 surface_->GetVSyncParameters(callback); |
| 261 return surface_->GetVSyncParameters(timebase, interval); | |
| 262 } | 259 } |
| 263 | 260 |
| 264 GLSurfaceAdapter::~GLSurfaceAdapter() {} | 261 GLSurfaceAdapter::~GLSurfaceAdapter() {} |
| 265 | 262 |
| 266 } // namespace gfx | 263 } // namespace gfx |
| OLD | NEW |