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

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2735283002: Combine ComputedStyle default ctor with initial style ctor. (Closed)
Patch Set: Rebase Created 3 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 | « no previous file | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index 043e2233a9150af7460166166e09b755e054d71a..7cec8159bf7bfacde2f5fbf47e584e408aab28f0 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -302,14 +302,13 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
}
private:
- // TODO(sashab): Move these to the bottom of ComputedStyle.
- ALWAYS_INLINE ComputedStyle();
-
+ // TODO(sashab): Move these private members to the bottom of ComputedStyle.
enum InitialStyleTag { InitialStyle };
ALWAYS_INLINE explicit ComputedStyle(InitialStyleTag);
ALWAYS_INLINE ComputedStyle(const ComputedStyle&);
static PassRefPtr<ComputedStyle> createInitialStyle();
+ // TODO(shend): Remove this. Initial style should not be mutable.
static inline ComputedStyle& mutableInitialStyle() {
LEAK_SANITIZER_DISABLED_SCOPE;
DEFINE_STATIC_REF(ComputedStyle, s_initialStyle,
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698