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

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

Issue 1973843003: LayoutBox (not LayoutBlock) is the common base for floats and out-of-flow objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 234
235 void LayoutBox::styleDidChange(StyleDifference diff, const ComputedStyle* oldSty le) 235 void LayoutBox::styleDidChange(StyleDifference diff, const ComputedStyle* oldSty le)
236 { 236 {
237 // Horizontal writing mode definition is updated in LayoutBoxModelObject::up dateFromStyle, 237 // Horizontal writing mode definition is updated in LayoutBoxModelObject::up dateFromStyle,
238 // (as part of the LayoutBoxModelObject::styleDidChange call below). So, we can safely cache the horizontal 238 // (as part of the LayoutBoxModelObject::styleDidChange call below). So, we can safely cache the horizontal
239 // writing mode value before style change here. 239 // writing mode value before style change here.
240 bool oldHorizontalWritingMode = isHorizontalWritingMode(); 240 bool oldHorizontalWritingMode = isHorizontalWritingMode();
241 241
242 LayoutBoxModelObject::styleDidChange(diff, oldStyle); 242 LayoutBoxModelObject::styleDidChange(diff, oldStyle);
243 243
244 if (isFloatingOrOutOfFlowPositioned() && oldStyle && !oldStyle->isFloating() && !oldStyle->hasOutOfFlowPosition() && parent() && parent()->isLayoutBlockFlow ())
245 toLayoutBlockFlow(parent())->childBecameFloatingOrOutOfFlow(this);
246
244 const ComputedStyle& newStyle = styleRef(); 247 const ComputedStyle& newStyle = styleRef();
245 if (needsLayout() && oldStyle) 248 if (needsLayout() && oldStyle)
246 removeFromPercentHeightContainer(); 249 removeFromPercentHeightContainer();
247 250
248 if (oldHorizontalWritingMode != isHorizontalWritingMode()) { 251 if (oldHorizontalWritingMode != isHorizontalWritingMode()) {
249 if (oldStyle) { 252 if (oldStyle) {
250 if (isOrthogonalWritingModeRoot()) 253 if (isOrthogonalWritingModeRoot())
251 markOrthogonalWritingModeRoot(); 254 markOrthogonalWritingModeRoot();
252 else 255 else
253 unmarkOrthogonalWritingModeRoot(); 256 unmarkOrthogonalWritingModeRoot();
(...skipping 4694 matching lines...) Expand 10 before | Expand all | Expand 10 after
4948 m_rareData->m_snapAreas->remove(&snapArea); 4951 m_rareData->m_snapAreas->remove(&snapArea);
4949 } 4952 }
4950 } 4953 }
4951 4954
4952 SnapAreaSet* LayoutBox::snapAreas() const 4955 SnapAreaSet* LayoutBox::snapAreas() const
4953 { 4956 {
4954 return m_rareData ? m_rareData->m_snapAreas.get() : nullptr; 4957 return m_rareData ? m_rareData->m_snapAreas.get() : nullptr;
4955 } 4958 }
4956 4959
4957 } // namespace blink 4960 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698