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

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayer.cpp

Issue 2643123004: Don't cancel out scroll offset when calculating the clip rectangle for multicol. (Closed)
Patch Set: The new test is expected to fail with SlimmingPaintV2 Created 3 years, 11 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
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/multicol/scrollable-basic-expected.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * 4 *
5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
6 * 6 *
7 * Other contributors: 7 * Other contributors:
8 * Robert O'Callahan <roc+@cs.cmu.edu> 8 * Robert O'Callahan <roc+@cs.cmu.edu>
9 * David Baron <dbaron@fas.harvard.edu> 9 * David Baron <dbaron@fas.harvard.edu>
10 * Christian Biesinger <cbiesinger@web.de> 10 * Christian Biesinger <cbiesinger@web.de>
(...skipping 1617 matching lines...) Expand 10 before | Expand all | Expand 10 after
1628 // context and the root layer. 1628 // context and the root layer.
1629 offsetOfPaginationLayerFromRoot = 1629 offsetOfPaginationLayerFromRoot =
1630 -rootLayer->visualOffsetFromAncestor(enclosingPaginationLayer()); 1630 -rootLayer->visualOffsetFromAncestor(enclosingPaginationLayer());
1631 } else { 1631 } else {
1632 offsetOfPaginationLayerFromRoot = 1632 offsetOfPaginationLayerFromRoot =
1633 enclosingPaginationLayer()->visualOffsetFromAncestor(rootLayer); 1633 enclosingPaginationLayer()->visualOffsetFromAncestor(rootLayer);
1634 } 1634 }
1635 // Make the dirty rect relative to the fragmentation context (multicol 1635 // Make the dirty rect relative to the fragmentation context (multicol
1636 // container, etc.). 1636 // container, etc.).
1637 LayoutRect dirtyRectInMulticolContainer(dirtyRect); 1637 LayoutRect dirtyRectInMulticolContainer(dirtyRect);
1638 dirtyRectInMulticolContainer.move(enclosingPaginationLayer()->location() - 1638 dirtyRectInMulticolContainer.move(enclosingFlowThread->physicalLocation() -
1639 offsetOfPaginationLayerFromRoot); 1639 offsetOfPaginationLayerFromRoot);
1640 1640
1641 // Slice the layer into fragments. Each fragment needs to be processed (e.g. 1641 // Slice the layer into fragments. Each fragment needs to be processed (e.g.
1642 // painted) separately. We pass enough information to walk a minimal number of 1642 // painted) separately. We pass enough information to walk a minimal number of
1643 // fragments based on the pages/columns that intersect the actual dirtyRect as 1643 // fragments based on the pages/columns that intersect the actual dirtyRect as
1644 // well as the pages/columns that intersect our layer's bounding box. 1644 // well as the pages/columns that intersect our layer's bounding box.
1645 FragmentainerIterator iterator(*enclosingFlowThread, 1645 FragmentainerIterator iterator(*enclosingFlowThread,
1646 layerBoundingBoxInFlowThread, 1646 layerBoundingBoxInFlowThread,
1647 dirtyRectInMulticolContainer); 1647 dirtyRectInMulticolContainer);
1648 if (iterator.atEnd()) 1648 if (iterator.atEnd())
(...skipping 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after
3221 } 3221 }
3222 3222
3223 void showLayerTree(const blink::LayoutObject* layoutObject) { 3223 void showLayerTree(const blink::LayoutObject* layoutObject) {
3224 if (!layoutObject) { 3224 if (!layoutObject) {
3225 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; 3225 LOG(INFO) << "Cannot showLayerTree. Root is (nil)";
3226 return; 3226 return;
3227 } 3227 }
3228 showLayerTree(layoutObject->enclosingLayer()); 3228 showLayerTree(layoutObject->enclosingLayer());
3229 } 3229 }
3230 #endif 3230 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/multicol/scrollable-basic-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698