Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(983)

Unified Diff: Source/core/layout/LayoutThemeMac.mm

Issue 1274263003: Revert of Delete AuthorStyleInfo and move its data into ComputedStyle.RareNonInheritedData. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutThemeMac.h ('k') | Source/core/style/AuthorStyleInfo.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutThemeMac.mm
diff --git a/Source/core/layout/LayoutThemeMac.mm b/Source/core/layout/LayoutThemeMac.mm
index b3519c09d852bd10163a88e695f6e142231ac3b3..a85c8e2ebb36cfc1aa9052f04dada047438d6dfa 100644
--- a/Source/core/layout/LayoutThemeMac.mm
+++ b/Source/core/layout/LayoutThemeMac.mm
@@ -29,6 +29,7 @@
#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"
@@ -437,10 +438,10 @@
return color;
}
-bool LayoutThemeMac::isControlStyled(const ComputedStyle& style) const
+bool LayoutThemeMac::isControlStyled(const ComputedStyle& style, const AuthorStyleInfo& authorStyle) const
{
if (style.appearance() == TextFieldPart || style.appearance() == TextAreaPart)
- return style.hasAuthorBorder() || style.boxShadow();
+ return authorStyle.specifiesBorder() || 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
@@ -454,7 +455,7 @@
if (style.appearance() == SearchFieldPart && style.effectiveZoom() != 1)
return true;
- return LayoutTheme::isControlStyled(style);
+ return LayoutTheme::isControlStyled(style, authorStyle);
}
void LayoutThemeMac::addVisualOverflow(const LayoutObject& object, IntRect& rect)
« no previous file with comments | « Source/core/layout/LayoutThemeMac.h ('k') | Source/core/style/AuthorStyleInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698