| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> | 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> |
| 3 * Copyright (C) 2006 Apple Computer Inc. | 3 * Copyright (C) 2006 Apple Computer Inc. |
| 4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> | 4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> |
| 5 * Copyright (C) 2008 Rob Buis <buis@kde.org> | 5 * Copyright (C) 2008 Rob Buis <buis@kde.org> |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. 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 Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 fontDescription.setComputedSize(FontSize::getComputedSizeFromSpecifiedSize(&
document, scalingFactor, fontDescription.isAbsoluteSize(), fontDescription.speci
fiedSize(), DoNotUseSmartMinimumForFontSize)); | 228 fontDescription.setComputedSize(FontSize::getComputedSizeFromSpecifiedSize(&
document, scalingFactor, fontDescription.isAbsoluteSize(), fontDescription.speci
fiedSize(), DoNotUseSmartMinimumForFontSize)); |
| 229 | 229 |
| 230 scaledFont = Font(fontDescription); | 230 scaledFont = Font(fontDescription); |
| 231 scaledFont.update(document.styleEngine().fontSelector()); | 231 scaledFont.update(document.styleEngine().fontSelector()); |
| 232 } | 232 } |
| 233 | 233 |
| 234 LayoutRect LayoutSVGInlineText::clippedOverflowRectForPaintInvalidation(const La
youtBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* pa
intInvalidationState) const | 234 LayoutRect LayoutSVGInlineText::clippedOverflowRectForPaintInvalidation(const La
youtBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* pa
intInvalidationState) const |
| 235 { | 235 { |
| 236 // FIXME: The following works because LayoutSVGBlock has forced slow rect ma
pping of the paintInvalidationState. | 236 // FIXME: The following works because LayoutSVGBlock has forced slow rect ma
pping of the paintInvalidationState. |
| 237 // Should let this really work with paintInvalidationState's fast mapping an
d remove the assert. | 237 // Should let this really work with paintInvalidationState's fast mapping an
d remove the assert. |
| 238 ASSERT(!paintInvalidationState || !paintInvalidationState->canMapToContainer
(paintInvalidationContainer)); | 238 ASSERT(!paintInvalidationState || !paintInvalidationState->canMapToAncestor(
paintInvalidationContainer)); |
| 239 return parent()->clippedOverflowRectForPaintInvalidation(paintInvalidationCo
ntainer, paintInvalidationState); | 239 return parent()->clippedOverflowRectForPaintInvalidation(paintInvalidationCo
ntainer, paintInvalidationState); |
| 240 } | 240 } |
| 241 | 241 |
| 242 PassRefPtr<StringImpl> LayoutSVGInlineText::originalText() const | 242 PassRefPtr<StringImpl> LayoutSVGInlineText::originalText() const |
| 243 { | 243 { |
| 244 RefPtr<StringImpl> result = LayoutText::originalText(); | 244 RefPtr<StringImpl> result = LayoutText::originalText(); |
| 245 if (!result) | 245 if (!result) |
| 246 return nullptr; | 246 return nullptr; |
| 247 return applySVGWhitespaceRules(result, style() && style()->whiteSpace() == P
RE); | 247 return applySVGWhitespaceRules(result, style() && style()->whiteSpace() == P
RE); |
| 248 } | 248 } |
| 249 | 249 |
| 250 } // namespace blink | 250 } // namespace blink |
| OLD | NEW |