| OLD | NEW |
| 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 15 matching lines...) Expand all Loading... |
| 26 #include "core/layout/LayoutDeprecatedFlexibleBox.h" | 26 #include "core/layout/LayoutDeprecatedFlexibleBox.h" |
| 27 | 27 |
| 28 #include "core/frame/UseCounter.h" | 28 #include "core/frame/UseCounter.h" |
| 29 #include "core/layout/LayoutView.h" | 29 #include "core/layout/LayoutView.h" |
| 30 #include "core/layout/TextAutosizer.h" | 30 #include "core/layout/TextAutosizer.h" |
| 31 #include "core/layout/TextRunConstructor.h" | 31 #include "core/layout/TextRunConstructor.h" |
| 32 #include "core/paint/PaintLayer.h" | 32 #include "core/paint/PaintLayer.h" |
| 33 #include "platform/fonts/Font.h" | 33 #include "platform/fonts/Font.h" |
| 34 #include "wtf/StdLibExtras.h" | 34 #include "wtf/StdLibExtras.h" |
| 35 #include "wtf/text/CharacterNames.h" | 35 #include "wtf/text/CharacterNames.h" |
| 36 #include <algorithm> |
| 36 | 37 |
| 37 namespace blink { | 38 namespace blink { |
| 38 | 39 |
| 39 class FlexBoxIterator { | 40 class FlexBoxIterator { |
| 40 public: | 41 public: |
| 41 FlexBoxIterator(LayoutDeprecatedFlexibleBox* parent) | 42 FlexBoxIterator(LayoutDeprecatedFlexibleBox* parent) |
| 42 : m_box(parent) | 43 : m_box(parent) |
| 43 , m_largestOrdinal(1) | 44 , m_largestOrdinal(1) |
| 44 { | 45 { |
| 45 if (m_box->style()->boxOrient() == HORIZONTAL && !m_box->style()->isLeft
ToRightDirection()) | 46 if (m_box->style()->boxOrient() == HORIZONTAL && !m_box->style()->isLeft
ToRightDirection()) |
| (...skipping 949 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 995 if (minHeight.isFixed() || minHeight.isAuto()) { | 996 if (minHeight.isFixed() || minHeight.isAuto()) { |
| 996 LayoutUnit minHeight = child->style()->minHeight().value(); | 997 LayoutUnit minHeight = child->style()->minHeight().value(); |
| 997 LayoutUnit height = contentHeightForChild(child); | 998 LayoutUnit height = contentHeightForChild(child); |
| 998 LayoutUnit allowedShrinkage = std::min<LayoutUnit>(0, minHeight - height
); | 999 LayoutUnit allowedShrinkage = std::min<LayoutUnit>(0, minHeight - height
); |
| 999 return allowedShrinkage; | 1000 return allowedShrinkage; |
| 1000 } | 1001 } |
| 1001 return 0; | 1002 return 0; |
| 1002 } | 1003 } |
| 1003 | 1004 |
| 1004 } // namespace blink | 1005 } // namespace blink |
| OLD | NEW |