[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.2.2-27-g91dab87
Gustavo Noronha Silva
gns at gnome.org
Thu Jul 15 21:13:18 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 08a38bc5b036f6f4859fc0eb4c4394d7567c5155
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Apr 24 00:16:30 2010 +0000
<rdar://problem/7898436> :after content is duplicated
Reviewed by Simon Fraser.
WebCore:
Test: fast/css-generated-content/after-duplicated-after-split.html
* rendering/RenderInline.cpp:
(WebCore::RenderInline::splitInlines): Pass the correct owner of the child list.
LayoutTests:
* fast/css-generated-content/after-duplicated-after-split.html: Added.
* platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.checksum: Added.
* platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.png: Added.
* platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@58201 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b25888d..3ef8c9c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-23 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ <rdar://problem/7898436> :after content is duplicated
+
+ * fast/css-generated-content/after-duplicated-after-split.html: Added.
+ * platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.checksum: Added.
+ * platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.png: Added.
+ * platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.txt: Added.
+
2010-03-30 Chris Evans <cevans at chromium.org>
Reviewed by Adam Barth.
diff --git a/LayoutTests/fast/css-generated-content/after-duplicated-after-split.html b/LayoutTests/fast/css-generated-content/after-duplicated-after-split.html
new file mode 100644
index 0000000..59fc0ae
--- /dev/null
+++ b/LayoutTests/fast/css-generated-content/after-duplicated-after-split.html
@@ -0,0 +1,14 @@
+<style>
+ span:after { content: 'not '; }
+</style>
+<p>
+ Test for <i><a href="rdar://problem/7898436">rdar://problem/7898436</a> :after content is duplicated</i>.
+</p>
+<p>
+ The test passed if the word “not” appears exactly once in the following sentence:
+</p>
+<div style="font-size: 96px;">
+The test did
+<span><b><div></div></b></span>
+fail.
+</div>
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.checksum b/LayoutTests/platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.checksum
new file mode 100644
index 0000000..9a45b1c
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.checksum
@@ -0,0 +1 @@
+6ae34a396b3be0bf3cd080519387cad4
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.png b/LayoutTests/platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.png
new file mode 100644
index 0000000..22bb94e
Binary files /dev/null and b/LayoutTests/platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.txt b/LayoutTests/platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.txt
new file mode 100644
index 0000000..dc96395
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/css-generated-content/after-duplicated-after-split-expected.txt
@@ -0,0 +1,35 @@
+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
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 53x18
+ text run at (0,0) width 53: "Test for "
+ RenderInline {I} at (0,0) size 326x18
+ RenderInline {A} at (0,0) size 154x18 [color=#0000EE]
+ RenderText {#text} at (53,0) size 154x18
+ text run at (53,0) width 154: "rdar://problem/7898436"
+ RenderText {#text} at (207,0) size 172x18
+ text run at (207,0) width 172: " :after content is duplicated"
+ RenderText {#text} at (379,0) size 4x18
+ text run at (379,0) width 4: "."
+ RenderBlock {P} at (0,34) size 784x18
+ RenderText {#text} at (0,0) size 508x18
+ text run at (0,0) width 508: "The test passed if the word \x{201C}not\x{201D} appears exactly once in the following sentence:"
+ RenderBlock {DIV} at (0,68) size 784x220
+ RenderBlock (anonymous) at (0,0) size 784x110
+ RenderText {#text} at (0,0) size 455x110
+ text run at (0,0) width 455: "The test did"
+ RenderInline {SPAN} at (0,0) size 0x0
+ RenderInline {B} at (0,0) size 0x0
+ RenderBlock (anonymous) at (0,110) size 784x0
+ RenderBlock {DIV} at (0,0) size 784x0
+ RenderBlock (anonymous) at (0,110) size 784x110
+ RenderInline {SPAN} at (0,0) size 147x110
+ RenderInline {B} at (0,0) size 0x0
+ RenderInline (generated) at (0,0) size 147x110
+ RenderText at (0,0) size 147x110
+ text run at (0,0) width 147: "not "
+ RenderText {#text} at (147,0) size 153x110
+ text run at (147,0) width 153: "fail."
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e849c07..dec4bd1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-23 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ <rdar://problem/7898436> :after content is duplicated
+
+ Test: fast/css-generated-content/after-duplicated-after-split.html
+
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::splitInlines): Pass the correct owner of the child list.
+
2010-03-30 Chris Evans <cevans at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebCore/rendering/RenderInline.cpp b/WebCore/rendering/RenderInline.cpp
index 6d3f462..69e6eab 100644
--- a/WebCore/rendering/RenderInline.cpp
+++ b/WebCore/rendering/RenderInline.cpp
@@ -274,7 +274,7 @@ void RenderInline::splitInlines(RenderBlock* fromBlock, RenderBlock* toBlock,
// has to move into the inline continuation. Call updateBeforeAfterContent to ensure that the inline's :after
// content gets properly destroyed.
if (document()->usesBeforeAfterRules())
- inlineCurr->children()->updateBeforeAfterContent(this, AFTER);
+ inlineCurr->children()->updateBeforeAfterContent(inlineCurr, AFTER);
// Now we need to take all of the children starting from the first child
// *after* currChild and append them all to the clone.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list