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

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

Issue 2667493002: Changed EPosition to an enum class and renamed its members (Closed)
Patch Set: Rebase Created 3 years, 10 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 dirtyLineBoxes(false); 197 dirtyLineBoxes(false);
198 setNeedsLayoutAndFullPaintInvalidation( 198 setNeedsLayoutAndFullPaintInvalidation(
199 LayoutInvalidationReason::StyleChange); 199 LayoutInvalidationReason::StyleChange);
200 } 200 }
201 setAlwaysCreateLineBoxes(alwaysCreateLineBoxesNew); 201 setAlwaysCreateLineBoxes(alwaysCreateLineBoxesNew);
202 } 202 }
203 203
204 // If we are changing to/from static, we need to reposition 204 // If we are changing to/from static, we need to reposition
205 // out-of-flow positioned descendants. 205 // out-of-flow positioned descendants.
206 if (oldStyle && oldStyle->position() != newStyle.position() && 206 if (oldStyle && oldStyle->position() != newStyle.position() &&
207 (newStyle.position() == StaticPosition || 207 (newStyle.position() == EPosition::kStatic ||
208 oldStyle->position() == StaticPosition)) { 208 oldStyle->position() == EPosition::kStatic)) {
209 LayoutBlock* absContainingBlock = nullptr; 209 LayoutBlock* absContainingBlock = nullptr;
210 if (oldStyle->position() == StaticPosition) { 210 if (oldStyle->position() == EPosition::kStatic) {
211 absContainingBlock = containingBlockForAbsolutePosition(); 211 absContainingBlock = containingBlockForAbsolutePosition();
212 } else { 212 } else {
213 // When position was not static, containingBlockForAbsolutePosition 213 // When position was not static, containingBlockForAbsolutePosition
214 // for our children is our existing containingBlock. 214 // for our children is our existing containingBlock.
215 absContainingBlock = containingBlock(); 215 absContainingBlock = containingBlock();
216 } 216 }
217 if (absContainingBlock) 217 if (absContainingBlock)
218 absContainingBlock->removePositionedObjects(this, NewContainingBlock); 218 absContainingBlock->removePositionedObjects(this, NewContainingBlock);
219 } 219 }
220 220
(...skipping 1297 matching lines...) Expand 10 before | Expand all | Expand 10 after
1518 paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason); 1518 paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason);
1519 } 1519 }
1520 1520
1521 // TODO(lunalu): Not to just dump 0, 0 as the x and y here 1521 // TODO(lunalu): Not to just dump 0, 0 as the x and y here
1522 LayoutRect LayoutInline::debugRect() const { 1522 LayoutRect LayoutInline::debugRect() const {
1523 IntRect linesBox = enclosingIntRect(linesBoundingBox()); 1523 IntRect linesBox = enclosingIntRect(linesBoundingBox());
1524 return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height())); 1524 return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height()));
1525 } 1525 }
1526 1526
1527 } // namespace blink 1527 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698