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

Unified Diff: Source/core/dom/Element.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/dom/Document.cpp ('k') | Source/core/dom/Element.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Element.h
diff --git a/Source/core/dom/Element.h b/Source/core/dom/Element.h
index e954a5aa8f69c3283df35534ebf330324bfd49d5..e8d991a1cc9d27a43b161fc6e3f4c0780a6e11f4 100644
--- a/Source/core/dom/Element.h
+++ b/Source/core/dom/Element.h
@@ -310,8 +310,8 @@ public:
virtual void attach(const AttachContext& = AttachContext()) override;
virtual void detach(const AttachContext& = AttachContext()) override;
- virtual LayoutObject* createLayoutObject(const LayoutStyle&);
- virtual bool layoutObjectIsNeeded(const LayoutStyle&);
+ virtual LayoutObject* createLayoutObject(const ComputedStyle&);
+ virtual bool layoutObjectIsNeeded(const ComputedStyle&);
void recalcStyle(StyleRecalcChange, Text* nextTextSibling = nullptr);
void pseudoStateChanged(CSSSelector::PseudoType);
void setAnimationStyleChange(bool);
@@ -336,7 +336,7 @@ public:
bool isInDescendantTreeOf(const Element* shadowHost) const;
- const LayoutStyle* computedStyle(PseudoId = NOPSEUDO);
+ const ComputedStyle* ensureComputedStyle(PseudoId = NOPSEUDO);
// Methods for indicating the style is affected by dynamic updates (e.g., children changing, our position changing in our sibling list, etc.)
bool styleAffectedByEmpty() const { return hasElementFlag(StyleAffectedByEmpty); }
@@ -476,7 +476,7 @@ public:
bool isSpellCheckingEnabled() const;
// FIXME: public for LayoutTreeBuilder, we shouldn't expose this though.
- PassRefPtr<LayoutStyle> styleForLayoutObject();
+ PassRefPtr<ComputedStyle> styleForLayoutObject();
bool hasID() const;
bool hasClass() const;
@@ -520,7 +520,7 @@ protected:
virtual void willRecalcStyle(StyleRecalcChange);
virtual void didRecalcStyle(StyleRecalcChange);
- virtual PassRefPtr<LayoutStyle> customStyleForLayoutObject();
+ virtual PassRefPtr<ComputedStyle> customStyleForLayoutObject();
virtual bool shouldRegisterAsNamedItem() const { return false; }
virtual bool shouldRegisterAsExtraNamedItem() const { return false; }
@@ -541,7 +541,7 @@ protected:
// svgAttributeChanged (called when element.className.baseValue is set)
void classAttributeChanged(const AtomicString& newClassString);
- PassRefPtr<LayoutStyle> originalStyleForLayoutObject();
+ PassRefPtr<ComputedStyle> originalStyleForLayoutObject();
Node* insertAdjacent(const String& where, Node* newChild, ExceptionState&);
@@ -613,13 +613,13 @@ private:
virtual void formatForDebugger(char* buffer, unsigned length) const override;
#endif
- bool pseudoStyleCacheIsInvalid(const LayoutStyle* currentStyle, LayoutStyle* newStyle);
+ bool pseudoStyleCacheIsInvalid(const ComputedStyle* currentStyle, ComputedStyle* newStyle);
void cancelFocusAppearanceUpdate();
- virtual const LayoutStyle* virtualComputedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO) override { return computedStyle(pseudoElementSpecifier); }
+ virtual const ComputedStyle* virtualEnsureComputedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO) override { return ensureComputedStyle(pseudoElementSpecifier); }
- inline void updateCallbackSelectors(const LayoutStyle* oldStyle, const LayoutStyle* newStyle);
+ inline void updateCallbackSelectors(const ComputedStyle* oldStyle, const ComputedStyle* newStyle);
inline void removeCallbackSelectors();
inline void addCallbackSelectors();
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698