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

Side by Side Diff: Source/core/style/SVGComputedStyle.cpp

Issue 1241163002: dominant-baseline property should be inherited (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased Created 5 years, 4 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 | « Source/core/style/SVGComputedStyle.h ('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) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 2004, 2005, 2010 Rob Buis <buis@kde.org> 3 2004, 2005, 2010 Rob Buis <buis@kde.org>
4 Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 Copyright (C) Research In Motion Limited 2010. All rights reserved.
5 5
6 Based on khtml code by: 6 Based on khtml code by:
7 Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 7 Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
8 Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org) 8 Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
9 Copyright (C) 2002-2003 Dirk Mueller (mueller@kde.org) 9 Copyright (C) 2002-2003 Dirk Mueller (mueller@kde.org)
10 Copyright (C) 2002 Apple Computer, Inc. 10 Copyright (C) 2002 Apple Computer, Inc.
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 150
151 // If markers change, we need a relayout, as marker boundaries are cached in LayoutSVGPath. 151 // If markers change, we need a relayout, as marker boundaries are cached in LayoutSVGPath.
152 if (inheritedResources != other->inheritedResources) 152 if (inheritedResources != other->inheritedResources)
153 return true; 153 return true;
154 154
155 // All text related properties influence layout. 155 // All text related properties influence layout.
156 if (svg_inherited_flags._textAnchor != other->svg_inherited_flags._textAncho r 156 if (svg_inherited_flags._textAnchor != other->svg_inherited_flags._textAncho r
157 || svg_inherited_flags._writingMode != other->svg_inherited_flags._writi ngMode 157 || svg_inherited_flags._writingMode != other->svg_inherited_flags._writi ngMode
158 || svg_inherited_flags._glyphOrientationHorizontal != other->svg_inherit ed_flags._glyphOrientationHorizontal 158 || svg_inherited_flags._glyphOrientationHorizontal != other->svg_inherit ed_flags._glyphOrientationHorizontal
159 || svg_inherited_flags._glyphOrientationVertical != other->svg_inherited _flags._glyphOrientationVertical 159 || svg_inherited_flags._glyphOrientationVertical != other->svg_inherited _flags._glyphOrientationVertical
160 || svg_inherited_flags.dominantBaseline != other->svg_inherited_flags.do minantBaseline
160 || svg_noninherited_flags.f._alignmentBaseline != other->svg_noninherite d_flags.f._alignmentBaseline 161 || svg_noninherited_flags.f._alignmentBaseline != other->svg_noninherite d_flags.f._alignmentBaseline
161 || svg_noninherited_flags.f._dominantBaseline != other->svg_noninherited _flags.f._dominantBaseline
162 || svg_noninherited_flags.f._baselineShift != other->svg_noninherited_fl ags.f._baselineShift) 162 || svg_noninherited_flags.f._baselineShift != other->svg_noninherited_fl ags.f._baselineShift)
163 return true; 163 return true;
164 164
165 // Text related properties influence layout. 165 // Text related properties influence layout.
166 if (misc->baselineShiftValue != other->misc->baselineShiftValue) 166 if (misc->baselineShiftValue != other->misc->baselineShiftValue)
167 return true; 167 return true;
168 168
169 // These properties affect the cached stroke bounding box rects. 169 // These properties affect the cached stroke bounding box rects.
170 if (svg_inherited_flags._capStyle != other->svg_inherited_flags._capStyle 170 if (svg_inherited_flags._capStyle != other->svg_inherited_flags._capStyle
171 || svg_inherited_flags._joinStyle != other->svg_inherited_flags._joinSty le) 171 || svg_inherited_flags._joinStyle != other->svg_inherited_flags._joinSty le)
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 case PaintOrderMarkersStrokeFill: 279 case PaintOrderMarkersStrokeFill:
280 pt = paintOrderSequence(PT_MARKERS, PT_STROKE, PT_FILL); 280 pt = paintOrderSequence(PT_MARKERS, PT_STROKE, PT_FILL);
281 break; 281 break;
282 } 282 }
283 283
284 pt = (pt >> (kPaintOrderBitwidth*index)) & ((1u << kPaintOrderBitwidth) - 1) ; 284 pt = (pt >> (kPaintOrderBitwidth*index)) & ((1u << kPaintOrderBitwidth) - 1) ;
285 return (EPaintOrderType)pt; 285 return (EPaintOrderType)pt;
286 } 286 }
287 287
288 } 288 }
OLDNEW
« no previous file with comments | « Source/core/style/SVGComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698