| Index: Source/core/layout/LayoutThemeMac.mm
|
| diff --git a/Source/core/layout/LayoutThemeMac.mm b/Source/core/layout/LayoutThemeMac.mm
|
| index 7ada83ecad5247fb21a71254a20e95fa39befc13..618ee12ba613e0fe76ac4ac2705e656d0d24df26 100644
|
| --- a/Source/core/layout/LayoutThemeMac.mm
|
| +++ b/Source/core/layout/LayoutThemeMac.mm
|
| @@ -29,7 +29,6 @@
|
| #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"
|
| @@ -446,10 +445,10 @@ Color LayoutThemeMac::systemColor(CSSValueID cssValueId) const
|
| 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
|
| @@ -463,7 +462,7 @@ bool LayoutThemeMac::isControlStyled(const ComputedStyle& style, const AuthorSty
|
| 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)
|
|
|