Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Unified Diff: remoting/base/util.h

Issue 7992011: Move us fully from gfx:: over to skia types for consistency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix for bad DEPS Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/base/encoder_vp8_unittest.cc ('k') | remoting/base/util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/util.h
diff --git a/remoting/base/util.h b/remoting/base/util.h
index 262b5519d761dbf908d792cf010f51cec3f0a92c..b60e0721fe3b74038b0666a52ca2d3f9e614541c 100644
--- a/remoting/base/util.h
+++ b/remoting/base/util.h
@@ -7,7 +7,6 @@
#include "media/base/video_frame.h"
#include "third_party/skia/include/core/SkRect.h"
-#include "ui/gfx/rect.h"
namespace remoting {
@@ -21,7 +20,7 @@ void ConvertYUVToRGB32WithRect(const uint8* y_plane,
const uint8* u_plane,
const uint8* v_plane,
uint8* rgb_plane,
- const gfx::Rect& rect,
+ const SkIRect& rect,
int y_stride,
int uv_stride,
int rgb_stride);
@@ -30,8 +29,8 @@ void ScaleYUVToRGB32WithRect(const uint8* y_plane,
const uint8* u_plane,
const uint8* v_plane,
uint8* rgb_plane,
- const gfx::Rect& source_rect,
- const gfx::Rect& dest_rect,
+ const SkIRect& source_rect,
+ const SkIRect& dest_rect,
int y_stride,
int uv_stride,
int rgb_stride);
@@ -51,13 +50,13 @@ void ConvertRGB32ToYUVWithRect(const uint8* rgb_plane,
int RoundToTwosMultiple(int x);
// Align the sides of the rectangle to multiples of 2 (expanding outwards).
-gfx::Rect AlignRect(const gfx::Rect& rect);
+SkIRect AlignRect(const SkIRect& rect);
// Return a scaled rectangle using the horizontal and vertical scale
// factors.
-gfx::Rect ScaleRect(const gfx::Rect& rect,
- double horizontal_ratio,
- double vertical_ratio);
+SkIRect ScaleRect(const SkIRect& rect,
+ double horizontal_ratio,
+ double vertical_ratio);
// Copy pixels in the rectangle from source to destination.
void CopyRect(const uint8* src_plane,
« no previous file with comments | « remoting/base/encoder_vp8_unittest.cc ('k') | remoting/base/util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698