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

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

Issue 15012010: Remove the CSS_COMPOSITING define, leaving the implementation under the runtime flag, since runtime… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: removed bogus test Created 7 years, 7 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/RenderObject.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 894 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 bool isFlippedBlocksWritingMode() const { return WebCore::isFlippedBlocksWri tingMode(writingMode()); } 905 bool isFlippedBlocksWritingMode() const { return WebCore::isFlippedBlocksWri tingMode(writingMode()); }
906 906
907 EImageRendering imageRendering() const { return static_cast<EImageRendering> (rareInheritedData->m_imageRendering); } 907 EImageRendering imageRendering() const { return static_cast<EImageRendering> (rareInheritedData->m_imageRendering); }
908 908
909 ESpeak speak() const { return static_cast<ESpeak>(rareInheritedData->speak); } 909 ESpeak speak() const { return static_cast<ESpeak>(rareInheritedData->speak); }
910 910
911 FilterOperations& mutableFilter() { return rareNonInheritedData.access()->m_ filter.access()->m_operations; } 911 FilterOperations& mutableFilter() { return rareNonInheritedData.access()->m_ filter.access()->m_operations; }
912 const FilterOperations& filter() const { return rareNonInheritedData->m_filt er->m_operations; } 912 const FilterOperations& filter() const { return rareNonInheritedData->m_filt er->m_operations; }
913 bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operation s.operations().isEmpty(); } 913 bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operation s.operations().isEmpty(); }
914 914
915 #if ENABLE(CSS_COMPOSITING) 915 BlendMode blendMode() const;
916 BlendMode blendMode() const { return static_cast<BlendMode>(rareNonInherited Data->m_effectiveBlendMode); } 916 void setBlendMode(BlendMode v);
917 void setBlendMode(BlendMode v) { rareNonInheritedData.access()->m_effectiveB lendMode = v; } 917 bool hasBlendMode() const;
918 bool hasBlendMode() const { return static_cast<BlendMode>(rareNonInheritedDa ta->m_effectiveBlendMode) != BlendModeNormal; }
919 #else
920 bool hasBlendMode() const { return false; }
921 #endif
922 918
923 bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return !isLef tToRightDirection() && isHorizontalWritingMode(); } 919 bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return !isLef tToRightDirection() && isHorizontalWritingMode(); }
924 920
925 // attribute setter methods 921 // attribute setter methods
926 922
927 void setDisplay(EDisplay v) { noninherited_flags._effectiveDisplay = v; } 923 void setDisplay(EDisplay v) { noninherited_flags._effectiveDisplay = v; }
928 void setOriginalDisplay(EDisplay v) { noninherited_flags._originalDisplay = v; } 924 void setOriginalDisplay(EDisplay v) { noninherited_flags._originalDisplay = v; }
929 void setPosition(EPosition v) { noninherited_flags._position = v; } 925 void setPosition(EPosition v) { noninherited_flags._position = v; }
930 void setFloating(EFloat v) { noninherited_flags._floating = v; } 926 void setFloating(EFloat v) { noninherited_flags._floating = v; }
931 927
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
1645 static WrapThrough initialWrapThrough() { return WrapThroughWrap; } 1641 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
1646 1642
1647 // Keep these at the end. 1643 // Keep these at the end.
1648 static LineClampValue initialLineClamp() { return LineClampValue(); } 1644 static LineClampValue initialLineClamp() { return LineClampValue(); }
1649 static ETextSecurity initialTextSecurity() { return TSNONE; } 1645 static ETextSecurity initialTextSecurity() { return TSNONE; }
1650 static Color initialTapHighlightColor(); 1646 static Color initialTapHighlightColor();
1651 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) 1647 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
1652 static bool initialUseTouchOverflowScrolling() { return false; } 1648 static bool initialUseTouchOverflowScrolling() { return false; }
1653 #endif 1649 #endif
1654 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; } 1650 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; }
1655 #if ENABLE(CSS_COMPOSITING)
1656 static BlendMode initialBlendMode() { return BlendModeNormal; } 1651 static BlendMode initialBlendMode() { return BlendModeNormal; }
1657 #endif
1658 private: 1652 private:
1659 void setVisitedLinkColor(const Color&); 1653 void setVisitedLinkColor(const Color&);
1660 void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBackgroundColor, v); } 1654 void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBackgroundColor, v); }
1661 void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBorderLeftColor, v); } 1655 void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBorderLeftColor, v); }
1662 void setVisitedLinkBorderRightColor(const Color& v) { SET_VAR(rareNonInherit edData, m_visitedLinkBorderRightColor, v); } 1656 void setVisitedLinkBorderRightColor(const Color& v) { SET_VAR(rareNonInherit edData, m_visitedLinkBorderRightColor, v); }
1663 void setVisitedLinkBorderBottomColor(const Color& v) { SET_VAR(rareNonInheri tedData, m_visitedLinkBorderBottomColor, v); } 1657 void setVisitedLinkBorderBottomColor(const Color& v) { SET_VAR(rareNonInheri tedData, m_visitedLinkBorderBottomColor, v); }
1664 void setVisitedLinkBorderTopColor(const Color& v) { SET_VAR(rareNonInherited Data, m_visitedLinkBorderTopColor, v); } 1658 void setVisitedLinkBorderTopColor(const Color& v) { SET_VAR(rareNonInherited Data, m_visitedLinkBorderTopColor, v); }
1665 void setVisitedLinkOutlineColor(const Color& v) { SET_VAR(rareNonInheritedDa ta, m_visitedLinkOutlineColor, v); } 1659 void setVisitedLinkOutlineColor(const Color& v) { SET_VAR(rareNonInheritedDa ta, m_visitedLinkOutlineColor, v); }
1666 void setVisitedLinkColumnRuleColor(const Color& v) { SET_VAR(rareNonInherite dData.access()->m_multiCol, m_visitedLinkColumnRuleColor, v); } 1660 void setVisitedLinkColumnRuleColor(const Color& v) { SET_VAR(rareNonInherite dData.access()->m_multiCol, m_visitedLinkColumnRuleColor, v); }
1667 #if ENABLE(CSS3_TEXT) 1661 #if ENABLE(CSS3_TEXT)
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1784 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1778 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1785 return false; 1779 return false;
1786 1780
1787 rareInheritedData.access()->m_textOrientation = textOrientation; 1781 rareInheritedData.access()->m_textOrientation = textOrientation;
1788 return true; 1782 return true;
1789 } 1783 }
1790 1784
1791 } // namespace WebCore 1785 } // namespace WebCore
1792 1786
1793 #endif // RenderStyle_h 1787 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698