Commit 1645ce3a authored by andersr@opera.com's avatar andersr@opera.com

Remove CachedUAStyle::hasAppearance.

As of f885f9b1178fa278beafd201fb92a93af2117d64, this variable is now
pointless, because the existence of a CachedUAStyle is only possible
when 'hasAppearance' is 'true'.

Review URL: https://codereview.chromium.org/639963005

git-svn-id: svn://svn.chromium.org/blink/trunk@183594 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 9c9c7d58
...@@ -99,7 +99,7 @@ void RenderTheme::adjustStyle(RenderStyle* style, Element* e, const CachedUAStyl ...@@ -99,7 +99,7 @@ void RenderTheme::adjustStyle(RenderStyle* style, Element* e, const CachedUAStyl
else if (style->display() == LIST_ITEM || style->display() == TABLE) else if (style->display() == LIST_ITEM || style->display() == TABLE)
style->setDisplay(BLOCK); style->setDisplay(BLOCK);
if (uaStyle && uaStyle->hasAppearance && isControlStyled(style, uaStyle)) { if (uaStyle && isControlStyled(style, uaStyle)) {
if (part == MenulistPart) { if (part == MenulistPart) {
style->setAppearance(MenulistButtonPart); style->setAppearance(MenulistButtonPart);
part = MenulistButtonPart; part = MenulistButtonPart;
......
...@@ -37,19 +37,16 @@ public: ...@@ -37,19 +37,16 @@ public:
return adoptPtr(new CachedUAStyle(style)); return adoptPtr(new CachedUAStyle(style));
} }
bool hasAppearance;
BorderData border; BorderData border;
FillLayer backgroundLayers; FillLayer backgroundLayers;
StyleColor backgroundColor; StyleColor backgroundColor;
private: private:
explicit CachedUAStyle(const RenderStyle* style) explicit CachedUAStyle(const RenderStyle* style)
: hasAppearance(true) : border(style->border())
, border(style->border())
, backgroundLayers(style->backgroundLayers()) , backgroundLayers(style->backgroundLayers())
, backgroundColor(style->backgroundColor()) , backgroundColor(style->backgroundColor())
{ {
ASSERT(style->hasAppearance());
} }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment