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

Unified Diff: cc/CCSharedQuadState.h

Issue 10984053: cc: Use ui/gfx geometry types for the CCRenderPass and CCDrawQuad classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
Index: cc/CCSharedQuadState.h
diff --git a/cc/CCSharedQuadState.h b/cc/CCSharedQuadState.h
index f4f9726644e76039932404fa653689483e888ab5..7c2688c1a36b07ee9ee1b5ef3e3264ef4b8c351d 100644
--- a/cc/CCSharedQuadState.h
+++ b/cc/CCSharedQuadState.h
@@ -5,8 +5,9 @@
#ifndef CCSharedQuadState_h
#define CCSharedQuadState_h
-#include "IntRect.h"
+#include "cc/math/int_rect.h"
#include <public/WebTransformationMatrix.h>
+#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
namespace cc {
@@ -17,13 +18,13 @@ struct CCSharedQuadState {
// Transforms from quad's original content space to its target content space.
WebKit::WebTransformationMatrix quadTransform;
// This rect lives in the content space for the quad's originating layer.
- IntRect visibleContentRect;
- IntRect clippedRectInTarget;
+ ccmath::IntRect visibleContentRect;
+ ccmath::IntRect clippedRectInTarget;
float opacity;
bool opaque;
- static PassOwnPtr<CCSharedQuadState> create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque);
- CCSharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque);
+ static PassOwnPtr<CCSharedQuadState> create(const WebKit::WebTransformationMatrix& quadTransform, const ccmath::IntRect& visibleContentRect, const ccmath::IntRect& clippedRectInTarget, float opacity, bool opaque);
+ CCSharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const ccmath::IntRect& visibleContentRect, const ccmath::IntRect& clippedRectInTarget, float opacity, bool opaque);
PassOwnPtr<CCSharedQuadState> copy() const;
};
« no previous file with comments | « cc/CCRendererSoftware.cpp ('k') | cc/CCSharedQuadState.cpp » ('j') | cc/math/clamp.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698