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 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
677 if (newLeft != box->logicalLeft()) | 677 if (newLeft != box->logicalLeft()) |
678 layoutScope.setChildNeedsLayout(child); | 678 layoutScope.setChildNeedsLayout(child); |
679 } else if (hasStaticBlockPosition) { | 679 } else if (hasStaticBlockPosition) { |
680 LayoutUnit oldTop = box->logicalTop(); | 680 LayoutUnit oldTop = box->logicalTop(); |
681 box->updateLogicalHeight(); | 681 box->updateLogicalHeight(); |
682 if (box->logicalTop() != oldTop) | 682 if (box->logicalTop() != oldTop) |
683 layoutScope.setChildNeedsLayout(child); | 683 layoutScope.setChildNeedsLayout(child); |
684 } | 684 } |
685 } | 685 } |
686 | 686 |
687 LayoutUnit LayoutBlock::marginIntrinsicLogicalWidthForChild(LayoutBox& child) co
nst | 687 LayoutUnit LayoutBlock::marginIntrinsicLogicalWidthForChild(const LayoutBox& chi
ld) const |
688 { | 688 { |
689 // A margin has three types: fixed, percentage, and auto (variable). | 689 // A margin has three types: fixed, percentage, and auto (variable). |
690 // Auto and percentage margins become 0 when computing min/max width. | 690 // Auto and percentage margins become 0 when computing min/max width. |
691 // Fixed margins can be added in as is. | 691 // Fixed margins can be added in as is. |
692 Length marginLeft = child.style()->marginStartUsing(style()); | 692 Length marginLeft = child.style()->marginStartUsing(style()); |
693 Length marginRight = child.style()->marginEndUsing(style()); | 693 Length marginRight = child.style()->marginEndUsing(style()); |
694 LayoutUnit margin; | 694 LayoutUnit margin; |
695 if (marginLeft.isFixed()) | 695 if (marginLeft.isFixed()) |
696 margin += marginLeft.value(); | 696 margin += marginLeft.value(); |
697 if (marginRight.isFixed()) | 697 if (marginRight.isFixed()) |
(...skipping 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1913 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda
ntSet->begin(); it != end; ++it) { | 1913 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda
ntSet->begin(); it != end; ++it) { |
1914 LayoutBox* currBox = *it; | 1914 LayoutBox* currBox = *it; |
1915 ASSERT(!currBox->needsLayout()); | 1915 ASSERT(!currBox->needsLayout()); |
1916 } | 1916 } |
1917 } | 1917 } |
1918 } | 1918 } |
1919 | 1919 |
1920 #endif | 1920 #endif |
1921 | 1921 |
1922 } // namespace blink | 1922 } // namespace blink |
OLD | NEW |