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

Source/core/layout/LayoutTheme.h

 /*
  * 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 15 matching lines @@
 #include "core/CoreExport.h"
 #include "core/layout/LayoutObject.h"
 #include "platform/ThemeTypes.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
+class AuthorStyleInfo;
 class ComputedStyle;
 class Element;
 class FileList;
 class HTMLInputElement;
 class LayoutMeter;
 class Theme;
 class ThemePainter;
 
 class CORE_EXPORT LayoutTheme : public RefCounted<LayoutTheme> {
 protected:
     LayoutTheme();
 
 public:
     virtual ~LayoutTheme() { }
 
     // This function is to be implemented in your platform-specific theme implementation to hand back the
     // appropriate platform theme.
     static LayoutTheme& theme();
 
     virtual ThemePainter& painter() = 0;
 
     static void setSizeIfAuto(ComputedStyle&, const IntSize&);
 
     // This method is called whenever style has been computed for an element and the appearance
     // property has been set to a value other than "none".  The theme should map in all of the appropriate
     // metrics and defaults given the contents of the style.  This includes sophisticated operations like
     // selection of control size based off the font, the disabling of appearance when certain other properties like
     // "border" are set, or if the appearance is not supported by the theme.
-    void adjustStyle(ComputedStyle&, Element*);
+    void adjustStyle(ComputedStyle&, Element*, const AuthorStyleInfo&);
 
     // The remaining methods should be implemented by the platform-specific portion of the theme, e.g.,
     // LayoutThemeMac.cpp for Mac OS X.
 
     // These methods return the theme's extra style sheets rules, to let each platform
     // adjust the default CSS rules in html.css, quirks.css or mediaControls.css.
     virtual String extraDefaultStyleSheet();
     virtual String extraQuirksStyleSheet() { return String(); }
     virtual String extraMediaControlsStyleSheet() { return String(); }
     virtual String extraFullScreenStyleSheet() { return String(); }
 
     // A method to obtain the baseline position for a "leaf" control.  This will only be used if a baseline
     // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
     // controls that need to do this.
     virtual int baselinePosition(const LayoutObject*) const;
 
     // A method for asking if a control is a container or not.  Leaf controls have to have some special behavior (like
     // the baseline position API above).
     bool isControlContainer(ControlPart) const;
 
     // Whether or not the control has been styled enough by the author to disable the native appearance.
-    virtual bool isControlStyled(const ComputedStyle&) const;
+    virtual bool isControlStyled(const ComputedStyle&, const AuthorStyleInfo&) const;
 
     // Some controls may spill out of their containers (e.g., the check on an OSX 10.9 checkbox). Add this
     // "visual overflow" to the object's border box rect.
     virtual void addVisualOverflow(const LayoutObject&, IntRect& borderBox);
 
     // This method is called whenever a control state changes on a particular themed object, e.g., the mouse becomes pressed
     // or a control becomes disabled. The ControlState parameter indicates which state has changed (from having to not having,
     // or vice versa).
     bool controlStateChanged(LayoutObject&, ControlState) const;
 
@@ skipping 151 matching lines @@
     static const RGBA32 defaultCompositionBackgroundColor = 0xFFFFDD55;
 
 #if USE(NEW_THEME)
     Theme* m_platformTheme; // The platform-specific theme.
 #endif
 };
 
 } // namespace blink
 
 #endif // LayoutTheme_h