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 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. | 4 * Copyright (C) 2003, 2006, 2007 Apple Inc. 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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
523 LayoutRectRecorder recorder(*this); | 523 LayoutRectRecorder recorder(*this); |
524 LayoutUnit oldWidth = width(); | 524 LayoutUnit oldWidth = width(); |
525 updateLogicalWidth(); | 525 updateLogicalWidth(); |
526 // If we shrink to fit our width may have changed, so we still need full layout. | 526 // If we shrink to fit our width may have changed, so we still need full layout. |
527 if (oldWidth != width()) | 527 if (oldWidth != width()) |
528 return false; | 528 return false; |
529 updateLogicalHeight(); | 529 updateLogicalHeight(); |
530 return true; | 530 return true; |
531 } | 531 } |
532 | 532 |
533 bool tryLayoutDoingResizeOnly() | |
534 { | |
535 // FIXME: For now this is for RenderView only. Needs more verifications before applied to generic objects. | |
536 ASSERT(isRenderView()); | |
537 // For now what needed to do happens to be the same as tryLayoutDoingPos itionedMovementOnly() does. | |
538 return tryLayoutDoingPositionedMovementOnly(); | |
Julien - ping for review
2014/03/21 19:39:10
I don't think this is fundamentally right to do a
Xianzhu
2014/03/21 20:10:36
Actually the intent is not to do a position moveme
| |
539 } | |
540 | |
533 LayoutRect maskClipRect(); | 541 LayoutRect maskClipRect(); |
534 | 542 |
535 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) OVERRIDE; | 543 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) OVERRIDE; |
536 | 544 |
537 void removeFloatingOrPositionedChildFromBlockLists(); | 545 void removeFloatingOrPositionedChildFromBlockLists(); |
538 | 546 |
539 RenderLayer* enclosingFloatPaintingLayer() const; | 547 RenderLayer* enclosingFloatPaintingLayer() const; |
540 | 548 |
541 virtual int firstLineBoxBaseline() const { return -1; } | 549 virtual int firstLineBoxBaseline() const { return -1; } |
542 virtual int inlineBlockBaseline(LineDirectionMode) const { return -1; } // R eturns -1 if we should skip this box when computing the baseline of an inline-bl ock. | 550 virtual int inlineBlockBaseline(LineDirectionMode) const { return -1; } // R eturns -1 if we should skip this box when computing the baseline of an inline-bl ock. |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
778 if (UNLIKELY(inlineBoxWrapper() != 0)) | 786 if (UNLIKELY(inlineBoxWrapper() != 0)) |
779 deleteLineBoxWrapper(); | 787 deleteLineBoxWrapper(); |
780 } | 788 } |
781 | 789 |
782 ensureRareData().m_inlineBoxWrapper = boxWrapper; | 790 ensureRareData().m_inlineBoxWrapper = boxWrapper; |
783 } | 791 } |
784 | 792 |
785 } // namespace WebCore | 793 } // namespace WebCore |
786 | 794 |
787 #endif // RenderBox_h | 795 #endif // RenderBox_h |
OLD | NEW |