Apply vertical-align style of <sub> and <sup> to child elements.

third_party/WebKit/Source/core/editing/EditingStyle.cpp

 /*
  * Copyright (C) 2007, 2008, 2009 Apple Computer, Inc.
  * Copyright (C) 2010, 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 12 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/editing/EditingStyle.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/HTMLNames.h"
 #include "core/css/CSSColorValue.h"
 #include "core/css/CSSComputedStyleDeclaration.h"
+#include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/css/CSSRuleList.h"
 #include "core/css/CSSStyleRule.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/CSSValuePool.h"
 #include "core/css/FontSize.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
 #include "core/css/parser/CSSParser.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Node.h"
+#include "core/dom/NodeComputedStyle.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/QualifiedName.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/Editor.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/Position.h"
 #include "core/editing/commands/ApplyStyleCommand.h"
 #include "core/editing/serializers/HTMLInterchange.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLFontElement.h"
@@ skipping 292 matching lines @@
     if (!HTMLFontElement::cssValueFromFontSizeNumber(value, size))
         return nullptr;
     return CSSPrimitiveValue::createIdentifier(size);
 }
 
 float EditingStyle::NoFontDelta = 0.0f;
 
 EditingStyle::EditingStyle()
     : m_isMonospaceFont(false)
     , m_fontSizeDelta(NoFontDelta)
+    , m_isVerticalAlign(false)
 {
 }
 
 EditingStyle::EditingStyle(ContainerNode* node, PropertiesToInclude propertiesToInclude)
     : m_isMonospaceFont(false)
     , m_fontSizeDelta(NoFontDelta)
+    , m_isVerticalAlign(false)
 {
     init(node, propertiesToInclude);
 }
 
 EditingStyle::EditingStyle(const Position& position, PropertiesToInclude propertiesToInclude)
     : m_isMonospaceFont(false)
     , m_fontSizeDelta(NoFontDelta)
+    , m_isVerticalAlign(false)
 {
     init(position.anchorNode(), propertiesToInclude);
 }
 
 EditingStyle::EditingStyle(const StylePropertySet* style)
     : m_mutableStyle(style ? style->mutableCopy() : nullptr)
     , m_isMonospaceFont(false)
     , m_fontSizeDelta(NoFontDelta)
+    , m_isVerticalAlign(false)
 {
     extractFontSizeDelta();
 }
 
 EditingStyle::EditingStyle(CSSPropertyID propertyID, const String& value)
     : m_mutableStyle(nullptr)
     , m_isMonospaceFont(false)
     , m_fontSizeDelta(NoFontDelta)
+    , m_isVerticalAlign(false)
 {
     setProperty(propertyID, value);
+    if (propertyID == CSSPropertyVerticalAlign) {

[yosin_UTC9, 2016/05/17 01:15:48]

nit: Can we simplify this?

m_isVerticalAlign = propertyID == CSSProeprtyVerticalAlign && (value == "sub" ||
value == "super");

[joone, 2016/05/17 23:01:33]

Done.

+        if (value == "sub" || value == "super")
+            m_isVerticalAlign = true;
+    }
 }
 
 static Color cssValueToColor(CSSValue* colorValue)
 {
     if (!colorValue || (!colorValue->isColorValue() && !colorValue->isPrimitiveValue()))
         return Color::transparent;
 
     if (colorValue->isColorValue())
         return toCSSColorValue(colorValue)->value();
 
@@ skipping 331 matching lines @@
         difference->removePropertiesInSet(textOnlyProperties, WTF_ARRAY_LENGTH(textOnlyProperties));
 
     if (difference->isEmpty())
         return TrueTriState;
     if (difference->propertyCount() == m_mutableStyle->propertyCount())
         return FalseTriState;
 
     return MixedTriState;
 }
 
+static void applyAncestorVerticalAlignStyle(StylePropertySet* stylePropertyToApply, Node* node)
+{
+    for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) {

[yosin_UTC9, 2016/05/17 01:15:48]

nit: Please use range-for

for (Node* runner : NodeTraversal::inclusiveAncestorsOf(*node)) {
 ...
}

Since, NodeTraversal::inclusiveAncestorsOf(*node) == node and ancestorsOf(node),

variable |ancestor| isn't match.

[joone, 2016/05/17 23:01:33]

Done.

+        CSSComputedStyleDeclaration* ancestorStyle = CSSComputedStyleDeclaration::create(ancestor);
+        CSSPrimitiveValue* verticalAlign = toCSSPrimitiveValue(stylePropertyToApply->getPropertyCSSValue(CSSPropertyVerticalAlign));
+        if (getIdentifierValue(ancestorStyle, CSSPropertyVerticalAlign) == verticalAlign->getValueID()) {
+            node->mutableComputedStyle()->setVerticalAlign(verticalAlign->convertTo<EVerticalAlign>());
+            break;
+        }
+    }
+}
+
 TriState EditingStyle::triStateOfStyle(const VisibleSelection& selection) const
 {
     if (!selection.isCaretOrRange())
         return FalseTriState;
 
     if (selection.isCaret())
         return triStateOfStyle(EditingStyle::styleAtSelectionStart(selection));
 
     TriState state = FalseTriState;
     bool nodeIsStart = true;
     for (Node& node : NodeTraversal::startsAt(selection.start().anchorNode())) {
         if (node.layoutObject() && node.hasEditableStyle()) {
             CSSComputedStyleDeclaration* nodeStyle = CSSComputedStyleDeclaration::create(&node);
             if (nodeStyle) {
+                // If the selected element has <sub> or <sup> ancestor element, apply the corrsponding
+                // style(vertical-align) to it so that document.queryCommandState() works with the sytle.
+                // See bug http://crbug.com/582225.
+                if (m_isVerticalAlign && getIdentifierValue(nodeStyle, CSSPropertyVerticalAlign) == CSSValueBaseline)
+                    applyAncestorVerticalAlignStyle(m_mutableStyle, &node);
+
                 // Pass EditingStyle::DoNotIgnoreTextOnlyProperties without checking if node.isTextNode()
                 // because the node can be an element node. See bug http://crbug.com/584939.
                 TriState nodeState = triStateOfStyle(nodeStyle, EditingStyle::DoNotIgnoreTextOnlyProperties);
                 if (nodeIsStart) {
                     state = nodeState;
                     nodeIsStart = false;
                 } else if (state != nodeState && node.isTextNode()) {
                     state = MixedTriState;
                     break;
                 }
@@ skipping 966 matching lines @@
 {
     for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) {
         CSSComputedStyleDeclaration* ancestorStyle = CSSComputedStyleDeclaration::create(ancestor);
         if (!hasTransparentBackgroundColor(ancestorStyle))
             return ancestorStyle->getPropertyCSSValue(CSSPropertyBackgroundColor);
     }
     return nullptr;
 }
 
 } // namespace blink