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

Unified Diff: sky/engine/core/rendering/style/StyleRareInheritedData.cpp

Issue 1068073002: drop 'orphan' property (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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 | « sky/engine/core/rendering/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/style/StyleRareInheritedData.cpp
diff --git a/sky/engine/core/rendering/style/StyleRareInheritedData.cpp b/sky/engine/core/rendering/style/StyleRareInheritedData.cpp
index 53375092b7c9f746e65fcbcaa1b26501c72229dc..5dacda42e94469d3eeeebf12e9dbb87f6b7a041d 100644
--- a/sky/engine/core/rendering/style/StyleRareInheritedData.cpp
+++ b/sky/engine/core/rendering/style/StyleRareInheritedData.cpp
@@ -50,16 +50,16 @@ struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI
Color touchColors;
};
-COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInheritedData), StyleRareInheritedData_should_bit_pack);
+ // TODO(ianh): The size of this thing is in total flux, since many of these properties are going to go away.
+ // If we keep some then we should rework out the right size.
+ //COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInheritedData), StyleRareInheritedData_should_bit_pack);
ojan 2015/04/08 00:05:44 We should either update the size or delete the ass
StyleRareInheritedData::StyleRareInheritedData()
: listStyleImage(RenderStyle::initialListStyleImage())
, textStrokeWidth(RenderStyle::initialTextStrokeWidth())
, indent(RenderStyle::initialTextIndent())
, widows(RenderStyle::initialWidows())
- , orphans(RenderStyle::initialOrphans())
, m_hasAutoWidows(true)
- , m_hasAutoOrphans(true)
, m_textStrokeColorIsCurrentColor(true)
, m_textFillColorIsCurrentColor(true)
, m_textEmphasisColorIsCurrentColor(true)
@@ -103,9 +103,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
, cursorData(o.cursorData)
, indent(o.indent)
, widows(o.widows)
- , orphans(o.orphans)
, m_hasAutoWidows(o.m_hasAutoWidows)
- , m_hasAutoOrphans(o.m_hasAutoOrphans)
, m_textStrokeColorIsCurrentColor(o.m_textStrokeColorIsCurrentColor)
, m_textFillColorIsCurrentColor(o.m_textFillColorIsCurrentColor)
, m_textEmphasisColorIsCurrentColor(o.m_textEmphasisColorIsCurrentColor)
@@ -157,9 +155,7 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
&& dataEquivalent(cursorData.get(), o.cursorData.get())
&& indent == o.indent
&& widows == o.widows
- && orphans == o.orphans
&& m_hasAutoWidows == o.m_hasAutoWidows
- && m_hasAutoOrphans == o.m_hasAutoOrphans
&& m_textStrokeColorIsCurrentColor == o.m_textStrokeColorIsCurrentColor
&& m_textFillColorIsCurrentColor == o.m_textFillColorIsCurrentColor
&& m_textEmphasisColorIsCurrentColor == o.m_textEmphasisColorIsCurrentColor
« no previous file with comments | « sky/engine/core/rendering/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698