Revised sub-rectangle scaling for use in Chromoting.

remoting/base/util.h

Index: remoting/base/util.h
diff --git a/remoting/base/util.h b/remoting/base/util.h
index b60e0721fe3b74038b0666a52ca2d3f9e614541c..fb0a648130c2d05c208a33f9395997579896a50f 100644
--- a/remoting/base/util.h
+++ b/remoting/base/util.h
@@ -5,6 +5,8 @@
 #ifndef REMOTING_BASE_UTIL_H_
 #define REMOTING_BASE_UTIL_H_
 
+#include <string>
+
 #include "media/base/video_frame.h"
 #include "third_party/skia/include/core/SkRect.h"
 
@@ -25,16 +27,6 @@ void ConvertYUVToRGB32WithRect(const uint8* y_plane,
                                int uv_stride,
                                int rgb_stride);
 
-void ScaleYUVToRGB32WithRect(const uint8* y_plane,
-                             const uint8* u_plane,
-                             const uint8* v_plane,
-                             uint8* rgb_plane,
-                             const SkIRect& source_rect,
-                             const SkIRect& dest_rect,
-                             int y_stride,
-                             int uv_stride,
-                             int rgb_stride);
-
 void ConvertRGB32ToYUVWithRect(const uint8* rgb_plane,
                                uint8* y_plane,
                                uint8* u_plane,
@@ -52,8 +44,9 @@ int RoundToTwosMultiple(int x);
 // Align the sides of the rectangle to multiples of 2 (expanding outwards).
 SkIRect AlignRect(const SkIRect& rect);
 
-// Return a scaled rectangle using the horizontal and vertical scale
-// factors.
+// Scale a rectangle by horizontal and vertical factors.  If the result has
+// non-integer coordinates then the smallest integer-coordinate rectangle that
+// wholly encloses it is returned.
 SkIRect ScaleRect(const SkIRect& rect,
                   double horizontal_ratio,
                   double vertical_ratio);