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

Unified Diff: trunk/Source/core/layout/style/LayoutStyle.h

Issue 948053002: Revert 190605 "Make RenderObject::style() return a const object" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 5 years, 10 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
Index: trunk/Source/core/layout/style/LayoutStyle.h
===================================================================
--- trunk/Source/core/layout/style/LayoutStyle.h (revision 190671)
+++ trunk/Source/core/layout/style/LayoutStyle.h (working copy)
@@ -258,9 +258,8 @@
unsigned styleType : 6; // PseudoId
unsigned pseudoBits : 8;
- // FIXME: |explicitInheritance| should be moved to ElementRareData.
- mutable unsigned explicitInheritance : 1; // Explicitly inherits a non-inherited property
- mutable unsigned unique : 1; // Style can not be shared.
+ unsigned explicitInheritance : 1; // Explicitly inherits a non-inherited property
+ unsigned unique : 1; // Style can not be shared.
unsigned emptyState : 1;
@@ -1461,7 +1460,7 @@
// A unique style is one that has matches something that makes it impossible to share.
bool unique() const { return noninherited_flags.unique; }
- void setUnique() const { noninherited_flags.unique = true; }
+ void setUnique() { noninherited_flags.unique = true; }
bool isSharable() const;
@@ -1470,7 +1469,7 @@
Color visitedDependentColor(int colorProperty) const;
- void setHasExplicitlyInheritedProperties() const { noninherited_flags.explicitInheritance = true; }
+ void setHasExplicitlyInheritedProperties() { noninherited_flags.explicitInheritance = true; }
bool hasExplicitlyInheritedProperties() const { return noninherited_flags.explicitInheritance; }
bool hasBoxDecorations() const { return hasBorder() || hasBorderRadius() || hasOutline() || hasAppearance() || boxShadow() || hasFilter() || resize() != RESIZE_NONE; }
« no previous file with comments | « trunk/Source/core/layout/line/BreakingContextInlineHeaders.h ('k') | trunk/Source/core/layout/style/LayoutStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698