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

Side by Side Diff: Source/core/rendering/style/RenderStyle.h

Issue 157553002: Remove the Pagination struct, clean up viewport scroll policy propagation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master Created 6 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 unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderView.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 return m_background->outline().width(); 531 return m_background->outline().width();
532 } 532 }
533 bool hasOutline() const { return outlineWidth() > 0 && outlineStyle() > BHID DEN; } 533 bool hasOutline() const { return outlineWidth() > 0 && outlineStyle() > BHID DEN; }
534 EBorderStyle outlineStyle() const { return m_background->outline().style(); } 534 EBorderStyle outlineStyle() const { return m_background->outline().style(); }
535 OutlineIsAuto outlineStyleIsAuto() const { return static_cast<OutlineIsAuto> (m_background->outline().isAuto()); } 535 OutlineIsAuto outlineStyleIsAuto() const { return static_cast<OutlineIsAuto> (m_background->outline().isAuto()); }
536 536
537 EOverflow overflowX() const { return static_cast<EOverflow>(noninherited_fla gs._overflowX); } 537 EOverflow overflowX() const { return static_cast<EOverflow>(noninherited_fla gs._overflowX); }
538 EOverflow overflowY() const { return static_cast<EOverflow>(noninherited_fla gs._overflowY); } 538 EOverflow overflowY() const { return static_cast<EOverflow>(noninherited_fla gs._overflowY); }
539 // It's sufficient to just check one direction, since it's illegal to have v isible on only one overflow value. 539 // It's sufficient to just check one direction, since it's illegal to have v isible on only one overflow value.
540 bool isOverflowVisible() const { ASSERT(overflowX() != OVISIBLE || overflowX () == overflowY()); return overflowX() == OVISIBLE; } 540 bool isOverflowVisible() const { ASSERT(overflowX() != OVISIBLE || overflowX () == overflowY()); return overflowX() == OVISIBLE; }
541 bool isOverflowPaged() const { return overflowY() == OPAGEDX || overflowY() == OPAGEDY; }
541 542
542 EVisibility visibility() const { return static_cast<EVisibility>(inherited_f lags._visibility); } 543 EVisibility visibility() const { return static_cast<EVisibility>(inherited_f lags._visibility); }
543 EVerticalAlign verticalAlign() const { return static_cast<EVerticalAlign>(no ninherited_flags._vertical_align); } 544 EVerticalAlign verticalAlign() const { return static_cast<EVerticalAlign>(no ninherited_flags._vertical_align); }
544 Length verticalAlignLength() const { return m_box->verticalAlign(); } 545 Length verticalAlignLength() const { return m_box->verticalAlign(); }
545 546
546 Length clipLeft() const { return visual->clip.left(); } 547 Length clipLeft() const { return visual->clip.left(); }
547 Length clipRight() const { return visual->clip.right(); } 548 Length clipRight() const { return visual->clip.right(); }
548 Length clipTop() const { return visual->clip.top(); } 549 Length clipTop() const { return visual->clip.top(); }
549 Length clipBottom() const { return visual->clip.bottom(); } 550 Length clipBottom() const { return visual->clip.bottom(); }
550 LengthBox clip() const { return visual->clip; } 551 LengthBox clip() const { return visual->clip; }
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 const AtomicString& highlight() const { return rareInheritedData->highlight; } 823 const AtomicString& highlight() const { return rareInheritedData->highlight; }
823 const AtomicString& hyphenationString() const { return rareInheritedData->hy phenationString; } 824 const AtomicString& hyphenationString() const { return rareInheritedData->hy phenationString; }
824 const AtomicString& locale() const { return rareInheritedData->locale; } 825 const AtomicString& locale() const { return rareInheritedData->locale; }
825 EBorderFit borderFit() const { return static_cast<EBorderFit>(rareNonInherit edData->m_borderFit); } 826 EBorderFit borderFit() const { return static_cast<EBorderFit>(rareNonInherit edData->m_borderFit); }
826 EResize resize() const { return static_cast<EResize>(rareInheritedData->resi ze); } 827 EResize resize() const { return static_cast<EResize>(rareInheritedData->resi ze); }
827 ColumnAxis columnAxis() const { return static_cast<ColumnAxis>(rareNonInheri tedData->m_multiCol->m_axis); } 828 ColumnAxis columnAxis() const { return static_cast<ColumnAxis>(rareNonInheri tedData->m_multiCol->m_axis); }
828 bool hasInlineColumnAxis() const { 829 bool hasInlineColumnAxis() const {
829 ColumnAxis axis = columnAxis(); 830 ColumnAxis axis = columnAxis();
830 return axis == AutoColumnAxis || isHorizontalWritingMode() == (axis == H orizontalColumnAxis); 831 return axis == AutoColumnAxis || isHorizontalWritingMode() == (axis == H orizontalColumnAxis);
831 } 832 }
833 bool hasInlinePaginationAxis() const
834 {
835 // If the pagination axis is parallel with the writing mode inline axis, columns may be laid
836 // out along the inline axis, just like for regular multicol. Otherwise, we need to lay out
837 // along the block axis.
838 if (isOverflowPaged())
839 return (overflowY() == OPAGEDX) == isHorizontalWritingMode();
840 return false;
841 }
832 ColumnProgression columnProgression() const { return static_cast<ColumnProgr ession>(rareNonInheritedData->m_multiCol->m_progression); } 842 ColumnProgression columnProgression() const { return static_cast<ColumnProgr ession>(rareNonInheritedData->m_multiCol->m_progression); }
833 float columnWidth() const { return rareNonInheritedData->m_multiCol->m_width ; } 843 float columnWidth() const { return rareNonInheritedData->m_multiCol->m_width ; }
834 bool hasAutoColumnWidth() const { return rareNonInheritedData->m_multiCol->m _autoWidth; } 844 bool hasAutoColumnWidth() const { return rareNonInheritedData->m_multiCol->m _autoWidth; }
835 unsigned short columnCount() const { return rareNonInheritedData->m_multiCol ->m_count; } 845 unsigned short columnCount() const { return rareNonInheritedData->m_multiCol ->m_count; }
836 bool hasAutoColumnCount() const { return rareNonInheritedData->m_multiCol->m _autoCount; } 846 bool hasAutoColumnCount() const { return rareNonInheritedData->m_multiCol->m _autoCount; }
837 bool specifiesAutoColumns() const { return hasAutoColumnCount() && hasAutoCo lumnWidth(); } 847 bool specifiesAutoColumns() const { return hasAutoColumnCount() && hasAutoCo lumnWidth(); }
838 bool specifiesColumns() const { return !hasAutoColumnCount() || !hasAutoColu mnWidth() || !hasInlineColumnAxis(); } 848 bool specifiesColumns() const { return !hasAutoColumnCount() || !hasAutoColu mnWidth() || !hasInlineColumnAxis(); }
839 ColumnFill columnFill() const { return static_cast<ColumnFill>(rareNonInheri tedData->m_multiCol->m_fill); } 849 ColumnFill columnFill() const { return static_cast<ColumnFill>(rareNonInheri tedData->m_multiCol->m_fill); }
840 float columnGap() const { return rareNonInheritedData->m_multiCol->m_gap; } 850 float columnGap() const { return rareNonInheritedData->m_multiCol->m_gap; }
841 bool hasNormalColumnGap() const { return rareNonInheritedData->m_multiCol->m _normalGap; } 851 bool hasNormalColumnGap() const { return rareNonInheritedData->m_multiCol->m _normalGap; }
(...skipping 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after
1898 } 1908 }
1899 1909
1900 inline bool RenderStyle::hasPseudoElementStyle() const 1910 inline bool RenderStyle::hasPseudoElementStyle() const
1901 { 1911 {
1902 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; 1912 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;
1903 } 1913 }
1904 1914
1905 } // namespace WebCore 1915 } // namespace WebCore
1906 1916
1907 #endif // RenderStyle_h 1917 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderView.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698