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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 371443003: Merge .in files for css/svg properties into a single file (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cascade
Patch Set: Created 6 years, 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 699
700 if (state.style()->hasViewportUnits()) 700 if (state.style()->hasViewportUnits())
701 document().setHasViewportUnits(); 701 document().setHasViewportUnits();
702 702
703 // Now return the style. 703 // Now return the style.
704 return state.takeStyle(); 704 return state.takeStyle();
705 } 705 }
706 706
707 // FIXME: Consider refactoring to create a new class which owns the following 707 // FIXME: Consider refactoring to create a new class which owns the following
708 // first/last/range properties. 708 // first/last/range properties.
709 // c.f. //src/third_party/WebKit/Source/core/css/CSSPropertyNames.in. 709 // c.f. //src/third_party/WebKit/Source/core/css/CSSProperties.in.
710 710
711 template<> CSSPropertyID StyleResolver::firstCSSPropertyId<StyleResolver::HighPr iorityProperties>() 711 template<> CSSPropertyID StyleResolver::firstCSSPropertyId<StyleResolver::HighPr iorityProperties>()
712 { 712 {
713 COMPILE_ASSERT(CSSPropertyColor == firstCSSProperty, CSS_color_is_first_high _priority_property); 713 COMPILE_ASSERT(CSSPropertyColor == firstCSSProperty, CSS_color_is_first_high _priority_property);
714 return CSSPropertyColor; 714 return CSSPropertyColor;
715 } 715 }
716 716
717 template<> CSSPropertyID StyleResolver::lastCSSPropertyId<StyleResolver::HighPri orityProperties>() 717 template<> CSSPropertyID StyleResolver::lastCSSPropertyId<StyleResolver::HighPri orityProperties>()
718 { 718 {
719 return CSSPropertyZoom; 719 return CSSPropertyZoom;
720 } 720 }
721 721
722 template<> CSSPropertyID StyleResolver::firstCSSPropertyId<StyleResolver::LowPri orityProperties>() 722 template<> CSSPropertyID StyleResolver::firstCSSPropertyId<StyleResolver::LowPri orityProperties>()
723 { 723 {
724 COMPILE_ASSERT(CSSPropertyBackground == CSSPropertyZoom + 1, CSS_background_ is_first_low_priority_property); 724 COMPILE_ASSERT(CSSPropertyWebkitBorderImage == CSSPropertyZoom + 1, CSS_webk it_border_image_is_first_low_priority_property);
725 return CSSPropertyBackground; 725 return CSSPropertyWebkitBorderImage;
726 } 726 }
727 727
728 template<> CSSPropertyID StyleResolver::lastCSSPropertyId<StyleResolver::LowPrio rityProperties>() 728 template<> CSSPropertyID StyleResolver::lastCSSPropertyId<StyleResolver::LowPrio rityProperties>()
729 { 729 {
730 return static_cast<CSSPropertyID>(lastCSSProperty); 730 return static_cast<CSSPropertyID>(lastCSSProperty);
731 } 731 }
732 732
733 template <StyleResolver::StyleApplicationPass pass> 733 template <StyleResolver::StyleApplicationPass pass>
734 bool StyleResolver::isPropertyForPass(CSSPropertyID property) 734 bool StyleResolver::isPropertyForPass(CSSPropertyID property)
735 { 735 {
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
1285 visitor->trace(m_viewportStyleResolver); 1285 visitor->trace(m_viewportStyleResolver);
1286 visitor->trace(m_features); 1286 visitor->trace(m_features);
1287 visitor->trace(m_siblingRuleSet); 1287 visitor->trace(m_siblingRuleSet);
1288 visitor->trace(m_uncommonAttributeRuleSet); 1288 visitor->trace(m_uncommonAttributeRuleSet);
1289 visitor->trace(m_watchedSelectorsRules); 1289 visitor->trace(m_watchedSelectorsRules);
1290 visitor->trace(m_treeBoundaryCrossingRules); 1290 visitor->trace(m_treeBoundaryCrossingRules);
1291 visitor->trace(m_pendingStyleSheets); 1291 visitor->trace(m_pendingStyleSheets);
1292 } 1292 }
1293 1293
1294 } // namespace WebCore 1294 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698