Chromium Code Reviews| 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 3568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3579 | 3579 |
| 3580 int scrollbarWidth = instrinsicScrollbarLogicalWidth(); | 3580 int scrollbarWidth = instrinsicScrollbarLogicalWidth(); |
| 3581 maxLogicalWidth += scrollbarWidth; | 3581 maxLogicalWidth += scrollbarWidth; |
| 3582 minLogicalWidth += scrollbarWidth; | 3582 minLogicalWidth += scrollbarWidth; |
| 3583 } | 3583 } |
| 3584 | 3584 |
| 3585 void RenderBlock::computePreferredLogicalWidths() | 3585 void RenderBlock::computePreferredLogicalWidths() |
| 3586 { | 3586 { |
| 3587 ASSERT(preferredLogicalWidthsDirty()); | 3587 ASSERT(preferredLogicalWidthsDirty()); |
| 3588 | 3588 |
| 3589 updateFirstLetter(); | |
|
esprehn
2014/07/14 22:55:01
If you don't call updateFirstLetter() when computi
| |
| 3590 | |
| 3591 m_minPreferredLogicalWidth = 0; | 3589 m_minPreferredLogicalWidth = 0; |
| 3592 m_maxPreferredLogicalWidth = 0; | 3590 m_maxPreferredLogicalWidth = 0; |
| 3593 | 3591 |
| 3594 // FIXME: The isFixed() calls here should probably be checking for isSpecifi ed since you | 3592 // FIXME: The isFixed() calls here should probably be checking for isSpecifi ed since you |
| 3595 // should be able to use percentage, calc or viewport relative values for wi dth. | 3593 // should be able to use percentage, calc or viewport relative values for wi dth. |
| 3596 RenderStyle* styleToUse = style(); | 3594 RenderStyle* styleToUse = style(); |
| 3597 if (!isTableCell() && styleToUse->logicalWidth().isFixed() && styleToUse->lo gicalWidth().value() >= 0 | 3595 if (!isTableCell() && styleToUse->logicalWidth().isFixed() && styleToUse->lo gicalWidth().value() >= 0 |
| 3598 && !(isDeprecatedFlexItem() && !styleToUse->logicalWidth().intValue())) | 3596 && !(isDeprecatedFlexItem() && !styleToUse->logicalWidth().intValue())) |
| 3599 m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentB oxLogicalWidthForBoxSizing(styleToUse->logicalWidth().value()); | 3597 m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentB oxLogicalWidthForBoxSizing(styleToUse->logicalWidth().value()); |
| 3600 else | 3598 else |
| (...skipping 1438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5039 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const | 5037 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const |
| 5040 { | 5038 { |
| 5041 showRenderObject(); | 5039 showRenderObject(); |
| 5042 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) | 5040 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) |
| 5043 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); | 5041 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); |
| 5044 } | 5042 } |
| 5045 | 5043 |
| 5046 #endif | 5044 #endif |
| 5047 | 5045 |
| 5048 } // namespace WebCore | 5046 } // namespace WebCore |
| OLD | NEW |