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

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

Issue 16690004: [CSS Regions] Rename region-overflow to region-fragment (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch Created 7 years, 6 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/RenderRegion.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | 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 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 837
838 TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInh eritedData->m_textCombine); } 838 TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInh eritedData->m_textCombine); }
839 bool hasTextCombine() const { return textCombine() != TextCombineNone; } 839 bool hasTextCombine() const { return textCombine() != TextCombineNone; }
840 840
841 unsigned tabSize() const { return rareInheritedData->m_tabSize; } 841 unsigned tabSize() const { return rareInheritedData->m_tabSize; }
842 842
843 // End CSS3 Getters 843 // End CSS3 Getters
844 844
845 const AtomicString& flowThread() const { return rareNonInheritedData->m_flow Thread; } 845 const AtomicString& flowThread() const { return rareNonInheritedData->m_flow Thread; }
846 const AtomicString& regionThread() const { return rareNonInheritedData->m_re gionThread; } 846 const AtomicString& regionThread() const { return rareNonInheritedData->m_re gionThread; }
847 RegionOverflow regionOverflow() const { return static_cast<RegionOverflow>(r areNonInheritedData->m_regionOverflow); } 847 RegionFragment regionFragment() const { return static_cast<RegionFragment>(r areNonInheritedData->m_regionFragment); }
848 848
849 const AtomicString& lineGrid() const { return rareInheritedData->m_lineGrid; } 849 const AtomicString& lineGrid() const { return rareInheritedData->m_lineGrid; }
850 LineSnap lineSnap() const { return static_cast<LineSnap>(rareInheritedData-> m_lineSnap); } 850 LineSnap lineSnap() const { return static_cast<LineSnap>(rareInheritedData-> m_lineSnap); }
851 LineAlign lineAlign() const { return static_cast<LineAlign>(rareInheritedDat a->m_lineAlign); } 851 LineAlign lineAlign() const { return static_cast<LineAlign>(rareInheritedDat a->m_lineAlign); }
852 852
853 WrapFlow wrapFlow() const { return static_cast<WrapFlow>(rareNonInheritedDat a->m_wrapFlow); } 853 WrapFlow wrapFlow() const { return static_cast<WrapFlow>(rareNonInheritedDat a->m_wrapFlow); }
854 WrapThrough wrapThrough() const { return static_cast<WrapThrough>(rareNonInh eritedData->m_wrapThrough); } 854 WrapThrough wrapThrough() const { return static_cast<WrapThrough>(rareNonInh eritedData->m_wrapThrough); }
855 855
856 // Apple-specific property getter methods 856 // Apple-specific property getter methods
857 EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(in herited_flags._pointerEvents); } 857 EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(in herited_flags._pointerEvents); }
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
1269 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; } 1269 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size) ; }
1270 1270
1271 // End CSS3 Setters 1271 // End CSS3 Setters
1272 1272
1273 void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); } 1273 void setLineGrid(const AtomicString& lineGrid) { SET_VAR(rareInheritedData, m_lineGrid, lineGrid); }
1274 void setLineSnap(LineSnap lineSnap) { SET_VAR(rareInheritedData, m_lineSnap, lineSnap); } 1274 void setLineSnap(LineSnap lineSnap) { SET_VAR(rareInheritedData, m_lineSnap, lineSnap); }
1275 void setLineAlign(LineAlign lineAlign) { SET_VAR(rareInheritedData, m_lineAl ign, lineAlign); } 1275 void setLineAlign(LineAlign lineAlign) { SET_VAR(rareInheritedData, m_lineAl ign, lineAlign); }
1276 1276
1277 void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInherite dData, m_flowThread, flowThread); } 1277 void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInherite dData, m_flowThread, flowThread); }
1278 void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInhe ritedData, m_regionThread, regionThread); } 1278 void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInhe ritedData, m_regionThread, regionThread); }
1279 void setRegionOverflow(RegionOverflow regionOverflow) { SET_VAR(rareNonInher itedData, m_regionOverflow, regionOverflow); } 1279 void setRegionFragment(RegionFragment regionFragment) { SET_VAR(rareNonInher itedData, m_regionFragment, regionFragment); }
1280 1280
1281 void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFl ow, wrapFlow); } 1281 void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFl ow, wrapFlow); }
1282 void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); } 1282 void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); }
1283 1283
1284 // Apple-specific property setters 1284 // Apple-specific property setters
1285 void setPointerEvents(EPointerEvents p) { inherited_flags._pointerEvents = p ; } 1285 void setPointerEvents(EPointerEvents p) { inherited_flags._pointerEvents = p ; }
1286 1286
1287 void clearAnimations() 1287 void clearAnimations()
1288 { 1288 {
1289 rareNonInheritedData.access()->m_animations.clear(); 1289 rareNonInheritedData.access()->m_animations.clear();
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
1619 static GridPosition initialGridAfter() { return GridPosition(); } 1619 static GridPosition initialGridAfter() { return GridPosition(); }
1620 1620
1621 static unsigned initialTabSize() { return 8; } 1621 static unsigned initialTabSize() { return 8; }
1622 1622
1623 static const AtomicString& initialLineGrid() { return nullAtom; } 1623 static const AtomicString& initialLineGrid() { return nullAtom; }
1624 static LineSnap initialLineSnap() { return LineSnapNone; } 1624 static LineSnap initialLineSnap() { return LineSnapNone; }
1625 static LineAlign initialLineAlign() { return LineAlignNone; } 1625 static LineAlign initialLineAlign() { return LineAlignNone; }
1626 1626
1627 static const AtomicString& initialFlowThread() { return nullAtom; } 1627 static const AtomicString& initialFlowThread() { return nullAtom; }
1628 static const AtomicString& initialRegionThread() { return nullAtom; } 1628 static const AtomicString& initialRegionThread() { return nullAtom; }
1629 static RegionOverflow initialRegionOverflow() { return AutoRegionOverflow; } 1629 static RegionFragment initialRegionFragment() { return AutoRegionFragment; }
1630 1630
1631 static WrapFlow initialWrapFlow() { return WrapFlowAuto; } 1631 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
1632 static WrapThrough initialWrapThrough() { return WrapThroughWrap; } 1632 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
1633 1633
1634 // Keep these at the end. 1634 // Keep these at the end.
1635 static LineClampValue initialLineClamp() { return LineClampValue(); } 1635 static LineClampValue initialLineClamp() { return LineClampValue(); }
1636 static ETextSecurity initialTextSecurity() { return TSNONE; } 1636 static ETextSecurity initialTextSecurity() { return TSNONE; }
1637 static Color initialTapHighlightColor(); 1637 static Color initialTapHighlightColor();
1638 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) 1638 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
1639 static bool initialUseTouchOverflowScrolling() { return false; } 1639 static bool initialUseTouchOverflowScrolling() { return false; }
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
1763 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1763 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1764 return false; 1764 return false;
1765 1765
1766 rareInheritedData.access()->m_textOrientation = textOrientation; 1766 rareInheritedData.access()->m_textOrientation = textOrientation;
1767 return true; 1767 return true;
1768 } 1768 }
1769 1769
1770 } // namespace WebCore 1770 } // namespace WebCore
1771 1771
1772 #endif // RenderStyle_h 1772 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderRegion.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698