Adding support for VSyncProvider to the software drawing path

content/browser/aura/software_output_device_ozone.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/aura/software_output_device_ozone.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/ozone/surface_factory_ozone.h"
 #include "ui/gfx/skia_util.h"
@@ skipping 13 matching lines @@
 void SoftwareOutputDeviceOzone::Resize(gfx::Size viewport_size) {
   if (viewport_size_ == viewport_size)
     return;
 
   viewport_size_ = viewport_size;
   gfx::Rect bounds(viewport_size_);
 
   gfx::SurfaceFactoryOzone* factory = gfx::SurfaceFactoryOzone::GetInstance();
   factory->AttemptToResizeAcceleratedWidget(compositor_->widget(),
                                             bounds);
-  gfx::AcceleratedWidget realized_widget = factory->RealizeAcceleratedWidget(
-      compositor_->widget());
+  realized_widget_ = factory->RealizeAcceleratedWidget(compositor_->widget());

[piman, 2013/11/05 23:32:27]

Could this be done at construction time?

 
-  if (realized_widget == gfx::kNullAcceleratedWidget)
+  if (realized_widget_ == gfx::kNullAcceleratedWidget)
     LOG(FATAL) << "Failed to get a realized AcceleratedWidget";
 
-  canvas_ = skia::SharePtr(factory->GetCanvasForWidget(realized_widget));
+  canvas_ = skia::SharePtr(factory->GetCanvasForWidget(realized_widget_));
   device_ = skia::SharePtr(canvas_->getDevice());
 }
 
 SkCanvas* SoftwareOutputDeviceOzone::BeginPaint(gfx::Rect damage_rect) {
   DCHECK(gfx::Rect(viewport_size_).Contains(damage_rect));
 
   canvas_->clipRect(gfx::RectToSkRect(damage_rect), SkRegion::kReplace_Op);
   // Save the current state so we can restore once we're done drawing. This is
   // saved after the clip since we want to keep the clip information after we're
   // done drawing such that OZONE knows what was updated.
   canvas_->save();
 
   return SoftwareOutputDevice::BeginPaint(damage_rect);
 }
 
 void SoftwareOutputDeviceOzone::EndPaint(cc::SoftwareFrameData* frame_data) {
   SoftwareOutputDevice::EndPaint(frame_data);
 
   canvas_->restore();
 
   if (damage_rect_.IsEmpty())
     return;
 
   bool scheduled = gfx::SurfaceFactoryOzone::GetInstance()->SchedulePageFlip(
       compositor_->widget());
   DCHECK(scheduled) << "Failed to schedule pageflip";
 }
 
+gfx::VSyncProvider* SoftwareOutputDeviceOzone::GetVSyncProvider() {
+  return gfx::SurfaceFactoryOzone::GetInstance()->GetVSyncProvider(
+      realized_widget_);

[piman, 2013/11/05 23:32:27]

Do we expect different VSyncProvider across calls? Should we cache it at
construction time?

+}
+
 }  // namespace content