third_party/WebKit/Source/core/style/ComputedStyle.h - Issue 1855203002: Revert of Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects.

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 1855203002: Revert of Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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 | « third_party/WebKit/Source/core/loader/ImageLoader.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

OLD	NEW
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 1834 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1845 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }	1845 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }

1846 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }	1846 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }

1847	1847

1848 static QuotesData* initialQuotes() { return 0; }	1848 static QuotesData* initialQuotes() { return 0; }

1849	1849

1850 // Keep these at the end.	1850 // Keep these at the end.

1851 // FIXME: Why? Seems these should all be one big sorted list.	1851 // FIXME: Why? Seems these should all be one big sorted list.

1852 static LineClampValue initialLineClamp() { return LineClampValue(); }	1852 static LineClampValue initialLineClamp() { return LineClampValue(); }

1853 static ETextSecurity initialTextSecurity() { return TSNONE; }	1853 static ETextSecurity initialTextSecurity() { return TSNONE; }

1854 static Color initialTapHighlightColor();	1854 static Color initialTapHighlightColor();

	1855 #if ENABLE(OILPAN)

1855 static const FilterOperations& initialFilter();	1856 static const FilterOperations& initialFilter();

1856 static const FilterOperations& initialBackdropFilter();	1857 static const FilterOperations& initialBackdropFilter();

	1858 #else

	1859 static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterO perations, ops, ()); return ops; }

	1860 static const FilterOperations& initialBackdropFilter() { DEFINE_STATIC_LOCAL (FilterOperations, ops, ()); return ops; }

	1861 #endif

1857 static WebBlendMode initialBlendMode() { return WebBlendModeNormal; }	1862 static WebBlendMode initialBlendMode() { return WebBlendModeNormal; }

1858 static EIsolation initialIsolation() { return IsolationAuto; }	1863 static EIsolation initialIsolation() { return IsolationAuto; }

1859 private:	1864 private:

1860 void setVisitedLinkColor(const Color&);	1865 void setVisitedLinkColor(const Color&);

1861 void setVisitedLinkBackgroundColor(const StyleColor& v) { SET_VAR(rareNonInh eritedData, m_visitedLinkBackgroundColor, v); }	1866 void setVisitedLinkBackgroundColor(const StyleColor& v) { SET_VAR(rareNonInh eritedData, m_visitedLinkBackgroundColor, v); }

1862 void setVisitedLinkBorderLeftColor(const StyleColor& v) { SET_VAR(rareNonInh eritedData, m_visitedLinkBorderLeftColor, v); }	1867 void setVisitedLinkBorderLeftColor(const StyleColor& v) { SET_VAR(rareNonInh eritedData, m_visitedLinkBorderLeftColor, v); }

1863 void setVisitedLinkBorderRightColor(const StyleColor& v) { SET_VAR(rareNonIn heritedData, m_visitedLinkBorderRightColor, v); }	1868 void setVisitedLinkBorderRightColor(const StyleColor& v) { SET_VAR(rareNonIn heritedData, m_visitedLinkBorderRightColor, v); }

1864 void setVisitedLinkBorderBottomColor(const StyleColor& v) { SET_VAR(rareNonI nheritedData, m_visitedLinkBorderBottomColor, v); }	1869 void setVisitedLinkBorderBottomColor(const StyleColor& v) { SET_VAR(rareNonI nheritedData, m_visitedLinkBorderBottomColor, v); }

1865 void setVisitedLinkBorderTopColor(const StyleColor& v) { SET_VAR(rareNonInhe ritedData, m_visitedLinkBorderTopColor, v); }	1870 void setVisitedLinkBorderTopColor(const StyleColor& v) { SET_VAR(rareNonInhe ritedData, m_visitedLinkBorderTopColor, v); }

1866 void setVisitedLinkOutlineColor(const StyleColor& v) { SET_VAR(rareNonInheri tedData, m_visitedLinkOutlineColor, v); }	1871 void setVisitedLinkOutlineColor(const StyleColor& v) { SET_VAR(rareNonInheri tedData, m_visitedLinkOutlineColor, v); }

(...skipping 179 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2046 }	2051 }

2047	2052

2048 inline bool ComputedStyle::hasPseudoElementStyle() const	2053 inline bool ComputedStyle::hasPseudoElementStyle() const

2049 {	2054 {

2050 return noninherited_flags.pseudoBits & ElementPseudoIdMask;	2055 return noninherited_flags.pseudoBits & ElementPseudoIdMask;

2051 }	2056 }

2052	2057

2053 } // namespace blink	2058 } // namespace blink

2054	2059

2055 #endif // ComputedStyle_h	2060 #endif // ComputedStyle_h

OLD	NEW