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

Side by Side Diff: WebCore/rendering/style/RenderStyle.h

Issue 14295007: Remove the CSS_COMPOSITING define, the CSS blending and compositing (Closed) Base URL: http://src.chromium.org/blink/trunk/Source/
Patch Set: 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
« no previous file with comments | « WebCore/rendering/RenderObject.h ('k') | WebCore/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 928 matching lines...) Expand 10 before | Expand all | Expand 10 after
939 ESpeak speak() const { return static_cast<ESpeak>(rareInheritedData->speak); } 939 ESpeak speak() const { return static_cast<ESpeak>(rareInheritedData->speak); }
940 940
941 #if ENABLE(CSS_FILTERS) 941 #if ENABLE(CSS_FILTERS)
942 FilterOperations& mutableFilter() { return rareNonInheritedData.access()->m_ filter.access()->m_operations; } 942 FilterOperations& mutableFilter() { return rareNonInheritedData.access()->m_ filter.access()->m_operations; }
943 const FilterOperations& filter() const { return rareNonInheritedData->m_filt er->m_operations; } 943 const FilterOperations& filter() const { return rareNonInheritedData->m_filt er->m_operations; }
944 bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operation s.operations().isEmpty(); } 944 bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operation s.operations().isEmpty(); }
945 #else 945 #else
946 bool hasFilter() const { return false; } 946 bool hasFilter() const { return false; }
947 #endif 947 #endif
948 948
949 #if ENABLE(CSS_COMPOSITING)
950 BlendMode blendMode() const { return static_cast<BlendMode>(rareNonInherited Data->m_effectiveBlendMode); } 949 BlendMode blendMode() const { return static_cast<BlendMode>(rareNonInherited Data->m_effectiveBlendMode); }
951 void setBlendMode(BlendMode v) { rareNonInheritedData.access()->m_effectiveB lendMode = v; } 950 void setBlendMode(BlendMode v) { rareNonInheritedData.access()->m_effectiveB lendMode = v; }
952 bool hasBlendMode() const { return static_cast<BlendMode>(rareNonInheritedDa ta->m_effectiveBlendMode) != BlendModeNormal; } 951 bool hasBlendMode() const { return static_cast<BlendMode>(rareNonInheritedDa ta->m_effectiveBlendMode) != BlendModeNormal; }
953 #else
954 bool hasBlendMode() const { return false; }
955 #endif
956 952
957 #if USE(RTL_SCROLLBAR) 953 #if USE(RTL_SCROLLBAR)
958 bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return !isLef tToRightDirection() && isHorizontalWritingMode(); } 954 bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return !isLef tToRightDirection() && isHorizontalWritingMode(); }
959 #else 955 #else
960 bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return false; } 956 bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return false; }
961 #endif 957 #endif
962 958
963 // attribute setter methods 959 // attribute setter methods
964 960
965 void setDisplay(EDisplay v) { noninherited_flags._effectiveDisplay = v; } 961 void setDisplay(EDisplay v) { noninherited_flags._effectiveDisplay = v; }
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
1702 static ETextSecurity initialTextSecurity() { return TSNONE; } 1698 static ETextSecurity initialTextSecurity() { return TSNONE; }
1703 #if ENABLE(TOUCH_EVENTS) 1699 #if ENABLE(TOUCH_EVENTS)
1704 static Color initialTapHighlightColor(); 1700 static Color initialTapHighlightColor();
1705 #endif 1701 #endif
1706 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) 1702 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
1707 static bool initialUseTouchOverflowScrolling() { return false; } 1703 static bool initialUseTouchOverflowScrolling() { return false; }
1708 #endif 1704 #endif
1709 #if ENABLE(CSS_FILTERS) 1705 #if ENABLE(CSS_FILTERS)
1710 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; } 1706 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; }
1711 #endif 1707 #endif
1712 #if ENABLE(CSS_COMPOSITING)
1713 static BlendMode initialBlendMode() { return BlendModeNormal; } 1708 static BlendMode initialBlendMode() { return BlendModeNormal; }
1714 #endif
1715 private: 1709 private:
1716 void setVisitedLinkColor(const Color&); 1710 void setVisitedLinkColor(const Color&);
1717 void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBackgroundColor, v); } 1711 void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBackgroundColor, v); }
1718 void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBorderLeftColor, v); } 1712 void setVisitedLinkBorderLeftColor(const Color& v) { SET_VAR(rareNonInherite dData, m_visitedLinkBorderLeftColor, v); }
1719 void setVisitedLinkBorderRightColor(const Color& v) { SET_VAR(rareNonInherit edData, m_visitedLinkBorderRightColor, v); } 1713 void setVisitedLinkBorderRightColor(const Color& v) { SET_VAR(rareNonInherit edData, m_visitedLinkBorderRightColor, v); }
1720 void setVisitedLinkBorderBottomColor(const Color& v) { SET_VAR(rareNonInheri tedData, m_visitedLinkBorderBottomColor, v); } 1714 void setVisitedLinkBorderBottomColor(const Color& v) { SET_VAR(rareNonInheri tedData, m_visitedLinkBorderBottomColor, v); }
1721 void setVisitedLinkBorderTopColor(const Color& v) { SET_VAR(rareNonInherited Data, m_visitedLinkBorderTopColor, v); } 1715 void setVisitedLinkBorderTopColor(const Color& v) { SET_VAR(rareNonInherited Data, m_visitedLinkBorderTopColor, v); }
1722 void setVisitedLinkOutlineColor(const Color& v) { SET_VAR(rareNonInheritedDa ta, m_visitedLinkOutlineColor, v); } 1716 void setVisitedLinkOutlineColor(const Color& v) { SET_VAR(rareNonInheritedDa ta, m_visitedLinkOutlineColor, v); }
1723 void setVisitedLinkColumnRuleColor(const Color& v) { SET_VAR(rareNonInherite dData.access()->m_multiCol, m_visitedLinkColumnRuleColor, v); } 1717 void setVisitedLinkColumnRuleColor(const Color& v) { SET_VAR(rareNonInherite dData.access()->m_multiCol, m_visitedLinkColumnRuleColor, v); }
1724 #if ENABLE(CSS3_TEXT) 1718 #if ENABLE(CSS3_TEXT)
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1841 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1835 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1842 return false; 1836 return false;
1843 1837
1844 rareInheritedData.access()->m_textOrientation = textOrientation; 1838 rareInheritedData.access()->m_textOrientation = textOrientation;
1845 return true; 1839 return true;
1846 } 1840 }
1847 1841
1848 } // namespace WebCore 1842 } // namespace WebCore
1849 1843
1850 #endif // RenderStyle_h 1844 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « WebCore/rendering/RenderObject.h ('k') | WebCore/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698