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

Unified Diff: components/view_manager/gles2/command_buffer_driver.cc

Issue 1245683004: Mandoline: Merge Surfaces and Views apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Rob's comments 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 side-by-side diff with in-line comments
Download patch
Index: components/view_manager/gles2/command_buffer_driver.cc
diff --git a/components/view_manager/gles2/command_buffer_driver.cc b/components/view_manager/gles2/command_buffer_driver.cc
index af7828faeb7a8c7c1dce6ba1962d8735fc6e0dd9..727adcff0daf4d275de73e6faadc9dcbed115f72 100644
--- a/components/view_manager/gles2/command_buffer_driver.cc
+++ b/components/view_manager/gles2/command_buffer_driver.cc
@@ -110,15 +110,10 @@ bool CommandBufferDriver::MakeCurrent() {
bool CommandBufferDriver::DoInitialize(
mojo::ScopedSharedBufferHandle shared_state) {
- if (widget_ == gfx::kNullAcceleratedWidget)
+ if (widget_ == gfx::kNullAcceleratedWidget) {
surface_ = gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1));
- else {
+ } else {
surface_ = gfx::GLSurface::CreateViewGLSurface(widget_);
- if (auto vsync_provider = surface_->GetVSyncProvider()) {
- vsync_provider->GetVSyncParameters(
- base::Bind(&CommandBufferDriver::OnUpdateVSyncParameters,
- weak_factory_.GetWeakPtr()));
- }
}
if (!surface_.get())
@@ -347,12 +342,6 @@ void CommandBufferDriver::OnContextLost(uint32_t reason) {
client_->DidLoseContext();
}
-void CommandBufferDriver::OnUpdateVSyncParameters(
- const base::TimeTicks timebase,
- const base::TimeDelta interval) {
- client_->UpdateVSyncParameters(timebase, interval);
-}
-
void CommandBufferDriver::DestroyDecoder() {
if (decoder_) {
bool have_context = decoder_->MakeCurrent();

Powered by Google App Engine
This is Rietveld 408576698