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

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

Issue 2670643004: Rename EDisplay values with k prefix. (Closed)
Patch Set: Rebase Created 3 years, 9 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 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. 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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 // The element's parent needs to relayout so that it calls LayoutBlockFlow:: 309 // The element's parent needs to relayout so that it calls LayoutBlockFlow::
310 // setStaticInlinePositionForChild with the out-of-flow-positioned child, so 310 // setStaticInlinePositionForChild with the out-of-flow-positioned child, so
311 // that when it's laid out, its LayoutBox::computePositionedLogicalWidth/ 311 // that when it's laid out, its LayoutBox::computePositionedLogicalWidth/
312 // Height takes into account its new inline/block position rather than its old 312 // Height takes into account its new inline/block position rather than its old
313 // block/inline position. 313 // block/inline position.
314 // Position changes and other types of display changes are handled elsewhere. 314 // Position changes and other types of display changes are handled elsewhere.
315 if (oldStyle && isOutOfFlowPositioned() && parent() && 315 if (oldStyle && isOutOfFlowPositioned() && parent() &&
316 (parent() != containingBlock()) && 316 (parent() != containingBlock()) &&
317 (styleRef().position() == oldStyle->position()) && 317 (styleRef().position() == oldStyle->position()) &&
318 (styleRef().originalDisplay() != oldStyle->originalDisplay()) && 318 (styleRef().originalDisplay() != oldStyle->originalDisplay()) &&
319 ((styleRef().originalDisplay() == EDisplay::Block) || 319 ((styleRef().originalDisplay() == EDisplay::kBlock) ||
320 (styleRef().originalDisplay() == EDisplay::InlineBlock)) && 320 (styleRef().originalDisplay() == EDisplay::kInlineBlock)) &&
321 ((oldStyle->originalDisplay() == EDisplay::Block) || 321 ((oldStyle->originalDisplay() == EDisplay::kBlock) ||
322 (oldStyle->originalDisplay() == EDisplay::InlineBlock))) 322 (oldStyle->originalDisplay() == EDisplay::kInlineBlock)))
323 parent()->setNeedsLayout(LayoutInvalidationReason::ChildChanged, 323 parent()->setNeedsLayout(LayoutInvalidationReason::ChildChanged,
324 MarkContainerChain); 324 MarkContainerChain);
325 325
326 PaintLayerType type = layerTypeRequired(); 326 PaintLayerType type = layerTypeRequired();
327 if (type != NoPaintLayer) { 327 if (type != NoPaintLayer) {
328 if (!layer() && layerCreationAllowedForSubtree()) { 328 if (!layer() && layerCreationAllowedForSubtree()) {
329 if (wasFloatingBeforeStyleChanged && isFloating()) 329 if (wasFloatingBeforeStyleChanged && isFloating())
330 setChildNeedsLayout(); 330 setChildNeedsLayout();
331 createLayer(); 331 createLayer();
332 if (parent() && !needsLayout()) { 332 if (parent() && !needsLayout()) {
(...skipping 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after
1468 if (rootElementStyle->hasBackground()) 1468 if (rootElementStyle->hasBackground())
1469 return false; 1469 return false;
1470 1470
1471 if (node() != document().firstBodyElement()) 1471 if (node() != document().firstBodyElement())
1472 return false; 1472 return false;
1473 1473
1474 return true; 1474 return true;
1475 } 1475 }
1476 1476
1477 } // namespace blink 1477 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutFullScreen.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698