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

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

Issue 1681273003: Add CSS parser support for break-after, break-before and break-inside. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update some text expectations, and move the new properties into ComputedStyle, since they aren't ra… Created 4 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: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index c3b28edacb650bac880d9eb4cb8ec91bafe68ee0..6884e0e3205739087b2d78d9eded887b60850ab5 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -67,7 +67,7 @@ struct SameSizeAsComputedStyle : public RefCounted<SameSizeAsComputedStyle> {
} inherited_flags;
struct NonInheritedFlags {
- unsigned m_bitfields[2];
+ unsigned m_bitfields[3];
} noninherited_flags;
};
@@ -109,7 +109,7 @@ ALWAYS_INLINE ComputedStyle::ComputedStyle()
{
setBitDefaults(); // Would it be faster to copy this from the default style?
static_assert((sizeof(InheritedFlags) <= 8), "InheritedFlags should not grow");
- static_assert((sizeof(NonInheritedFlags) <= 8), "NonInheritedFlags should not grow");
+ static_assert((sizeof(NonInheritedFlags) <= 12), "NonInheritedFlags should not grow");
}
ALWAYS_INLINE ComputedStyle::ComputedStyle(InitialStyleTag)
@@ -260,9 +260,9 @@ void ComputedStyle::copyNonInheritedFromCached(const ComputedStyle& other)
noninherited_flags.tableLayout = other.noninherited_flags.tableLayout;
noninherited_flags.unicodeBidi = other.noninherited_flags.unicodeBidi;
noninherited_flags.hasViewportUnits = other.noninherited_flags.hasViewportUnits;
- noninherited_flags.pageBreakBefore = other.noninherited_flags.pageBreakBefore;
- noninherited_flags.pageBreakAfter = other.noninherited_flags.pageBreakAfter;
- noninherited_flags.pageBreakInside = other.noninherited_flags.pageBreakInside;
+ noninherited_flags.breakBefore = other.noninherited_flags.breakBefore;
+ noninherited_flags.breakAfter = other.noninherited_flags.breakAfter;
+ noninherited_flags.breakInside = other.noninherited_flags.breakInside;
noninherited_flags.hasRemUnits = other.noninherited_flags.hasRemUnits;
// Correctly set during selector matching:

Powered by Google App Engine
This is Rietveld 408576698