[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
mitz at apple.com
mitz at apple.com
Wed Dec 22 18:48:15 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c21ca25d16a1687eea1cef1dc0c076710aa55b11
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 18 22:49:45 2010 +0000
In flipped writing modes, opposite text emphasis marks from adjacent lines overlap
https://bugs.webkit.org/show_bug.cgi?id=51298
Reviewed by Cameron Zwarich.
WebCore:
Test: fast/text/emphasis-overlap.html
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::beforeAnnotationsAdjustment): Changed + to -.
LayoutTests:
* fast/text/emphasis-overlap-expected.checksum: Added.
* fast/text/emphasis-overlap-expected.png: Added.
* fast/text/emphasis-overlap-expected.txt: Added.
* fast/text/emphasis-overlap.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74318 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 94aa894..42ff6b0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-18 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Cameron Zwarich.
+
+ In flipped writing modes, opposite text emphasis marks from adjacent lines overlap
+ https://bugs.webkit.org/show_bug.cgi?id=51298
+
+ * fast/text/emphasis-overlap-expected.checksum: Added.
+ * fast/text/emphasis-overlap-expected.png: Added.
+ * fast/text/emphasis-overlap-expected.txt: Added.
+ * fast/text/emphasis-overlap.html: Added.
+
2010-12-18 Helder Correia <helder at sencha.com> and Martin Robinson <mrobinson at igalia.com>
Reviewed by Ariya Hidayat.
diff --git a/LayoutTests/fast/text/emphasis-overlap-expected.checksum b/LayoutTests/fast/text/emphasis-overlap-expected.checksum
new file mode 100644
index 0000000..be83225
--- /dev/null
+++ b/LayoutTests/fast/text/emphasis-overlap-expected.checksum
@@ -0,0 +1 @@
+94e71ce789adf4b76b120ea678209fea
\ No newline at end of file
diff --git a/LayoutTests/fast/text/emphasis-overlap-expected.png b/LayoutTests/fast/text/emphasis-overlap-expected.png
new file mode 100644
index 0000000..f1d82e0
Binary files /dev/null and b/LayoutTests/fast/text/emphasis-overlap-expected.png differ
diff --git a/LayoutTests/fast/text/emphasis-overlap-expected.txt b/LayoutTests/fast/text/emphasis-overlap-expected.txt
new file mode 100644
index 0000000..8a8cac2
--- /dev/null
+++ b/LayoutTests/fast/text/emphasis-overlap-expected.txt
@@ -0,0 +1,125 @@
+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 {DIV} at (0,0) size 784x176
+ RenderBlock {DIV} at (0,24) size 160x144
+ RenderText {#text} at (0,0) size 160x32
+ text run at (0,0) width 160: "1111 "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x32
+ RenderText {#text} at (0,32) size 128x32
+ text run at (0,32) width 128: "2222"
+ RenderText {#text} at (128,32) size 32x32
+ text run at (128,32) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x32 [color=#0000FF]
+ RenderText {#text} at (0,80) size 128x32
+ text run at (0,80) width 128: "3333"
+ RenderText {#text} at (128,80) size 32x32
+ text run at (128,80) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,112) size 128x32
+ text run at (0,112) width 128: "4444"
+ RenderText {#text} at (160,148) size 4x18
+ text run at (160,148) width 4: " "
+ RenderBlock {DIV} at (164,24) size 160x144
+ RenderText {#text} at (0,0) size 160x32
+ text run at (0,0) width 160: "1111 "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x32 [color=#008000]
+ RenderText {#text} at (0,32) size 128x32
+ text run at (0,32) width 128: "2222"
+ RenderText {#text} at (128,32) size 32x32
+ text run at (128,32) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x32
+ RenderText {#text} at (0,80) size 128x32
+ text run at (0,80) width 128: "3333"
+ RenderText {#text} at (128,80) size 32x32
+ text run at (128,80) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,112) size 128x32
+ text run at (0,112) width 128: "4444"
+ RenderText {#text} at (324,148) size 4x18
+ text run at (324,148) width 4: " "
+ RenderBlock {DIV} at (328,8) size 160x160
+ RenderText {#text} at (0,0) size 160x32
+ text run at (0,0) width 160: "1111 "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x32 [color=#008000]
+ RenderText {#text} at (0,32) size 128x32
+ text run at (0,32) width 128: "2222"
+ RenderText {#text} at (128,32) size 32x32
+ text run at (128,32) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x32 [color=#0000FF]
+ RenderText {#text} at (0,96) size 128x32
+ text run at (0,96) width 128: "3333"
+ RenderText {#text} at (128,96) size 32x32
+ text run at (128,96) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,128) size 128x32
+ text run at (0,128) width 128: "4444"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,176) size 784x176
+ RenderBlock {DIV} at (0,8) size 160x144
+ RenderText {#text} at (0,0) size 160x32
+ text run at (0,0) width 160: "1111 "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x32
+ RenderText {#text} at (0,32) size 128x32
+ text run at (0,32) width 128: "2222"
+ RenderText {#text} at (128,32) size 32x32
+ text run at (128,32) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x32 [color=#008000]
+ RenderText {#text} at (0,80) size 128x32
+ text run at (0,80) width 128: "3333"
+ RenderText {#text} at (128,80) size 32x32
+ text run at (128,80) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,112) size 128x32
+ text run at (0,112) width 128: "4444"
+ RenderText {#text} at (160,10) size 4x18
+ text run at (160,10) width 4: " "
+ RenderBlock {DIV} at (164,8) size 160x144
+ RenderText {#text} at (0,0) size 160x32
+ text run at (0,0) width 160: "1111 "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x32 [color=#0000FF]
+ RenderText {#text} at (0,32) size 128x32
+ text run at (0,32) width 128: "2222"
+ RenderText {#text} at (128,32) size 32x32
+ text run at (128,32) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x32
+ RenderText {#text} at (0,80) size 128x32
+ text run at (0,80) width 128: "3333"
+ RenderText {#text} at (128,80) size 32x32
+ text run at (128,80) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,112) size 128x32
+ text run at (0,112) width 128: "4444"
+ RenderText {#text} at (324,10) size 4x18
+ text run at (324,10) width 4: " "
+ RenderBlock {DIV} at (328,8) size 160x160
+ RenderText {#text} at (0,0) size 160x32
+ text run at (0,0) width 160: "1111 "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x32 [color=#0000FF]
+ RenderText {#text} at (0,32) size 128x32
+ text run at (0,32) width 128: "2222"
+ RenderText {#text} at (128,32) size 32x32
+ text run at (128,32) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x32 [color=#008000]
+ RenderText {#text} at (0,96) size 128x32
+ text run at (0,96) width 128: "3333"
+ RenderText {#text} at (128,96) size 32x32
+ text run at (128,96) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,128) size 128x32
+ text run at (0,128) width 128: "4444"
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/fast/text/emphasis-overlap.html b/LayoutTests/fast/text/emphasis-overlap.html
new file mode 100644
index 0000000..32b1b91
--- /dev/null
+++ b/LayoutTests/fast/text/emphasis-overlap.html
@@ -0,0 +1,64 @@
+<style>
+ div div { font-family: ahem; font-size: 32px; -webkit-font-smoothing: none; display: inline-block; margin: 8px 0; }
+ .horizontal-bt { -webkit-writing-mode: horizontal-bt; }
+ .over { color: blue; -webkit-text-emphasis: "m"; -webkit-text-emphasis-position: over; }
+ .under { color: green; -webkit-text-emphasis: "m"; -webkit-text-emphasis-position: under; }
+</style>
+<div>
+ <div>
+ 1111
+ <br>
+ <span>2222</span>
+ <br>
+ <span class="over">3333</span>
+ <br>
+ 4444
+ </div>
+ <div>
+ 1111
+ <br>
+ <span class="under">2222</span>
+ <br>
+ <span>3333</span>
+ <br>
+ 4444
+ </div>
+ <div>
+ 1111
+ <br>
+ <span class="under">2222</span>
+ <br>
+ <span class="over">3333</span>
+ <br>
+ 4444
+ </div>
+</div>
+<div class="horizontal-bt">
+ <div>
+ 1111
+ <br>
+ <span>2222</span>
+ <br>
+ <span class="under">3333</span>
+ <br>
+ 4444
+ </div>
+ <div>
+ 1111
+ <br>
+ <span class="over">2222</span>
+ <br>
+ <span>3333</span>
+ <br>
+ 4444
+ </div>
+ <div>
+ 1111
+ <br>
+ <span class="over">2222</span>
+ <br>
+ <span class="under">3333</span>
+ <br>
+ 4444
+ </div>
+</div>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3b08fc5..48adcf6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-18 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Cameron Zwarich.
+
+ In flipped writing modes, opposite text emphasis marks from adjacent lines overlap
+ https://bugs.webkit.org/show_bug.cgi?id=51298
+
+ Test: fast/text/emphasis-overlap.html
+
+ * rendering/RootInlineBox.cpp:
+ (WebCore::RootInlineBox::beforeAnnotationsAdjustment): Changed + to -.
+
2010-12-18 Helder Correia <helder at sencha.com> and Martin Robinson <mrobinson at igalia.com>
Reviewed by Ariya Hidayat.
diff --git a/WebCore/rendering/RootInlineBox.cpp b/WebCore/rendering/RootInlineBox.cpp
index 5961d19..be326b5 100644
--- a/WebCore/rendering/RootInlineBox.cpp
+++ b/WebCore/rendering/RootInlineBox.cpp
@@ -296,7 +296,7 @@ int RootInlineBox::beforeAnnotationsAdjustment() const
return result;
// We have to compute the expansion for annotations over the previous line to see how much we should move.
- int lowestAllowedPosition = max(prevRootBox()->lineBottom(), lineTop()) + result;
+ int lowestAllowedPosition = max(prevRootBox()->lineBottom(), lineTop()) - result;
result = prevRootBox()->computeOverAnnotationAdjustment(lowestAllowedPosition);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list