cc: turn on strict paint property checking

ash/drag_drop/drag_image_view.cc

 // Copyright (c) 2012 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 "ash/drag_drop/drag_image_view.h"
 
 #include "skia/ext/image_operations.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/dip_util.h"
@@ skipping 114 matching lines @@
     SkBitmap scaled = skia::ImageOperations::Resize(
         image_rep.sk_bitmap(), skia::ImageOperations::RESIZE_LANCZOS3,
         scaled_widget_size.width(), scaled_widget_size.height());
     gfx::ImageSkia image_skia(gfx::ImageSkiaRep(scaled, device_scale));
     canvas->DrawImageInt(image_skia, 0, 0);
   }
 
   if (drag_event_source_ != ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH)
     return;
 
+  gfx::Image* drag_hint = DragHint();
+  if (!drag_hint)

[mfomitchev, 2015/12/11 15:37:01]

Shouldn't this be drag_hint->IsEmpty()?

+    return;
+
+  // Make sure drag hint image is positioned within the widget.
+  gfx::Size drag_hint_size = drag_hint->Size();
+  gfx::Point drag_hint_position = touch_drag_operation_indicator_position_;
+  drag_hint_position.Offset(-drag_hint_size.width() / 2, 0);
+  gfx::Rect drag_hint_bounds(drag_hint_position, drag_hint_size);
+  drag_hint_bounds.AdjustToFit(gfx::Rect(widget_size_));
+
+  // Draw image.
+  canvas->DrawImageInt(*(drag_hint->ToImageSkia()), drag_hint_bounds.x(),
+                       drag_hint_bounds.y());
+}
+
+gfx::Image* DragImageView::DragHint() const {
   // Select appropriate drag hint.
   gfx::Image* drag_hint =
       &ui::ResourceBundle::GetSharedInstance().GetImageNamed(
       IDR_TOUCH_DRAG_TIP_NODROP);
   if (touch_drag_operation_ & ui::DragDropTypes::DRAG_COPY) {
     drag_hint = &ui::ResourceBundle::GetSharedInstance().GetImageNamed(
         IDR_TOUCH_DRAG_TIP_COPY);
   } else if (touch_drag_operation_ & ui::DragDropTypes::DRAG_MOVE) {
     drag_hint = &ui::ResourceBundle::GetSharedInstance().GetImageNamed(
         IDR_TOUCH_DRAG_TIP_MOVE);
   } else if (touch_drag_operation_ & ui::DragDropTypes::DRAG_LINK) {
     drag_hint = &ui::ResourceBundle::GetSharedInstance().GetImageNamed(
         IDR_TOUCH_DRAG_TIP_LINK);
   }
-  if (!drag_hint->IsEmpty()) {
-    gfx::Size drag_hint_size = drag_hint->Size();
+  return drag_hint;
+}
 
-    // Enlarge widget if required to fit the drag hint image.
-    if (drag_hint_size.width() > widget_size_.width() ||
-        drag_hint_size.height() > widget_size_.height()) {
-      gfx::Size new_widget_size = widget_size_;
-      new_widget_size.SetToMax(drag_hint_size);
-      widget_->SetSize(new_widget_size);
-    }
+void DragImageView::Layout() {
+  View::Layout();
 
-    // Make sure drag hint image is positioned within the widget.
-    gfx::Point drag_hint_position = touch_drag_operation_indicator_position_;
-    drag_hint_position.Offset(-drag_hint_size.width() / 2, 0);
-    gfx::Rect drag_hint_bounds(drag_hint_position, drag_hint_size);
-    drag_hint_bounds.AdjustToFit(gfx::Rect(widget_size_));
+  gfx::Image* drag_hint = DragHint();
+  if (!drag_hint)
+    return;
 
-    // Draw image.
-    canvas->DrawImageInt(*(drag_hint->ToImageSkia()),
-        drag_hint_bounds.x(), drag_hint_bounds.y());
+  gfx::Size drag_hint_size = drag_hint->Size();
+
+  // Enlarge widget if required to fit the drag hint image.
+  if (drag_hint_size.width() > widget_size_.width() ||
+      drag_hint_size.height() > widget_size_.height()) {
+    gfx::Size new_widget_size = widget_size_;
+    new_widget_size.SetToMax(drag_hint_size);
+    widget_->SetSize(new_widget_size);
   }
 }
 
 }  // namespace ash