Changeset 103608 in webkit

Timestamp:

Dec 22, 2011 11:29:32 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Map 'lang' and xml:lang attributes to '-webkit-locale' CSS property for use with font fallback and text-transform
​https://bugs.webkit.org/show_bug.cgi?id=67586

Original patch by Jungshik Shin <​jshin@chromium.org>

Patch by Matt Falkenhagen <​falken@chromium.org> on 2011-12-22
Reviewed by Darin Adler.

Source/WebCore:

Tests: fast/text/lang-mapped-to-webkit-locale.xhtml

fast/text/xml-lang-ignored-in-html.html

• html/HTMLElement.cpp:

(WebCore::HTMLElement::mapLanguageAttributeToLocale):
(WebCore::HTMLElement::parseMappedAttribute): Map 'lang' and 'xml:lang' to -webkit-locale.

• html/HTMLElement.h:

LayoutTests:

• fast/text/lang-mapped-to-webkit-locale-expected.txt: Added.
• fast/text/lang-mapped-to-webkit-locale.xhtml: Added.
• fast/text/xml-lang-ignored-in-html-expected.txt: Added.
• fast/text/xml-lang-ignored-in-html.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/lang-mapped-to-webkit-locale-expected.txt (added)
• LayoutTests/fast/text/lang-mapped-to-webkit-locale.xhtml (added)
• LayoutTests/fast/text/xml-lang-ignored-in-html-expected.txt (added)
• LayoutTests/fast/text/xml-lang-ignored-in-html.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLElement.cpp (modified) (4 diffs)
• Source/WebCore/html/HTMLElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-22  Matt Falkenhagen  <falken@chromium.org>
+
+        Map 'lang' and xml:lang attributes to '-webkit-locale' CSS property for use with font fallback and text-transform
+        https://bugs.webkit.org/show_bug.cgi?id=67586
+
+        Original patch by Jungshik Shin <jshin@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        * fast/text/lang-mapped-to-webkit-locale-expected.txt: Added.
+        * fast/text/lang-mapped-to-webkit-locale.xhtml: Added.
+        * fast/text/xml-lang-ignored-in-html-expected.txt: Added.
+        * fast/text/xml-lang-ignored-in-html.html: Added.
+
 2011-12-22  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-22  Matt Falkenhagen  <falken@chromium.org>
+
+        Map 'lang' and xml:lang attributes to '-webkit-locale' CSS property for use with font fallback and text-transform
+        https://bugs.webkit.org/show_bug.cgi?id=67586
+
+        Original patch by Jungshik Shin <jshin@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Tests: fast/text/lang-mapped-to-webkit-locale.xhtml
+               fast/text/xml-lang-ignored-in-html.html
+
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::mapLanguageAttributeToLocale):
+        (WebCore::HTMLElement::parseMappedAttribute): Map 'lang' and 'xml:lang' to -webkit-locale.
+        * html/HTMLElement.h:
+
 2011-12-22  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -27 +27 @@
 
 #include "Attribute.h"
+#include "CSSParser.h"
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
@@ -49 +50 @@
 #include "Text.h"
 #include "TextIterator.h"
+#include "XMLNames.h"
 #include "markup.h"
 #include <wtf/StdLibExtras.h>
@@ -169 +171 @@
 }
 
+void HTMLElement::mapLanguageAttributeToLocale(Attribute* attribute)
+{
+    ASSERT(attribute && (attribute->name() == langAttr || attribute->name().matches(XMLNames::langAttr)));
+    const AtomicString& value = attribute->value();
+    if (!value.isEmpty()) {
+        // Have to quote so the locale id is treated as a string instead of as a CSS keyword.
+        addCSSProperty(attribute, CSSPropertyWebkitLocale, quoteCSSString(value));
+    } else {
+        // The empty string means the language is explicitly unknown.
+        addCSSProperty(attribute, CSSPropertyWebkitLocale, CSSValueAuto);
+    }
+    setNeedsStyleRecalc();
+}
+
 void HTMLElement::parseMappedAttribute(Attribute* attr)
 {
@@ -193 +209 @@
             setTabIndexExplicitly(max(static_cast<int>(std::numeric_limits<short>::min()), min(tabindex, static_cast<int>(std::numeric_limits<short>::max()))));
         }
+    } else if (attr->name().matches(XMLNames::langAttr)) {
+        mapLanguageAttributeToLocale(attr);
     } else if (attr->name() == langAttr) {
-        // FIXME: Implement
+        // xml:lang has a higher priority than lang.
+        if (!fastHasAttribute(XMLNames::langAttr))
+            mapLanguageAttributeToLocale(attr);
     } else if (attr->name() == dirAttr) {
         bool dirIsAuto = equalIgnoringCase(attr->value(), "auto");

trunk/Source/WebCore/html/HTMLElement.h

@@ -108 +108 @@
     virtual String nodeName() const;
 
+    void mapLanguageAttributeToLocale(Attribute*);
+
     void setContentEditable(Attribute*);