| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Rob Buis <buis@kde.org> | 2 * Copyright (C) 2007, 2008 Rob Buis <buis@kde.org> |
| 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> | 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> |
| 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> | 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> |
| 5 * Copyright (C) 2009 Google, Inc. All rights reserved. | 5 * Copyright (C) 2009 Google, Inc. All rights reserved. |
| 6 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> | 6 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> |
| 7 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. | 7 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 { | 270 { |
| 271 ASSERT(object); | 271 ASSERT(object); |
| 272 | 272 |
| 273 SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(
object); | 273 SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(
object); |
| 274 if (resources) | 274 if (resources) |
| 275 resources->layoutIfNeeded(); | 275 resources->layoutIfNeeded(); |
| 276 } | 276 } |
| 277 | 277 |
| 278 bool SVGRenderSupport::isOverflowHidden(const RenderObject* object) | 278 bool SVGRenderSupport::isOverflowHidden(const RenderObject* object) |
| 279 { | 279 { |
| 280 // SVG doesn't support independent x/y overflow | |
| 281 ASSERT(object->style()->overflowX() == object->style()->overflowY()); | |
| 282 | |
| 283 // OSCROLL is never set for SVG - see StyleResolver::adjustRenderStyle | |
| 284 ASSERT(object->style()->overflowX() != OSCROLL); | |
| 285 | |
| 286 // RenderSVGRoot should never query for overflow state - it should always cl
ip itself to the initial viewport size. | 280 // RenderSVGRoot should never query for overflow state - it should always cl
ip itself to the initial viewport size. |
| 287 ASSERT(!object->isDocumentElement()); | 281 ASSERT(!object->isDocumentElement()); |
| 288 | 282 |
| 289 return object->style()->overflowX() == OHIDDEN; | 283 return object->style()->overflowX() == OHIDDEN || object->style()->overflowX
() == OSCROLL; |
| 290 } | 284 } |
| 291 | 285 |
| 292 void SVGRenderSupport::intersectRepaintRectWithResources(const RenderObject* ren
derer, FloatRect& repaintRect) | 286 void SVGRenderSupport::intersectRepaintRectWithResources(const RenderObject* ren
derer, FloatRect& repaintRect) |
| 293 { | 287 { |
| 294 ASSERT(renderer); | 288 ASSERT(renderer); |
| 295 | 289 |
| 296 SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(
renderer); | 290 SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(
renderer); |
| 297 if (!resources) | 291 if (!resources) |
| 298 return; | 292 return; |
| 299 | 293 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 } | 391 } |
| 398 | 392 |
| 399 bool SVGRenderSupport::isRenderableTextNode(const RenderObject* object) | 393 bool SVGRenderSupport::isRenderableTextNode(const RenderObject* object) |
| 400 { | 394 { |
| 401 ASSERT(object->isText()); | 395 ASSERT(object->isText()); |
| 402 // <br> is marked as text, but is not handled by the SVG rendering code-path
. | 396 // <br> is marked as text, but is not handled by the SVG rendering code-path
. |
| 403 return object->isSVGInlineText() && !toRenderSVGInlineText(object)->hasEmpty
Text(); | 397 return object->isSVGInlineText() && !toRenderSVGInlineText(object)->hasEmpty
Text(); |
| 404 } | 398 } |
| 405 | 399 |
| 406 } | 400 } |
| OLD | NEW |