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 1369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1380 } | 1380 } |
1381 } | 1381 } |
1382 | 1382 |
1383 void RenderBlock::layout() | 1383 void RenderBlock::layout() |
1384 { | 1384 { |
1385 OverflowEventDispatcher dispatcher(this); | 1385 OverflowEventDispatcher dispatcher(this); |
1386 | 1386 |
1387 // Update our first letter info now. | 1387 // Update our first letter info now. |
1388 updateFirstLetter(); | 1388 updateFirstLetter(); |
1389 | 1389 |
1390 bool relayoutChildren = false; | |
1391 | |
1392 // If CustomScrollbar Rect is changed, RenderBlock and child needs reLayout. | |
1393 if (hasOverflowClip()) | |
1394 relayoutChildren |= layer()->scrollableArea()->didCustomScrollbarRectCha nged(); | |
skobes
2014/11/13 18:14:26
RenderBlockFlow::layoutBlockFlow has logic to forc
MuVen
2014/11/13 20:34:10
I have added a variable in the RenderBox to inform
| |
1395 | |
1390 // Table cells call layoutBlock directly, so don't add any logic here. Put code into | 1396 // Table cells call layoutBlock directly, so don't add any logic here. Put code into |
1391 // layoutBlock(). | 1397 // layoutBlock(). |
1392 layoutBlock(false); | 1398 layoutBlock(relayoutChildren); |
1393 | 1399 |
1394 // It's safe to check for control clip here, since controls can never be tab le cells. | 1400 // It's safe to check for control clip here, since controls can never be tab le cells. |
1395 // If we have a lightweight clip, there can never be any overflow from child ren. | 1401 // If we have a lightweight clip, there can never be any overflow from child ren. |
1396 if (hasControlClip() && m_overflow) | 1402 if (hasControlClip() && m_overflow) |
1397 clearLayoutOverflow(); | 1403 clearLayoutOverflow(); |
1398 | 1404 |
1399 invalidateBackgroundObscurationStatus(); | 1405 invalidateBackgroundObscurationStatus(); |
1400 } | 1406 } |
1401 | 1407 |
1402 bool RenderBlock::updateImageLoadingPriorities() | 1408 bool RenderBlock::updateImageLoadingPriorities() |
(...skipping 3007 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4410 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const | 4416 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const |
4411 { | 4417 { |
4412 showRenderObject(); | 4418 showRenderObject(); |
4413 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) | 4419 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) |
4414 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); | 4420 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); |
4415 } | 4421 } |
4416 | 4422 |
4417 #endif | 4423 #endif |
4418 | 4424 |
4419 } // namespace blink | 4425 } // namespace blink |
OLD | NEW |