| 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 // FIXME: Investigate in size rounding issues | 109 // FIXME: Investigate in size rounding issues |
| 110 // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/
63656 | 110 // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/
63656 |
| 111 // FIXME: Is this correct for vertical writing mode? | 111 // FIXME: Is this correct for vertical writing mode? |
| 112 computedValues.m_extent = static_cast<int>(roundf(m_viewport.height())); | 112 computedValues.m_extent = static_cast<int>(roundf(m_viewport.height())); |
| 113 computedValues.m_position = logicalTop; | 113 computedValues.m_position = logicalTop; |
| 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()->layoutStateCachedOffsetsEnabled()); // RenderSVGRoot disable
s 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 bool updateCachedBoundariesInParents = false; | 124 bool updateCachedBoundariesInParents = false; |
| 125 if (m_needsTransformUpdate) { | 125 if (m_needsTransformUpdate) { |
| 126 m_localTransform = foreign->animatedLocalTransform(); | 126 m_localTransform = foreign->animatedLocalTransform(); |
| 127 m_needsTransformUpdate = false; | 127 m_needsTransformUpdate = false; |
| 128 updateCachedBoundariesInParents = true; | 128 updateCachedBoundariesInParents = true; |
| 129 } | 129 } |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 return false; | 180 return false; |
| 181 | 181 |
| 182 // FOs establish a stacking context, so we need to hit-test all layers. | 182 // FOs establish a stacking context, so we need to hit-test all layers. |
| 183 HitTestLocation hitTestLocation(roundedLayoutPoint(localPoint)); | 183 HitTestLocation hitTestLocation(roundedLayoutPoint(localPoint)); |
| 184 return RenderBlock::nodeAtPoint(request, result, hitTestLocation, LayoutPoin
t(), HitTestForeground) | 184 return RenderBlock::nodeAtPoint(request, result, hitTestLocation, LayoutPoin
t(), HitTestForeground) |
| 185 || RenderBlock::nodeAtPoint(request, result, hitTestLocation, LayoutPoin
t(), HitTestFloat) | 185 || RenderBlock::nodeAtPoint(request, result, hitTestLocation, LayoutPoin
t(), HitTestFloat) |
| 186 || RenderBlock::nodeAtPoint(request, result, hitTestLocation, LayoutPoin
t(), HitTestChildBlockBackgrounds); | 186 || RenderBlock::nodeAtPoint(request, result, hitTestLocation, LayoutPoin
t(), HitTestChildBlockBackgrounds); |
| 187 } | 187 } |
| 188 | 188 |
| 189 } | 189 } |
| OLD | NEW |