Attachment 224167 Details for Bug 128723 – Patch

[patch] Patch

bug-128723-20140214163059.patch (text/plain), 5.75 KB, created by Yuki Sekiguchi on 2014-02-13 23:31:00 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Yuki Sekiguchi

Created: 2014-02-13 23:31:00 PST

Size: 5.75 KB

patch

obsolete

>Subversion Revision: 164086
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 7c0f21eb5b1687ffd96d27ed1df2e0e66bdff7aa..ab238066972d82539e7f4f5ec4d9409e5b63e707 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2014-02-13  Yuki Sekiguchi  <yuki.sekiguchi@access-company.com>
>+
>+        [css3-text] Support -webkit-text-decoration-skip: objects
>+        https://bugs.webkit.org/show_bug.cgi?id=128723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Moved FIXME comments to correct position.
>+
>+        Test: fast/css/text-decoration-skip-atomic-inline.html
>+
>+        * rendering/InlineTextBox.cpp:
>+        (WebCore::InlineTextBox::paintDecoration):
>+        * rendering/style/RenderStyleConstants.h:
>+
> 2014-02-13  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         Remove position:sticky runtime flag
>diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp
>index 7246fd12de3db317ec95d5fe0077f0bde1f2e144..505a88e959742f79c5d84450a12c516906d1788d 100644
>--- a/Source/WebCore/rendering/InlineTextBox.cpp
>+++ b/Source/WebCore/rendering/InlineTextBox.cpp
>@@ -1170,7 +1170,6 @@ void InlineTextBox::paintDecoration(GraphicsContext& context, const FloatPoint&
>                             drawSkipInkUnderline(textPainter, context, localOrigin, underlineOffset + doubleOffset, width, isPrinting);
>                     }
>                 } else {
>-                    // FIXME: Need to support text-decoration-skip: none.
> #endif // CSS3_TEXT_DECORATION_SKIP_INK
>                     context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() + underlineOffset), width, isPrinting);
> 
>@@ -1200,7 +1199,6 @@ void InlineTextBox::paintDecoration(GraphicsContext& context, const FloatPoint&
>                             drawSkipInkUnderline(textPainter, context, localOrigin, -doubleOffset, width, isPrinting);
>                     }
>                 } else {
>-                    // FIXME: Need to support text-decoration-skip: none.
> #endif // CSS3_TEXT_DECORATION_SKIP_INK
>                     context.drawLineForText(localOrigin, width, isPrinting);
>                     if (decorationStyle == TextDecorationStyleDouble)
>diff --git a/Source/WebCore/rendering/style/RenderStyleConstants.h b/Source/WebCore/rendering/style/RenderStyleConstants.h
>index 9f8d165bfb821b0477b0258c5796d03e93bc0c7a..d3d89b769dac6ff94ada9e07f5e0c723ea0e0ed4 100644
>--- a/Source/WebCore/rendering/style/RenderStyleConstants.h
>+++ b/Source/WebCore/rendering/style/RenderStyleConstants.h
>@@ -388,7 +388,7 @@ enum TextJustify {
> #endif // CSS3_TEXT
> 
> enum TextDecorationSkipItems {
>-    TextDecorationSkipNone = 0,
>+    TextDecorationSkipNone = 0, // FIXME: Need to support text-decoration-skip: none. It currently works as if objects is specified.
>     TextDecorationSkipInk = 1 << 0,
>     TextDecorationSkipObjects = 1 << 1
> };
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 3e579bb7fe82fcfc131d4e1f9ef26a8dda8da9bb..1d867a21d5cc2381c8135c119c77ecffa5b27de5 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2014-02-13  Yuki Sekiguchi  <yuki.sekiguchi@access-company.com>
>+
>+        [css3-text] Support -webkit-text-decoration-skip: objects
>+        https://bugs.webkit.org/show_bug.cgi?id=128723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added test case which checked whether underlines skips atomic inline objects.
>+
>+        * fast/css/text-decoration-skip-atomic-inline-expected.html: Added.
>+        * fast/css/text-decoration-skip-atomic-inline.html: Added.
>+
> 2014-02-13  Roger Fong  <roger_fong@apple.com>
> 
>         [Windows] Unreviewed gardening of some timing out tests.
>diff --git a/LayoutTests/fast/css/text-decoration-skip-atomic-inline-expected.html b/LayoutTests/fast/css/text-decoration-skip-atomic-inline-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..c764133e0f211cf14a10062ab852ceb312215aae
>--- /dev/null
>+++ b/LayoutTests/fast/css/text-decoration-skip-atomic-inline-expected.html
>@@ -0,0 +1,7 @@
>+<!DOCTYPE html>
>+<style>
>+.underline { color: red; }
>+.margin-border-padding { margin: 2px; border: 2px solid blue; padding: 2px; }
>+</style>
>+These atomic inlines should not be underlined.
>+<div class="underline"><img class="margin-border-padding" src="resources/greenbox.png" /><table style="display: inline-table; "><td class="margin-border-padding">inline-table</table><div class="margin-border-padding" style="display: inline-block; ">inline-block</div><input class="margin-border-padding" type="button" value="button" /><video class="margin-border-padding" src="dummy.mp4"></video><canvas class="margin-border-padding" width="10" height="10"></canvas><iframe class="margin-border-padding"></iframe></div>
>diff --git a/LayoutTests/fast/css/text-decoration-skip-atomic-inline.html b/LayoutTests/fast/css/text-decoration-skip-atomic-inline.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..c123d9374106d1d43105db90487a3dbebd6e8afa
>--- /dev/null
>+++ b/LayoutTests/fast/css/text-decoration-skip-atomic-inline.html
>@@ -0,0 +1,7 @@
>+<!DOCTYPE html>
>+<style>
>+.underline { text-decoration: underline; color: red; }
>+.margin-border-padding { margin: 2px; border: 2px solid blue; padding: 2px; }
>+</style>
>+These atomic inlines should not be underlined.
>+<div class="underline"><img class="margin-border-padding" src="resources/greenbox.png" /><table style="display: inline-table; "><td class="margin-border-padding">inline-table</table><div class="margin-border-padding" style="display: inline-block; ">inline-block</div><input class="margin-border-padding" type="button" value="button" /><video class="margin-border-padding" src="dummy.mp4"></video><canvas class="margin-border-padding" width="10" height="10"></canvas><iframe class="margin-border-padding"></iframe></div>

Actions: View | Formatted Diff | Diff

Attachments on bug 128723: 224045 | 224167 | 224462