| 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 }; | 133 }; |
| 134 | 134 |
| 135 template <FloatingObject::Type FloatTypeValue> | 135 template <FloatingObject::Type FloatTypeValue> |
| 136 class ComputeFloatOffsetForFloatLayoutAdapter : public ComputeFloatOffsetAdapter
<FloatTypeValue> { | 136 class ComputeFloatOffsetForFloatLayoutAdapter : public ComputeFloatOffsetAdapter
<FloatTypeValue> { |
| 137 public: | 137 public: |
| 138 ComputeFloatOffsetForFloatLayoutAdapter(const LayoutBlockFlow* layoutObject,
LayoutUnit lineTop, LayoutUnit lineBottom, LayoutUnit offset) | 138 ComputeFloatOffsetForFloatLayoutAdapter(const LayoutBlockFlow* layoutObject,
LayoutUnit lineTop, LayoutUnit lineBottom, LayoutUnit offset) |
| 139 : ComputeFloatOffsetAdapter<FloatTypeValue>(layoutObject, lineTop, lineB
ottom, offset) | 139 : ComputeFloatOffsetAdapter<FloatTypeValue>(layoutObject, lineTop, lineB
ottom, offset) |
| 140 { | 140 { |
| 141 } | 141 } |
| 142 | 142 |
| 143 virtual ~ComputeFloatOffsetForFloatLayoutAdapter() { } | 143 ~ComputeFloatOffsetForFloatLayoutAdapter() override { } |
| 144 | 144 |
| 145 LayoutUnit heightRemaining() const; | 145 LayoutUnit heightRemaining() const; |
| 146 | 146 |
| 147 protected: | 147 protected: |
| 148 virtual bool updateOffsetIfNeeded(const FloatingObject&) override final; | 148 bool updateOffsetIfNeeded(const FloatingObject&) final; |
| 149 }; | 149 }; |
| 150 | 150 |
| 151 template <FloatingObject::Type FloatTypeValue> | 151 template <FloatingObject::Type FloatTypeValue> |
| 152 class ComputeFloatOffsetForLineLayoutAdapter : public ComputeFloatOffsetAdapter<
FloatTypeValue> { | 152 class ComputeFloatOffsetForLineLayoutAdapter : public ComputeFloatOffsetAdapter<
FloatTypeValue> { |
| 153 public: | 153 public: |
| 154 ComputeFloatOffsetForLineLayoutAdapter(const LayoutBlockFlow* layoutObject,
LayoutUnit lineTop, LayoutUnit lineBottom, LayoutUnit offset) | 154 ComputeFloatOffsetForLineLayoutAdapter(const LayoutBlockFlow* layoutObject,
LayoutUnit lineTop, LayoutUnit lineBottom, LayoutUnit offset) |
| 155 : ComputeFloatOffsetAdapter<FloatTypeValue>(layoutObject, lineTop, lineB
ottom, offset) | 155 : ComputeFloatOffsetAdapter<FloatTypeValue>(layoutObject, lineTop, lineB
ottom, offset) |
| 156 { | 156 { |
| 157 } | 157 } |
| 158 | 158 |
| 159 virtual ~ComputeFloatOffsetForLineLayoutAdapter() { } | 159 ~ComputeFloatOffsetForLineLayoutAdapter() override { } |
| 160 | 160 |
| 161 protected: | 161 protected: |
| 162 virtual bool updateOffsetIfNeeded(const FloatingObject&) override final; | 162 bool updateOffsetIfNeeded(const FloatingObject&) final; |
| 163 }; | 163 }; |
| 164 | 164 |
| 165 | 165 |
| 166 FloatingObjects::~FloatingObjects() | 166 FloatingObjects::~FloatingObjects() |
| 167 { | 167 { |
| 168 } | 168 } |
| 169 void FloatingObjects::clearLineBoxTreePointers() | 169 void FloatingObjects::clearLineBoxTreePointers() |
| 170 { | 170 { |
| 171 // Clear references to originating lines, since the lines are being deleted | 171 // Clear references to originating lines, since the lines are being deleted |
| 172 FloatingObjectSetIterator end = m_set.end(); | 172 FloatingObjectSetIterator end = m_set.end(); |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 } | 557 } |
| 558 | 558 |
| 559 String ValueToString<FloatingObject*>::string(const FloatingObject* floatingObje
ct) | 559 String ValueToString<FloatingObject*>::string(const FloatingObject* floatingObje
ct) |
| 560 { | 560 { |
| 561 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr
ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating
Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped
MaxY()); | 561 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr
ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating
Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped
MaxY()); |
| 562 } | 562 } |
| 563 #endif | 563 #endif |
| 564 | 564 |
| 565 | 565 |
| 566 } // namespace blink | 566 } // namespace blink |
| OLD | NEW |