Attachment 179016 Details for Bug 104786 – Patch

[patch] Patch

bug-104786-20121212202738.patch (text/plain), 4.12 KB, created by Yuki Sekiguchi on 2012-12-12 03:30:17 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Yuki Sekiguchi

Created: 2012-12-12 03:30:17 PST

Size: 4.12 KB

patch

obsolete

>Subversion Revision: 137375
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 39dc34ab52a396965fc8cb271f8da996029545bd..d581564d9652154b187846d9be7a121684ab5bf0 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2012-12-12  Yuki Sekiguchi  <yuki.sekiguchi@access-company.com>
>+
>+        If there is two kind of text-decoration, one decoration use outermost color.
>+        https://bugs.webkit.org/show_bug.cgi?id=104786
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Mask currDecs not to propagete the color of the type already propagated.
>+
>+        Test: fast/css/text-decoration-propagate.html
>+
>+        * rendering/RenderObject.cpp:
>+        (WebCore::RenderObject::getTextDecorationColors): Change currDecs to int to be able to use bitwise operations.
>+                getTextDecorationColors() have already dependend on that ETextDecoration is flag. This fix don't add assumption.
>+
> 2012-12-11  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Mail hangs when resizing the font size of a large RTL text
>diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp
>index 9703b15bb33f390d0f851a3e8db0b4eab14d880c..a6e8a89a73edc5d9178aab36d20253008cde1555 100644
>--- a/Source/WebCore/rendering/RenderObject.cpp
>+++ b/Source/WebCore/rendering/RenderObject.cpp
>@@ -2778,11 +2778,12 @@ void RenderObject::getTextDecorationColors(int decorations, Color& underline, Co
> {
>     RenderObject* curr = this;
>     RenderStyle* styleToUse = 0;
>-    ETextDecoration currDecs = TDNONE;
>+    int currDecs = TDNONE;
>     Color resultColor;
>     do {
>         styleToUse = curr->style(firstlineStyle);
>         currDecs = styleToUse->textDecoration();
>+        currDecs &= decorations;
>         resultColor = decorationColor(styleToUse);
>         // Parameter 'decorations' is cast as an int to enable the bitwise operations below.
>         if (currDecs) {
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 7969bf17d7425fb9c2acac798e29b432864a3e74..d6ec09a052dcb9cc359ddc92286c4d00c517209b 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2012-12-12  Yuki Sekiguchi  <yuki.sekiguchi@access-company.com>
>+
>+        If there is two kind of text-decoration, one decoration use outermost color.
>+        https://bugs.webkit.org/show_bug.cgi?id=104786
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test propagating two text-decoration type.
>+
>+        * fast/css/text-decoration-propagate-expected.html: Added.
>+        * fast/css/text-decoration-propagate.html: Added.
>+
> 2012-12-11  Adam Klein  <adamk@chromium.org>
> 
>         More inspector flakiness
>diff --git a/LayoutTests/fast/css/text-decoration-propagate-expected.html b/LayoutTests/fast/css/text-decoration-propagate-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..8492ac715a86a670e44d5f136faa0f9527f64772
>--- /dev/null
>+++ b/LayoutTests/fast/css/text-decoration-propagate-expected.html
>@@ -0,0 +1,15 @@
>+<!DOCTYPE html>
>+<html>
>+<body>
>+
>+<div style="color: green; text-decoration: line-through; font-family: ahem; line-height: 1.2em">
>+    line-through only
>+    <div>
>+        <span style="color: red; text-decoration: overline;">outside</span>
>+        <div style="color: blue; text-decoration: overline;">
>+            inside
>+        </div>
>+    </div>
>+</div>
>+</body>
>+</html>
>diff --git a/LayoutTests/fast/css/text-decoration-propagate.html b/LayoutTests/fast/css/text-decoration-propagate.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..d9779855c27a62f861fc23a2731018ababc1d378
>--- /dev/null
>+++ b/LayoutTests/fast/css/text-decoration-propagate.html
>@@ -0,0 +1,15 @@
>+<!DOCTYPE html>
>+<html>
>+<body>
>+
>+<div style="color: green; text-decoration: line-through; font-family: ahem; line-height: 1.2em">
>+    line-through only
>+    <div style="color: red; text-decoration: overline;">
>+        outside
>+        <div style="color: blue; text-decoration: overline;">
>+            inside
>+        </div>
>+    </div>
>+</div>
>+</body>
>+</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 104786: 179009 | 179016 | 200198