Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 1623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1634 } | 1634 } |
| 1635 | 1635 |
| 1636 #if ENABLE(OILPAN) | 1636 #if ENABLE(OILPAN) |
| 1637 const FilterOperations& ComputedStyle::initialFilter() | 1637 const FilterOperations& ComputedStyle::initialFilter() |
| 1638 { | 1638 { |
| 1639 DEFINE_STATIC_LOCAL(Persistent<FilterOperationsWrapper>, ops, (FilterOperati onsWrapper::create())); | 1639 DEFINE_STATIC_LOCAL(Persistent<FilterOperationsWrapper>, ops, (FilterOperati onsWrapper::create())); |
| 1640 return ops->operations(); | 1640 return ops->operations(); |
| 1641 } | 1641 } |
| 1642 #endif | 1642 #endif |
| 1643 | 1643 |
| 1644 ColumnFill ComputedStyle::initialColumnFill() | |
| 1645 { | |
| 1646 if (RuntimeEnabledFeatures::columnFillEnabled()) | |
|
Julien - ping for review
2015/05/20 19:01:22
That means that we will check this flag for every
mstensho (USE GERRIT)
2015/05/20 19:30:42
Ouch, that's a good point. I don't wanna do it thi
| |
| 1647 return ColumnFillBalance; | |
| 1648 // If the column-fill property isn't enabled, we want the layout engine to u se column-fill:auto, | |
| 1649 // so that multicol containers with specified height don't get their columns balanced | |
| 1650 // (auto-height multicol containers will still get their columns balanced, e ven if column-fill | |
| 1651 // isn't 'balance' - in accordance with the spec). This behavior also matche s the old multicol | |
| 1652 // implementation, which has no support for this property. | |
|
Julien - ping for review
2015/05/20 19:01:22
That comment is weird. The specification seems to
mstensho (USE GERRIT)
2015/05/20 19:30:42
Well, a "bug" (or rather missing feature) in the o
esprehn
2015/05/20 20:26:55
This is the wrong place to fix this, you should fi
Julien - ping for review
2015/05/21 14:12:47
I don't agree, that's a super gross approach. It's
| |
| 1653 return ColumnFillAuto; | |
| 1654 } | |
| 1655 | |
| 1644 LayoutRectOutsets ComputedStyle::imageOutsets(const NinePieceImage& image) const | 1656 LayoutRectOutsets ComputedStyle::imageOutsets(const NinePieceImage& image) const |
| 1645 { | 1657 { |
| 1646 return LayoutRectOutsets( | 1658 return LayoutRectOutsets( |
| 1647 NinePieceImage::computeOutset(image.outset().top(), borderTopWidth()), | 1659 NinePieceImage::computeOutset(image.outset().top(), borderTopWidth()), |
| 1648 NinePieceImage::computeOutset(image.outset().right(), borderRightWidth() ), | 1660 NinePieceImage::computeOutset(image.outset().right(), borderRightWidth() ), |
| 1649 NinePieceImage::computeOutset(image.outset().bottom(), borderBottomWidth ()), | 1661 NinePieceImage::computeOutset(image.outset().bottom(), borderBottomWidth ()), |
| 1650 NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth())) ; | 1662 NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth())) ; |
| 1651 } | 1663 } |
| 1652 | 1664 |
| 1653 void ComputedStyle::setBorderImageSource(PassRefPtr<StyleImage> image) | 1665 void ComputedStyle::setBorderImageSource(PassRefPtr<StyleImage> image) |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1736 } | 1748 } |
| 1737 | 1749 |
| 1738 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) | 1750 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) |
| 1739 { | 1751 { |
| 1740 setEmptyState(other.emptyState()); | 1752 setEmptyState(other.emptyState()); |
| 1741 if (other.hasExplicitlyInheritedProperties()) | 1753 if (other.hasExplicitlyInheritedProperties()) |
| 1742 setHasExplicitlyInheritedProperties(); | 1754 setHasExplicitlyInheritedProperties(); |
| 1743 } | 1755 } |
| 1744 | 1756 |
| 1745 } // namespace blink | 1757 } // namespace blink |
| OLD | NEW |