Fix assert in GetOverlayRect when transforming video with Ozone overlay

ui/ozone/platform/drm/gbm_surface_factory.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/drm/gbm_surface_factory.h"
 
 #include <gbm.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "third_party/khronos/EGL/egl.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/ozone/common/egl_util.h"
 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
 #include "ui/ozone/platform/drm/gpu/drm_window.h"
 #include "ui/ozone/platform/drm/gpu/gbm_buffer.h"
 #include "ui/ozone/platform/drm/gpu/gbm_device.h"
 #include "ui/ozone/platform/drm/gpu/gbm_surface.h"
 #include "ui/ozone/platform/drm/gpu/gbm_surfaceless.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
 #include "ui/ozone/platform/drm/gpu/screen_manager.h"
 #include "ui/ozone/public/native_pixmap.h"
@@ skipping 19 matching lines @@
       OverlayCandidatesOzone::OverlaySurfaceCandidate* overlay;
       if (first->plane_z_order == 0) {
         overlay = second;
       } else if (second->plane_z_order == 0) {
         overlay = first;
       } else {
         NOTREACHED();
         return;
       }
       if (overlay->plane_z_order > 0 &&
-          IsTransformSupported(overlay->transform)) {
+          IsTransformSupported(overlay->transform) &&
+          gfx::IsNearestRectWithinDistance(overlay->display_rect, 0.01f)) {

[danakj, 2015/05/04 19:56:41]

This magic number, can you leave a comment explaining it?

[halliwell, 2015/05/04 21:38:16]

Done.

         overlay->overlay_handled = true;
       }
     }
   }
 
  private:
   bool IsTransformSupported(gfx::OverlayTransform transform) {
     switch (transform) {
       case gfx::OVERLAY_TRANSFORM_NONE:
         return true;
@@ skipping 150 matching lines @@
   return false;
 }
 
 scoped_refptr<GbmDevice> GbmSurfaceFactory::GetGbmDevice(
     gfx::AcceleratedWidget widget) {
   return static_cast<GbmDevice*>(
       drm_device_manager_->GetDrmDevice(widget).get());
 }
 
 }  // namespace ui