| 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 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 void RenderBlock::layout() | 308 void RenderBlock::layout() |
| 309 { | 309 { |
| 310 // Table cells call layoutBlock directly, so don't add any logic here. Put
code into | 310 // Table cells call layoutBlock directly, so don't add any logic here. Put
code into |
| 311 // layoutBlock(). | 311 // layoutBlock(). |
| 312 layoutBlock(false); | 312 layoutBlock(false); |
| 313 | 313 |
| 314 // It's safe to check for control clip here, since controls can never be tab
le cells. | 314 // It's safe to check for control clip here, since controls can never be tab
le cells. |
| 315 // If we have a lightweight clip, there can never be any overflow from child
ren. | 315 // If we have a lightweight clip, there can never be any overflow from child
ren. |
| 316 if (hasControlClip() && m_overflow) | 316 if (hasControlClip() && m_overflow) |
| 317 clearLayoutOverflow(); | 317 clearLayoutOverflow(); |
| 318 | |
| 319 invalidateBackgroundObscurationStatus(); | |
| 320 } | 318 } |
| 321 | 319 |
| 322 bool RenderBlock::widthAvailableToChildrenHasChanged() | 320 bool RenderBlock::widthAvailableToChildrenHasChanged() |
| 323 { | 321 { |
| 324 bool widthAvailableToChildrenHasChanged = m_hasBorderOrPaddingLogicalWidthCh
anged; | 322 bool widthAvailableToChildrenHasChanged = m_hasBorderOrPaddingLogicalWidthCh
anged; |
| 325 m_hasBorderOrPaddingLogicalWidthChanged = false; | 323 m_hasBorderOrPaddingLogicalWidthChanged = false; |
| 326 | 324 |
| 327 // If we use border-box sizing, have percentage padding, and our parent has
changed width then the width available to our children has changed even | 325 // If we use border-box sizing, have percentage padding, and our parent has
changed width then the width available to our children has changed even |
| 328 // though our own width has remained the same. | 326 // though our own width has remained the same. |
| 329 widthAvailableToChildrenHasChanged |= style()->boxSizing() == BORDER_BOX &&
needsPreferredWidthsRecalculation() && view()->layoutState()->containingBlockLog
icalWidthChanged(); | 327 widthAvailableToChildrenHasChanged |= style()->boxSizing() == BORDER_BOX &&
needsPreferredWidthsRecalculation() && view()->layoutState()->containingBlockLog
icalWidthChanged(); |
| (...skipping 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1948 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 1946 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
| 1949 { | 1947 { |
| 1950 showRenderObject(); | 1948 showRenderObject(); |
| 1951 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 1949 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 1952 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 1950 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 1953 } | 1951 } |
| 1954 | 1952 |
| 1955 #endif | 1953 #endif |
| 1956 | 1954 |
| 1957 } // namespace blink | 1955 } // namespace blink |
| OLD | NEW |