| 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 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 534 #endif | 534 #endif |
| 535 markLowestFloatLogicalBottomCacheAsDirty(); | 535 markLowestFloatLogicalBottomCacheAsDirty(); |
| 536 } | 536 } |
| 537 | 537 |
| 538 void FloatingObjects::removePlacedObject(FloatingObject& floatingObject) { | 538 void FloatingObjects::removePlacedObject(FloatingObject& floatingObject) { |
| 539 ASSERT(floatingObject.isPlaced() && floatingObject.isInPlacedTree()); | 539 ASSERT(floatingObject.isPlaced() && floatingObject.isInPlacedTree()); |
| 540 | 540 |
| 541 if (m_placedFloatsTree.isInitialized()) { | 541 if (m_placedFloatsTree.isInitialized()) { |
| 542 bool removed = | 542 bool removed = |
| 543 m_placedFloatsTree.remove(intervalForFloatingObject(floatingObject)); | 543 m_placedFloatsTree.remove(intervalForFloatingObject(floatingObject)); |
| 544 ASSERT_UNUSED(removed, removed); | 544 DCHECK(removed); |
| 545 } | 545 } |
| 546 | 546 |
| 547 floatingObject.setIsPlaced(false); | 547 floatingObject.setIsPlaced(false); |
| 548 #if ENABLE(ASSERT) | 548 #if ENABLE(ASSERT) |
| 549 floatingObject.setIsInPlacedTree(false); | 549 floatingObject.setIsInPlacedTree(false); |
| 550 #endif | 550 #endif |
| 551 markLowestFloatLogicalBottomCacheAsDirty(); | 551 markLowestFloatLogicalBottomCacheAsDirty(); |
| 552 } | 552 } |
| 553 | 553 |
| 554 FloatingObject* FloatingObjects::add( | 554 FloatingObject* FloatingObjects::add( |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 749 const FloatingObject* floatingObject) { | 749 const FloatingObject* floatingObject) { |
| 750 return String::format("%p (%gx%g %gx%g)", floatingObject, | 750 return String::format("%p (%gx%g %gx%g)", floatingObject, |
| 751 floatingObject->frameRect().x().toFloat(), | 751 floatingObject->frameRect().x().toFloat(), |
| 752 floatingObject->frameRect().y().toFloat(), | 752 floatingObject->frameRect().y().toFloat(), |
| 753 floatingObject->frameRect().maxX().toFloat(), | 753 floatingObject->frameRect().maxX().toFloat(), |
| 754 floatingObject->frameRect().maxY().toFloat()); | 754 floatingObject->frameRect().maxY().toFloat()); |
| 755 } | 755 } |
| 756 #endif | 756 #endif |
| 757 | 757 |
| 758 } // namespace blink | 758 } // namespace blink |
| OLD | NEW |