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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 FloatingObjects::~FloatingObjects() | 134 FloatingObjects::~FloatingObjects() |
135 { | 135 { |
136 // FIXME: m_set should use OwnPtr instead. | 136 // FIXME: m_set should use OwnPtr instead. |
137 deleteAllValues(m_set); | 137 deleteAllValues(m_set); |
138 } | 138 } |
139 void FloatingObjects::clearLineBoxTreePointers() | 139 void FloatingObjects::clearLineBoxTreePointers() |
140 { | 140 { |
141 // Clear references to originating lines, since the lines are being deleted | 141 // Clear references to originating lines, since the lines are being deleted |
142 FloatingObjectSetIterator end = m_set.end(); | 142 FloatingObjectSetIterator end = m_set.end(); |
143 for (FloatingObjectSetIterator it = m_set.begin(); it != end; ++it) { | 143 for (FloatingObjectSetIterator it = m_set.begin(); it != end; ++it) { |
144 ASSERT(!((*it)->originatingLine()) || (*it)->originatingLine()->renderer
() == m_renderer); | 144 ASSERT(!((*it)->originatingLine()) || &(*it)->originatingLine()->rendere
r() == m_renderer); |
145 (*it)->setOriginatingLine(0); | 145 (*it)->setOriginatingLine(0); |
146 } | 146 } |
147 } | 147 } |
148 | 148 |
149 template<> | 149 template<> |
150 inline bool ComputeFloatOffsetAdapter<FloatingObject::FloatLeft>::updateOffsetIf
Needed(const FloatingObject* floatingObject) | 150 inline bool ComputeFloatOffsetAdapter<FloatingObject::FloatLeft>::updateOffsetIf
Needed(const FloatingObject* floatingObject) |
151 { | 151 { |
152 LayoutUnit logicalRight = m_renderer->logicalRightForFloat(floatingObject); | 152 LayoutUnit logicalRight = m_renderer->logicalRightForFloat(floatingObject); |
153 if (logicalRight > m_offset) { | 153 if (logicalRight > m_offset) { |
154 m_offset = logicalRight; | 154 m_offset = logicalRight; |
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 } | 495 } |
496 | 496 |
497 String ValueToString<FloatingObject*>::string(const FloatingObject* floatingObje
ct) | 497 String ValueToString<FloatingObject*>::string(const FloatingObject* floatingObje
ct) |
498 { | 498 { |
499 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr
ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating
Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped
MaxY()); | 499 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr
ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating
Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped
MaxY()); |
500 } | 500 } |
501 #endif | 501 #endif |
502 | 502 |
503 | 503 |
504 } // namespace WebCore | 504 } // namespace WebCore |
OLD | NEW |