| 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 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 579 return false; | 579 return false; |
| 580 } | 580 } |
| 581 | 581 |
| 582 template <FloatingObject::Type FloatTypeValue> | 582 template <FloatingObject::Type FloatTypeValue> |
| 583 LayoutUnit ComputeFloatOffsetForFloatLayoutAdapter<FloatTypeValue>::heightRemain
ing() const | 583 LayoutUnit ComputeFloatOffsetForFloatLayoutAdapter<FloatTypeValue>::heightRemain
ing() const |
| 584 { | 584 { |
| 585 return this->m_outermostFloat ? this->m_layoutObject->logicalBottomForFloat(
*this->m_outermostFloat) - this->m_lineTop : LayoutUnit(1); | 585 return this->m_outermostFloat ? this->m_layoutObject->logicalBottomForFloat(
*this->m_outermostFloat) - this->m_lineTop : LayoutUnit(1); |
| 586 } | 586 } |
| 587 | 587 |
| 588 template <FloatingObject::Type FloatTypeValue> | 588 template <FloatingObject::Type FloatTypeValue> |
| 589 DISABLE_CFI_PERF |
| 589 inline void ComputeFloatOffsetAdapter<FloatTypeValue>::collectIfNeeded(const Int
ervalType& interval) | 590 inline void ComputeFloatOffsetAdapter<FloatTypeValue>::collectIfNeeded(const Int
ervalType& interval) |
| 590 { | 591 { |
| 591 const FloatingObject& floatingObject = *(interval.data()); | 592 const FloatingObject& floatingObject = *(interval.data()); |
| 592 if (floatingObject.getType() != FloatTypeValue || !rangesIntersect(interval.
low(), interval.high(), m_lineTop, m_lineBottom)) | 593 if (floatingObject.getType() != FloatTypeValue || !rangesIntersect(interval.
low(), interval.high(), m_lineTop, m_lineBottom)) |
| 593 return; | 594 return; |
| 594 | 595 |
| 595 // Make sure the float hasn't changed since it was added to the placed float
s tree. | 596 // Make sure the float hasn't changed since it was added to the placed float
s tree. |
| 596 ASSERT(floatingObject.isPlaced()); | 597 ASSERT(floatingObject.isPlaced()); |
| 597 ASSERT(interval.low() == m_layoutObject->logicalTopForFloat(floatingObject))
; | 598 ASSERT(interval.low() == m_layoutObject->logicalTopForFloat(floatingObject))
; |
| 598 ASSERT(interval.high() == m_layoutObject->logicalBottomForFloat(floatingObje
ct)); | 599 ASSERT(interval.high() == m_layoutObject->logicalBottomForFloat(floatingObje
ct)); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 648 } | 649 } |
| 649 | 650 |
| 650 String ValueToString<FloatingObject*>::toString(const FloatingObject* floatingOb
ject) | 651 String ValueToString<FloatingObject*>::toString(const FloatingObject* floatingOb
ject) |
| 651 { | 652 { |
| 652 return String::format("%p (%gx%g %gx%g)", floatingObject, floatingObject->fr
ameRect().x().toFloat(), floatingObject->frameRect().y().toFloat(), floatingObje
ct->frameRect().maxX().toFloat(), floatingObject->frameRect().maxY().toFloat()); | 653 return String::format("%p (%gx%g %gx%g)", floatingObject, floatingObject->fr
ameRect().x().toFloat(), floatingObject->frameRect().y().toFloat(), floatingObje
ct->frameRect().maxX().toFloat(), floatingObject->frameRect().maxY().toFloat()); |
| 653 } | 654 } |
| 654 #endif | 655 #endif |
| 655 | 656 |
| 656 | 657 |
| 657 } // namespace blink | 658 } // namespace blink |
| OLD | NEW |