OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 1389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1400 | 1400 |
1401 if (!parent() || !everHadLayout()) | 1401 if (!parent() || !everHadLayout()) |
1402 return; | 1402 return; |
1403 | 1403 |
1404 ShapeValue* shapeValue = style()->shapeInside(); | 1404 ShapeValue* shapeValue = style()->shapeInside(); |
1405 if (shapeValue && shapeValue->image() && shapeValue->image()->data() == imag
e) { | 1405 if (shapeValue && shapeValue->image() && shapeValue->image()->data() == imag
e) { |
1406 ShapeInsideInfo* shapeInsideInfo = ensureShapeInsideInfo(); | 1406 ShapeInsideInfo* shapeInsideInfo = ensureShapeInsideInfo(); |
1407 shapeInsideInfo->dirtyShapeSize(); | 1407 shapeInsideInfo->dirtyShapeSize(); |
1408 markShapeInsideDescendantsForLayout(); | 1408 markShapeInsideDescendantsForLayout(); |
1409 } | 1409 } |
1410 | |
1411 ShapeValue* shapeOutsideValue = style()->shapeOutside(); | |
1412 if (isFloating() && shapeOutsideValue && shapeOutsideValue->image() && shape
OutsideValue->image()->data() == image) | |
1413 parent()->setNeedsLayoutAndPrefWidthsRecalc(); | |
1414 } | 1410 } |
1415 | 1411 |
1416 void RenderBlock::updateShapeInsideInfoAfterStyleChange(const ShapeValue* shapeI
nside, const ShapeValue* oldShapeInside) | 1412 void RenderBlock::updateShapeInsideInfoAfterStyleChange(const ShapeValue* shapeI
nside, const ShapeValue* oldShapeInside) |
1417 { | 1413 { |
1418 // FIXME: A future optimization would do a deep comparison for equality. | 1414 // FIXME: A future optimization would do a deep comparison for equality. |
1419 if (shapeInside == oldShapeInside) | 1415 if (shapeInside == oldShapeInside) |
1420 return; | 1416 return; |
1421 | 1417 |
1422 if (shapeInside) { | 1418 if (shapeInside) { |
1423 ShapeInsideInfo* shapeInsideInfo = ensureShapeInsideInfo(); | 1419 ShapeInsideInfo* shapeInsideInfo = ensureShapeInsideInfo(); |
(...skipping 4220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5644 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 5640 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
5645 { | 5641 { |
5646 showRenderObject(); | 5642 showRenderObject(); |
5647 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 5643 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
5648 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 5644 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
5649 } | 5645 } |
5650 | 5646 |
5651 #endif | 5647 #endif |
5652 | 5648 |
5653 } // namespace WebCore | 5649 } // namespace WebCore |
OLD | NEW |