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

Unified Diff: sky/engine/core/rendering/style/RenderStyle.h

Issue 1070313003: Remove page-break properties and captions (Closed) Base URL: git@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/RootInlineBox.h ('k') | sky/engine/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/style/RenderStyle.h
diff --git a/sky/engine/core/rendering/style/RenderStyle.h b/sky/engine/core/rendering/style/RenderStyle.h
index d7057eb67f7a014359aa5754a54f0f7d72600128..003d214b53d10b83f61e9bffd0e4dbd91115b17d 100644
--- a/sky/engine/core/rendering/style/RenderStyle.h
+++ b/sky/engine/core/rendering/style/RenderStyle.h
@@ -132,7 +132,6 @@ protected:
bool operator==(const InheritedFlags& other) const
{
return (_empty_cells == other._empty_cells)
- && (_caption_side == other._caption_side)
&& (_visibility == other._visibility)
&& (_text_align == other._text_align)
&& (m_textUnderline == other.m_textUnderline)
@@ -145,7 +144,6 @@ protected:
bool operator!=(const InheritedFlags& other) const { return !(*this == other); }
unsigned _empty_cells : 1; // EEmptyCell
- unsigned _caption_side : 2; // ECaptionSide
unsigned _visibility : 2; // EVisibility
unsigned _text_align : 4; // ETextAlign
unsigned m_textUnderline : 1;
@@ -170,9 +168,6 @@ protected:
&& verticalAlign == other.verticalAlign
&& position == other.position
&& tableLayout == other.tableLayout
- && pageBreakBefore == other.pageBreakBefore
- && pageBreakAfter == other.pageBreakAfter
- && pageBreakInside == other.pageBreakInside
&& styleType == other.styleType
&& affectedByFocus == other.affectedByFocus
&& affectedByHover == other.affectedByHover
@@ -204,10 +199,6 @@ protected:
// 32 bits
- unsigned pageBreakBefore : 2; // EPageBreak
- unsigned pageBreakAfter : 2; // EPageBreak
- unsigned pageBreakInside : 2; // EPageBreak
-
unsigned styleType : 6; // PseudoId
unsigned explicitInheritance : 1; // Explicitly inherits a non-inherited property
unsigned currentColor : 1; // At least one color has the value 'currentColor'
@@ -232,7 +223,6 @@ protected:
void setBitDefaults()
{
inherited_flags._empty_cells = initialEmptyCells();
- inherited_flags._caption_side = initialCaptionSide();
inherited_flags._visibility = initialVisibility();
inherited_flags._text_align = initialTextAlign();
inherited_flags.m_textUnderline = false;
@@ -248,9 +238,6 @@ protected:
noninherited_flags.position = initialPosition();
noninherited_flags.tableLayout = initialTableLayout();
noninherited_flags.unicodeBidi = initialUnicodeBidi();
- noninherited_flags.pageBreakBefore = initialPageBreak();
- noninherited_flags.pageBreakAfter = initialPageBreak();
- noninherited_flags.pageBreakInside = initialPageBreak();
noninherited_flags.explicitInheritance = false;
noninherited_flags.currentColor = false;
noninherited_flags.unique = false;
@@ -554,7 +541,6 @@ public:
short horizontalBorderSpacing() const;
short verticalBorderSpacing() const;
EEmptyCell emptyCells() const { return static_cast<EEmptyCell>(inherited_flags._empty_cells); }
- ECaptionSide captionSide() const { return static_cast<ECaptionSide>(inherited_flags._caption_side); }
const Length& marginTop() const { return surround->margin.top(); }
const Length& marginBottom() const { return surround->margin.bottom(); }
@@ -583,9 +569,6 @@ public:
short widows() const { return rareInheritedData->widows; }
bool hasAutoWidows() const { return rareInheritedData->m_hasAutoWidows; }
- EPageBreak pageBreakInside() const { return static_cast<EPageBreak>(noninherited_flags.pageBreakInside); }
- EPageBreak pageBreakBefore() const { return static_cast<EPageBreak>(noninherited_flags.pageBreakBefore); }
- EPageBreak pageBreakAfter() const { return static_cast<EPageBreak>(noninherited_flags.pageBreakAfter); }
// CSS3 Getter Methods
@@ -885,7 +868,6 @@ public:
void setHorizontalBorderSpacing(short);
void setVerticalBorderSpacing(short);
void setEmptyCells(EEmptyCell v) { inherited_flags._empty_cells = v; }
- void setCaptionSide(ECaptionSide v) { inherited_flags._caption_side = v; }
void setHasAspectRatio(bool b) { SET_VAR(rareNonInheritedData, m_hasAspectRatio, b); }
void setAspectRatioDenominator(float v) { SET_VAR(rareNonInheritedData, m_aspectRatioDenominator, v); }
@@ -915,11 +897,6 @@ public:
void setHasAutoWidows() { SET_VAR(rareInheritedData, m_hasAutoWidows, true); SET_VAR(rareInheritedData, widows, initialWidows()); }
void setWidows(short w) { SET_VAR(rareInheritedData, m_hasAutoWidows, false); SET_VAR(rareInheritedData, widows, w); }
- // For valid values of page-break-inside see http://www.w3.org/TR/CSS21/page.html#page-break-props
- void setPageBreakInside(EPageBreak b) { ASSERT(b == PBAUTO || b == PBAVOID); noninherited_flags.pageBreakInside = b; }
- void setPageBreakBefore(EPageBreak b) { noninherited_flags.pageBreakBefore = b; }
- void setPageBreakAfter(EPageBreak b) { noninherited_flags.pageBreakAfter = b; }
-
// CSS3 Setters
void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v); }
void setTextShadow(PassRefPtr<ShadowList>);
@@ -1069,7 +1046,6 @@ public:
static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; }
static NinePieceImage initialNinePieceImage() { return NinePieceImage(); }
static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed), Length(0, Fixed)); }
- static ECaptionSide initialCaptionSide() { return CAPTOP; }
static LengthBox initialClip() { return LengthBox(); }
static TextDirection initialDirection() { return LTR; }
static TextOrientation initialTextOrientation() { return TextOrientationVerticalRight; }
@@ -1079,7 +1055,6 @@ public:
static EEmptyCell initialEmptyCells() { return SHOW; }
static EOverflow initialOverflowX() { return OVISIBLE; }
static EOverflow initialOverflowY() { return OVISIBLE; }
- static EPageBreak initialPageBreak() { return PBAUTO; }
static EPosition initialPosition() { return StaticPosition; }
static ETableLayout initialTableLayout() { return TAUTO; }
static EUnicodeBidi initialUnicodeBidi() { return UBNormal; }
« no previous file with comments | « sky/engine/core/rendering/RootInlineBox.h ('k') | sky/engine/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698