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

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: 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
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 2213 matching lines...) Expand 10 before | Expand all | Expand 10 after
2224 // width/height/border/padding/... from the RenderStyle -> for SVG these values would never scale, 2224 // width/height/border/padding/... from the RenderStyle -> for SVG these values would never scale,
2225 // if we'd pass a 1.0 zoom factor everyhwere. So we only pass a zoom factor of 1 .0 for specific 2225 // if we'd pass a 1.0 zoom factor everyhwere. So we only pass a zoom factor of 1 .0 for specific
2226 // properties that are NOT allowed to scale within a zoomed SVG document (letter /word-spacing/font-size). 2226 // properties that are NOT allowed to scale within a zoomed SVG document (letter /word-spacing/font-size).
2227 bool StyleResolver::useSVGZoomRules() 2227 bool StyleResolver::useSVGZoomRules()
2228 { 2228 {
2229 return m_state.element() && m_state.element()->isSVGElement(); 2229 return m_state.element() && m_state.element()->isSVGElement();
2230 } 2230 }
2231 2231
2232 static bool createGridTrackBreadth(CSSPrimitiveValue* primitiveValue, const Styl eResolverState& state, GridLength& workingLength) 2232 static bool createGridTrackBreadth(CSSPrimitiveValue* primitiveValue, const Styl eResolverState& state, GridLength& workingLength)
2233 { 2233 {
2234 if (primitiveValue->getValueID() == CSSValueWebkitMinContent) { 2234 if (primitiveValue->getValueID() == CSSValueMinContent) {
2235 workingLength = Length(MinContent); 2235 workingLength = Length(MinContent);
2236 return true; 2236 return true;
2237 } 2237 }
2238 2238
2239 if (primitiveValue->getValueID() == CSSValueWebkitMaxContent) { 2239 if (primitiveValue->getValueID() == CSSValueMaxContent) {
2240 workingLength = Length(MaxContent); 2240 workingLength = Length(MaxContent);
2241 return true; 2241 return true;
2242 } 2242 }
2243 2243
2244 if (primitiveValue->isFlex()) { 2244 if (primitiveValue->isFlex()) {
2245 // Fractional unit. 2245 // Fractional unit.
2246 workingLength.setFlex(primitiveValue->getFloatValue()); 2246 workingLength.setFlex(primitiveValue->getFloatValue());
2247 return true; 2247 return true;
2248 } 2248 }
2249 2249
(...skipping 1481 matching lines...) Expand 10 before | Expand all | Expand 10 after
3731 info.addMember(m_state, "state"); 3731 info.addMember(m_state, "state");
3732 3732
3733 // FIXME: move this to a place where it would be called only once? 3733 // FIXME: move this to a place where it would be called only once?
3734 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle"); 3734 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle");
3735 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e"); 3735 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e");
3736 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" ); 3736 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" );
3737 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle"); 3737 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle");
3738 } 3738 }
3739 3739
3740 } // namespace WebCore 3740 } // namespace WebCore
OLDNEW
« Source/core/css/CSSValueKeywords.in ('K') | « Source/core/css/CSSValueKeywords.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698