[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c
ariya at webkit.org
ariya at webkit.org
Mon Dec 27 16:28:59 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit beaa6298cff87ad93602aeae77132a41eb560c9d
Author: ariya at webkit.org <ariya at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 22 03:42:38 2010 +0000
2010-12-21 Jan Erik Hanssen <jhanssen at sencha.com>
Reviewed by Simon Fraser.
matrix3d() must take the zoom factor into account
https://bugs.webkit.org/show_bug.cgi?id=51408
* transforms/3d/general/matrix-with-zoom-3d-expected.checksum: Added.
* transforms/3d/general/matrix-with-zoom-3d-expected.png: Added.
* transforms/3d/general/matrix-with-zoom-3d-expected.txt: Added.
* transforms/3d/general/matrix-with-zoom-3d.html: Added.
2010-12-21 Jan Erik Hanssen <jhanssen at sencha.com>
Reviewed by Simon Fraser.
matrix3d() must take the zoom factor into account
https://bugs.webkit.org/show_bug.cgi?id=51408
Test: transforms/3d/general/matrix-with-zoom-3d.html
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::createTransformOperations):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74451 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 904f685..56fdee6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-21 Jan Erik Hanssen <jhanssen at sencha.com>
+
+ Reviewed by Simon Fraser.
+
+ matrix3d() must take the zoom factor into account
+ https://bugs.webkit.org/show_bug.cgi?id=51408
+
+ * transforms/3d/general/matrix-with-zoom-3d-expected.checksum: Added.
+ * transforms/3d/general/matrix-with-zoom-3d-expected.png: Added.
+ * transforms/3d/general/matrix-with-zoom-3d-expected.txt: Added.
+ * transforms/3d/general/matrix-with-zoom-3d.html: Added.
+
2010-12-21 Dan Bernstein <mitz at apple.com>
Reviewed by John Sullivan.
diff --git a/LayoutTests/transforms/3d/general/matrix-with-zoom-3d-expected.checksum b/LayoutTests/transforms/3d/general/matrix-with-zoom-3d-expected.checksum
new file mode 100644
index 0000000..44366ce
--- /dev/null
+++ b/LayoutTests/transforms/3d/general/matrix-with-zoom-3d-expected.checksum
@@ -0,0 +1 @@
+b456bd8acae8d9bc2bb5f43534e2ff9f
\ No newline at end of file
diff --git a/LayoutTests/transforms/3d/general/matrix-with-zoom-3d-expected.png b/LayoutTests/transforms/3d/general/matrix-with-zoom-3d-expected.png
new file mode 100644
index 0000000..3a8790e
Binary files /dev/null and b/LayoutTests/transforms/3d/general/matrix-with-zoom-3d-expected.png differ
diff --git a/LayoutTests/transforms/3d/general/matrix-with-zoom-3d-expected.txt b/LayoutTests/transforms/3d/general/matrix-with-zoom-3d-expected.txt
new file mode 100644
index 0000000..838dfc8
--- /dev/null
+++ b/LayoutTests/transforms/3d/general/matrix-with-zoom-3d-expected.txt
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBody {BODY} at (0,0) size 800x600
+layer at (48,72) size 120x120
+ RenderBlock (positioned) {DIV} at (48,72) size 120x120 [bgcolor=#FF0000]
+layer at (48,72) size 120x120
+ RenderBlock (positioned) {DIV} at (48,72) size 120x120 [bgcolor=#008000]
diff --git a/LayoutTests/transforms/3d/general/matrix-with-zoom-3d.html b/LayoutTests/transforms/3d/general/matrix-with-zoom-3d.html
new file mode 100644
index 0000000..2420f4b
--- /dev/null
+++ b/LayoutTests/transforms/3d/general/matrix-with-zoom-3d.html
@@ -0,0 +1,65 @@
+<html>
+<head>
+<style>
+body {
+ zoom: 1.2;
+ padding: 0;
+ margin: 0;
+ -webkit-transform-style: perserve-3d;
+ -webkit-perspective: 1000px;
+}
+
+.box {
+ width: 100px;
+ height: 100px;
+ background-color: blue;
+ position: absolute;
+ top: 60px;
+ left: 40px;
+}
+
+.translate {
+ -webkit-transform: translate(100px, 50px);
+ background-color: red;
+}
+
+.matrix {
+ -webkit-transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 50, 0, 1);
+ background-color: green;
+}
+</style>
+<script type="text/javascript">
+
+function runTest() {
+ if (!window.layoutTestController) {
+
+ var id1 = "a";
+ var id2 = "b";
+ var element1 = document.getElementById(id1);
+ var element2 = document.getElementById(id2);
+ var x1 = webkitConvertPointFromNodeToPage(element1, new WebKitPoint(0,0)).x;
+ var y1 = webkitConvertPointFromNodeToPage(element1, new WebKitPoint(0,0)).y;
+ var x2 = webkitConvertPointFromNodeToPage(element2, new WebKitPoint(0,0)).x;
+ var y2 = webkitConvertPointFromNodeToPage(element2, new WebKitPoint(0,0)).y;
+
+ var resultString = '';
+ if (x1 == x2 && y1 == y2) {
+ resultString += "PASS - Element " + id1 + " and Element " + id2 + " had identical positions";
+ } else {
+ resultString += "FAIL - Element " + id1 + " and Element " + id2 + " had different positions";
+ }
+
+ document.body.appendChild(document.createTextNode(resultString));
+ }
+}
+</script>
+</head>
+<body onload="runTest();">
+
+<!-- You should see green box only. If you see red, the test has failed -->
+
+<div id='a' class="box translate"></div>
+<div id='b' class="box matrix"></div>
+
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 87078ec..4b61335 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-21 Jan Erik Hanssen <jhanssen at sencha.com>
+
+ Reviewed by Simon Fraser.
+
+ matrix3d() must take the zoom factor into account
+ https://bugs.webkit.org/show_bug.cgi?id=51408
+
+ Test: transforms/3d/general/matrix-with-zoom-3d.html
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::createTransformOperations):
+
2010-12-21 Adam Barth <abarth at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index 4f47432..e90f9f0 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -6841,8 +6841,8 @@ bool CSSStyleSelector::createTransformOperations(CSSValue* inValue, RenderStyle*
static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(9))->getDoubleValue(),
static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(10))->getDoubleValue(),
static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(11))->getDoubleValue(),
- static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(12))->getDoubleValue(),
- static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(13))->getDoubleValue(),
+ zoomFactor * static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(12))->getDoubleValue(),
+ zoomFactor * static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(13))->getDoubleValue(),
static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(14))->getDoubleValue(),
static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(15))->getDoubleValue());
operations.operations().append(Matrix3DTransformOperation::create(matrix));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list