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

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

Issue 655003005: [New Multicolumn] boundingBoxForCompositingOverlapTest() needs to use fragmentsBoundingBox(). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add tests for vertical-rl and vertical-lr. The verical-rl one fails currently. Created 6 years, 1 month 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/vertical-rl/composited-relpos-overlapping-will-change-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 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 2265 matching lines...) Expand 10 before | Expand all | Expand 10 after
2276 if (!enclosingPaginationLayer()) 2276 if (!enclosingPaginationLayer())
2277 return physicalBoundingBox(ancestorLayer); 2277 return physicalBoundingBox(ancestorLayer);
2278 2278
2279 LayoutRect result = flippedLogicalBoundingBox(logicalBoundingBox(), renderer ()); 2279 LayoutRect result = flippedLogicalBoundingBox(logicalBoundingBox(), renderer ());
2280 convertFromFlowThreadToVisualBoundingBoxInAncestor(this, ancestorLayer, resu lt); 2280 convertFromFlowThreadToVisualBoundingBoxInAncestor(this, ancestorLayer, resu lt);
2281 return result; 2281 return result;
2282 } 2282 }
2283 2283
2284 LayoutRect RenderLayer::boundingBoxForCompositingOverlapTest() const 2284 LayoutRect RenderLayer::boundingBoxForCompositingOverlapTest() const
2285 { 2285 {
2286 return overlapBoundsIncludeChildren() ? boundingBoxForCompositing() : flippe dLogicalBoundingBox(logicalBoundingBox(), renderer()); 2286 return overlapBoundsIncludeChildren() ? boundingBoxForCompositing() : fragme ntsBoundingBox(this);
2287 } 2287 }
2288 2288
2289 static void expandRectForReflectionAndStackingChildren(const RenderLayer* ancest orLayer, RenderLayer::CalculateBoundsOptions options, LayoutRect& result) 2289 static void expandRectForReflectionAndStackingChildren(const RenderLayer* ancest orLayer, RenderLayer::CalculateBoundsOptions options, LayoutRect& result)
2290 { 2290 {
2291 if (ancestorLayer->reflectionInfo() && !ancestorLayer->reflectionInfo()->ref lectionLayer()->hasCompositedLayerMapping()) 2291 if (ancestorLayer->reflectionInfo() && !ancestorLayer->reflectionInfo()->ref lectionLayer()->hasCompositedLayerMapping())
2292 result.unite(ancestorLayer->reflectionInfo()->reflectionLayer()->boundin gBoxForCompositing(ancestorLayer)); 2292 result.unite(ancestorLayer->reflectionInfo()->reflectionLayer()->boundin gBoxForCompositing(ancestorLayer));
2293 2293
2294 ASSERT(ancestorLayer->stackingNode()->isStackingContext() || !ancestorLayer- >stackingNode()->hasPositiveZOrderList()); 2294 ASSERT(ancestorLayer->stackingNode()->isStackingContext() || !ancestorLayer- >stackingNode()->hasPositiveZOrderList());
2295 2295
2296 #if ENABLE(ASSERT) 2296 #if ENABLE(ASSERT)
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
2870 } 2870 }
2871 } 2871 }
2872 2872
2873 void showLayerTree(const blink::RenderObject* renderer) 2873 void showLayerTree(const blink::RenderObject* renderer)
2874 { 2874 {
2875 if (!renderer) 2875 if (!renderer)
2876 return; 2876 return;
2877 showLayerTree(renderer->enclosingLayer()); 2877 showLayerTree(renderer->enclosingLayer());
2878 } 2878 }
2879 #endif 2879 #endif
OLDNEW
« no previous file with comments | « LayoutTests/fast/multicol/vertical-rl/composited-relpos-overlapping-will-change-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698