| 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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 { | 112 { |
| 113 // FIXME: Investigate in size rounding issues | 113 // FIXME: Investigate in size rounding issues |
| 114 // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/
63656 | 114 // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/
63656 |
| 115 // FIXME: Is this correct for vertical writing mode? | 115 // FIXME: Is this correct for vertical writing mode? |
| 116 computedValues.m_extent = static_cast<int>(roundf(m_viewport.height())); | 116 computedValues.m_extent = static_cast<int>(roundf(m_viewport.height())); |
| 117 computedValues.m_position = logicalTop; | 117 computedValues.m_position = logicalTop; |
| 118 } | 118 } |
| 119 | 119 |
| 120 void RenderSVGForeignObject::layout() | 120 void RenderSVGForeignObject::layout() |
| 121 { | 121 { |
| 122 StackStats::LayoutCheckPoint layoutCheckPoint; | |
| 123 ASSERT(needsLayout()); | 122 ASSERT(needsLayout()); |
| 124 ASSERT(!view()->layoutStateEnabled()); // RenderSVGRoot disables layoutState
for the SVG rendering tree. | 123 ASSERT(!view()->layoutStateEnabled()); // RenderSVGRoot disables layoutState
for the SVG rendering tree. |
| 125 | 124 |
| 126 LayoutRepainter repainter(*this, SVGRenderSupport::checkForSVGRepaintDuringL
ayout(this)); | 125 LayoutRepainter repainter(*this, SVGRenderSupport::checkForSVGRepaintDuringL
ayout(this)); |
| 127 SVGForeignObjectElement* foreign = static_cast<SVGForeignObjectElement*>(nod
e()); | 126 SVGForeignObjectElement* foreign = static_cast<SVGForeignObjectElement*>(nod
e()); |
| 128 | 127 |
| 129 bool updateCachedBoundariesInParents = false; | 128 bool updateCachedBoundariesInParents = false; |
| 130 if (m_needsTransformUpdate) { | 129 if (m_needsTransformUpdate) { |
| 131 m_localTransform = foreign->animatedLocalTransform(); | 130 m_localTransform = foreign->animatedLocalTransform(); |
| 132 m_needsTransformUpdate = false; | 131 m_needsTransformUpdate = false; |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 { | 192 { |
| 194 SVGRenderSupport::mapLocalToContainer(this, repaintContainer, transformState
, wasFixed); | 193 SVGRenderSupport::mapLocalToContainer(this, repaintContainer, transformState
, wasFixed); |
| 195 } | 194 } |
| 196 | 195 |
| 197 const RenderObject* RenderSVGForeignObject::pushMappingToContainer(const RenderL
ayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const | 196 const RenderObject* RenderSVGForeignObject::pushMappingToContainer(const RenderL
ayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const |
| 198 { | 197 { |
| 199 return SVGRenderSupport::pushMappingToContainer(this, ancestorToStopAt, geom
etryMap); | 198 return SVGRenderSupport::pushMappingToContainer(this, ancestorToStopAt, geom
etryMap); |
| 200 } | 199 } |
| 201 | 200 |
| 202 } | 201 } |
| OLD | NEW |