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

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

Issue 300843010: Change clip rect computation for multicol (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('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 reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 2598 matching lines...) Expand 10 before | Expand all | Expand 10 after
2609 colRect.moveBy(layerOffset); 2609 colRect.moveBy(layerOffset);
2610 2610
2611 LayoutRect localDirtyRect(paintingInfo.paintDirtyRect); 2611 LayoutRect localDirtyRect(paintingInfo.paintDirtyRect);
2612 localDirtyRect.intersect(colRect); 2612 localDirtyRect.intersect(colRect);
2613 2613
2614 if (!localDirtyRect.isEmpty()) { 2614 if (!localDirtyRect.isEmpty()) {
2615 GraphicsContextStateSaver stateSaver(*context); 2615 GraphicsContextStateSaver stateSaver(*context);
2616 2616
2617 // Each strip pushes a clip, since column boxes are specified as bei ng 2617 // Each strip pushes a clip, since column boxes are specified as bei ng
2618 // like overflow:hidden. 2618 // like overflow:hidden.
2619 context->clip(pixelSnappedIntRect(colRect)); 2619 context->clip(enclosingIntRect(colRect));
2620 2620
2621 if (!colIndex) { 2621 if (!colIndex) {
2622 // Apply a translation transform to change where the layer paint s. 2622 // Apply a translation transform to change where the layer paint s.
2623 TransformationMatrix oldTransform; 2623 TransformationMatrix oldTransform;
2624 bool oldHasTransform = childLayer->transform(); 2624 bool oldHasTransform = childLayer->transform();
2625 if (oldHasTransform) 2625 if (oldHasTransform)
2626 oldTransform = *childLayer->transform(); 2626 oldTransform = *childLayer->transform();
2627 TransformationMatrix newTransform(oldTransform); 2627 TransformationMatrix newTransform(oldTransform);
2628 newTransform.translateRight(roundToInt(offset.width()), roundToI nt(offset.height())); 2628 newTransform.translateRight(roundToInt(offset.width()), roundToI nt(offset.height()));
2629 2629
(...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after
4021 } 4021 }
4022 } 4022 }
4023 4023
4024 void showLayerTree(const WebCore::RenderObject* renderer) 4024 void showLayerTree(const WebCore::RenderObject* renderer)
4025 { 4025 {
4026 if (!renderer) 4026 if (!renderer)
4027 return; 4027 return;
4028 showLayerTree(renderer->enclosingLayer()); 4028 showLayerTree(renderer->enclosingLayer());
4029 } 4029 }
4030 #endif 4030 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698