| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Apple Computer, Inc. | 2 * Copyright (C) 2006 Apple Computer, Inc. |
| 3 * Copyright (C) 2009 Google, Inc. | 3 * Copyright (C) 2009 Google, Inc. |
| 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 } | 114 } |
| 115 | 115 |
| 116 void RenderSVGForeignObject::layout() | 116 void RenderSVGForeignObject::layout() |
| 117 { | 117 { |
| 118 ASSERT(needsLayout()); | 118 ASSERT(needsLayout()); |
| 119 ASSERT(!view()->layoutStateEnabled()); // RenderSVGRoot disables layoutState
for the SVG rendering tree. | 119 ASSERT(!view()->layoutStateEnabled()); // RenderSVGRoot disables layoutState
for the SVG rendering tree. |
| 120 | 120 |
| 121 LayoutRepainter repainter(*this, SVGRenderSupport::checkForSVGRepaintDuringL
ayout(this)); | 121 LayoutRepainter repainter(*this, SVGRenderSupport::checkForSVGRepaintDuringL
ayout(this)); |
| 122 SVGForeignObjectElement* foreign = toSVGForeignObjectElement(node()); | 122 SVGForeignObjectElement* foreign = toSVGForeignObjectElement(node()); |
| 123 | 123 |
| 124 setMayNeedInvalidation(true); |
| 125 |
| 124 bool updateCachedBoundariesInParents = false; | 126 bool updateCachedBoundariesInParents = false; |
| 125 if (m_needsTransformUpdate) { | 127 if (m_needsTransformUpdate) { |
| 126 m_localTransform = foreign->animatedLocalTransform(); | 128 m_localTransform = foreign->animatedLocalTransform(); |
| 127 m_needsTransformUpdate = false; | 129 m_needsTransformUpdate = false; |
| 128 updateCachedBoundariesInParents = true; | 130 updateCachedBoundariesInParents = true; |
| 129 } | 131 } |
| 130 | 132 |
| 131 FloatRect oldViewport = m_viewport; | 133 FloatRect oldViewport = m_viewport; |
| 132 | 134 |
| 133 // Cache viewport boundaries | 135 // Cache viewport boundaries |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 return false; | 182 return false; |
| 181 | 183 |
| 182 // FOs establish a stacking context, so we need to hit-test all layers. | 184 // FOs establish a stacking context, so we need to hit-test all layers. |
| 183 HitTestLocation hitTestLocation(roundedLayoutPoint(localPoint)); | 185 HitTestLocation hitTestLocation(roundedLayoutPoint(localPoint)); |
| 184 return RenderBlock::nodeAtPoint(request, result, hitTestLocation, LayoutPoin
t(), HitTestForeground) | 186 return RenderBlock::nodeAtPoint(request, result, hitTestLocation, LayoutPoin
t(), HitTestForeground) |
| 185 || RenderBlock::nodeAtPoint(request, result, hitTestLocation, LayoutPoin
t(), HitTestFloat) | 187 || RenderBlock::nodeAtPoint(request, result, hitTestLocation, LayoutPoin
t(), HitTestFloat) |
| 186 || RenderBlock::nodeAtPoint(request, result, hitTestLocation, LayoutPoin
t(), HitTestChildBlockBackgrounds); | 188 || RenderBlock::nodeAtPoint(request, result, hitTestLocation, LayoutPoin
t(), HitTestChildBlockBackgrounds); |
| 187 } | 189 } |
| 188 | 190 |
| 189 } | 191 } |
| OLD | NEW |