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

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

Issue 2521463002: Changed EBoxDirection to an enum class and renamed its members to keywords (Closed)
Patch Set: Rebase Created 4 years 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 * This file is part of the layout object implementation for KHTML. 2 * This file is part of the layout object implementation for KHTML.
3 * 3 *
4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
5 * (C) 1999 Antti Koivisto (koivisto@kde.org) 5 * (C) 1999 Antti Koivisto (koivisto@kde.org)
6 * Copyright (C) 2003 Apple Computer, Inc. 6 * Copyright (C) 2003 Apple Computer, Inc.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 25 matching lines...) Expand all
36 #include <algorithm> 36 #include <algorithm>
37 37
38 namespace blink { 38 namespace blink {
39 39
40 class FlexBoxIterator { 40 class FlexBoxIterator {
41 public: 41 public:
42 FlexBoxIterator(LayoutDeprecatedFlexibleBox* parent) 42 FlexBoxIterator(LayoutDeprecatedFlexibleBox* parent)
43 : m_box(parent), m_largestOrdinal(1) { 43 : m_box(parent), m_largestOrdinal(1) {
44 if (m_box->style()->boxOrient() == HORIZONTAL && 44 if (m_box->style()->boxOrient() == HORIZONTAL &&
45 !m_box->style()->isLeftToRightDirection()) 45 !m_box->style()->isLeftToRightDirection())
46 m_forward = m_box->style()->boxDirection() != BNORMAL; 46 m_forward = m_box->style()->boxDirection() != EBoxDirection::Normal;
47 else 47 else
48 m_forward = m_box->style()->boxDirection() == BNORMAL; 48 m_forward = m_box->style()->boxDirection() == EBoxDirection::Normal;
49 if (!m_forward) { 49 if (!m_forward) {
50 // No choice, since we're going backwards, we have to find out the highest 50 // No choice, since we're going backwards, we have to find out the highest
51 // ordinal up front. 51 // ordinal up front.
52 LayoutBox* child = m_box->firstChildBox(); 52 LayoutBox* child = m_box->firstChildBox();
53 while (child) { 53 while (child) {
54 if (child->style()->boxOrdinalGroup() > m_largestOrdinal) 54 if (child->style()->boxOrdinalGroup() > m_largestOrdinal)
55 m_largestOrdinal = child->style()->boxOrdinalGroup(); 55 m_largestOrdinal = child->style()->boxOrdinalGroup();
56 child = child->nextSiblingBox(); 56 child = child->nextSiblingBox();
57 } 57 }
58 } 58 }
(...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after
1265 if (minHeight.isFixed() || minHeight.isAuto()) { 1265 if (minHeight.isFixed() || minHeight.isAuto()) {
1266 LayoutUnit minHeight(child->style()->minHeight().value()); 1266 LayoutUnit minHeight(child->style()->minHeight().value());
1267 LayoutUnit height = contentHeightForChild(child); 1267 LayoutUnit height = contentHeightForChild(child);
1268 LayoutUnit allowedShrinkage = (minHeight - height).clampPositiveToZero(); 1268 LayoutUnit allowedShrinkage = (minHeight - height).clampPositiveToZero();
1269 return allowedShrinkage; 1269 return allowedShrinkage;
1270 } 1270 }
1271 return LayoutUnit(); 1271 return LayoutUnit();
1272 } 1272 }
1273 1273
1274 } // namespace blink 1274 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h ('k') | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698