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

Unified Diff: Source/core/html/HTMLOptionElement.h

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 9 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/html/HTMLOptGroupElement.cpp ('k') | Source/core/html/HTMLOptionElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLOptionElement.h
diff --git a/Source/core/html/HTMLOptionElement.h b/Source/core/html/HTMLOptionElement.h
index 7e286f6c6c6153becee15bd00d62b87e9989d60c..4c120c55026d9ca81f810843174b80f259ea7606 100644
--- a/Source/core/html/HTMLOptionElement.h
+++ b/Source/core/html/HTMLOptionElement.h
@@ -33,7 +33,7 @@ namespace blink {
class ExceptionState;
class HTMLDataListElement;
class HTMLSelectElement;
-class LayoutStyle;
+class ComputedStyle;
class CORE_EXPORT HTMLOptionElement final : public HTMLElement {
DEFINE_WRAPPERTYPEINFO();
@@ -89,9 +89,9 @@ private:
virtual void childrenChanged(const ChildrenChange&) override;
// <option> never has a renderer so we manually manage a cached style.
- void updateNonLayoutStyle();
- virtual LayoutStyle* nonRendererStyle() const override;
- virtual PassRefPtr<LayoutStyle> customStyleForLayoutObject() override;
+ void updateNonComputedStyle();
+ virtual ComputedStyle* nonLayoutObjectComputedStyle() const override;
+ virtual PassRefPtr<ComputedStyle> customStyleForLayoutObject() override;
virtual void didRecalcStyle(StyleRecalcChange) override;
virtual void didAddClosedShadowRoot(ShadowRoot&) override;
@@ -101,7 +101,7 @@ private:
bool m_disabled;
bool m_isSelected;
- RefPtr<LayoutStyle> m_style;
+ RefPtr<ComputedStyle> m_style;
};
} // namespace blink
« no previous file with comments | « Source/core/html/HTMLOptGroupElement.cpp ('k') | Source/core/html/HTMLOptionElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698