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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 ComputeFloatOffsetForFloatLayoutAdapter(const RenderBlockFlow* renderer, Lay
outUnit lineTop, LayoutUnit lineBottom, LayoutUnit offset) | 135 ComputeFloatOffsetForFloatLayoutAdapter(const RenderBlockFlow* renderer, Lay
outUnit lineTop, LayoutUnit lineBottom, LayoutUnit offset) |
136 : ComputeFloatOffsetAdapter<FloatTypeValue>(renderer, lineTop, lineBotto
m, offset) | 136 : ComputeFloatOffsetAdapter<FloatTypeValue>(renderer, lineTop, lineBotto
m, offset) |
137 { | 137 { |
138 } | 138 } |
139 | 139 |
140 virtual ~ComputeFloatOffsetForFloatLayoutAdapter() { } | 140 virtual ~ComputeFloatOffsetForFloatLayoutAdapter() { } |
141 | 141 |
142 LayoutUnit heightRemaining() const; | 142 LayoutUnit heightRemaining() const; |
143 | 143 |
144 protected: | 144 protected: |
145 virtual bool updateOffsetIfNeeded(const FloatingObject&) OVERRIDE FINAL; | 145 virtual bool updateOffsetIfNeeded(const FloatingObject&) override final; |
146 }; | 146 }; |
147 | 147 |
148 template <FloatingObject::Type FloatTypeValue> | 148 template <FloatingObject::Type FloatTypeValue> |
149 class ComputeFloatOffsetForLineLayoutAdapter : public ComputeFloatOffsetAdapter<
FloatTypeValue> { | 149 class ComputeFloatOffsetForLineLayoutAdapter : public ComputeFloatOffsetAdapter<
FloatTypeValue> { |
150 public: | 150 public: |
151 ComputeFloatOffsetForLineLayoutAdapter(const RenderBlockFlow* renderer, Layo
utUnit lineTop, LayoutUnit lineBottom, LayoutUnit offset) | 151 ComputeFloatOffsetForLineLayoutAdapter(const RenderBlockFlow* renderer, Layo
utUnit lineTop, LayoutUnit lineBottom, LayoutUnit offset) |
152 : ComputeFloatOffsetAdapter<FloatTypeValue>(renderer, lineTop, lineBotto
m, offset) | 152 : ComputeFloatOffsetAdapter<FloatTypeValue>(renderer, lineTop, lineBotto
m, offset) |
153 { | 153 { |
154 } | 154 } |
155 | 155 |
156 virtual ~ComputeFloatOffsetForLineLayoutAdapter() { } | 156 virtual ~ComputeFloatOffsetForLineLayoutAdapter() { } |
157 | 157 |
158 protected: | 158 protected: |
159 virtual bool updateOffsetIfNeeded(const FloatingObject&) OVERRIDE FINAL; | 159 virtual bool updateOffsetIfNeeded(const FloatingObject&) override final; |
160 }; | 160 }; |
161 | 161 |
162 | 162 |
163 FloatingObjects::~FloatingObjects() | 163 FloatingObjects::~FloatingObjects() |
164 { | 164 { |
165 } | 165 } |
166 void FloatingObjects::clearLineBoxTreePointers() | 166 void FloatingObjects::clearLineBoxTreePointers() |
167 { | 167 { |
168 // Clear references to originating lines, since the lines are being deleted | 168 // Clear references to originating lines, since the lines are being deleted |
169 FloatingObjectSetIterator end = m_set.end(); | 169 FloatingObjectSetIterator end = m_set.end(); |
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
526 } | 526 } |
527 | 527 |
528 String ValueToString<FloatingObject*>::string(const FloatingObject* floatingObje
ct) | 528 String ValueToString<FloatingObject*>::string(const FloatingObject* floatingObje
ct) |
529 { | 529 { |
530 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr
ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating
Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped
MaxY()); | 530 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr
ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating
Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped
MaxY()); |
531 } | 531 } |
532 #endif | 532 #endif |
533 | 533 |
534 | 534 |
535 } // namespace blink | 535 } // namespace blink |
OLD | NEW |