Attachment 153811 Details for Bug 92000 – Proposed patch

[patch] Proposed patch

0001-css3-text-Update-text-decoration-to-support-CSS3-spe.patch (text/plain), 8.10 KB, created by Bruno Abinader (history only) on 2012-07-23 09:28:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Bruno Abinader (history only)

Created: 2012-07-23 09:28:43 PDT

Size: 8.10 KB

patch

obsolete

>From 90193b4252d8818c0d49932717e5fb35a750bcad Mon Sep 17 00:00:00 2001
>From: Bruno de Oliveira Abinader <bruno.abinader@basyskom.com>
>Date: Mon, 23 Jul 2012 12:19:35 -0400
>Subject: [PATCH] [css3-text] Update "text-decoration" to support CSS3 spec
> https://bugs.webkit.org/show_bug.cgi?id=92000
>
>Current "text-decoration" implementation on WebKit does not support new CSS3
>variations, such as -style, -color and -line, for instance. This bug intends to
>create a "-webkit-text-decoration" property with such feature support, as
>specified in the link below:
>
>http://www.w3.org/TR/css3-text/#text-decoration
>
>Boilerplates for -style, -color and -line were also added (full implementation
>handled on bugs 90959, 90958 and 91638, respectively).
>---
> Source/WebCore/ChangeLog                           |   32 ++++++++++++++++++++
> Source/WebCore/css/CSSComputedStyleDeclaration.cpp |    4 +++
> Source/WebCore/css/CSSParser.cpp                   |    6 ++++
> Source/WebCore/css/CSSProperty.cpp                 |    4 +++
> Source/WebCore/css/CSSPropertyNames.in             |    4 +++
> Source/WebCore/css/StylePropertyShorthand.cpp      |   11 +++++++
> Source/WebCore/css/StylePropertyShorthand.h        |    1 +
> Source/WebCore/css/StyleResolver.cpp               |    4 +++
> 8 files changed, 66 insertions(+)
>
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0b31ceb..c9090f6 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,35 @@
>+2012-07-23  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
>+
>+        [css3-text] Update "text-decoration" to support CSS3 spec
>+        https://bugs.webkit.org/show_bug.cgi?id=92000
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Current "text-decoration" implementation on WebKit does not support new CSS3
>+        variations, such as -style, -color and -line, for instance. This bug intends to
>+        create a "-webkit-text-decoration" property with such feature support, as
>+        specified in the link below:
>+
>+        http://www.w3.org/TR/css3-text/#text-decoration
>+
>+        Boilerplates for -style, -color and -line were also added (full implementation
>+        handled on bugs 90959, 90958 and 91638, respectively).
>+
>+        * css/CSSComputedStyleDeclaration.cpp:
>+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
>+        * css/CSSParser.cpp:
>+        (WebCore::CSSParser::parseValue):
>+        * css/CSSProperty.cpp:
>+        (WebCore::CSSProperty::isInheritedProperty):
>+        * css/CSSPropertyNames.in:
>+        * css/StylePropertyShorthand.cpp:
>+        (WebCore::webkitTextDecorationShorthand):
>+        (WebCore):
>+        * css/StylePropertyShorthand.h:
>+        (WebCore):
>+        * css/StyleResolver.cpp:
>+        (WebCore::StyleResolver::collectMatchingRulesForList):
>+
> 2012-07-23  Patrick Gansterer  <paroga@webkit.org>
> 
>         [WIN] Remove ICU dependencies from UniscribeController
>diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>index 26615c5..eb4c365 100644
>--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>@@ -2434,6 +2434,10 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
>             break;
> 
>         /* Unimplemented CSS 3 properties (including CSS3 shorthand properties) */
>+        case CSSPropertyWebkitTextDecoration:
>+        case CSSPropertyWebkitTextDecorationLine:
>+        case CSSPropertyWebkitTextDecorationStyle:
>+        case CSSPropertyWebkitTextDecorationColor:
>         case CSSPropertyWebkitTextEmphasis:
>         case CSSPropertyTextLineThrough:
>         case CSSPropertyTextLineThroughColor:
>diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
>index 4bd9778..5b70712 100644
>--- a/Source/WebCore/css/CSSParser.cpp
>+++ b/Source/WebCore/css/CSSParser.cpp
>@@ -2088,6 +2088,12 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
>         break;
>     }
> 
>+    case CSSPropertyWebkitTextDecoration:
>+        // <text-decoration-line> || <text-decoration-style> || <text-decoration-color> || blink
>+        if (id != CSSValueBlink)
>+            return parseShorthand(propId, webkitTextDecorationShorthand(), important);
>+        break;
>+
>     case CSSPropertyTextDecoration:
>     case CSSPropertyWebkitTextDecorationsInEffect:
>         // none | [ underline || overline || line-through || blink ] | inherit
>diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp
>index 8c82dc6..071e9b4 100644
>--- a/Source/WebCore/css/CSSProperty.cpp
>+++ b/Source/WebCore/css/CSSProperty.cpp
>@@ -339,6 +339,10 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)
>     case CSSPropertyWebkitPrintColorAdjust:
>     case CSSPropertyWebkitRtlOrdering:
>     case CSSPropertyWebkitTextCombine:
>+    case CSSPropertyWebkitTextDecoration:
>+    case CSSPropertyWebkitTextDecorationLine:
>+    case CSSPropertyWebkitTextDecorationStyle:
>+    case CSSPropertyWebkitTextDecorationColor:
>     case CSSPropertyWebkitTextDecorationsInEffect:
>     case CSSPropertyWebkitTextEmphasis:
>     case CSSPropertyWebkitTextEmphasisColor:
>diff --git a/Source/WebCore/css/CSSPropertyNames.in b/Source/WebCore/css/CSSPropertyNames.in
>index 547907e..1530c83 100644
>--- a/Source/WebCore/css/CSSPropertyNames.in
>+++ b/Source/WebCore/css/CSSPropertyNames.in
>@@ -351,6 +351,10 @@ z-index
> -webkit-rtl-ordering
> -webkit-text-combine
> -epub-text-combine = -webkit-text-combine
>+-webkit-text-decoration
>+-webkit-text-decoration-line
>+-webkit-text-decoration-style
>+-webkit-text-decoration-color
> -webkit-text-decorations-in-effect
> -webkit-text-emphasis
> -epub-text-emphasis = -webkit-text-emphasis
>diff --git a/Source/WebCore/css/StylePropertyShorthand.cpp b/Source/WebCore/css/StylePropertyShorthand.cpp
>index 045bd24..86c47a3 100644
>--- a/Source/WebCore/css/StylePropertyShorthand.cpp
>+++ b/Source/WebCore/css/StylePropertyShorthand.cpp
>@@ -383,6 +383,17 @@ const StylePropertyShorthand& webkitTextEmphasisShorthand()
>     return webkitTextEmphasisLonghands;
> }
> 
>+const StylePropertyShorthand& webkitTextDecorationShorthand()
>+{
>+    static const CSSPropertyID textDecorationProperties[] = {
>+        CSSPropertyWebkitTextDecorationLine,
>+        CSSPropertyWebkitTextDecorationStyle,
>+        CSSPropertyWebkitTextDecorationColor
>+    };
>+    DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitTextDecorationLonghands, (textDecorationProperties, WTF_ARRAY_LENGTH(textDecorationProperties)));
>+    return webkitTextDecorationLonghands;
>+}
>+
> const StylePropertyShorthand& webkitTextStrokeShorthand()
> {
>     static const CSSPropertyID textStrokeProperties[] = { CSSPropertyWebkitTextStrokeWidth, CSSPropertyWebkitTextStrokeColor };
>diff --git a/Source/WebCore/css/StylePropertyShorthand.h b/Source/WebCore/css/StylePropertyShorthand.h
>index ee331c7..f4bd618 100644
>--- a/Source/WebCore/css/StylePropertyShorthand.h
>+++ b/Source/WebCore/css/StylePropertyShorthand.h
>@@ -96,6 +96,7 @@ const StylePropertyShorthand& webkitMaskShorthand();
> const StylePropertyShorthand& webkitMaskPositionShorthand();
> const StylePropertyShorthand& webkitMaskRepeatShorthand();
> const StylePropertyShorthand& webkitTextEmphasisShorthand();
>+const StylePropertyShorthand& webkitTextDecorationShorthand();
> const StylePropertyShorthand& webkitTextStrokeShorthand();
> const StylePropertyShorthand& webkitTransitionShorthand();
> const StylePropertyShorthand& webkitTransformOriginShorthand();
>diff --git a/Source/WebCore/css/StyleResolver.cpp b/Source/WebCore/css/StyleResolver.cpp
>index 4ee464a..82db209 100644
>--- a/Source/WebCore/css/StyleResolver.cpp
>+++ b/Source/WebCore/css/StyleResolver.cpp
>@@ -4009,6 +4009,10 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
>     case CSSPropertyTextUnderlineStyle:
>     case CSSPropertyTextUnderlineWidth:
>     case CSSPropertyWebkitFontSizeDelta:
>+    case CSSPropertyWebkitTextDecoration:
>+    case CSSPropertyWebkitTextDecorationLine:
>+    case CSSPropertyWebkitTextDecorationStyle:
>+    case CSSPropertyWebkitTextDecorationColor:
>     case CSSPropertyWebkitTextDecorationsInEffect:
>     case CSSPropertyWebkitTextStroke:
>     case CSSPropertyWebkitTextEmphasis:
>-- 
>1.7.9.5
>

Actions: View | Formatted Diff | Diff

Attachments on bug 92000: 153811 | 155021 | 155146 | 157234 | 158833 | 159137 | 159170 | 161695 | 161702 | 170667 | 170972 | 171241 | 179064 | 193065 | 204163 | 204164 | 204165 | 204166 | 204338 | 206613 | 206619 | 209114