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

Unified Diff: cc/render_pass.h

Issue 11308153: Migrate most of cc/ from WebKit::WebTransformationMatrix to gfx::Transform (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased to tip of tree and addressed feedback Created 8 years, 1 month 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/render_pass.h
diff --git a/cc/render_pass.h b/cc/render_pass.h
index e14b5e6d97be36eca25ccd83c3cb427f61668fec..46247573b488b6f8453c2881ac7b6f672efaa17f 100644
--- a/cc/render_pass.h
+++ b/cc/render_pass.h
@@ -5,6 +5,9 @@
#ifndef CC_RENDER_PASS_H_
#define CC_RENDER_PASS_H_
+#include <public/WebFilterOperations.h>
+#include <vector>
+
#include "base/basictypes.h"
#include "cc/cc_export.h"
#include "cc/draw_quad.h"
@@ -14,9 +17,7 @@
#include "cc/shared_quad_state.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/rect_f.h"
-#include <public/WebFilterOperations.h>
-#include <public/WebTransformationMatrix.h>
-#include <vector>
+#include "ui/gfx/transform.h"
class SkImageFilter;
@@ -66,12 +67,12 @@ class CC_EXPORT RenderPass {
void SetNew(Id id,
gfx::Rect output_rect,
gfx::RectF damage_rect,
- const WebKit::WebTransformationMatrix& transform_to_root_target);
+ const gfx::Transform& transform_to_root_target);
void SetAll(Id id,
gfx::Rect output_rect,
gfx::RectF damage_rect,
- const WebKit::WebTransformationMatrix& transform_to_root_target,
+ const gfx::Transform& transform_to_root_target,
bool has_transparent_background,
bool has_occlusion_from_outside_target_surface,
const WebKit::WebFilterOperations& filters,
@@ -87,7 +88,7 @@ class CC_EXPORT RenderPass {
// Transforms from the origin of the |output_rect| to the origin of the root
// render pass' |output_rect|.
- WebKit::WebTransformationMatrix transform_to_root_target;
+ gfx::Transform transform_to_root_target;
// If false, the pixels in the render pass' texture are all opaque.
bool has_transparent_background;

Powered by Google App Engine
This is Rietveld 408576698