Index: cc/CCLayerQuad.h |
diff --git a/cc/CCLayerQuad.h b/cc/CCLayerQuad.h |
index 8be296fbf3c5a9d6798521c8be1ab9065bc95f6f..813ee03471c3cd1cdcc46d40b37a645df0154965 100644 |
--- a/cc/CCLayerQuad.h |
+++ b/cc/CCLayerQuad.h |
@@ -1,106 +1,6 @@ |
-// Copyright 2011 The Chromium Authors. All rights reserved. |
+// Copyright 2012 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
- |
-#ifndef CCLayerQuad_h |
-#define CCLayerQuad_h |
- |
-#if USE(ACCELERATED_COMPOSITING) |
- |
-#include "FloatPoint3D.h" |
-#include "FloatQuad.h" |
- |
-static const float kAntiAliasingInflateDistance = 0.5f; |
- |
-namespace cc { |
- |
-class CCLayerQuad { |
-public: |
- class Edge { |
- public: |
- Edge() |
- : m_x(0) |
- , m_y(0) |
- , m_z(0) |
- { |
- } |
- Edge(const FloatPoint&, const FloatPoint&); |
- |
- float x() const { return m_x; } |
- float y() const { return m_y; } |
- float z() const { return m_z; } |
- |
- void setX(float x) { m_x = x; } |
- void setY(float y) { m_y = y; } |
- void setZ(float z) { m_z = z; } |
- void set(float x, float y, float z) |
- { |
- m_x = x; |
- m_y = y; |
- m_z = z; |
- } |
- |
- void moveX(float dx) { m_x += dx; } |
- void moveY(float dy) { m_y += dy; } |
- void moveZ(float dz) { m_z += dz; } |
- void move(float dx, float dy, float dz) |
- { |
- m_x += dx; |
- m_y += dy; |
- m_z += dz; |
- } |
- |
- void scaleX(float sx) { m_x *= sx; } |
- void scaleY(float sy) { m_y *= sy; } |
- void scaleZ(float sz) { m_z *= sz; } |
- void scale(float sx, float sy, float sz) |
- { |
- m_x *= sx; |
- m_y *= sy; |
- m_z *= sz; |
- } |
- void scale(float s) { scale(s, s, s); } |
- |
- FloatPoint intersect(const Edge& e) const |
- { |
- return FloatPoint( |
- (y() * e.z() - e.y() * z()) / (x() * e.y() - e.x() * y()), |
- (x() * e.z() - e.x() * z()) / (e.x() * y() - x() * e.y())); |
- } |
- |
- private: |
- float m_x; |
- float m_y; |
- float m_z; |
- }; |
- |
- CCLayerQuad(const Edge& left, const Edge& top, const Edge& right, const Edge& bottom); |
- CCLayerQuad(const FloatQuad&); |
- |
- Edge left() const { return m_left; } |
- Edge top() const { return m_top; } |
- Edge right() const { return m_right; } |
- Edge bottom() const { return m_bottom; } |
- |
- void inflateX(float dx) { m_left.moveZ(dx); m_right.moveZ(dx); } |
- void inflateY(float dy) { m_top.moveZ(dy); m_bottom.moveZ(dy); } |
- void inflate(float d) { inflateX(d); inflateY(d); } |
- void inflateAntiAliasingDistance() { inflate(kAntiAliasingInflateDistance); } |
- |
- FloatQuad floatQuad() const; |
- |
- void toFloatArray(float[12]) const; |
- |
-private: |
- Edge m_left; |
- Edge m_top; |
- Edge m_right; |
- Edge m_bottom; |
-}; |
- |
-} |
- |
-#endif // USE(ACCELERATED_COMPOSITING) |
- |
-#endif |
+// Temporary forwarding header |
+#include "cc/layer_quad.h" |