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

ui/ozone/platform/dri/gbm_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/gbm_surface.h"
 
 #include <gbm.h>
 
 #include "base/logging.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
@@ skipping 117 matching lines @@
       GbmSurfaceBuffer::GetBuffer(pending_buffer);
   if (!primary) {
     primary = GbmSurfaceBuffer::CreateBuffer(dri_, pending_buffer);
     if (!primary) {
       LOG(ERROR) << "Failed to associate the buffer with the controller";
       return false;
     }
   }
 
   // The primary buffer is a special case.
-  queued_planes_.push_back(OverlayPlane(primary));
+  controller_->QueueOverlayPlane(OverlayPlane(primary));
 
   if (!GbmSurfaceless::OnSwapBuffers())
     return false;
 
   // If there was a frontbuffer, it is no longer active. Release it back to GBM.
   if (current_buffer_)
     gbm_surface_release_buffer(native_surface_, current_buffer_);
 
   current_buffer_ = pending_buffer;
   return true;
 }
 
 }  // namespace ui