Changeset 89864 in webkit

Timestamp:

Jun 27, 2011 3:01:38 PM (13 years ago)

Author:

leviw@chromium.org

Message:

2011-06-27 Levi Weintraub <​leviw@chromium.org>

Reviewed by Eric Seidel.

Add support for unicode-bidi:plaintext CSS property
​https://bugs.webkit.org/show_bug.cgi?id=50949
Adding support for the 'plaintext' mode of unicode-bidi.

• fast/text/international/unicode-bidi-plaintext.html: Added.
• platform/chromium-linux/fast/text/international/unicode-bidi-plaintext-expected.txt: added
• platform/mac/fast/text/international/unicode-bidi-plaintext-expected.png: Added.
• platform/mac/fast/text/international/unicode-bidi-plaintext-expected.txt: Added.

2011-06-27 Levi Weintraub <​leviw@chromium.org>

Reviewed by Eric Seidel.

Add support for unicode-bidi:plaintext CSS property
​https://bugs.webkit.org/show_bug.cgi?id=50949

Adding support for unicode-bidi: plaintext. This involves invoking P2 and P3
of the Unicode BiDi algorithm on each paragraph of a block with that style.
This is similar to dir=auto but done per-paragraph instead of per element.

Test: fast/text/international/unicode-bidi-plaintext.html

• css/CSSParser.cpp: (WebCore::CSSParser::parseValue): Added plaintext.
• css/CSSPrimitiveValueMappings.h: (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Ditto. (WebCore::CSSPrimitiveValue::operator EUnicodeBidi): Ditto.
• css/CSSValueKeywords.in: Ditto.
• html/HTMLElement.cpp: (WebCore::unicodeBidiAttributeForDirAuto): Helper to map elements with dir=auto to their proper unicode-bidi attribute. (WebCore::HTMLElement::parseMappedAttribute): Assign plaintext to pre and textarea when dir=auto.
• platform/text/UnicodeBidi.h: Added plaintext.
• rendering/RenderBlockLineLayout.cpp: (WebCore::determineParagraphDirection): Determines the direction of a paragraph based on the first strong character. Stops at first paragraph separator. (WebCore::RenderBlock::layoutInlineChildren): Uses determineParagraphDirection when in unicode-bidi: plaintext mode (and operating at the block's BidiContext) to set each paragraph to the proper base BidiContext. (WebCore::RenderBlock::determineStartPosition): Ditto.
• rendering/style/RenderStyle.h: Gave _unicodebidi another bit to accomodate for plaintext.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/international/unicode-bidi-plaintext.html (added)
• LayoutTests/platform/chromium-linux/fast/text/international/unicode-bidi-plaintext-expected.txt (added)
• LayoutTests/platform/mac/fast/text/international/unicode-bidi-plaintext-expected.png (added)
• LayoutTests/platform/mac/fast/text/international/unicode-bidi-plaintext-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (1 diff)
• Source/WebCore/css/CSSPrimitiveValueMappings.h (modified) (2 diffs)
• Source/WebCore/css/CSSValueKeywords.in (modified) (1 diff)
• Source/WebCore/html/HTMLElement.cpp (modified) (2 diffs)
• Source/WebCore/platform/text/UnicodeBidi.h (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (4 diffs)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-27  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Add support for unicode-bidi:plaintext CSS property
+        https://bugs.webkit.org/show_bug.cgi?id=50949
+        Adding support for the 'plaintext' mode of unicode-bidi.
+
+        * fast/text/international/unicode-bidi-plaintext.html: Added.
+        * platform/chromium-linux/fast/text/international/unicode-bidi-plaintext-expected.txt: added
+        * platform/mac/fast/text/international/unicode-bidi-plaintext-expected.png: Added.
+        * platform/mac/fast/text/international/unicode-bidi-plaintext-expected.txt: Added.
+
 2011-06-27  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-27  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Add support for unicode-bidi:plaintext CSS property
+        https://bugs.webkit.org/show_bug.cgi?id=50949
+
+        Adding support for unicode-bidi: plaintext. This involves invoking P2 and P3
+        of the Unicode BiDi algorithm on each paragraph of a block with that style.
+        This is similar to dir=auto but done per-paragraph instead of per element.
+
+        Test: fast/text/international/unicode-bidi-plaintext.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):  Added plaintext.
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Ditto.
+        (WebCore::CSSPrimitiveValue::operator EUnicodeBidi): Ditto.
+        * css/CSSValueKeywords.in: Ditto.
+        * html/HTMLElement.cpp:
+        (WebCore::unicodeBidiAttributeForDirAuto): Helper to map elements with dir=auto
+        to their proper unicode-bidi attribute.
+        (WebCore::HTMLElement::parseMappedAttribute): Assign plaintext to pre and textarea
+        when dir=auto.
+        * platform/text/UnicodeBidi.h: Added plaintext.
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::determineParagraphDirection): Determines the direction of a paragraph
+        based on the first strong character. Stops at first paragraph separator.
+        (WebCore::RenderBlock::layoutInlineChildren): Uses determineParagraphDirection
+        when in unicode-bidi: plaintext mode (and operating at the block's BidiContext)
+        to set each paragraph to the proper base BidiContext.
+        (WebCore::RenderBlock::determineStartPosition): Ditto.
+        * rendering/style/RenderStyle.h: Gave _unicodebidi another bit to accomodate
+        for plaintext.
+
 2011-06-27  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -861 +861 @@
             return parseQuotes(propId, important);
         break;
-    case CSSPropertyUnicodeBidi: // normal | embed | bidi-override | isolate | inherit
+    case CSSPropertyUnicodeBidi: // normal | embed | bidi-override | isolate | plaintext | inherit
         if (id == CSSValueNormal
             || id == CSSValueEmbed
             || id == CSSValueBidiOverride
-            || id == CSSValueWebkitIsolate)
+            || id == CSSValueWebkitIsolate
+            || id == CSSValueWebkitPlaintext)
             validPrimitive = true;
         break;

trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

@@ -1772 +1772 @@
     case Isolate:
         m_value.ident = CSSValueWebkitIsolate;
+        break;
+    case Plaintext:
+        m_value.ident = CSSValueWebkitPlaintext;
+        break;
     }
 }
@@ -1786 +1790 @@
     case CSSValueWebkitIsolate:
         return Isolate;
+    case CSSValueWebkitPlaintext:
+        return Plaintext;
     default:
         ASSERT_NOT_REACHED();

trunk/Source/WebCore/css/CSSValueKeywords.in

@@ -411 +411 @@
 invert
 -webkit-isolate
+-webkit-plaintext
 landscape
 ledger

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -126 +126 @@
     return StyledElement::mapToEntry(attrName, result);
 }
-    
+
+static inline int unicodeBidiAttributeForDirAuto(HTMLElement* element)
+{
+    if (element->hasLocalName(bdoTag))
+        return CSSValueBidiOverride;
+    if (element->hasLocalName(preTag) || element->hasLocalName(textareaTag))
+        return CSSValueWebkitPlaintext;
+    return CSSValueEmbed;
+}
+
 void HTMLElement::parseMappedAttribute(Attribute* attr)
 {
@@ -157 +166 @@
             addCSSProperty(attr, CSSPropertyDirection, attr->value());
         dirAttributeChanged(attr);
-        addCSSProperty(attr, CSSPropertyUnicodeBidi, hasLocalName(bdoTag) ? CSSValueBidiOverride : CSSValueEmbed);
+        addCSSProperty(attr, CSSPropertyUnicodeBidi, unicodeBidiAttributeForDirAuto(this));
     } else if (attr->name() == draggableAttr) {
         const AtomicString& value = attr->value();

trunk/Source/WebCore/platform/text/UnicodeBidi.h

@@ -33 +33 @@
     Embed,
     Override,
-    Isolate
+    Isolate,
+    Plaintext
 };
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -111 +111 @@
     }
     return extraWidth;
+}
+
+static void determineParagraphDirection(TextDirection& dir, InlineIterator iter)
+{
+    while (!iter.atEnd()) {
+        if (iter.atParagraphSeparator())
+            return;
+        if (UChar current = iter.current()) {
+            Direction charDirection = direction(current);
+            if (charDirection == LeftToRight) {
+                dir = LTR;
+                return;
+            }
+            if (charDirection == RightToLeft || charDirection == RightToLeftArabic) {
+                dir = RTL;
+                return;
+            }
+        }
+        iter.increment();
+    }
 }
 
@@ -945 +965 @@
 
         InlineIterator oldEnd = end;
+        bool isNewUBAParagraph = lineInfo.previousLineBrokeCleanly();
         FloatingObject* lastFloatFromPreviousLine = (m_floatingObjects && !m_floatingObjects->set().isEmpty()) ? m_floatingObjects->set().last() : 0;
         end = lineBreaker.nextLineBreak(resolver, lineInfo, lineBreakIteratorInfo, lastFloatFromPreviousLine);
@@ -963 +984 @@
         } else {
             VisualDirectionOverride override = (style()->rtlOrdering() == VisualOrder ? (style()->direction() == LTR ? VisualLeftToRightOverride : VisualRightToLeftOverride) : NoVisualOverride);
+
+            if (isNewUBAParagraph && style()->unicodeBidi() == Plaintext && !resolver.context()->parent()) {
+                TextDirection direction = style()->direction();
+                determineParagraphDirection(direction, resolver.position());
+                resolver.setStatus(BidiStatus(direction, style()->unicodeBidi() == Override));
+            }
             // FIXME: This ownership is reversed. We should own the BidiRunList and pass it to createBidiRunsForLine.
             BidiRunList<BidiRun>& bidiRuns = resolver.runs();
@@ -1350 +1377 @@
         resolver.setStatus(last->lineBreakBidiStatus());
     } else {
-        resolver.setStatus(BidiStatus(style()->direction(), style()->unicodeBidi() == Override));
+        TextDirection direction = style()->direction();
+        if (style()->unicodeBidi() == Plaintext)
+            determineParagraphDirection(direction, InlineIterator(this, bidiFirstNotSkippingInlines(this), 0));
+        resolver.setStatus(BidiStatus(direction, style()->unicodeBidi() == Override));
         resolver.setPosition(InlineIterator(this, bidiFirstSkippingInlines(this, &resolver), 0));
     }

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -257 +257 @@
         bool _affectedByDrag : 1;
         unsigned _pseudoBits : 7;
-        unsigned _unicodeBidi : 2; // EUnicodeBidi
+        unsigned _unicodeBidi : 3; // EUnicodeBidi
         bool _isLink : 1;
-        // 50 bits
+        // 53 bits
     } noninherited_flags;