Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 2025543002: Fix when orthogonal writing mode roots have floating siblings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix removeFloatingOrPositionedChildFromBlockLists Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 154
155 void LayoutBox::removeFloatingOrPositionedChildFromBlockLists() 155 void LayoutBox::removeFloatingOrPositionedChildFromBlockLists()
156 { 156 {
157 ASSERT(isFloatingOrOutOfFlowPositioned()); 157 ASSERT(isFloatingOrOutOfFlowPositioned());
158 158
159 if (documentBeingDestroyed()) 159 if (documentBeingDestroyed())
160 return; 160 return;
161 161
162 if (isFloating()) { 162 if (isFloating()) {
163 LayoutBlockFlow* parentBlockFlow = nullptr; 163 LayoutBlockFlow* parentBlockFlow = nullptr;
164 for (LayoutObject* curr = parent(); curr && !curr->isLayoutView(); curr = curr->parent()) { 164 for (LayoutObject* curr = parent(); curr; curr = curr->parent()) {
165 if (curr->isLayoutBlockFlow()) { 165 if (curr->isLayoutBlockFlow()) {
166 LayoutBlockFlow* currBlockFlow = toLayoutBlockFlow(curr); 166 LayoutBlockFlow* currBlockFlow = toLayoutBlockFlow(curr);
167 if (!parentBlockFlow || currBlockFlow->containsFloat(this)) 167 if (!parentBlockFlow || currBlockFlow->containsFloat(this))
168 parentBlockFlow = currBlockFlow; 168 parentBlockFlow = currBlockFlow;
169 } 169 }
170 } 170 }
171 171
172 if (parentBlockFlow) { 172 if (parentBlockFlow) {
173 parentBlockFlow->markSiblingsWithFloatsForLayout(this); 173 parentBlockFlow->markSiblingsWithFloatsForLayout(this);
174 parentBlockFlow->markAllDescendantsWithFloatsForLayout(this, false); 174 parentBlockFlow->markAllDescendantsWithFloatsForLayout(this, false);
(...skipping 4762 matching lines...) Expand 10 before | Expand all | Expand 10 after
4937 m_rareData->m_snapAreas->remove(&snapArea); 4937 m_rareData->m_snapAreas->remove(&snapArea);
4938 } 4938 }
4939 } 4939 }
4940 4940
4941 SnapAreaSet* LayoutBox::snapAreas() const 4941 SnapAreaSet* LayoutBox::snapAreas() const
4942 { 4942 {
4943 return m_rareData ? m_rareData->m_snapAreas.get() : nullptr; 4943 return m_rareData ? m_rareData->m_snapAreas.get() : nullptr;
4944 } 4944 }
4945 4945
4946 } // namespace blink 4946 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698