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

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

Issue 2370673002: Changed EDisplay to an enum class and renamed its members to be keywords (Closed)
Patch Set: Comment Created 4 years, 2 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 2804 matching lines...) Expand 10 before | Expand all | Expand 10 after
2815 if (isHorizontalWritingMode() != containingBlock->isHorizontalWritingMode()) 2815 if (isHorizontalWritingMode() != containingBlock->isHorizontalWritingMode())
2816 return false; 2816 return false;
2817 2817
2818 // Anonymous blocks should not impede percentage resolution on a child. Exam ples of such 2818 // Anonymous blocks should not impede percentage resolution on a child. Exam ples of such
2819 // anonymous blocks are blocks wrapped around inlines that have block siblin gs (from the CSS 2819 // anonymous blocks are blocks wrapped around inlines that have block siblin gs (from the CSS
2820 // spec) and multicol flow threads (an implementation detail). Another imple mentation detail, 2820 // spec) and multicol flow threads (an implementation detail). Another imple mentation detail,
2821 // ruby runs, create anonymous inline-blocks, so skip those too. All other t ypes of anonymous 2821 // ruby runs, create anonymous inline-blocks, so skip those too. All other t ypes of anonymous
2822 // objects, such as table-cells, will be treated just as if they were non-an onymous. 2822 // objects, such as table-cells, will be treated just as if they were non-an onymous.
2823 if (containingBlock->isAnonymous()) { 2823 if (containingBlock->isAnonymous()) {
2824 EDisplay display = containingBlock->styleRef().display(); 2824 EDisplay display = containingBlock->styleRef().display();
2825 return display == BLOCK || display == INLINE_BLOCK; 2825 return display == EDisplay::Block || display == EDisplay::InlineBlock;
2826 } 2826 }
2827 2827
2828 // For quirks mode, we skip most auto-height containing blocks when computin g percentages. 2828 // For quirks mode, we skip most auto-height containing blocks when computin g percentages.
2829 return document().inQuirksMode() && !containingBlock->isTableCell() && !cont ainingBlock->isOutOfFlowPositioned() && !containingBlock->isLayoutGrid() && cont ainingBlock->style()->logicalHeight().isAuto(); 2829 return document().inQuirksMode() && !containingBlock->isTableCell() && !cont ainingBlock->isOutOfFlowPositioned() && !containingBlock->isLayoutGrid() && cont ainingBlock->style()->logicalHeight().isAuto();
2830 } 2830 }
2831 2831
2832 LayoutUnit LayoutBox::computePercentageLogicalHeight(const Length& height) const 2832 LayoutUnit LayoutBox::computePercentageLogicalHeight(const Length& height) const
2833 { 2833 {
2834 LayoutBlock* cb = containingBlock(); 2834 LayoutBlock* cb = containingBlock();
2835 const LayoutBox* containingBlockChild = this; 2835 const LayoutBox* containingBlockChild = this;
(...skipping 2043 matching lines...) Expand 10 before | Expand all | Expand 10 after
4879 LayoutRect rect = frameRect(); 4879 LayoutRect rect = frameRect();
4880 4880
4881 LayoutBlock* block = containingBlock(); 4881 LayoutBlock* block = containingBlock();
4882 if (block) 4882 if (block)
4883 block->adjustChildDebugRect(rect); 4883 block->adjustChildDebugRect(rect);
4884 4884
4885 return rect; 4885 return rect;
4886 } 4886 }
4887 4887
4888 } // namespace blink 4888 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698