With the overlay path moving back to passing AcceleratedWidgets, move the implementation back into …

ui/ozone/platform/dri/dri_surface.cc

 // Copyright 2014 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 "ui/ozone/platform/dri/dri_surface.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
@@ skipping 53 matching lines @@
     buffers_[i] = AllocateBuffer(dri_, mode_size);
 }
 
 void DriSurface::PresentCanvas(const gfx::Rect& damage) {
   DCHECK(base::MessageLoopForUI::IsCurrent());
   DCHECK(buffers_[front_buffer_ ^ 1]);
 
   if (!controller_)
     return;
 
-  std::vector<OverlayPlane> planes(
-      1, OverlayPlane(buffers_[front_buffer_ ^ 1]));
+  controller_->QueueOverlayPlane(OverlayPlane(buffers_[front_buffer_ ^ 1]));
 
   UpdateNativeSurface(damage);
-  controller_->SchedulePageFlip(planes);
+  controller_->SchedulePageFlip();
   controller_->WaitForPageFlipEvent();
 
   // Update our front buffer pointer.
   front_buffer_ ^= 1;
 }
 
 scoped_ptr<gfx::VSyncProvider> DriSurface::CreateVSyncProvider() {
   return scoped_ptr<gfx::VSyncProvider>(new DriVSyncProvider(controller_));
 }
 
 void DriSurface::UpdateNativeSurface(const gfx::Rect& damage) {
   SkCanvas* canvas = buffers_[front_buffer_ ^ 1]->GetCanvas();
 
   // The DriSurface is double buffered, so the current back buffer is
   // missing the previous update. Expand damage region.
   SkRect real_damage = RectToSkRect(UnionRects(damage, last_damage_));
 
   // Copy damage region.
   skia::RefPtr<SkImage> image = skia::AdoptRef(surface_->newImageSnapshot());
   image->draw(canvas, &real_damage, real_damage, NULL);
 
   last_damage_ = damage;
 }
 
 }  // namespace ui