| 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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 7 * Copyright (C) 2013 Adobe Systems Incorporated. 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 | 163 |
| 164 void LayoutBox::removeFloatingOrPositionedChildFromBlockLists() | 164 void LayoutBox::removeFloatingOrPositionedChildFromBlockLists() |
| 165 { | 165 { |
| 166 ASSERT(isFloatingOrOutOfFlowPositioned()); | 166 ASSERT(isFloatingOrOutOfFlowPositioned()); |
| 167 | 167 |
| 168 if (documentBeingDestroyed()) | 168 if (documentBeingDestroyed()) |
| 169 return; | 169 return; |
| 170 | 170 |
| 171 if (isFloating()) { | 171 if (isFloating()) { |
| 172 LayoutBlockFlow* parentBlockFlow = nullptr; | 172 LayoutBlockFlow* parentBlockFlow = nullptr; |
| 173 for (LayoutObject* curr = parent(); curr && !curr->isLayoutView(); curr
= curr->parent()) { | 173 for (LayoutObject* curr = parent(); curr; curr = curr->parent()) { |
| 174 if (curr->isLayoutBlockFlow()) { | 174 if (curr->isLayoutBlockFlow()) { |
| 175 LayoutBlockFlow* currBlockFlow = toLayoutBlockFlow(curr); | 175 LayoutBlockFlow* currBlockFlow = toLayoutBlockFlow(curr); |
| 176 if (!parentBlockFlow || currBlockFlow->containsFloat(this)) | 176 if (!parentBlockFlow || currBlockFlow->containsFloat(this)) |
| 177 parentBlockFlow = currBlockFlow; | 177 parentBlockFlow = currBlockFlow; |
| 178 } | 178 } |
| 179 } | 179 } |
| 180 | 180 |
| 181 if (parentBlockFlow) { | 181 if (parentBlockFlow) { |
| 182 parentBlockFlow->markSiblingsWithFloatsForLayout(this); | 182 parentBlockFlow->markSiblingsWithFloatsForLayout(this); |
| 183 parentBlockFlow->markAllDescendantsWithFloatsForLayout(this, false); | 183 parentBlockFlow->markAllDescendantsWithFloatsForLayout(this, false); |
| (...skipping 4762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4946 m_rareData->m_snapAreas->remove(&snapArea); | 4946 m_rareData->m_snapAreas->remove(&snapArea); |
| 4947 } | 4947 } |
| 4948 } | 4948 } |
| 4949 | 4949 |
| 4950 SnapAreaSet* LayoutBox::snapAreas() const | 4950 SnapAreaSet* LayoutBox::snapAreas() const |
| 4951 { | 4951 { |
| 4952 return m_rareData ? m_rareData->m_snapAreas.get() : nullptr; | 4952 return m_rareData ? m_rareData->m_snapAreas.get() : nullptr; |
| 4953 } | 4953 } |
| 4954 | 4954 |
| 4955 } // namespace blink | 4955 } // namespace blink |
| OLD | NEW |