Corrects RWHVCocoa to convert from flipped to unflipped...

chrome/browser/renderer_host/render_widget_host_view_mac.mm

 // Copyright (c) 2006-2008 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 "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 
 #include "base/histogram.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_trial.h"
 #import "chrome/browser/cocoa/rwhvm_editcommand_helper.h"
@@ skipping 432 matching lines @@
 
       CGRect paint_rect_cg = paint_rect.ToCGRect();
       NSRect paint_rect_ns = [self RectToNSRect:paint_rect];
       canvas->getTopPlatformDevice().DrawToContext(
           context, paint_rect_ns.origin.x, paint_rect_ns.origin.y,
           &paint_rect_cg);
     }
 
     // Fill the remaining portion of the damaged_rect with white
     if (damaged_rect.right() > bitmap_rect.right()) {
-      NSRect r;
-      r.origin.x = std::max(bitmap_rect.right(), damaged_rect.x());
-      r.origin.y = std::min(bitmap_rect.bottom(), damaged_rect.bottom());
-      r.size.width = damaged_rect.right() - r.origin.x;
-      r.size.height = damaged_rect.y() - r.origin.y;
+      int x = std::max(bitmap_rect.right(), damaged_rect.x());
+      int y = std::min(bitmap_rect.bottom(), damaged_rect.bottom());
+      int width = damaged_rect.right() - x;
+      int height = damaged_rect.y() - y;
+
+      // Extra fun to get around the fact that gfx::Rects can't have
+      // negative sizes.
+      if (width < 0) {
+        x += width;
+        width = -width;
+      }
+      if (height < 0) {
+        y += height;
+        height = -height;
+      }
+
+      NSRect r = [self RectToNSRect:gfx::Rect(x, y, width, height)];
       [[NSColor whiteColor] set];
       NSRectFill(r);
     }
     if (damaged_rect.bottom() > bitmap_rect.bottom()) {
-      NSRect r;
-      r.origin.x = damaged_rect.x();
-      r.origin.y = damaged_rect.bottom();
-      r.size.width = damaged_rect.right() - r.origin.x;
-      r.size.height = std::max(bitmap_rect.bottom(), damaged_rect.y()) -
-          r.origin.y;
+      int x = damaged_rect.x();
+      int y = damaged_rect.bottom();
+      int width = damaged_rect.right() - x;
+      int height = std::max(bitmap_rect.bottom(), damaged_rect.y()) - y;
+
+      // Extra fun to get around the fact that gfx::Rects can't have
+      // negative sizes.
+      if (width < 0) {
+        x += width;
+        width = -width;
+      }
+      if (height < 0) {
+        y += height;
+        height = -height;
+      }
+
+      NSRect r = [self RectToNSRect:gfx::Rect(x, y, width, height)];
       [[NSColor whiteColor] set];
       NSRectFill(r);
     }
     if (!renderWidgetHostView_->whiteout_start_time_.is_null()) {
       base::TimeDelta whiteout_duration = base::TimeTicks::Now() -
           renderWidgetHostView_->whiteout_start_time_;
       UMA_HISTOGRAM_TIMES("MPArch.RWHH_WhiteoutDuration", whiteout_duration);
 
       // Reset the start time to 0 so that we start recording again the next
       // time the backing store is NULL...
@@ skipping 45 matching lines @@
 
   return editCommand_helper_->IsMenuItemEnabled(action, self);
 }
 
 - (RenderWidgetHostViewMac*)renderWidgetHostViewMac {
   return renderWidgetHostView_;
 }
 
 @end