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

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

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase. Created 7 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 unified diff | Download patch | Annotate | Revision Log
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 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 Length perspectiveOriginX() const { return rareNonInheritedData->m_perspecti veOriginX; } 904 Length perspectiveOriginX() const { return rareNonInheritedData->m_perspecti veOriginX; }
905 Length perspectiveOriginY() const { return rareNonInheritedData->m_perspecti veOriginY; } 905 Length perspectiveOriginY() const { return rareNonInheritedData->m_perspecti veOriginY; }
906 LengthSize pageSize() const { return rareNonInheritedData->m_pageSize; } 906 LengthSize pageSize() const { return rareNonInheritedData->m_pageSize; }
907 PageSizeType pageSizeType() const { return static_cast<PageSizeType>(rareNon InheritedData->m_pageSizeType); } 907 PageSizeType pageSizeType() const { return static_cast<PageSizeType>(rareNon InheritedData->m_pageSizeType); }
908 908
909 // When set, this ensures that styles compare as different. Used during acce lerated animations. 909 // When set, this ensures that styles compare as different. Used during acce lerated animations.
910 bool isRunningAcceleratedAnimation() const { return rareNonInheritedData->m_ runningAcceleratedAnimation; } 910 bool isRunningAcceleratedAnimation() const { return rareNonInheritedData->m_ runningAcceleratedAnimation; }
911 911
912 LineBoxContain lineBoxContain() const { return rareInheritedData->m_lineBoxC ontain; } 912 LineBoxContain lineBoxContain() const { return rareInheritedData->m_lineBoxC ontain; }
913 const LineClampValue& lineClamp() const { return rareNonInheritedData->lineC lamp; } 913 const LineClampValue& lineClamp() const { return rareNonInheritedData->lineC lamp; }
914 #if ENABLE(TOUCH_EVENTS)
915 Color tapHighlightColor() const { return rareInheritedData->tapHighlightColo r; } 914 Color tapHighlightColor() const { return rareInheritedData->tapHighlightColo r; }
916 #endif
917 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) 915 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
918 bool useTouchOverflowScrolling() const { return rareInheritedData->useTouchO verflowScrolling; } 916 bool useTouchOverflowScrolling() const { return rareInheritedData->useTouchO verflowScrolling; }
919 #endif 917 #endif
920 ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareI nheritedData->textSecurity); } 918 ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareI nheritedData->textSecurity); }
921 919
922 WritingMode writingMode() const { return static_cast<WritingMode>(inherited_ flags.m_writingMode); } 920 WritingMode writingMode() const { return static_cast<WritingMode>(inherited_ flags.m_writingMode); }
923 bool isHorizontalWritingMode() const { return WebCore::isHorizontalWritingMo de(writingMode()); } 921 bool isHorizontalWritingMode() const { return WebCore::isHorizontalWritingMo de(writingMode()); }
924 bool isFlippedLinesWritingMode() const { return WebCore::isFlippedLinesWriti ngMode(writingMode()); } 922 bool isFlippedLinesWritingMode() const { return WebCore::isFlippedLinesWriti ngMode(writingMode()); }
925 bool isFlippedBlocksWritingMode() const { return WebCore::isFlippedBlocksWri tingMode(writingMode()); } 923 bool isFlippedBlocksWritingMode() const { return WebCore::isFlippedBlocksWri tingMode(writingMode()); }
926 924
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
1355 void setPerspectiveOriginX(Length l) { SET_VAR(rareNonInheritedData, m_persp ectiveOriginX, l); } 1353 void setPerspectiveOriginX(Length l) { SET_VAR(rareNonInheritedData, m_persp ectiveOriginX, l); }
1356 void setPerspectiveOriginY(Length l) { SET_VAR(rareNonInheritedData, m_persp ectiveOriginY, l); } 1354 void setPerspectiveOriginY(Length l) { SET_VAR(rareNonInheritedData, m_persp ectiveOriginY, l); }
1357 void setPageSize(LengthSize s) { SET_VAR(rareNonInheritedData, m_pageSize, s ); } 1355 void setPageSize(LengthSize s) { SET_VAR(rareNonInheritedData, m_pageSize, s ); }
1358 void setPageSizeType(PageSizeType t) { SET_VAR(rareNonInheritedData, m_pageS izeType, t); } 1356 void setPageSizeType(PageSizeType t) { SET_VAR(rareNonInheritedData, m_pageS izeType, t); }
1359 void resetPageSizeType() { SET_VAR(rareNonInheritedData, m_pageSizeType, PAG E_SIZE_AUTO); } 1357 void resetPageSizeType() { SET_VAR(rareNonInheritedData, m_pageSizeType, PAG E_SIZE_AUTO); }
1360 1358
1361 void setIsRunningAcceleratedAnimation(bool b = true) { SET_VAR(rareNonInheri tedData, m_runningAcceleratedAnimation, b); } 1359 void setIsRunningAcceleratedAnimation(bool b = true) { SET_VAR(rareNonInheri tedData, m_runningAcceleratedAnimation, b); }
1362 1360
1363 void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_line BoxContain, c); } 1361 void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_line BoxContain, c); }
1364 void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClam p, c); } 1362 void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClam p, c); }
1365 #if ENABLE(TOUCH_EVENTS)
1366 void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHi ghlightColor, c); } 1363 void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHi ghlightColor, c); }
1367 #endif
1368 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) 1364 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
1369 void setUseTouchOverflowScrolling(bool v) { SET_VAR(rareInheritedData, useTo uchOverflowScrolling, v); } 1365 void setUseTouchOverflowScrolling(bool v) { SET_VAR(rareInheritedData, useTo uchOverflowScrolling, v); }
1370 #endif 1366 #endif
1371 void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedDat a, textSecurity, aTextSecurity); } 1367 void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedDat a, textSecurity, aTextSecurity); }
1372 1368
1373 #if ENABLE(SVG) 1369 #if ENABLE(SVG)
1374 const SVGRenderStyle* svgStyle() const { return m_svgStyle.get(); } 1370 const SVGRenderStyle* svgStyle() const { return m_svgStyle.get(); }
1375 SVGRenderStyle* accessSVGStyle() { return m_svgStyle.access(); } 1371 SVGRenderStyle* accessSVGStyle() { return m_svgStyle.access(); }
1376 1372
1377 const SVGPaint::SVGPaintType& fillPaintType() const { return svgStyle()->fil lPaintType(); } 1373 const SVGPaint::SVGPaintType& fillPaintType() const { return svgStyle()->fil lPaintType(); }
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1677 static const AtomicString& initialFlowThread() { return nullAtom; } 1673 static const AtomicString& initialFlowThread() { return nullAtom; }
1678 static const AtomicString& initialRegionThread() { return nullAtom; } 1674 static const AtomicString& initialRegionThread() { return nullAtom; }
1679 static RegionOverflow initialRegionOverflow() { return AutoRegionOverflow; } 1675 static RegionOverflow initialRegionOverflow() { return AutoRegionOverflow; }
1680 1676
1681 static WrapFlow initialWrapFlow() { return WrapFlowAuto; } 1677 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
1682 static WrapThrough initialWrapThrough() { return WrapThroughWrap; } 1678 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
1683 1679
1684 // Keep these at the end. 1680 // Keep these at the end.
1685 static LineClampValue initialLineClamp() { return LineClampValue(); } 1681 static LineClampValue initialLineClamp() { return LineClampValue(); }
1686 static ETextSecurity initialTextSecurity() { return TSNONE; } 1682 static ETextSecurity initialTextSecurity() { return TSNONE; }
1687 #if ENABLE(TOUCH_EVENTS)
1688 static Color initialTapHighlightColor(); 1683 static Color initialTapHighlightColor();
1689 #endif
1690 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) 1684 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
1691 static bool initialUseTouchOverflowScrolling() { return false; } 1685 static bool initialUseTouchOverflowScrolling() { return false; }
1692 #endif 1686 #endif
1693 #if ENABLE(CSS_FILTERS) 1687 #if ENABLE(CSS_FILTERS)
1694 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; } 1688 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; }
1695 #endif 1689 #endif
1696 #if ENABLE(CSS_COMPOSITING) 1690 #if ENABLE(CSS_COMPOSITING)
1697 static BlendMode initialBlendMode() { return BlendModeNormal; } 1691 static BlendMode initialBlendMode() { return BlendModeNormal; }
1698 #endif 1692 #endif
1699 private: 1693 private:
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1825 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1819 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1826 return false; 1820 return false;
1827 1821
1828 rareInheritedData.access()->m_textOrientation = textOrientation; 1822 rareInheritedData.access()->m_textOrientation = textOrientation;
1829 return true; 1823 return true;
1830 } 1824 }
1831 1825
1832 } // namespace WebCore 1826 } // namespace WebCore
1833 1827
1834 #endif // RenderStyle_h 1828 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumSkia.h ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698