| 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. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. |
| 6 * All rights reserved. | 6 * All rights reserved. |
| 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 7 * Copyright (C) Research In Motion Limited 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 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 #if DCHECK_IS_ON() | 524 #if DCHECK_IS_ON() |
| 525 floatingObject.setIsInPlacedTree(false); | 525 floatingObject.setIsInPlacedTree(false); |
| 526 #endif | 526 #endif |
| 527 markLowestFloatLogicalBottomCacheAsDirty(); | 527 markLowestFloatLogicalBottomCacheAsDirty(); |
| 528 } | 528 } |
| 529 | 529 |
| 530 FloatingObject* FloatingObjects::add( | 530 FloatingObject* FloatingObjects::add( |
| 531 std::unique_ptr<FloatingObject> floatingObject) { | 531 std::unique_ptr<FloatingObject> floatingObject) { |
| 532 FloatingObject* newObject = floatingObject.release(); | 532 FloatingObject* newObject = floatingObject.release(); |
| 533 increaseObjectsCount(newObject->getType()); | 533 increaseObjectsCount(newObject->getType()); |
| 534 m_set.add(WTF::wrapUnique(newObject)); | 534 m_set.insert(WTF::wrapUnique(newObject)); |
| 535 if (newObject->isPlaced()) | 535 if (newObject->isPlaced()) |
| 536 addPlacedObject(*newObject); | 536 addPlacedObject(*newObject); |
| 537 markLowestFloatLogicalBottomCacheAsDirty(); | 537 markLowestFloatLogicalBottomCacheAsDirty(); |
| 538 return newObject; | 538 return newObject; |
| 539 } | 539 } |
| 540 | 540 |
| 541 void FloatingObjects::remove(FloatingObject* toBeRemoved) { | 541 void FloatingObjects::remove(FloatingObject* toBeRemoved) { |
| 542 decreaseObjectsCount(toBeRemoved->getType()); | 542 decreaseObjectsCount(toBeRemoved->getType()); |
| 543 std::unique_ptr<FloatingObject> floatingObject = m_set.take(toBeRemoved); | 543 std::unique_ptr<FloatingObject> floatingObject = m_set.take(toBeRemoved); |
| 544 ASSERT(floatingObject->isPlaced() || !floatingObject->isInPlacedTree()); | 544 ASSERT(floatingObject->isPlaced() || !floatingObject->isInPlacedTree()); |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 726 const FloatingObject* floatingObject) { | 726 const FloatingObject* floatingObject) { |
| 727 return String::format("%p (%gx%g %gx%g)", floatingObject, | 727 return String::format("%p (%gx%g %gx%g)", floatingObject, |
| 728 floatingObject->frameRect().x().toFloat(), | 728 floatingObject->frameRect().x().toFloat(), |
| 729 floatingObject->frameRect().y().toFloat(), | 729 floatingObject->frameRect().y().toFloat(), |
| 730 floatingObject->frameRect().maxX().toFloat(), | 730 floatingObject->frameRect().maxX().toFloat(), |
| 731 floatingObject->frameRect().maxY().toFloat()); | 731 floatingObject->frameRect().maxY().toFloat()); |
| 732 } | 732 } |
| 733 #endif | 733 #endif |
| 734 | 734 |
| 735 } // namespace blink | 735 } // namespace blink |
| OLD | NEW |