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

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

Issue 26588002: Remove support for -webkit-line-clamp Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Base files missing... Created 7 years, 2 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 24 matching lines...) Expand all
35 #include "core/platform/ThemeTypes.h" 35 #include "core/platform/ThemeTypes.h"
36 #include "core/platform/animation/CSSAnimationDataList.h" 36 #include "core/platform/animation/CSSAnimationDataList.h"
37 #include "core/platform/graphics/Color.h" 37 #include "core/platform/graphics/Color.h"
38 #include "core/platform/graphics/FontBaseline.h" 38 #include "core/platform/graphics/FontBaseline.h"
39 #include "core/platform/graphics/FontDescription.h" 39 #include "core/platform/graphics/FontDescription.h"
40 #include "core/platform/graphics/GraphicsTypes.h" 40 #include "core/platform/graphics/GraphicsTypes.h"
41 #include "core/platform/graphics/transforms/TransformOperations.h" 41 #include "core/platform/graphics/transforms/TransformOperations.h"
42 #include "core/rendering/style/BorderValue.h" 42 #include "core/rendering/style/BorderValue.h"
43 #include "core/rendering/style/CounterDirectives.h" 43 #include "core/rendering/style/CounterDirectives.h"
44 #include "core/rendering/style/DataRef.h" 44 #include "core/rendering/style/DataRef.h"
45 #include "core/rendering/style/LineClampValue.h"
46 #include "core/rendering/style/NinePieceImage.h" 45 #include "core/rendering/style/NinePieceImage.h"
47 #include "core/rendering/style/OutlineValue.h" 46 #include "core/rendering/style/OutlineValue.h"
48 #include "core/rendering/style/RenderStyleConstants.h" 47 #include "core/rendering/style/RenderStyleConstants.h"
49 #include "core/rendering/style/SVGRenderStyle.h" 48 #include "core/rendering/style/SVGRenderStyle.h"
50 #include "core/rendering/style/ShadowData.h" 49 #include "core/rendering/style/ShadowData.h"
51 #include "core/rendering/style/ShapeValue.h" 50 #include "core/rendering/style/ShapeValue.h"
52 #include "core/rendering/style/StyleBackgroundData.h" 51 #include "core/rendering/style/StyleBackgroundData.h"
53 #include "core/rendering/style/StyleBoxData.h" 52 #include "core/rendering/style/StyleBoxData.h"
54 #include "core/rendering/style/StyleDeprecatedFlexibleBoxData.h" 53 #include "core/rendering/style/StyleDeprecatedFlexibleBoxData.h"
55 #include "core/rendering/style/StyleFilterData.h" 54 #include "core/rendering/style/StyleFilterData.h"
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 bool hasPerspective() const { return rareNonInheritedData->m_perspective > 0 ; } 880 bool hasPerspective() const { return rareNonInheritedData->m_perspective > 0 ; }
882 Length perspectiveOriginX() const { return rareNonInheritedData->m_perspecti veOriginX; } 881 Length perspectiveOriginX() const { return rareNonInheritedData->m_perspecti veOriginX; }
883 Length perspectiveOriginY() const { return rareNonInheritedData->m_perspecti veOriginY; } 882 Length perspectiveOriginY() const { return rareNonInheritedData->m_perspecti veOriginY; }
884 LengthSize pageSize() const { return rareNonInheritedData->m_pageSize; } 883 LengthSize pageSize() const { return rareNonInheritedData->m_pageSize; }
885 PageSizeType pageSizeType() const { return static_cast<PageSizeType>(rareNon InheritedData->m_pageSizeType); } 884 PageSizeType pageSizeType() const { return static_cast<PageSizeType>(rareNon InheritedData->m_pageSizeType); }
886 885
887 // When set, this ensures that styles compare as different. Used during acce lerated animations. 886 // When set, this ensures that styles compare as different. Used during acce lerated animations.
888 bool isRunningAcceleratedAnimation() const { return rareNonInheritedData->m_ runningAcceleratedAnimation; } 887 bool isRunningAcceleratedAnimation() const { return rareNonInheritedData->m_ runningAcceleratedAnimation; }
889 888
890 LineBoxContain lineBoxContain() const { return rareInheritedData->m_lineBoxC ontain; } 889 LineBoxContain lineBoxContain() const { return rareInheritedData->m_lineBoxC ontain; }
891 const LineClampValue& lineClamp() const { return rareNonInheritedData->lineC lamp; }
892 Color tapHighlightColor() const { return rareInheritedData->tapHighlightColo r; } 890 Color tapHighlightColor() const { return rareInheritedData->tapHighlightColo r; }
893 ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareI nheritedData->textSecurity); } 891 ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareI nheritedData->textSecurity); }
894 892
895 WritingMode writingMode() const { return static_cast<WritingMode>(inherited_ flags.m_writingMode); } 893 WritingMode writingMode() const { return static_cast<WritingMode>(inherited_ flags.m_writingMode); }
896 bool isHorizontalWritingMode() const { return WebCore::isHorizontalWritingMo de(writingMode()); } 894 bool isHorizontalWritingMode() const { return WebCore::isHorizontalWritingMo de(writingMode()); }
897 bool isFlippedLinesWritingMode() const { return WebCore::isFlippedLinesWriti ngMode(writingMode()); } 895 bool isFlippedLinesWritingMode() const { return WebCore::isFlippedLinesWriti ngMode(writingMode()); }
898 bool isFlippedBlocksWritingMode() const { return WebCore::isFlippedBlocksWri tingMode(writingMode()); } 896 bool isFlippedBlocksWritingMode() const { return WebCore::isFlippedBlocksWri tingMode(writingMode()); }
899 897
900 EImageRendering imageRendering() const { return static_cast<EImageRendering> (rareInheritedData->m_imageRendering); } 898 EImageRendering imageRendering() const { return static_cast<EImageRendering> (rareInheritedData->m_imageRendering); }
901 899
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
1312 void setPerspective(float p) { SET_VAR(rareNonInheritedData, m_perspective, p); } 1310 void setPerspective(float p) { SET_VAR(rareNonInheritedData, m_perspective, p); }
1313 void setPerspectiveOriginX(Length l) { SET_VAR(rareNonInheritedData, m_persp ectiveOriginX, l); } 1311 void setPerspectiveOriginX(Length l) { SET_VAR(rareNonInheritedData, m_persp ectiveOriginX, l); }
1314 void setPerspectiveOriginY(Length l) { SET_VAR(rareNonInheritedData, m_persp ectiveOriginY, l); } 1312 void setPerspectiveOriginY(Length l) { SET_VAR(rareNonInheritedData, m_persp ectiveOriginY, l); }
1315 void setPageSize(LengthSize s) { SET_VAR(rareNonInheritedData, m_pageSize, s ); } 1313 void setPageSize(LengthSize s) { SET_VAR(rareNonInheritedData, m_pageSize, s ); }
1316 void setPageSizeType(PageSizeType t) { SET_VAR(rareNonInheritedData, m_pageS izeType, t); } 1314 void setPageSizeType(PageSizeType t) { SET_VAR(rareNonInheritedData, m_pageS izeType, t); }
1317 void resetPageSizeType() { SET_VAR(rareNonInheritedData, m_pageSizeType, PAG E_SIZE_AUTO); } 1315 void resetPageSizeType() { SET_VAR(rareNonInheritedData, m_pageSizeType, PAG E_SIZE_AUTO); }
1318 1316
1319 void setIsRunningAcceleratedAnimation(bool b = true) { SET_VAR(rareNonInheri tedData, m_runningAcceleratedAnimation, b); } 1317 void setIsRunningAcceleratedAnimation(bool b = true) { SET_VAR(rareNonInheri tedData, m_runningAcceleratedAnimation, b); }
1320 1318
1321 void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_line BoxContain, c); } 1319 void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_line BoxContain, c); }
1322 void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClam p, c); }
1323 void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHi ghlightColor, c); } 1320 void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHi ghlightColor, c); }
1324 void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedDat a, textSecurity, aTextSecurity); } 1321 void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedDat a, textSecurity, aTextSecurity); }
1325 void setTouchAction(TouchAction t) { SET_VAR(rareNonInheritedData, m_touchAc tion, t); } 1322 void setTouchAction(TouchAction t) { SET_VAR(rareNonInheritedData, m_touchAc tion, t); }
1326 1323
1327 const SVGRenderStyle* svgStyle() const { return m_svgStyle.get(); } 1324 const SVGRenderStyle* svgStyle() const { return m_svgStyle.get(); }
1328 SVGRenderStyle* accessSVGStyle() { return m_svgStyle.access(); } 1325 SVGRenderStyle* accessSVGStyle() { return m_svgStyle.access(); }
1329 1326
1330 const SVGPaint::SVGPaintType& fillPaintType() const { return svgStyle()->fil lPaintType(); } 1327 const SVGPaint::SVGPaintType& fillPaintType() const { return svgStyle()->fil lPaintType(); }
1331 Color fillPaintColor() const { return svgStyle()->fillPaintColor(); } 1328 Color fillPaintColor() const { return svgStyle()->fillPaintColor(); }
1332 void setFillPaintColor(const Color& c) { accessSVGStyle()->setFillPaint(SVGP aint::SVG_PAINTTYPE_RGBCOLOR, c, ""); } 1329 void setFillPaintColor(const Color& c) { accessSVGStyle()->setFillPaint(SVGP aint::SVG_PAINTTYPE_RGBCOLOR, c, ""); }
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
1646 static const AtomicString& initialRegionThread() { return nullAtom; } 1643 static const AtomicString& initialRegionThread() { return nullAtom; }
1647 static RegionFragment initialRegionFragment() { return AutoRegionFragment; } 1644 static RegionFragment initialRegionFragment() { return AutoRegionFragment; }
1648 1645
1649 static WrapFlow initialWrapFlow() { return WrapFlowAuto; } 1646 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
1650 static WrapThrough initialWrapThrough() { return WrapThroughWrap; } 1647 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
1651 1648
1652 static QuotesData* initialQuotes() { return 0; } 1649 static QuotesData* initialQuotes() { return 0; }
1653 1650
1654 // Keep these at the end. 1651 // Keep these at the end.
1655 // FIXME: Why? Seems these should all be one big sorted list. 1652 // FIXME: Why? Seems these should all be one big sorted list.
1656 static LineClampValue initialLineClamp() { return LineClampValue(); }
1657 static ETextSecurity initialTextSecurity() { return TSNONE; } 1653 static ETextSecurity initialTextSecurity() { return TSNONE; }
1658 static Color initialTapHighlightColor(); 1654 static Color initialTapHighlightColor();
1659 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; } 1655 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; }
1660 static BlendMode initialBlendMode() { return BlendModeNormal; } 1656 static BlendMode initialBlendMode() { return BlendModeNormal; }
1661 static EIsolation initialIsolation() { return IsolationAuto; } 1657 static EIsolation initialIsolation() { return IsolationAuto; }
1662 private: 1658 private:
1663 void setVisitedLinkColor(const Color&); 1659 void setVisitedLinkColor(const Color&);
1664 void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBackgroundColor, v); } 1660 void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBackgroundColor, v); }
1665 void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBorderLeftColor, v); } 1661 void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBorderLeftColor, v); }
1666 void setVisitedLinkBorderRightColor(const Color& v) { SET_VAR(rareNonInherit edData, m_visitedLinkBorderRightColor, v); } 1662 void setVisitedLinkBorderRightColor(const Color& v) { SET_VAR(rareNonInherit edData, m_visitedLinkBorderRightColor, v); }
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1782 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1778 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1783 return false; 1779 return false;
1784 1780
1785 rareInheritedData.access()->m_textOrientation = textOrientation; 1781 rareInheritedData.access()->m_textOrientation = textOrientation;
1786 return true; 1782 return true;
1787 } 1783 }
1788 1784
1789 } // namespace WebCore 1785 } // namespace WebCore
1790 1786
1791 #endif // RenderStyle_h 1787 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/LineClampValue.h ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698