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

Side by Side Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 430333002: Do not expose auto as value of widows (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Set initial to 1 Created 6 years 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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
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 Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 2299 matching lines...) Expand 10 before | Expand all | Expand 10 after
2310 case LENGTH: 2310 case LENGTH:
2311 return zoomAdjustedPixelValueForLength(style->verticalAlignL ength(), *style); 2311 return zoomAdjustedPixelValueForLength(style->verticalAlignL ength(), *style);
2312 } 2312 }
2313 ASSERT_NOT_REACHED(); 2313 ASSERT_NOT_REACHED();
2314 return nullptr; 2314 return nullptr;
2315 case CSSPropertyVisibility: 2315 case CSSPropertyVisibility:
2316 return cssValuePool().createValue(style->visibility()); 2316 return cssValuePool().createValue(style->visibility());
2317 case CSSPropertyWhiteSpace: 2317 case CSSPropertyWhiteSpace:
2318 return cssValuePool().createValue(style->whiteSpace()); 2318 return cssValuePool().createValue(style->whiteSpace());
2319 case CSSPropertyWidows: 2319 case CSSPropertyWidows:
2320 if (style->hasAutoWidows())
2321 return cssValuePool().createIdentifierValue(CSSValueAuto);
2322 return cssValuePool().createValue(style->widows(), CSSPrimitiveValue ::CSS_NUMBER); 2320 return cssValuePool().createValue(style->widows(), CSSPrimitiveValue ::CSS_NUMBER);
2323 case CSSPropertyWidth: 2321 case CSSPropertyWidth:
2324 if (renderer) { 2322 if (renderer) {
2325 // According to http://www.w3.org/TR/CSS2/visudet.html#the-width -property, 2323 // According to http://www.w3.org/TR/CSS2/visudet.html#the-width -property,
2326 // the "width" property does not apply for non-replaced inline e lements. 2324 // the "width" property does not apply for non-replaced inline e lements.
2327 if (!renderer->isReplaced() && renderer->isInline()) 2325 if (!renderer->isReplaced() && renderer->isInline())
2328 return cssValuePool().createIdentifierValue(CSSValueAuto); 2326 return cssValuePool().createIdentifierValue(CSSValueAuto);
2329 return zoomAdjustedPixelValue(sizingBox(renderer).width(), *styl e); 2327 return zoomAdjustedPixelValue(sizingBox(renderer).width(), *styl e);
2330 } 2328 }
2331 return zoomAdjustedPixelValueForLength(style->width(), *style); 2329 return zoomAdjustedPixelValueForLength(style->width(), *style);
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
3063 return list.release(); 3061 return list.release();
3064 } 3062 }
3065 3063
3066 void CSSComputedStyleDeclaration::trace(Visitor* visitor) 3064 void CSSComputedStyleDeclaration::trace(Visitor* visitor)
3067 { 3065 {
3068 visitor->trace(m_node); 3066 visitor->trace(m_node);
3069 CSSStyleDeclaration::trace(visitor); 3067 CSSStyleDeclaration::trace(visitor);
3070 } 3068 }
3071 3069
3072 } // namespace blink 3070 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/svg/css/getComputedStyle-basic-expected.txt ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698