<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[167965] trunk</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167965">167965</a></dd>

<dt>Author</dt> <dd>hyatt@apple.com</dd>

<dt>Date</dt> <dd>2014-04-29 15:59:26 -0700 (Tue, 29 Apr 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>[New Multicolumn] Implement support for compositing

https://bugs.webkit.org/show_bug.cgi?id=132298

Source/WebCore: 

Reviewed by Simon Fraser.

* rendering/RenderLayer.cpp:

(WebCore::accumulateOffsetTowardsAncestor):

Add in a case for the new columns that calls into the multi-column flow thread

to get an offset to adjust by.

* rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::adjustAncestorCompositingBoundsForFlowThread):

Make sure this code only runs for named flow threads.

* rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::canBeComposited):

Turn on compositing support for in-flow RenderFlowThreads instead of always returning

false

* rendering/RenderMultiColumnFlowThread.cpp:

(WebCore::RenderMultiColumnFlowThread::physicalTranslationOffsetFromFlowToRegion):

Changed this function to fix a couple of bugs exposed by compositing/columns tests. Its

end goal is the same, but the approach is improved.

* rendering/RenderMultiColumnSet.cpp:

(WebCore::RenderMultiColumnSet::endFlow):

Don't pad out to a multiple of column height. You can't flip around a flow thread

to get back to accurate physical coordinates if bogus padding is introduced. This

seemed to have no effect on any layout tests when removed, so I don't think it 

was really serving any useful purpose.

(WebCore::RenderMultiColumnSet::columnTranslationForOffset):

Don't factor in the overall flow thread portion, since this is handled by the callers

now.

(WebCore::RenderMultiColumnSet::adjustRegionBoundsFromFlowThreadPortionRect):

* rendering/RenderMultiColumnSet.h:

Change this function to be ASSERT_NOT_REACHED(), since we want to know if someone calls

it. It only runs for named flow thread compositing code, so it would be a mistake if

this ever gets invoked.

LayoutTests: 

Reviewed by Simon Fraser.

Minor pixel test changes based off how we flip now.

* platform/mac/fast/multicol/block-axis-horizontal-bt-expected.png:

* platform/mac/fast/multicol/block-axis-horizontal-tb-expected.png:

* platform/mac/fast/multicol/block-axis-vertical-lr-expected.png:

* platform/mac/fast/multicol/block-axis-vertical-rl-expected.png:

* platform/mac/fast/multicol/border-padding-pagination-expected.png:

* platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt:

* platform/mac/fast/multicol/client-rects-spanners-expected.txt:

* platform/mac/fast/multicol/column-break-with-balancing-expected.png:

* platform/mac/fast/multicol/column-count-with-rules-expected.png:

* platform/mac/fast/multicol/column-rules-expected.png:

* platform/mac/fast/multicol/column-rules-stacking-expected.png:

* platform/mac/fast/multicol/columns-shorthand-parsing-expected.png:

* platform/mac/fast/multicol/float-avoidance-expected.png:

* platform/mac/fast/multicol/float-multicol-expected.png:

* platform/mac/fast/multicol/float-paginate-complex-expected.png:

* platform/mac/fast/multicol/float-paginate-empty-lines-expected.png:

* platform/mac/fast/multicol/float-paginate-expected.png:

* platform/mac/fast/multicol/layers-in-multicol-expected.png:

* platform/mac/fast/multicol/layers-split-across-columns-expected.png:

* platform/mac/fast/multicol/margin-collapse-expected.png:

* platform/mac/fast/multicol/max-height-columns-block-expected.png:

* platform/mac/fast/multicol/nested-columns-expected.png:

* platform/mac/fast/multicol/newmulticol/client-rects-expected.txt:

* platform/mac/fast/multicol/overflow-across-columns-expected.png:

* platform/mac/fast/multicol/overflow-across-columns-percent-height-expected.png:

* platform/mac/fast/multicol/overflow-unsplittable-expected.png:

* platform/mac/fast/multicol/paginate-block-replaced-expected.png:

* platform/mac/fast/multicol/pagination/BottomToTop-bt-expected.png:

* platform/mac/fast/multicol/pagination/BottomToTop-lr-expected.png:

* platform/mac/fast/multicol/pagination/BottomToTop-rl-expected.png:

* platform/mac/fast/multicol/pagination/BottomToTop-tb-expected.png:

* platform/mac/fast/multicol/pagination/LeftToRight-bt-expected.png:

* platform/mac/fast/multicol/pagination/LeftToRight-lr-expected.png:

* platform/mac/fast/multicol/pagination/LeftToRight-rl-expected.png:

* platform/mac/fast/multicol/pagination/LeftToRight-tb-expected.png:

* platform/mac/fast/multicol/pagination/RightToLeft-bt-expected.png:

* platform/mac/fast/multicol/pagination/RightToLeft-lr-expected.png:

* platform/mac/fast/multicol/pagination/RightToLeft-rl-expected.png:

* platform/mac/fast/multicol/pagination/RightToLeft-tb-expected.png:

* platform/mac/fast/multicol/pagination/TopToBottom-bt-expected.png:

* platform/mac/fast/multicol/pagination/TopToBottom-lr-expected.png:

* platform/mac/fast/multicol/pagination/TopToBottom-rl-expected.png:

* platform/mac/fast/multicol/pagination/TopToBottom-tb-expected.png:

* platform/mac/fast/multicol/positioned-split-expected.png:

* platform/mac/fast/multicol/positive-leading-expected.png:

* platform/mac/fast/multicol/scrolling-overflow-expected.png:

* platform/mac/fast/multicol/shadow-breaking-expected.png:

* platform/mac/fast/multicol/single-line-expected.png:

* platform/mac/fast/multicol/span/anonymous-before-child-parent-crash-expected.png:

* platform/mac/fast/multicol/span/anonymous-split-block-crash-expected.png:

* platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.png:

* platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.txt:

* platform/mac/fast/multicol/span/clone-anonymous-block-non-inline-child-crash-expected.png:

* platform/mac/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.png:

* platform/mac/fast/multicol/span/span-as-immediate-child-generated-content-expected.png:

* platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.png:

* platform/mac/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.png:

* platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.png:

* platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.png:

* platform/mac/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.png:

* platform/mac/fast/multicol/span/span-as-nested-columns-child-expected.png:

* platform/mac/fast/multicol/span/span-as-nested-inline-block-child-expected.png:

* platform/mac/fast/multicol/span/span-margin-collapsing-expected.png:

* platform/mac/fast/multicol/table-margin-collapse-expected.png:

* platform/mac/fast/multicol/table-vertical-align-expected.png:

* platform/mac/fast/multicol/unsplittable-inline-block-expected.png:

* platform/mac/fast/multicol/vertical-lr/border-padding-pagination-expected.png:

* platform/mac/fast/multicol/vertical-lr/column-break-with-balancing-expected.png:

* platform/mac/fast/multicol/vertical-lr/column-count-with-rules-expected.png:

* platform/mac/fast/multicol/vertical-lr/column-rules-expected.png:

* platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.png:

* platform/mac/fast/multicol/vertical-lr/float-multicol-expected.png:

* platform/mac/fast/multicol/vertical-lr/float-paginate-complex-expected.png:

* platform/mac/fast/multicol/vertical-lr/float-paginate-expected.png:

* platform/mac/fast/multicol/vertical-lr/nested-columns-expected.png:

* platform/mac/fast/multicol/vertical-lr/unsplittable-inline-block-expected.png:

* platform/mac/fast/multicol/vertical-rl/border-padding-pagination-expected.png:

* platform/mac/fast/multicol/vertical-rl/column-break-with-balancing-expected.png:

* platform/mac/fast/multicol/vertical-rl/column-count-with-rules-expected.png:

* platform/mac/fast/multicol/vertical-rl/column-rules-expected.png:

* platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.png:

* platform/mac/fast/multicol/vertical-rl/float-multicol-expected.png:

* platform/mac/fast/multicol/vertical-rl/float-paginate-complex-expected.png:

* platform/mac/fast/multicol/vertical-rl/float-paginate-expected.png:

* platform/mac/fast/multicol/vertical-rl/nested-columns-expected.png:

* platform/mac/fast/multicol/vertical-rl/unsplittable-inline-block-expected.png:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolblockaxishorizontalbtexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/block-axis-horizontal-bt-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolblockaxishorizontaltbexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/block-axis-horizontal-tb-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolblockaxisverticallrexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/block-axis-vertical-lr-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolblockaxisverticalrlexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/block-axis-vertical-rl-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolborderpaddingpaginationexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/border-padding-pagination-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolclientrectsspannerscomplexexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolclientrectsspannersexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolcolumnbreakwithbalancingexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/column-break-with-balancing-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolcolumncountwithrulesexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/column-count-with-rules-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolcolumnrulesexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/column-rules-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolcolumnrulesstackingexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/column-rules-stacking-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolcolumnsshorthandparsingexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/columns-shorthand-parsing-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolfloatavoidanceexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/float-avoidance-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolfloatmulticolexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/float-multicol-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolfloatpaginatecomplexexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/float-paginate-complex-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolfloatpaginateemptylinesexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/float-paginate-empty-lines-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolfloatpaginateexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticollayersinmulticolexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/layers-in-multicol-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticollayerssplitacrosscolumnsexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/layers-split-across-columns-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolmargincollapseexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/margin-collapse-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolmaxheightcolumnsblockexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/max-height-columns-block-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolnestedcolumnsexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/nested-columns-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolnewmulticolclientrectsexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticoloverflowacrosscolumnsexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/overflow-across-columns-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticoloverflowacrosscolumnspercentheightexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/overflow-across-columns-percent-height-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticoloverflowunsplittableexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/overflow-unsplittable-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginateblockreplacedexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/paginate-block-replaced-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationBottomToTopbtexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/BottomToTop-bt-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationBottomToToplrexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/BottomToTop-lr-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationBottomToToprlexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/BottomToTop-rl-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationBottomToToptbexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/BottomToTop-tb-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationLeftToRightbtexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/LeftToRight-bt-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationLeftToRightlrexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/LeftToRight-lr-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationLeftToRightrlexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/LeftToRight-rl-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationLeftToRighttbexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/LeftToRight-tb-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationRightToLeftbtexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-bt-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationRightToLeftlrexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-lr-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationRightToLeftrlexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-rl-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationRightToLefttbexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-tb-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationTopToBottombtexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/TopToBottom-bt-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationTopToBottomlrexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/TopToBottom-lr-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationTopToBottomrlexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/TopToBottom-rl-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationTopToBottomtbexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/TopToBottom-tb-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpositionedsplitexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/positioned-split-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolpositiveleadingexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/positive-leading-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolscrollingoverflowexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/scrolling-overflow-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolshadowbreakingexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/shadow-breaking-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolsinglelineexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/single-line-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspananonymousbeforechildparentcrashexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/anonymous-before-child-parent-crash-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspananonymoussplitblockcrashexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/anonymous-split-block-crash-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspananonymousstyleinheritanceexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspananonymousstyleinheritanceexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspancloneanonymousblocknoninlinechildcrashexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/clone-anonymous-block-non-inline-child-crash-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatechildcomplexsplittingexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatechildgeneratedcontentexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-generated-content-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatechildpropertyremovalexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatecolumnschilddynamicexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatecolumnschildexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatecolumnschildremovalexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspanspanasnestedcolumnschilddynamicexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspanspanasnestedcolumnschildexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-nested-columns-child-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspanspanasnestedinlineblockchildexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-nested-inline-block-child-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolspanspanmargincollapsingexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/span-margin-collapsing-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticoltablemargincollapseexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/table-margin-collapse-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticoltableverticalalignexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/table-vertical-align-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolunsplittableinlineblockexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/unsplittable-inline-block-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticallrborderpaddingpaginationexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/border-padding-pagination-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticallrcolumnbreakwithbalancingexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/column-break-with-balancing-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticallrcolumncountwithrulesexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/column-count-with-rules-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticallrcolumnrulesexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/column-rules-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticallrfloatavoidanceexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticallrfloatmulticolexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-multicol-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticallrfloatpaginatecomplexexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-paginate-complex-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticallrfloatpaginateexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-paginate-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticallrnestedcolumnsexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/nested-columns-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticallrunsplittableinlineblockexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/unsplittable-inline-block-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticalrlborderpaddingpaginationexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/border-padding-pagination-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticalrlcolumnbreakwithbalancingexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/column-break-with-balancing-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticalrlcolumncountwithrulesexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/column-count-with-rules-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticalrlcolumnrulesexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/column-rules-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticalrlfloatavoidanceexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticalrlfloatmulticolexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-multicol-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticalrlfloatpaginatecomplexexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-paginate-complex-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticalrlfloatpaginateexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-paginate-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticalrlnestedcolumnsexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/nested-columns-expected.png</a></li>

<li><a href="#trunkLayoutTestsplatformmacfastmulticolverticalrlunsplittableinlineblockexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/unsplittable-inline-block-expected.png</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSetcpp">trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSeth">trunk/Source/WebCore/rendering/RenderMultiColumnSet.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167964 => 167965)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2014-04-29 22:23:17 UTC (rev 167964)

+++ trunk/LayoutTests/ChangeLog        2014-04-29 22:59:26 UTC (rev 167965)

</span><span class="lines">@@ -1,3 +1,99 @@

</span><ins>+2014-04-29  David Hyatt  &lt;hyatt@apple.com&gt;

+

+        [New Multicolumn] Implement support for compositing

+        https://bugs.webkit.org/show_bug.cgi?id=132298

+        

+        Reviewed by Simon Fraser.

+    

+        Minor pixel test changes based off how we flip now.

+

+        * platform/mac/fast/multicol/block-axis-horizontal-bt-expected.png:

+        * platform/mac/fast/multicol/block-axis-horizontal-tb-expected.png:

+        * platform/mac/fast/multicol/block-axis-vertical-lr-expected.png:

+        * platform/mac/fast/multicol/block-axis-vertical-rl-expected.png:

+        * platform/mac/fast/multicol/border-padding-pagination-expected.png:

+        * platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt:

+        * platform/mac/fast/multicol/client-rects-spanners-expected.txt:

+        * platform/mac/fast/multicol/column-break-with-balancing-expected.png:

+        * platform/mac/fast/multicol/column-count-with-rules-expected.png:

+        * platform/mac/fast/multicol/column-rules-expected.png:

+        * platform/mac/fast/multicol/column-rules-stacking-expected.png:

+        * platform/mac/fast/multicol/columns-shorthand-parsing-expected.png:

+        * platform/mac/fast/multicol/float-avoidance-expected.png:

+        * platform/mac/fast/multicol/float-multicol-expected.png:

+        * platform/mac/fast/multicol/float-paginate-complex-expected.png:

+        * platform/mac/fast/multicol/float-paginate-empty-lines-expected.png:

+        * platform/mac/fast/multicol/float-paginate-expected.png:

+        * platform/mac/fast/multicol/layers-in-multicol-expected.png:

+        * platform/mac/fast/multicol/layers-split-across-columns-expected.png:

+        * platform/mac/fast/multicol/margin-collapse-expected.png:

+        * platform/mac/fast/multicol/max-height-columns-block-expected.png:

+        * platform/mac/fast/multicol/nested-columns-expected.png:

+        * platform/mac/fast/multicol/newmulticol/client-rects-expected.txt:

+        * platform/mac/fast/multicol/overflow-across-columns-expected.png:

+        * platform/mac/fast/multicol/overflow-across-columns-percent-height-expected.png:

+        * platform/mac/fast/multicol/overflow-unsplittable-expected.png:

+        * platform/mac/fast/multicol/paginate-block-replaced-expected.png:

+        * platform/mac/fast/multicol/pagination/BottomToTop-bt-expected.png:

+        * platform/mac/fast/multicol/pagination/BottomToTop-lr-expected.png:

+        * platform/mac/fast/multicol/pagination/BottomToTop-rl-expected.png:

+        * platform/mac/fast/multicol/pagination/BottomToTop-tb-expected.png:

+        * platform/mac/fast/multicol/pagination/LeftToRight-bt-expected.png:

+        * platform/mac/fast/multicol/pagination/LeftToRight-lr-expected.png:

+        * platform/mac/fast/multicol/pagination/LeftToRight-rl-expected.png:

+        * platform/mac/fast/multicol/pagination/LeftToRight-tb-expected.png:

+        * platform/mac/fast/multicol/pagination/RightToLeft-bt-expected.png:

+        * platform/mac/fast/multicol/pagination/RightToLeft-lr-expected.png:

+        * platform/mac/fast/multicol/pagination/RightToLeft-rl-expected.png:

+        * platform/mac/fast/multicol/pagination/RightToLeft-tb-expected.png:

+        * platform/mac/fast/multicol/pagination/TopToBottom-bt-expected.png:

+        * platform/mac/fast/multicol/pagination/TopToBottom-lr-expected.png:

+        * platform/mac/fast/multicol/pagination/TopToBottom-rl-expected.png:

+        * platform/mac/fast/multicol/pagination/TopToBottom-tb-expected.png:

+        * platform/mac/fast/multicol/positioned-split-expected.png:

+        * platform/mac/fast/multicol/positive-leading-expected.png:

+        * platform/mac/fast/multicol/scrolling-overflow-expected.png:

+        * platform/mac/fast/multicol/shadow-breaking-expected.png:

+        * platform/mac/fast/multicol/single-line-expected.png:

+        * platform/mac/fast/multicol/span/anonymous-before-child-parent-crash-expected.png:

+        * platform/mac/fast/multicol/span/anonymous-split-block-crash-expected.png:

+        * platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.png:

+        * platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.txt:

+        * platform/mac/fast/multicol/span/clone-anonymous-block-non-inline-child-crash-expected.png:

+        * platform/mac/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.png:

+        * platform/mac/fast/multicol/span/span-as-immediate-child-generated-content-expected.png:

+        * platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.png:

+        * platform/mac/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.png:

+        * platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.png:

+        * platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.png:

+        * platform/mac/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.png:

+        * platform/mac/fast/multicol/span/span-as-nested-columns-child-expected.png:

+        * platform/mac/fast/multicol/span/span-as-nested-inline-block-child-expected.png:

+        * platform/mac/fast/multicol/span/span-margin-collapsing-expected.png:

+        * platform/mac/fast/multicol/table-margin-collapse-expected.png:

+        * platform/mac/fast/multicol/table-vertical-align-expected.png:

+        * platform/mac/fast/multicol/unsplittable-inline-block-expected.png:

+        * platform/mac/fast/multicol/vertical-lr/border-padding-pagination-expected.png:

+        * platform/mac/fast/multicol/vertical-lr/column-break-with-balancing-expected.png:

+        * platform/mac/fast/multicol/vertical-lr/column-count-with-rules-expected.png:

+        * platform/mac/fast/multicol/vertical-lr/column-rules-expected.png:

+        * platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.png:

+        * platform/mac/fast/multicol/vertical-lr/float-multicol-expected.png:

+        * platform/mac/fast/multicol/vertical-lr/float-paginate-complex-expected.png:

+        * platform/mac/fast/multicol/vertical-lr/float-paginate-expected.png:

+        * platform/mac/fast/multicol/vertical-lr/nested-columns-expected.png:

+        * platform/mac/fast/multicol/vertical-lr/unsplittable-inline-block-expected.png:

+        * platform/mac/fast/multicol/vertical-rl/border-padding-pagination-expected.png:

+        * platform/mac/fast/multicol/vertical-rl/column-break-with-balancing-expected.png:

+        * platform/mac/fast/multicol/vertical-rl/column-count-with-rules-expected.png:

+        * platform/mac/fast/multicol/vertical-rl/column-rules-expected.png:

+        * platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.png:

+        * platform/mac/fast/multicol/vertical-rl/float-multicol-expected.png:

+        * platform/mac/fast/multicol/vertical-rl/float-paginate-complex-expected.png:

+        * platform/mac/fast/multicol/vertical-rl/float-paginate-expected.png:

+        * platform/mac/fast/multicol/vertical-rl/nested-columns-expected.png:

+        * platform/mac/fast/multicol/vertical-rl/unsplittable-inline-block-expected.png:

+

</ins><span class="cx"> 2014-04-29  Oliver Hunt  &lt;oliver@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Don't hold on to parameter BindingNodes forever

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolblockaxishorizontalbtexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/block-axis-horizontal-bt-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolblockaxishorizontaltbexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/block-axis-horizontal-tb-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolblockaxisverticallrexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/block-axis-vertical-lr-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolblockaxisverticalrlexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/block-axis-vertical-rl-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolborderpaddingpaginationexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/border-padding-pagination-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolclientrectsspannerscomplexexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt (167964 => 167965)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt        2014-04-29 22:23:17 UTC (rev 167964)

+++ trunk/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt        2014-04-29 22:59:26 UTC (rev 167965)

</span><span class="lines">@@ -162,8 +162,8 @@

</span><span class="cx">     RenderMultiColumnSet at (8,8) size 5x100

</span><span class="cx">     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]

</span><span class="cx">     RenderMultiColumnSet at (43,8) size 55x100

</span><del>-layer at (16,71) size 48x120

-  RenderMultiColumnFlowThread at (8,8) size 48x120

</del><ins>+layer at (16,71) size 48x115

+  RenderMultiColumnFlowThread at (8,8) size 48x115

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 48x10 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,10) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (0,10) size 48x105

</span><span class="lines">@@ -172,8 +172,8 @@

</span><span class="cx">         text run at (0,25) width 25: &quot;x&quot;

</span><span class="cx">         text run at (0,55) width 25: &quot;y&quot;

</span><span class="cx">         text run at (0,80) width 25: &quot;z&quot;

</span><del>-layer at (136,71) size 48x120

-  RenderMultiColumnFlowThread at (8,8) size 48x120

</del><ins>+layer at (136,71) size 48x115

+  RenderMultiColumnFlowThread at (8,8) size 48x115

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 48x10 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,10) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (0,10) size 48x105

</span><span class="lines">@@ -184,8 +184,8 @@

</span><span class="cx">           text run at (0,55) width 25: &quot;y&quot;

</span><span class="cx">           text run at (0,80) width 25: &quot;z&quot;

</span><span class="cx">       RenderText {#text} at (0,0) size 0x0

</span><del>-layer at (256,71) size 48x120

-  RenderMultiColumnFlowThread at (8,8) size 48x120

</del><ins>+layer at (256,71) size 48x115

+  RenderMultiColumnFlowThread at (8,8) size 48x115

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 48x10 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,10) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (0,10) size 48x25

</span><span class="lines">@@ -195,8 +195,8 @@

</span><span class="cx">         text run at (0,0) width 25: &quot;x&quot;

</span><span class="cx">         text run at (0,30) width 25: &quot;y&quot;

</span><span class="cx">         text run at (0,55) width 25: &quot;z&quot;

</span><del>-layer at (376,71) size 48x120

-  RenderMultiColumnFlowThread at (8,8) size 48x120

</del><ins>+layer at (376,71) size 48x115

+  RenderMultiColumnFlowThread at (8,8) size 48x115

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 48x10 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,10) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (0,10) size 48x25

</span><span class="lines">@@ -206,8 +206,8 @@

</span><span class="cx">       RenderText {#text} at (0,30) size 25x50

</span><span class="cx">         text run at (0,30) width 25: &quot;y&quot;

</span><span class="cx">         text run at (0,55) width 25: &quot;z&quot;

</span><del>-layer at (496,71) size 48x120

-  RenderMultiColumnFlowThread at (8,8) size 48x120

</del><ins>+layer at (496,71) size 48x94

+  RenderMultiColumnFlowThread at (8,8) size 48x94

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 48x10 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,10) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (0,10) size 48x25

</span><span class="lines">@@ -218,8 +218,8 @@

</span><span class="cx">         RenderFlexibleBox {DIV} at (0,0) size 25x25

</span><span class="cx">           RenderBlock {DIV} at (0,12) size 25x1

</span><span class="cx">             RenderBlock {DIV} at (0,0) size 25x0

</span><del>-layer at (616,89) size 48x120

-  RenderMultiColumnFlowThread at (8,8) size 48x120

</del><ins>+layer at (616,89) size 48x90

+  RenderMultiColumnFlowThread at (8,8) size 48x90

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 48x10 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,10) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (0,10) size 48x25

</span><span class="lines">@@ -227,13 +227,13 @@

</span><span class="cx">     RenderBlock {DIV} at (0,35) size 48x55

</span><span class="cx">       RenderBR {BR} at (0,0) size 0x25

</span><span class="cx">       RenderImage {IMG} at (0,30) size 25x25 [bgcolor=#ADD8E6]

</span><del>-layer at (16,215) size 48x120

-  RenderMultiColumnFlowThread at (8,8) size 48x120

</del><ins>+layer at (16,215) size 48x75

+  RenderMultiColumnFlowThread at (8,8) size 48x75

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 48x10 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,10) size 0x0

</span><span class="cx">     RenderBlock {DIV} at (0,50) size 25x25 [bgcolor=#ADD8E6]

</span><del>-layer at (146,215) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (146,215) size 115x48

+  RenderMultiColumnFlowThread at (8,8) size 115x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (10,0) size 105x48

</span><span class="lines">@@ -242,8 +242,8 @@

</span><span class="cx">         text run at (25,0) width 25: &quot;x&quot;

</span><span class="cx">         text run at (55,0) width 25: &quot;y&quot;

</span><span class="cx">         text run at (80,0) width 25: &quot;z&quot;

</span><del>-layer at (276,215) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (276,215) size 115x48

+  RenderMultiColumnFlowThread at (8,8) size 115x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (10,0) size 105x48

</span><span class="lines">@@ -254,8 +254,8 @@

</span><span class="cx">           text run at (55,0) width 25: &quot;y&quot;

</span><span class="cx">           text run at (80,0) width 25: &quot;z&quot;

</span><span class="cx">       RenderText {#text} at (0,0) size 0x0

</span><del>-layer at (406,215) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (406,215) size 115x48

+  RenderMultiColumnFlowThread at (8,8) size 115x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (10,0) size 25x48

</span><span class="lines">@@ -265,8 +265,8 @@

</span><span class="cx">         text run at (0,0) width 25: &quot;x&quot;

</span><span class="cx">         text run at (30,0) width 25: &quot;y&quot;

</span><span class="cx">         text run at (55,0) width 25: &quot;z&quot;

</span><del>-layer at (536,215) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (536,215) size 115x48

+  RenderMultiColumnFlowThread at (8,8) size 115x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (10,0) size 25x48

</span><span class="lines">@@ -276,8 +276,8 @@

</span><span class="cx">       RenderText {#text} at (30,0) size 50x25

</span><span class="cx">         text run at (30,0) width 25: &quot;y&quot;

</span><span class="cx">         text run at (55,0) width 25: &quot;z&quot;

</span><del>-layer at (666,215) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (666,215) size 94x48

+  RenderMultiColumnFlowThread at (8,8) size 94x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (10,0) size 25x48

</span><span class="lines">@@ -288,8 +288,8 @@

</span><span class="cx">         RenderFlexibleBox {DIV} at (0,0) size 25x25

</span><span class="cx">           RenderBlock {DIV} at (0,12) size 25x1

</span><span class="cx">             RenderBlock {DIV} at (0,0) size 25x0

</span><del>-layer at (26,335) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (26,335) size 90x48

+  RenderMultiColumnFlowThread at (8,8) size 90x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (10,0) size 25x48

</span><span class="lines">@@ -297,13 +297,13 @@

</span><span class="cx">     RenderBlock {DIV} at (35,0) size 55x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="cx">       RenderImage {IMG} at (30,0) size 25x25 [bgcolor=#ADD8E6]

</span><del>-layer at (156,335) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (156,335) size 75x48

+  RenderMultiColumnFlowThread at (8,8) size 75x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock {DIV} at (50,0) size 25x25 [bgcolor=#ADD8E6]

</span><del>-layer at (256,335) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (261,335) size 115x48

+  RenderMultiColumnFlowThread at (8,8) size 115x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (10,0) size 105x48

</span><span class="lines">@@ -312,8 +312,8 @@

</span><span class="cx">         text run at (25,0) width 25: &quot;x&quot;

</span><span class="cx">         text run at (55,0) width 25: &quot;y&quot;

</span><span class="cx">         text run at (80,0) width 25: &quot;z&quot;

</span><del>-layer at (386,335) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (391,335) size 115x48

+  RenderMultiColumnFlowThread at (8,8) size 115x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (10,0) size 105x48

</span><span class="lines">@@ -324,8 +324,8 @@

</span><span class="cx">           text run at (55,0) width 25: &quot;y&quot;

</span><span class="cx">           text run at (80,0) width 25: &quot;z&quot;

</span><span class="cx">       RenderText {#text} at (0,0) size 0x0

</span><del>-layer at (516,335) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (521,335) size 115x48

+  RenderMultiColumnFlowThread at (8,8) size 115x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (10,0) size 25x48

</span><span class="lines">@@ -335,8 +335,8 @@

</span><span class="cx">         text run at (0,0) width 25: &quot;x&quot;

</span><span class="cx">         text run at (30,0) width 25: &quot;y&quot;

</span><span class="cx">         text run at (55,0) width 25: &quot;z&quot;

</span><del>-layer at (646,335) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (651,335) size 115x48

+  RenderMultiColumnFlowThread at (8,8) size 115x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (10,0) size 25x48

</span><span class="lines">@@ -346,8 +346,8 @@

</span><span class="cx">       RenderText {#text} at (30,0) size 50x25

</span><span class="cx">         text run at (30,0) width 25: &quot;y&quot;

</span><span class="cx">         text run at (55,0) width 25: &quot;z&quot;

</span><del>-layer at (-4,455) size 120x48 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (22,455) size 94x48

+  RenderMultiColumnFlowThread at (8,8) size 94x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (10,0) size 25x48

</span><span class="lines">@@ -358,8 +358,8 @@

</span><span class="cx">         RenderFlexibleBox {DIV} at (0,0) size 25x25

</span><span class="cx">           RenderBlock {DIV} at (0,12) size 25x1

</span><span class="cx">             RenderBlock {DIV} at (0,0) size 25x0

</span><del>-layer at (126,455) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (156,455) size 90x48

+  RenderMultiColumnFlowThread at (8,8) size 90x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (10,0) size 25x48

</span><span class="lines">@@ -367,8 +367,8 @@

</span><span class="cx">     RenderBlock {DIV} at (35,0) size 55x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="cx">       RenderImage {IMG} at (30,0) size 25x25 [bgcolor=#ADD8E6]

</span><del>-layer at (256,455) size 120x48

-  RenderMultiColumnFlowThread at (8,8) size 120x48

</del><ins>+layer at (301,455) size 75x48

+  RenderMultiColumnFlowThread at (8,8) size 75x48

</ins><span class="cx">     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]

</span><span class="cx">     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0

</span><span class="cx">     RenderBlock {DIV} at (50,0) size 25x25 [bgcolor=#ADD8E6]

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolclientrectsspannersexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.txt (167964 => 167965)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.txt        2014-04-29 22:23:17 UTC (rev 167964)

+++ trunk/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.txt        2014-04-29 22:59:26 UTC (rev 167965)

</span><span class="lines">@@ -183,8 +183,8 @@

</span><span class="cx">       RenderText {#text} at (0,25) size 25x50

</span><span class="cx">         text run at (0,25) width 25: &quot;y&quot;

</span><span class="cx">         text run at (0,50) width 25: &quot;z&quot;

</span><del>-layer at (496,71) size 48x100

-  RenderMultiColumnFlowThread at (8,8) size 48x100

</del><ins>+layer at (496,71) size 48x79

+  RenderMultiColumnFlowThread at (8,8) size 48x79

</ins><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (0,0) size 48x25

</span><span class="cx">       RenderBR {BR} at (0,0) size 0x25

</span><span class="lines">@@ -194,16 +194,16 @@

</span><span class="cx">         RenderFlexibleBox {DIV} at (0,0) size 25x25

</span><span class="cx">           RenderBlock {DIV} at (0,12) size 25x1

</span><span class="cx">             RenderBlock {DIV} at (0,0) size 25x0

</span><del>-layer at (616,71) size 48x100

-  RenderMultiColumnFlowThread at (8,8) size 48x100

</del><ins>+layer at (616,71) size 48x75

+  RenderMultiColumnFlowThread at (8,8) size 48x75

</ins><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (0,0) size 48x25

</span><span class="cx">       RenderBR {BR} at (0,0) size 0x25

</span><span class="cx">     RenderBlock {DIV} at (0,25) size 48x50

</span><span class="cx">       RenderBR {BR} at (0,0) size 0x25

</span><span class="cx">       RenderImage {IMG} at (0,25) size 25x25 [bgcolor=#ADD8E6]

</span><del>-layer at (16,191) size 48x100

-  RenderMultiColumnFlowThread at (8,8) size 48x100

</del><ins>+layer at (16,191) size 48x65

+  RenderMultiColumnFlowThread at (8,8) size 48x65

</ins><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0

</span><span class="cx">     RenderBlock {DIV} at (0,40) size 25x25 [bgcolor=#ADD8E6]

</span><span class="cx"> layer at (146,161) size 100x48

</span><span class="lines">@@ -246,8 +246,8 @@

</span><span class="cx">       RenderText {#text} at (25,0) size 50x25

</span><span class="cx">         text run at (25,0) width 25: &quot;y&quot;

</span><span class="cx">         text run at (50,0) width 25: &quot;z&quot;

</span><del>-layer at (546,161) size 100x48

-  RenderMultiColumnFlowThread at (8,8) size 100x48

</del><ins>+layer at (546,161) size 79x48

+  RenderMultiColumnFlowThread at (8,8) size 79x48

</ins><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (0,0) size 25x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="lines">@@ -257,16 +257,16 @@

</span><span class="cx">         RenderFlexibleBox {DIV} at (0,0) size 25x25

</span><span class="cx">           RenderBlock {DIV} at (0,12) size 25x1

</span><span class="cx">             RenderBlock {DIV} at (0,0) size 25x0

</span><del>-layer at (646,161) size 100x48

-  RenderMultiColumnFlowThread at (8,8) size 100x48

</del><ins>+layer at (646,161) size 75x48

+  RenderMultiColumnFlowThread at (8,8) size 75x48

</ins><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (0,0) size 25x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="cx">     RenderBlock {DIV} at (25,0) size 50x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="cx">       RenderImage {IMG} at (25,0) size 25x25 [bgcolor=#ADD8E6]

</span><del>-layer at (26,281) size 100x48

-  RenderMultiColumnFlowThread at (8,8) size 100x48

</del><ins>+layer at (26,281) size 65x48

+  RenderMultiColumnFlowThread at (8,8) size 65x48

</ins><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0

</span><span class="cx">     RenderBlock {DIV} at (40,0) size 25x25 [bgcolor=#ADD8E6]

</span><span class="cx"> layer at (86,281) size 100x48

</span><span class="lines">@@ -309,8 +309,8 @@

</span><span class="cx">       RenderText {#text} at (25,0) size 50x25

</span><span class="cx">         text run at (25,0) width 25: &quot;y&quot;

</span><span class="cx">         text run at (50,0) width 25: &quot;z&quot;

</span><del>-layer at (486,281) size 100x48

-  RenderMultiColumnFlowThread at (8,8) size 100x48

</del><ins>+layer at (507,281) size 79x48

+  RenderMultiColumnFlowThread at (8,8) size 79x48

</ins><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (0,0) size 25x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="lines">@@ -320,16 +320,16 @@

</span><span class="cx">         RenderFlexibleBox {DIV} at (0,0) size 25x25

</span><span class="cx">           RenderBlock {DIV} at (0,12) size 25x1

</span><span class="cx">             RenderBlock {DIV} at (0,0) size 25x0

</span><del>-layer at (586,281) size 100x48

-  RenderMultiColumnFlowThread at (8,8) size 100x48

</del><ins>+layer at (611,281) size 75x48

+  RenderMultiColumnFlowThread at (8,8) size 75x48

</ins><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0

</span><span class="cx">     RenderBlock (anonymous) at (0,0) size 25x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="cx">     RenderBlock {DIV} at (25,0) size 50x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="cx">       RenderImage {IMG} at (25,0) size 25x25 [bgcolor=#ADD8E6]

</span><del>-layer at (-14,401) size 100x48 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600

-  RenderMultiColumnFlowThread at (8,8) size 100x48

</del><ins>+layer at (21,401) size 65x48

+  RenderMultiColumnFlowThread at (8,8) size 65x48

</ins><span class="cx">     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0

</span><span class="cx">     RenderBlock {DIV} at (40,0) size 25x25 [bgcolor=#ADD8E6]

</span><span class="cx"> layer at (16,106) size 25x25

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolcolumnbreakwithbalancingexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/column-break-with-balancing-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolcolumncountwithrulesexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/column-count-with-rules-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolcolumnrulesexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/column-rules-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolcolumnrulesstackingexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/column-rules-stacking-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolcolumnsshorthandparsingexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/columns-shorthand-parsing-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolfloatavoidanceexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/float-avoidance-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolfloatmulticolexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/float-multicol-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolfloatpaginatecomplexexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/float-paginate-complex-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolfloatpaginateemptylinesexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/float-paginate-empty-lines-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolfloatpaginateexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticollayersinmulticolexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/layers-in-multicol-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticollayerssplitacrosscolumnsexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/layers-split-across-columns-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolmargincollapseexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/margin-collapse-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolmaxheightcolumnsblockexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/max-height-columns-block-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolnestedcolumnsexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/nested-columns-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolnewmulticolclientrectsexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt (167964 => 167965)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt        2014-04-29 22:23:17 UTC (rev 167964)

+++ trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt        2014-04-29 22:59:26 UTC (rev 167965)

</span><span class="lines">@@ -155,8 +155,8 @@

</span><span class="cx">       RenderText {#text} at (0,25) size 25x50

</span><span class="cx">         text run at (0,25) width 25: &quot;y&quot;

</span><span class="cx">         text run at (0,50) width 25: &quot;z&quot;

</span><del>-layer at (496,71) size 48x100

-  RenderMultiColumnFlowThread at (8,8) size 48x100

</del><ins>+layer at (496,71) size 48x79

+  RenderMultiColumnFlowThread at (8,8) size 48x79

</ins><span class="cx">     RenderBlock (anonymous) at (0,0) size 48x25

</span><span class="cx">       RenderBR {BR} at (0,0) size 0x25

</span><span class="cx">     RenderBlock {DIV} at (0,25) size 48x54

</span><span class="lines">@@ -165,15 +165,15 @@

</span><span class="cx">         RenderFlexibleBox {DIV} at (0,0) size 25x25

</span><span class="cx">           RenderBlock {DIV} at (0,12) size 25x1

</span><span class="cx">             RenderBlock {DIV} at (0,0) size 25x0

</span><del>-layer at (616,71) size 48x100

-  RenderMultiColumnFlowThread at (8,8) size 48x100

</del><ins>+layer at (616,71) size 48x75

+  RenderMultiColumnFlowThread at (8,8) size 48x75

</ins><span class="cx">     RenderBlock (anonymous) at (0,0) size 48x25

</span><span class="cx">       RenderBR {BR} at (0,0) size 0x25

</span><span class="cx">     RenderBlock {DIV} at (0,25) size 48x50

</span><span class="cx">       RenderBR {BR} at (0,0) size 0x25

</span><span class="cx">       RenderImage {IMG} at (0,25) size 25x25 [bgcolor=#ADD8E6]

</span><del>-layer at (16,191) size 48x100

-  RenderMultiColumnFlowThread at (8,8) size 48x100

</del><ins>+layer at (16,191) size 48x65

+  RenderMultiColumnFlowThread at (8,8) size 48x65

</ins><span class="cx">     RenderBlock {DIV} at (0,40) size 25x25 [bgcolor=#ADD8E6]

</span><span class="cx"> layer at (146,151) size 100x48

</span><span class="cx">   RenderMultiColumnFlowThread at (8,8) size 100x48

</span><span class="lines">@@ -209,8 +209,8 @@

</span><span class="cx">       RenderText {#text} at (25,0) size 50x25

</span><span class="cx">         text run at (25,0) width 25: &quot;y&quot;

</span><span class="cx">         text run at (50,0) width 25: &quot;z&quot;

</span><del>-layer at (506,151) size 100x48

-  RenderMultiColumnFlowThread at (8,8) size 100x48

</del><ins>+layer at (506,151) size 79x48

+  RenderMultiColumnFlowThread at (8,8) size 79x48

</ins><span class="cx">     RenderBlock (anonymous) at (0,0) size 25x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="cx">     RenderBlock {DIV} at (25,0) size 54x48

</span><span class="lines">@@ -219,15 +219,15 @@

</span><span class="cx">         RenderFlexibleBox {DIV} at (0,0) size 25x25

</span><span class="cx">           RenderBlock {DIV} at (0,12) size 25x1

</span><span class="cx">             RenderBlock {DIV} at (0,0) size 25x0

</span><del>-layer at (596,151) size 100x48

-  RenderMultiColumnFlowThread at (8,8) size 100x48

</del><ins>+layer at (596,151) size 75x48

+  RenderMultiColumnFlowThread at (8,8) size 75x48

</ins><span class="cx">     RenderBlock (anonymous) at (0,0) size 25x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="cx">     RenderBlock {DIV} at (25,0) size 50x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="cx">       RenderImage {IMG} at (25,0) size 25x25 [bgcolor=#ADD8E6]

</span><del>-layer at (686,151) size 100x48

-  RenderMultiColumnFlowThread at (8,8) size 100x48

</del><ins>+layer at (686,151) size 65x48

+  RenderMultiColumnFlowThread at (8,8) size 65x48

</ins><span class="cx">     RenderBlock {DIV} at (40,0) size 25x25 [bgcolor=#ADD8E6]

</span><span class="cx"> layer at (-24,271) size 100x48 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600

</span><span class="cx">   RenderMultiColumnFlowThread at (8,8) size 100x48

</span><span class="lines">@@ -263,8 +263,8 @@

</span><span class="cx">       RenderText {#text} at (25,0) size 50x25

</span><span class="cx">         text run at (25,0) width 25: &quot;y&quot;

</span><span class="cx">         text run at (50,0) width 25: &quot;z&quot;

</span><del>-layer at (336,271) size 100x48

-  RenderMultiColumnFlowThread at (8,8) size 100x48

</del><ins>+layer at (357,271) size 79x48

+  RenderMultiColumnFlowThread at (8,8) size 79x48

</ins><span class="cx">     RenderBlock (anonymous) at (0,0) size 25x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="cx">     RenderBlock {DIV} at (25,0) size 54x48

</span><span class="lines">@@ -273,15 +273,15 @@

</span><span class="cx">         RenderFlexibleBox {DIV} at (0,0) size 25x25

</span><span class="cx">           RenderBlock {DIV} at (0,12) size 25x1

</span><span class="cx">             RenderBlock {DIV} at (0,0) size 25x0

</span><del>-layer at (426,271) size 100x48

-  RenderMultiColumnFlowThread at (8,8) size 100x48

</del><ins>+layer at (451,271) size 75x48

+  RenderMultiColumnFlowThread at (8,8) size 75x48

</ins><span class="cx">     RenderBlock (anonymous) at (0,0) size 25x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="cx">     RenderBlock {DIV} at (25,0) size 50x48

</span><span class="cx">       RenderBR {BR} at (0,0) size 25x0

</span><span class="cx">       RenderImage {IMG} at (25,0) size 25x25 [bgcolor=#ADD8E6]

</span><del>-layer at (516,271) size 100x48

-  RenderMultiColumnFlowThread at (8,8) size 100x48

</del><ins>+layer at (551,271) size 65x48

+  RenderMultiColumnFlowThread at (8,8) size 65x48

</ins><span class="cx">     RenderBlock {DIV} at (40,0) size 25x25 [bgcolor=#ADD8E6]

</span><span class="cx"> layer at (16,96) size 25x25

</span><span class="cx">   RenderBlock (positioned) {DIV} at (16,96) size 25x25 [border: (3px solid #0000FF7F)]

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticoloverflowacrosscolumnsexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/overflow-across-columns-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticoloverflowacrosscolumnspercentheightexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/overflow-across-columns-percent-height-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticoloverflowunsplittableexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/overflow-unsplittable-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginateblockreplacedexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/paginate-block-replaced-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationBottomToTopbtexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/BottomToTop-bt-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationBottomToToplrexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/BottomToTop-lr-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationBottomToToprlexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/BottomToTop-rl-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationBottomToToptbexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/BottomToTop-tb-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationLeftToRightbtexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/LeftToRight-bt-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationLeftToRightlrexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/LeftToRight-lr-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationLeftToRightrlexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/LeftToRight-rl-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationLeftToRighttbexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/LeftToRight-tb-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationRightToLeftbtexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-bt-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationRightToLeftlrexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-lr-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationRightToLeftrlexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-rl-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationRightToLefttbexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-tb-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationTopToBottombtexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/TopToBottom-bt-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationTopToBottomlrexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/TopToBottom-lr-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationTopToBottomrlexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/TopToBottom-rl-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpaginationTopToBottomtbexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/pagination/TopToBottom-tb-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpositionedsplitexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/positioned-split-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolpositiveleadingexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/positive-leading-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolscrollingoverflowexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/scrolling-overflow-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolshadowbreakingexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/shadow-breaking-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolsinglelineexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/single-line-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspananonymousbeforechildparentcrashexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/anonymous-before-child-parent-crash-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspananonymoussplitblockcrashexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/anonymous-split-block-crash-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspananonymousstyleinheritanceexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspananonymousstyleinheritanceexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.txt (167964 => 167965)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.txt        2014-04-29 22:23:17 UTC (rev 167964)

+++ trunk/LayoutTests/platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.txt        2014-04-29 22:59:26 UTC (rev 167965)

</span><span class="lines">@@ -1,16 +1,16 @@

</span><del>-layer at (0,0) size 843x585

</del><ins>+layer at (0,0) size 844x585

</ins><span class="cx">   RenderView at (0,0) size 800x585

</span><del>-layer at (0,0) size 800x516

-  RenderBlock {HTML} at (0,0) size 800x516

-    RenderBody {BODY} at (8,17) size 784x482

-layer at (8,18) size 835x481

-  RenderBlock {DIV} at (0,0) size 835x481 [border: (5px solid #800000)]

-    RenderBlock (anonymous multi-column span) at (5,5) size 825x75

</del><ins>+layer at (0,0) size 800x517

+  RenderBlock {HTML} at (0,0) size 800x517

+    RenderBody {BODY} at (8,17) size 784x483

+layer at (8,18) size 836x482

+  RenderBlock {DIV} at (0,0) size 836x482 [border: (5.50px solid #800000)]

+    RenderBlock (anonymous multi-column span) at (5,5) size 826x76

</ins><span class="cx">       RenderBlock {H2} at (0,21) size 825x32 [bgcolor=#EEEEEE]

</span><span class="cx">         RenderText {#text} at (0,0) size 723x31

</span><span class="cx">           text run at (0,0) width 723: &quot;This is a spanning element at the beginning of the columns block.&quot;

</span><del>-layer at (13,97) size 825x396

-  RenderBlock (anonymous multi-column) at (5,79) size 825x397

</del><ins>+layer at (14,98) size 825x396

+  RenderBlock (anonymous multi-column) at (5,80) size 826x397

</ins><span class="cx">     RenderText {#text} at (0,0) size 403x792

</span><span class="cx">       text run at (0,0) width 381: &quot;Lorem ipsum dolor sit amet, consectetuer adipiscing&quot;

</span><span class="cx">       text run at (0,22) width 373: &quot;elit. Nulla varius enim ac mi. Curabitur sollicitudin&quot;

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspancloneanonymousblocknoninlinechildcrashexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/clone-anonymous-block-non-inline-child-crash-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatechildcomplexsplittingexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatechildgeneratedcontentexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-generated-content-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatechildpropertyremovalexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatecolumnschilddynamicexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatecolumnschildexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatecolumnschildremovalexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspanspanasnestedcolumnschilddynamicexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspanspanasnestedcolumnschildexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-nested-columns-child-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspanspanasnestedinlineblockchildexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-nested-inline-block-child-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolspanspanmargincollapsingexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/span-margin-collapsing-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticoltablemargincollapseexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/table-margin-collapse-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticoltableverticalalignexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/table-vertical-align-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolunsplittableinlineblockexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/unsplittable-inline-block-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticallrborderpaddingpaginationexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/border-padding-pagination-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticallrcolumnbreakwithbalancingexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/column-break-with-balancing-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticallrcolumncountwithrulesexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/column-count-with-rules-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticallrcolumnrulesexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/column-rules-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticallrfloatavoidanceexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticallrfloatmulticolexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-multicol-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticallrfloatpaginatecomplexexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-paginate-complex-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticallrfloatpaginateexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-paginate-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticallrnestedcolumnsexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/nested-columns-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticallrunsplittableinlineblockexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/unsplittable-inline-block-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticalrlborderpaddingpaginationexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/border-padding-pagination-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticalrlcolumnbreakwithbalancingexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/column-break-with-balancing-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticalrlcolumncountwithrulesexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/column-count-with-rules-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticalrlcolumnrulesexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/column-rules-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticalrlfloatavoidanceexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticalrlfloatmulticolexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-multicol-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticalrlfloatpaginatecomplexexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-paginate-complex-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticalrlfloatpaginateexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-paginate-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticalrlnestedcolumnsexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/nested-columns-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacfastmulticolverticalrlunsplittableinlineblockexpectedpng"></a>

<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/unsplittable-inline-block-expected.png</h4>

<pre class="diff"><span>

<span class="cx">(Binary files differ)

</span></span></pre></div>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167964 => 167965)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-04-29 22:23:17 UTC (rev 167964)

+++ trunk/Source/WebCore/ChangeLog        2014-04-29 22:59:26 UTC (rev 167965)

</span><span class="lines">@@ -1,3 +1,46 @@

</span><ins>+2014-04-29  David Hyatt  &lt;hyatt@apple.com&gt;

+

+        [New Multicolumn] Implement support for compositing

+        https://bugs.webkit.org/show_bug.cgi?id=132298

+

+        Reviewed by Simon Fraser.

+

+        * rendering/RenderLayer.cpp:

+        (WebCore::accumulateOffsetTowardsAncestor):

+        Add in a case for the new columns that calls into the multi-column flow thread

+        to get an offset to adjust by.

+

+        * rendering/RenderLayerBacking.cpp:

+        (WebCore::RenderLayerBacking::adjustAncestorCompositingBoundsForFlowThread):

+        Make sure this code only runs for named flow threads.

+

+        * rendering/RenderLayerCompositor.cpp:

+        (WebCore::RenderLayerCompositor::canBeComposited):

+        Turn on compositing support for in-flow RenderFlowThreads instead of always returning

+        false

+

+        * rendering/RenderMultiColumnFlowThread.cpp:

+        (WebCore::RenderMultiColumnFlowThread::physicalTranslationOffsetFromFlowToRegion):

+        Changed this function to fix a couple of bugs exposed by compositing/columns tests. Its

+        end goal is the same, but the approach is improved.

+

+        * rendering/RenderMultiColumnSet.cpp:

+        (WebCore::RenderMultiColumnSet::endFlow):

+        Don't pad out to a multiple of column height. You can't flip around a flow thread

+        to get back to accurate physical coordinates if bogus padding is introduced. This

+        seemed to have no effect on any layout tests when removed, so I don't think it 

+        was really serving any useful purpose.

+

+        (WebCore::RenderMultiColumnSet::columnTranslationForOffset):

+        Don't factor in the overall flow thread portion, since this is handled by the callers

+        now.

+

+        (WebCore::RenderMultiColumnSet::adjustRegionBoundsFromFlowThreadPortionRect):

+        * rendering/RenderMultiColumnSet.h:

+        Change this function to be ASSERT_NOT_REACHED(), since we want to know if someone calls

+        it. It only runs for named flow thread compositing code, so it would be a mistake if

+        this ever gets invoked.

+

</ins><span class="cx"> 2014-04-29  Mark Hahnenberg  &lt;mhahnenberg@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         JSProxies should be cacheable

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (167964 => 167965)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2014-04-29 22:23:17 UTC (rev 167964)

+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2014-04-29 22:59:26 UTC (rev 167965)

</span><span class="lines">@@ -86,6 +86,7 @@

</span><span class="cx"> #include &quot;RenderLayerBacking.h&quot;

</span><span class="cx"> #include &quot;RenderLayerCompositor.h&quot;

</span><span class="cx"> #include &quot;RenderMarquee.h&quot;

</span><ins>+#include &quot;RenderMultiColumnFlowThread.h&quot;

</ins><span class="cx"> #include &quot;RenderNamedFlowFragment.h&quot;

</span><span class="cx"> #include &quot;RenderNamedFlowThread.h&quot;

</span><span class="cx"> #include &quot;RenderRegion.h&quot;

</span><span class="lines">@@ -2057,6 +2058,12 @@

</span><span class="cx">             LayoutSize layerColumnOffset;

</span><span class="cx">             parentLayer-&gt;renderer().adjustForColumns(layerColumnOffset, location);

</span><span class="cx">             location += layerColumnOffset;

</span><ins>+            

+            if (parentLayer-&gt;renderer().isRenderMultiColumnFlowThread()) {

+                RenderRegion* region = toRenderMultiColumnFlowThread(parentLayer-&gt;renderer()).physicalTranslationFromFlowToRegion(location);

+                if (region)

+                    location.moveBy(region-&gt;topLeftLocation() + -parentLayer-&gt;renderBox()-&gt;topLeftLocation());

+            }

</ins><span class="cx">         }

</span><span class="cx">     }

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (167964 => 167965)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp        2014-04-29 22:23:17 UTC (rev 167964)

+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp        2014-04-29 22:59:26 UTC (rev 167965)

</span><span class="lines">@@ -1001,7 +1001,7 @@

</span><span class="cx">     if (!m_owningLayer.isInsideFlowThread())

</span><span class="cx">         return;

</span><span class="cx"> 

</span><del>-    RenderLayer* flowThreadLayer = m_owningLayer.isInsideOutOfFlowThread() ? m_owningLayer.stackingContainer() : m_owningLayer.enclosingFlowThreadAncestor();

</del><ins>+    RenderLayer* flowThreadLayer = m_owningLayer.isInsideOutOfFlowThread() ? m_owningLayer.stackingContainer() : nullptr;

</ins><span class="cx">     if (flowThreadLayer &amp;&amp; flowThreadLayer-&gt;isRenderFlowThread()) {

</span><span class="cx">         if (m_owningLayer.isFlowThreadCollectingGraphicsLayersUnderRegions()) {

</span><span class="cx">             // The RenderNamedFlowThread is not composited, as we need it to paint the 

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (167964 => 167965)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2014-04-29 22:23:17 UTC (rev 167964)

+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2014-04-29 22:59:26 UTC (rev 167965)

</span><span class="lines">@@ -2065,8 +2065,7 @@

</span><span class="cx">         if (layer.isRenderFlowThread())

</span><span class="cx">             return false;

</span><span class="cx"> 

</span><del>-        // A faster way of saying layer.enclosingFlowThreadLayer()-&gt;isFlowThreadCollectingGraphicsLayersUnderRegions()

-        return layer.isInsideOutOfFlowThread();

</del><ins>+        return true;

</ins><span class="cx">     }

</span><span class="cx">     return false;

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (167964 => 167965)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp        2014-04-29 22:23:17 UTC (rev 167964)

+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp        2014-04-29 22:59:26 UTC (rev 167965)

</span><span class="lines">@@ -654,16 +654,22 @@

</span><span class="cx">     

</span><span class="cx">     // Now we know how we want the rect to be translated into the region. At this point we're converting

</span><span class="cx">     // back to physical coordinates.

</span><del>-    LayoutRect flippedRegionRect(renderRegion-&gt;flowThreadPortionRect());

-    if (isHorizontalWritingMode())

-        flippedRegionRect.setHeight(columnSet-&gt;computedColumnHeight());

-    else

-        flippedRegionRect.setWidth(columnSet-&gt;computedColumnHeight());

-    flipForWritingMode(flippedRegionRect);

</del><ins>+    if (style().isFlippedBlocksWritingMode()) {

+        LayoutRect portionRect(columnSet-&gt;flowThreadPortionRect());

+        LayoutRect columnRect = columnSet-&gt;columnRectAt(0);

+        LayoutUnit physicalDeltaFromPortionBottom = logicalHeight() - columnSet-&gt;logicalBottomInFlowThread();

+        if (isHorizontalWritingMode())

+            columnRect.setHeight(portionRect.height());

+        else

+            columnRect.setWidth(portionRect.width());

+        columnSet-&gt;flipForWritingMode(columnRect);

+        if (isHorizontalWritingMode())

+            translationOffset.move(0, columnRect.y() - portionRect.y() - physicalDeltaFromPortionBottom);

+        else

+            translationOffset.move(columnRect.x() - portionRect.x() - physicalDeltaFromPortionBottom, 0);

+    }

</ins><span class="cx">     

</span><del>-    flippedRegionRect.moveBy(-translationOffset);

-    

-    return renderRegion-&gt;contentBoxRect().location() - flippedRegionRect.location();

</del><ins>+    return LayoutSize(translationOffset.x(), translationOffset.y());

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> RenderRegion* RenderMultiColumnFlowThread::physicalTranslationFromFlowToRegion(LayoutPoint&amp; physicalPoint) const

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderMultiColumnSetcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (167964 => 167965)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp        2014-04-29 22:23:17 UTC (rev 167964)

+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp        2014-04-29 22:59:26 UTC (rev 167965)

</span><span class="lines">@@ -381,16 +381,6 @@

</span><span class="cx">     LayoutUnit logicalBottomInFlowThread = flowThread-&gt;offsetFromLogicalTopOfFirstRegion(container) + bottomInContainer;

</span><span class="cx">     setLogicalBottomInFlowThread(logicalBottomInFlowThread);

</span><span class="cx">     container-&gt;setLogicalHeight(bottomInContainer);

</span><del>-    unsigned colCount = columnCount();

-    if (colCount &gt; 1) {

-        LayoutUnit paddedLogicalBottomInFlowThread = logicalTopInFlowThread() + computedColumnHeight() * colCount;

-        if (logicalBottomInFlowThread != paddedLogicalBottomInFlowThread) {

-            // Stretch the container to fully contain all columns, so that later content doesn't

-            // start at the wrong position and end up bleeding into the columns of this set.

-            container-&gt;setLogicalHeight(container-&gt;logicalHeight() + paddedLogicalBottomInFlowThread - logicalBottomInFlowThread);

-            setLogicalBottomInFlowThread(paddedLogicalBottomInFlowThread);

-        }

-    }

</del><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void RenderMultiColumnSet::layout()

</span><span class="lines">@@ -819,8 +809,6 @@

</span><span class="cx">     LayoutRect flowThreadPortion = flowThreadPortionRectAt(startColumn);

</span><span class="cx">     LayoutPoint translationOffset;

</span><span class="cx">     

</span><del>-    LayoutRect overallFlowThreadPortion = flowThreadPortionRect();

-    

</del><span class="cx">     bool progressionReversed = multiColumnFlowThread()-&gt;progressionIsReversed();

</span><span class="cx">     bool progressionIsInline = multiColumnFlowThread()-&gt;progressionIsInline();

</span><span class="cx"> 

</span><span class="lines">@@ -835,7 +823,7 @@

</span><span class="cx">             inlineOffset += contentLogicalWidth() - colLogicalWidth;

</span><span class="cx">     }

</span><span class="cx">     translationOffset.setX(inlineOffset);

</span><del>-    LayoutUnit blockOffset = initialBlockOffset + (isHorizontalWritingMode() ? overallFlowThreadPortion.y() - flowThreadPortion.y() : overallFlowThreadPortion.x() - flowThreadPortion.x());

</del><ins>+    LayoutUnit blockOffset = initialBlockOffset - (isHorizontalWritingMode() ? flowThreadPortion.y() : flowThreadPortion.x());

</ins><span class="cx">     if (!progressionIsInline) {

</span><span class="cx">         if (!progressionReversed)

</span><span class="cx">             blockOffset = startColumn * colGap;

</span><span class="lines">@@ -852,9 +840,10 @@

</span><span class="cx">     return translationOffset;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderMultiColumnSet::adjustRegionBoundsFromFlowThreadPortionRect(const LayoutPoint&amp; layerOffset, LayoutRect&amp; regionBounds)

</del><ins>+void RenderMultiColumnSet::adjustRegionBoundsFromFlowThreadPortionRect(const LayoutPoint&amp;, LayoutRect&amp;)

</ins><span class="cx"> {

</span><del>-    regionBounds.moveBy(roundedIntPoint(-columnTranslationForOffset(isHorizontalWritingMode() ? layerOffset.y() : layerOffset.x())));

</del><ins>+    // This only fires for named flow thread compositing code, so let's make sure to ASSERT if this ever gets invoked.

+    ASSERT_NOT_REACHED();

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void RenderMultiColumnSet::addOverflowFromChildren()

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderMultiColumnSeth"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.h (167964 => 167965)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.h        2014-04-29 22:23:17 UTC (rev 167964)

+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.h        2014-04-29 22:59:26 UTC (rev 167965)

</span><span class="lines">@@ -127,6 +127,8 @@

</span><span class="cx"> 

</span><span class="cx">     virtual void updateHitTestResult(HitTestResult&amp;, const LayoutPoint&amp;) override;

</span><span class="cx">     

</span><ins>+    LayoutRect columnRectAt(unsigned index) const;

+    

</ins><span class="cx"> protected:

</span><span class="cx">     void addOverflowFromChildren() override;

</span><span class="cx">     

</span><span class="lines">@@ -156,7 +158,6 @@

</span><span class="cx"> 

</span><span class="cx">     LayoutUnit calculateMaxColumnHeight() const;

</span><span class="cx">     LayoutUnit columnGap() const;

</span><del>-    LayoutRect columnRectAt(unsigned index) const;

</del><span class="cx">     unsigned columnCount() const;

</span><span class="cx"> 

</span><span class="cx">     LayoutRect flowThreadPortionRectAt(unsigned index) const;

</span></span></pre>

</div>

</div>

</body>

</html>