bdo

Source/core/html/HTMLElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004-2008, 2013, 2014 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2011 Motorola Mobility. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 166 matching lines @@
     if (name == alignAttr || name == contenteditableAttr || name == hiddenAttr || name == langAttr || name.matches(XMLNames::langAttr) || name == draggableAttr || name == dirAttr)
         return true;
     return Element::isPresentationAttribute(name);
 }
 
 static inline bool isValidDirAttribute(const AtomicString& value)
 {
     return equalIgnoringCase(value, "auto") || equalIgnoringCase(value, "ltr") || equalIgnoringCase(value, "rtl");
 }
 
+static bool shouldUseUnicodeBidiEmbed(const Element* element)
+{
+    if (element->hasTagName(bdoTag)
+        || element->hasTagName(addressTag)
+        || element->hasTagName(blockquoteTag)
+        || element->hasTagName(centerTag)
+        || element->hasTagName(divTag)
+        || element->hasTagName(figureTag)
+        || element->hasTagName(figcaptionTag)
+        || element->hasTagName(footerTag)
+        || element->hasTagName(formTag)
+        || element->hasTagName(headerTag)
+        || element->hasTagName(hrTag)
+        || element->hasTagName(legendTag)
+        || element->hasTagName(listingTag)
+        || element->hasTagName(pTag)
+        || element->hasTagName(plaintextTag)
+        || element->hasTagName(preTag)
+        || element->hasTagName(summaryTag)
+        || element->hasTagName(xmpTag)
+        || element->hasTagName(articleTag)
+        || element->hasTagName(asideTag)
+        || element->hasTagName(h1Tag)
+        || element->hasTagName(h2Tag)
+        || element->hasTagName(h3Tag)
+        || element->hasTagName(h4Tag)
+        || element->hasTagName(h5Tag)
+        || element->hasTagName(h6Tag)
+        || element->hasTagName(hgroupTag)
+        || element->hasTagName(mainTag)
+        || element->hasTagName(navTag)
+        || element->hasTagName(sectionTag)
+        || element->hasTagName(tableTag)
+        || element->hasTagName(captionTag)
+        || element->hasTagName(colgroupTag)
+        || element->hasTagName(colTag)
+        || element->hasTagName(theadTag)
+        || element->hasTagName(tbodyTag)
+        || element->hasTagName(tfootTag)
+        || element->hasTagName(trTag)
+        || element->hasTagName(tdTag)
+        || element->hasTagName(thTag)
+        || element->hasTagName(dirTag)
+        || element->hasTagName(ddTag)
+        || element->hasTagName(dlTag)
+        || element->hasTagName(dtTag)
+        || element->hasTagName(menuTag)
+        || element->hasTagName(olTag)
+        || element->hasTagName(ulTag)
+        || element->hasTagName(liTag)
+        || element->hasTagName(bdiTag)
+        || element->hasTagName(outputTag))
+        return false;
+    return true;
+}
+
 void HTMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
 {
     if (name == alignAttr) {
         if (equalIgnoringCase(value, "middle"))
             addPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign, CSSValueCenter);
         else
             addPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign, value);
     } else if (name == contenteditableAttr) {
         if (value.isEmpty() || equalIgnoringCase(value, "true")) {
             addPropertyToPresentationAttributeStyle(style, CSSPropertyWebkitUserModify, CSSValueReadWrite);
@@ skipping 16 matching lines @@
             addPropertyToPresentationAttributeStyle(style, CSSPropertyWebkitUserDrag, CSSValueNone);
         }
     } else if (name == dirAttr) {
         if (equalIgnoringCase(value, "auto")) {
             addPropertyToPresentationAttributeStyle(style, CSSPropertyUnicodeBidi, unicodeBidiAttributeForDirAuto(this));
         } else {
             if (isValidDirAttribute(value))
                 addPropertyToPresentationAttributeStyle(style, CSSPropertyDirection, value);
             else
                 addPropertyToPresentationAttributeStyle(style, CSSPropertyDirection, "ltr");
-            if (!hasTagName(bdiTag) && !hasTagName(bdoTag) && !hasTagName(outputTag))
+            if (shouldUseUnicodeBidiEmbed(this))
                 addPropertyToPresentationAttributeStyle(style, CSSPropertyUnicodeBidi, CSSValueEmbed);
         }
     } else if (name.matches(XMLNames::langAttr)) {
         mapLanguageAttributeToLocale(value, style);
     } else if (name == langAttr) {
         // xml:lang has a higher priority than lang.
         if (!fastHasAttribute(XMLNames::langAttr))
             mapLanguageAttributeToLocale(value, style);
     } else {
         Element::collectStyleForPresentationAttribute(name, value, style);
@@ skipping 782 matching lines @@
 #ifndef NDEBUG
 
 // For use in the debugger
 void dumpInnerHTML(blink::HTMLElement*);
 
 void dumpInnerHTML(blink::HTMLElement* element)
 {
     printf("%s\n", element->innerHTML().ascii().data());
 }
 #endif