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 4116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4127 | 4127 |
4128 // Clear our positioned floats boolean. | 4128 // Clear our positioned floats boolean. |
4129 m_hasPositionedFloats = false; | 4129 m_hasPositionedFloats = false; |
4130 | 4130 |
4131 HashSet<RenderBox*> oldIntrudingFloatSet; | 4131 HashSet<RenderBox*> oldIntrudingFloatSet; |
4132 if (!childrenInline() && m_floatingObjects) { | 4132 if (!childrenInline() && m_floatingObjects) { |
4133 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); | 4133 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); |
4134 FloatingObjectSetIterator end = floatingObjectSet.end(); | 4134 FloatingObjectSetIterator end = floatingObjectSet.end(); |
4135 for (FloatingObjectSetIterator it = floatingObjectSet.begin(); it != end
; ++it) { | 4135 for (FloatingObjectSetIterator it = floatingObjectSet.begin(); it != end
; ++it) { |
4136 FloatingObject* floatingObject = *it; | 4136 FloatingObject* floatingObject = *it; |
4137 if (!floatingObject->isDescendant()) | 4137 if (!floatingObject->m_isDescendant) |
4138 oldIntrudingFloatSet.add(floatingObject->m_renderer); | 4138 oldIntrudingFloatSet.add(floatingObject->m_renderer); |
4139 } | 4139 } |
4140 } | 4140 } |
4141 | 4141 |
4142 // Inline blocks are covered by the isReplaced() check in the avoidFloats me
thod. | 4142 // Inline blocks are covered by the isReplaced() check in the avoidFloats me
thod. |
4143 if (avoidsFloats() || isRoot() || isRenderView() || isFloatingOrPositioned()
|| isTableCell()) { | 4143 if (avoidsFloats() || isRoot() || isRenderView() || isFloatingOrPositioned()
|| isTableCell()) { |
4144 if (m_floatingObjects) { | 4144 if (m_floatingObjects) { |
4145 deleteAllValues(m_floatingObjects->set()); | 4145 deleteAllValues(m_floatingObjects->set()); |
4146 m_floatingObjects->clear(); | 4146 m_floatingObjects->clear(); |
4147 } | 4147 } |
(...skipping 3288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7436 } | 7436 } |
7437 | 7437 |
7438 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) | 7438 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) |
7439 { | 7439 { |
7440 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); | 7440 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); |
7441 } | 7441 } |
7442 | 7442 |
7443 #endif | 7443 #endif |
7444 | 7444 |
7445 } // namespace WebCore | 7445 } // namespace WebCore |
OLD | NEW |