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

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

Issue 612363002: Let the RenderFlowThread layer have an empty size. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed nits Created 6 years, 2 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 | « LayoutTests/fast/multicol/composited-layer-expected.txt ('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 3129 matching lines...) Expand 10 before | Expand all | Expand 10 after
3140 ancestorLayer = this; 3140 ancestorLayer = this;
3141 3141
3142 // FIXME: This could be improved to do a check like hasVisibleNonCompositing DescendantLayers() (bug 92580). 3142 // FIXME: This could be improved to do a check like hasVisibleNonCompositing DescendantLayers() (bug 92580).
3143 if (this != ancestorLayer && !hasVisibleContent() && !hasVisibleDescendant() ) 3143 if (this != ancestorLayer && !hasVisibleContent() && !hasVisibleDescendant() )
3144 return LayoutRect(); 3144 return LayoutRect();
3145 3145
3146 // The root layer is always just the size of the document. 3146 // The root layer is always just the size of the document.
3147 if (isRootLayer()) 3147 if (isRootLayer())
3148 return m_renderer->view()->unscaledDocumentRect(); 3148 return m_renderer->view()->unscaledDocumentRect();
3149 3149
3150 // The layer created for the RenderFlowThread is just a helper for painting and hit-testing,
3151 // and should not contribute to the bounding box. The RenderMultiColumnSets will contribute
3152 // the correct size for the rendered content of the multicol container.
3153 if (useRegionBasedColumns() && renderer()->isRenderFlowThread())
3154 return LayoutRect();
3155
3150 const bool shouldIncludeTransform = paintsWithTransform(PaintBehaviorNormal) || (options == ApplyBoundsChickenEggHacks && transform()); 3156 const bool shouldIncludeTransform = paintsWithTransform(PaintBehaviorNormal) || (options == ApplyBoundsChickenEggHacks && transform());
3151 3157
3152 LayoutRect localClipRect = clipper().localClipRect(); 3158 LayoutRect localClipRect = clipper().localClipRect();
3153 if (localClipRect != PaintInfo::infiniteRect()) { 3159 if (localClipRect != PaintInfo::infiniteRect()) {
3154 if (shouldIncludeTransform) 3160 if (shouldIncludeTransform)
3155 localClipRect = transform()->mapRect(localClipRect); 3161 localClipRect = transform()->mapRect(localClipRect);
3156 3162
3157 LayoutPoint delta; 3163 LayoutPoint delta;
3158 convertToLayerCoords(ancestorLayer, delta); 3164 convertToLayerCoords(ancestorLayer, delta);
3159 localClipRect.moveBy(delta); 3165 localClipRect.moveBy(delta);
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
3696 } 3702 }
3697 } 3703 }
3698 3704
3699 void showLayerTree(const blink::RenderObject* renderer) 3705 void showLayerTree(const blink::RenderObject* renderer)
3700 { 3706 {
3701 if (!renderer) 3707 if (!renderer)
3702 return; 3708 return;
3703 showLayerTree(renderer->enclosingLayer()); 3709 showLayerTree(renderer->enclosingLayer());
3704 } 3710 }
3705 #endif 3711 #endif
OLDNEW
« no previous file with comments | « LayoutTests/fast/multicol/composited-layer-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698