New SELECT Popup: Compare OPTION style with the parent OPTGROUP.

Source/web/PopupMenuImpl.cpp

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "web/PopupMenuImpl.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/ElementTraversal.h"
@@ skipping 145 matching lines @@
     CSSFontSelector::trace(visitor);
     CSSFontSelectorClient::trace(visitor);
 }
 
 // ----------------------------------------------------------------
 
 class PopupMenuImpl::ItemIterationContext {
     STACK_ALLOCATED();
 public:
     ItemIterationContext(const ComputedStyle& style, SharedBuffer* buffer)
-        : m_direction(style.direction())
-        , m_foregroundColor(style.visitedDependentColor(CSSPropertyColor))
+        : m_baseStyle(style)
         , m_backgroundColor(style.visitedDependentColor(CSSPropertyBackgroundColor))
-        , m_textTransform(style.textTransform())
-        , m_fontDescription(style.fontDescription())
         , m_listIndex(0)
         , m_isInGroup(false)
         , m_buffer(buffer)
     {
         ASSERT(m_buffer);
 #if OS(LINUX)
         // On other platforms, the <option> background color is the same as the
         // <select> background color. On Linux, that makes the <option>
         // background color very dark, so by default, try to use a lighter
         // background color for <option>s.
         if (LayoutTheme::theme().systemColor(CSSValueButtonface) == m_backgroundColor)
             m_backgroundColor = LayoutTheme::theme().systemColor(CSSValueMenu);
 #endif
     }
 
     void serializeBaseStyle()
     {
+        ASSERT(!m_isInGroup);
         PagePopupClient::addString("baseStyle: {", m_buffer);
         addProperty("backgroundColor", m_backgroundColor.serialized(), m_buffer);
-        addProperty("color", m_foregroundColor.serialized(), m_buffer);
-        addProperty("textTransform", String(textTransformToString(m_textTransform)), m_buffer);
-        addProperty("fontSize", fontSize(), m_buffer);
-        addProperty("fontStyle", String(fontStyleToString(fontStyle())), m_buffer);
-        addProperty("fontVariant", String(fontVariantToString(fontVariant())), m_buffer);
+        addProperty("color", baseStyle().visitedDependentColor(CSSPropertyColor).serialized(), m_buffer);
+        addProperty("textTransform", String(textTransformToString(baseStyle().textTransform())), m_buffer);
+        addProperty("fontSize", baseFont().computedPixelSize(), m_buffer);
+        addProperty("fontStyle", String(fontStyleToString(baseFont().style())), m_buffer);
+        addProperty("fontVariant", String(fontVariantToString(baseFont().variant())), m_buffer);
 
         PagePopupClient::addString("fontFamily: [", m_buffer);
-        for (const FontFamily* f = &fontFamily(); f; f = f->next()) {
+        for (const FontFamily* f = &baseFont().family(); f; f = f->next()) {
             addJavaScriptString(f->family().string(), m_buffer);
             if (f->next())
                 PagePopupClient::addString(",", m_buffer);
         }
         PagePopupClient::addString("]", m_buffer);
         PagePopupClient::addString("},\n", m_buffer);
     }
 
-    void startGroupChildren()
+    Color backgroundColor() const { return m_isInGroup ? m_groupStyle->visitedDependentColor(CSSPropertyBackgroundColor) : m_backgroundColor; }
+    // Do not use baseStyle() for background-color, use backgroundColor()
+    // instead.
+    const ComputedStyle& baseStyle() { return m_isInGroup ? *m_groupStyle : m_baseStyle; }
+    const FontDescription& baseFont() { return m_isInGroup ? m_groupStyle->fontDescription() : m_baseStyle.fontDescription(); }
+    void startGroupChildren(const ComputedStyle& groupStyle)
     {
         ASSERT(!m_isInGroup);
         PagePopupClient::addString("children: [", m_buffer);
         m_isInGroup = true;
+        m_groupStyle = &groupStyle;
     }
     void finishGroupIfNecessary()
     {
         if (!m_isInGroup)
             return;
         PagePopupClient::addString("],},\n", m_buffer);
         m_isInGroup = false;
+        m_groupStyle = nullptr;
     }
 
-    int fontSize() const { return m_fontDescription.computedPixelSize(); }
-    FontStyle fontStyle() const { return m_fontDescription.style(); }
-    FontVariant fontVariant() const { return m_fontDescription.variant(); }
-    const FontFamily& fontFamily() const { return m_fontDescription.family(); }
-
-    TextDirection m_direction;
-    Color m_foregroundColor;
+    const ComputedStyle& m_baseStyle;
     Color m_backgroundColor;
-    ETextTransform m_textTransform;
-    const FontDescription& m_fontDescription;
+    const ComputedStyle* m_groupStyle;
 
     unsigned m_listIndex;
     bool m_isInGroup;
     SharedBuffer* m_buffer;
 };
 
 // ----------------------------------------------------------------
 
 PassRefPtrWillBeRawPtr<PopupMenuImpl> PopupMenuImpl::create(ChromeClientImpl* chromeClient, HTMLSelectElement& ownerElement)
 {
@@ skipping 69 matching lines @@
     const ComputedStyle* style = m_ownerElement->itemComputedStyle(element);
     ASSERT(style);
     SharedBuffer* data = context.m_buffer;
     // TODO(tkent): We generate unnecessary "style: {\n},\n" even if no
     // additional style.
     PagePopupClient::addString("style: {\n", data);
     if (style->visibility() == HIDDEN)
         addProperty("visibility", String("hidden"), data);
     if (style->display() == NONE)
         addProperty("display", String("none"), data);
-    if (context.m_direction != style->direction())
+    const ComputedStyle& baseStyle = context.baseStyle();
+    if (baseStyle.direction() != style->direction())
         addProperty("direction", String(style->direction() == RTL ? "rtl" : "ltr"), data);
     if (isOverride(style->unicodeBidi()))
         addProperty("unicodeBidi", String("bidi-override"), data);
     Color foregroundColor = style->visitedDependentColor(CSSPropertyColor);
-    if (context.m_foregroundColor != foregroundColor)
+    if (baseStyle.visitedDependentColor(CSSPropertyColor) != foregroundColor)
         addProperty("color", foregroundColor.serialized(), data);
     Color backgroundColor = style->visitedDependentColor(CSSPropertyBackgroundColor);
-    if (context.m_backgroundColor != backgroundColor && backgroundColor != Color::transparent)
+    if (context.backgroundColor() != backgroundColor && backgroundColor != Color::transparent)
         addProperty("backgroundColor", backgroundColor.serialized(), data);
+    const FontDescription& baseFont = context.baseFont();
     const FontDescription& fontDescription = style->font().fontDescription();
-    if (context.fontSize() != fontDescription.computedPixelSize())
+    if (baseFont.computedPixelSize() != fontDescription.computedPixelSize())
         addProperty("fontSize", fontDescription.computedPixelSize(), data);
     // Our UA stylesheet has font-weight:normal for OPTION.
     if (FontWeightNormal != fontDescription.weight())
         addProperty("fontWeight", String(fontWeightToString(fontDescription.weight())), data);
-    if (context.fontFamily() != fontDescription.family()) {
+    if (baseFont.family() != fontDescription.family()) {
         PagePopupClient::addString("fontFamily: [\n", data);
         for (const FontFamily* f = &fontDescription.family(); f; f = f->next()) {
             addJavaScriptString(f->family().string(), data);
             if (f->next())
                 PagePopupClient::addString(",\n", data);
         }
         PagePopupClient::addString("],\n", data);
     }
-    if (context.fontStyle() != fontDescription.style())
+    if (baseFont.style() != fontDescription.style())
         addProperty("fontStyle", String(fontStyleToString(fontDescription.style())), data);
-    if (context.fontVariant() != fontDescription.variant())
+    if (baseFont.variant() != fontDescription.variant())
         addProperty("fontVariant", String(fontVariantToString(fontDescription.variant())), data);
-    if (context.m_textTransform != style->textTransform())
+    if (baseStyle.textTransform() != style->textTransform())
         addProperty("textTransform", String(textTransformToString(style->textTransform())), data);
 
     PagePopupClient::addString("},\n", data);
 }
 
 void PopupMenuImpl::addOption(ItemIterationContext& context, HTMLOptionElement& element)
 {
     SharedBuffer* data = context.m_buffer;
     PagePopupClient::addString("{", data);
     addProperty("label", element.text(), data);
@@ skipping 12 matching lines @@
 void PopupMenuImpl::addOptGroup(ItemIterationContext& context, HTMLOptGroupElement& element)
 {
     SharedBuffer* data = context.m_buffer;
     PagePopupClient::addString("{\n", data);
     PagePopupClient::addString("type: \"optgroup\",\n", data);
     addProperty("label", element.groupLabelText(), data);
     addProperty("title", element.title(), data);
     addProperty("ariaLabel", element.fastGetAttribute(HTMLNames::aria_labelAttr), data);
     addProperty("disabled", element.isDisabledFormControl(), data);
     addElementStyle(context, element);
-    context.startGroupChildren();
+    context.startGroupChildren(*m_ownerElement->itemComputedStyle(element));
     // We should call ItemIterationContext::finishGroupIfNecessary() later.
 }
 
 void PopupMenuImpl::addSeparator(ItemIterationContext& context, HTMLHRElement& element)
 {
     SharedBuffer* data = context.m_buffer;
     PagePopupClient::addString("{\n", data);
     PagePopupClient::addString("type: \"separator\",\n", data);
     addProperty("title", element.title(), data);
     addProperty("ariaLabel", element.fastGetAttribute(HTMLNames::aria_labelAttr), data);
@@ skipping 124 matching lines @@
 
 void PopupMenuImpl::disconnectClient()
 {
     m_ownerElement = nullptr;
     // Cannot be done during finalization, so instead done when the
     // layout object is destroyed and disconnected.
     dispose();
 }
 
 } // namespace blink