Revert of Delete AuthorStyleInfo and move its data into ComputedStyle.RareNonInheritedData.

Source/core/layout/LayoutTheme.cpp

 /**
  * This file is part of the theme implementation for form controls in WebCore.
  *
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 27 matching lines @@
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLMeterElement.h"
 #include "core/html/HTMLOptionElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/html/shadow/MediaControlElements.h"
 #include "core/html/shadow/ShadowElementNames.h"
 #include "core/html/shadow/SpinButtonElement.h"
 #include "core/html/shadow/TextControlInnerElements.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
+#include "core/style/AuthorStyleInfo.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/FileMetadata.h"
 #include "platform/FloatConversion.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/FontSelector.h"
 #include "platform/text/PlatformLocale.h"
 #include "platform/text/StringTruncator.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebFallbackThemeEngine.h"
 #include "public/platform/WebRect.h"
@@ skipping 10 matching lines @@
 using namespace HTMLNames;
 
 LayoutTheme::LayoutTheme()
     : m_hasCustomFocusRingColor(false)
 #if USE(NEW_THEME)
     , m_platformTheme(platformTheme())
 #endif
 {
 }
 
-void LayoutTheme::adjustStyle(ComputedStyle& style, Element* e)
+void LayoutTheme::adjustStyle(ComputedStyle& style, Element* e, const AuthorStyleInfo& authorStyle)
 {
     ASSERT(style.hasAppearance());
 
     // Force inline and table display styles to be inline-block (except for table- which is block)
     ControlPart part = style.appearance();
     if (style.display() == INLINE || style.display() == INLINE_TABLE || style.display() == TABLE_ROW_GROUP
         || style.display() == TABLE_HEADER_GROUP || style.display() == TABLE_FOOTER_GROUP
         || style.display() == TABLE_ROW || style.display() == TABLE_COLUMN_GROUP || style.display() == TABLE_COLUMN
         || style.display() == TABLE_CELL || style.display() == TABLE_CAPTION)
         style.setDisplay(INLINE_BLOCK);
     else if (style.display() == LIST_ITEM || style.display() == TABLE)
         style.setDisplay(BLOCK);
 
-    if (isControlStyled(style)) {
+    if (isControlStyled(style, authorStyle)) {
         if (part == MenulistPart) {
             style.setAppearance(MenulistButtonPart);
             part = MenulistButtonPart;
         } else {
             style.setAppearance(NoControlPart);
-            return;
         }
     }
 
+    if (!style.hasAppearance())
+        return;
+
     if (shouldUseFallbackTheme(style)) {
         adjustStyleUsingFallbackTheme(style);
         return;
     }
 
 #if USE(NEW_THEME)
     switch (part) {
     case CheckboxPart:
     case InnerSpinButtonPart:
     case RadioPart:
@@ skipping 246 matching lines @@
 #endif
 }
 
 bool LayoutTheme::isControlContainer(ControlPart appearance) const
 {
     // There are more leaves than this, but we'll patch this function as we add support for
     // more controls.
     return appearance != CheckboxPart && appearance != RadioPart;
 }
 
-bool LayoutTheme::isControlStyled(const ComputedStyle& style) const
+bool LayoutTheme::isControlStyled(const ComputedStyle& style, const AuthorStyleInfo& authorStyle) const
 {
     switch (style.appearance()) {
     case PushButtonPart:
     case SquareButtonPart:
     case ButtonPart:
     case ProgressBarPart:
     case MeterPart:
     case RelevancyLevelIndicatorPart:
     case ContinuousCapacityLevelIndicatorPart:
     case DiscreteCapacityLevelIndicatorPart:
     case RatingLevelIndicatorPart:
-        return style.hasAuthorBackground() || style.hasAuthorBorder();
+        return authorStyle.specifiesBackground() || authorStyle.specifiesBorder();
 
     case MenulistPart:
     case SearchFieldPart:
     case TextAreaPart:
     case TextFieldPart:
-        return style.hasAuthorBackground() || style.hasAuthorBorder() || style.boxShadow();
+        return authorStyle.specifiesBackground() || authorStyle.specifiesBorder() || style.boxShadow();
 
     case SliderHorizontalPart:
     case SliderVerticalPart:
         return style.boxShadow();
 
     default:
         return false;
     }
 }
 
@@ skipping 523 matching lines @@
 
     // padding - not honored by WinIE, needs to be removed.
     style.resetPadding();
 
     // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
     // for now, we will not honor it.
     style.resetBorder();
 }
 
 } // namespace blink