OLD | NEW |
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) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
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 1715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1726 } | 1726 } |
1727 | 1727 |
1728 LayoutBlock* LayoutBlock::createAnonymousWithParentAndDisplay(const LayoutObject
* parent, EDisplay display) | 1728 LayoutBlock* LayoutBlock::createAnonymousWithParentAndDisplay(const LayoutObject
* parent, EDisplay display) |
1729 { | 1729 { |
1730 // FIXME: Do we need to convert all our inline displays to block-type in the
anonymous logic ? | 1730 // FIXME: Do we need to convert all our inline displays to block-type in the
anonymous logic ? |
1731 EDisplay newDisplay; | 1731 EDisplay newDisplay; |
1732 LayoutBlock* newBox = nullptr; | 1732 LayoutBlock* newBox = nullptr; |
1733 if (display == FLEX || display == INLINE_FLEX) { | 1733 if (display == FLEX || display == INLINE_FLEX) { |
1734 newBox = LayoutFlexibleBox::createAnonymous(&parent->document()); | 1734 newBox = LayoutFlexibleBox::createAnonymous(&parent->document()); |
1735 newDisplay = FLEX; | 1735 newDisplay = FLEX; |
| 1736 } else if (display == GRID || display == INLINE_GRID) { |
| 1737 newBox = LayoutGrid::createAnonymous(&parent->document()); |
| 1738 newDisplay = GRID; |
1736 } else { | 1739 } else { |
1737 newBox = LayoutBlockFlow::createAnonymous(&parent->document()); | 1740 newBox = LayoutBlockFlow::createAnonymous(&parent->document()); |
1738 newDisplay = BLOCK; | 1741 newDisplay = BLOCK; |
1739 } | 1742 } |
1740 | 1743 |
1741 RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisp
lay(parent->styleRef(), newDisplay); | 1744 RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisp
lay(parent->styleRef(), newDisplay); |
1742 parent->updateAnonymousChildStyle(*newBox, *newStyle); | 1745 parent->updateAnonymousChildStyle(*newBox, *newStyle); |
1743 newBox->setStyle(newStyle.release()); | 1746 newBox->setStyle(newStyle.release()); |
1744 return newBox; | 1747 return newBox; |
1745 } | 1748 } |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1864 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda
ntSet->begin(); it != end; ++it) { | 1867 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda
ntSet->begin(); it != end; ++it) { |
1865 LayoutBox* currBox = *it; | 1868 LayoutBox* currBox = *it; |
1866 ASSERT(!currBox->needsLayout()); | 1869 ASSERT(!currBox->needsLayout()); |
1867 } | 1870 } |
1868 } | 1871 } |
1869 } | 1872 } |
1870 | 1873 |
1871 #endif | 1874 #endif |
1872 | 1875 |
1873 } // namespace blink | 1876 } // namespace blink |
OLD | NEW |