[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
noam.rosenthal at nokia.com
noam.rosenthal at nokia.com
Wed Dec 22 14:41:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0fed9f59f0d97bba06fa545c8d8d820fd28bbc98
Author: noam.rosenthal at nokia.com <noam.rosenthal at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 15 21:57:43 2010 +0000
2010-10-15 No'am Rosenthal <noam.rosenthal at nokia.com>
Reviewed by Simon Fraser.
Add public functions to serialize TransformOperations.
https://bugs.webkit.org/show_bug.cgi?id=47728
Added public accessors to the internal data of the TransformOperations.
No new tests. These functions are enablers for WebKit2.
* platform/graphics/transforms/Matrix3DTransformOperation.h:
(WebCore::Matrix3DTransformOperation::matrix):
* platform/graphics/transforms/MatrixTransformOperation.h:
(WebCore::MatrixTransformOperation::matrix):
* platform/graphics/transforms/PerspectiveTransformOperation.h:
(WebCore::PerspectiveTransformOperation::perspective):
* platform/graphics/transforms/RotateTransformOperation.h:
(WebCore::RotateTransformOperation::x):
(WebCore::RotateTransformOperation::y):
(WebCore::RotateTransformOperation::z):
* platform/graphics/transforms/SkewTransformOperation.h:
(WebCore::SkewTransformOperation::angleX):
(WebCore::SkewTransformOperation::angleY):
* platform/graphics/transforms/TranslateTransformOperation.h:
(WebCore::TranslateTransformOperation::x):
(WebCore::TranslateTransformOperation::y):
(WebCore::TranslateTransformOperation::z):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69884 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3d86c5f..fca674f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,32 @@
+2010-10-15 No'am Rosenthal <noam.rosenthal at nokia.com>
+
+ Reviewed by Simon Fraser.
+
+ Add public functions to serialize TransformOperations.
+ https://bugs.webkit.org/show_bug.cgi?id=47728
+
+ Added public accessors to the internal data of the TransformOperations.
+
+ No new tests. These functions are enablers for WebKit2.
+
+ * platform/graphics/transforms/Matrix3DTransformOperation.h:
+ (WebCore::Matrix3DTransformOperation::matrix):
+ * platform/graphics/transforms/MatrixTransformOperation.h:
+ (WebCore::MatrixTransformOperation::matrix):
+ * platform/graphics/transforms/PerspectiveTransformOperation.h:
+ (WebCore::PerspectiveTransformOperation::perspective):
+ * platform/graphics/transforms/RotateTransformOperation.h:
+ (WebCore::RotateTransformOperation::x):
+ (WebCore::RotateTransformOperation::y):
+ (WebCore::RotateTransformOperation::z):
+ * platform/graphics/transforms/SkewTransformOperation.h:
+ (WebCore::SkewTransformOperation::angleX):
+ (WebCore::SkewTransformOperation::angleY):
+ * platform/graphics/transforms/TranslateTransformOperation.h:
+ (WebCore::TranslateTransformOperation::x):
+ (WebCore::TranslateTransformOperation::y):
+ (WebCore::TranslateTransformOperation::z):
+
2010-10-15 Jian Li <jianli at chromium.org>
Reviewed by Dmitry Titov.
diff --git a/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h b/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h
index 7430dbc..0a0aaf0 100644
--- a/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h
+++ b/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h
@@ -37,6 +37,8 @@ public:
return adoptRef(new Matrix3DTransformOperation(matrix));
}
+ TransformationMatrix matrix() const {return m_matrix; }
+
private:
virtual bool isIdentity() const { return m_matrix.isIdentity(); }
diff --git a/WebCore/platform/graphics/transforms/MatrixTransformOperation.h b/WebCore/platform/graphics/transforms/MatrixTransformOperation.h
index ee47a11..fd9b27e 100644
--- a/WebCore/platform/graphics/transforms/MatrixTransformOperation.h
+++ b/WebCore/platform/graphics/transforms/MatrixTransformOperation.h
@@ -42,6 +42,8 @@ public:
return adoptRef(new MatrixTransformOperation(t));
}
+ TransformationMatrix matrix() const { return TransformationMatrix(m_a, m_b, m_c, m_d, m_e, m_f); }
+
private:
virtual bool isIdentity() const { return m_a == 1 && m_b == 0 && m_c == 0 && m_d == 1 && m_e == 0 && m_f == 0; }
diff --git a/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h b/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h
index a665f3e..834cc83 100644
--- a/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h
+++ b/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h
@@ -36,6 +36,8 @@ public:
{
return adoptRef(new PerspectiveTransformOperation(p));
}
+
+ double perspective() const { return m_p; }
private:
virtual bool isIdentity() const { return m_p == 0; }
diff --git a/WebCore/platform/graphics/transforms/RotateTransformOperation.h b/WebCore/platform/graphics/transforms/RotateTransformOperation.h
index 699ea43..2acb002 100644
--- a/WebCore/platform/graphics/transforms/RotateTransformOperation.h
+++ b/WebCore/platform/graphics/transforms/RotateTransformOperation.h
@@ -41,6 +41,9 @@ public:
return adoptRef(new RotateTransformOperation(x, y, z, angle, type));
}
+ double x() const { return m_x; }
+ double y() const { return m_y; }
+ double z() const { return m_z; }
double angle() const { return m_angle; }
private:
diff --git a/WebCore/platform/graphics/transforms/SkewTransformOperation.h b/WebCore/platform/graphics/transforms/SkewTransformOperation.h
index 6343710..afe9a7b 100644
--- a/WebCore/platform/graphics/transforms/SkewTransformOperation.h
+++ b/WebCore/platform/graphics/transforms/SkewTransformOperation.h
@@ -36,6 +36,9 @@ public:
return adoptRef(new SkewTransformOperation(angleX, angleY, type));
}
+ double angleX() const { return m_angleX; }
+ double angleY() const { return m_angleY; }
+
private:
virtual bool isIdentity() const { return m_angleX == 0 && m_angleY == 0; }
virtual OperationType getOperationType() const { return m_type; }
diff --git a/WebCore/platform/graphics/transforms/TranslateTransformOperation.h b/WebCore/platform/graphics/transforms/TranslateTransformOperation.h
index a66cc3d..ea48d49 100644
--- a/WebCore/platform/graphics/transforms/TranslateTransformOperation.h
+++ b/WebCore/platform/graphics/transforms/TranslateTransformOperation.h
@@ -46,6 +46,10 @@ public:
double y(const IntSize& borderBoxSize) const { return m_y.calcFloatValue(borderBoxSize.height()); }
double z(const IntSize&) const { return m_z.calcFloatValue(1); }
+ Length x() const { return m_x; }
+ Length y() const { return m_y; }
+ Length z() const { return m_z; }
+
private:
virtual bool isIdentity() const { return m_x.calcFloatValue(1) == 0 && m_y.calcFloatValue(1) == 0 && m_z.calcFloatValue(1) == 0; }
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list