[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
simon.fraser at apple.com
simon.fraser at apple.com
Wed Dec 22 17:45:28 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 78e3bdb16c412faa7690eb21b071fa4784150bb8
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 30 00:53:05 2010 +0000
2010-11-29 Simon Fraser <simon.fraser at apple.com>
Reviewed by Ojan Vafai.
bunch of pixel failures after http://trac.webkit.org/changeset/72839/
https://bugs.webkit.org/show_bug.cgi?id=50188
We need to call updateLayerTransform() for reflections, and
table rows as well.
* rendering/RenderReplica.cpp:
(WebCore::RenderReplica::layout):
* rendering/RenderTableRow.cpp:
(WebCore::RenderTableRow::layout):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::layoutRows):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72850 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ead95d7..0d5ce18 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-29 Simon Fraser <simon.fraser at apple.com>
+
+ Reviewed by Ojan Vafai.
+
+ bunch of pixel failures after http://trac.webkit.org/changeset/72839/
+ https://bugs.webkit.org/show_bug.cgi?id=50188
+
+ Move the results of overflow-update-transform.html into the platform directory
+ since they include pixel results.
+
+ * fast/overflow/overflow-update-transform-expected.txt: Removed.
+ * fast/overflow/overflow-update-transform.html:
+ * platform/mac/fast/overflow/overflow-update-transform-expected.checksum: Added.
+ * platform/mac/fast/overflow/overflow-update-transform-expected.png: Added.
+ * platform/mac/fast/overflow/overflow-update-transform-expected.txt: Added.
+ * platform/qt/fast/overflow/overflow-update-transform-expected.txt: Removed.
+
2010-11-29 Ojan Vafai <ojan at chromium.org>
Mark tests as failing after http://trac.webkit.org/changeset/72839/.
diff --git a/LayoutTests/fast/overflow/overflow-update-transform-expected.txt b/LayoutTests/fast/overflow/overflow-update-transform-expected.txt
deleted file mode 100644
index 695f9cf..0000000
--- a/LayoutTests/fast/overflow/overflow-update-transform-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 785x634
- RenderView at (0,0) size 785x600
-layer at (0,0) size 785x634
- RenderBlock {HTML} at (0,0) size 785x634
- RenderBody {BODY} at (8,10) size 769x614
-layer at (18,10) size 302x302 clip at (19,11) size 285x285 scrollWidth 363 scrollHeight 363
- RenderBlock {DIV} at (10,0) size 302x302 [border: (1px solid #000000)]
-layer at (18,322) size 302x302 clip at (19,323) size 285x285 scrollWidth 363 scrollHeight 363
- RenderBlock {DIV} at (10,312) size 302x302 [border: (1px solid #000000)]
- RenderText {#text} at (0,0) size 0x0
-layer at (19,11) size 300x300 backgroundClip at (19,11) size 285x285 clip at (19,11) size 285x285 outlineClip at (19,11) size 285x285
- RenderBlock {DIV} at (1,1) size 300x300 [bgcolor=#C0C0C0]
-layer at (19,323) size 300x300 backgroundClip at (19,323) size 285x285 clip at (19,323) size 285x285 outlineClip at (19,323) size 285x285
- RenderImage {IMG} at (1,1) size 300x300 [bgcolor=#C0C0C0]
diff --git a/LayoutTests/fast/overflow/overflow-update-transform.html b/LayoutTests/fast/overflow/overflow-update-transform.html
index 0cd7dac..3295887 100644
--- a/LayoutTests/fast/overflow/overflow-update-transform.html
+++ b/LayoutTests/fast/overflow/overflow-update-transform.html
@@ -5,15 +5,15 @@
<style type="text/css" media="screen">
.container {
overflow: scroll;
- height: 300px;
- width: 300px;
+ height: 250px;
+ width: 250px;
margin: 10px;
border: 1px solid black;
}
.contents {
- height: 300px;
- width: 300px;
+ height: 250px;
+ width: 250px;
-webkit-transform: rotate(45deg);
background-color: silver;
}
diff --git a/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.checksum b/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.checksum
new file mode 100644
index 0000000..1aa01be
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.checksum
@@ -0,0 +1 @@
+cf236338b6818f45e1e841e8919a908e
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.png b/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.png
new file mode 100644
index 0000000..fb66831
Binary files /dev/null and b/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.txt b/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.txt
new file mode 100644
index 0000000..702ace3
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.txt
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x534
+ RenderBlock {HTML} at (0,0) size 800x534
+ RenderBody {BODY} at (8,10) size 784x514
+layer at (18,10) size 252x252 clip at (19,11) size 235x235 scrollWidth 302 scrollHeight 302
+ RenderBlock {DIV} at (10,0) size 252x252 [border: (1px solid #000000)]
+layer at (18,272) size 252x252 clip at (19,273) size 235x235 scrollWidth 302 scrollHeight 302
+ RenderBlock {DIV} at (10,262) size 252x252 [border: (1px solid #000000)]
+ RenderText {#text} at (0,0) size 0x0
+layer at (19,11) size 250x250 backgroundClip at (19,11) size 235x235 clip at (19,11) size 235x235 outlineClip at (19,11) size 235x235
+ RenderBlock {DIV} at (1,1) size 250x250 [bgcolor=#C0C0C0]
+layer at (19,273) size 250x250 backgroundClip at (19,273) size 235x235 clip at (19,273) size 235x235 outlineClip at (19,273) size 235x235
+ RenderImage {IMG} at (1,1) size 250x250 [bgcolor=#C0C0C0]
diff --git a/LayoutTests/platform/qt/fast/overflow/overflow-update-transform-expected.txt b/LayoutTests/platform/qt/fast/overflow/overflow-update-transform-expected.txt
deleted file mode 100644
index 47681f9..0000000
--- a/LayoutTests/platform/qt/fast/overflow/overflow-update-transform-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 784x634
- RenderView at (0,0) size 784x600
-layer at (0,0) size 784x634
- RenderBlock {HTML} at (0,0) size 784x634
- RenderBody {BODY} at (8,10) size 768x614
-layer at (18,10) size 302x302 clip at (19,11) size 284x284 scrollWidth 363 scrollHeight 363
- RenderBlock {DIV} at (10,0) size 302x302 [border: (1px solid #000000)]
-layer at (18,322) size 302x302 clip at (19,323) size 284x284 scrollWidth 363 scrollHeight 363
- RenderBlock {DIV} at (10,312) size 302x302 [border: (1px solid #000000)]
- RenderText {#text} at (0,0) size 0x0
-layer at (19,11) size 300x300 backgroundClip at (19,11) size 284x284 clip at (19,11) size 284x284 outlineClip at (19,11) size 284x284
- RenderBlock {DIV} at (1,1) size 300x300 [bgcolor=#C0C0C0]
-layer at (19,323) size 300x300 backgroundClip at (19,323) size 284x284 clip at (19,323) size 284x284 outlineClip at (19,323) size 284x284
- RenderImage {IMG} at (1,1) size 300x300 [bgcolor=#C0C0C0]
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dbf3e72..437b8a3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-29 Simon Fraser <simon.fraser at apple.com>
+
+ Reviewed by Ojan Vafai.
+
+ bunch of pixel failures after http://trac.webkit.org/changeset/72839/
+ https://bugs.webkit.org/show_bug.cgi?id=50188
+
+ We need to call updateLayerTransform() for reflections, and
+ table rows as well.
+
+ * rendering/RenderReplica.cpp:
+ (WebCore::RenderReplica::layout):
+ * rendering/RenderTableRow.cpp:
+ (WebCore::RenderTableRow::layout):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::layoutRows):
+
2010-11-29 Xiaomei Ji <xji at chromium.org>
Reviewed by David Hyatt.
diff --git a/WebCore/rendering/RenderReplica.cpp b/WebCore/rendering/RenderReplica.cpp
index 4b11f40..c099d9d 100644
--- a/WebCore/rendering/RenderReplica.cpp
+++ b/WebCore/rendering/RenderReplica.cpp
@@ -49,6 +49,7 @@ RenderReplica::~RenderReplica()
void RenderReplica::layout()
{
setFrameRect(parentBox()->borderBoxRect());
+ updateLayerTransform();
setNeedsLayout(false);
}
diff --git a/WebCore/rendering/RenderTableRow.cpp b/WebCore/rendering/RenderTableRow.cpp
index 98544a6..3dd4017 100644
--- a/WebCore/rendering/RenderTableRow.cpp
+++ b/WebCore/rendering/RenderTableRow.cpp
@@ -145,6 +145,7 @@ void RenderTableRow::layout()
}
statePusher.pop();
+ // RenderTableSection::layoutRows will set our logical height and width later, so it calls updateLayerTransform().
setNeedsLayout(false);
}
diff --git a/WebCore/rendering/RenderTableSection.cpp b/WebCore/rendering/RenderTableSection.cpp
index f4051e7..829bf5b 100644
--- a/WebCore/rendering/RenderTableSection.cpp
+++ b/WebCore/rendering/RenderTableSection.cpp
@@ -492,6 +492,7 @@ int RenderTableSection::layoutRows(int toAdd)
rowRenderer->setLocation(0, m_rowPos[r]);
rowRenderer->setLogicalWidth(logicalWidth());
rowRenderer->setLogicalHeight(m_rowPos[r + 1] - m_rowPos[r] - vspacing);
+ rowRenderer->updateLayerTransform();
}
for (int c = 0; c < nEffCols; c++) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list