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

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

Issue 16404015: Unprefix -webkit-min-content and -webkit-max-content for grid layout (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebaselined change Created 7 years, 6 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
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | no next file » | 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) 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 2164 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 // width/height/border/padding/... from the RenderStyle -> for SVG these values would never scale, 2175 // width/height/border/padding/... from the RenderStyle -> for SVG these values would never scale,
2176 // if we'd pass a 1.0 zoom factor everyhwere. So we only pass a zoom factor of 1 .0 for specific 2176 // if we'd pass a 1.0 zoom factor everyhwere. So we only pass a zoom factor of 1 .0 for specific
2177 // properties that are NOT allowed to scale within a zoomed SVG document (letter /word-spacing/font-size). 2177 // properties that are NOT allowed to scale within a zoomed SVG document (letter /word-spacing/font-size).
2178 bool StyleResolver::useSVGZoomRules() 2178 bool StyleResolver::useSVGZoomRules()
2179 { 2179 {
2180 return m_state.element() && m_state.element()->isSVGElement(); 2180 return m_state.element() && m_state.element()->isSVGElement();
2181 } 2181 }
2182 2182
2183 static bool createGridTrackBreadth(CSSPrimitiveValue* primitiveValue, const Styl eResolverState& state, GridLength& workingLength) 2183 static bool createGridTrackBreadth(CSSPrimitiveValue* primitiveValue, const Styl eResolverState& state, GridLength& workingLength)
2184 { 2184 {
2185 if (primitiveValue->getValueID() == CSSValueWebkitMinContent) { 2185 if (primitiveValue->getValueID() == CSSValueMinContent) {
2186 workingLength = Length(MinContent); 2186 workingLength = Length(MinContent);
2187 return true; 2187 return true;
2188 } 2188 }
2189 2189
2190 if (primitiveValue->getValueID() == CSSValueWebkitMaxContent) { 2190 if (primitiveValue->getValueID() == CSSValueMaxContent) {
2191 workingLength = Length(MaxContent); 2191 workingLength = Length(MaxContent);
2192 return true; 2192 return true;
2193 } 2193 }
2194 2194
2195 if (primitiveValue->isFlex()) { 2195 if (primitiveValue->isFlex()) {
2196 // Fractional unit. 2196 // Fractional unit.
2197 workingLength.setFlex(primitiveValue->getFloatValue()); 2197 workingLength.setFlex(primitiveValue->getFloatValue());
2198 return true; 2198 return true;
2199 } 2199 }
2200 2200
(...skipping 1489 matching lines...) Expand 10 before | Expand all | Expand 10 after
3690 info.addMember(m_state, "state"); 3690 info.addMember(m_state, "state");
3691 3691
3692 // FIXME: move this to a place where it would be called only once? 3692 // FIXME: move this to a place where it would be called only once?
3693 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle"); 3693 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle");
3694 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e"); 3694 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e");
3695 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" ); 3695 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" );
3696 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle"); 3696 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle");
3697 } 3697 }
3698 3698
3699 } // namespace WebCore 3699 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698