summaryrefslogtreecommitdiffstats
path: root/cc/nine_patch_layer_impl_unittest.cc
diff options
context:
space:
mode:
authorilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 06:40:50 +0000
committerilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 06:40:50 +0000
commit3543975945a5667aa3fb48c6d0e1b6312d1ed293 (patch)
treea6ea1e1c640c6e9121a4e2ef066e1f235868099e /cc/nine_patch_layer_impl_unittest.cc
parent88b2f1aa74e8fe0b4413a4f807681fd427071184 (diff)
downloadchromium_src-3543975945a5667aa3fb48c6d0e1b6312d1ed293.zip
chromium_src-3543975945a5667aa3fb48c6d0e1b6312d1ed293.tar.gz
chromium_src-3543975945a5667aa3fb48c6d0e1b6312d1ed293.tar.bz2
Revert 177288
> cc: Add point-based UV coordinate on TextureLayer > > Previously, the uv coordinates was using gfx::RectF as a struct. > This was limitating because it could not handle negative width > and heights. Soring them as 2 gfx::PointF for the Top-Left and > Bottom-Right points aleviate that restriction. > The current implementation of the phone UI rely on this feature. > > BUG=168927 > > Review URL: https://chromiumcodereview.appspot.com/11783094 This is breaking the android internal chrome build, we need green for a release cut later tonight. Let's reland tomorrow with the corresponding downstream fix. TBR=jscholler@chromium.org Review URL: https://codereview.chromium.org/11959026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/nine_patch_layer_impl_unittest.cc')
-rw-r--r--cc/nine_patch_layer_impl_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/nine_patch_layer_impl_unittest.cc b/cc/nine_patch_layer_impl_unittest.cc
index fbf765b..aa9bc01 100644
--- a/cc/nine_patch_layer_impl_unittest.cc
+++ b/cc/nine_patch_layer_impl_unittest.cc
@@ -82,7 +82,7 @@ TEST(NinePatchLayerImplTest, verifyDrawQuads)
for (size_t i = 0; i < quads.size(); ++i) {
DrawQuad* quad = quads[i];
const TextureDrawQuad* texQuad = TextureDrawQuad::MaterialCast(quad);
- gfx::RectF texRect = gfx::BoundingRect(texQuad->uv_top_left, texQuad->uv_bottom_right);
+ gfx::RectF texRect = texQuad->uv_rect;
texRect.Scale(bitmapSize.width(), bitmapSize.height());
texRemaining.Subtract(Region(ToRoundedIntRect(texRect)));
}
@@ -135,7 +135,7 @@ TEST(NinePatchLayerImplTest, verifyDrawQuadsForSqueezedLayer)
for (size_t i = 0; i < quads.size(); ++i) {
DrawQuad* quad = quads[i];
const TextureDrawQuad* texQuad = TextureDrawQuad::MaterialCast(quad);
- gfx::RectF texRect = gfx::BoundingRect(texQuad->uv_top_left, texQuad->uv_bottom_right);
+ gfx::RectF texRect = texQuad->uv_rect;
texRect.Scale(bitmapSize.width(), bitmapSize.height());
texRemaining.Subtract(Region(ToRoundedIntRect(texRect)));
}