Add non-member non-mutating methods for common gfx::Rect operations.

webkit/plugins/ppapi/ppapi_plugin_instance.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 "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 1139 matching lines @@
     return false;
 
   gfx::Point plugin_origin = PP_ToGfxPoint(view_data_.rect.point);
   // Convert |paint_bounds| to be relative to the left-top corner of the plugin.
   gfx::Rect relative_paint_bounds(paint_bounds);
   relative_paint_bounds.Offset(-plugin_origin.x(), -plugin_origin.y());
 
   gfx::Rect pixel_plugin_backing_store_rect(
       0, 0, image_data->width(), image_data->height());
   float scale = GetBoundGraphics2D()->GetScale();
-  gfx::RectF scaled_backing_store_rect = pixel_plugin_backing_store_rect;
-  scaled_backing_store_rect.Scale(scale);
-  gfx::Rect plugin_backing_store_rect =
-    gfx::ToEnclosedRect(scaled_backing_store_rect);
+  gfx::Rect plugin_backing_store_rect = gfx::ToEnclosedRect(
+      gfx::Scale(pixel_plugin_backing_store_rect, scale));
 
   gfx::Rect clip_page = PP_ToGfxRect(view_data_.clip_rect);
-  gfx::Rect plugin_paint_rect = plugin_backing_store_rect;
-  plugin_paint_rect.Intersect(clip_page);
+  gfx::Rect plugin_paint_rect =
+      gfx::Intersection(plugin_backing_store_rect, clip_page);
   if (!plugin_paint_rect.Contains(relative_paint_bounds))
     return false;
 
   // Don't do optimized painting if the area to paint intersects with the
   // cut-out rects, otherwise we will paint over them.
   for (std::vector<gfx::Rect>::const_iterator iter = cut_outs_rects_.begin();
        iter != cut_outs_rects_.end(); ++iter) {
     if (relative_paint_bounds.Intersects(*iter))
       return false;
   }
@@ skipping 2031 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit