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

Unified Diff: cc/texture_draw_quad.cc

Issue 11481004: explicitly validating assumptions about positive matrix scale (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | « cc/texture_draw_quad.h ('k') | cc/texture_layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/texture_draw_quad.cc
diff --git a/cc/texture_draw_quad.cc b/cc/texture_draw_quad.cc
index d552c3991c21a2d3a1f89aa3f03dee46dbdd1109..5ad73b69dc28731925dcf31518cd61148feedc72 100644
--- a/cc/texture_draw_quad.cc
+++ b/cc/texture_draw_quad.cc
@@ -58,4 +58,52 @@ const TextureDrawQuad* TextureDrawQuad::MaterialCast(
return static_cast<const TextureDrawQuad*>(quad);
}
+bool TextureDrawQuad::PerformClipping() {
+ // This only occurs if the rect is only scaled and translated (and thus still
+ // axis aligned).
+ if (!quadTransform().IsScaleOrTranslation())
+ return false;
+
+ // Grab our scale and make sure it's positive.
+ float x_scale = quadTransform().matrix().getDouble(0,0);
+ float y_scale = quadTransform().matrix().getDouble(1,1);
+ if (x_scale <= 0.0f || y_scale <= 0.0f)
+ return false;
+
+ // Grab our offset.
+ gfx::Vector2dF offset(
+ quadTransform().matrix().getDouble(0,3),
+ quadTransform().matrix().getDouble(1,3));
+
+ // Transform the rect by the scale and offset.
+ gfx::RectF rectF = rect;
+ rectF.Scale(x_scale, y_scale);
+ rectF += offset;
+
+ // Perform clipping and check to see if the result is empty.
+ gfx::RectF clippedRect = IntersectRects(rectF, clipRect());
+ if (clippedRect.IsEmpty()) {
+ rect = gfx::Rect();
+ uv_rect = gfx::RectF();
+ return true;
+ }
+
+ // Create a new uv-rect by clipping the old one to the new bounds.
+ uv_rect = gfx::RectF(
+ uv_rect.x()+uv_rect.width ()/rectF.width ()*(clippedRect.x()-rectF.x()),
+ uv_rect.y()+uv_rect.height()/rectF.height()*(clippedRect.y()-rectF.y()),
+ uv_rect.width () / rectF.width () * clippedRect.width (),
+ uv_rect.height() / rectF.height() * clippedRect.height());
+
+ // Move the clipped rectangle back into its space.
+ clippedRect -= offset;
+ clippedRect.Scale(1.0f / x_scale, 1.0f / y_scale);
+ rect = gfx::Rect(
+ static_cast<int>(clippedRect.x() + 0.5f),
+ static_cast<int>(clippedRect.y() + 0.5f),
+ static_cast<int>(clippedRect.width() + 0.5f),
+ static_cast<int>(clippedRect.height() + 0.5f));
+ return true;
+}
+
} // namespace cc
« no previous file with comments | « cc/texture_draw_quad.h ('k') | cc/texture_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698