Delete AuthorStyleInfo and move its data into ComputedStyle.RareNonInheritedData.

Source/core/layout/LayoutThemeMac.mm

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Google, 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 11 matching lines @@
 #import "core/layout/LayoutThemeMac.h"
 
 #import "core/CSSValueKeywords.h"
 #import "core/HTMLNames.h"
 #import "core/fileapi/FileList.h"
 #import "core/html/HTMLMeterElement.h"
 #import "core/layout/LayoutMeter.h"
 #import "core/layout/LayoutProgress.h"
 #import "core/layout/LayoutView.h"
 #import "core/paint/MediaControlsPainter.h"
-#import "core/style/AuthorStyleInfo.h"
 #import "core/style/ShadowList.h"
 #import "platform/LayoutTestSupport.h"
 #import "platform/PlatformResourceLoader.h"
 #import "platform/graphics/BitmapImage.h"
 #import "platform/mac/ColorMac.h"
 #import "platform/mac/LocalCurrentGraphicsContext.h"
 #import "platform/mac/ThemeMac.h"
 #import "platform/mac/WebCoreNSCellExtras.h"
 #import "platform/text/PlatformLocale.h"
 #import "platform/text/StringTruncator.h"
@@ skipping 388 matching lines @@
     }
 
     if (needsFallback)
         color = LayoutTheme::systemColor(cssValueId);
 
     m_systemColorCache.set(cssValueId, color.rgb());
 
     return color;
 }
 
-bool LayoutThemeMac::isControlStyled(const ComputedStyle& style, const AuthorStyleInfo& authorStyle) const
+bool LayoutThemeMac::isControlStyled(const ComputedStyle& style) const
 {
     if (style.appearance() == TextFieldPart || style.appearance() == TextAreaPart)
-        return authorStyle.specifiesBorder() || style.boxShadow();
+        return style.hasAuthorBorder() || style.boxShadow();
 
     // FIXME: This is horrible, but there is not much else that can be done.
     // Menu lists cannot draw properly when scaled. They can't really draw
     // properly when transformed either. We can't detect the transform case at
     // style adjustment time so that will just have to stay broken.  We can
     // however detect that we're zooming. If zooming is in effect we treat it
     // like the control is styled.
     if (style.appearance() == MenulistPart && style.effectiveZoom() != 1.0f)
         return true;
     // FIXME: NSSearchFieldCell doesn't work well when scaled.
     if (style.appearance() == SearchFieldPart && style.effectiveZoom() != 1)
         return true;
 
-    return LayoutTheme::isControlStyled(style, authorStyle);
+    return LayoutTheme::isControlStyled(style);
 }
 
 void LayoutThemeMac::addVisualOverflow(const LayoutObject& object, IntRect& rect)
 {
     ControlPart part = object.style()->appearance();
 
 #if USE(NEW_THEME)
     switch (part) {
     case CheckboxPart:
     case RadioPart:
@@ skipping 309 matching lines @@
 
     // Height is locked to auto.
     style.setHeight(Length(Auto));
 
     // White-space is locked to pre.
     style.setWhiteSpace(PRE);
 
     // Set the foreground color to black or gray when we have the aqua look.
     // Cast to RGB32 is to work around a compiler bug.
     style.setColor(e && !e->isDisabledFormControl() ? static_cast<RGBA32>(Color::black) : Color::darkGray);
+    // The style is not cachable since it depends on the element type.
+    style.setUnique();

[Timothy Loh, 2015/07/29 03:37:08]

We probably don't need to do this since the MPC is used before style adjustmemnt

[meade_UTC10, 2015/07/30 05:38:17]

Removed

 
     // Set the button's vertical size.
     setSizeFromFont(style, menuListButtonSizes());
 
     // Our font is locked to the appropriate system font size for the
     // control. To clarify, we first use the CSS-specified font to figure out a
     // reasonable control size, but once that control size is determined, we
     // throw that font away and use the appropriate system font for the control
     // size instead.
     setFontFromControlSize(style, controlSize);
@@ skipping 376 matching lines @@
 
 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const
 {
     ControlPart part = style.appearance();
     if (part == CheckboxPart || part == RadioPart)
         return style.effectiveZoom() != 1;
     return false;
 }
 
 } // namespace blink