Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(422)

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 203463007: Recompute overflow after transform changes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1498 matching lines...) Expand 10 before | Expand all | Expand 10 after
1509 } else { 1509 } else {
1510 ColumnInfo* colInfo = columnInfo(); 1510 ColumnInfo* colInfo = columnInfo();
1511 if (columnCount(colInfo)) { 1511 if (columnCount(colInfo)) {
1512 LayoutRect lastRect = columnRectAt(colInfo, columnCount(colInfo) - 1 ); 1512 LayoutRect lastRect = columnRectAt(colInfo, columnCount(colInfo) - 1 );
1513 addLayoutOverflow(lastRect); 1513 addLayoutOverflow(lastRect);
1514 addContentsVisualOverflow(lastRect); 1514 addContentsVisualOverflow(lastRect);
1515 } 1515 }
1516 } 1516 }
1517 } 1517 }
1518 1518
1519 void RenderBlock::updateOverflowForTransform()
1520 {
1521 LayoutUnit oldClientAfterEdge = hasRenderOverflow() ? m_overflow->layoutClie ntAfterEdge() : clientLogicalBottom();
1522 computeOverflow(oldClientAfterEdge, true);
1523 if (hasOverflowClip())
1524 layer()->scrollableArea()->updateAfterOverflowRecalc();
1525 }
1526
1519 void RenderBlock::computeOverflow(LayoutUnit oldClientAfterEdge, bool) 1527 void RenderBlock::computeOverflow(LayoutUnit oldClientAfterEdge, bool)
1520 { 1528 {
1521 m_overflow.clear(); 1529 m_overflow.clear();
1522 1530
1523 // Add overflow from children. 1531 // Add overflow from children.
1524 addOverflowFromChildren(); 1532 addOverflowFromChildren();
1525 1533
1526 // Add in the overflow from positioned objects. 1534 // Add in the overflow from positioned objects.
1527 addOverflowFromPositionedObjects(); 1535 addOverflowFromPositionedObjects();
1528 1536
(...skipping 3492 matching lines...) Expand 10 before | Expand all | Expand 10 after
5021 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5029 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5022 { 5030 {
5023 showRenderObject(); 5031 showRenderObject();
5024 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5032 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5025 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5033 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5026 } 5034 }
5027 5035
5028 #endif 5036 #endif
5029 5037
5030 } // namespace WebCore 5038 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698