OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006 Apple Computer, Inc. | 2 * Copyright (C) 2006 Apple Computer, Inc. |
3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> | 3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> |
4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> | 4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> |
5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> | 5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> |
6 * Copyright (C) 2008 Rob Buis <buis@kde.org> | 6 * Copyright (C) 2008 Rob Buis <buis@kde.org> |
7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> | 7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> |
8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. | 8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. |
9 * Copyright (C) 2012 Google Inc. | 9 * Copyright (C) 2012 Google Inc. |
10 * | 10 * |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 | 224 |
225 m_layoutAttributes = newLayoutAttributes; | 225 m_layoutAttributes = newLayoutAttributes; |
226 } | 226 } |
227 | 227 |
228 static inline void checkLayoutAttributesConsistency(RenderSVGText* text, Vector<
SVGTextLayoutAttributes*>& expectedLayoutAttributes) | 228 static inline void checkLayoutAttributesConsistency(RenderSVGText* text, Vector<
SVGTextLayoutAttributes*>& expectedLayoutAttributes) |
229 { | 229 { |
230 #ifndef NDEBUG | 230 #ifndef NDEBUG |
231 Vector<SVGTextLayoutAttributes*> newLayoutAttributes; | 231 Vector<SVGTextLayoutAttributes*> newLayoutAttributes; |
232 collectLayoutAttributes(text, newLayoutAttributes); | 232 collectLayoutAttributes(text, newLayoutAttributes); |
233 ASSERT(newLayoutAttributes == expectedLayoutAttributes); | 233 ASSERT(newLayoutAttributes == expectedLayoutAttributes); |
234 #else | |
235 UNUSED_PARAM(text); | |
236 UNUSED_PARAM(expectedLayoutAttributes); | |
237 #endif | 234 #endif |
238 } | 235 } |
239 | 236 |
240 void RenderSVGText::willBeDestroyed() | 237 void RenderSVGText::willBeDestroyed() |
241 { | 238 { |
242 m_layoutAttributes.clear(); | 239 m_layoutAttributes.clear(); |
243 m_layoutAttributesBuilder.clearTextPositioningElements(); | 240 m_layoutAttributesBuilder.clearTextPositioningElements(); |
244 | 241 |
245 RenderSVGBlock::willBeDestroyed(); | 242 RenderSVGBlock::willBeDestroyed(); |
246 } | 243 } |
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
555 return 0; | 552 return 0; |
556 } | 553 } |
557 | 554 |
558 // Fix for <rdar://problem/8048875>. We should not render :first-letter CSS Styl
e | 555 // Fix for <rdar://problem/8048875>. We should not render :first-letter CSS Styl
e |
559 // in a SVG text element context. | 556 // in a SVG text element context. |
560 void RenderSVGText::updateFirstLetter() | 557 void RenderSVGText::updateFirstLetter() |
561 { | 558 { |
562 } | 559 } |
563 | 560 |
564 } | 561 } |
OLD | NEW |