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 995 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1006 if (!inlineRunStart) | 1006 if (!inlineRunStart) |
1007 break; | 1007 break; |
1008 | 1008 |
1009 child = inlineRunEnd->nextSibling(); | 1009 child = inlineRunEnd->nextSibling(); |
1010 | 1010 |
1011 RenderBlock* block = createAnonymousBlock(); | 1011 RenderBlock* block = createAnonymousBlock(); |
1012 children()->insertChildNode(this, block, inlineRunStart); | 1012 children()->insertChildNode(this, block, inlineRunStart); |
1013 moveChildrenTo(block, inlineRunStart, child); | 1013 moveChildrenTo(block, inlineRunStart, child); |
1014 } | 1014 } |
1015 | 1015 |
1016 #ifndef NDEBUG | 1016 #if ENABLE(ASSERT) |
1017 for (RenderObject *c = firstChild(); c; c = c->nextSibling()) | 1017 for (RenderObject *c = firstChild(); c; c = c->nextSibling()) |
1018 ASSERT(!c->isInline()); | 1018 ASSERT(!c->isInline()); |
1019 #endif | 1019 #endif |
1020 | 1020 |
1021 paintInvalidationForWholeRenderer(); | 1021 paintInvalidationForWholeRenderer(); |
1022 } | 1022 } |
1023 | 1023 |
1024 void RenderBlock::removeLeftoverAnonymousBlock(RenderBlock* child) | 1024 void RenderBlock::removeLeftoverAnonymousBlock(RenderBlock* child) |
1025 { | 1025 { |
1026 ASSERT(child->isAnonymousBlock()); | 1026 ASSERT(child->isAnonymousBlock()); |
(...skipping 3883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4910 | 4910 |
4911 LayoutUnit oldClientAfterEdge = hasRenderOverflow() ? m_overflow->layoutClie
ntAfterEdge() : clientLogicalBottom(); | 4911 LayoutUnit oldClientAfterEdge = hasRenderOverflow() ? m_overflow->layoutClie
ntAfterEdge() : clientLogicalBottom(); |
4912 computeOverflow(oldClientAfterEdge, true); | 4912 computeOverflow(oldClientAfterEdge, true); |
4913 | 4913 |
4914 if (hasOverflowClip()) | 4914 if (hasOverflowClip()) |
4915 layer()->scrollableArea()->updateAfterOverflowRecalc(); | 4915 layer()->scrollableArea()->updateAfterOverflowRecalc(); |
4916 | 4916 |
4917 return !hasOverflowClip(); | 4917 return !hasOverflowClip(); |
4918 } | 4918 } |
4919 | 4919 |
4920 #ifndef NDEBUG | 4920 #if ENABLE(ASSERT) |
4921 void RenderBlock::checkPositionedObjectsNeedLayout() | 4921 void RenderBlock::checkPositionedObjectsNeedLayout() |
4922 { | 4922 { |
4923 if (!gPositionedDescendantsMap) | 4923 if (!gPositionedDescendantsMap) |
4924 return; | 4924 return; |
4925 | 4925 |
4926 if (TrackedRendererListHashSet* positionedDescendantSet = positionedObjects(
)) { | 4926 if (TrackedRendererListHashSet* positionedDescendantSet = positionedObjects(
)) { |
4927 TrackedRendererListHashSet::const_iterator end = positionedDescendantSet
->end(); | 4927 TrackedRendererListHashSet::const_iterator end = positionedDescendantSet
->end(); |
4928 for (TrackedRendererListHashSet::const_iterator it = positionedDescendan
tSet->begin(); it != end; ++it) { | 4928 for (TrackedRendererListHashSet::const_iterator it = positionedDescendan
tSet->begin(); it != end; ++it) { |
4929 RenderBox* currBox = *it; | 4929 RenderBox* currBox = *it; |
4930 ASSERT(!currBox->needsLayout()); | 4930 ASSERT(!currBox->needsLayout()); |
4931 } | 4931 } |
4932 } | 4932 } |
4933 } | 4933 } |
4934 | 4934 |
| 4935 #endif |
| 4936 |
| 4937 #ifndef NDEBUG |
| 4938 |
4935 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 4939 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
4936 { | 4940 { |
4937 showRenderObject(); | 4941 showRenderObject(); |
4938 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 4942 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
4939 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 4943 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
4940 } | 4944 } |
4941 | 4945 |
4942 #endif | 4946 #endif |
4943 | 4947 |
4944 } // namespace WebCore | 4948 } // namespace WebCore |
OLD | NEW |