[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
alex at webkit.org
alex at webkit.org
Wed Dec 22 18:49:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit add5180b1ee028ac3138a73c0db6e8a5d77f476d
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 20 15:25:18 2010 +0000
2010-12-20 Alejandro G. Castro <alex at igalia.com>
Unreviewed, added the proper expected result file.
* platform/gtk/fast/text/emphasis-overlap-expected.txt: Added.
* platform/gtk/fast/text/emphasis-overlap.html: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74346 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e59fc32..0adb600 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-20 Alejandro G. Castro <alex at igalia.com>
+
+ Unreviewed, added the proper expected result file.
+
+ * platform/gtk/fast/text/emphasis-overlap-expected.txt: Added.
+ * platform/gtk/fast/text/emphasis-overlap.html: Removed.
+
2010-12-20 Andrei Popescu <andreip at google.com>
Reviewed by Jeremy Orlow.
diff --git a/LayoutTests/platform/gtk/fast/text/emphasis-overlap-expected.txt b/LayoutTests/platform/gtk/fast/text/emphasis-overlap-expected.txt
new file mode 100644
index 0000000..57d50fd
--- /dev/null
+++ b/LayoutTests/platform/gtk/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 784x182
+ RenderBlock {DIV} at (0,25) size 160x149
+ RenderText {#text} at (0,0) size 160x33
+ text run at (0,0) width 160: "1111 "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x33
+ RenderText {#text} at (0,33) size 128x33
+ text run at (0,33) width 128: "2222"
+ RenderText {#text} at (128,33) size 32x33
+ text run at (128,33) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x33 [color=#0000FF]
+ RenderText {#text} at (0,83) size 128x33
+ text run at (0,83) width 128: "3333"
+ RenderText {#text} at (128,83) size 32x33
+ text run at (128,83) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,116) size 128x33
+ text run at (0,116) width 128: "4444"
+ RenderText {#text} at (160,152) size 4x19
+ text run at (160,152) width 4: " "
+ RenderBlock {DIV} at (164,25) size 160x149
+ RenderText {#text} at (0,0) size 160x33
+ text run at (0,0) width 160: "1111 "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x33 [color=#008000]
+ RenderText {#text} at (0,33) size 128x33
+ text run at (0,33) width 128: "2222"
+ RenderText {#text} at (128,33) size 32x33
+ text run at (128,33) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x33
+ RenderText {#text} at (0,83) size 128x33
+ text run at (0,83) width 128: "3333"
+ RenderText {#text} at (128,83) size 32x33
+ text run at (128,83) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,116) size 128x33
+ text run at (0,116) width 128: "4444"
+ RenderText {#text} at (324,152) size 4x19
+ text run at (324,152) width 4: " "
+ RenderBlock {DIV} at (328,8) size 160x166
+ RenderText {#text} at (0,0) size 160x33
+ text run at (0,0) width 160: "1111 "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x33 [color=#008000]
+ RenderText {#text} at (0,33) size 128x33
+ text run at (0,33) width 128: "2222"
+ RenderText {#text} at (128,33) size 32x33
+ text run at (128,33) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x33 [color=#0000FF]
+ RenderText {#text} at (0,100) size 128x33
+ text run at (0,100) width 128: "3333"
+ RenderText {#text} at (128,100) size 32x33
+ text run at (128,100) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,133) size 128x33
+ text run at (0,133) width 128: "4444"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,182) size 784x182
+ RenderBlock {DIV} at (0,8) size 160x149
+ RenderText {#text} at (0,0) size 160x33
+ text run at (0,0) width 160: "1111 "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x33
+ RenderText {#text} at (0,33) size 128x33
+ text run at (0,33) width 128: "2222"
+ RenderText {#text} at (128,33) size 32x33
+ text run at (128,33) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x33 [color=#008000]
+ RenderText {#text} at (0,83) size 128x33
+ text run at (0,83) width 128: "3333"
+ RenderText {#text} at (128,83) size 32x33
+ text run at (128,83) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,116) size 128x33
+ text run at (0,116) width 128: "4444"
+ RenderText {#text} at (160,11) size 4x19
+ text run at (160,11) width 4: " "
+ RenderBlock {DIV} at (164,8) size 160x149
+ RenderText {#text} at (0,0) size 160x33
+ text run at (0,0) width 160: "1111 "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x33 [color=#0000FF]
+ RenderText {#text} at (0,33) size 128x33
+ text run at (0,33) width 128: "2222"
+ RenderText {#text} at (128,33) size 32x33
+ text run at (128,33) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x33
+ RenderText {#text} at (0,83) size 128x33
+ text run at (0,83) width 128: "3333"
+ RenderText {#text} at (128,83) size 32x33
+ text run at (128,83) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,116) size 128x33
+ text run at (0,116) width 128: "4444"
+ RenderText {#text} at (324,11) size 4x19
+ text run at (324,11) width 4: " "
+ RenderBlock {DIV} at (328,8) size 160x166
+ RenderText {#text} at (0,0) size 160x33
+ text run at (0,0) width 160: "1111 "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x33 [color=#0000FF]
+ RenderText {#text} at (0,33) size 128x33
+ text run at (0,33) width 128: "2222"
+ RenderText {#text} at (128,33) size 32x33
+ text run at (128,33) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 128x33 [color=#008000]
+ RenderText {#text} at (0,100) size 128x33
+ text run at (0,100) width 128: "3333"
+ RenderText {#text} at (128,100) size 32x33
+ text run at (128,100) width 32: " "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,133) size 128x33
+ text run at (0,133) width 128: "4444"
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/text/emphasis-overlap.html b/LayoutTests/platform/gtk/fast/text/emphasis-overlap.html
deleted file mode 100644
index 32b1b91..0000000
--- a/LayoutTests/platform/gtk/fast/text/emphasis-overlap.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<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>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list