| 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 Inc. All rights reserved. | 3 * Copyright (C) 2006 Apple Inc. All rights reserved. |
| 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 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "core/layout/svg/LayoutSVGInline.h" | 24 #include "core/layout/svg/LayoutSVGInline.h" |
| 25 | 25 |
| 26 #include "core/layout/svg/LayoutSVGText.h" | 26 #include "core/layout/svg/LayoutSVGText.h" |
| 27 #include "core/layout/svg/SVGLayoutSupport.h" | 27 #include "core/layout/svg/SVGLayoutSupport.h" |
| 28 #include "core/layout/svg/SVGResourcesCache.h" | 28 #include "core/layout/svg/SVGResourcesCache.h" |
| 29 #include "core/layout/svg/line/SVGInlineFlowBox.h" | 29 #include "core/layout/svg/line/SVGInlineFlowBox.h" |
| 30 #include "core/svg/SVGAElement.h" | 30 #include "core/svg/SVGAElement.h" |
| 31 | 31 |
| 32 namespace blink { | 32 namespace blink { |
| 33 | 33 |
| 34 bool LayoutSVGInline::isChildAllowed(LayoutObject* child, const LayoutStyle& sty
le) const | 34 bool LayoutSVGInline::isChildAllowed(LayoutObject* child, const ComputedStyle& s
tyle) const |
| 35 { | 35 { |
| 36 if (child->isText()) | 36 if (child->isText()) |
| 37 return SVGLayoutSupport::isLayoutableTextNode(child); | 37 return SVGLayoutSupport::isLayoutableTextNode(child); |
| 38 | 38 |
| 39 if (isSVGAElement(*node())) { | 39 if (isSVGAElement(*node())) { |
| 40 // Disallow direct descendant 'a'. | 40 // Disallow direct descendant 'a'. |
| 41 if (isSVGAElement(*child->node())) | 41 if (isSVGAElement(*child->node())) |
| 42 return false; | 42 return false; |
| 43 } | 43 } |
| 44 | 44 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) | 110 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) |
| 111 quads.append(localToAbsoluteQuad(FloatRect(textBoundingBox.x() + box->x(
), textBoundingBox.y() + box->y(), box->logicalWidth(), box->logicalHeight()), f
alse, wasFixed)); | 111 quads.append(localToAbsoluteQuad(FloatRect(textBoundingBox.x() + box->x(
), textBoundingBox.y() + box->y(), box->logicalWidth(), box->logicalHeight()), f
alse, wasFixed)); |
| 112 } | 112 } |
| 113 | 113 |
| 114 void LayoutSVGInline::willBeDestroyed() | 114 void LayoutSVGInline::willBeDestroyed() |
| 115 { | 115 { |
| 116 SVGResourcesCache::clientDestroyed(this); | 116 SVGResourcesCache::clientDestroyed(this); |
| 117 LayoutInline::willBeDestroyed(); | 117 LayoutInline::willBeDestroyed(); |
| 118 } | 118 } |
| 119 | 119 |
| 120 void LayoutSVGInline::styleDidChange(StyleDifference diff, const LayoutStyle* ol
dStyle) | 120 void LayoutSVGInline::styleDidChange(StyleDifference diff, const ComputedStyle*
oldStyle) |
| 121 { | 121 { |
| 122 if (diff.needsFullLayout()) | 122 if (diff.needsFullLayout()) |
| 123 setNeedsBoundariesUpdate(); | 123 setNeedsBoundariesUpdate(); |
| 124 | 124 |
| 125 LayoutInline::styleDidChange(diff, oldStyle); | 125 LayoutInline::styleDidChange(diff, oldStyle); |
| 126 SVGResourcesCache::clientStyleChanged(this, diff, styleRef()); | 126 SVGResourcesCache::clientStyleChanged(this, diff, styleRef()); |
| 127 } | 127 } |
| 128 | 128 |
| 129 void LayoutSVGInline::addChild(LayoutObject* child, LayoutObject* beforeChild) | 129 void LayoutSVGInline::addChild(LayoutObject* child, LayoutObject* beforeChild) |
| 130 { | 130 { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 144 LayoutInline::removeChild(child); | 144 LayoutInline::removeChild(child); |
| 145 return; | 145 return; |
| 146 } | 146 } |
| 147 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; | 147 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; |
| 148 textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes); | 148 textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes); |
| 149 LayoutInline::removeChild(child); | 149 LayoutInline::removeChild(child); |
| 150 textRenderer->subtreeChildWasRemoved(affectedAttributes); | 150 textRenderer->subtreeChildWasRemoved(affectedAttributes); |
| 151 } | 151 } |
| 152 | 152 |
| 153 } | 153 } |
| OLD | NEW |