[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
hyatt at apple.com
hyatt at apple.com
Wed Dec 22 18:03:46 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 592848f1ed5bf4750132941ee743e7ad06cca7c7
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 6 20:03:43 2010 +0000
Fix for https://bugs.webkit.org/show_bug.cgi?id=49220 <<rdar://problem/8644849>, REGRESSION: transforms now
O(n^3) from pathological behavior in lowestPosition, rightmostPosition, leftmostPosition and topmostPosition.
Reviewed by Simon Fraser.
This patch throws out the lowest/rightmost/leftmost/topmostPosition functions and re-architects layout overflow
in the engine to cache all the information required to properly handle scrolling.
In the old code, there were two types of overflow: layout overflow and visual overflow. The former could
affect scrolling and the latter could not. The distinction was largely meaningless, since layout overflow
wasn't actually used to determine scroll width or scroll height. It didn't propagate across self-painting layer
boundaries either. In the old code, the term visible overflow meant the union of the layout overflow and
visual overflow rects.
In the new code, the two types of overflow remain, but the distinction between the two is now clear. Visual overflow
is used purely for painting and hit testing checks and layout overflow is used specifically for scrolling. It has
been expanded to propagate across self-painting layers, to factor in relative positioning and transforms, and to
work with writing modes.
In order to minimize layout test changes, layers no longer incorporate right/bottom overflow into their width/height members.
Doing so uncovered two bugs where left/top overflow was ignored (proof that even having layer dimensions is harmful).
A render tree dump hack has been put into the code to keep this overflow dumping for the RenderView's layer, since otherwise
a huge number of tests would change.
Added fast/overflow/overflow-rtl-vertical.html to test vertical writing-mode overflow. Existing tests cover the rest.
WebCore:
* page/FrameView.cpp:
(WebCore::FrameView::adjustViewSize):
(WebCore::FrameView::forceLayoutForPagination):
Changed to use RenderView's docTop/Left/Width/Height accessors, which simply grab the overflow and properly flip it
to account for writing modes.
* platform/graphics/IntRect.h:
(WebCore::IntRect::shiftLeftEdgeTo):
(WebCore::IntRect::shiftRightEdgeTo):
(WebCore::IntRect::shiftTopEdgeTo):
(WebCore::IntRect::shiftBottomEdgeTo):
New helper functions for sliding the edge of a rectangle without moving any of the other three edges.
* rendering/InlineBox.h:
(WebCore::InlineBox::frameRect):
frameRect is a helper for obtaining the x, y, width, height of an InlineBox as an IntRect.
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::placeBoxesInInlineDirection):
All of the overflow setting in the inline direction has been removed from this function. All line overflow is computed
at once now in a single function: computeOverflow.
(WebCore::InlineFlowBox::addBoxShadowVisualOverflow):
(WebCore::InlineFlowBox::addTextBoxVisualOverflow):
(WebCore::InlineFlowBox::addReplacedChildOverflow):
Helper for propagating overflow from specific types of children that occur on a line into the InlineFlowBox's overflow.
(WebCore::InlineFlowBox::computeOverflow):
The new function that computes both horizontal and vertical overflow for a line box.
(WebCore::InlineFlowBox::setLayoutOverflow):
(WebCore::InlineFlowBox::setVisualOverflow):
(WebCore::InlineFlowBox::setOverflowFromLogicalRects):
New functions that set the overflow computed by computeOverflow. These replace setBlockDirectionOverflowPositions
and setInlineDirectionOverflowPositions. They essentially do the same thing, but they operate on rectangles.
(WebCore::InlineFlowBox::nodeAtPoint):
(WebCore::InlineFlowBox::paint):
Changed to use visual overflow instead of visible overflow. (Visible overflow as a union of layout and visual
overflow is no longer necessary, since visual overflow is now equivalent to the old visible overflow concept.)
* rendering/InlineFlowBox.h:
(WebCore::InlineFlowBox::logicalLayoutOverflowRect):
(WebCore::InlineFlowBox::logicalVisualOverflowRect):
Helpers for obtaining logical overflow rectangles, since lines compute their overflow in logical terms before
converting to block coordinates at the end.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::layoutBlock):
(WebCore::RenderBlock::addOverflowFromChildren):
(WebCore::RenderBlock::computeOverflow):
(WebCore::RenderBlock::addOverflowFromFloats):
(WebCore::RenderBlock::addOverflowFromPositionedObjects):
Blocks now have a computeOverflow function called at the end of layout that adds in all the types of overflow. The addOverflowFromChildren
method is virtual so that RenderListItem and RenderTable can subclass it. RenderListItem has to position its list marker and
propagate marker overflow up, and RenderTable adds in overflow from its sections.
(WebCore::RenderBlock::layoutOnlyPositionedObjects):
(WebCore::RenderBlock::layoutPositionedObjects):
When only positioned objects lay out, overflow must still be recomputed. The refactoring of overflow computation into a single
callable method: computeOverflow, makes it possible for this to be done easily.
(WebCore::RenderBlock::paint):
visible -> visual.
(WebCore::RenderBlock::addOverhangingFloats):
The propagation of float overflow has changed substantially. The basic rules are:
(1) The float must be in our floating objects list to contribute to overflow.
(2) The float must be a descendant to contribute to overflow.
(3) The block must have the outermost list that contains the float, or it has a self-painting layer and
so the float needs to be included in its overflow.
(WebCore::RenderBlock::nodeAtPoint):
visible -> visual.
(WebCore::RenderBlock::layoutColumns):
Remove column overflow computation from layoutColumns and move it to computeOverflow.
(WebCore::RenderBlock::adjustLinePositionForPagination):
visible -> visual.
* rendering/RenderBlock.h:
(WebCore::RenderBlock::scrollbarsChanged):
Added a new virtual method used by table cells when scrollbars in an overflow:auto/scroll table cell come and go.
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlock::layoutInlineChildren):
(WebCore::RenderBlock::determineStartPosition):
(WebCore::RenderBlock::matchedEndLine):
(WebCore::RenderBlock::addOverflowFromInlineChildren):
(WebCore::RenderBlock::beforeSideVisualOverflowForLine):
(WebCore::RenderBlock::afterSideVisualOverflowForLine):
visible -> visual.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::scrollWidth):
(WebCore::RenderBox::scrollHeight):
Patched to use layoutOverflow functions instead of the old rightmost/leftmostPosition functions.
(WebCore::RenderBox::paintRootBoxDecorations):
Use docLeft and docTop here, so that writing modes are handled.
(WebCore::RenderBox::clippedOverflowRectForRepaint):
visible -> visual.
(WebCore::RenderBox::addOverflowFromChild):
(WebCore::RenderBox::addLayoutOverflow):
(WebCore::RenderBox::addVisualOverflow):
(WebCore::RenderBox::logicalVisualOverflowRectForPropagation):
(WebCore::RenderBox::visualOverflowRectForPropagation):
(WebCore::RenderBox::logicalLayoutOverflowRectForPropagation):
(WebCore::RenderBox::layoutOverflowRectForPropagation):
* rendering/RenderBox.h:
The new overflow system for boxes. Layout overflow now crosses self-painting layer boundaries and adjusts child boxes
for transforms, relative positioning and writing mode differences.
(WebCore::RenderBox::layoutOverflowRect):
(WebCore::RenderBox::topLayoutOverflow):
(WebCore::RenderBox::bottomLayoutOverflow):
(WebCore::RenderBox::leftLayoutOverflow):
(WebCore::RenderBox::rightLayoutOverflow):
Changed the default rectangle for layout overflow to be the client box to match the scrollable areas of overflow regions.
(WebCore::RenderBox::clientLogicalBottom):
New helper for obtaining the logical bottom of the client box.
(WebCore::RenderBox::clientBoxRect):
New helper for obtaining the clientLeft/Top/Width/Height box.
* rendering/RenderBoxModelObject.h:
(WebCore::RenderBoxModelObject::relativePositionLogicalOffset):
Helper for obtaining the relative position offset transposed for vertical writing modes. Used by line overflow.
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::layoutBlock):
Changed flexible boxes to just call the base class computeOverflow method.
* rendering/RenderInline.cpp:
(WebCore::RenderInline::linesVisualOverflowBoundingBox):
(WebCore::RenderInline::clippedOverflowRectForRepaint):
visible -> visual.
* rendering/RenderInline.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateLayerPosition):
Changed layers to no longer incorporate right/bottom overflow into width/height. This is the reason many layout
tests change. (Not doing this makes the layout test changes far worse, since overflow propagates across self-painting
layers now.)
(WebCore::RenderLayer::overflowTop):
(WebCore::RenderLayer::overflowBottom):
(WebCore::RenderLayer::overflowLeft):
(WebCore::RenderLayer::overflowRight):
overflowTop/Bottom/Left/Right return overflow that accounts for writing modes, i.e., purely physical overflow that can be used
to set up the scroll area.
(WebCore::RenderLayer::computeScrollDimensions):
Drastically simplified this method now that overflowTop/Bottom/Left/Right just do the right thing regarding unreachable overflow.
(WebCore::RenderLayer::updateScrollInfoAfterLayout):
Make sure to explicitly set the vertical scrollbar's position just as we did with horizontal scrollbars, so that clamping to the
bottom works.
(WebCore::performOverlapTests):
(WebCore::RenderLayer::paintLayer):
Fix a bug in performOverlapTests. It incorrectly used the layer's bounds, and so it didn't account for left/top overflow out
of the layer (see why I hate layers even having dimensions?). Changed it to use the bounding box of the layer instead.
(WebCore::RenderLayer::hitTest):
Fix a bug in hit testing. It incorrectly used the root layer's bounds as the limit of the hit test, and so it didn't account
for left/top overflow in a ScrollView (hate hate hate layers having dimensions). I changed it to use the hit test rect instead,
so that the damage rect never stops the point from being tested (unless the hit test request says not to ignore clipping).
(WebCore::RenderLayer::localBoundingBox):
visible -> visual.
* rendering/RenderLayer.h:
Added the new overflowTop/Left/Right/Bottom accessors.
* rendering/RenderLineBoxList.cpp:
(WebCore::RenderLineBoxList::anyLineIntersectsRect):
(WebCore::RenderLineBoxList::lineIntersectsDirtyRect):
(WebCore::RenderLineBoxList::paint):
(WebCore::RenderLineBoxList::hitTest):
visible -> visual.
* rendering/RenderListItem.cpp:
(WebCore::RenderListItem::addOverflowFromChildren):
(WebCore::RenderListItem::positionListMarker):
* rendering/RenderListItem.h:
RenderListItem now positions the list marker when computing its overflow, since the marker propagates overflow back up to the list item.
* rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::paint):
visible -> visual.
* rendering/RenderMarquee.cpp:
(WebCore::RenderMarquee::computePosition):
Changed to use overflow functions instead of rightmost/lowestPosition.
* rendering/RenderMedia.cpp:
* rendering/RenderMedia.h:
Removed the lowest/topmost/rightmost/leftmostPosition functions, since control overflow is handled properly already.
* rendering/RenderOverflow.h:
(WebCore::RenderOverflow::RenderOverflow):
(WebCore::RenderOverflow::setLayoutOverflow):
(WebCore::RenderOverflow::setVisualOverflow):
Add new setters for layout and visual overflow as rects.
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::shouldPaint):
(WebCore::RenderReplaced::clippedOverflowRectForRepaint):
visible -> visual.
* rendering/RenderRubyRun.cpp:
(WebCore::RenderRubyRun::layout):
Call computeOverflow to recompute our overflow information after we adjust the ruby.
* rendering/RenderTable.cpp:
(WebCore::RenderTable::layout):
(WebCore::RenderTable::addOverflowFromChildren):
(WebCore::RenderTable::paint):
* rendering/RenderTable.h:
Move section overflow propagation into addOverflowFromChildren, and change RenderTable to just call computeOverflow.
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::clippedOverflowRectForRepaint):
visible -> visual.
(WebCore::RenderTableCell::scrollbarsChanged):
Adding unreachable overflow support (something that in the old code only existed for positioned objects in the root view) exposed
a bug in table layout. If scrollbars are added during the layout that occurs after intrinsic padding was incorporated into the
cell, then the cell won't lay out properly the second time (after the scrollbars have been added). We have to adjust the intrinsic
padding accounting for the presence of the new scrollbar so the second layout will get the right dimensions.
* rendering/RenderTableCell.h:
(WebCore::RenderTableCell::hasVisualOverflow):
visible -> visual.
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::layoutRows):
* rendering/RenderTableSection.h:
visible -> visual. Removed the leftmost/rightmost/topmost/bottommostPosition functions.
* rendering/RenderTreeAsText.cpp:
(WebCore::writeLayers):
Added a hack to render tree dumping to include right/bottom overflow for the root layer only. This keeps a zillion layout tests
from failing.
* rendering/RenderView.cpp:
(WebCore::RenderView::layout):
(WebCore::RenderView::docTop):
(WebCore::RenderView::docBottom):
(WebCore::RenderView::docLeft):
(WebCore::RenderView::docRight):
* rendering/RenderView.h:
(WebCore::RenderView::docHeight):
(WebCore::RenderView::docWidth):
RenderView now uses docLeft/Top/Height/Width functions, which are just overflow queries that account for writing modes. These methods
are now the preferred way to query for the physical dimensions of a document.
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::addHighlightOverflow):
Changed to call setOverflowFromLogicalRects instead of the block/inline position functions.
(WebCore::RootInlineBox::alignBoxesInBlockDirection):
Remove the computation of block direction overflow, since it now all happens at once after the line is built.
(WebCore::RootInlineBox::paddedLayoutOverflowRect):
* rendering/RootInlineBox.h:
Added a new helper function for incorporating the end padding into a line. This end padding also includes the single pixel for a caret
in LTR if needed.
LayoutTests:
* compositing/checkerboard-expected.txt:
* compositing/geometry/limit-layer-bounds-transformed-expected.txt:
* compositing/iframes/composited-parent-iframe-expected.txt:
* fast/backgrounds/size/contain-and-cover-expected.txt:
* fast/flexbox/009.html:
* fast/overflow/overflow-rtl-vertical.html: Added.
* fast/spatial-navigation/snav-clipped-overflowed-content-expected.txt:
* fast/spatial-navigation/snav-clipped-overflowed-content.html:
* platform/mac/compositing/direct-image-compositing-expected.txt:
* platform/mac/compositing/geometry/fixed-position-expected.txt:
* platform/mac/compositing/geometry/video-opacity-overlay-expected.txt:
* platform/mac/compositing/overflow/fixed-position-ancestor-clip-expected.txt:
* platform/mac/compositing/overflow/scroll-ancestor-update-expected.txt:
* platform/mac/compositing/reflections/load-video-in-reflection-expected.txt:
* platform/mac/compositing/repaint/content-into-overflow-expected.txt:
* platform/mac/compositing/repaint/overflow-into-content-expected.txt:
* platform/mac/css1/box_properties/margin-expected.txt:
* platform/mac/css1/box_properties/margin_right-expected.txt:
* platform/mac/css1/classification/white_space-expected.txt:
* platform/mac/css1/color_and_background/background_attachment-expected.txt:
* platform/mac/css1/color_and_background/background_repeat-expected.txt:
* platform/mac/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt:
* platform/mac/css2.1/t0803-c5505-mrgn-02-c-expected.txt:
* platform/mac/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt:
* platform/mac/css2.1/t0905-c414-flt-00-d-expected.txt:
* platform/mac/css2.1/t0905-c414-flt-01-d-g-expected.txt:
* platform/mac/css2.1/t0905-c414-flt-02-c-expected.txt:
* platform/mac/css2.1/t0905-c414-flt-03-c-expected.txt:
* platform/mac/css2.1/t0905-c414-flt-04-c-expected.txt:
* platform/mac/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt:
* platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt:
* platform/mac/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt:
* platform/mac/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt:
* platform/mac/css2.1/t090501-c414-flt-02-d-g-expected.txt:
* platform/mac/css2.1/t090501-c414-flt-03-b-g-expected.txt:
* platform/mac/css2.1/t1202-counters-08-b-expected.txt:
* platform/mac/css2.1/t1202-counters-09-b-expected.txt:
* platform/mac/editing/deleting/delete-after-span-ws-001-expected.txt:
* platform/mac/editing/deleting/delete-after-span-ws-002-expected.txt:
* platform/mac/editing/deleting/delete-after-span-ws-003-expected.txt:
* platform/mac/editing/deleting/delete-line-end-ws-001-expected.txt:
* platform/mac/editing/deleting/delete-line-end-ws-002-expected.txt:
* platform/mac/editing/selection/25228-expected.txt:
* platform/mac/editing/selection/focus_editable_html-expected.txt:
* platform/mac/editing/selection/select-all-001-expected.txt:
* platform/mac/editing/selection/select-all-002-expected.txt:
* platform/mac/editing/selection/select-all-003-expected.txt:
* platform/mac/editing/selection/select-all-004-expected.txt:
* platform/mac/editing/selection/unrendered-001-expected.txt:
* platform/mac/editing/selection/unrendered-002-expected.txt:
* platform/mac/editing/selection/unrendered-003-expected.txt:
* platform/mac/editing/selection/unrendered-004-expected.txt:
* platform/mac/editing/selection/unrendered-005-expected.txt:
* platform/mac/fast/backgrounds/repeat/negative-offset-repeat-expected.txt:
* platform/mac/fast/backgrounds/size/backgroundSize15-expected.txt:
* platform/mac/fast/block/basic/010-expected.txt:
* platform/mac/fast/block/basic/fieldset-stretch-to-legend-expected.txt:
* platform/mac/fast/block/float/008-expected.txt:
* platform/mac/fast/block/float/013-expected.txt:
* platform/mac/fast/block/float/019-expected.txt:
* platform/mac/fast/block/float/021-expected.txt:
* platform/mac/fast/block/float/029-expected.txt:
* platform/mac/fast/block/float/031-expected.txt:
* platform/mac/fast/block/float/033-expected.txt:
* platform/mac/fast/block/float/035-expected.txt:
* platform/mac/fast/block/float/avoidance-percent-width-strict-expected.txt:
* platform/mac/fast/block/float/clamped-right-float-expected.txt:
* platform/mac/fast/block/float/float-in-float-painting-expected.txt:
* platform/mac/fast/block/float/nested-clearance-expected.txt:
* platform/mac/fast/block/float/relative-painted-twice-expected.txt:
* platform/mac/fast/block/margin-collapse/004-expected.txt:
* platform/mac/fast/block/margin-collapse/062-expected.txt:
* platform/mac/fast/block/margin-collapse/063-expected.txt:
* platform/mac/fast/block/margin-collapse/104-expected.txt:
* platform/mac/fast/block/margin-collapse/block-inside-inline/004-expected.txt:
* platform/mac/fast/block/margin-collapse/block-inside-inline/005-expected.txt:
* platform/mac/fast/block/positioning/002-expected.txt:
* platform/mac/fast/block/positioning/047-expected.txt:
* platform/mac/fast/block/positioning/049-expected.txt:
* platform/mac/fast/block/positioning/051-expected.txt:
* platform/mac/fast/block/positioning/auto-height-with-top-and-bottom-expected.txt:
* platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt:
* platform/mac/fast/blockflow/block-level-images-expected.txt:
* platform/mac/fast/blockflow/border-radius-clipping-vertical-lr-expected.txt:
* platform/mac/fast/blockflow/box-shadow-vertical-lr-expected.txt:
* platform/mac/fast/blockflow/box-shadow-vertical-rl-expected.txt:
* platform/mac/fast/blockflow/floats-in-block-layout-expected.txt:
* platform/mac/fast/body-propagation/background-color/002-expected.txt:
* platform/mac/fast/body-propagation/background-color/002-xhtml-expected.txt:
* platform/mac/fast/body-propagation/background-image/002-expected.txt:
* platform/mac/fast/body-propagation/background-image/002-xhtml-expected.txt:
* platform/mac/fast/body-propagation/overflow/001-expected.txt:
* platform/mac/fast/body-propagation/overflow/001-xhtml-expected.txt:
* platform/mac/fast/body-propagation/overflow/005-declarative-expected.txt:
* platform/mac/fast/body-propagation/overflow/005-expected.txt:
* platform/mac/fast/body-propagation/overflow/005-xhtml-expected.txt:
* platform/mac/fast/borders/fieldsetBorderRadius-expected.txt:
* platform/mac/fast/box-shadow/basic-shadows-expected.txt:
* platform/mac/fast/box-sizing/box-sizing-expected.txt:
* platform/mac/fast/clip/008-expected.txt:
* platform/mac/fast/clip/009-expected.txt:
* platform/mac/fast/clip/010-expected.txt:
* platform/mac/fast/clip/011-expected.txt:
* platform/mac/fast/clip/012-expected.txt:
* platform/mac/fast/compact/001-expected.txt:
* platform/mac/fast/css/color-correction-on-background-image-expected.txt:
* platform/mac/fast/css/negative-leading-expected.txt:
* platform/mac/fast/css/percentage-non-integer-expected.txt:
* platform/mac/fast/css/word-space-extra-expected.txt:
* platform/mac/fast/dom/clone-node-dynamic-style-expected.txt:
* platform/mac/fast/dynamic/window-resize-scrollbars-test-expected.txt:
* platform/mac/fast/events/focusingUnloadedFrame-expected.txt:
* platform/mac/fast/flexbox/009-expected.txt:
* platform/mac/fast/flexbox/016-expected.txt:
* platform/mac/fast/flexbox/flex-hang-expected.txt:
* platform/mac/fast/forms/basic-textareas-quirks-expected.txt:
* platform/mac/fast/forms/file-input-direction-expected.txt:
* platform/mac/fast/forms/floating-textfield-relayout-expected.txt:
* platform/mac/fast/forms/textfield-overflow-expected.txt:
* platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt:
* platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt:
* platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt:
* platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt:
* platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt:
* platform/mac/fast/frames/frame-scrolling-attribute-expected.txt:
* platform/mac/fast/frames/iframe-scrolling-attribute-expected.txt:
* platform/mac/fast/frames/inline-object-inside-frameset-expected.txt:
* platform/mac/fast/gradients/background-clipped-expected.txt:
* platform/mac/fast/images/gif-large-checkerboard-expected.txt:
* platform/mac/fast/images/pdf-as-image-landscape-expected.txt:
* platform/mac/fast/inline-block/inline-block-vertical-align-expected.txt:
* platform/mac/fast/inline/long-wrapped-line-expected.txt:
* platform/mac/fast/layers/layer-visibility-expected.txt:
* platform/mac/fast/layers/layer-visibility-sublayer-expected.txt:
* platform/mac/fast/lists/001-expected.txt:
* platform/mac/fast/lists/001-vertical-expected.txt:
* platform/mac/fast/lists/003-expected.txt:
* platform/mac/fast/lists/003-vertical-expected.txt:
* platform/mac/fast/lists/li-br-expected.txt:
* platform/mac/fast/media/mq-relative-constraints-02-expected.txt:
* platform/mac/fast/media/mq-relative-constraints-03-expected.txt:
* platform/mac/fast/media/mq-relative-constraints-04-expected.txt:
* platform/mac/fast/media/mq-relative-constraints-05-expected.txt:
* platform/mac/fast/media/mq-relative-constraints-06-expected.txt:
* platform/mac/fast/media/mq-relative-constraints-07-expected.txt:
* platform/mac/fast/media/mq-relative-constraints-08-expected.txt:
* platform/mac/fast/media/mq-relative-constraints-09-expected.txt:
* platform/mac/fast/media/mq-width-absolute-01-expected.txt:
* platform/mac/fast/media/mq-width-absolute-02-expected.txt:
* platform/mac/fast/media/mq-width-absolute-03-expected.txt:
* platform/mac/fast/media/mq-width-absolute-04-expected.txt:
* platform/mac/fast/multicol/float-multicol-expected.txt:
* platform/mac/fast/multicol/float-paginate-complex-expected.txt:
* platform/mac/fast/multicol/float-paginate-expected.txt:
* platform/mac/fast/multicol/layers-in-multicol-expected.txt:
* platform/mac/fast/multicol/paginate-block-replaced-expected.txt:
* platform/mac/fast/multicol/positioned-with-constrained-height-expected.txt:
* platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.txt:
* platform/mac/fast/multicol/table-vertical-align-expected.txt:
* platform/mac/fast/overflow/006-expected.txt:
* platform/mac/fast/overflow/float-in-relpositioned-expected.txt:
* platform/mac/fast/overflow/overflow-auto-table-expected.txt:
* platform/mac/fast/overflow/overflow-rtl-vertical-expected.checksum: Added.
* platform/mac/fast/overflow/overflow-rtl-vertical-expected.png: Added.
* platform/mac/fast/overflow/overflow-rtl-vertical-expected.txt: Added.
* platform/mac/fast/overflow/scrollRevealButton-expected.txt:
* platform/mac/fast/reflections/reflection-direction-expected.txt:
* platform/mac/fast/repaint/box-shadow-h-expected.checksum:
* platform/mac/fast/repaint/box-shadow-h-expected.png:
* platform/mac/fast/repaint/box-shadow-h-expected.txt:
* platform/mac/fast/repaint/box-shadow-v-expected.txt:
* platform/mac/fast/repaint/content-into-overflow-expected.txt:
* platform/mac/fast/repaint/dynamic-table-vertical-alignment-change-expected.txt:
* platform/mac/fast/repaint/float-overflow-expected.txt:
* platform/mac/fast/repaint/float-overflow-right-expected.txt:
* platform/mac/fast/repaint/overflow-into-content-expected.txt:
* platform/mac/fast/repaint/overflow-scroll-body-appear-expected.txt:
* platform/mac/fast/repaint/subtree-root-clip-expected.txt:
* platform/mac/fast/repaint/transform-absolute-in-positioned-container-expected.txt:
* platform/mac/fast/repaint/transform-replaced-shadows-expected.checksum:
* platform/mac/fast/repaint/transform-replaced-shadows-expected.png:
* platform/mac/fast/replaced/004-expected.txt:
* platform/mac/fast/table/034-expected.txt:
* platform/mac/fast/table/border-collapsing/004-vertical-expected.txt:
* platform/mac/fast/table/colspanMinWidth-vertical-expected.txt:
* platform/mac/fast/table/fixed-with-auto-with-colspan-expected.txt:
* platform/mac/fast/table/fixed-with-auto-with-colspan-vertical-expected.txt:
* platform/mac/fast/table/frame-and-rules-expected.txt:
* platform/mac/fast/table/height-percent-test-vertical-expected.txt:
* platform/mac/fast/table/wide-colspan-expected.txt:
* platform/mac/fast/table/wide-column-expected.txt:
* platform/mac/fast/text/international/thai-line-breaks-expected.txt:
* platform/mac/fast/text/large-text-composed-char-expected.txt:
* platform/mac/fast/text/letter-spacing-negative-opacity-expected.txt:
* platform/mac/fast/text/text-letter-spacing-expected.txt:
* platform/mac/fast/text/whitespace/012-expected.txt:
* platform/mac/mathml/presentation/fenced-expected.txt:
* platform/mac/mathml/presentation/mo-expected.txt:
* platform/mac/mathml/presentation/over-expected.txt:
* platform/mac/mathml/presentation/row-alignment-expected.txt:
* platform/mac/mathml/presentation/row-expected.txt:
* platform/mac/printing/return-from-printing-mode-expected.txt:
* platform/mac/svg/custom/altglyph-expected.txt:
* platform/mac/svg/custom/getscreenctm-in-mixed-content-expected.txt:
* platform/mac/svg/custom/path-bad-data-expected.txt:
* platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt:
* platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
* platform/mac/svg/custom/text-xy-updates-SVGList-expected.txt:
* platform/mac/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-expected.txt:
* platform/mac/svg/text/foreignObject-text-clipping-bug-expected.txt:
* platform/mac/svg/text/kerning-expected.txt:
* platform/mac/svg/text/multichar-glyph-expected.txt:
* platform/mac/svg/transforms/animated-path-inside-transformed-html-expected.txt:
* platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt:
* platform/mac/svg/zoom/text/zoom-hixie-mixed-009-expected.txt:
* platform/mac/tables/mozilla/bugs/bug120364-expected.txt:
* platform/mac/tables/mozilla/bugs/bug131020-expected.txt:
* platform/mac/tables/mozilla/bugs/bug196870-expected.txt:
* platform/mac/tables/mozilla/bugs/bug23151-expected.txt:
* platform/mac/tables/mozilla/bugs/bug29314-expected.txt:
* platform/mac/tables/mozilla/bugs/bug43039-expected.txt:
* platform/mac/tables/mozilla/bugs/bug43854-1-expected.txt:
* platform/mac/tables/mozilla/bugs/bug45055-2-expected.txt:
* platform/mac/tables/mozilla/bugs/bug5797-expected.txt:
* platform/mac/tables/mozilla/bugs/bug625-expected.txt:
* platform/mac/tables/mozilla/bugs/bug72359-expected.txt:
* platform/mac/tables/mozilla/bugs/bug83786-expected.txt:
* platform/mac/tables/mozilla/bugs/bug92143-expected.txt:
* platform/mac/tables/mozilla/bugs/bug96334-expected.txt:
* platform/mac/tables/mozilla/core/nested1-expected.txt:
* platform/mac/tables/mozilla/marvin/backgr_index-expected.txt:
* platform/mac/tables/mozilla/marvin/x_table_align_left-expected.txt:
* platform/mac/tables/mozilla/marvin/x_table_align_right-expected.txt:
* platform/mac/tables/mozilla/marvin/x_td_nowrap-expected.txt:
* platform/mac/tables/mozilla/marvin/x_th_nowrap-expected.txt:
* platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.txt:
* platform/mac/tables/mozilla_expected_failures/bugs/bug2479-5-expected.txt:
* platform/mac/tables/mozilla_expected_failures/bugs/bug67915-2-expected.txt:
* platform/mac/tables/mozilla_expected_failures/bugs/bug85016-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_left-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_right-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_top-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_table-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_align_right-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_bottom-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_middle-expected.txt:
* platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_top-expected.txt:
* platform/mac/transforms/3d/point-mapping/3d-point-mapping-2-expected.txt:
* platform/mac/transforms/3d/point-mapping/3d-point-mapping-expected.txt:
* platform/mac/transforms/3d/point-mapping/3d-point-mapping-origins-expected.txt:
* platform/mac/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.txt:
* platform/mac/transforms/svg-vs-css-expected.txt:
* svg/custom/text-zoom-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73385 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9e7b35a..b98ebd3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,300 @@
+2010-12-06 David Hyatt <hyatt at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Fix for https://bugs.webkit.org/show_bug.cgi?id=49220 <<rdar://problem/8644849>, REGRESSION: transforms now
+ O(n^3) from pathological behavior in lowestPosition, rightmostPosition, leftmostPosition and topmostPosition.
+
+ This patch throws out the lowest/rightmost/leftmost/topmostPosition functions and re-architects layout overflow
+ in the engine to cache all the information required to properly handle scrolling.
+
+ In the old code, there were two types of overflow: layout overflow and visual overflow. The former could
+ affect scrolling and the latter could not. The distinction was largely meaningless, since layout overflow
+ wasn't actually used to determine scroll width or scroll height. It didn't propagate across self-painting layer
+ boundaries either. In the old code, the term visible overflow meant the union of the layout overflow and
+ visual overflow rects.
+
+ In the new code, the two types of overflow remain, but the distinction between the two is now clear. Visual overflow
+ is used purely for painting and hit testing checks and layout overflow is used specifically for scrolling. It has
+ been expanded to propagate across self-painting layers, to factor in relative positioning and transforms, and to
+ work with writing modes.
+
+ In order to minimize layout test changes, layers no longer incorporate right/bottom overflow into their width/height members.
+ Doing so uncovered two bugs where left/top overflow was ignored (proof that even having layer dimensions is harmful).
+ A render tree dump hack has been put into the code to keep this overflow dumping for the RenderView's layer, since otherwise
+ a huge number of tests would change.
+
+ Added fast/overflow/overflow-rtl-vertical.html to test vertical writing-mode overflow. Existing tests cover the rest.
+
+ * compositing/checkerboard-expected.txt:
+ * compositing/geometry/limit-layer-bounds-transformed-expected.txt:
+ * compositing/iframes/composited-parent-iframe-expected.txt:
+ * fast/backgrounds/size/contain-and-cover-expected.txt:
+ * fast/flexbox/009.html:
+ * fast/overflow/overflow-rtl-vertical.html: Added.
+ * fast/spatial-navigation/snav-clipped-overflowed-content-expected.txt:
+ * fast/spatial-navigation/snav-clipped-overflowed-content.html:
+ * platform/mac/compositing/direct-image-compositing-expected.txt:
+ * platform/mac/compositing/geometry/fixed-position-expected.txt:
+ * platform/mac/compositing/geometry/video-opacity-overlay-expected.txt:
+ * platform/mac/compositing/overflow/fixed-position-ancestor-clip-expected.txt:
+ * platform/mac/compositing/overflow/scroll-ancestor-update-expected.txt:
+ * platform/mac/compositing/reflections/load-video-in-reflection-expected.txt:
+ * platform/mac/compositing/repaint/content-into-overflow-expected.txt:
+ * platform/mac/compositing/repaint/overflow-into-content-expected.txt:
+ * platform/mac/css1/box_properties/margin-expected.txt:
+ * platform/mac/css1/box_properties/margin_right-expected.txt:
+ * platform/mac/css1/classification/white_space-expected.txt:
+ * platform/mac/css1/color_and_background/background_attachment-expected.txt:
+ * platform/mac/css1/color_and_background/background_repeat-expected.txt:
+ * platform/mac/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt:
+ * platform/mac/css2.1/t0803-c5505-mrgn-02-c-expected.txt:
+ * platform/mac/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt:
+ * platform/mac/css2.1/t0905-c414-flt-00-d-expected.txt:
+ * platform/mac/css2.1/t0905-c414-flt-01-d-g-expected.txt:
+ * platform/mac/css2.1/t0905-c414-flt-02-c-expected.txt:
+ * platform/mac/css2.1/t0905-c414-flt-03-c-expected.txt:
+ * platform/mac/css2.1/t0905-c414-flt-04-c-expected.txt:
+ * platform/mac/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt:
+ * platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt:
+ * platform/mac/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt:
+ * platform/mac/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt:
+ * platform/mac/css2.1/t090501-c414-flt-02-d-g-expected.txt:
+ * platform/mac/css2.1/t090501-c414-flt-03-b-g-expected.txt:
+ * platform/mac/css2.1/t1202-counters-08-b-expected.txt:
+ * platform/mac/css2.1/t1202-counters-09-b-expected.txt:
+ * platform/mac/editing/deleting/delete-after-span-ws-001-expected.txt:
+ * platform/mac/editing/deleting/delete-after-span-ws-002-expected.txt:
+ * platform/mac/editing/deleting/delete-after-span-ws-003-expected.txt:
+ * platform/mac/editing/deleting/delete-line-end-ws-001-expected.txt:
+ * platform/mac/editing/deleting/delete-line-end-ws-002-expected.txt:
+ * platform/mac/editing/selection/25228-expected.txt:
+ * platform/mac/editing/selection/focus_editable_html-expected.txt:
+ * platform/mac/editing/selection/select-all-001-expected.txt:
+ * platform/mac/editing/selection/select-all-002-expected.txt:
+ * platform/mac/editing/selection/select-all-003-expected.txt:
+ * platform/mac/editing/selection/select-all-004-expected.txt:
+ * platform/mac/editing/selection/unrendered-001-expected.txt:
+ * platform/mac/editing/selection/unrendered-002-expected.txt:
+ * platform/mac/editing/selection/unrendered-003-expected.txt:
+ * platform/mac/editing/selection/unrendered-004-expected.txt:
+ * platform/mac/editing/selection/unrendered-005-expected.txt:
+ * platform/mac/fast/backgrounds/repeat/negative-offset-repeat-expected.txt:
+ * platform/mac/fast/backgrounds/size/backgroundSize15-expected.txt:
+ * platform/mac/fast/block/basic/010-expected.txt:
+ * platform/mac/fast/block/basic/fieldset-stretch-to-legend-expected.txt:
+ * platform/mac/fast/block/float/008-expected.txt:
+ * platform/mac/fast/block/float/013-expected.txt:
+ * platform/mac/fast/block/float/019-expected.txt:
+ * platform/mac/fast/block/float/021-expected.txt:
+ * platform/mac/fast/block/float/029-expected.txt:
+ * platform/mac/fast/block/float/031-expected.txt:
+ * platform/mac/fast/block/float/033-expected.txt:
+ * platform/mac/fast/block/float/035-expected.txt:
+ * platform/mac/fast/block/float/avoidance-percent-width-strict-expected.txt:
+ * platform/mac/fast/block/float/clamped-right-float-expected.txt:
+ * platform/mac/fast/block/float/float-in-float-painting-expected.txt:
+ * platform/mac/fast/block/float/nested-clearance-expected.txt:
+ * platform/mac/fast/block/float/relative-painted-twice-expected.txt:
+ * platform/mac/fast/block/margin-collapse/004-expected.txt:
+ * platform/mac/fast/block/margin-collapse/062-expected.txt:
+ * platform/mac/fast/block/margin-collapse/063-expected.txt:
+ * platform/mac/fast/block/margin-collapse/104-expected.txt:
+ * platform/mac/fast/block/margin-collapse/block-inside-inline/004-expected.txt:
+ * platform/mac/fast/block/margin-collapse/block-inside-inline/005-expected.txt:
+ * platform/mac/fast/block/positioning/002-expected.txt:
+ * platform/mac/fast/block/positioning/047-expected.txt:
+ * platform/mac/fast/block/positioning/049-expected.txt:
+ * platform/mac/fast/block/positioning/051-expected.txt:
+ * platform/mac/fast/block/positioning/auto-height-with-top-and-bottom-expected.txt:
+ * platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt:
+ * platform/mac/fast/blockflow/block-level-images-expected.txt:
+ * platform/mac/fast/blockflow/border-radius-clipping-vertical-lr-expected.txt:
+ * platform/mac/fast/blockflow/box-shadow-vertical-lr-expected.txt:
+ * platform/mac/fast/blockflow/box-shadow-vertical-rl-expected.txt:
+ * platform/mac/fast/blockflow/floats-in-block-layout-expected.txt:
+ * platform/mac/fast/body-propagation/background-color/002-expected.txt:
+ * platform/mac/fast/body-propagation/background-color/002-xhtml-expected.txt:
+ * platform/mac/fast/body-propagation/background-image/002-expected.txt:
+ * platform/mac/fast/body-propagation/background-image/002-xhtml-expected.txt:
+ * platform/mac/fast/body-propagation/overflow/001-expected.txt:
+ * platform/mac/fast/body-propagation/overflow/001-xhtml-expected.txt:
+ * platform/mac/fast/body-propagation/overflow/005-declarative-expected.txt:
+ * platform/mac/fast/body-propagation/overflow/005-expected.txt:
+ * platform/mac/fast/body-propagation/overflow/005-xhtml-expected.txt:
+ * platform/mac/fast/borders/fieldsetBorderRadius-expected.txt:
+ * platform/mac/fast/box-shadow/basic-shadows-expected.txt:
+ * platform/mac/fast/box-sizing/box-sizing-expected.txt:
+ * platform/mac/fast/clip/008-expected.txt:
+ * platform/mac/fast/clip/009-expected.txt:
+ * platform/mac/fast/clip/010-expected.txt:
+ * platform/mac/fast/clip/011-expected.txt:
+ * platform/mac/fast/clip/012-expected.txt:
+ * platform/mac/fast/compact/001-expected.txt:
+ * platform/mac/fast/css/color-correction-on-background-image-expected.txt:
+ * platform/mac/fast/css/negative-leading-expected.txt:
+ * platform/mac/fast/css/percentage-non-integer-expected.txt:
+ * platform/mac/fast/css/word-space-extra-expected.txt:
+ * platform/mac/fast/dom/clone-node-dynamic-style-expected.txt:
+ * platform/mac/fast/dynamic/window-resize-scrollbars-test-expected.txt:
+ * platform/mac/fast/events/focusingUnloadedFrame-expected.txt:
+ * platform/mac/fast/flexbox/009-expected.txt:
+ * platform/mac/fast/flexbox/016-expected.txt:
+ * platform/mac/fast/flexbox/flex-hang-expected.txt:
+ * platform/mac/fast/forms/basic-textareas-quirks-expected.txt:
+ * platform/mac/fast/forms/file-input-direction-expected.txt:
+ * platform/mac/fast/forms/floating-textfield-relayout-expected.txt:
+ * platform/mac/fast/forms/textfield-overflow-expected.txt:
+ * platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt:
+ * platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt:
+ * platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt:
+ * platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt:
+ * platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt:
+ * platform/mac/fast/frames/frame-scrolling-attribute-expected.txt:
+ * platform/mac/fast/frames/iframe-scrolling-attribute-expected.txt:
+ * platform/mac/fast/frames/inline-object-inside-frameset-expected.txt:
+ * platform/mac/fast/gradients/background-clipped-expected.txt:
+ * platform/mac/fast/images/gif-large-checkerboard-expected.txt:
+ * platform/mac/fast/images/pdf-as-image-landscape-expected.txt:
+ * platform/mac/fast/inline-block/inline-block-vertical-align-expected.txt:
+ * platform/mac/fast/inline/long-wrapped-line-expected.txt:
+ * platform/mac/fast/layers/layer-visibility-expected.txt:
+ * platform/mac/fast/layers/layer-visibility-sublayer-expected.txt:
+ * platform/mac/fast/lists/001-expected.txt:
+ * platform/mac/fast/lists/001-vertical-expected.txt:
+ * platform/mac/fast/lists/003-expected.txt:
+ * platform/mac/fast/lists/003-vertical-expected.txt:
+ * platform/mac/fast/lists/li-br-expected.txt:
+ * platform/mac/fast/media/mq-relative-constraints-02-expected.txt:
+ * platform/mac/fast/media/mq-relative-constraints-03-expected.txt:
+ * platform/mac/fast/media/mq-relative-constraints-04-expected.txt:
+ * platform/mac/fast/media/mq-relative-constraints-05-expected.txt:
+ * platform/mac/fast/media/mq-relative-constraints-06-expected.txt:
+ * platform/mac/fast/media/mq-relative-constraints-07-expected.txt:
+ * platform/mac/fast/media/mq-relative-constraints-08-expected.txt:
+ * platform/mac/fast/media/mq-relative-constraints-09-expected.txt:
+ * platform/mac/fast/media/mq-width-absolute-01-expected.txt:
+ * platform/mac/fast/media/mq-width-absolute-02-expected.txt:
+ * platform/mac/fast/media/mq-width-absolute-03-expected.txt:
+ * platform/mac/fast/media/mq-width-absolute-04-expected.txt:
+ * platform/mac/fast/multicol/float-multicol-expected.txt:
+ * platform/mac/fast/multicol/float-paginate-complex-expected.txt:
+ * platform/mac/fast/multicol/float-paginate-expected.txt:
+ * platform/mac/fast/multicol/layers-in-multicol-expected.txt:
+ * platform/mac/fast/multicol/paginate-block-replaced-expected.txt:
+ * platform/mac/fast/multicol/positioned-with-constrained-height-expected.txt:
+ * platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.txt:
+ * platform/mac/fast/multicol/table-vertical-align-expected.txt:
+ * platform/mac/fast/overflow/006-expected.txt:
+ * platform/mac/fast/overflow/float-in-relpositioned-expected.txt:
+ * platform/mac/fast/overflow/overflow-auto-table-expected.txt:
+ * platform/mac/fast/overflow/overflow-rtl-vertical-expected.checksum: Added.
+ * platform/mac/fast/overflow/overflow-rtl-vertical-expected.png: Added.
+ * platform/mac/fast/overflow/overflow-rtl-vertical-expected.txt: Added.
+ * platform/mac/fast/overflow/scrollRevealButton-expected.txt:
+ * platform/mac/fast/reflections/reflection-direction-expected.txt:
+ * platform/mac/fast/repaint/box-shadow-h-expected.checksum:
+ * platform/mac/fast/repaint/box-shadow-h-expected.png:
+ * platform/mac/fast/repaint/box-shadow-h-expected.txt:
+ * platform/mac/fast/repaint/box-shadow-v-expected.txt:
+ * platform/mac/fast/repaint/content-into-overflow-expected.txt:
+ * platform/mac/fast/repaint/dynamic-table-vertical-alignment-change-expected.txt:
+ * platform/mac/fast/repaint/float-overflow-expected.txt:
+ * platform/mac/fast/repaint/float-overflow-right-expected.txt:
+ * platform/mac/fast/repaint/overflow-into-content-expected.txt:
+ * platform/mac/fast/repaint/overflow-scroll-body-appear-expected.txt:
+ * platform/mac/fast/repaint/subtree-root-clip-expected.txt:
+ * platform/mac/fast/repaint/transform-absolute-in-positioned-container-expected.txt:
+ * platform/mac/fast/repaint/transform-replaced-shadows-expected.checksum:
+ * platform/mac/fast/repaint/transform-replaced-shadows-expected.png:
+ * platform/mac/fast/replaced/004-expected.txt:
+ * platform/mac/fast/table/034-expected.txt:
+ * platform/mac/fast/table/border-collapsing/004-vertical-expected.txt:
+ * platform/mac/fast/table/colspanMinWidth-vertical-expected.txt:
+ * platform/mac/fast/table/fixed-with-auto-with-colspan-expected.txt:
+ * platform/mac/fast/table/fixed-with-auto-with-colspan-vertical-expected.txt:
+ * platform/mac/fast/table/frame-and-rules-expected.txt:
+ * platform/mac/fast/table/height-percent-test-vertical-expected.txt:
+ * platform/mac/fast/table/wide-colspan-expected.txt:
+ * platform/mac/fast/table/wide-column-expected.txt:
+ * platform/mac/fast/text/international/thai-line-breaks-expected.txt:
+ * platform/mac/fast/text/large-text-composed-char-expected.txt:
+ * platform/mac/fast/text/letter-spacing-negative-opacity-expected.txt:
+ * platform/mac/fast/text/text-letter-spacing-expected.txt:
+ * platform/mac/fast/text/whitespace/012-expected.txt:
+ * platform/mac/mathml/presentation/fenced-expected.txt:
+ * platform/mac/mathml/presentation/mo-expected.txt:
+ * platform/mac/mathml/presentation/over-expected.txt:
+ * platform/mac/mathml/presentation/row-alignment-expected.txt:
+ * platform/mac/mathml/presentation/row-expected.txt:
+ * platform/mac/printing/return-from-printing-mode-expected.txt:
+ * platform/mac/svg/custom/altglyph-expected.txt:
+ * platform/mac/svg/custom/getscreenctm-in-mixed-content-expected.txt:
+ * platform/mac/svg/custom/path-bad-data-expected.txt:
+ * platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt:
+ * platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
+ * platform/mac/svg/custom/text-xy-updates-SVGList-expected.txt:
+ * platform/mac/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-expected.txt:
+ * platform/mac/svg/text/foreignObject-text-clipping-bug-expected.txt:
+ * platform/mac/svg/text/kerning-expected.txt:
+ * platform/mac/svg/text/multichar-glyph-expected.txt:
+ * platform/mac/svg/transforms/animated-path-inside-transformed-html-expected.txt:
+ * platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt:
+ * platform/mac/svg/zoom/text/zoom-hixie-mixed-009-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug120364-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug131020-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug196870-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug23151-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug29314-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug43039-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug43854-1-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug45055-2-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug5797-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug625-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug72359-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug83786-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug92143-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug96334-expected.txt:
+ * platform/mac/tables/mozilla/core/nested1-expected.txt:
+ * platform/mac/tables/mozilla/marvin/backgr_index-expected.txt:
+ * platform/mac/tables/mozilla/marvin/x_table_align_left-expected.txt:
+ * platform/mac/tables/mozilla/marvin/x_table_align_right-expected.txt:
+ * platform/mac/tables/mozilla/marvin/x_td_nowrap-expected.txt:
+ * platform/mac/tables/mozilla/marvin/x_th_nowrap-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/bugs/bug2479-5-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/bugs/bug67915-2-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/bugs/bug85016-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_left-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_right-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_top-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_table-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_align_right-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_bottom-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_middle-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_top-expected.txt:
+ * platform/mac/transforms/3d/point-mapping/3d-point-mapping-2-expected.txt:
+ * platform/mac/transforms/3d/point-mapping/3d-point-mapping-expected.txt:
+ * platform/mac/transforms/3d/point-mapping/3d-point-mapping-origins-expected.txt:
+ * platform/mac/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.txt:
+ * platform/mac/transforms/svg-vs-css-expected.txt:
+ * svg/custom/text-zoom-expected.txt:
+
2010-12-06 Mihai Parparita <mihaip at chromium.org>
Unreviewed move of Chromium baselines.
diff --git a/LayoutTests/compositing/checkerboard-expected.txt b/LayoutTests/compositing/checkerboard-expected.txt
index a0185f9..4d81e88 100644
--- a/LayoutTests/compositing/checkerboard-expected.txt
+++ b/LayoutTests/compositing/checkerboard-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 2055x2063
RenderView at (0,0) size 800x600
-layer at (0,0) size 2055x2063
+layer at (0,0) size 800x2063
RenderBlock {HTML} at (0,0) size 800x2063
RenderBody {BODY} at (8,8) size 784x2047
RenderBlock {DIV} at (0,0) size 2047x2047
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt b/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
index 6469010..8221ff7 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
@@ -1,9 +1,9 @@
Text here
(GraphicsLayer
- (bounds 1329.00 585.00)
+ (bounds 800.00 600.00)
(children 1
(GraphicsLayer
- (bounds 1329.00 585.00)
+ (bounds 800.00 600.00)
(children 3
(GraphicsLayer
(position 129.00 29.00)
diff --git a/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt b/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt
index 567dc1d..445f51e 100644
--- a/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt
+++ b/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt
@@ -3,11 +3,10 @@
(bounds 800.00 600.00)
(children 1
(GraphicsLayer
- (position -12.00 0.00)
- (bounds 812.00 600.00)
+ (bounds 800.00 600.00)
(children 1
(GraphicsLayer
- (position 0.00 -12.00)
+ (position -12.00 -12.00)
(bounds 370.00 220.00)
(drawsContent 1)
(children 1
diff --git a/LayoutTests/fast/backgrounds/size/contain-and-cover-expected.txt b/LayoutTests/fast/backgrounds/size/contain-and-cover-expected.txt
index ac8bb2c..8289790 100644
--- a/LayoutTests/fast/backgrounds/size/contain-and-cover-expected.txt
+++ b/LayoutTests/fast/backgrounds/size/contain-and-cover-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x598
+layer at (0,0) size 800x0
RenderBlock {HTML} at (0,0) size 800x0
RenderBody {BODY} at (0,0) size 800x0
RenderBlock (floating) {DIV} at (2,2) size 396x146 [bgcolor=#ADD8E6] [border: (3px solid #000000)]
diff --git a/LayoutTests/fast/flexbox/009.html b/LayoutTests/fast/flexbox/009.html
index 0fe37dc..027e1b5 100644
--- a/LayoutTests/fast/flexbox/009.html
+++ b/LayoutTests/fast/flexbox/009.html
@@ -9,6 +9,8 @@ div.box {
display: -webkit-box;
display: box;
overflow:auto;
+ -webkit-box-orient: vertical;
+ -moz-box-orient: vertical;
border: 2px solid olive;
}
diff --git a/LayoutTests/fast/overflow/overflow-rtl-vertical.html b/LayoutTests/fast/overflow/overflow-rtl-vertical.html
new file mode 100644
index 0000000..215e91b
--- /dev/null
+++ b/LayoutTests/fast/overflow/overflow-rtl-vertical.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html style="-webkit-writing-mode:vertical-lr">
+<head>
+<title>overflow:auto with direction:rtl</title>
+<style type="text/css">
+div.test { background: yellow; width: 6ex; height: 100px; overflow: auto;
+ border-top: 10px solid red; border-bottom: 5px solid green; margin: 4px; }
+div.rtl { direction: rtl; border-bottom: 10px solid red; border-top: 5px solid green; }
+</style>
+</head>
+<body>
+<p>
+This is a test case for <i>http://bugzilla.opendarwin.org/show_bug.cgi?id=5826 Blocks with direction:rtl and overflow:auto or scroll have incorrect scrollbars</i>.
+</p>
+The right column should be a mirror-image of the left column in terms of
+<ul>
+ <li>the presence of a scrollbar</li>
+ <li>the initial position of the scroll thumb</li>
+ <li>which letters are visible initially and when you scroll</li>
+</ul>
+<table>
+<tr>
+<td>
+<div class="test">
+abcdefghijklmnopqrstuvwxyz
+</div>
+
+<div class="test">
+<div style="direction:rtl; background:lightgray;">abcdefghijklmnopqrstuvwxyz</div>
+</div>
+
+<div class="test">
+<div style="direction:ltr; background:lightgray;">abcdefghijklmnopqrstuvwxyz</div>
+</div>
+</td>
+<td>
+<div class="test rtl">
+zyxwvutsrqponmlkjihgfedcba
+</div>
+
+<div class="test rtl">
+<div style="direction:ltr; background:lightgray;">zyxwvutsrqponmlkjihgfedcba</div>
+</div>
+
+<div class="test rtl">
+<div style="direction:rtl; background:lightgray;">zyxwvutsrqponmlkjihgfedcba</div>
+</div>
+</td>
+</tr>
+</table>
+</body>
+</html>
diff --git a/LayoutTests/fast/spatial-navigation/snav-clipped-overflowed-content-expected.txt b/LayoutTests/fast/spatial-navigation/snav-clipped-overflowed-content-expected.txt
index 6a82226..5cc6e9f 100644
--- a/LayoutTests/fast/spatial-navigation/snav-clipped-overflowed-content-expected.txt
+++ b/LayoutTests/fast/spatial-navigation/snav-clipped-overflowed-content-expected.txt
@@ -7,11 +7,9 @@ PASS gFocusedDocument.activeElement.getAttribute("id") is "1"
PASS gFocusedDocument.activeElement.getAttribute("id") is "1"
PASS gFocusedDocument.activeElement.getAttribute("id") is "2"
PASS gFocusedDocument.activeElement.getAttribute("id") is "2"
-PASS gFocusedDocument.activeElement.getAttribute("id") is "2"
PASS gFocusedDocument.activeElement.getAttribute("id") is "3"
PASS gFocusedDocument.activeElement.getAttribute("id") is "2"
PASS gFocusedDocument.activeElement.getAttribute("id") is "2"
-PASS gFocusedDocument.activeElement.getAttribute("id") is "2"
PASS gFocusedDocument.activeElement.getAttribute("id") is "1"
PASS gFocusedDocument.activeElement.getAttribute("id") is "1"
PASS gFocusedDocument.activeElement.getAttribute("id") is "start"
diff --git a/LayoutTests/fast/spatial-navigation/snav-clipped-overflowed-content.html b/LayoutTests/fast/spatial-navigation/snav-clipped-overflowed-content.html
index adb90b8..5c33300 100644
--- a/LayoutTests/fast/spatial-navigation/snav-clipped-overflowed-content.html
+++ b/LayoutTests/fast/spatial-navigation/snav-clipped-overflowed-content.html
@@ -37,11 +37,9 @@
["Down", "1"],
["Down", "2"],
["Down", "2"],
- ["Down", "2"],
["Down", "3"],
["Up", "2"],
["Up", "2"],
- ["Up", "2"],
["Up", "1"],
["Up", "1"],
["Up", "start"],
@@ -82,7 +80,7 @@
<div></div>
<img src="resources/green.png" width=200px height=200px>
<div></div>
- <a id="2" href="a"><img src="resources/green.png" width=30px height=30px></a>.</p>
+ <a id="2" href="a"><img src="resources/green.png" width=30px height=30px></a>.
</div>
<a id="3" href="a"><img src="resources/green.png" width=30px height=30px></a>
<div id="console"></div>
diff --git a/LayoutTests/platform/mac/compositing/direct-image-compositing-expected.txt b/LayoutTests/platform/mac/compositing/direct-image-compositing-expected.txt
index ef249c7..12c4903 100644
--- a/LayoutTests/platform/mac/compositing/direct-image-compositing-expected.txt
+++ b/LayoutTests/platform/mac/compositing/direct-image-compositing-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x749
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x749
+layer at (0,0) size 785x149
RenderBlock {HTML} at (0,0) size 785x149
RenderBody {BODY} at (8,21) size 769x112
RenderBlock {H1} at (0,0) size 769x37
diff --git a/LayoutTests/platform/mac/compositing/geometry/fixed-position-expected.txt b/LayoutTests/platform/mac/compositing/geometry/fixed-position-expected.txt
index 5d018ae..ee674aa 100644
--- a/LayoutTests/platform/mac/compositing/geometry/fixed-position-expected.txt
+++ b/LayoutTests/platform/mac/compositing/geometry/fixed-position-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1008x1016
RenderView at (0,0) size 785x585
-layer at (0,0) size 1008x1016
+layer at (0,0) size 785x1016
RenderBlock {HTML} at (0,0) size 785x1016
RenderBody {BODY} at (8,8) size 1000x1000
layer at (50,166) size 439x18
diff --git a/LayoutTests/platform/mac/compositing/geometry/video-opacity-overlay-expected.txt b/LayoutTests/platform/mac/compositing/geometry/video-opacity-overlay-expected.txt
index 3207239..fc2add9 100644
--- a/LayoutTests/platform/mac/compositing/geometry/video-opacity-overlay-expected.txt
+++ b/LayoutTests/platform/mac/compositing/geometry/video-opacity-overlay-expected.txt
@@ -6,7 +6,7 @@ layer at (0,0) size 800x360
RenderBlock {P} at (0,0) size 784x18
RenderText {#text} at (0,0) size 294x18
text run at (0,0) width 294: "The orange bar should be in front of the video."
-layer at (8,50) size 402x305
+layer at (8,50) size 402x302
RenderBlock (relative positioned) {DIV} at (0,34) size 402x302 [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 400x304
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/compositing/overflow/fixed-position-ancestor-clip-expected.txt b/LayoutTests/platform/mac/compositing/overflow/fixed-position-ancestor-clip-expected.txt
index 897052a..14b12a8 100644
--- a/LayoutTests/platform/mac/compositing/overflow/fixed-position-ancestor-clip-expected.txt
+++ b/LayoutTests/platform/mac/compositing/overflow/fixed-position-ancestor-clip-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1008x1016
RenderView at (0,0) size 785x585
-layer at (0,0) size 1008x1016
+layer at (0,0) size 785x1016
RenderBlock {HTML} at (0,0) size 785x1016
RenderBody {BODY} at (8,8) size 1000x1000
layer at (50,166) size 318x18
diff --git a/LayoutTests/platform/mac/compositing/overflow/scroll-ancestor-update-expected.txt b/LayoutTests/platform/mac/compositing/overflow/scroll-ancestor-update-expected.txt
index 189799f..ee973e2 100644
--- a/LayoutTests/platform/mac/compositing/overflow/scroll-ancestor-update-expected.txt
+++ b/LayoutTests/platform/mac/compositing/overflow/scroll-ancestor-update-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 100x100
RenderVideo {VIDEO} at (0,0) size 100x100
layer at (50,50) size 100x100
RenderBlock (positioned) {DIV} at (50,50) size 100x100 [bgcolor=#FF0000]
-layer at (50,50) size 202x272
+layer at (50,50) size 200x200
RenderBlock (positioned) {DIV} at (50,50) size 200x200
RenderBlock {P} at (0,218) size 200x54
RenderText {#text} at (0,0) size 191x54
diff --git a/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.txt b/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.txt
index a2ed5b4..5f9697a 100644
--- a/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.txt
+++ b/LayoutTests/platform/mac/compositing/reflections/load-video-in-reflection-expected.txt
@@ -6,7 +6,7 @@ layer at (0,0) size 800x350
RenderBlock {P} at (0,0) size 784x18
RenderText {#text} at (0,0) size 493x18
text run at (0,0) width 493: "You should see a reflected video below, rather than the red video background."
-layer at (8,50) size 352x292
+layer at (8,50) size 300x292
RenderBlock {DIV} at (0,34) size 300x292
RenderText {#text} at (0,0) size 0x0
layer at (8,50) size 352x288
diff --git a/LayoutTests/platform/mac/compositing/repaint/content-into-overflow-expected.txt b/LayoutTests/platform/mac/compositing/repaint/content-into-overflow-expected.txt
index 9f00590..a008d84 100644
--- a/LayoutTests/platform/mac/compositing/repaint/content-into-overflow-expected.txt
+++ b/LayoutTests/platform/mac/compositing/repaint/content-into-overflow-expected.txt
@@ -17,6 +17,6 @@ layer at (28,328) size 100x100
RenderBlock (positioned) {DIV} at (0,308) size 100x100
RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
RenderBlock {DIV} at (0,80) size 100x20
-layer at (28,328) size 100x80
+layer at (28,328) size 100x0
RenderBlock (relative positioned) {DIV} at (0,0) size 100x0
RenderBlock (floating) {DIV} at (0,0) size 100x80
diff --git a/LayoutTests/platform/mac/compositing/repaint/overflow-into-content-expected.txt b/LayoutTests/platform/mac/compositing/repaint/overflow-into-content-expected.txt
index 7a2afeb..4b3f83b 100644
--- a/LayoutTests/platform/mac/compositing/repaint/overflow-into-content-expected.txt
+++ b/LayoutTests/platform/mac/compositing/repaint/overflow-into-content-expected.txt
@@ -5,17 +5,17 @@ layer at (0,0) size 800x460
RenderBody {BODY} at (8,20) size 784x420
layer at (28,20) size 120x420
RenderBlock {DIV} at (20,0) size 120x420
-layer at (28,28) size 103x106
+layer at (28,28) size 56x106
RenderBlock (positioned) {DIV} at (0,8) size 56x106 [border: (3px solid #008000)]
RenderBlock {DIV} at (3,3) size 50x50
RenderBlock {DIV} at (0,0) size 100x50
-layer at (28,178) size 106x103
+layer at (28,178) size 106x56
RenderBlock (positioned) {DIV} at (0,158) size 106x56 [border: (3px solid #008000)]
RenderBlock {DIV} at (3,3) size 50x50
RenderBlock {DIV} at (0,0) size 50x100
layer at (28,328) size 100x80
RenderBlock (positioned) {DIV} at (0,308) size 100x80
RenderBlock {DIV} at (0,0) size 100x0 [bgcolor=#008000]
-layer at (28,328) size 100x80
+layer at (28,328) size 100x0
RenderBlock (relative positioned) {DIV} at (0,0) size 100x0
RenderBlock (floating) {DIV} at (0,0) size 100x80
diff --git a/LayoutTests/platform/mac/css1/box_properties/margin-expected.txt b/LayoutTests/platform/mac/css1/box_properties/margin-expected.txt
index c484f47..94969e0 100644
--- a/LayoutTests/platform/mac/css1/box_properties/margin-expected.txt
+++ b/LayoutTests/platform/mac/css1/box_properties/margin-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 787x2628
RenderView at (0,0) size 785x585
-layer at (0,0) size 787x2628
+layer at (0,0) size 785x2628
RenderBlock {HTML} at (0,0) size 785x2628
RenderBody {BODY} at (8,8) size 769x2612 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 769x18
diff --git a/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt b/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt
index 0fcb7db..3fc051f 100644
--- a/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt
+++ b/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 787x1005
RenderView at (0,0) size 785x585
-layer at (0,0) size 787x1005
+layer at (0,0) size 785x1005
RenderBlock {HTML} at (0,0) size 785x1005
RenderBody {BODY} at (8,8) size 769x989 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 769x18
diff --git a/LayoutTests/platform/mac/css1/classification/white_space-expected.txt b/LayoutTests/platform/mac/css1/classification/white_space-expected.txt
index 9dfdd58..51d906f 100644
--- a/LayoutTests/platform/mac/css1/classification/white_space-expected.txt
+++ b/LayoutTests/platform/mac/css1/classification/white_space-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 921x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 921x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/css1/color_and_background/background_attachment-expected.txt b/LayoutTests/platform/mac/css1/color_and_background/background_attachment-expected.txt
index 24d66a7..95dd298 100644
--- a/LayoutTests/platform/mac/css1/color_and_background/background_attachment-expected.txt
+++ b/LayoutTests/platform/mac/css1/color_and_background/background_attachment-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 880x1193
RenderView at (0,0) size 785x585
-layer at (0,0) size 880x1193
+layer at (0,0) size 785x1193
RenderBlock {HTML} at (0,0) size 785x1193
RenderBody {BODY} at (8,8) size 769x1177 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 769x18
diff --git a/LayoutTests/platform/mac/css1/color_and_background/background_repeat-expected.txt b/LayoutTests/platform/mac/css1/color_and_background/background_repeat-expected.txt
index 859a8b7..93509a8 100644
--- a/LayoutTests/platform/mac/css1/color_and_background/background_repeat-expected.txt
+++ b/LayoutTests/platform/mac/css1/color_and_background/background_repeat-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 888x1838
RenderView at (0,0) size 785x585
-layer at (0,0) size 888x1838
+layer at (0,0) size 785x1838
RenderBlock {HTML} at (0,0) size 785x1838
RenderBody {BODY} at (8,8) size 769x1822 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 769x18
diff --git a/LayoutTests/platform/mac/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt b/LayoutTests/platform/mac/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt
index 28f87e1..0d08e55 100644
--- a/LayoutTests/platform/mac/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 802x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 802x66
+layer at (0,0) size 800x66
RenderBlock {HTML} at (0,0) size 800x66
RenderBody {BODY} at (8,24) size 784x18
RenderBlock {P} at (0,0) size 794x18 [color=#000080]
diff --git a/LayoutTests/platform/mac/css2.1/t0803-c5505-mrgn-02-c-expected.txt b/LayoutTests/platform/mac/css2.1/t0803-c5505-mrgn-02-c-expected.txt
index 9c2685e..c345a7e 100644
--- a/LayoutTests/platform/mac/css2.1/t0803-c5505-mrgn-02-c-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t0803-c5505-mrgn-02-c-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 802x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 802x34
+layer at (0,0) size 800x32
RenderBlock {HTML} at (0,0) size 800x32
RenderBody {BODY} at (8,-2) size 784x36
RenderBlock {P} at (-10,0) size 804x36 [color=#000080]
diff --git a/LayoutTests/platform/mac/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt b/LayoutTests/platform/mac/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt
index a17ab8c..1e5af21 100644
--- a/LayoutTests/platform/mac/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x122
+layer at (0,0) size 800x110
RenderBlock {HTML} at (0,0) size 800x110
RenderBody {BODY} at (8,16) size 784x86
RenderBlock {P} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/css2.1/t0905-c414-flt-00-d-expected.txt b/LayoutTests/platform/mac/css2.1/t0905-c414-flt-00-d-expected.txt
index 6885c62..a7cc727 100644
--- a/LayoutTests/platform/mac/css2.1/t0905-c414-flt-00-d-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t0905-c414-flt-00-d-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x170
+layer at (0,0) size 800x134
RenderBlock {HTML} at (0,0) size 800x134
RenderBody {BODY} at (8,16) size 784x102
RenderBlock {P} at (0,0) size 784x18 [color=#000080]
diff --git a/LayoutTests/platform/mac/css2.1/t0905-c414-flt-01-d-g-expected.txt b/LayoutTests/platform/mac/css2.1/t0905-c414-flt-01-d-g-expected.txt
index 4412271..e538a40 100644
--- a/LayoutTests/platform/mac/css2.1/t0905-c414-flt-01-d-g-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t0905-c414-flt-01-d-g-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x162
+layer at (0,0) size 800x130
RenderBlock {HTML} at (0,0) size 800x130
RenderBody {BODY} at (8,16) size 784x98
RenderBlock {P} at (0,0) size 784x18 [color=#000080]
diff --git a/LayoutTests/platform/mac/css2.1/t0905-c414-flt-02-c-expected.txt b/LayoutTests/platform/mac/css2.1/t0905-c414-flt-02-c-expected.txt
index 10c81d7..3aa79fb 100644
--- a/LayoutTests/platform/mac/css2.1/t0905-c414-flt-02-c-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t0905-c414-flt-02-c-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x264
+layer at (0,0) size 800x68
RenderBlock {HTML} at (0,0) size 800x68
RenderBody {BODY} at (8,16) size 784x36
RenderBlock {P} at (0,0) size 784x36 [color=#000080]
diff --git a/LayoutTests/platform/mac/css2.1/t0905-c414-flt-03-c-expected.txt b/LayoutTests/platform/mac/css2.1/t0905-c414-flt-03-c-expected.txt
index 77f48ea..630392a 100644
--- a/LayoutTests/platform/mac/css2.1/t0905-c414-flt-03-c-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t0905-c414-flt-03-c-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x264
+layer at (0,0) size 800x68
RenderBlock {HTML} at (0,0) size 800x68
RenderBody {BODY} at (8,16) size 784x36
RenderBlock {P} at (0,0) size 784x36 [color=#000080]
diff --git a/LayoutTests/platform/mac/css2.1/t0905-c414-flt-04-c-expected.txt b/LayoutTests/platform/mac/css2.1/t0905-c414-flt-04-c-expected.txt
index e941322..54f22ba 100644
--- a/LayoutTests/platform/mac/css2.1/t0905-c414-flt-04-c-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t0905-c414-flt-04-c-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x344
+layer at (0,0) size 800x68
RenderBlock {HTML} at (0,0) size 800x68
RenderBody {BODY} at (8,16) size 784x36
RenderBlock {P} at (0,0) size 784x36 [color=#000080]
diff --git a/LayoutTests/platform/mac/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt b/LayoutTests/platform/mac/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt
index 3b531e8..929e600 100644
--- a/LayoutTests/platform/mac/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x163
+layer at (0,0) size 800x156
RenderBlock {HTML} at (0,0) size 800x156
RenderBody {BODY} at (8,16) size 784x124
RenderBlock {P} at (0,0) size 784x18 [color=#000080]
diff --git a/LayoutTests/platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt b/LayoutTests/platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
index 15492d8..f7daa1d 100644
--- a/LayoutTests/platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x260
+layer at (0,0) size 800x8
RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0
RenderBlock (floating) {DIV} at (0,0) size 588x252 [color=#FFFFFF] [bgcolor=#000080]
diff --git a/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt b/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt
index 75b2806..d01d197 100644
--- a/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x54
+layer at (0,0) size 800x34
RenderBlock {HTML} at (0,0) size 800x34
RenderBody {BODY} at (8,8) size 784x18
RenderBlock {DIV} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt b/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
index dfd0e9e..457299b 100644
--- a/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x44
+layer at (0,0) size 800x34
RenderBlock {HTML} at (0,0) size 800x34
RenderBody {BODY} at (8,8) size 784x18
RenderBlock {DIV} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/css2.1/t090501-c414-flt-02-d-g-expected.txt b/LayoutTests/platform/mac/css2.1/t090501-c414-flt-02-d-g-expected.txt
index c368da2..5e2d15c 100644
--- a/LayoutTests/platform/mac/css2.1/t090501-c414-flt-02-d-g-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t090501-c414-flt-02-d-g-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x218
+layer at (0,0) size 800x154
RenderBlock {HTML} at (0,0) size 800x154
RenderBody {BODY} at (8,16) size 784x122
RenderBlock {P} at (0,0) size 784x18 [color=#000080]
diff --git a/LayoutTests/platform/mac/css2.1/t090501-c414-flt-03-b-g-expected.txt b/LayoutTests/platform/mac/css2.1/t090501-c414-flt-03-b-g-expected.txt
index 941a41f..c888a56 100644
--- a/LayoutTests/platform/mac/css2.1/t090501-c414-flt-03-b-g-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t090501-c414-flt-03-b-g-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x237
+layer at (0,0) size 800x155
RenderBlock {HTML} at (0,0) size 800x155
RenderBody {BODY} at (8,16) size 784x123
RenderBlock {P} at (0,0) size 784x37 [color=#000080]
diff --git a/LayoutTests/platform/mac/css2.1/t1202-counters-08-b-expected.txt b/LayoutTests/platform/mac/css2.1/t1202-counters-08-b-expected.txt
index 55e4e88..ff1c4f9 100644
--- a/LayoutTests/platform/mac/css2.1/t1202-counters-08-b-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t1202-counters-08-b-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 954x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 954x94
+layer at (0,0) size 800x94
RenderBlock {HTML} at (0,0) size 800x94
RenderBody {BODY} at (8,16) size 784x70
RenderBlock {P} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/css2.1/t1202-counters-09-b-expected.txt b/LayoutTests/platform/mac/css2.1/t1202-counters-09-b-expected.txt
index 01e160e..7b79bde 100644
--- a/LayoutTests/platform/mac/css2.1/t1202-counters-09-b-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t1202-counters-09-b-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1047x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1047x94
+layer at (0,0) size 800x94
RenderBlock {HTML} at (0,0) size 800x94
RenderBody {BODY} at (8,16) size 784x70
RenderBlock {P} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/editing/deleting/delete-after-span-ws-001-expected.txt b/LayoutTests/platform/mac/editing/deleting/delete-after-span-ws-001-expected.txt
index b3c46c1..03e454c 100644
--- a/LayoutTests/platform/mac/editing/deleting/delete-after-span-ws-001-expected.txt
+++ b/LayoutTests/platform/mac/editing/deleting/delete-after-span-ws-001-expected.txt
@@ -11,7 +11,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 820x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 820x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,64) size 784x457
RenderBlock {DIV} at (64,0) size 748x196 [border: (50px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/editing/deleting/delete-after-span-ws-002-expected.txt b/LayoutTests/platform/mac/editing/deleting/delete-after-span-ws-002-expected.txt
index b3c46c1..03e454c 100644
--- a/LayoutTests/platform/mac/editing/deleting/delete-after-span-ws-002-expected.txt
+++ b/LayoutTests/platform/mac/editing/deleting/delete-after-span-ws-002-expected.txt
@@ -11,7 +11,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 820x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 820x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,64) size 784x457
RenderBlock {DIV} at (64,0) size 748x196 [border: (50px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/editing/deleting/delete-after-span-ws-003-expected.txt b/LayoutTests/platform/mac/editing/deleting/delete-after-span-ws-003-expected.txt
index b3c46c1..03e454c 100644
--- a/LayoutTests/platform/mac/editing/deleting/delete-after-span-ws-003-expected.txt
+++ b/LayoutTests/platform/mac/editing/deleting/delete-after-span-ws-003-expected.txt
@@ -11,7 +11,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 820x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 820x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,64) size 784x457
RenderBlock {DIV} at (64,0) size 748x196 [border: (50px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/editing/deleting/delete-line-end-ws-001-expected.txt b/LayoutTests/platform/mac/editing/deleting/delete-line-end-ws-001-expected.txt
index 959829a..f43b2fd 100644
--- a/LayoutTests/platform/mac/editing/deleting/delete-line-end-ws-001-expected.txt
+++ b/LayoutTests/platform/mac/editing/deleting/delete-line-end-ws-001-expected.txt
@@ -66,7 +66,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 820x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 820x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,64) size 784x457
RenderBlock {DIV} at (64,0) size 748x244 [border: (50px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/editing/deleting/delete-line-end-ws-002-expected.txt b/LayoutTests/platform/mac/editing/deleting/delete-line-end-ws-002-expected.txt
index 1fd0cf7..e14d813 100644
--- a/LayoutTests/platform/mac/editing/deleting/delete-line-end-ws-002-expected.txt
+++ b/LayoutTests/platform/mac/editing/deleting/delete-line-end-ws-002-expected.txt
@@ -66,7 +66,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 820x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 820x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,64) size 784x457
RenderBlock {DIV} at (64,0) size 748x244 [border: (50px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/editing/selection/25228-expected.txt b/LayoutTests/platform/mac/editing/selection/25228-expected.txt
index 0bc6aaf..1432b58 100644
--- a/LayoutTests/platform/mac/editing/selection/25228-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/25228-expected.txt
@@ -1,6 +1,6 @@
-layer at (0,0) size 2000x585
+layer at (0,0) size 1100x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 2000x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (0,0) size 800x585
RenderBlock {DIV} at (798,0) size 302x272 [border: (1px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/editing/selection/focus_editable_html-expected.txt b/LayoutTests/platform/mac/editing/selection/focus_editable_html-expected.txt
index ff870a4..d803968 100644
--- a/LayoutTests/platform/mac/editing/selection/focus_editable_html-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/focus_editable_html-expected.txt
@@ -8,7 +8,7 @@ EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
layer at (0,0) size 2008x2088
RenderView at (0,0) size 785x585
-layer at (0,0) size 2008x2088
+layer at (0,0) size 785x2088
RenderBlock {HTML} at (0,0) size 785x2088
RenderBody {BODY} at (8,8) size 769x2072
RenderBlock (anonymous) at (0,0) size 769x54
diff --git a/LayoutTests/platform/mac/editing/selection/select-all-001-expected.txt b/LayoutTests/platform/mac/editing/selection/select-all-001-expected.txt
index c2cc66e..04deaf5 100644
--- a/LayoutTests/platform/mac/editing/selection/select-all-001-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/select-all-001-expected.txt
@@ -5,7 +5,7 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > BODY
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
layer at (0,0) size 820x900
RenderView at (0,0) size 785x585
-layer at (0,0) size 820x900
+layer at (0,0) size 785x900
RenderBlock {HTML} at (0,0) size 785x900
RenderBody {BODY} at (8,64) size 769x772
RenderBlock {DIV} at (64,0) size 748x772 [border: (50px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/editing/selection/select-all-002-expected.txt b/LayoutTests/platform/mac/editing/selection/select-all-002-expected.txt
index e7c56fe..dce65a4 100644
--- a/LayoutTests/platform/mac/editing/selection/select-all-002-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/select-all-002-expected.txt
@@ -5,7 +5,7 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > BODY
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
layer at (0,0) size 820x900
RenderView at (0,0) size 785x585
-layer at (0,0) size 820x900
+layer at (0,0) size 785x900
RenderBlock {HTML} at (0,0) size 785x900
RenderBody {BODY} at (8,64) size 769x772
RenderBlock {DIV} at (64,0) size 748x772 [border: (50px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/editing/selection/select-all-003-expected.txt b/LayoutTests/platform/mac/editing/selection/select-all-003-expected.txt
index d0d0620..5e828a6 100644
--- a/LayoutTests/platform/mac/editing/selection/select-all-003-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/select-all-003-expected.txt
@@ -5,7 +5,7 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of BODY > HTML > #do
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
layer at (0,0) size 812x1044
RenderView at (0,0) size 785x585
-layer at (0,0) size 812x1044
+layer at (0,0) size 785x1044
RenderBlock {HTML} at (0,0) size 785x1044
RenderBody {BODY} at (64,64) size 748x916 [border: (50px solid #FF0000)]
RenderBlock (anonymous) at (74,74) size 600x768
diff --git a/LayoutTests/platform/mac/editing/selection/select-all-004-expected.txt b/LayoutTests/platform/mac/editing/selection/select-all-004-expected.txt
index afb9470..3bee36d 100644
--- a/LayoutTests/platform/mac/editing/selection/select-all-004-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/select-all-004-expected.txt
@@ -5,7 +5,7 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > BODY > HT
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
layer at (0,0) size 812x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 812x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (64,64) size 748x457 [border: (50px solid #FF0000)]
RenderBlock {DIV} at (74,74) size 600x0
diff --git a/LayoutTests/platform/mac/editing/selection/unrendered-001-expected.txt b/LayoutTests/platform/mac/editing/selection/unrendered-001-expected.txt
index 4424f67..3ee3dd2 100644
--- a/LayoutTests/platform/mac/editing/selection/unrendered-001-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/unrendered-001-expected.txt
@@ -3,7 +3,7 @@ EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
layer at (0,0) size 820x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 820x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,64) size 784x457
RenderBlock {DIV} at (64,0) size 748x196 [border: (50px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/editing/selection/unrendered-002-expected.txt b/LayoutTests/platform/mac/editing/selection/unrendered-002-expected.txt
index 73e160b..5408d44 100644
--- a/LayoutTests/platform/mac/editing/selection/unrendered-002-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/unrendered-002-expected.txt
@@ -4,7 +4,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
layer at (0,0) size 820x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 820x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,64) size 784x457
RenderBlock {DIV} at (64,0) size 748x196 [border: (50px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/editing/selection/unrendered-003-expected.txt b/LayoutTests/platform/mac/editing/selection/unrendered-003-expected.txt
index cd3ef3b..40e24d9 100644
--- a/LayoutTests/platform/mac/editing/selection/unrendered-003-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/unrendered-003-expected.txt
@@ -4,7 +4,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
layer at (0,0) size 820x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 820x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,64) size 784x457
RenderBlock {DIV} at (64,0) size 748x196 [border: (50px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/editing/selection/unrendered-004-expected.txt b/LayoutTests/platform/mac/editing/selection/unrendered-004-expected.txt
index fbd243a..eff00f1 100644
--- a/LayoutTests/platform/mac/editing/selection/unrendered-004-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/unrendered-004-expected.txt
@@ -5,7 +5,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
layer at (0,0) size 820x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 820x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,64) size 784x457
RenderBlock {DIV} at (64,0) size 748x196 [border: (50px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/editing/selection/unrendered-005-expected.txt b/LayoutTests/platform/mac/editing/selection/unrendered-005-expected.txt
index fbd243a..eff00f1 100644
--- a/LayoutTests/platform/mac/editing/selection/unrendered-005-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/unrendered-005-expected.txt
@@ -5,7 +5,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
layer at (0,0) size 820x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 820x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,64) size 784x457
RenderBlock {DIV} at (64,0) size 748x196 [border: (50px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/fast/backgrounds/repeat/negative-offset-repeat-expected.txt b/LayoutTests/platform/mac/fast/backgrounds/repeat/negative-offset-repeat-expected.txt
index d6dad1d..5add2ab 100644
--- a/LayoutTests/platform/mac/fast/backgrounds/repeat/negative-offset-repeat-expected.txt
+++ b/LayoutTests/platform/mac/fast/backgrounds/repeat/negative-offset-repeat-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x524
+layer at (0,0) size 800x484
RenderBlock {HTML} at (0,0) size 800x484
RenderBody {BODY} at (8,16) size 784x452
RenderBlock {P} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/fast/backgrounds/size/backgroundSize15-expected.txt b/LayoutTests/platform/mac/fast/backgrounds/size/backgroundSize15-expected.txt
index a148940..f3de403 100644
--- a/LayoutTests/platform/mac/fast/backgrounds/size/backgroundSize15-expected.txt
+++ b/LayoutTests/platform/mac/fast/backgrounds/size/backgroundSize15-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x970
RenderView at (0,0) size 785x585
-layer at (0,0) size 808x970
+layer at (0,0) size 785x970
RenderBlock {HTML} at (0,0) size 785x970
RenderBody {BODY} at (8,8) size 769x954
RenderBlock {DIV} at (0,0) size 100x100
diff --git a/LayoutTests/platform/mac/fast/block/basic/010-expected.txt b/LayoutTests/platform/mac/fast/block/basic/010-expected.txt
index 63cc6ff..9aacffd 100644
--- a/LayoutTests/platform/mac/fast/block/basic/010-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/basic/010-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x226
+layer at (0,0) size 800x134
RenderBlock {HTML} at (0,0) size 800x134
RenderBody {BODY} at (8,8) size 784x118
RenderBlock (anonymous) at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/fast/block/basic/fieldset-stretch-to-legend-expected.txt b/LayoutTests/platform/mac/fast/block/basic/fieldset-stretch-to-legend-expected.txt
index 764f13d..d08cfca 100644
--- a/LayoutTests/platform/mac/fast/block/basic/fieldset-stretch-to-legend-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/basic/fieldset-stretch-to-legend-expected.txt
@@ -35,7 +35,7 @@ layer at (0,0) size 785x859
RenderText {#text} at (0,0) size 0x0
RenderFieldSet {FIELDSET} at (2,812) size 128x29 [border: (2px groove #C0C0C0)]
RenderBlock {LEGEND} at (14,0) size 156x12 [border: (1px solid #0000FF)]
-layer at (8,581) size 186x40
+layer at (8,581) size 100x40
RenderBlock (relative positioned) {DIV} at (0,573) size 100x40
RenderFieldSet {FIELDSET} at (2,0) size 184x29 [border: (2px groove #C0C0C0)]
RenderBlock {LEGEND} at (14,0) size 156x12 [border: (1px solid #0000FF)]
diff --git a/LayoutTests/platform/mac/fast/block/float/008-expected.txt b/LayoutTests/platform/mac/fast/block/float/008-expected.txt
index 9a69e33..1924ca3 100644
--- a/LayoutTests/platform/mac/fast/block/float/008-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/008-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x608
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x608
+layer at (0,0) size 785x600
RenderBlock {HTML} at (0,0) size 785x600
RenderBody {BODY} at (8,8) size 769x300
RenderBlock (floating) {DIV} at (0,0) size 769x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/mac/fast/block/float/013-expected.txt b/LayoutTests/platform/mac/fast/block/float/013-expected.txt
index 0c98889..4943562 100644
--- a/LayoutTests/platform/mac/fast/block/float/013-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/013-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 808x585
layer at (0,0) size 800x8
RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0
-layer at (8,64) size 800x115
+layer at (8,64) size 800x108
RenderBlock (positioned) {DIV} at (8,64) size 800x108 [bgcolor=#0000FF]
RenderBlock {DIV} at (38,8) size 723x57 [bgcolor=#008000] [border: (2px solid #888878) none]
RenderText {#text} at (0,0) size 182x18
diff --git a/LayoutTests/platform/mac/fast/block/float/019-expected.txt b/LayoutTests/platform/mac/fast/block/float/019-expected.txt
index b4fe7a9..2568a10 100644
--- a/LayoutTests/platform/mac/fast/block/float/019-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/019-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 2008x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 2008x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {DIV} at (0,0) size 784x154
diff --git a/LayoutTests/platform/mac/fast/block/float/021-expected.txt b/LayoutTests/platform/mac/fast/block/float/021-expected.txt
index ae3d5f9..d1d586a 100644
--- a/LayoutTests/platform/mac/fast/block/float/021-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/021-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1518x3166
RenderView at (0,0) size 785x585
-layer at (0,0) size 1518x3166
+layer at (0,0) size 785x3166
RenderBlock {HTML} at (0,0) size 785x3166
RenderBody {BODY} at (8,8) size 769x3142
RenderBlock (anonymous) at (0,0) size 769x36
diff --git a/LayoutTests/platform/mac/fast/block/float/029-expected.txt b/LayoutTests/platform/mac/fast/block/float/029-expected.txt
index 8a7dec4..13a062a 100644
--- a/LayoutTests/platform/mac/fast/block/float/029-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/029-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x166
+layer at (0,0) size 800x54
RenderBlock {HTML} at (0,0) size 800x54
RenderBody {BODY} at (8,8) size 784x38
RenderBlock (floating) {DIV} at (532,0) size 252x102 [border: (1px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/fast/block/float/031-expected.txt b/LayoutTests/platform/mac/fast/block/float/031-expected.txt
index 4e77a30..6f0a719 100644
--- a/LayoutTests/platform/mac/fast/block/float/031-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/031-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x332
+layer at (0,0) size 800x300
RenderBlock {HTML} at (0,0) size 800x300
RenderBody {BODY} at (8,8) size 784x284
RenderBlock {P} at (0,0) size 784x50
diff --git a/LayoutTests/platform/mac/fast/block/float/033-expected.txt b/LayoutTests/platform/mac/fast/block/float/033-expected.txt
index 8d3ff5e..567db35 100644
--- a/LayoutTests/platform/mac/fast/block/float/033-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/033-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x2008
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x2008
+layer at (0,0) size 785x600
RenderBlock {HTML} at (0,0) size 785x600
RenderBody {BODY} at (8,8) size 769x584
layer at (477,8) size 300x2000
diff --git a/LayoutTests/platform/mac/fast/block/float/035-expected.txt b/LayoutTests/platform/mac/fast/block/float/035-expected.txt
index de6e021..0de49a1 100644
--- a/LayoutTests/platform/mac/fast/block/float/035-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/035-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x828
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x828
+layer at (0,0) size 785x600
RenderBlock {HTML} at (0,0) size 785x600
RenderBody {BODY} at (8,8) size 769x584
RenderBlock (floating) {DIV} at (0,0) size 673x820 [border: (10px solid #0000FF)]
diff --git a/LayoutTests/platform/mac/fast/block/float/avoidance-percent-width-strict-expected.txt b/LayoutTests/platform/mac/fast/block/float/avoidance-percent-width-strict-expected.txt
index 9587950..266a865 100644
--- a/LayoutTests/platform/mac/fast/block/float/avoidance-percent-width-strict-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/avoidance-percent-width-strict-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 812x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 812x138
+layer at (0,0) size 800x138
RenderBlock {HTML} at (0,0) size 800x138
RenderBody {BODY} at (8,8) size 784x122
RenderBlock {DIV} at (0,0) size 800x50
diff --git a/LayoutTests/platform/mac/fast/block/float/clamped-right-float-expected.txt b/LayoutTests/platform/mac/fast/block/float/clamped-right-float-expected.txt
index 622703f..24d2b21 100644
--- a/LayoutTests/platform/mac/fast/block/float/clamped-right-float-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/clamped-right-float-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x108
+layer at (0,0) size 800x8
RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0
RenderBlock (floating) {DIV} at (-4216,0) size 5000x100 [bgcolor=#66EEAA]
diff --git a/LayoutTests/platform/mac/fast/block/float/float-in-float-painting-expected.txt b/LayoutTests/platform/mac/fast/block/float/float-in-float-painting-expected.txt
index 0e415b5..0730ad5 100644
--- a/LayoutTests/platform/mac/fast/block/float/float-in-float-painting-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/float-in-float-painting-expected.txt
@@ -12,7 +12,7 @@ layer at (0,0) size 800x600
text run at (0,18) width 115: "issues (flickr.com)"
RenderText {#text} at (115,18) size 597x18
text run at (115,18) width 597: ", or rather, a related painting issue. The word \"PASS\" should appear below in translucent blue."
-layer at (8,44) size 784x162
+layer at (8,44) size 784x125
RenderBlock {DIV} at (0,36) size 784x125
RenderBlock (floating) {DIV} at (0,0) size 104x125
RenderImage {IMG} at (0,0) size 100x100
diff --git a/LayoutTests/platform/mac/fast/block/float/nested-clearance-expected.txt b/LayoutTests/platform/mac/fast/block/float/nested-clearance-expected.txt
index 48aca7c..8e1bab2 100644
--- a/LayoutTests/platform/mac/fast/block/float/nested-clearance-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/nested-clearance-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x1504
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1504
+layer at (0,0) size 785x1444
RenderBlock {HTML} at (0,0) size 785x1444
RenderBody {BODY} at (8,8) size 769x1428
RenderBlock (floating) {DIV} at (0,0) size 64x68
diff --git a/LayoutTests/platform/mac/fast/block/float/relative-painted-twice-expected.txt b/LayoutTests/platform/mac/fast/block/float/relative-painted-twice-expected.txt
index ad6125c..66c578f 100644
--- a/LayoutTests/platform/mac/fast/block/float/relative-painted-twice-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/float/relative-painted-twice-expected.txt
@@ -5,7 +5,7 @@ layer at (0,0) size 785x2016
RenderBody {BODY} at (8,8) size 769x2000
RenderBlock {DIV} at (0,0) size 769x150
RenderBlock {DIV} at (0,150) size 769x0
-layer at (8,58) size 769x100
+layer at (8,58) size 769x0
RenderBlock (relative positioned) {DIV} at (0,0) size 769x0
RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#0000007F]
caret: position 0 of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of body
diff --git a/LayoutTests/platform/mac/fast/block/margin-collapse/004-expected.txt b/LayoutTests/platform/mac/fast/block/margin-collapse/004-expected.txt
index 1850398..a8e8849 100644
--- a/LayoutTests/platform/mac/fast/block/margin-collapse/004-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/margin-collapse/004-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x130
+layer at (0,0) size 800x58
RenderBlock {HTML} at (0,0) size 800x58
RenderBody {BODY} at (8,16) size 784x114
RenderBlock {P} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/fast/block/margin-collapse/062-expected.txt b/LayoutTests/platform/mac/fast/block/margin-collapse/062-expected.txt
index 013f594..b163544 100644
--- a/LayoutTests/platform/mac/fast/block/margin-collapse/062-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/margin-collapse/062-expected.txt
@@ -1,11 +1,11 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x110 layerType: background only
+layer at (0,0) size 800x46 layerType: background only
layer at (10,46) size 320x64
RenderBlock (positioned) zI: -1 {DIV} at (10,46) size 320x64 [color=#FFFF00] [bgcolor=#FF0000]
RenderText zI: -1 {#text} at (0,0) size 36x18
text run at (0,0) width 36: "FAIL"
-layer at (0,0) size 800x110 layerType: foreground only
+layer at (0,0) size 800x46 layerType: foreground only
RenderBlock {HTML} at (0,0) size 800x46
RenderBody {BODY} at (10,46) size 780x0
RenderBlock {DIV} at (2,0) size 776x0
diff --git a/LayoutTests/platform/mac/fast/block/margin-collapse/063-expected.txt b/LayoutTests/platform/mac/fast/block/margin-collapse/063-expected.txt
index be22032..d0fa7b6 100644
--- a/LayoutTests/platform/mac/fast/block/margin-collapse/063-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/margin-collapse/063-expected.txt
@@ -1,11 +1,11 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x77 layerType: background only
+layer at (0,0) size 800x49 layerType: background only
layer at (10,13) size 320x64
RenderBlock (positioned) zI: -1 {DIV} at (10,13) size 320x64 [color=#FFFF00] [bgcolor=#FF0000]
RenderText zI: -1 {#text} at (0,0) size 36x18
text run at (0,0) width 36: "FAIL"
-layer at (0,0) size 800x77 layerType: foreground only
+layer at (0,0) size 800x49 layerType: foreground only
RenderBlock {HTML} at (0,0) size 800x49
RenderBody {BODY} at (10,2) size 780x1
RenderBlock {DIV} at (2,0) size 776x1
diff --git a/LayoutTests/platform/mac/fast/block/margin-collapse/104-expected.txt b/LayoutTests/platform/mac/fast/block/margin-collapse/104-expected.txt
index 3a0f3bb..37e3e97 100644
--- a/LayoutTests/platform/mac/fast/block/margin-collapse/104-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/margin-collapse/104-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 976x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 976x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {DIV} at (0,0) size 784x108 [border: (2px solid #0000FF)]
diff --git a/LayoutTests/platform/mac/fast/block/margin-collapse/block-inside-inline/004-expected.txt b/LayoutTests/platform/mac/fast/block/margin-collapse/block-inside-inline/004-expected.txt
index 029a5da..ecb2247 100644
--- a/LayoutTests/platform/mac/fast/block/margin-collapse/block-inside-inline/004-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/margin-collapse/block-inside-inline/004-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x130
+layer at (0,0) size 800x58
RenderBlock {HTML} at (0,0) size 800x58
RenderBody {BODY} at (8,16) size 784x114
RenderBlock {P} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/fast/block/margin-collapse/block-inside-inline/005-expected.txt b/LayoutTests/platform/mac/fast/block/margin-collapse/block-inside-inline/005-expected.txt
index c27f4e1..d5a5ced 100644
--- a/LayoutTests/platform/mac/fast/block/margin-collapse/block-inside-inline/005-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/margin-collapse/block-inside-inline/005-expected.txt
@@ -34,7 +34,7 @@ layer at (0,0) size 800x483
text run at (259,0) width 49: "test 006"
RenderText {#text} at (308,0) size 4x18
text run at (308,0) width 4: "."
-layer at (11,103) size 36x327
+layer at (11,103) size 36x277
RenderBlock (relative positioned) {DIV} at (0,0) size 36x277 [bgcolor=#0000FF]
RenderBlock (anonymous) at (0,0) size 36x0
RenderInline {SPAN} at (0,0) size 0x0
@@ -62,7 +62,7 @@ layer at (11,103) size 36x327
RenderBlock (anonymous) at (0,327) size 36x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (11,103) size 36x109
+layer at (11,103) size 36x59
RenderBlock (relative positioned) {DIV} at (0,0) size 36x59 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 36x0
RenderInline {SPAN} at (0,0) size 0x0
@@ -74,7 +74,7 @@ layer at (11,103) size 36x109
RenderBlock (anonymous) at (0,109) size 36x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
-layer at (11,103) size 36x109
+layer at (11,103) size 36x59
RenderBlock (relative positioned) {DIV} at (0,0) size 36x59 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 36x0
RenderInline {SPAN} at (0,0) size 0x0
@@ -85,7 +85,7 @@ layer at (11,103) size 36x59
RenderBlock (relative positioned) {DIV} at (0,0) size 36x59 [bgcolor=#FFFF00]
RenderText {#text} at (0,0) size 36x59
text run at (0,0) width 36: "A"
-layer at (11,212) size 36x109
+layer at (11,212) size 36x59
RenderBlock (relative positioned) {DIV} at (0,0) size 36x59 [bgcolor=#FF0000]
RenderBlock (anonymous) at (0,0) size 36x0
RenderInline {SPAN} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/block/positioning/002-expected.txt b/LayoutTests/platform/mac/fast/block/positioning/002-expected.txt
index 1d9236b..67dd9c6 100644
--- a/LayoutTests/platform/mac/fast/block/positioning/002-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/positioning/002-expected.txt
@@ -8,7 +8,7 @@ layer at (0,0) size 800x134
RenderText {#text} at (0,1) size 528x16
text run at (0,1) width 528: "Ahem_font_required_for_this_test."
RenderText {#text} at (0,0) size 0x0
-layer at (8,26) size 600x200
+layer at (8,26) size 300x100
RenderBlock (relative positioned) {DIV} at (0,18) size 300x100 [bgcolor=#FF0000]
RenderBlock {DIV} at (0,0) size 600x200 [color=#008000]
RenderText {#text} at (0,0) size 300x100
diff --git a/LayoutTests/platform/mac/fast/block/positioning/047-expected.txt b/LayoutTests/platform/mac/fast/block/positioning/047-expected.txt
index ed2b803..daa9ebb 100644
--- a/LayoutTests/platform/mac/fast/block/positioning/047-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/positioning/047-expected.txt
@@ -51,7 +51,7 @@ layer at (8,8) size 512x839
text run at (320,31) width 192: " (hit it a few times on"
text run at (0,60) width 501: "this page). This is a crippling flaw for people who need"
text run at (0,89) width 370: "to enlarge the fonts to read comfortably."
-layer at (546,179) size 200x49
+layer at (546,179) size 200x48
RenderBlock (positioned) {SPAN} at (538,171) size 200x48
RenderText {#text} at (0,-1) size 199x50
text run at (0,-1) width 199: "\x{2190} this should be to the right of"
diff --git a/LayoutTests/platform/mac/fast/block/positioning/049-expected.txt b/LayoutTests/platform/mac/fast/block/positioning/049-expected.txt
index 5dacd68..c82b722 100644
--- a/LayoutTests/platform/mac/fast/block/positioning/049-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/positioning/049-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
-layer at (10,10) size 160x160
+layer at (10,10) size 120x120
RenderBlock (positioned) {DIV} at (10,10) size 120x120 [bgcolor=#FF0000] [border: (10px solid #000000)]
RenderBlock {DIV} at (10,10) size 150x150 [bgcolor=#008000]
layer at (200,10) size 120x120 clip at (210,20) size 100x100 scrollWidth 150 scrollHeight 150
diff --git a/LayoutTests/platform/mac/fast/block/positioning/051-expected.txt b/LayoutTests/platform/mac/fast/block/positioning/051-expected.txt
index e64dfa6..56c9a82 100644
--- a/LayoutTests/platform/mac/fast/block/positioning/051-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/positioning/051-expected.txt
@@ -21,7 +21,7 @@ layer at (34,2265) size 200x200
RenderBlock (positioned) zI: -30 {P} at (10,210) size 200x200 [color=#FFFFFF] [bgcolor=#660099]
RenderText zI: -30 {#text} at (71,42) size 57x97
text run at (71,42) width 57: "7"
-layer at (84,843) size 519x200
+layer at (84,843) size 200x200
RenderBlock (positioned) zI: -3 {P} at (60,60) size 200x200 [color=#FFFFFF] [bgcolor=#990066]
RenderText zI: -3 {#text} at (50,42) size 469x97
text run at (50,42) width 469: " 8 hide me"
@@ -99,7 +99,7 @@ layer at (0,0) size 785x5269 layerType: foreground only
text run at (0,0) width 349: "Using assumed default value of z-index (may not pass):"
layer at (24,147) size 620x620
RenderBlock (relative positioned) {DIV} at (16,126) size 620x620 [border: (10px solid #000000)]
-layer at (84,207) size 519x200
+layer at (84,207) size 200x200
RenderBlock (positioned) {P} at (60,60) size 200x200 [color=#FFFFFF] [bgcolor=#990066]
RenderText {#text} at (50,42) size 469x97
text run at (50,42) width 469: " 8 hide me"
diff --git a/LayoutTests/platform/mac/fast/block/positioning/auto-height-with-top-and-bottom-expected.txt b/LayoutTests/platform/mac/fast/block/positioning/auto-height-with-top-and-bottom-expected.txt
index 5c9d8b1..5c2d438 100644
--- a/LayoutTests/platform/mac/fast/block/positioning/auto-height-with-top-and-bottom-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/positioning/auto-height-with-top-and-bottom-expected.txt
@@ -8,7 +8,7 @@ layer at (0,0) size 800x600
text run at (0,0) width 634: "The red box should be entirely inside the black box with the text content spilling out of both of them."
layer at (8,42) size 404x104
RenderBlock (relative positioned) {DIV} at (0,34) size 404x104 [border: (2px solid #000000)]
-layer at (10,64) size 400x146
+layer at (10,64) size 400x60
RenderBlock (positioned) {DIV} at (2,22) size 400x60 [border: (2px solid #FF0000)]
RenderText {#text} at (2,2) size 396x144
text run at (2,2) width 396: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do"
diff --git a/LayoutTests/platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt b/LayoutTests/platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt
index 0d13cf4..e55ee09 100644
--- a/LayoutTests/platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/positioning/replaced-inside-fixed-top-bottom-expected.txt
@@ -5,7 +5,7 @@ layer at (0,0) size 800x0
RenderBody {BODY} at (0,0) size 800x0
layer at (50,100) size 700x400
RenderBlock (positioned) {DIV} at (50,100) size 700x400 [border: (1px solid #808080)]
-layer at (51,140) size 560x323
+layer at (51,140) size 560x320
RenderBlock (positioned) {DIV} at (1,40) size 560x320 [border: (1px solid #FF0000)]
RenderImage {IMG} at (1,1) size 392x318
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/blockflow/block-level-images-expected.txt b/LayoutTests/platform/mac/fast/blockflow/block-level-images-expected.txt
index 41fcfc7..f1e8df2 100644
--- a/LayoutTests/platform/mac/fast/blockflow/block-level-images-expected.txt
+++ b/LayoutTests/platform/mac/fast/blockflow/block-level-images-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x314
+layer at (0,0) size 800x8
RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0
RenderBlock (floating) {DIV} at (2,2) size 264x304 [border: (2px solid #000000)]
diff --git a/LayoutTests/platform/mac/fast/blockflow/border-radius-clipping-vertical-lr-expected.txt b/LayoutTests/platform/mac/fast/blockflow/border-radius-clipping-vertical-lr-expected.txt
index 95741e5..4e09633 100644
--- a/LayoutTests/platform/mac/fast/blockflow/border-radius-clipping-vertical-lr-expected.txt
+++ b/LayoutTests/platform/mac/fast/blockflow/border-radius-clipping-vertical-lr-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x621
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x621
+layer at (0,0) size 785x600
RenderBlock {HTML} at (0,0) size 785x600
RenderBody {BODY} at (8,8) size 727x584
RenderBlock {DIV} at (0,0) size 144x600
diff --git a/LayoutTests/platform/mac/fast/blockflow/box-shadow-vertical-lr-expected.txt b/LayoutTests/platform/mac/fast/blockflow/box-shadow-vertical-lr-expected.txt
index 9637dce..ba658d0 100644
--- a/LayoutTests/platform/mac/fast/blockflow/box-shadow-vertical-lr-expected.txt
+++ b/LayoutTests/platform/mac/fast/blockflow/box-shadow-vertical-lr-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x608
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x608
+layer at (0,0) size 785x600
RenderBlock {HTML} at (0,0) size 785x600
RenderBody {BODY} at (8,8) size 769x584
RenderBlock {DIV} at (0,0) size 144x600
diff --git a/LayoutTests/platform/mac/fast/blockflow/box-shadow-vertical-rl-expected.txt b/LayoutTests/platform/mac/fast/blockflow/box-shadow-vertical-rl-expected.txt
index 9637dce..ba658d0 100644
--- a/LayoutTests/platform/mac/fast/blockflow/box-shadow-vertical-rl-expected.txt
+++ b/LayoutTests/platform/mac/fast/blockflow/box-shadow-vertical-rl-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x608
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x608
+layer at (0,0) size 785x600
RenderBlock {HTML} at (0,0) size 785x600
RenderBody {BODY} at (8,8) size 769x584
RenderBlock {DIV} at (0,0) size 144x600
diff --git a/LayoutTests/platform/mac/fast/blockflow/floats-in-block-layout-expected.txt b/LayoutTests/platform/mac/fast/blockflow/floats-in-block-layout-expected.txt
index 7900a9c..e0249cb 100644
--- a/LayoutTests/platform/mac/fast/blockflow/floats-in-block-layout-expected.txt
+++ b/LayoutTests/platform/mac/fast/blockflow/floats-in-block-layout-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 308x600
+layer at (0,0) size 116x600
RenderBlock {HTML} at (0,0) size 116x600
RenderBody {BODY} at (8,8) size 100x584
RenderBlock {DIV} at (0,0) size 100x584 [bgcolor=#FFFF00]
diff --git a/LayoutTests/platform/mac/fast/body-propagation/background-color/002-expected.txt b/LayoutTests/platform/mac/fast/body-propagation/background-color/002-expected.txt
index 45bf246..a9ea59e 100644
--- a/LayoutTests/platform/mac/fast/body-propagation/background-color/002-expected.txt
+++ b/LayoutTests/platform/mac/fast/body-propagation/background-color/002-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
+layer at (0,0) size 800x24
RenderBlock {HTML} at (0,0) size 800x24 [bgcolor=#00FF00]
RenderBody {BODY} at (8,16) size 784x0 [bgcolor=#FF0000]
RenderBlock {P} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/fast/body-propagation/background-color/002-xhtml-expected.txt b/LayoutTests/platform/mac/fast/body-propagation/background-color/002-xhtml-expected.txt
index 43742c5..4d1fed7 100644
--- a/LayoutTests/platform/mac/fast/body-propagation/background-color/002-xhtml-expected.txt
+++ b/LayoutTests/platform/mac/fast/body-propagation/background-color/002-xhtml-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
+layer at (0,0) size 800x24
RenderBlock {html} at (0,0) size 800x24 [bgcolor=#00FF00]
RenderBody {body} at (8,16) size 784x0 [bgcolor=#FF0000]
RenderBlock {p} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/fast/body-propagation/background-image/002-expected.txt b/LayoutTests/platform/mac/fast/body-propagation/background-image/002-expected.txt
index 1d2f15f..1d7ef2a 100644
--- a/LayoutTests/platform/mac/fast/body-propagation/background-image/002-expected.txt
+++ b/LayoutTests/platform/mac/fast/body-propagation/background-image/002-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
+layer at (0,0) size 800x24
RenderBlock {HTML} at (0,0) size 800x24
RenderBody {BODY} at (8,16) size 784x0
RenderBlock {P} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/fast/body-propagation/background-image/002-xhtml-expected.txt b/LayoutTests/platform/mac/fast/body-propagation/background-image/002-xhtml-expected.txt
index 8aed703..5287a1e 100644
--- a/LayoutTests/platform/mac/fast/body-propagation/background-image/002-xhtml-expected.txt
+++ b/LayoutTests/platform/mac/fast/body-propagation/background-image/002-xhtml-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
+layer at (0,0) size 800x24
RenderBlock {html} at (0,0) size 800x24
RenderBody {body} at (8,16) size 784x0
RenderBlock {p} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/fast/body-propagation/overflow/001-expected.txt b/LayoutTests/platform/mac/fast/body-propagation/overflow/001-expected.txt
index 8f2a397..a4c6f0c 100644
--- a/LayoutTests/platform/mac/fast/body-propagation/overflow/001-expected.txt
+++ b/LayoutTests/platform/mac/fast/body-propagation/overflow/001-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x585
RenderView at (0,0) size 785x585
-layer at (0,0) size 785x233
+layer at (0,0) size 785x178
RenderBlock {HTML} at (0,0) size 785x178
RenderBody {BODY} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)]
RenderBlock {P} at (1,17) size 160x72
diff --git a/LayoutTests/platform/mac/fast/body-propagation/overflow/001-xhtml-expected.txt b/LayoutTests/platform/mac/fast/body-propagation/overflow/001-xhtml-expected.txt
index a92fdcc..e5e7fdf 100644
--- a/LayoutTests/platform/mac/fast/body-propagation/overflow/001-xhtml-expected.txt
+++ b/LayoutTests/platform/mac/fast/body-propagation/overflow/001-xhtml-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x585
RenderView at (0,0) size 785x585
-layer at (0,0) size 785x233
+layer at (0,0) size 785x178
RenderBlock {html} at (0,0) size 785x178
RenderBody {body} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)]
RenderBlock {p} at (1,17) size 160x72
diff --git a/LayoutTests/platform/mac/fast/body-propagation/overflow/005-declarative-expected.txt b/LayoutTests/platform/mac/fast/body-propagation/overflow/005-declarative-expected.txt
index efa7d7e..42843a1 100644
--- a/LayoutTests/platform/mac/fast/body-propagation/overflow/005-declarative-expected.txt
+++ b/LayoutTests/platform/mac/fast/body-propagation/overflow/005-declarative-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x585
RenderView at (0,0) size 785x585
-layer at (0,0) size 785x449
+layer at (0,0) size 785x340
RenderBlock {html} at (0,0) size 785x340
RenderBody {body} at (8,170) size 162x162 [color=#000080] [border: (1px solid #000080)]
RenderBlock {p} at (1,17) size 160x126
diff --git a/LayoutTests/platform/mac/fast/body-propagation/overflow/005-expected.txt b/LayoutTests/platform/mac/fast/body-propagation/overflow/005-expected.txt
index 675cbbd..6fd5726 100644
--- a/LayoutTests/platform/mac/fast/body-propagation/overflow/005-expected.txt
+++ b/LayoutTests/platform/mac/fast/body-propagation/overflow/005-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x585
RenderView at (0,0) size 785x585
-layer at (0,0) size 785x449
+layer at (0,0) size 785x340
RenderBlock {HTML} at (0,0) size 785x340
RenderBody {BODY} at (8,170) size 162x162 [color=#000080] [border: (1px solid #000080)]
RenderBlock {P} at (1,17) size 160x126
diff --git a/LayoutTests/platform/mac/fast/body-propagation/overflow/005-xhtml-expected.txt b/LayoutTests/platform/mac/fast/body-propagation/overflow/005-xhtml-expected.txt
index efa7d7e..42843a1 100644
--- a/LayoutTests/platform/mac/fast/body-propagation/overflow/005-xhtml-expected.txt
+++ b/LayoutTests/platform/mac/fast/body-propagation/overflow/005-xhtml-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x585
RenderView at (0,0) size 785x585
-layer at (0,0) size 785x449
+layer at (0,0) size 785x340
RenderBlock {html} at (0,0) size 785x340
RenderBody {body} at (8,170) size 162x162 [color=#000080] [border: (1px solid #000080)]
RenderBlock {p} at (1,17) size 160x126
diff --git a/LayoutTests/platform/mac/fast/borders/fieldsetBorderRadius-expected.txt b/LayoutTests/platform/mac/fast/borders/fieldsetBorderRadius-expected.txt
index 2a16ce0..4829a8b 100644
--- a/LayoutTests/platform/mac/fast/borders/fieldsetBorderRadius-expected.txt
+++ b/LayoutTests/platform/mac/fast/borders/fieldsetBorderRadius-expected.txt
@@ -42,7 +42,7 @@ layer at (0,0) size 800x600
RenderText {#text} at (0,0) size 0x0
RenderFieldSet {FIELDSET} at (2,347) size 128x39 [border: (2px groove #C0C0C0)]
RenderBlock {LEGEND} at (14,0) size 156x12 [border: (1px solid #0000FF)]
-layer at (458,106) size 186x40
+layer at (458,106) size 100x40
RenderBlock (relative positioned) {DIV} at (0,98) size 100x40
RenderFieldSet {FIELDSET} at (2,0) size 184x39 [border: (2px groove #C0C0C0)]
RenderBlock {LEGEND} at (14,0) size 156x12 [border: (1px solid #0000FF)]
diff --git a/LayoutTests/platform/mac/fast/box-shadow/basic-shadows-expected.txt b/LayoutTests/platform/mac/fast/box-shadow/basic-shadows-expected.txt
index 5efe150..780810a 100644
--- a/LayoutTests/platform/mac/fast/box-shadow/basic-shadows-expected.txt
+++ b/LayoutTests/platform/mac/fast/box-shadow/basic-shadows-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x671
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x671
+layer at (0,0) size 785x658
RenderBlock {HTML} at (0,0) size 785x658
RenderBody {BODY} at (8,8) size 769x634
RenderBlock (anonymous) at (0,0) size 769x150
diff --git a/LayoutTests/platform/mac/fast/box-sizing/box-sizing-expected.txt b/LayoutTests/platform/mac/fast/box-sizing/box-sizing-expected.txt
index 6d4496b..80b8313 100644
--- a/LayoutTests/platform/mac/fast/box-sizing/box-sizing-expected.txt
+++ b/LayoutTests/platform/mac/fast/box-sizing/box-sizing-expected.txt
@@ -75,7 +75,7 @@ layer at (43,413) size 20x20
RenderBlock (positioned) {DIV} at (43,413) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
layer at (73,413) size 20x20
RenderBlock (positioned) {DIV} at (73,413) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-layer at (103,413) size 20x60
+layer at (103,413) size 20x20
RenderBlock (positioned) {DIV} at (103,413) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
RenderBR {BR} at (6,6) size 0x18
RenderBR {BR} at (6,24) size 0x18
diff --git a/LayoutTests/platform/mac/fast/clip/008-expected.txt b/LayoutTests/platform/mac/fast/clip/008-expected.txt
index bbf1ce8..3f0c743 100644
--- a/LayoutTests/platform/mac/fast/clip/008-expected.txt
+++ b/LayoutTests/platform/mac/fast/clip/008-expected.txt
@@ -13,7 +13,7 @@ layer at (0,0) size 800x70
RenderText {#text} at (0,0) size 0x0
layer at (8,62) size 100x100
RenderBlock (positioned) {DIV} at (8,62) size 100x100
-layer at (100,100) size 200x200
+layer at (100,100) size 100x100
RenderBlock (positioned) {DIV} at (100,100) size 100x100
layer at (200,200) size 100x100
RenderBlock {DIV} at (100,100) size 100x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/mac/fast/clip/009-expected.txt b/LayoutTests/platform/mac/fast/clip/009-expected.txt
index 5474365..6a56223 100644
--- a/LayoutTests/platform/mac/fast/clip/009-expected.txt
+++ b/LayoutTests/platform/mac/fast/clip/009-expected.txt
@@ -9,6 +9,6 @@ layer at (0,0) size 800x52
text run at (541,0) width 239: "This test is checking to make sure clip"
text run at (0,18) width 192: "is applying to all descendants. "
RenderText {#text} at (0,0) size 0x0
-layer at (8,44) size 200x200 backgroundClip at (8,44) size 100x100 clip at (8,44) size 100x100 outlineClip at (8,44) size 100x100
+layer at (8,44) size 100x100
RenderBlock (positioned) {DIV} at (8,44) size 100x100 [bgcolor=#008000]
RenderBlock {DIV} at (100,100) size 100x100 [bgcolor=#FF0000]
diff --git a/LayoutTests/platform/mac/fast/clip/010-expected.txt b/LayoutTests/platform/mac/fast/clip/010-expected.txt
index 5474365..6a56223 100644
--- a/LayoutTests/platform/mac/fast/clip/010-expected.txt
+++ b/LayoutTests/platform/mac/fast/clip/010-expected.txt
@@ -9,6 +9,6 @@ layer at (0,0) size 800x52
text run at (541,0) width 239: "This test is checking to make sure clip"
text run at (0,18) width 192: "is applying to all descendants. "
RenderText {#text} at (0,0) size 0x0
-layer at (8,44) size 200x200 backgroundClip at (8,44) size 100x100 clip at (8,44) size 100x100 outlineClip at (8,44) size 100x100
+layer at (8,44) size 100x100
RenderBlock (positioned) {DIV} at (8,44) size 100x100 [bgcolor=#008000]
RenderBlock {DIV} at (100,100) size 100x100 [bgcolor=#FF0000]
diff --git a/LayoutTests/platform/mac/fast/clip/011-expected.txt b/LayoutTests/platform/mac/fast/clip/011-expected.txt
index e7e1c8d..6a56223 100644
--- a/LayoutTests/platform/mac/fast/clip/011-expected.txt
+++ b/LayoutTests/platform/mac/fast/clip/011-expected.txt
@@ -9,6 +9,6 @@ layer at (0,0) size 800x52
text run at (541,0) width 239: "This test is checking to make sure clip"
text run at (0,18) width 192: "is applying to all descendants. "
RenderText {#text} at (0,0) size 0x0
-layer at (8,44) size 200x400 backgroundClip at (8,44) size 100x100 clip at (8,44) size 100x100 outlineClip at (8,44) size 100x100
+layer at (8,44) size 100x100
RenderBlock (positioned) {DIV} at (8,44) size 100x100 [bgcolor=#008000]
RenderBlock {DIV} at (100,100) size 100x100 [bgcolor=#FF0000]
diff --git a/LayoutTests/platform/mac/fast/clip/012-expected.txt b/LayoutTests/platform/mac/fast/clip/012-expected.txt
index e7e1c8d..6a56223 100644
--- a/LayoutTests/platform/mac/fast/clip/012-expected.txt
+++ b/LayoutTests/platform/mac/fast/clip/012-expected.txt
@@ -9,6 +9,6 @@ layer at (0,0) size 800x52
text run at (541,0) width 239: "This test is checking to make sure clip"
text run at (0,18) width 192: "is applying to all descendants. "
RenderText {#text} at (0,0) size 0x0
-layer at (8,44) size 200x400 backgroundClip at (8,44) size 100x100 clip at (8,44) size 100x100 outlineClip at (8,44) size 100x100
+layer at (8,44) size 100x100
RenderBlock (positioned) {DIV} at (8,44) size 100x100 [bgcolor=#008000]
RenderBlock {DIV} at (100,100) size 100x100 [bgcolor=#FF0000]
diff --git a/LayoutTests/platform/mac/fast/compact/001-expected.txt b/LayoutTests/platform/mac/fast/compact/001-expected.txt
index b7674eb..cb534a6 100644
--- a/LayoutTests/platform/mac/fast/compact/001-expected.txt
+++ b/LayoutTests/platform/mac/fast/compact/001-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x77
+layer at (0,0) size 800x76
RenderBlock {HTML} at (0,0) size 800x76
RenderBody {BODY} at (8,16) size 784x52
RenderBlock {P} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-on-background-image-expected.txt b/LayoutTests/platform/mac/fast/css/color-correction-on-background-image-expected.txt
index b1b8b90..fe5adca 100644
--- a/LayoutTests/platform/mac/fast/css/color-correction-on-background-image-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/color-correction-on-background-image-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x860
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x860
+layer at (0,0) size 785x600
RenderBlock {HTML} at (0,0) size 785x600
RenderBody {BODY} at (8,8) size 769x576
RenderBlock {P} at (0,0) size 769x36
diff --git a/LayoutTests/platform/mac/fast/css/negative-leading-expected.txt b/LayoutTests/platform/mac/fast/css/negative-leading-expected.txt
index 0b9524e..e1d202f 100644
--- a/LayoutTests/platform/mac/fast/css/negative-leading-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/negative-leading-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x205
+layer at (0,0) size 800x198
RenderBlock {HTML} at (0,0) size 800x198
RenderBody {BODY} at (8,16) size 784x174
RenderBlock {P} at (0,0) size 784x36
diff --git a/LayoutTests/platform/mac/fast/css/percentage-non-integer-expected.txt b/LayoutTests/platform/mac/fast/css/percentage-non-integer-expected.txt
index 5b99a01..c1ecafe 100644
--- a/LayoutTests/platform/mac/fast/css/percentage-non-integer-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/percentage-non-integer-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1013x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1013x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#00FF00]
diff --git a/LayoutTests/platform/mac/fast/css/word-space-extra-expected.txt b/LayoutTests/platform/mac/fast/css/word-space-extra-expected.txt
index 9c8f77e..9cce177 100644
--- a/LayoutTests/platform/mac/fast/css/word-space-extra-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/word-space-extra-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 2026x2393
RenderView at (0,0) size 785x585
-layer at (0,0) size 2026x2393
+layer at (0,0) size 785x2393
RenderBlock {HTML} at (0,0) size 785x2393
RenderBody {BODY} at (8,8) size 769x2377
RenderBlock {H2} at (0,0) size 769x28
diff --git a/LayoutTests/platform/mac/fast/dom/clone-node-dynamic-style-expected.txt b/LayoutTests/platform/mac/fast/dom/clone-node-dynamic-style-expected.txt
index 16689f4..25d6be3 100644
--- a/LayoutTests/platform/mac/fast/dom/clone-node-dynamic-style-expected.txt
+++ b/LayoutTests/platform/mac/fast/dom/clone-node-dynamic-style-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 838x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 838x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {H1} at (0,0) size 784x37
diff --git a/LayoutTests/platform/mac/fast/dynamic/window-resize-scrollbars-test-expected.txt b/LayoutTests/platform/mac/fast/dynamic/window-resize-scrollbars-test-expected.txt
index 892baca..4cfa1e1 100644
--- a/LayoutTests/platform/mac/fast/dynamic/window-resize-scrollbars-test-expected.txt
+++ b/LayoutTests/platform/mac/fast/dynamic/window-resize-scrollbars-test-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 768x592
+layer at (0,0) size 768x568
RenderBlock {HTML} at (0,0) size 768x568
RenderBody {BODY} at (8,8) size 752x584
RenderText {#text} at (0,0) size 484x18
diff --git a/LayoutTests/platform/mac/fast/events/focusingUnloadedFrame-expected.txt b/LayoutTests/platform/mac/fast/events/focusingUnloadedFrame-expected.txt
index 9c570b1..e1beb16 100644
--- a/LayoutTests/platform/mac/fast/events/focusingUnloadedFrame-expected.txt
+++ b/LayoutTests/platform/mac/fast/events/focusingUnloadedFrame-expected.txt
@@ -19,8 +19,8 @@ layer at (0,0) size 800x600
text run at (580,18) width 37: "Crash"
RenderText {#text} at (0,0) size 0x0
RenderFrame {FRAME} at (0,0) size 0x0
- layer at (0,0) size 8x8
+ layer at (0,0) size 0x0
RenderView at (0,0) size 0x0
- layer at (0,0) size 8x8
+ layer at (0,0) size 0x8
RenderBlock {HTML} at (0,0) size 0x8
RenderBody {BODY} at (8,8) size 0x0
diff --git a/LayoutTests/platform/mac/fast/flexbox/009-expected.txt b/LayoutTests/platform/mac/fast/flexbox/009-expected.txt
index 58e510e..ebb3848 100644
--- a/LayoutTests/platform/mac/fast/flexbox/009-expected.txt
+++ b/LayoutTests/platform/mac/fast/flexbox/009-expected.txt
@@ -11,4 +11,4 @@ layer at (0,0) size 800x600
text run at (249,18) width 326: "If you do not see a scrollbar, then the test has failed."
layer at (8,60) size 104x104 clip at (10,62) size 85x100 scrollHeight 1000
RenderFlexibleBox {DIV} at (0,52) size 104x104 [bgcolor=#008000] [border: (2px solid #808000)]
- RenderBlock {DIV} at (2,2) size 0x1000
+ RenderBlock {DIV} at (2,2) size 85x1000
diff --git a/LayoutTests/platform/mac/fast/flexbox/016-expected.txt b/LayoutTests/platform/mac/fast/flexbox/016-expected.txt
index 2bc12e5..00e698a 100644
--- a/LayoutTests/platform/mac/fast/flexbox/016-expected.txt
+++ b/LayoutTests/platform/mac/fast/flexbox/016-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 812x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 812x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585 [bgcolor=#FFFFFF]
RenderBody {BODY} at (0,0) size 800x585
RenderFlexibleBox {DIV} at (0,0) size 800x585
diff --git a/LayoutTests/platform/mac/fast/flexbox/flex-hang-expected.txt b/LayoutTests/platform/mac/fast/flexbox/flex-hang-expected.txt
index 52010fe..c862a1a 100644
--- a/LayoutTests/platform/mac/fast/flexbox/flex-hang-expected.txt
+++ b/LayoutTests/platform/mac/fast/flexbox/flex-hang-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 788x587
RenderView at (0,0) size 785x585
-layer at (0,0) size 788x587
+layer at (0,0) size 785x587
RenderBlock {HTML} at (0,0) size 785x587
RenderBody {BODY} at (0,0) size 785x587
RenderFlexibleBox {DIV} at (0,0) size 787x587 [border: (1px solid #000000)]
diff --git a/LayoutTests/platform/mac/fast/forms/basic-textareas-quirks-expected.txt b/LayoutTests/platform/mac/fast/forms/basic-textareas-quirks-expected.txt
index 4a0ce80..2cac9e4 100644
--- a/LayoutTests/platform/mac/fast/forms/basic-textareas-quirks-expected.txt
+++ b/LayoutTests/platform/mac/fast/forms/basic-textareas-quirks-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x1050
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1050
+layer at (0,0) size 785x600
RenderBlock {HTML} at (0,0) size 785x600
RenderBody {BODY} at (8,8) size 769x584
RenderBlock (floating) {DIV} at (0,0) size 352x817 [border: (1px solid #FF0000)]
diff --git a/LayoutTests/platform/mac/fast/forms/file-input-direction-expected.txt b/LayoutTests/platform/mac/fast/forms/file-input-direction-expected.txt
index c4dcfa3..cb9e038 100644
--- a/LayoutTests/platform/mac/fast/forms/file-input-direction-expected.txt
+++ b/LayoutTests/platform/mac/fast/forms/file-input-direction-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1083x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1083x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderTable {TABLE} at (0,0) size 1075x108
diff --git a/LayoutTests/platform/mac/fast/forms/floating-textfield-relayout-expected.txt b/LayoutTests/platform/mac/fast/forms/floating-textfield-relayout-expected.txt
index 9253b09..1739db7 100644
--- a/LayoutTests/platform/mac/fast/forms/floating-textfield-relayout-expected.txt
+++ b/LayoutTests/platform/mac/fast/forms/floating-textfield-relayout-expected.txt
@@ -17,7 +17,7 @@ layer at (0,0) size 800x600
RenderText {#text} at (59,18) size 4x18
text run at (59,18) width 4: "."
RenderBlock {HR} at (0,52) size 784x2 [border: (1px inset #000000)]
-layer at (8,70) size 784x21
+layer at (8,70) size 784x0
RenderBlock (relative positioned) {DIV} at (0,62) size 784x0
RenderTextControl {INPUT} at (0,2) size 392x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
layer at (11,75) size 386x13
diff --git a/LayoutTests/platform/mac/fast/forms/textfield-overflow-expected.txt b/LayoutTests/platform/mac/fast/forms/textfield-overflow-expected.txt
index 408b30d..ef46adc 100644
--- a/LayoutTests/platform/mac/fast/forms/textfield-overflow-expected.txt
+++ b/LayoutTests/platform/mac/fast/forms/textfield-overflow-expected.txt
@@ -6,6 +6,6 @@ layer at (0,0) size 800x600
RenderTextControl {INPUT} at (2,0) size 125x10 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (13,11) size 119x4
+layer at (13,11) size 119x4 scrollHeight 13
RenderBlock {DIV} at (3,3) size 119x4
caret: position 0 of child 0 {DIV} of child 1 {INPUT} of body
diff --git a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt
index c15a769..7bb7ec3 100644
--- a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt
+++ b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 866x607
RenderView at (0,0) size 785x585
-layer at (0,0) size 866x607
+layer at (0,0) size 785x607
RenderBlock {HTML} at (0,0) size 785x607
RenderFrameSet {FRAMESET} at (0,0) size 866x607
RenderFrameSet {FRAMESET} at (0,0) size 866x207
diff --git a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt
index bc08b93..fe6d664 100644
--- a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt
+++ b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1200x800
RenderView at (0,0) size 785x585
-layer at (0,0) size 1200x800
+layer at (0,0) size 785x800
RenderBlock {HTML} at (0,0) size 785x800
RenderFrameSet {FRAMESET} at (0,0) size 1200x800
RenderFrame {FRAME} at (0,0) size 600x200
diff --git a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt
index 27b00a8..12e44ea 100644
--- a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt
+++ b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1000x600
RenderView at (0,0) size 800x585
-layer at (0,0) size 1000x600
+layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderFrameSet {FRAMESET} at (0,0) size 1000x600
RenderFrame {FRAME} at (0,0) size 800x600
diff --git a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt
index 325b240..aad430a 100644
--- a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt
+++ b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1000x650
RenderView at (0,0) size 785x585
-layer at (0,0) size 1000x650
+layer at (0,0) size 785x650
RenderBlock {HTML} at (0,0) size 785x650
RenderFrameSet {FRAMESET} at (0,0) size 1000x650
RenderFrame {FRAME} at (0,0) size 300x650
diff --git a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
index 8d6f4e5..a951fbf 100644
--- a/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
+++ b/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 900x630
RenderView at (0,0) size 785x585
-layer at (0,0) size 900x630
+layer at (0,0) size 785x630
RenderBlock {HTML} at (0,0) size 785x630
RenderFrameSet {FRAMESET} at (0,0) size 900x630
RenderFrameSet {FRAMESET} at (0,0) size 900x150
diff --git a/LayoutTests/platform/mac/fast/frames/frame-scrolling-attribute-expected.txt b/LayoutTests/platform/mac/fast/frames/frame-scrolling-attribute-expected.txt
index c1303b2..a28252e 100644
--- a/LayoutTests/platform/mac/fast/frames/frame-scrolling-attribute-expected.txt
+++ b/LayoutTests/platform/mac/fast/frames/frame-scrolling-attribute-expected.txt
@@ -6,7 +6,7 @@ layer at (0,0) size 800x600
RenderFrame {FRAME} at (0,0) size 195x145
layer at (0,0) size 408x486
RenderView at (0,0) size 180x130
- layer at (0,0) size 408x486
+ layer at (0,0) size 180x486
RenderBlock {HTML} at (0,0) size 180x486
RenderBody {BODY} at (8,8) size 164x470
RenderBlock {P} at (0,0) size 164x54
@@ -18,7 +18,7 @@ layer at (0,0) size 800x600
RenderFrame {FRAME} at (201,0) size 195x145
layer at (0,0) size 408x486
RenderView at (0,0) size 180x130
- layer at (0,0) size 408x486
+ layer at (0,0) size 180x486
RenderBlock {HTML} at (0,0) size 180x486
RenderBody {BODY} at (8,8) size 164x470
RenderBlock {P} at (0,0) size 164x54
@@ -30,7 +30,7 @@ layer at (0,0) size 800x600
RenderFrame {FRAME} at (402,0) size 195x145
layer at (0,0) size 408x486
RenderView at (0,0) size 180x130
- layer at (0,0) size 408x486
+ layer at (0,0) size 180x486
RenderBlock {HTML} at (0,0) size 180x486
RenderBody {BODY} at (8,8) size 164x470
RenderBlock {P} at (0,0) size 164x54
@@ -42,7 +42,7 @@ layer at (0,0) size 800x600
RenderFrame {FRAME} at (603,0) size 197x145
layer at (0,0) size 408x486
RenderView at (0,0) size 182x130
- layer at (0,0) size 408x486
+ layer at (0,0) size 182x486
RenderBlock {HTML} at (0,0) size 182x486
RenderBody {BODY} at (8,8) size 166x470
RenderBlock {P} at (0,0) size 166x54
@@ -54,7 +54,7 @@ layer at (0,0) size 800x600
RenderFrame {FRAME} at (0,151) size 195x145
layer at (0,0) size 408x486
RenderView at (0,0) size 180x130
- layer at (0,0) size 408x486
+ layer at (0,0) size 180x486
RenderBlock {HTML} at (0,0) size 180x486
RenderBody {BODY} at (8,8) size 164x470
RenderBlock {P} at (0,0) size 164x54
@@ -66,7 +66,7 @@ layer at (0,0) size 800x600
RenderFrame {FRAME} at (201,151) size 195x145
layer at (0,0) size 408x486
RenderView at (0,0) size 195x145
- layer at (0,0) size 408x486
+ layer at (0,0) size 195x486
RenderBlock {HTML} at (0,0) size 195x486
RenderBody {BODY} at (8,8) size 179x470
RenderBlock {P} at (0,0) size 179x54
@@ -78,7 +78,7 @@ layer at (0,0) size 800x600
RenderFrame {FRAME} at (402,151) size 195x145
layer at (0,0) size 408x486
RenderView at (0,0) size 180x130
- layer at (0,0) size 408x486
+ layer at (0,0) size 180x486
RenderBlock {HTML} at (0,0) size 180x486
RenderBody {BODY} at (8,8) size 164x470
RenderBlock {P} at (0,0) size 164x54
@@ -90,7 +90,7 @@ layer at (0,0) size 800x600
RenderFrame {FRAME} at (603,151) size 197x145
layer at (0,0) size 408x486
RenderView at (0,0) size 182x130
- layer at (0,0) size 408x486
+ layer at (0,0) size 182x486
RenderBlock {HTML} at (0,0) size 182x486
RenderBody {BODY} at (8,8) size 166x470
RenderBlock {P} at (0,0) size 166x54
diff --git a/LayoutTests/platform/mac/fast/frames/iframe-scrolling-attribute-expected.txt b/LayoutTests/platform/mac/fast/frames/iframe-scrolling-attribute-expected.txt
index cb1aaea..8865322 100644
--- a/LayoutTests/platform/mac/fast/frames/iframe-scrolling-attribute-expected.txt
+++ b/LayoutTests/platform/mac/fast/frames/iframe-scrolling-attribute-expected.txt
@@ -21,7 +21,7 @@ layer at (0,0) size 785x692
RenderPartObject {IFRAME} at (0,0) size 204x204 [border: (2px inset #000000)]
layer at (0,0) size 408x486
RenderView at (0,0) size 185x185
- layer at (0,0) size 408x486
+ layer at (0,0) size 185x486
RenderBlock {HTML} at (0,0) size 185x486
RenderBody {BODY} at (8,8) size 169x470
RenderBlock {P} at (0,0) size 169x54
@@ -35,7 +35,7 @@ layer at (0,0) size 785x692
RenderPartObject {IFRAME} at (208,0) size 204x204 [border: (2px inset #000000)]
layer at (0,0) size 408x486
RenderView at (0,0) size 185x185
- layer at (0,0) size 408x486
+ layer at (0,0) size 185x486
RenderBlock {HTML} at (0,0) size 185x486
RenderBody {BODY} at (8,8) size 169x470
RenderBlock {P} at (0,0) size 169x54
@@ -49,7 +49,7 @@ layer at (0,0) size 785x692
RenderPartObject {IFRAME} at (416,0) size 204x204 [border: (2px inset #000000)]
layer at (0,0) size 408x486
RenderView at (0,0) size 185x185
- layer at (0,0) size 408x486
+ layer at (0,0) size 185x486
RenderBlock {HTML} at (0,0) size 185x486
RenderBody {BODY} at (8,8) size 169x470
RenderBlock {P} at (0,0) size 169x54
@@ -63,7 +63,7 @@ layer at (0,0) size 785x692
RenderPartObject {IFRAME} at (0,208) size 204x204 [border: (2px inset #000000)]
layer at (0,0) size 408x486
RenderView at (0,0) size 185x185
- layer at (0,0) size 408x486
+ layer at (0,0) size 185x486
RenderBlock {HTML} at (0,0) size 185x486
RenderBody {BODY} at (8,8) size 169x470
RenderBlock {P} at (0,0) size 169x54
@@ -77,7 +77,7 @@ layer at (0,0) size 785x692
RenderPartObject {IFRAME} at (208,208) size 204x204 [border: (2px inset #000000)]
layer at (0,0) size 408x486
RenderView at (0,0) size 185x185
- layer at (0,0) size 408x486
+ layer at (0,0) size 185x486
RenderBlock {HTML} at (0,0) size 185x486
RenderBody {BODY} at (8,8) size 169x470
RenderBlock {P} at (0,0) size 169x54
@@ -91,7 +91,7 @@ layer at (0,0) size 785x692
RenderPartObject {IFRAME} at (416,208) size 204x204 [border: (2px inset #000000)]
layer at (0,0) size 408x486
RenderView at (0,0) size 200x200
- layer at (0,0) size 408x486
+ layer at (0,0) size 200x486
RenderBlock {HTML} at (0,0) size 200x486
RenderBody {BODY} at (8,8) size 184x470
RenderBlock {P} at (0,0) size 184x54
@@ -105,7 +105,7 @@ layer at (0,0) size 785x692
RenderPartObject {IFRAME} at (0,416) size 204x204 [border: (2px inset #000000)]
layer at (0,0) size 408x486
RenderView at (0,0) size 185x185
- layer at (0,0) size 408x486
+ layer at (0,0) size 185x486
RenderBlock {HTML} at (0,0) size 185x486
RenderBody {BODY} at (8,8) size 169x470
RenderBlock {P} at (0,0) size 169x54
@@ -119,7 +119,7 @@ layer at (0,0) size 785x692
RenderPartObject {IFRAME} at (208,416) size 204x204 [border: (2px inset #000000)]
layer at (0,0) size 408x486
RenderView at (0,0) size 185x185
- layer at (0,0) size 408x486
+ layer at (0,0) size 185x486
RenderBlock {HTML} at (0,0) size 185x486
RenderBody {BODY} at (8,8) size 169x470
RenderBlock {P} at (0,0) size 169x54
diff --git a/LayoutTests/platform/mac/fast/frames/inline-object-inside-frameset-expected.txt b/LayoutTests/platform/mac/fast/frames/inline-object-inside-frameset-expected.txt
index 7b11759..db47ee4 100644
--- a/LayoutTests/platform/mac/fast/frames/inline-object-inside-frameset-expected.txt
+++ b/LayoutTests/platform/mac/fast/frames/inline-object-inside-frameset-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 793x634
RenderView at (0,0) size 785x585
-layer at (0,0) size 793x634
+layer at (0,0) size 785x634
RenderBlock {HTML} at (0,0) size 785x634
RenderBody {BODY} at (8,8) size 769x618
RenderBlock {DIV} at (0,0) size 769x18
diff --git a/LayoutTests/platform/mac/fast/gradients/background-clipped-expected.txt b/LayoutTests/platform/mac/fast/gradients/background-clipped-expected.txt
index 61250f3..49a0e49 100644
--- a/LayoutTests/platform/mac/fast/gradients/background-clipped-expected.txt
+++ b/LayoutTests/platform/mac/fast/gradients/background-clipped-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 842x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 842x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {DIV} at (-50,260) size 210x210 [border: (5px dashed #0000FF)]
diff --git a/LayoutTests/platform/mac/fast/images/gif-large-checkerboard-expected.txt b/LayoutTests/platform/mac/fast/images/gif-large-checkerboard-expected.txt
index e810b02..d837791 100644
--- a/LayoutTests/platform/mac/fast/images/gif-large-checkerboard-expected.txt
+++ b/LayoutTests/platform/mac/fast/images/gif-large-checkerboard-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1599x2090
RenderView at (0,0) size 785x585
-layer at (0,0) size 1599x2090
+layer at (0,0) size 785x2090
RenderBlock {HTML} at (0,0) size 785x2090
RenderBody {BODY} at (8,8) size 769x2074
RenderImage {IMG} at (0,0) size 1591x2074
diff --git a/LayoutTests/platform/mac/fast/images/pdf-as-image-landscape-expected.txt b/LayoutTests/platform/mac/fast/images/pdf-as-image-landscape-expected.txt
index 2aac97b..a386f28 100644
--- a/LayoutTests/platform/mac/fast/images/pdf-as-image-landscape-expected.txt
+++ b/LayoutTests/platform/mac/fast/images/pdf-as-image-landscape-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 850x653
RenderView at (0,0) size 785x585
-layer at (0,0) size 850x653
+layer at (0,0) size 785x653
RenderBlock {HTML} at (0,0) size 785x653
RenderBody {BODY} at (8,8) size 769x629
RenderBlock (anonymous) at (0,0) size 769x18
diff --git a/LayoutTests/platform/mac/fast/inline-block/inline-block-vertical-align-expected.txt b/LayoutTests/platform/mac/fast/inline-block/inline-block-vertical-align-expected.txt
index 3e686f1..220400e 100644
--- a/LayoutTests/platform/mac/fast/inline-block/inline-block-vertical-align-expected.txt
+++ b/LayoutTests/platform/mac/fast/inline-block/inline-block-vertical-align-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1024x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1024x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {DIV} at (0,0) size 784x56
diff --git a/LayoutTests/platform/mac/fast/inline/long-wrapped-line-expected.txt b/LayoutTests/platform/mac/fast/inline/long-wrapped-line-expected.txt
index dbe09bc..297a008 100644
--- a/LayoutTests/platform/mac/fast/inline/long-wrapped-line-expected.txt
+++ b/LayoutTests/platform/mac/fast/inline/long-wrapped-line-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1983x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1983x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderInline {SPAN} at (0,0) size 1975x18
diff --git a/LayoutTests/platform/mac/fast/layers/layer-visibility-expected.txt b/LayoutTests/platform/mac/fast/layers/layer-visibility-expected.txt
index d418b9b..481c0cd 100644
--- a/LayoutTests/platform/mac/fast/layers/layer-visibility-expected.txt
+++ b/LayoutTests/platform/mac/fast/layers/layer-visibility-expected.txt
@@ -191,7 +191,7 @@ layer at (10,322) size 130x36
text run at (0,0) width 115: "16 green box with"
text run at (0,18) width 61: "word ok: "
RenderText {#text} at (0,0) size 0x0
-layer at (10,358) size 130x50
+layer at (10,358) size 130x34
RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 126x48 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #FF0000)]
@@ -206,7 +206,7 @@ layer at (144,322) size 130x36
text run at (0,0) width 115: "17 green box with"
text run at (0,18) width 61: "word ok: "
RenderText {#text} at (0,0) size 0x0
-layer at (144,358) size 130x50
+layer at (144,358) size 130x34
RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 126x48 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #008000)]
@@ -221,7 +221,7 @@ layer at (278,322) size 130x36
text run at (0,0) width 115: "18 green box with"
text run at (0,18) width 61: "word ok: "
RenderText {#text} at (0,0) size 0x0
-layer at (278,358) size 130x50
+layer at (278,358) size 130x34
RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 126x48 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #FF0000)]
@@ -236,7 +236,7 @@ layer at (412,322) size 130x36
text run at (0,0) width 115: "19 green box with"
text run at (0,18) width 61: "word ok: "
RenderText {#text} at (0,0) size 0x0
-layer at (412,358) size 130x54
+layer at (412,358) size 130x34
RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 126x26 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #FF0000)]
@@ -251,7 +251,7 @@ layer at (546,322) size 130x18
RenderText {#text} at (0,0) size 91x18
text run at (0,0) width 91: "20 green box: "
RenderText {#text} at (0,0) size 0x0
-layer at (546,340) size 130x50
+layer at (546,340) size 130x34
RenderBlock (positioned) {DIV} at (0,18) size 130x34 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 126x48 [border: (2px solid #008000)]
RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #FF0000)]
@@ -266,7 +266,7 @@ layer at (10,426) size 130x36
text run at (0,0) width 124: "21 two green boxes"
text run at (0,18) width 93: "with word ok: "
RenderText {#text} at (0,0) size 0x0
-layer at (10,462) size 130x54
+layer at (10,462) size 130x34
RenderBlock (positioned) {DIV} at (0,36) size 130x34 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 126x26 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 122x22 [border: (2px solid #008000)]
diff --git a/LayoutTests/platform/mac/fast/layers/layer-visibility-sublayer-expected.txt b/LayoutTests/platform/mac/fast/layers/layer-visibility-sublayer-expected.txt
index a02915e..9a943cf 100644
--- a/LayoutTests/platform/mac/fast/layers/layer-visibility-sublayer-expected.txt
+++ b/LayoutTests/platform/mac/fast/layers/layer-visibility-sublayer-expected.txt
@@ -41,7 +41,7 @@ layer at (0,170) size 800x34
RenderBlock {DIV} at (2,10) size 796x22 [border: (2px solid #008000)]
RenderText {#text} at (2,2) size 16x18
text run at (2,2) width 16: "ok"
-layer at (0,242) size 800x50
+layer at (0,242) size 800x34
RenderBlock (positioned) {DIV} at (0,242) size 800x34 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 796x22 [border: (2px solid #FF0000)]
RenderBlock {DIV} at (2,2) size 792x18
diff --git a/LayoutTests/platform/mac/fast/lists/001-expected.txt b/LayoutTests/platform/mac/fast/lists/001-expected.txt
index bdd5cb8..3394be9 100644
--- a/LayoutTests/platform/mac/fast/lists/001-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/001-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 809x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 809x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x561
RenderBlock {DIV} at (0,0) size 784x106 [border: (3px solid #FFA500)]
diff --git a/LayoutTests/platform/mac/fast/lists/001-vertical-expected.txt b/LayoutTests/platform/mac/fast/lists/001-vertical-expected.txt
index f0dceb5..d499c66 100644
--- a/LayoutTests/platform/mac/fast/lists/001-vertical-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/001-vertical-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x620
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x620
+layer at (0,0) size 785x600
RenderBlock {HTML} at (0,0) size 785x600
RenderBody {BODY} at (8,8) size 761x584
RenderBlock {DIV} at (0,0) size 106x584 [border: (3px solid #FFA500)]
diff --git a/LayoutTests/platform/mac/fast/lists/003-expected.txt b/LayoutTests/platform/mac/fast/lists/003-expected.txt
index 24013af..239e1ba 100644
--- a/LayoutTests/platform/mac/fast/lists/003-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/003-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x350
+layer at (0,0) size 800x334
RenderBlock {HTML} at (0,0) size 800x334
RenderBody {BODY} at (8,16) size 784x302
RenderBlock (floating) {DIV} at (0,0) size 470x334
diff --git a/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt b/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt
index fcecfa5..fb3c27c 100644
--- a/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 426x600
+layer at (0,0) size 334x600
RenderBlock {HTML} at (0,0) size 334x600
RenderBody {BODY} at (16,8) size 302x584
RenderBlock (floating) {DIV} at (0,0) size 410x350
diff --git a/LayoutTests/platform/mac/fast/lists/li-br-expected.txt b/LayoutTests/platform/mac/fast/lists/li-br-expected.txt
index 5160bd1..b75b4ba 100644
--- a/LayoutTests/platform/mac/fast/lists/li-br-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/li-br-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1518x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1518x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x561
RenderBlock {OL} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-02-expected.txt b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-02-expected.txt
index 3453a7a..22c8748 100644
--- a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-02-expected.txt
+++ b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-02-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {P} at (0,0) size 784x18 [color=#008000]
diff --git a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-03-expected.txt b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-03-expected.txt
index 3453a7a..22c8748 100644
--- a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-03-expected.txt
+++ b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-03-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {P} at (0,0) size 784x18 [color=#008000]
diff --git a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-04-expected.txt b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-04-expected.txt
index 3453a7a..22c8748 100644
--- a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-04-expected.txt
+++ b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-04-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {P} at (0,0) size 784x18 [color=#008000]
diff --git a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-05-expected.txt b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-05-expected.txt
index 3453a7a..22c8748 100644
--- a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-05-expected.txt
+++ b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-05-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {P} at (0,0) size 784x18 [color=#008000]
diff --git a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-06-expected.txt b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-06-expected.txt
index 5de50eb..72a2aaa 100644
--- a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-06-expected.txt
+++ b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-06-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 968x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 968x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {P} at (0,0) size 784x18 [color=#008000]
diff --git a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-07-expected.txt b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-07-expected.txt
index 235a2fe..1a7c267 100644
--- a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-07-expected.txt
+++ b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-07-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {P} at (0,0) size 784x18 [color=#008000]
diff --git a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-08-expected.txt b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-08-expected.txt
index c5c4435..7b0793d 100644
--- a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-08-expected.txt
+++ b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-08-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x642
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x642
+layer at (0,0) size 785x600
RenderBlock {HTML} at (0,0) size 785x600
RenderBody {BODY} at (8,8) size 769x576
RenderBlock {P} at (0,0) size 769x18 [color=#008000]
diff --git a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-09-expected.txt b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-09-expected.txt
index 647c1ad..d043c3b 100644
--- a/LayoutTests/platform/mac/fast/media/mq-relative-constraints-09-expected.txt
+++ b/LayoutTests/platform/mac/fast/media/mq-relative-constraints-09-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 968x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 968x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {P} at (0,0) size 784x18 [color=#008000]
diff --git a/LayoutTests/platform/mac/fast/media/mq-width-absolute-01-expected.txt b/LayoutTests/platform/mac/fast/media/mq-width-absolute-01-expected.txt
index dd85a1a..1916501 100644
--- a/LayoutTests/platform/mac/fast/media/mq-width-absolute-01-expected.txt
+++ b/LayoutTests/platform/mac/fast/media/mq-width-absolute-01-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {P} at (0,0) size 784x18 [color=#008000]
diff --git a/LayoutTests/platform/mac/fast/media/mq-width-absolute-02-expected.txt b/LayoutTests/platform/mac/fast/media/mq-width-absolute-02-expected.txt
index dd85a1a..1916501 100644
--- a/LayoutTests/platform/mac/fast/media/mq-width-absolute-02-expected.txt
+++ b/LayoutTests/platform/mac/fast/media/mq-width-absolute-02-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {P} at (0,0) size 784x18 [color=#008000]
diff --git a/LayoutTests/platform/mac/fast/media/mq-width-absolute-03-expected.txt b/LayoutTests/platform/mac/fast/media/mq-width-absolute-03-expected.txt
index dd85a1a..1916501 100644
--- a/LayoutTests/platform/mac/fast/media/mq-width-absolute-03-expected.txt
+++ b/LayoutTests/platform/mac/fast/media/mq-width-absolute-03-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {P} at (0,0) size 784x18 [color=#008000]
diff --git a/LayoutTests/platform/mac/fast/media/mq-width-absolute-04-expected.txt b/LayoutTests/platform/mac/fast/media/mq-width-absolute-04-expected.txt
index dd85a1a..1916501 100644
--- a/LayoutTests/platform/mac/fast/media/mq-width-absolute-04-expected.txt
+++ b/LayoutTests/platform/mac/fast/media/mq-width-absolute-04-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {P} at (0,0) size 784x18 [color=#008000]
diff --git a/LayoutTests/platform/mac/fast/multicol/float-multicol-expected.txt b/LayoutTests/platform/mac/fast/multicol/float-multicol-expected.txt
index 6e21ce9..e891016 100644
--- a/LayoutTests/platform/mac/fast/multicol/float-multicol-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/float-multicol-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 1608x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1608x545
+layer at (0,0) size 800x545
RenderBlock {HTML} at (0,0) size 800x545
-layer at (8,19) size 1600x510
+layer at (8,19) size 784x510
RenderBody {BODY} at (8,19) size 784x510
RenderBlock {DIV} at (0,0) size 784x28 [bgcolor=#00FFFF]
RenderBlock (floating) {DIV} at (4,4) size 392x462 [bgcolor=#FFFF00]
diff --git a/LayoutTests/platform/mac/fast/multicol/float-paginate-complex-expected.txt b/LayoutTests/platform/mac/fast/multicol/float-paginate-complex-expected.txt
index c5446d5..b258a97 100644
--- a/LayoutTests/platform/mac/fast/multicol/float-paginate-complex-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/float-paginate-complex-expected.txt
@@ -1,9 +1,9 @@
layer at (0,0) size 1164x1680
RenderView at (0,0) size 785x585
-layer at (0,0) size 1164x1680
+layer at (0,0) size 785x1680
RenderBlock {HTML} at (0,0) size 785x1680
RenderBody {BODY} at (8,8) size 769x1664
-layer at (8,8) size 1156x404
+layer at (8,8) size 769x404
RenderBlock {DIV} at (0,0) size 769x404 [border: (2px solid #000000)]
RenderBlock (anonymous) at (2,2) size 374x252
RenderText {#text} at (0,0) size 110x18
@@ -130,7 +130,7 @@ layer at (8,8) size 1156x404
RenderText {#text} at (0,586) size 110x18
text run at (0,586) width 110: "This is some text."
RenderBR {BR} at (110,600) size 0x0
-layer at (8,428) size 1156x404
+layer at (8,428) size 769x404
RenderBlock {DIV} at (0,420) size 769x404 [border: (2px solid #000000)]
RenderBlock (anonymous) at (2,2) size 374x252
RenderText {#text} at (0,0) size 110x18
diff --git a/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.txt b/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.txt
index 4855232..14c08b1 100644
--- a/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/float-paginate-expected.txt
@@ -1,9 +1,9 @@
layer at (0,0) size 1188x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1188x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
-layer at (8,8) size 1180x404
+layer at (8,8) size 784x404
RenderBlock {DIV} at (0,0) size 784x404 [border: (2px solid #000000)]
RenderText {#text} at (2,2) size 110x18
text run at (2,2) width 110: "This is some text."
diff --git a/LayoutTests/platform/mac/fast/multicol/layers-in-multicol-expected.txt b/LayoutTests/platform/mac/fast/multicol/layers-in-multicol-expected.txt
index 9f95400..7071c30 100644
--- a/LayoutTests/platform/mac/fast/multicol/layers-in-multicol-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/layers-in-multicol-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1287x672
RenderView at (0,0) size 785x585
-layer at (0,0) size 1287x672
+layer at (0,0) size 785x672
RenderBlock {HTML} at (0,0) size 785x672
RenderBody {BODY} at (8,8) size 769x656
RenderBlock (anonymous) at (0,0) size 769x18
@@ -9,7 +9,7 @@ layer at (0,0) size 1287x672
RenderBlock (anonymous) at (0,328) size 769x18
RenderText {#text} at (0,0) size 89x18
text run at (0,0) width 89: "RTL Version:"
-layer at (8,26) size 1279x310
+layer at (8,26) size 769x310
RenderBlock {DIV} at (0,18) size 769x310 [border: (5px solid #800000)]
RenderBlock (anonymous) at (5,5) size 242x234
RenderText {#text} at (0,0) size 106x18
diff --git a/LayoutTests/platform/mac/fast/multicol/paginate-block-replaced-expected.txt b/LayoutTests/platform/mac/fast/multicol/paginate-block-replaced-expected.txt
index ed43337..5c027a2 100644
--- a/LayoutTests/platform/mac/fast/multicol/paginate-block-replaced-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/paginate-block-replaced-expected.txt
@@ -1,9 +1,9 @@
layer at (0,0) size 1586x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1586x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
-layer at (8,8) size 1578x404
+layer at (8,8) size 784x404
RenderBlock {DIV} at (0,0) size 784x404 [border: (2px solid #000000)]
RenderBlock (anonymous) at (2,2) size 382x180
RenderText {#text} at (0,0) size 110x18
diff --git a/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.txt b/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.txt
index 02b694c..ecd670f 100644
--- a/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 1090x585
layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
-layer at (8,8) size 1082x300
+layer at (8,8) size 106x300
RenderBlock (positioned) {DIV} at (8,8) size 106x300 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 106x18
text run at (0,0) width 106: "This is some text"
diff --git a/LayoutTests/platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.txt b/LayoutTests/platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.txt
index 1a25108..468beb8 100644
--- a/LayoutTests/platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/span/anonymous-style-inheritance-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 843x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 843x513
+layer at (0,0) size 800x513
RenderBlock {HTML} at (0,0) size 800x513
RenderBody {BODY} at (8,17) size 784x479
layer at (8,17) size 835x479
diff --git a/LayoutTests/platform/mac/fast/multicol/table-vertical-align-expected.txt b/LayoutTests/platform/mac/fast/multicol/table-vertical-align-expected.txt
index 34f2b31..43c48af 100644
--- a/LayoutTests/platform/mac/fast/multicol/table-vertical-align-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/table-vertical-align-expected.txt
@@ -1,11 +1,11 @@
layer at (0,0) size 1560x1010
RenderView at (0,0) size 785x585
-layer at (0,0) size 1560x1010
+layer at (0,0) size 785x1010
RenderBlock {HTML} at (0,0) size 785x1010
RenderBody {BODY} at (8,8) size 769x994
RenderBlock {HR} at (0,358) size 769x2 [border: (1px inset #000000)]
RenderBlock {HR} at (0,676) size 769x2 [border: (1px inset #000000)]
-layer at (8,8) size 1552x350
+layer at (8,8) size 769x350
RenderBlock {DIV} at (0,0) size 769x350
RenderTable {TABLE} at (0,0) size 376x1179 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 374x1177
@@ -136,7 +136,7 @@ layer at (8,8) size 1552x350
RenderText {#text} at (11,11) size 145x148
text run at (11,11) width 145: "Other"
text run at (11,85) width 108: "cell."
-layer at (8,376) size 1552x300
+layer at (8,376) size 769x300
RenderBlock {DIV} at (0,368) size 769x300
RenderTable {TABLE} at (0,0) size 376x1129 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 374x1127
@@ -267,7 +267,7 @@ layer at (8,376) size 1552x300
RenderText {#text} at (11,11) size 145x185
text run at (11,11) width 145: "Other"
text run at (11,122) width 108: "cell."
-layer at (8,702) size 1552x300
+layer at (8,702) size 769x300
RenderBlock {DIV} at (0,694) size 769x300
RenderTable {TABLE} at (0,0) size 376x1129 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 374x1127
diff --git a/LayoutTests/platform/mac/fast/overflow/006-expected.txt b/LayoutTests/platform/mac/fast/overflow/006-expected.txt
index a91c29c..59fab66 100644
--- a/LayoutTests/platform/mac/fast/overflow/006-expected.txt
+++ b/LayoutTests/platform/mac/fast/overflow/006-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x990
RenderView at (0,0) size 785x585
-layer at (0,0) size 785x990
+layer at (0,0) size 785x585
RenderBlock {HTML} at (0,0) size 785x585
RenderBody {BODY} at (0,0) size 785x585
RenderText {#text} at (0,0) size 420x18
diff --git a/LayoutTests/platform/mac/fast/overflow/float-in-relpositioned-expected.txt b/LayoutTests/platform/mac/fast/overflow/float-in-relpositioned-expected.txt
index 5972e0c..3a64474 100644
--- a/LayoutTests/platform/mac/fast/overflow/float-in-relpositioned-expected.txt
+++ b/LayoutTests/platform/mac/fast/overflow/float-in-relpositioned-expected.txt
@@ -27,10 +27,10 @@ layer at (18,300) size 102x102 clip at (19,301) size 100x85 scrollWidth 125
RenderBlock {DIV} at (10,292) size 102x102 [border: (1px solid #000000)]
layer at (18,412) size 102x102 clip at (19,413) size 85x100 scrollHeight 125
RenderBlock {DIV} at (10,404) size 102x102 [border: (1px solid #000000)]
-layer at (69,77) size 75x75 backgroundClip at (19,77) size 100x85 clip at (19,77) size 100x85 outlineClip at (19,77) size 100x85
+layer at (69,77) size 25x25
RenderBlock (relative positioned) {DIV} at (1,1) size 25x25 [bgcolor=#000000]
RenderBlock (floating) {DIV} at (0,0) size 75x75 [bgcolor=#0000FF7F]
-layer at (19,239) size 75x75 backgroundClip at (19,189) size 85x100 clip at (19,189) size 85x100 outlineClip at (19,189) size 85x100
+layer at (19,239) size 25x25
RenderBlock (relative positioned) {DIV} at (1,1) size 25x25 [bgcolor=#000000]
RenderBlock (floating) {DIV} at (0,0) size 75x75 [bgcolor=#0000FF7F]
layer at (69,301) size 25x25
diff --git a/LayoutTests/platform/mac/fast/overflow/overflow-auto-table-expected.txt b/LayoutTests/platform/mac/fast/overflow/overflow-auto-table-expected.txt
index 7a2afc9..b39fd68 100644
--- a/LayoutTests/platform/mac/fast/overflow/overflow-auto-table-expected.txt
+++ b/LayoutTests/platform/mac/fast/overflow/overflow-auto-table-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 7618x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 7618x160
+layer at (0,0) size 800x160
RenderBlock {HTML} at (0,0) size 800x160
RenderBody {BODY} at (8,16) size 784x136
RenderBlock {P} at (0,0) size 784x54
diff --git a/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.checksum b/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.checksum
new file mode 100644
index 0000000..050df8a
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.checksum
@@ -0,0 +1 @@
+9a224a48fdc0a78f2bdd400fb5c17781
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.png b/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.png
new file mode 100644
index 0000000..7b15d29
Binary files /dev/null and b/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.txt b/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.txt
new file mode 100644
index 0000000..f28fcd2
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.txt
@@ -0,0 +1,63 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 313x600
+ RenderBlock {HTML} at (0,0) size 313x600
+ RenderBody {BODY} at (8,8) size 297x584
+ RenderBlock {P} at (0,16) size 36x552
+ RenderText {#text} at (0,0) size 18x135
+ text run at (0,0) width 135: "This is a test case for "
+ RenderInline {I} at (0,0) size 36x529
+ RenderText {#text} at (0,135) size 36x529
+ text run at (0,135) width 394: "http://bugzilla.opendarwin.org/show_bug.cgi?id=5826 Blocks"
+ text run at (18,0) width 445: "with direction:rtl and overflow:auto or scroll have incorrect scrollbars"
+ RenderText {#text} at (18,445) size 18x4
+ text run at (18,445) width 4: "."
+ RenderBlock (anonymous) at (36,0) size 18x584
+ RenderText {#text} at (0,0) size 18x457
+ text run at (0,0) width 457: "The right column should be a mirror-image of the left column in terms of"
+ RenderBlock {UL} at (70,0) size 54x584
+ RenderListItem {LI} at (0,40) size 18x544
+ RenderListMarker at (0,-17) size 18x7: bullet
+ RenderText {#text} at (0,0) size 18x164
+ text run at (0,0) width 164: "the presence of a scrollbar"
+ RenderListItem {LI} at (18,40) size 18x544
+ RenderListMarker at (0,-17) size 18x7: bullet
+ RenderText {#text} at (0,0) size 18x234
+ text run at (0,0) width 234: "the initial position of the scroll thumb"
+ RenderListItem {LI} at (36,40) size 18x544
+ RenderListMarker at (0,-17) size 18x7: bullet
+ RenderText {#text} at (0,0) size 18x331
+ text run at (0,0) width 331: "which letters are visible initially and when you scroll"
+ RenderTable {TABLE} at (140,0) size 157x256
+ RenderTableSection {TBODY} at (0,0) size 157x256
+ RenderTableRow {TR} at (0,2) size 153x256
+ RenderTableCell {TD} at (2,2) size 153x125 [r=0 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (2,129) size 153x125 [r=0 c=1 rs=1 cs=1]
+layer at (155,15) size 45x115 clip at (155,25) size 30x100 scrollHeight 188
+ RenderBlock {DIV} at (5,5) size 45x115 [bgcolor=#FFFF00] [border: (10px solid #FF0000) none (5px solid #008000) none]
+ RenderText {#text} at (0,10) size 18x188
+ text run at (0,10) width 188: "abcdefghijklmnopqrstuvwxyz"
+layer at (204,15) size 45x115 clip at (204,25) size 45x100
+ RenderBlock {DIV} at (54,5) size 45x115 [bgcolor=#FFFF00] [border: (10px solid #FF0000) none (5px solid #008000) none]
+ RenderBlock {DIV} at (0,10) size 18x100 [bgcolor=#D3D3D3]
+ RenderText {#text} at (0,-88) size 18x188
+ text run at (0,-88) width 188: "abcdefghijklmnopqrstuvwxyz"
+layer at (253,15) size 45x115 clip at (253,25) size 30x100 scrollHeight 188
+ RenderBlock {DIV} at (103,5) size 45x115 [bgcolor=#FFFF00] [border: (10px solid #FF0000) none (5px solid #008000) none]
+ RenderBlock {DIV} at (0,10) size 18x100 [bgcolor=#D3D3D3]
+ RenderText {#text} at (0,0) size 18x188
+ text run at (0,0) width 188: "abcdefghijklmnopqrstuvwxyz"
+layer at (155,142) size 45x115 clip at (155,147) size 30x100 scrollY 88 scrollHeight 188
+ RenderBlock {DIV} at (5,5) size 45x115 [bgcolor=#FFFF00] [border: (5px solid #008000) none (10px solid #FF0000) none]
+ RenderText {#text} at (0,-83) size 18x188
+ text run at (0,-83) width 188: "zyxwvutsrqponmlkjihgfedcba"
+layer at (204,142) size 45x115 clip at (204,147) size 45x100
+ RenderBlock {DIV} at (54,5) size 45x115 [bgcolor=#FFFF00] [border: (5px solid #008000) none (10px solid #FF0000) none]
+ RenderBlock {DIV} at (0,5) size 18x100 [bgcolor=#D3D3D3]
+ RenderText {#text} at (0,0) size 18x188
+ text run at (0,0) width 188: "zyxwvutsrqponmlkjihgfedcba"
+layer at (253,142) size 45x115 clip at (253,147) size 30x100 scrollY 88 scrollHeight 188
+ RenderBlock {DIV} at (103,5) size 45x115 [bgcolor=#FFFF00] [border: (5px solid #008000) none (10px solid #FF0000) none]
+ RenderBlock {DIV} at (0,5) size 18x100 [bgcolor=#D3D3D3]
+ RenderText {#text} at (0,-88) size 18x188
+ text run at (0,-88) width 188: "zyxwvutsrqponmlkjihgfedcba"
diff --git a/LayoutTests/platform/mac/fast/overflow/scrollRevealButton-expected.txt b/LayoutTests/platform/mac/fast/overflow/scrollRevealButton-expected.txt
index 9a9c3f4..0f1dcce 100644
--- a/LayoutTests/platform/mac/fast/overflow/scrollRevealButton-expected.txt
+++ b/LayoutTests/platform/mac/fast/overflow/scrollRevealButton-expected.txt
@@ -12,7 +12,7 @@ layer at (0,0) size 785x1188
RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
layer at (0,0) size 308x316
RenderView at (0,0) size 285x135
- layer at (0,0) size 308x316
+ layer at (0,0) size 285x316
RenderBlock {HTML} at (0,0) size 285x316
RenderBody {BODY} at (8,8) size 269x300
layer at (8,8) size 300x300 clip at (8,8) size 285x300 scrollY 543 scrollHeight 1268
diff --git a/LayoutTests/platform/mac/fast/reflections/reflection-direction-expected.txt b/LayoutTests/platform/mac/fast/reflections/reflection-direction-expected.txt
index 0b9a04f..edaf545 100644
--- a/LayoutTests/platform/mac/fast/reflections/reflection-direction-expected.txt
+++ b/LayoutTests/platform/mac/fast/reflections/reflection-direction-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1357x613
RenderView at (0,0) size 785x585
-layer at (0,0) size 1357x613
+layer at (0,0) size 785x613
RenderBlock {HTML} at (0,0) size 785x613
RenderBody {BODY} at (8,8) size 769x597
RenderBlock {DIV} at (0,1) size 671x592
diff --git a/LayoutTests/platform/mac/fast/repaint/box-shadow-h-expected.checksum b/LayoutTests/platform/mac/fast/repaint/box-shadow-h-expected.checksum
index a055ebc..bf3160c 100644
--- a/LayoutTests/platform/mac/fast/repaint/box-shadow-h-expected.checksum
+++ b/LayoutTests/platform/mac/fast/repaint/box-shadow-h-expected.checksum
@@ -1 +1 @@
-4216aa4b49e75c66b0acf55db608502c
\ No newline at end of file
+76c6e041c849e3a746babf586b924f8e
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/repaint/box-shadow-h-expected.png b/LayoutTests/platform/mac/fast/repaint/box-shadow-h-expected.png
index f141452..fdab1c1 100644
Binary files a/LayoutTests/platform/mac/fast/repaint/box-shadow-h-expected.png and b/LayoutTests/platform/mac/fast/repaint/box-shadow-h-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/repaint/box-shadow-h-expected.txt b/LayoutTests/platform/mac/fast/repaint/box-shadow-h-expected.txt
index f5346ba..8410985 100644
--- a/LayoutTests/platform/mac/fast/repaint/box-shadow-h-expected.txt
+++ b/LayoutTests/platform/mac/fast/repaint/box-shadow-h-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x514
+layer at (0,0) size 800x8
RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0
RenderBlock (floating) {DIV} at (0,0) size 121x506
diff --git a/LayoutTests/platform/mac/fast/repaint/box-shadow-v-expected.txt b/LayoutTests/platform/mac/fast/repaint/box-shadow-v-expected.txt
index f5346ba..8410985 100644
--- a/LayoutTests/platform/mac/fast/repaint/box-shadow-v-expected.txt
+++ b/LayoutTests/platform/mac/fast/repaint/box-shadow-v-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x514
+layer at (0,0) size 800x8
RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0
RenderBlock (floating) {DIV} at (0,0) size 121x506
diff --git a/LayoutTests/platform/mac/fast/repaint/content-into-overflow-expected.txt b/LayoutTests/platform/mac/fast/repaint/content-into-overflow-expected.txt
index c69459c..427859d 100644
--- a/LayoutTests/platform/mac/fast/repaint/content-into-overflow-expected.txt
+++ b/LayoutTests/platform/mac/fast/repaint/content-into-overflow-expected.txt
@@ -15,6 +15,6 @@ layer at (8,308) size 100x100
RenderBlock (positioned) {DIV} at (8,308) size 100x100
RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
RenderBlock {DIV} at (0,80) size 100x20
-layer at (8,308) size 100x80
+layer at (8,308) size 100x0
RenderBlock (relative positioned) {DIV} at (0,0) size 100x0
RenderBlock (floating) {DIV} at (0,0) size 100x80
diff --git a/LayoutTests/platform/mac/fast/repaint/dynamic-table-vertical-alignment-change-expected.txt b/LayoutTests/platform/mac/fast/repaint/dynamic-table-vertical-alignment-change-expected.txt
index f622511..fd92775 100644
--- a/LayoutTests/platform/mac/fast/repaint/dynamic-table-vertical-alignment-change-expected.txt
+++ b/LayoutTests/platform/mac/fast/repaint/dynamic-table-vertical-alignment-change-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x182
+layer at (0,0) size 800x182
RenderBlock {HTML} at (0,0) size 800x182
RenderBody {BODY} at (8,16) size 784x158
RenderBlock {P} at (0,0) size 784x36
diff --git a/LayoutTests/platform/mac/fast/repaint/float-overflow-expected.txt b/LayoutTests/platform/mac/fast/repaint/float-overflow-expected.txt
index 3741815..15adb9b 100644
--- a/LayoutTests/platform/mac/fast/repaint/float-overflow-expected.txt
+++ b/LayoutTests/platform/mac/fast/repaint/float-overflow-expected.txt
@@ -120,20 +120,20 @@ layer at (0,0) size 800x588
text run at (0,1) width 16: "x"
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (59,426) size 40x18
+layer at (59,426) size 40x10
RenderBlock (floating) {DIV} at (-8,0) size 40x10 [bgcolor=#ADD8E6]
RenderInline {SPAN} at (0,0) size 16x16 [color=#0000FF]
RenderText {#text} at (0,1) size 16x16
text run at (0,1) width 16: "x"
RenderText {#text} at (0,0) size 0x0
-layer at (67,465) size 50x18
+layer at (67,465) size 50x10
RenderBlock {DIV} at (6,6) size 50x10 [bgcolor=#FFC0CB]
RenderBlock (floating) {DIV} at (-8,0) size 40x10 [bgcolor=#ADD8E6]
RenderInline {SPAN} at (0,0) size 16x16 [color=#0000FF]
RenderText {#text} at (0,1) size 16x16
text run at (0,1) width 16: "x"
RenderText {#text} at (0,0) size 0x0
-layer at (61,498) size 62x24
+layer at (61,498) size 62x22
RenderBlock {DIV} at (51,7) size 62x22 [border: (1px solid #800080)]
RenderBlock {DIV} at (6,6) size 50x10 [bgcolor=#FFC0CB]
RenderBlock (floating) {DIV} at (-8,0) size 40x10 [bgcolor=#ADD8E6]
diff --git a/LayoutTests/platform/mac/fast/repaint/float-overflow-right-expected.txt b/LayoutTests/platform/mac/fast/repaint/float-overflow-right-expected.txt
index 4ef09a6..1b971ab 100644
--- a/LayoutTests/platform/mac/fast/repaint/float-overflow-right-expected.txt
+++ b/LayoutTests/platform/mac/fast/repaint/float-overflow-right-expected.txt
@@ -120,20 +120,20 @@ layer at (0,0) size 800x588
text run at (24,1) width 16: "x"
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (701,426) size 40x18
+layer at (701,426) size 40x10
RenderBlock (floating) {DIV} at (18,0) size 40x10 [bgcolor=#ADD8E6]
RenderInline {SPAN} at (0,0) size 16x16 [color=#0000FF]
RenderText {#text} at (24,1) size 16x16
text run at (24,1) width 16: "x"
RenderText {#text} at (0,0) size 0x0
-layer at (683,465) size 58x18
+layer at (683,465) size 50x10
RenderBlock {DIV} at (6,6) size 50x10 [bgcolor=#FFC0CB]
RenderBlock (floating) {DIV} at (18,0) size 40x10 [bgcolor=#ADD8E6]
RenderInline {SPAN} at (0,0) size 16x16 [color=#0000FF]
RenderText {#text} at (24,1) size 16x16
text run at (24,1) width 16: "x"
RenderText {#text} at (0,0) size 0x0
-layer at (677,498) size 64x24
+layer at (677,498) size 62x22
RenderBlock {DIV} at (667,7) size 62x22 [border: (1px solid #800080)]
RenderBlock {DIV} at (6,6) size 50x10 [bgcolor=#FFC0CB]
RenderBlock (floating) {DIV} at (18,0) size 40x10 [bgcolor=#ADD8E6]
diff --git a/LayoutTests/platform/mac/fast/repaint/overflow-into-content-expected.txt b/LayoutTests/platform/mac/fast/repaint/overflow-into-content-expected.txt
index f92080c..c5e5fae 100644
--- a/LayoutTests/platform/mac/fast/repaint/overflow-into-content-expected.txt
+++ b/LayoutTests/platform/mac/fast/repaint/overflow-into-content-expected.txt
@@ -3,17 +3,17 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x8
RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0
-layer at (8,8) size 103x106
+layer at (8,8) size 56x106
RenderBlock (positioned) {DIV} at (8,8) size 56x106 [border: (3px solid #008000)]
RenderBlock {DIV} at (3,3) size 50x50
RenderBlock {DIV} at (0,0) size 100x50
-layer at (8,158) size 106x103
+layer at (8,158) size 106x56
RenderBlock (positioned) {DIV} at (8,158) size 106x56 [border: (3px solid #008000)]
RenderBlock {DIV} at (3,3) size 50x50
RenderBlock {DIV} at (0,0) size 50x100
layer at (8,308) size 100x80
RenderBlock (positioned) {DIV} at (8,308) size 100x80
RenderBlock {DIV} at (0,0) size 100x0 [bgcolor=#008000]
-layer at (8,308) size 100x80
+layer at (8,308) size 100x0
RenderBlock (relative positioned) {DIV} at (0,0) size 100x0
RenderBlock (floating) {DIV} at (0,0) size 100x80
diff --git a/LayoutTests/platform/mac/fast/repaint/overflow-scroll-body-appear-expected.txt b/LayoutTests/platform/mac/fast/repaint/overflow-scroll-body-appear-expected.txt
index e1d42c3..ac25b0e 100644
--- a/LayoutTests/platform/mac/fast/repaint/overflow-scroll-body-appear-expected.txt
+++ b/LayoutTests/platform/mac/fast/repaint/overflow-scroll-body-appear-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 2008x2092
RenderView at (0,0) size 785x585
-layer at (0,0) size 2008x2092
+layer at (0,0) size 785x2092
RenderBlock {HTML} at (0,0) size 785x2092
RenderBody {BODY} at (8,16) size 769x2068
RenderBlock {P} at (0,0) size 769x18
diff --git a/LayoutTests/platform/mac/fast/repaint/subtree-root-clip-expected.txt b/LayoutTests/platform/mac/fast/repaint/subtree-root-clip-expected.txt
index 9cd1583..6e08a82 100644
--- a/LayoutTests/platform/mac/fast/repaint/subtree-root-clip-expected.txt
+++ b/LayoutTests/platform/mac/fast/repaint/subtree-root-clip-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x108
+layer at (0,0) size 800x8
RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0
layer at (8,8) size 100x100
diff --git a/LayoutTests/platform/mac/fast/repaint/transform-absolute-in-positioned-container-expected.txt b/LayoutTests/platform/mac/fast/repaint/transform-absolute-in-positioned-container-expected.txt
index 14a64f2..c1d32ed 100644
--- a/LayoutTests/platform/mac/fast/repaint/transform-absolute-in-positioned-container-expected.txt
+++ b/LayoutTests/platform/mac/fast/repaint/transform-absolute-in-positioned-container-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x308
+layer at (0,0) size 800x296
RenderBlock {HTML} at (0,0) size 800x296
RenderBody {BODY} at (8,16) size 784x272
RenderBlock {P} at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/fast/repaint/transform-replaced-shadows-expected.checksum b/LayoutTests/platform/mac/fast/repaint/transform-replaced-shadows-expected.checksum
index b238734..ea058e0 100644
--- a/LayoutTests/platform/mac/fast/repaint/transform-replaced-shadows-expected.checksum
+++ b/LayoutTests/platform/mac/fast/repaint/transform-replaced-shadows-expected.checksum
@@ -1 +1 @@
-555899c95dc93e1f9e43fd384e0c7c4d
\ No newline at end of file
+2a37b65c230bcb71bb1ecfb4c884942d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/repaint/transform-replaced-shadows-expected.png b/LayoutTests/platform/mac/fast/repaint/transform-replaced-shadows-expected.png
index 321ce8a..8ed6ad7 100644
Binary files a/LayoutTests/platform/mac/fast/repaint/transform-replaced-shadows-expected.png and b/LayoutTests/platform/mac/fast/repaint/transform-replaced-shadows-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/replaced/004-expected.txt b/LayoutTests/platform/mac/fast/replaced/004-expected.txt
index be96aa9..165c7d8 100644
--- a/LayoutTests/platform/mac/fast/replaced/004-expected.txt
+++ b/LayoutTests/platform/mac/fast/replaced/004-expected.txt
@@ -11,7 +11,7 @@ layer at (0,0) size 800x282
RenderBlock {P} at (0,0) size 600x100
RenderImage {IMG} at (0,0) size 300x100
RenderText {#text} at (0,0) size 0x0
-layer at (8,166) size 600x100
+layer at (8,166) size 300x100
RenderBlock (relative positioned) {DIV} at (0,150) size 300x100
RenderBlock {P} at (0,0) size 600x100
RenderImage {IMG} at (0,0) size 300x100
diff --git a/LayoutTests/platform/mac/fast/table/034-expected.txt b/LayoutTests/platform/mac/fast/table/034-expected.txt
index be8f777..6e45053 100644
--- a/LayoutTests/platform/mac/fast/table/034-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/034-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1064x1276
RenderView at (0,0) size 785x585
-layer at (0,0) size 1064x1276
+layer at (0,0) size 785x1276
RenderBlock {HTML} at (0,0) size 785x1276
RenderBody {BODY} at (8,8) size 769x1260
RenderTable {TABLE} at (0,0) size 1056x1260
diff --git a/LayoutTests/platform/mac/fast/table/border-collapsing/004-vertical-expected.txt b/LayoutTests/platform/mac/fast/table/border-collapsing/004-vertical-expected.txt
index 4e6c024..6f36d81 100644
--- a/LayoutTests/platform/mac/fast/table/border-collapsing/004-vertical-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/border-collapsing/004-vertical-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1444x914
RenderView at (0,0) size 785x585
-layer at (0,0) size 1444x914
+layer at (0,0) size 785x914
RenderBlock {HTML} at (0,0) size 785x914
RenderBody {BODY} at (8,21) size 769x885
RenderBlock {H1} at (0,0) size 769x37
diff --git a/LayoutTests/platform/mac/fast/table/colspanMinWidth-vertical-expected.txt b/LayoutTests/platform/mac/fast/table/colspanMinWidth-vertical-expected.txt
index 5a0b269..ec90478 100644
--- a/LayoutTests/platform/mac/fast/table/colspanMinWidth-vertical-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/colspanMinWidth-vertical-expected.txt
@@ -20,5 +20,5 @@ layer at (0,0) size 800x600
RenderTableCell {TD} at (2,6) size 14x131 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1]
RenderTextControl {INPUT} at (3,3) size 8x125 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (0,0) size 0x0
-layer at (3,23) size 2x119
+layer at (3,23) size 2x119 scrollX 13 scrollWidth 15
RenderBlock {DIV} at (3,3) size 2x119
diff --git a/LayoutTests/platform/mac/fast/table/fixed-with-auto-with-colspan-expected.txt b/LayoutTests/platform/mac/fast/table/fixed-with-auto-with-colspan-expected.txt
index 6a11905..41857f8 100644
--- a/LayoutTests/platform/mac/fast/table/fixed-with-auto-with-colspan-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/fixed-with-auto-with-colspan-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
-layer at (0,0) size 445x385
+layer at (0,0) size 400x385
RenderBlock (positioned) {DIV} at (0,0) size 400x385
RenderTable {TABLE} at (0,5) size 445x50
RenderTableSection {TBODY} at (0,0) size 445x50
@@ -82,7 +82,7 @@ layer at (0,0) size 445x385
RenderTableCell {TD} at (280,24) size 50x2 [bgcolor=#FF0000] [r=0 c=5 rs=1 cs=1]
RenderTableCell {TD} at (335,24) size 50x2 [bgcolor=#FF0000] [r=0 c=6 rs=1 cs=1]
RenderTableCell {TD} at (390,24) size 50x2 [bgcolor=#FF0000] [r=0 c=7 rs=1 cs=1]
-layer at (0,0) size 445x385
+layer at (0,0) size 430x385
RenderBlock (positioned) {DIV} at (0,0) size 430x385
RenderTable {TABLE} at (0,5) size 445x50
RenderTableSection {TBODY} at (0,0) size 445x50
diff --git a/LayoutTests/platform/mac/fast/table/fixed-with-auto-with-colspan-vertical-expected.txt b/LayoutTests/platform/mac/fast/table/fixed-with-auto-with-colspan-vertical-expected.txt
index 7dec398..acca3de 100644
--- a/LayoutTests/platform/mac/fast/table/fixed-with-auto-with-colspan-vertical-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/fixed-with-auto-with-colspan-vertical-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
-layer at (0,0) size 385x445
+layer at (0,0) size 385x0
RenderBlock (positioned) {DIV} at (0,0) size 385x0
RenderTable {TABLE} at (5,0) size 50x445
RenderTableSection {TBODY} at (0,0) size 50x445
@@ -82,7 +82,7 @@ layer at (0,0) size 385x445
RenderTableCell {TD} at (0,304) size 50x2 [bgcolor=#FF0000] [r=0 c=5 rs=1 cs=1]
RenderTableCell {TD} at (0,359) size 50x2 [bgcolor=#FF0000] [r=0 c=6 rs=1 cs=1]
RenderTableCell {TD} at (0,414) size 50x2 [bgcolor=#FF0000] [r=0 c=7 rs=1 cs=1]
-layer at (0,0) size 385x445
+layer at (0,0) size 385x0
RenderBlock (positioned) {DIV} at (0,0) size 385x0
RenderTable {TABLE} at (5,0) size 50x445
RenderTableSection {TBODY} at (0,0) size 50x445
diff --git a/LayoutTests/platform/mac/fast/table/frame-and-rules-expected.txt b/LayoutTests/platform/mac/fast/table/frame-and-rules-expected.txt
index 49f1b8d..ba2b857 100644
--- a/LayoutTests/platform/mac/fast/table/frame-and-rules-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/frame-and-rules-expected.txt
@@ -2208,7 +2208,7 @@ layer at (0,0) size 785x7608
RenderTableCell {TD} at (184,0) size 92x21 [border: (1px solid #808080)] [r=0 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 89x18
text run at (2,2) width 89: "Row 5, Cell 3"
-layer at (393,24) size 392x155
+layer at (393,24) size 392x150
RenderBlock (positioned) {TABLE} at (393,24) size 392x150
RenderTable at (0,0) size 361x155
RenderBlock {CAPTION} at (0,0) size 361x18
diff --git a/LayoutTests/platform/mac/fast/table/height-percent-test-vertical-expected.txt b/LayoutTests/platform/mac/fast/table/height-percent-test-vertical-expected.txt
index 09b8ba1..8db574b 100644
--- a/LayoutTests/platform/mac/fast/table/height-percent-test-vertical-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/height-percent-test-vertical-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1282x601
RenderView at (0,0) size 785x585
-layer at (0,0) size 1282x601
+layer at (0,0) size 785x601
RenderBlock {HTML} at (0,0) size 785x601
RenderBody {BODY} at (8,8) size 769x585
RenderBlock {DIV} at (0,0) size 1274x585
diff --git a/LayoutTests/platform/mac/fast/table/wide-colspan-expected.txt b/LayoutTests/platform/mac/fast/table/wide-colspan-expected.txt
index 143c37b..473fecc 100644
--- a/LayoutTests/platform/mac/fast/table/wide-colspan-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/wide-colspan-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1614x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1614x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderTable {TABLE} at (0,0) size 1606x110
diff --git a/LayoutTests/platform/mac/fast/table/wide-column-expected.txt b/LayoutTests/platform/mac/fast/table/wide-column-expected.txt
index 56dde9a..64f9178 100644
--- a/LayoutTests/platform/mac/fast/table/wide-column-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/wide-column-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1614x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1614x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderTable {TABLE} at (0,0) size 1606x56
diff --git a/LayoutTests/platform/mac/fast/text/international/thai-line-breaks-expected.txt b/LayoutTests/platform/mac/fast/text/international/thai-line-breaks-expected.txt
index a7336cc..03519a2 100644
--- a/LayoutTests/platform/mac/fast/text/international/thai-line-breaks-expected.txt
+++ b/LayoutTests/platform/mac/fast/text/international/thai-line-breaks-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 785x600
text run at (0,18) width 760: "The original source of this text was ICU, and the test program said \"by it's very nature, Thai word breaking is not exact\","
text run at (0,36) width 759: "so the columns don't match exactly. In a future version we might decide to tweak the right column to match our expected"
text run at (0,54) width 59: "behavior."
-layer at (235,96) size 83x22824
+layer at (235,96) size 1x22824
RenderBlock (positioned) {DIV} at (235,96) size 1x22824
RenderText {#text} at (0,0) size 83x22824
text run at (0,0) width 20: "\x{E1A}\x{E17}"
@@ -1280,7 +1280,7 @@ layer at (235,96) size 83x22824
text run at (0,22770) width 34: "\x{E04}\x{E23}\x{E32}\x{E07}"
text run at (0,22788) width 28: "\x{E2B}\x{E27}\x{E35}\x{E14}"
text run at (0,22806) width 27: "\x{E2B}\x{E27}\x{E37}\x{E2D}"
-layer at (471,96) size 72x24030
+layer at (471,96) size 1x24030
RenderBlock (positioned) {DIV} at (471,96) size 1x24030
RenderText {#text} at (0,0) size 72x24030
text run at (0,0) width 20: "\x{E1A}\x{E17}"
diff --git a/LayoutTests/platform/mac/fast/text/large-text-composed-char-expected.txt b/LayoutTests/platform/mac/fast/text/large-text-composed-char-expected.txt
index 0491783..3dea2de 100644
--- a/LayoutTests/platform/mac/fast/text/large-text-composed-char-expected.txt
+++ b/LayoutTests/platform/mac/fast/text/large-text-composed-char-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1064x7957
RenderView at (0,0) size 785x585
-layer at (0,0) size 1064x7957
+layer at (0,0) size 785x7957
RenderBlock {HTML} at (0,0) size 785x7957
RenderBody {BODY} at (8,8) size 769x7936
RenderBlock (anonymous) at (0,0) size 769x18
diff --git a/LayoutTests/platform/mac/fast/text/letter-spacing-negative-opacity-expected.txt b/LayoutTests/platform/mac/fast/text/letter-spacing-negative-opacity-expected.txt
index b62de36..65b00e7 100644
--- a/LayoutTests/platform/mac/fast/text/letter-spacing-negative-opacity-expected.txt
+++ b/LayoutTests/platform/mac/fast/text/letter-spacing-negative-opacity-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
-layer at (8,8) size 312x163
+layer at (8,8) size 273x163
RenderBlock (positioned) {DIV} at (8,8) size 273x163 [border: (1px solid #FF0000)]
RenderText {#text} at (1,1) size 271x161
text run at (1,1) width 271: "Testing the bug"
diff --git a/LayoutTests/platform/mac/fast/text/text-letter-spacing-expected.txt b/LayoutTests/platform/mac/fast/text/text-letter-spacing-expected.txt
index 87ae8b7..dcb4589 100644
--- a/LayoutTests/platform/mac/fast/text/text-letter-spacing-expected.txt
+++ b/LayoutTests/platform/mac/fast/text/text-letter-spacing-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 163023x1728
RenderView at (0,0) size 785x585
-layer at (0,0) size 163023x1728
+layer at (0,0) size 785x1728
RenderBlock {HTML} at (0,0) size 785x1728
RenderBody {BODY} at (8,16) size 769x1696
RenderBlock {P} at (0,0) size 769x90 [bgcolor=#FFFFFF]
diff --git a/LayoutTests/platform/mac/fast/text/whitespace/012-expected.txt b/LayoutTests/platform/mac/fast/text/whitespace/012-expected.txt
index 634c5a1..30f6d67 100644
--- a/LayoutTests/platform/mac/fast/text/whitespace/012-expected.txt
+++ b/LayoutTests/platform/mac/fast/text/whitespace/012-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x156
+layer at (0,0) size 800x76
RenderBlock {HTML} at (0,0) size 800x76
RenderBody {BODY} at (8,8) size 784x52
RenderBlock (anonymous) at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/mathml/presentation/fenced-expected.txt b/LayoutTests/platform/mac/mathml/presentation/fenced-expected.txt
index 11f7f73..1fce927 100644
--- a/LayoutTests/platform/mac/mathml/presentation/fenced-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/fenced-expected.txt
@@ -60,19 +60,19 @@ layer at (170,72) size 5x7 scrollHeight 14
text run at (0,-3) width 5: "\x{239F}"
layer at (170,79) size 5x11 scrollHeight 14
RenderBlock {mfenced} at (0,47) size 5x11
-layer at (10,33) size 5x14 backgroundClip at (10,32) size 5x10 clip at (10,32) size 5x10 outlineClip at (10,32) size 5x10
+layer at (10,33) size 5x11 backgroundClip at (10,32) size 5x10 clip at (10,32) size 5x10 outlineClip at (10,32) size 5x10
RenderBlock (relative positioned) {mfenced} at (0,0) size 5x11
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239B}"
-layer at (10,76) size 5x14 backgroundClip at (10,79) size 5x11 clip at (10,79) size 5x11 outlineClip at (10,79) size 5x11
+layer at (10,76) size 5x11 backgroundClip at (10,79) size 5x11 clip at (10,79) size 5x11 outlineClip at (10,79) size 5x11
RenderBlock (relative positioned) {mfenced} at (0,0) size 5x11
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239D}"
-layer at (170,33) size 5x14 backgroundClip at (170,32) size 5x10 clip at (170,32) size 5x10 outlineClip at (170,32) size 5x10
+layer at (170,33) size 5x11 backgroundClip at (170,32) size 5x10 clip at (170,32) size 5x10 outlineClip at (170,32) size 5x10
RenderBlock (relative positioned) {mfenced} at (0,0) size 5x11
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239E}"
-layer at (170,76) size 5x14 backgroundClip at (170,79) size 5x11 clip at (170,79) size 5x11 outlineClip at (170,79) size 5x11
+layer at (170,76) size 5x11 backgroundClip at (170,79) size 5x11 clip at (170,79) size 5x11 outlineClip at (170,79) size 5x11
RenderBlock (relative positioned) {mfenced} at (0,0) size 5x11
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A0}"
diff --git a/LayoutTests/platform/mac/mathml/presentation/mo-expected.txt b/LayoutTests/platform/mac/mathml/presentation/mo-expected.txt
index 46a26bb..08eb160 100644
--- a/LayoutTests/platform/mac/mathml/presentation/mo-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/mo-expected.txt
@@ -271,59 +271,59 @@ layer at (165,215) size 7x6 scrollHeight 14
text run at (0,-3) width 7: "\x{23AA}"
layer at (165,221) size 7x11 scrollHeight 14
RenderBlock {mo} at (0,52) size 7x11
-layer at (69,170) size 8x14 backgroundClip at (69,169) size 8x10 clip at (69,169) size 8x10 outlineClip at (69,169) size 8x10
+layer at (69,170) size 8x11 backgroundClip at (69,169) size 8x10 clip at (69,169) size 8x10 outlineClip at (69,169) size 8x10
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (69,218) size 8x14 backgroundClip at (69,221) size 8x11 clip at (69,221) size 8x11 outlineClip at (69,221) size 8x11
+layer at (69,218) size 8x11 backgroundClip at (69,221) size 8x11 clip at (69,221) size 8x11 outlineClip at (69,221) size 8x11
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (78,170) size 10x14 backgroundClip at (78,169) size 10x10 clip at (78,169) size 10x10 outlineClip at (78,169) size 10x10
+layer at (78,170) size 10x11 backgroundClip at (78,169) size 10x10 clip at (78,169) size 10x10 outlineClip at (78,169) size 10x10
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2320}"
-layer at (78,218) size 10x14 backgroundClip at (78,221) size 10x11 clip at (78,221) size 10x11 outlineClip at (78,221) size 10x11
+layer at (78,218) size 10x11 backgroundClip at (78,221) size 10x11 clip at (78,221) size 10x11 outlineClip at (78,221) size 10x11
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2321}"
-layer at (89,170) size 7x14 backgroundClip at (89,169) size 7x10 clip at (89,169) size 7x10 outlineClip at (89,169) size 7x10
+layer at (89,170) size 7x11 backgroundClip at (89,169) size 7x10 clip at (89,169) size 7x10 outlineClip at (89,169) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A7}"
-layer at (89,194) size 7x14 backgroundClip at (89,195) size 7x10 clip at (89,195) size 7x10 outlineClip at (89,195) size 7x10
+layer at (89,194) size 7x11 backgroundClip at (89,195) size 7x10 clip at (89,195) size 7x10 outlineClip at (89,195) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A8}"
-layer at (89,218) size 7x14 backgroundClip at (89,221) size 7x11 clip at (89,221) size 7x11 outlineClip at (89,221) size 7x11
+layer at (89,218) size 7x11 backgroundClip at (89,221) size 7x11 clip at (89,221) size 7x11 outlineClip at (89,221) size 7x11
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A9}"
-layer at (97,170) size 5x14 backgroundClip at (97,169) size 5x10 clip at (97,169) size 5x10 outlineClip at (97,169) size 5x10
+layer at (97,170) size 5x11 backgroundClip at (97,169) size 5x10 clip at (97,169) size 5x10 outlineClip at (97,169) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A1}"
-layer at (97,218) size 5x14 backgroundClip at (97,221) size 5x11 clip at (97,221) size 5x11 outlineClip at (97,221) size 5x11
+layer at (97,218) size 5x11 backgroundClip at (97,221) size 5x11 clip at (97,221) size 5x11 outlineClip at (97,221) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A3}"
-layer at (159,170) size 5x14 backgroundClip at (159,169) size 5x10 clip at (159,169) size 5x10 outlineClip at (159,169) size 5x10
+layer at (159,170) size 5x11 backgroundClip at (159,169) size 5x10 clip at (159,169) size 5x10 outlineClip at (159,169) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A4}"
-layer at (159,218) size 5x14 backgroundClip at (159,221) size 5x11 clip at (159,221) size 5x11 outlineClip at (159,221) size 5x11
+layer at (159,218) size 5x11 backgroundClip at (159,221) size 5x11 clip at (159,221) size 5x11 outlineClip at (159,221) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A6}"
-layer at (165,170) size 7x14 backgroundClip at (165,169) size 7x10 clip at (165,169) size 7x10 outlineClip at (165,169) size 7x10
+layer at (165,170) size 7x11 backgroundClip at (165,169) size 7x10 clip at (165,169) size 7x10 outlineClip at (165,169) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AB}"
-layer at (165,194) size 7x14 backgroundClip at (165,195) size 7x10 clip at (165,195) size 7x10 outlineClip at (165,195) size 7x10
+layer at (165,194) size 7x11 backgroundClip at (165,195) size 7x10 clip at (165,195) size 7x10 outlineClip at (165,195) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AC}"
-layer at (165,218) size 7x14 backgroundClip at (165,221) size 7x11 clip at (165,221) size 7x11 outlineClip at (165,221) size 7x11
+layer at (165,218) size 7x11 backgroundClip at (165,221) size 7x11 clip at (165,221) size 7x11 outlineClip at (165,221) size 7x11
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AD}"
diff --git a/LayoutTests/platform/mac/mathml/presentation/over-expected.txt b/LayoutTests/platform/mac/mathml/presentation/over-expected.txt
index aaa1f0c..de74e3a 100644
--- a/LayoutTests/platform/mac/mathml/presentation/over-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/over-expected.txt
@@ -89,11 +89,11 @@ layer at (45,258) size 10x8 scrollHeight 14
text run at (0,-3) width 10: "\x{23AE}"
layer at (45,266) size 10x11 scrollHeight 14
RenderBlock {mo} at (0,38) size 10x11
-layer at (45,229) size 10x14 backgroundClip at (45,228) size 10x10 clip at (45,228) size 10x10 outlineClip at (45,228) size 10x10
+layer at (45,229) size 10x11 backgroundClip at (45,228) size 10x10 clip at (45,228) size 10x10 outlineClip at (45,228) size 10x10
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2320}"
-layer at (45,263) size 10x14 backgroundClip at (45,266) size 10x11 clip at (45,266) size 10x11 outlineClip at (45,266) size 10x11
+layer at (45,263) size 10x11 backgroundClip at (45,266) size 10x11 clip at (45,266) size 10x11 outlineClip at (45,266) size 10x11
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2321}"
diff --git a/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt b/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt
index 96d6f1c..38fba52 100644
--- a/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt
@@ -414,51 +414,51 @@ layer at (120,509) size 5x8 scrollHeight 14
text run at (0,-3) width 5: "\x{23A5}"
layer at (120,517) size 5x11 scrollHeight 14
RenderBlock {mo} at (0,58) size 5x11
-layer at (36,302) size 5x14 backgroundClip at (36,301) size 5x10 clip at (36,301) size 5x10 outlineClip at (36,301) size 5x10
+layer at (36,302) size 5x11 backgroundClip at (36,301) size 5x10 clip at (36,301) size 5x10 outlineClip at (36,301) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239B}"
-layer at (36,328) size 5x14 backgroundClip at (36,331) size 5x11 clip at (36,331) size 5x11 outlineClip at (36,331) size 5x11
+layer at (36,328) size 5x11 backgroundClip at (36,331) size 5x11 clip at (36,331) size 5x11 outlineClip at (36,331) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239D}"
-layer at (90,302) size 5x14 backgroundClip at (90,301) size 5x10 clip at (90,301) size 5x10 outlineClip at (90,301) size 5x10
+layer at (90,302) size 5x11 backgroundClip at (90,301) size 5x10 clip at (90,301) size 5x10 outlineClip at (90,301) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239E}"
-layer at (90,328) size 5x14 backgroundClip at (90,331) size 5x11 clip at (90,331) size 5x11 outlineClip at (90,331) size 5x11
+layer at (90,328) size 5x11 backgroundClip at (90,331) size 5x11 clip at (90,331) size 5x11 outlineClip at (90,331) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A0}"
-layer at (43,359) size 5x14 backgroundClip at (43,358) size 5x10 clip at (43,358) size 5x10 outlineClip at (43,358) size 5x10
+layer at (43,359) size 5x11 backgroundClip at (43,358) size 5x10 clip at (43,358) size 5x10 outlineClip at (43,358) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239B}"
-layer at (43,429) size 5x14 backgroundClip at (43,432) size 5x11 clip at (43,432) size 5x11 outlineClip at (43,432) size 5x11
+layer at (43,429) size 5x11 backgroundClip at (43,432) size 5x11 clip at (43,432) size 5x11 outlineClip at (43,432) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239D}"
-layer at (116,359) size 5x14 backgroundClip at (116,358) size 5x10 clip at (116,358) size 5x10 outlineClip at (116,358) size 5x10
+layer at (116,359) size 5x11 backgroundClip at (116,358) size 5x10 clip at (116,358) size 5x10 outlineClip at (116,358) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239E}"
-layer at (116,429) size 5x14 backgroundClip at (116,432) size 5x11 clip at (116,432) size 5x11 outlineClip at (116,432) size 5x11
+layer at (116,429) size 5x11 backgroundClip at (116,432) size 5x11 clip at (116,432) size 5x11 outlineClip at (116,432) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A0}"
-layer at (36,460) size 5x14 backgroundClip at (36,459) size 5x10 clip at (36,459) size 5x10 outlineClip at (36,459) size 5x10
+layer at (36,460) size 5x11 backgroundClip at (36,459) size 5x10 clip at (36,459) size 5x10 outlineClip at (36,459) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A1}"
-layer at (36,514) size 5x14 backgroundClip at (36,517) size 5x11 clip at (36,517) size 5x11 outlineClip at (36,517) size 5x11
+layer at (36,514) size 5x11 backgroundClip at (36,517) size 5x11 clip at (36,517) size 5x11 outlineClip at (36,517) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A3}"
-layer at (120,460) size 5x14 backgroundClip at (120,459) size 5x10 clip at (120,459) size 5x10 outlineClip at (120,459) size 5x10
+layer at (120,460) size 5x11 backgroundClip at (120,459) size 5x10 clip at (120,459) size 5x10 outlineClip at (120,459) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A4}"
-layer at (120,514) size 5x14 backgroundClip at (120,517) size 5x11 clip at (120,517) size 5x11 outlineClip at (120,517) size 5x11
+layer at (120,514) size 5x11 backgroundClip at (120,517) size 5x11 clip at (120,517) size 5x11 outlineClip at (120,517) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A6}"
diff --git a/LayoutTests/platform/mac/mathml/presentation/row-expected.txt b/LayoutTests/platform/mac/mathml/presentation/row-expected.txt
index 1743886..bc24e68 100644
--- a/LayoutTests/platform/mac/mathml/presentation/row-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/row-expected.txt
@@ -1218,339 +1218,339 @@ layer at (157,579) size 5x8 scrollHeight 14
text run at (0,-3) width 5: "\x{239F}"
layer at (157,587) size 5x11 scrollHeight 14
RenderBlock {mo} at (0,38) size 5x11
-layer at (49,95) size 7x14 backgroundClip at (49,94) size 7x9 clip at (49,94) size 7x9 outlineClip at (49,94) size 7x9
+layer at (49,95) size 7x11 backgroundClip at (49,94) size 7x9 clip at (49,94) size 7x9 outlineClip at (49,94) size 7x9
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A7}"
-layer at (49,102) size 7x14 backgroundClip at (49,103) size 7x10 clip at (49,103) size 7x10 outlineClip at (49,103) size 7x10
+layer at (49,102) size 7x11 backgroundClip at (49,103) size 7x10 clip at (49,103) size 7x10 outlineClip at (49,103) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A8}"
-layer at (49,110) size 7x14 backgroundClip at (49,113) size 7x11 clip at (49,113) size 7x11 outlineClip at (49,113) size 7x11
+layer at (49,110) size 7x11 backgroundClip at (49,113) size 7x11 clip at (49,113) size 7x11 outlineClip at (49,113) size 7x11
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A9}"
-layer at (88,95) size 7x14 backgroundClip at (88,94) size 7x9 clip at (88,94) size 7x9 outlineClip at (88,94) size 7x9
+layer at (88,95) size 7x11 backgroundClip at (88,94) size 7x9 clip at (88,94) size 7x9 outlineClip at (88,94) size 7x9
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AB}"
-layer at (88,102) size 7x14 backgroundClip at (88,103) size 7x10 clip at (88,103) size 7x10 outlineClip at (88,103) size 7x10
+layer at (88,102) size 7x11 backgroundClip at (88,103) size 7x10 clip at (88,103) size 7x10 outlineClip at (88,103) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AC}"
-layer at (88,110) size 7x14 backgroundClip at (88,113) size 7x11 clip at (88,113) size 7x11 outlineClip at (88,113) size 7x11
+layer at (88,110) size 7x11 backgroundClip at (88,113) size 7x11 clip at (88,113) size 7x11 outlineClip at (88,113) size 7x11
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AD}"
-layer at (102,95) size 5x14 backgroundClip at (102,94) size 5x10 clip at (102,94) size 5x10 outlineClip at (102,94) size 5x10
+layer at (102,95) size 5x11 backgroundClip at (102,94) size 5x10 clip at (102,94) size 5x10 outlineClip at (102,94) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A1}"
-layer at (102,109) size 5x14 backgroundClip at (102,112) size 5x11 clip at (102,112) size 5x11 outlineClip at (102,112) size 5x11
+layer at (102,109) size 5x11 backgroundClip at (102,112) size 5x11 clip at (102,112) size 5x11 outlineClip at (102,112) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A3}"
-layer at (139,95) size 5x14 backgroundClip at (139,94) size 5x10 clip at (139,94) size 5x10 outlineClip at (139,94) size 5x10
+layer at (139,95) size 5x11 backgroundClip at (139,94) size 5x10 clip at (139,94) size 5x10 outlineClip at (139,94) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A4}"
-layer at (139,109) size 5x14 backgroundClip at (139,112) size 5x11 clip at (139,112) size 5x11 outlineClip at (139,112) size 5x11
+layer at (139,109) size 5x11 backgroundClip at (139,112) size 5x11 clip at (139,112) size 5x11 outlineClip at (139,112) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A6}"
-layer at (151,95) size 5x14 backgroundClip at (151,94) size 5x10 clip at (151,94) size 5x10 outlineClip at (151,94) size 5x10
+layer at (151,95) size 5x11 backgroundClip at (151,94) size 5x10 clip at (151,94) size 5x10 outlineClip at (151,94) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239B}"
-layer at (151,109) size 5x14 backgroundClip at (151,112) size 5x11 clip at (151,112) size 5x11 outlineClip at (151,112) size 5x11
+layer at (151,109) size 5x11 backgroundClip at (151,112) size 5x11 clip at (151,112) size 5x11 outlineClip at (151,112) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239D}"
-layer at (188,95) size 5x14 backgroundClip at (188,94) size 5x10 clip at (188,94) size 5x10 outlineClip at (188,94) size 5x10
+layer at (188,95) size 5x11 backgroundClip at (188,94) size 5x10 clip at (188,94) size 5x10 outlineClip at (188,94) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239E}"
-layer at (188,109) size 5x14 backgroundClip at (188,112) size 5x11 clip at (188,112) size 5x11 outlineClip at (188,112) size 5x11
+layer at (188,109) size 5x11 backgroundClip at (188,112) size 5x11 clip at (188,112) size 5x11 outlineClip at (188,112) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A0}"
-layer at (200,95) size 8x14 backgroundClip at (200,94) size 8x10 clip at (200,94) size 8x10 outlineClip at (200,94) size 8x10
+layer at (200,95) size 8x11 backgroundClip at (200,94) size 8x10 clip at (200,94) size 8x10 outlineClip at (200,94) size 8x10
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (200,109) size 8x14 backgroundClip at (200,112) size 8x11 clip at (200,112) size 8x11 outlineClip at (200,112) size 8x11
+layer at (200,109) size 8x11 backgroundClip at (200,112) size 8x11 clip at (200,112) size 8x11 outlineClip at (200,112) size 8x11
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (240,95) size 8x14 backgroundClip at (240,94) size 8x10 clip at (240,94) size 8x10 outlineClip at (240,94) size 8x10
+layer at (240,95) size 8x11 backgroundClip at (240,94) size 8x10 clip at (240,94) size 8x10 outlineClip at (240,94) size 8x10
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (240,109) size 8x14 backgroundClip at (240,112) size 8x11 clip at (240,112) size 8x11 outlineClip at (240,112) size 8x11
+layer at (240,109) size 8x11 backgroundClip at (240,112) size 8x11 clip at (240,112) size 8x11 outlineClip at (240,112) size 8x11
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (255,95) size 10x14 backgroundClip at (255,94) size 10x10 clip at (255,94) size 10x10 outlineClip at (255,94) size 10x10
+layer at (255,95) size 10x11 backgroundClip at (255,94) size 10x10 clip at (255,94) size 10x10 outlineClip at (255,94) size 10x10
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2320}"
-layer at (255,109) size 10x14 backgroundClip at (255,112) size 10x11 clip at (255,112) size 10x11 outlineClip at (255,112) size 10x11
+layer at (255,109) size 10x11 backgroundClip at (255,112) size 10x11 clip at (255,112) size 10x11 outlineClip at (255,112) size 10x11
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2321}"
-layer at (49,152) size 7x14 backgroundClip at (49,151) size 7x10 clip at (49,151) size 7x10 outlineClip at (49,151) size 7x10
+layer at (49,152) size 7x11 backgroundClip at (49,151) size 7x10 clip at (49,151) size 7x10 outlineClip at (49,151) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A7}"
-layer at (49,164) size 7x14 backgroundClip at (49,165) size 7x10 clip at (49,165) size 7x10 outlineClip at (49,165) size 7x10
+layer at (49,164) size 7x11 backgroundClip at (49,165) size 7x10 clip at (49,165) size 7x10 outlineClip at (49,165) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A8}"
-layer at (49,176) size 7x14 backgroundClip at (49,179) size 7x11 clip at (49,179) size 7x11 outlineClip at (49,179) size 7x11
+layer at (49,176) size 7x11 backgroundClip at (49,179) size 7x11 clip at (49,179) size 7x11 outlineClip at (49,179) size 7x11
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A9}"
-layer at (96,152) size 7x14 backgroundClip at (96,151) size 7x10 clip at (96,151) size 7x10 outlineClip at (96,151) size 7x10
+layer at (96,152) size 7x11 backgroundClip at (96,151) size 7x10 clip at (96,151) size 7x10 outlineClip at (96,151) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AB}"
-layer at (96,164) size 7x14 backgroundClip at (96,165) size 7x10 clip at (96,165) size 7x10 outlineClip at (96,165) size 7x10
+layer at (96,164) size 7x11 backgroundClip at (96,165) size 7x10 clip at (96,165) size 7x10 outlineClip at (96,165) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AC}"
-layer at (96,176) size 7x14 backgroundClip at (96,179) size 7x11 clip at (96,179) size 7x11 outlineClip at (96,179) size 7x11
+layer at (96,176) size 7x11 backgroundClip at (96,179) size 7x11 clip at (96,179) size 7x11 outlineClip at (96,179) size 7x11
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AD}"
-layer at (110,152) size 5x14 backgroundClip at (110,151) size 5x10 clip at (110,151) size 5x10 outlineClip at (110,151) size 5x10
+layer at (110,152) size 5x11 backgroundClip at (110,151) size 5x10 clip at (110,151) size 5x10 outlineClip at (110,151) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A1}"
-layer at (110,176) size 5x14 backgroundClip at (110,179) size 5x11 clip at (110,179) size 5x11 outlineClip at (110,179) size 5x11
+layer at (110,176) size 5x11 backgroundClip at (110,179) size 5x11 clip at (110,179) size 5x11 outlineClip at (110,179) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A3}"
-layer at (155,152) size 5x14 backgroundClip at (155,151) size 5x10 clip at (155,151) size 5x10 outlineClip at (155,151) size 5x10
+layer at (155,152) size 5x11 backgroundClip at (155,151) size 5x10 clip at (155,151) size 5x10 outlineClip at (155,151) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A4}"
-layer at (155,176) size 5x14 backgroundClip at (155,179) size 5x11 clip at (155,179) size 5x11 outlineClip at (155,179) size 5x11
+layer at (155,176) size 5x11 backgroundClip at (155,179) size 5x11 clip at (155,179) size 5x11 outlineClip at (155,179) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A6}"
-layer at (167,152) size 5x14 backgroundClip at (167,151) size 5x10 clip at (167,151) size 5x10 outlineClip at (167,151) size 5x10
+layer at (167,152) size 5x11 backgroundClip at (167,151) size 5x10 clip at (167,151) size 5x10 outlineClip at (167,151) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239B}"
-layer at (167,176) size 5x14 backgroundClip at (167,179) size 5x11 clip at (167,179) size 5x11 outlineClip at (167,179) size 5x11
+layer at (167,176) size 5x11 backgroundClip at (167,179) size 5x11 clip at (167,179) size 5x11 outlineClip at (167,179) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239D}"
-layer at (212,152) size 5x14 backgroundClip at (212,151) size 5x10 clip at (212,151) size 5x10 outlineClip at (212,151) size 5x10
+layer at (212,152) size 5x11 backgroundClip at (212,151) size 5x10 clip at (212,151) size 5x10 outlineClip at (212,151) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239E}"
-layer at (212,176) size 5x14 backgroundClip at (212,179) size 5x11 clip at (212,179) size 5x11 outlineClip at (212,179) size 5x11
+layer at (212,176) size 5x11 backgroundClip at (212,179) size 5x11 clip at (212,179) size 5x11 outlineClip at (212,179) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A0}"
-layer at (224,152) size 8x14 backgroundClip at (224,151) size 8x10 clip at (224,151) size 8x10 outlineClip at (224,151) size 8x10
+layer at (224,152) size 8x11 backgroundClip at (224,151) size 8x10 clip at (224,151) size 8x10 outlineClip at (224,151) size 8x10
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (224,176) size 8x14 backgroundClip at (224,179) size 8x11 clip at (224,179) size 8x11 outlineClip at (224,179) size 8x11
+layer at (224,176) size 8x11 backgroundClip at (224,179) size 8x11 clip at (224,179) size 8x11 outlineClip at (224,179) size 8x11
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (272,152) size 8x14 backgroundClip at (272,151) size 8x10 clip at (272,151) size 8x10 outlineClip at (272,151) size 8x10
+layer at (272,152) size 8x11 backgroundClip at (272,151) size 8x10 clip at (272,151) size 8x10 outlineClip at (272,151) size 8x10
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (272,176) size 8x14 backgroundClip at (272,179) size 8x11 clip at (272,179) size 8x11 outlineClip at (272,179) size 8x11
+layer at (272,176) size 8x11 backgroundClip at (272,179) size 8x11 clip at (272,179) size 8x11 outlineClip at (272,179) size 8x11
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (287,152) size 10x14 backgroundClip at (287,151) size 10x10 clip at (287,151) size 10x10 outlineClip at (287,151) size 10x10
+layer at (287,152) size 10x11 backgroundClip at (287,151) size 10x10 clip at (287,151) size 10x10 outlineClip at (287,151) size 10x10
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2320}"
-layer at (287,176) size 10x14 backgroundClip at (287,179) size 10x11 clip at (287,179) size 10x11 outlineClip at (287,179) size 10x11
+layer at (287,176) size 10x11 backgroundClip at (287,179) size 10x11 clip at (287,179) size 10x11 outlineClip at (287,179) size 10x11
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2321}"
-layer at (49,229) size 7x14 backgroundClip at (49,228) size 7x10 clip at (49,228) size 7x10 outlineClip at (49,228) size 7x10
+layer at (49,229) size 7x11 backgroundClip at (49,228) size 7x10 clip at (49,228) size 7x10 outlineClip at (49,228) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A7}"
-layer at (49,250) size 7x14 backgroundClip at (49,251) size 7x10 clip at (49,251) size 7x10 outlineClip at (49,251) size 7x10
+layer at (49,250) size 7x11 backgroundClip at (49,251) size 7x10 clip at (49,251) size 7x10 outlineClip at (49,251) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A8}"
-layer at (49,272) size 7x14 backgroundClip at (49,275) size 7x11 clip at (49,275) size 7x11 outlineClip at (49,275) size 7x11
+layer at (49,272) size 7x11 backgroundClip at (49,275) size 7x11 clip at (49,275) size 7x11 outlineClip at (49,275) size 7x11
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A9}"
-layer at (112,229) size 7x14 backgroundClip at (112,228) size 7x10 clip at (112,228) size 7x10 outlineClip at (112,228) size 7x10
+layer at (112,229) size 7x11 backgroundClip at (112,228) size 7x10 clip at (112,228) size 7x10 outlineClip at (112,228) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AB}"
-layer at (112,250) size 7x14 backgroundClip at (112,251) size 7x10 clip at (112,251) size 7x10 outlineClip at (112,251) size 7x10
+layer at (112,250) size 7x11 backgroundClip at (112,251) size 7x10 clip at (112,251) size 7x10 outlineClip at (112,251) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AC}"
-layer at (112,272) size 7x14 backgroundClip at (112,275) size 7x11 clip at (112,275) size 7x11 outlineClip at (112,275) size 7x11
+layer at (112,272) size 7x11 backgroundClip at (112,275) size 7x11 clip at (112,275) size 7x11 outlineClip at (112,275) size 7x11
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AD}"
-layer at (126,229) size 5x14 backgroundClip at (126,228) size 5x10 clip at (126,228) size 5x10 outlineClip at (126,228) size 5x10
+layer at (126,229) size 5x11 backgroundClip at (126,228) size 5x10 clip at (126,228) size 5x10 outlineClip at (126,228) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A1}"
-layer at (126,272) size 5x14 backgroundClip at (126,275) size 5x11 clip at (126,275) size 5x11 outlineClip at (126,275) size 5x11
+layer at (126,272) size 5x11 backgroundClip at (126,275) size 5x11 clip at (126,275) size 5x11 outlineClip at (126,275) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A3}"
-layer at (187,229) size 5x14 backgroundClip at (187,228) size 5x10 clip at (187,228) size 5x10 outlineClip at (187,228) size 5x10
+layer at (187,229) size 5x11 backgroundClip at (187,228) size 5x10 clip at (187,228) size 5x10 outlineClip at (187,228) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A4}"
-layer at (187,272) size 5x14 backgroundClip at (187,275) size 5x11 clip at (187,275) size 5x11 outlineClip at (187,275) size 5x11
+layer at (187,272) size 5x11 backgroundClip at (187,275) size 5x11 clip at (187,275) size 5x11 outlineClip at (187,275) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A6}"
-layer at (199,229) size 5x14 backgroundClip at (199,228) size 5x10 clip at (199,228) size 5x10 outlineClip at (199,228) size 5x10
+layer at (199,229) size 5x11 backgroundClip at (199,228) size 5x10 clip at (199,228) size 5x10 outlineClip at (199,228) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239B}"
-layer at (199,272) size 5x14 backgroundClip at (199,275) size 5x11 clip at (199,275) size 5x11 outlineClip at (199,275) size 5x11
+layer at (199,272) size 5x11 backgroundClip at (199,275) size 5x11 clip at (199,275) size 5x11 outlineClip at (199,275) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239D}"
-layer at (260,229) size 5x14 backgroundClip at (260,228) size 5x10 clip at (260,228) size 5x10 outlineClip at (260,228) size 5x10
+layer at (260,229) size 5x11 backgroundClip at (260,228) size 5x10 clip at (260,228) size 5x10 outlineClip at (260,228) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239E}"
-layer at (260,272) size 5x14 backgroundClip at (260,275) size 5x11 clip at (260,275) size 5x11 outlineClip at (260,275) size 5x11
+layer at (260,272) size 5x11 backgroundClip at (260,275) size 5x11 clip at (260,275) size 5x11 outlineClip at (260,275) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A0}"
-layer at (272,229) size 8x14 backgroundClip at (272,228) size 8x10 clip at (272,228) size 8x10 outlineClip at (272,228) size 8x10
+layer at (272,229) size 8x11 backgroundClip at (272,228) size 8x10 clip at (272,228) size 8x10 outlineClip at (272,228) size 8x10
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (272,272) size 8x14 backgroundClip at (272,275) size 8x11 clip at (272,275) size 8x11 outlineClip at (272,275) size 8x11
+layer at (272,272) size 8x11 backgroundClip at (272,275) size 8x11 clip at (272,275) size 8x11 outlineClip at (272,275) size 8x11
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (336,229) size 8x14 backgroundClip at (336,228) size 8x10 clip at (336,228) size 8x10 outlineClip at (336,228) size 8x10
+layer at (336,229) size 8x11 backgroundClip at (336,228) size 8x10 clip at (336,228) size 8x10 outlineClip at (336,228) size 8x10
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (336,272) size 8x14 backgroundClip at (336,275) size 8x11 clip at (336,275) size 8x11 outlineClip at (336,275) size 8x11
+layer at (336,272) size 8x11 backgroundClip at (336,275) size 8x11 clip at (336,275) size 8x11 outlineClip at (336,275) size 8x11
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (351,229) size 10x14 backgroundClip at (351,228) size 10x10 clip at (351,228) size 10x10 outlineClip at (351,228) size 10x10
+layer at (351,229) size 10x11 backgroundClip at (351,228) size 10x10 clip at (351,228) size 10x10 outlineClip at (351,228) size 10x10
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2320}"
-layer at (351,272) size 10x14 backgroundClip at (351,275) size 10x11 clip at (351,275) size 10x11 outlineClip at (351,275) size 10x11
+layer at (351,272) size 10x11 backgroundClip at (351,275) size 10x11 clip at (351,275) size 10x11 outlineClip at (351,275) size 10x11
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2321}"
-layer at (57,373) size 7x14 backgroundClip at (57,372) size 7x10 clip at (57,372) size 7x10 outlineClip at (57,372) size 7x10
+layer at (57,373) size 7x11 backgroundClip at (57,372) size 7x10 clip at (57,372) size 7x10 outlineClip at (57,372) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A7}"
-layer at (57,438) size 7x14 backgroundClip at (57,439) size 7x10 clip at (57,439) size 7x10 outlineClip at (57,439) size 7x10
+layer at (57,438) size 7x11 backgroundClip at (57,439) size 7x10 clip at (57,439) size 7x10 outlineClip at (57,439) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A8}"
-layer at (57,503) size 7x14 backgroundClip at (57,506) size 7x11 clip at (57,506) size 7x11 outlineClip at (57,506) size 7x11
+layer at (57,503) size 7x11 backgroundClip at (57,506) size 7x11 clip at (57,506) size 7x11 outlineClip at (57,506) size 7x11
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A9}"
-layer at (120,373) size 7x14 backgroundClip at (120,372) size 7x10 clip at (120,372) size 7x10 outlineClip at (120,372) size 7x10
+layer at (120,373) size 7x11 backgroundClip at (120,372) size 7x10 clip at (120,372) size 7x10 outlineClip at (120,372) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AB}"
-layer at (120,438) size 7x14 backgroundClip at (120,439) size 7x10 clip at (120,439) size 7x10 outlineClip at (120,439) size 7x10
+layer at (120,438) size 7x11 backgroundClip at (120,439) size 7x10 clip at (120,439) size 7x10 outlineClip at (120,439) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AC}"
-layer at (120,503) size 7x14 backgroundClip at (120,506) size 7x11 clip at (120,506) size 7x11 outlineClip at (120,506) size 7x11
+layer at (120,503) size 7x11 backgroundClip at (120,506) size 7x11 clip at (120,506) size 7x11 outlineClip at (120,506) size 7x11
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AD}"
-layer at (134,373) size 5x14 backgroundClip at (134,372) size 5x10 clip at (134,372) size 5x10 outlineClip at (134,372) size 5x10
+layer at (134,373) size 5x11 backgroundClip at (134,372) size 5x10 clip at (134,372) size 5x10 outlineClip at (134,372) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A1}"
-layer at (134,503) size 5x14 backgroundClip at (134,506) size 5x11 clip at (134,506) size 5x11 outlineClip at (134,506) size 5x11
+layer at (134,503) size 5x11 backgroundClip at (134,506) size 5x11 clip at (134,506) size 5x11 outlineClip at (134,506) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A3}"
-layer at (195,373) size 5x14 backgroundClip at (195,372) size 5x10 clip at (195,372) size 5x10 outlineClip at (195,372) size 5x10
+layer at (195,373) size 5x11 backgroundClip at (195,372) size 5x10 clip at (195,372) size 5x10 outlineClip at (195,372) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A4}"
-layer at (195,503) size 5x14 backgroundClip at (195,506) size 5x11 clip at (195,506) size 5x11 outlineClip at (195,506) size 5x11
+layer at (195,503) size 5x11 backgroundClip at (195,506) size 5x11 clip at (195,506) size 5x11 outlineClip at (195,506) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A6}"
-layer at (207,373) size 5x14 backgroundClip at (207,372) size 5x10 clip at (207,372) size 5x10 outlineClip at (207,372) size 5x10
+layer at (207,373) size 5x11 backgroundClip at (207,372) size 5x10 clip at (207,372) size 5x10 outlineClip at (207,372) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239B}"
-layer at (207,503) size 5x14 backgroundClip at (207,506) size 5x11 clip at (207,506) size 5x11 outlineClip at (207,506) size 5x11
+layer at (207,503) size 5x11 backgroundClip at (207,506) size 5x11 clip at (207,506) size 5x11 outlineClip at (207,506) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239D}"
-layer at (268,373) size 5x14 backgroundClip at (268,372) size 5x10 clip at (268,372) size 5x10 outlineClip at (268,372) size 5x10
+layer at (268,373) size 5x11 backgroundClip at (268,372) size 5x10 clip at (268,372) size 5x10 outlineClip at (268,372) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239E}"
-layer at (268,503) size 5x14 backgroundClip at (268,506) size 5x11 clip at (268,506) size 5x11 outlineClip at (268,506) size 5x11
+layer at (268,503) size 5x11 backgroundClip at (268,506) size 5x11 clip at (268,506) size 5x11 outlineClip at (268,506) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A0}"
-layer at (280,373) size 8x14 backgroundClip at (280,372) size 8x10 clip at (280,372) size 8x10 outlineClip at (280,372) size 8x10
+layer at (280,373) size 8x11 backgroundClip at (280,372) size 8x10 clip at (280,372) size 8x10 outlineClip at (280,372) size 8x10
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (280,503) size 8x14 backgroundClip at (280,506) size 8x11 clip at (280,506) size 8x11 outlineClip at (280,506) size 8x11
+layer at (280,503) size 8x11 backgroundClip at (280,506) size 8x11 clip at (280,506) size 8x11 outlineClip at (280,506) size 8x11
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (344,373) size 8x14 backgroundClip at (344,372) size 8x10 clip at (344,372) size 8x10 outlineClip at (344,372) size 8x10
+layer at (344,373) size 8x11 backgroundClip at (344,372) size 8x10 clip at (344,372) size 8x10 outlineClip at (344,372) size 8x10
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (344,503) size 8x14 backgroundClip at (344,506) size 8x11 clip at (344,506) size 8x11 outlineClip at (344,506) size 8x11
+layer at (344,503) size 8x11 backgroundClip at (344,506) size 8x11 clip at (344,506) size 8x11 outlineClip at (344,506) size 8x11
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (359,373) size 10x14 backgroundClip at (359,372) size 10x10 clip at (359,372) size 10x10 outlineClip at (359,372) size 10x10
+layer at (359,373) size 10x11 backgroundClip at (359,372) size 10x10 clip at (359,372) size 10x10 outlineClip at (359,372) size 10x10
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2320}"
-layer at (359,503) size 10x14 backgroundClip at (359,506) size 10x11 clip at (359,506) size 10x11 outlineClip at (359,506) size 10x11
+layer at (359,503) size 10x11 backgroundClip at (359,506) size 10x11 clip at (359,506) size 10x11 outlineClip at (359,506) size 10x11
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2321}"
-layer at (9,550) size 5x14 backgroundClip at (9,549) size 5x10 clip at (9,549) size 5x10 outlineClip at (9,549) size 5x10
+layer at (9,550) size 5x11 backgroundClip at (9,549) size 5x10 clip at (9,549) size 5x10 outlineClip at (9,549) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239B}"
-layer at (9,584) size 5x14 backgroundClip at (9,587) size 5x11 clip at (9,587) size 5x11 outlineClip at (9,587) size 5x11
+layer at (9,584) size 5x11 backgroundClip at (9,587) size 5x11 clip at (9,587) size 5x11 outlineClip at (9,587) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239D}"
-layer at (157,550) size 5x14 backgroundClip at (157,549) size 5x10 clip at (157,549) size 5x10 outlineClip at (157,549) size 5x10
+layer at (157,550) size 5x11 backgroundClip at (157,549) size 5x10 clip at (157,549) size 5x10 outlineClip at (157,549) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239E}"
-layer at (157,584) size 5x14 backgroundClip at (157,587) size 5x11 clip at (157,587) size 5x11 outlineClip at (157,587) size 5x11
+layer at (157,584) size 5x11 backgroundClip at (157,587) size 5x11 clip at (157,587) size 5x11 outlineClip at (157,587) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A0}"
diff --git a/LayoutTests/platform/mac/printing/return-from-printing-mode-expected.txt b/LayoutTests/platform/mac/printing/return-from-printing-mode-expected.txt
index a5ffcf1..771ec9b 100644
--- a/LayoutTests/platform/mac/printing/return-from-printing-mode-expected.txt
+++ b/LayoutTests/platform/mac/printing/return-from-printing-mode-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1656x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1656x48
+layer at (0,0) size 800x48
RenderBlock {HTML} at (0,0) size 800x48
RenderBody {BODY} at (8,16) size 784x16
RenderBlock {P} at (0,0) size 784x16
diff --git a/LayoutTests/platform/mac/svg/custom/altglyph-expected.txt b/LayoutTests/platform/mac/svg/custom/altglyph-expected.txt
index 4f94ef6..ab57c10 100644
--- a/LayoutTests/platform/mac/svg/custom/altglyph-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/altglyph-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {html} at (0,0) size 800x585
RenderBody {body} at (8,16) size 784x565
RenderBlock {p} at (0,0) size 784x36
diff --git a/LayoutTests/platform/mac/svg/custom/getscreenctm-in-mixed-content-expected.txt b/LayoutTests/platform/mac/svg/custom/getscreenctm-in-mixed-content-expected.txt
index 4970df5..5eddc85 100644
--- a/LayoutTests/platform/mac/svg/custom/getscreenctm-in-mixed-content-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/getscreenctm-in-mixed-content-expected.txt
@@ -13,7 +13,7 @@ layer at (0,0) size 800x52
RenderBR {br} at (507,0) size 0x18
RenderText {#text} at (0,18) size 315x18
text run at (0,18) width 315: "If the test passes you should see a green rectangle."
-layer at (30,100) size 400x204
+layer at (30,100) size 400x200
RenderBlock (positioned) {div} at (30,100) size 400x200
RenderSVGRoot {svg} at (30,100) size 400x200
RenderSVGPath {rect} at (30,100) size 400x200 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=200.00] [height=100.00]
diff --git a/LayoutTests/platform/mac/svg/custom/path-bad-data-expected.txt b/LayoutTests/platform/mac/svg/custom/path-bad-data-expected.txt
index 443b976..03b1876 100644
--- a/LayoutTests/platform/mac/svg/custom/path-bad-data-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/path-bad-data-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x778
RenderView at (0,0) size 785x585
-layer at (0,0) size 808x778
+layer at (0,0) size 785x778
RenderBlock {html} at (0,0) size 785x778
RenderBody {body} at (8,16) size 769x754
RenderBlock {parsererror} at (16,0) size 737x134 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
diff --git a/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
index 6f2e6a6..44ead63 100644
--- a/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1026x1014
RenderView at (0,0) size 785x585
-layer at (0,0) size 1026x1014
+layer at (0,0) size 785x1014
RenderBlock {HTML} at (0,0) size 785x1014
RenderBody {BODY} at (8,16) size 769x994
RenderBlock {DIV} at (16,0) size 737x60
diff --git a/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt b/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt
index 5836229..2f3b446 100644
--- a/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt
@@ -19,7 +19,7 @@ layer at (173,32) size 453x453
RenderInline {SPAN} at (0,0) size 0x0
RenderBlock {DIV} at (0,0) size 453x0
RenderInline {SPAN} at (0,0) size 0x0
-layer at (173,47) size 453x189
+layer at (173,47) size 453x188
RenderBlock (positioned) {H1} at (0,15) size 453x188 [color=#DD9955]
RenderInline {SPAN} at (0,0) size 340x190
RenderText {#text} at (63,-1) size 340x190
@@ -80,7 +80,7 @@ layer at (173,351) size 453x134
text run at (11,98) width 431: "Learn to use the (yet to be) time-honored techniques in new"
text run at (11,112) width 350: "and invigorating fashion. Become one with the web."
RenderText {#text} at (0,0) size 0x0
-layer at (322,236) size 304x82
+layer at (322,236) size 304x80
RenderBlock (positioned) {H3} at (149,-115) size 304x80 [color=#CCCC77] [bgcolor=#888811] [border: (3px solid #888811) none (3px solid #888811)]
RenderInline {SPAN} at (0,0) size 277x83
RenderText {#text} at (44,-1) size 277x83
diff --git a/LayoutTests/platform/mac/svg/custom/text-xy-updates-SVGList-expected.txt b/LayoutTests/platform/mac/svg/custom/text-xy-updates-SVGList-expected.txt
index 0adadc3..5bfb9b1 100644
--- a/LayoutTests/platform/mac/svg/custom/text-xy-updates-SVGList-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/text-xy-updates-SVGList-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x620
RenderView at (0,0) size 785x585
-layer at (0,0) size 808x620
+layer at (0,0) size 785x620
RenderBlock {html} at (0,0) size 785x620
RenderBody {body} at (8,8) size 769x604
RenderSVGRoot {svg:svg} at (208,14) size 166x18
diff --git a/LayoutTests/platform/mac/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-expected.txt b/LayoutTests/platform/mac/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-expected.txt
index c69be9f..8805d7b 100644
--- a/LayoutTests/platform/mac/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-expected.txt
+++ b/LayoutTests/platform/mac/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x604
RenderView at (0,0) size 785x585
-layer at (0,0) size 800x604
+layer at (0,0) size 785x604
RenderBlock {html} at (0,0) size 785x604
RenderInline {body} at (0,0) size 800x18
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/svg/text/foreignObject-text-clipping-bug-expected.txt b/LayoutTests/platform/mac/svg/text/foreignObject-text-clipping-bug-expected.txt
index f2b74d2..6f037af 100644
--- a/LayoutTests/platform/mac/svg/text/foreignObject-text-clipping-bug-expected.txt
+++ b/LayoutTests/platform/mac/svg/text/foreignObject-text-clipping-bug-expected.txt
@@ -14,7 +14,7 @@ layer at (0,0) size 800x292
RenderText {#text} at (0,0) size 24x13
text run at (0,0) width 24: "TEST"
RenderText {#text} at (0,0) size 0x0
-layer at (18,182) size 390x115
+layer at (18,182) size 390x110
RenderBlock (relative positioned) {div} at (0,162) size 390x110 [color=#000080] [bgcolor=#D3D3D3]
RenderBlock {div} at (0,0) size 390x115
RenderText {#text} at (0,0) size 239x115
diff --git a/LayoutTests/platform/mac/svg/text/kerning-expected.txt b/LayoutTests/platform/mac/svg/text/kerning-expected.txt
index 6fbd275..400b4f7 100644
--- a/LayoutTests/platform/mac/svg/text/kerning-expected.txt
+++ b/LayoutTests/platform/mac/svg/text/kerning-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {html} at (0,0) size 800x585
RenderBody {body} at (8,16) size 784x415
RenderBlock {p} at (0,0) size 784x36
diff --git a/LayoutTests/platform/mac/svg/text/multichar-glyph-expected.txt b/LayoutTests/platform/mac/svg/text/multichar-glyph-expected.txt
index 7f502c5..dd4872c 100644
--- a/LayoutTests/platform/mac/svg/text/multichar-glyph-expected.txt
+++ b/LayoutTests/platform/mac/svg/text/multichar-glyph-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {html} at (0,0) size 800x585
RenderBody {body} at (8,16) size 784x565
RenderBlock {p} at (0,0) size 784x36
diff --git a/LayoutTests/platform/mac/svg/transforms/animated-path-inside-transformed-html-expected.txt b/LayoutTests/platform/mac/svg/transforms/animated-path-inside-transformed-html-expected.txt
index 246bc08..0efd77e 100644
--- a/LayoutTests/platform/mac/svg/transforms/animated-path-inside-transformed-html-expected.txt
+++ b/LayoutTests/platform/mac/svg/transforms/animated-path-inside-transformed-html-expected.txt
@@ -6,7 +6,7 @@ layer at (0,0) size 800x536
RenderBlock {p} at (0,0) size 784x18
RenderText {#text} at (0,0) size 573x18
text run at (0,0) width 573: "CSS Transformed HTML div with SVG inside it. Animated SVG should repaint correctly."
-layer at (58,84) size 402x405
+layer at (58,84) size 402x402
RenderBlock {div} at (50,68) size 402x402 [border: (1px solid #000000)]
RenderSVGRoot {svg} at (148,144) size 358x419
RenderSVGPath {rect} at (355,187) size 115x115 [stroke={[type=SOLID] [color=#FFC0CB] [stroke width=5.00]}] [fill={[type=SOLID] [color=#0000FF]}] [x=300.00] [y=0.00] [width=100.00] [height=100.00]
diff --git a/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt b/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt
index bf494d1..70ec857 100644
--- a/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt
+++ b/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt
@@ -7,7 +7,7 @@ layer at (0,0) size 800x536
RenderText {#text} at (0,0) size 550x18
text run at (0,0) width 318: "CSS Transformed HTML div with SVG inside it. "
text run at (318,0) width 232: "objectBoundingBox patterns on text."
-layer at (58,84) size 402x405
+layer at (58,84) size 402x402
RenderBlock {div} at (50,68) size 402x402 [border: (1px solid #000000)]
RenderSVGRoot {svg} at (49,105) size 480x420
RenderSVGResourcePattern {pattern} [id="pat1"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse]
diff --git a/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-009-expected.txt b/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
index 348913a..a8373e4 100644
--- a/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
+++ b/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x348
+layer at (0,0) size 800x312
RenderBlock {html} at (0,0) size 800x312
RenderBody {body} at (8,10) size 784x292
RenderBlock {p} at (0,0) size 784x26 [color=#000080]
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug120364-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug120364-expected.txt
index fc7f549..08a7b2c 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug120364-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug120364-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x1813
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1813
+layer at (0,0) size 785x600
RenderBlock {HTML} at (0,0) size 785x600
RenderBody {BODY} at (8,8) size 769x584
RenderText {#text} at (0,0) size 21x18
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug131020-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug131020-expected.txt
index 3b0f562..d9674cb 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug131020-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug131020-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderTable {TABLE} at (0,0) size 800x569 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug196870-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug196870-expected.txt
index 6327326..9a5262e 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug196870-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug196870-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x92
+layer at (0,0) size 800x47
RenderBlock {HTML} at (0,0) size 800x47
RenderBody {BODY} at (8,8) size 784x31
RenderTable {TABLE} at (0,0) size 130x31
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug23151-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug23151-expected.txt
index 8d6e034..c74d8bb 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug23151-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug23151-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1264x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1264x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderTable {TABLE} at (0,0) size 1256x34 [bgcolor=#FFFFFF]
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug29314-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug29314-expected.txt
index a80e5f3..c553a80 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug29314-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug29314-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1009x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1009x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderTable {TABLE} at (0,0) size 1001x226
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug43039-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug43039-expected.txt
index 28ff7d3..5124596 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug43039-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug43039-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 16468x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 16468x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderTable {TABLE} at (0,0) size 16460x108
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug43854-1-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug43854-1-expected.txt
index 44bc0d6..12ad31f 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug43854-1-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug43854-1-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 942x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 942x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (0,0) size 800x585 [color=#FFFF00] [bgcolor=#000000]
RenderBlock {P} at (40,40) size 720x18
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug45055-2-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug45055-2-expected.txt
index 9ab8c34..678cd9c 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug45055-2-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug45055-2-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x136
+layer at (0,0) size 800x8
RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0 [bgcolor=#FFFFFF]
RenderTable {TABLE} at (0,0) size 86x123
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug5797-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug5797-expected.txt
index 9a9a99f..5a8dd19 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug5797-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug5797-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 866x990
RenderView at (0,0) size 785x585
-layer at (0,0) size 866x990
+layer at (0,0) size 785x990
RenderBlock {HTML} at (0,0) size 785x990
RenderBody {BODY} at (8,8) size 769x974
RenderTable {TABLE} at (0,0) size 769x28 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug625-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug625-expected.txt
index ddfbcd0..d2988f9 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug625-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug625-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1012x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1012x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock {HR} at (0,0) size 1004x4 [border: (2px solid #000000)]
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug72359-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug72359-expected.txt
index 33cd529..04fb1c3 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug72359-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug72359-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x62
+layer at (0,0) size 800x8
RenderBlock {html} at (0,0) size 800x8
RenderBody {body} at (8,8) size 784x0
RenderBlock (floating) {float} at (0,0) size 157x54 [bgcolor=#FF0000]
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug83786-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug83786-expected.txt
index 98aeac2..0a1af81 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug83786-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug83786-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x136
RenderBlock {HTML} at (0,0) size 800x136
RenderBody {BODY} at (0,0) size 800x136
-layer at (0,0) size 266x136 clip at (3,3) size 260x130 scrollWidth 324 scrollHeight 144
+layer at (0,0) size 266x136 clip at (3,3) size 260x130 scrollHeight 144
RenderBlock {DIV} at (0,0) size 266x136 [border: (3px solid #008000)]
RenderTable {TABLE} at (16,3) size 64x143
RenderTableSection {TBODY} at (0,0) size 64x143
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug92143-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug92143-expected.txt
index 7bfa8d0..ebaab0f 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug92143-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug92143-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 2410x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 2410x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderBlock (anonymous) at (0,0) size 784x18
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug96334-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug96334-expected.txt
index 2f38d4a..f2b05e4 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug96334-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug96334-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 999x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 999x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderTable {TABLE} at (0,0) size 991x147 [border: (2px solid #0000FF)]
diff --git a/LayoutTests/platform/mac/tables/mozilla/core/nested1-expected.txt b/LayoutTests/platform/mac/tables/mozilla/core/nested1-expected.txt
index ce2485f..12328ec 100644
--- a/LayoutTests/platform/mac/tables/mozilla/core/nested1-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/core/nested1-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderTable {TABLE} at (0,0) size 193x34 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla/marvin/backgr_index-expected.txt b/LayoutTests/platform/mac/tables/mozilla/marvin/backgr_index-expected.txt
index 4e58fec..d91ce52 100644
--- a/LayoutTests/platform/mac/tables/mozilla/marvin/backgr_index-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/marvin/backgr_index-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 827x1744
RenderView at (0,0) size 785x585
-layer at (0,0) size 827x1744
+layer at (0,0) size 785x1744
RenderBlock {HTML} at (0,0) size 785x1744
RenderBody {BODY} at (8,17) size 769x1714 [color=#00FF00] [bgcolor=#333333]
RenderBlock {H1} at (0,0) size 769x30
diff --git a/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_left-expected.txt b/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_left-expected.txt
index 6cfa448..099c138 100644
--- a/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_left-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_left-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x36
+layer at (0,0) size 800x8
RenderBlock {html} at (0,0) size 800x8
RenderBody {body} at (8,8) size 784x0
RenderTable {table} at (0,0) size 288x28 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_right-expected.txt b/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_right-expected.txt
index 8d22f0b..13249b5 100644
--- a/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_right-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_right-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x36
+layer at (0,0) size 800x8
RenderBlock {html} at (0,0) size 800x8
RenderBody {body} at (8,8) size 784x0
RenderTable {table} at (487,0) size 297x28 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_nowrap-expected.txt b/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_nowrap-expected.txt
index 2fad3a1..1c74b1f 100644
--- a/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_nowrap-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_nowrap-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 908x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 908x68
+layer at (0,0) size 800x68
RenderBlock {html} at (0,0) size 800x68
RenderBody {body} at (8,8) size 784x52
RenderTable {table} at (0,0) size 900x52 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_nowrap-expected.txt b/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_nowrap-expected.txt
index 84e7061..0b8bc80 100644
--- a/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_nowrap-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_nowrap-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 932x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 932x68
+layer at (0,0) size 800x68
RenderBlock {html} at (0,0) size 800x68
RenderBody {body} at (8,8) size 784x52
RenderTable {table} at (0,0) size 924x52 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.txt
index e5de57c..5c5c869 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 808x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 808x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderTable {TABLE} at (0,0) size 800x36 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug2479-5-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug2479-5-expected.txt
index 3bcad94..87c670a 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug2479-5-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug2479-5-expected.txt
@@ -1,4 +1,4 @@
-layer at (0,0) size 785x1415
+layer at (0,0) size 785x1407
RenderView at (0,0) size 785x600
layer at (8,8) size 769x1399
RenderBlock {HTML} at (8,8) size 769x1399 [bgcolor=#008000] [border: (16px solid #00FF00)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug67915-2-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug67915-2-expected.txt
index ef92587..1f83e71 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug67915-2-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug67915-2-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 948x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 948x585
+layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x569
RenderTable {TABLE} at (0,0) size 940x28 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug85016-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug85016-expected.txt
index 1a5cb1b..f62b00c 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug85016-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug85016-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 982x3040
RenderView at (0,0) size 785x585
-layer at (0,0) size 982x3040
+layer at (0,0) size 785x3040
RenderBlock {HTML} at (0,0) size 785x3040
RenderBody {BODY} at (32,32) size 721x2976
RenderBlock {DIV} at (32,0) size 657x668 [border: (1px solid #008000)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.txt
index 3526942..e9db1b8 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 1544x1673
RenderView at (0,0) size 785x585
-layer at (0,0) size 1544x1673
+layer at (0,0) size 785x1673
RenderBlock {HTML} at (0,0) size 785x1673
RenderBody {BODY} at (8,17) size 769x1643 [color=#00FF00] [bgcolor=#333333]
RenderBlock {H1} at (0,0) size 769x30
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption-expected.txt
index 3b7c881..4af8a0f 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x411
+layer at (0,0) size 800x138
RenderBlock {HTML} at (0,0) size 800x138
RenderBody {BODY} at (8,8) size 784x122
RenderTable {TABLE} at (0,0) size 200x122 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom-expected.txt
index 0bfb6d0..a03ecda 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x521
+layer at (0,0) size 800x138
RenderBlock {HTML} at (0,0) size 800x138
RenderBody {BODY} at (8,8) size 784x122
RenderTable {TABLE} at (0,0) size 200x122 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_left-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_left-expected.txt
index 3b7c881..4af8a0f 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_left-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_left-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x411
+layer at (0,0) size 800x138
RenderBlock {HTML} at (0,0) size 800x138
RenderBody {BODY} at (8,8) size 784x122
RenderTable {TABLE} at (0,0) size 200x122 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_right-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_right-expected.txt
index 3b7c881..4af8a0f 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_right-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_right-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x411
+layer at (0,0) size 800x138
RenderBlock {HTML} at (0,0) size 800x138
RenderBody {BODY} at (8,8) size 784x122
RenderTable {TABLE} at (0,0) size 200x122 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_top-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_top-expected.txt
index 3b7c881..4af8a0f 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_top-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_caption_top-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x411
+layer at (0,0) size 800x138
RenderBlock {HTML} at (0,0) size 800x138
RenderBody {BODY} at (8,8) size 784x122
RenderTable {TABLE} at (0,0) size 200x122 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow-expected.txt
index 7ce6b57..5a465f8 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x308
+layer at (0,0) size 800x116
RenderBlock {HTML} at (0,0) size 800x116
RenderBody {BODY} at (8,8) size 784x100
RenderTable {TABLE} at (0,0) size 200x100 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row-expected.txt
index c58685c..00a1c8c 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x612
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x612
+layer at (0,0) size 785x416
RenderBlock {HTML} at (0,0) size 785x416
RenderBody {BODY} at (8,8) size 769x400
RenderTable {TABLE} at (0,0) size 229x400 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_table-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_table-expected.txt
index 7f0184c..0adabf1 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_table-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_table-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x578
+layer at (0,0) size 800x356
RenderBlock {HTML} at (0,0) size 800x356
RenderBody {BODY} at (8,8) size 784x340
RenderTable {TABLE} at (0,0) size 200x340 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.txt
index 5dec1c5..819604b 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x728
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x728
+layer at (0,0) size 785x532
RenderBlock {HTML} at (0,0) size 785x532
RenderBody {BODY} at (8,8) size 769x516
RenderTable {TABLE} at (0,0) size 229x516 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.txt
index f4419b9..8c419ef 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x516
+layer at (0,0) size 800x38
RenderBlock {HTML} at (0,0) size 800x38
RenderBody {BODY} at (8,8) size 784x22
RenderTable {TABLE} at (0,0) size 22x22 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell-expected.txt
index d9b436c..1d190fe 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x549
+layer at (0,0) size 800x397
RenderBlock {HTML} at (0,0) size 800x397
RenderBody {BODY} at (8,8) size 784x381
RenderTable {TABLE} at (0,0) size 200x381 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling-expected.txt
index 96651d6..972be7e 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x597
+layer at (0,0) size 800x386
RenderBlock {HTML} at (0,0) size 800x386
RenderBody {BODY} at (8,8) size 784x370
RenderTable {TABLE} at (0,0) size 200x370 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row-expected.txt
index 01b7ad8..1ca6182 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x597
+layer at (0,0) size 800x386
RenderBlock {HTML} at (0,0) size 800x386
RenderBody {BODY} at (8,8) size 784x370
RenderTable {TABLE} at (0,0) size 200x370 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling-expected.txt
index 9792ed8..08cfc4c 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x685
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x685
+layer at (0,0) size 785x474
RenderBlock {HTML} at (0,0) size 785x474
RenderBody {BODY} at (8,8) size 769x458
RenderTable {TABLE} at (0,0) size 200x458 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table-expected.txt
index fe68eea..dd1109e 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x404
+layer at (0,0) size 800x163
RenderBlock {HTML} at (0,0) size 800x163
RenderBody {BODY} at (8,8) size 784x147
RenderTable {TABLE} at (0,0) size 200x147 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption-expected.txt
index 6991edc..72274aa 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x445
+layer at (0,0) size 800x234
RenderBlock {HTML} at (0,0) size 800x234
RenderBody {BODY} at (8,8) size 784x218
RenderTable {TABLE} at (0,0) size 200x218 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody-expected.txt
index a93747e..a5a6cdf 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x597
+layer at (0,0) size 800x386
RenderBlock {HTML} at (0,0) size 800x386
RenderBody {BODY} at (8,8) size 784x370
RenderTable {TABLE} at (0,0) size 200x370 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.txt
index 66a705a..0743c01 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 785x724
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x724
+layer at (0,0) size 785x513
RenderBlock {HTML} at (0,0) size 785x513
RenderBody {BODY} at (8,8) size 769x497
RenderTable {TABLE} at (0,0) size 200x497 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_align_right-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_align_right-expected.txt
index ce8aef4..c239562 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_align_right-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_align_right-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x460
+layer at (0,0) size 800x126
RenderBlock {HTML} at (0,0) size 800x126
RenderBody {BODY} at (8,8) size 784x110
RenderTable {TABLE} at (0,0) size 200x110 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_bottom-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_bottom-expected.txt
index 134ff28..53855b8 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_bottom-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_bottom-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x504
+layer at (0,0) size 800x126
RenderBlock {HTML} at (0,0) size 800x126
RenderBody {BODY} at (8,8) size 784x110
RenderTable {TABLE} at (0,0) size 200x110 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_middle-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_middle-expected.txt
index 94259e6..4f25a13 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_middle-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_middle-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x460
+layer at (0,0) size 800x126
RenderBlock {HTML} at (0,0) size 800x126
RenderBody {BODY} at (8,8) size 784x110
RenderTable {TABLE} at (0,0) size 200x110 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_top-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_top-expected.txt
index 407f9aa..3233ab1 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_top-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_top-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x416
+layer at (0,0) size 800x126
RenderBlock {HTML} at (0,0) size 800x126
RenderBody {BODY} at (8,8) size 784x110
RenderTable {TABLE} at (0,0) size 200x110 [border: (1px outset #808080)]
diff --git a/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-2-expected.txt b/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-2-expected.txt
index e741969..3a6bd4b 100644
--- a/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-2-expected.txt
+++ b/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-2-expected.txt
@@ -52,7 +52,7 @@ layer at (351,85) size 90x90
RenderBlock {DIV} at (21,1) size 90x90 [bgcolor=#0000FF] [border: (1px solid #000000)]
layer at (534,42) size 140x140
RenderBlock {DIV} at (21,21) size 140x140 [bgcolor=#DDDDDD] [border: (1px solid #000000)]
-layer at (555,63) size 121x121
+layer at (555,63) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#81AA8A] [border: (1px solid #000000)]
RenderBlock {DIV} at (21,21) size 100x100 [bgcolor=#DDDDDD] [border: (1px solid #000000)]
layer at (597,85) size 90x90
diff --git a/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-expected.txt b/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-expected.txt
index 3fcf05e..da0bdc1 100644
--- a/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-expected.txt
+++ b/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-expected.txt
@@ -60,7 +60,7 @@ layer at (63,63) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#AAAAAA] [border: (1px solid #000000)]
layer at (288,42) size 140x140
RenderBlock {DIV} at (21,21) size 140x140 [bgcolor=#DDDDDD] [border: (1px solid #000000)]
-layer at (309,63) size 121x121
+layer at (309,63) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#AAAAAA] [border: (1px solid #000000)]
RenderBlock {DIV} at (21,21) size 100x100 [bgcolor=#0000FF] [border: (1px solid #000000)]
layer at (42,288) size 140x140
@@ -71,7 +71,7 @@ layer at (84,330) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#0000FF] [border: (1px solid #000000)]
layer at (288,288) size 140x140
RenderBlock {DIV} at (21,21) size 140x140 [bgcolor=#DDDDDD] [border: (1px solid #000000)]
-layer at (309,309) size 121x121
+layer at (309,309) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#AAAAAA] [border: (1px solid #000000)]
RenderBlock {DIV} at (21,21) size 100x100 [bgcolor=#C0D69E] [border: (1px solid #000000)]
layer at (351,351) size 100x100
diff --git a/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-origins-expected.txt b/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-origins-expected.txt
index 72cc77c..740846f 100644
--- a/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-origins-expected.txt
+++ b/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-origins-expected.txt
@@ -60,7 +60,7 @@ layer at (63,63) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#AAAAAA] [border: (1px solid #000000)]
layer at (288,42) size 140x140
RenderBlock {DIV} at (21,21) size 140x140 [bgcolor=#DDDDDD] [border: (1px solid #000000)]
-layer at (309,63) size 121x121
+layer at (309,63) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#AAAAAA] [border: (1px solid #000000)]
RenderBlock {DIV} at (21,21) size 100x100 [bgcolor=#0000FF] [border: (1px solid #000000)]
layer at (42,288) size 140x140
@@ -71,7 +71,7 @@ layer at (84,330) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#0000FF] [border: (1px solid #000000)]
layer at (288,288) size 140x140
RenderBlock {DIV} at (21,21) size 140x140 [bgcolor=#DDDDDD] [border: (1px solid #000000)]
-layer at (309,309) size 121x121
+layer at (309,309) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#AAAAAA] [border: (1px solid #000000)]
RenderBlock {DIV} at (21,21) size 100x100 [bgcolor=#C0D69E] [border: (1px solid #000000)]
layer at (351,351) size 100x100
diff --git a/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.txt b/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.txt
index 3dec74e..e228461 100644
--- a/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.txt
+++ b/LayoutTests/platform/mac/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.txt
@@ -98,7 +98,7 @@ layer at (63,63) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#81AA8A] [border: (1px solid #000000)]
layer at (288,42) size 140x140
RenderBlock {DIV} at (21,21) size 140x140 [bgcolor=#DDDDDD] [border: (1px solid #000000)]
-layer at (309,63) size 111x111
+layer at (309,63) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#81AA8A] [border: (1px solid #000000)]
RenderBlock {DIV} at (21,21) size 90x90 [bgcolor=#0000FF] [border: (1px solid #000000)]
layer at (534,42) size 140x140
@@ -117,7 +117,7 @@ layer at (288,288) size 140x140
RenderBlock {DIV} at (21,21) size 140x140 [bgcolor=#DDDDDD] [border: (1px solid #000000)]
layer at (309,309) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#81AA8A] [border: (1px solid #000000)]
-layer at (350,350) size 111x111
+layer at (350,350) size 100x100
RenderBlock (relative positioned) {DIV} at (41,41) size 100x100 [border: (1px solid #000000)]
RenderBlock {DIV} at (21,21) size 90x90 [bgcolor=#0000FF] [border: (1px solid #000000)]
layer at (534,288) size 140x140
@@ -126,6 +126,6 @@ layer at (555,309) size 100x100
RenderBlock (relative positioned) {DIV} at (21,21) size 100x100 [bgcolor=#81AA8A] [border: (1px solid #000000)]
layer at (596,350) size 100x100
RenderBlock (relative positioned) {DIV} at (41,41) size 100x100 [border: (1px solid #000000)]
-layer at (637,391) size 111x111
+layer at (637,391) size 100x100
RenderBlock (relative positioned) {DIV} at (41,41) size 100x100 [bgcolor=#AA7994] [border: (1px solid #000000)]
RenderBlock {DIV} at (21,21) size 90x90 [bgcolor=#0000FF] [border: (1px solid #000000)]
diff --git a/LayoutTests/platform/mac/transforms/svg-vs-css-expected.txt b/LayoutTests/platform/mac/transforms/svg-vs-css-expected.txt
index 9f73278..8e3dbbe 100644
--- a/LayoutTests/platform/mac/transforms/svg-vs-css-expected.txt
+++ b/LayoutTests/platform/mac/transforms/svg-vs-css-expected.txt
@@ -29,7 +29,7 @@ layer at (0,0) size 800x578
RenderText {#text} at (0,0) size 116x28
text run at (0,0) width 116: "CSSMatrix"
RenderText {#text} at (0,0) size 0x0
-layer at (28,84) size 201x205
+layer at (28,84) size 200x200
RenderBlock (relative positioned) {div} at (10,66) size 200x200 [bgcolor=#C0C0C0] [border: (1px solid #000000)]
RenderSVGRoot {svg} at (29,108) size 196x174
RenderSVGContainer {g} at (29,108) size 196x174 [transform={m=((1.00,0.00)(0.00,1.00)) t=(75.00,25.00)}]
@@ -46,7 +46,7 @@ layer at (30,352) size 60x60
RenderBlock (positioned) {div} at (1,1) size 60x60 [border: (1px dotted #000000)]
layer at (31,353) size 60x60
RenderBlock (positioned) {div} at (1,1) size 60x60 [border: (1px solid #0000FF)]
-layer at (272,84) size 201x205
+layer at (272,84) size 200x200
RenderBlock (relative positioned) {div} at (10,66) size 200x200 [bgcolor=#C0C0C0] [border: (1px solid #000000)]
RenderSVGRoot {svg} at (273,108) size 162x174
RenderSVGPath {rect} at (273,107) size 163x176 [transform={m=((1.41,1.41)(-1.41,1.41)) t=(75.00,25.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=60.00] [height=60.00]
@@ -55,7 +55,7 @@ layer at (272,350) size 200x200
RenderBlock (relative positioned) {div} at (10,332) size 200x200 [bgcolor=#C0C0C0] [border: (1px solid #000000)]
layer at (273,351) size 60x60
RenderBlock (positioned) {div} at (1,1) size 60x60 [border: (1px solid #0000FF)]
-layer at (516,84) size 201x205
+layer at (516,84) size 200x200
RenderBlock (relative positioned) {div} at (10,66) size 200x200 [bgcolor=#C0C0C0] [border: (1px solid #000000)]
RenderSVGRoot {svg} at (517,108) size 162x174
RenderSVGPath {rect} at (517,107) size 163x176 [transform={m=((1.41,1.41)(-1.41,1.41)) t=(75.00,25.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=60.00] [height=60.00]
diff --git a/LayoutTests/svg/custom/text-zoom-expected.txt b/LayoutTests/svg/custom/text-zoom-expected.txt
index be2e16e..5858f26 100644
--- a/LayoutTests/svg/custom/text-zoom-expected.txt
+++ b/LayoutTests/svg/custom/text-zoom-expected.txt
@@ -5,7 +5,7 @@ layer at (0,0) size 800x8
RenderBody {body} at (8,8) size 784x0
layer at (0,30) size 100x100
RenderBlock (positioned) {div} at (0,30) size 100x100 [bgcolor=#FF0000]
-layer at (0,30) size 200x205
+layer at (0,30) size 200x200
RenderBlock (positioned) {div} at (0,30) size 200x200
RenderSVGRoot {svg} at (0,30) size 100x100
RenderSVGPath {rect} at (0,30) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=50.00] [height=50.00]
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3886e66..defc6da 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,305 @@
+2010-12-06 David Hyatt <hyatt at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Fix for https://bugs.webkit.org/show_bug.cgi?id=49220 <<rdar://problem/8644849>, REGRESSION: transforms now
+ O(n^3) from pathological behavior in lowestPosition, rightmostPosition, leftmostPosition and topmostPosition.
+
+ This patch throws out the lowest/rightmost/leftmost/topmostPosition functions and re-architects layout overflow
+ in the engine to cache all the information required to properly handle scrolling.
+
+ In the old code, there were two types of overflow: layout overflow and visual overflow. The former could
+ affect scrolling and the latter could not. The distinction was largely meaningless, since layout overflow
+ wasn't actually used to determine scroll width or scroll height. It didn't propagate across self-painting layer
+ boundaries either. In the old code, the term visible overflow meant the union of the layout overflow and
+ visual overflow rects.
+
+ In the new code, the two types of overflow remain, but the distinction between the two is now clear. Visual overflow
+ is used purely for painting and hit testing checks and layout overflow is used specifically for scrolling. It has
+ been expanded to propagate across self-painting layers, to factor in relative positioning and transforms, and to
+ work with writing modes.
+
+ In order to minimize layout test changes, layers no longer incorporate right/bottom overflow into their width/height members.
+ Doing so uncovered two bugs where left/top overflow was ignored (proof that even having layer dimensions is harmful).
+ A render tree dump hack has been put into the code to keep this overflow dumping for the RenderView's layer, since otherwise
+ a huge number of tests would change.
+
+ Added fast/overflow/overflow-rtl-vertical.html to test vertical writing-mode overflow. Existing tests cover the rest.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::adjustViewSize):
+ (WebCore::FrameView::forceLayoutForPagination):
+ Changed to use RenderView's docTop/Left/Width/Height accessors, which simply grab the overflow and properly flip it
+ to account for writing modes.
+
+ * platform/graphics/IntRect.h:
+ (WebCore::IntRect::shiftLeftEdgeTo):
+ (WebCore::IntRect::shiftRightEdgeTo):
+ (WebCore::IntRect::shiftTopEdgeTo):
+ (WebCore::IntRect::shiftBottomEdgeTo):
+ New helper functions for sliding the edge of a rectangle without moving any of the other three edges.
+
+ * rendering/InlineBox.h:
+ (WebCore::InlineBox::frameRect):
+ frameRect is a helper for obtaining the x, y, width, height of an InlineBox as an IntRect.
+
+ * rendering/InlineFlowBox.cpp:
+ (WebCore::InlineFlowBox::placeBoxesInInlineDirection):
+ All of the overflow setting in the inline direction has been removed from this function. All line overflow is computed
+ at once now in a single function: computeOverflow.
+
+ (WebCore::InlineFlowBox::addBoxShadowVisualOverflow):
+ (WebCore::InlineFlowBox::addTextBoxVisualOverflow):
+ (WebCore::InlineFlowBox::addReplacedChildOverflow):
+ Helper for propagating overflow from specific types of children that occur on a line into the InlineFlowBox's overflow.
+
+ (WebCore::InlineFlowBox::computeOverflow):
+ The new function that computes both horizontal and vertical overflow for a line box.
+
+ (WebCore::InlineFlowBox::setLayoutOverflow):
+ (WebCore::InlineFlowBox::setVisualOverflow):
+ (WebCore::InlineFlowBox::setOverflowFromLogicalRects):
+ New functions that set the overflow computed by computeOverflow. These replace setBlockDirectionOverflowPositions
+ and setInlineDirectionOverflowPositions. They essentially do the same thing, but they operate on rectangles.
+
+ (WebCore::InlineFlowBox::nodeAtPoint):
+ (WebCore::InlineFlowBox::paint):
+ Changed to use visual overflow instead of visible overflow. (Visible overflow as a union of layout and visual
+ overflow is no longer necessary, since visual overflow is now equivalent to the old visible overflow concept.)
+
+ * rendering/InlineFlowBox.h:
+ (WebCore::InlineFlowBox::logicalLayoutOverflowRect):
+ (WebCore::InlineFlowBox::logicalVisualOverflowRect):
+ Helpers for obtaining logical overflow rectangles, since lines compute their overflow in logical terms before
+ converting to block coordinates at the end.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::layoutBlock):
+ (WebCore::RenderBlock::addOverflowFromChildren):
+ (WebCore::RenderBlock::computeOverflow):
+ (WebCore::RenderBlock::addOverflowFromFloats):
+ (WebCore::RenderBlock::addOverflowFromPositionedObjects):
+ Blocks now have a computeOverflow function called at the end of layout that adds in all the types of overflow. The addOverflowFromChildren
+ method is virtual so that RenderListItem and RenderTable can subclass it. RenderListItem has to position its list marker and
+ propagate marker overflow up, and RenderTable adds in overflow from its sections.
+
+ (WebCore::RenderBlock::layoutOnlyPositionedObjects):
+ (WebCore::RenderBlock::layoutPositionedObjects):
+ When only positioned objects lay out, overflow must still be recomputed. The refactoring of overflow computation into a single
+ callable method: computeOverflow, makes it possible for this to be done easily.
+
+ (WebCore::RenderBlock::paint):
+ visible -> visual.
+
+ (WebCore::RenderBlock::addOverhangingFloats):
+ The propagation of float overflow has changed substantially. The basic rules are:
+ (1) The float must be in our floating objects list to contribute to overflow.
+ (2) The float must be a descendant to contribute to overflow.
+ (3) The block must have the outermost list that contains the float, or it has a self-painting layer and
+ so the float needs to be included in its overflow.
+
+ (WebCore::RenderBlock::nodeAtPoint):
+ visible -> visual.
+
+ (WebCore::RenderBlock::layoutColumns):
+ Remove column overflow computation from layoutColumns and move it to computeOverflow.
+
+ (WebCore::RenderBlock::adjustLinePositionForPagination):
+ visible -> visual.
+
+ * rendering/RenderBlock.h:
+ (WebCore::RenderBlock::scrollbarsChanged):
+ Added a new virtual method used by table cells when scrollbars in an overflow:auto/scroll table cell come and go.
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlock::layoutInlineChildren):
+ (WebCore::RenderBlock::determineStartPosition):
+ (WebCore::RenderBlock::matchedEndLine):
+ (WebCore::RenderBlock::addOverflowFromInlineChildren):
+ (WebCore::RenderBlock::beforeSideVisualOverflowForLine):
+ (WebCore::RenderBlock::afterSideVisualOverflowForLine):
+ visible -> visual.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::scrollWidth):
+ (WebCore::RenderBox::scrollHeight):
+ Patched to use layoutOverflow functions instead of the old rightmost/leftmostPosition functions.
+
+ (WebCore::RenderBox::paintRootBoxDecorations):
+ Use docLeft and docTop here, so that writing modes are handled.
+
+ (WebCore::RenderBox::clippedOverflowRectForRepaint):
+ visible -> visual.
+
+ (WebCore::RenderBox::addOverflowFromChild):
+ (WebCore::RenderBox::addLayoutOverflow):
+ (WebCore::RenderBox::addVisualOverflow):
+ (WebCore::RenderBox::logicalVisualOverflowRectForPropagation):
+ (WebCore::RenderBox::visualOverflowRectForPropagation):
+ (WebCore::RenderBox::logicalLayoutOverflowRectForPropagation):
+ (WebCore::RenderBox::layoutOverflowRectForPropagation):
+ * rendering/RenderBox.h:
+ The new overflow system for boxes. Layout overflow now crosses self-painting layer boundaries and adjusts child boxes
+ for transforms, relative positioning and writing mode differences.
+
+ (WebCore::RenderBox::layoutOverflowRect):
+ (WebCore::RenderBox::topLayoutOverflow):
+ (WebCore::RenderBox::bottomLayoutOverflow):
+ (WebCore::RenderBox::leftLayoutOverflow):
+ (WebCore::RenderBox::rightLayoutOverflow):
+ Changed the default rectangle for layout overflow to be the client box to match the scrollable areas of overflow regions.
+
+ (WebCore::RenderBox::clientLogicalBottom):
+ New helper for obtaining the logical bottom of the client box.
+
+ (WebCore::RenderBox::clientBoxRect):
+ New helper for obtaining the clientLeft/Top/Width/Height box.
+
+ * rendering/RenderBoxModelObject.h:
+ (WebCore::RenderBoxModelObject::relativePositionLogicalOffset):
+ Helper for obtaining the relative position offset transposed for vertical writing modes. Used by line overflow.
+
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::layoutBlock):
+ Changed flexible boxes to just call the base class computeOverflow method.
+
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::linesVisualOverflowBoundingBox):
+ (WebCore::RenderInline::clippedOverflowRectForRepaint):
+ visible -> visual.
+
+ * rendering/RenderInline.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateLayerPosition):
+ Changed layers to no longer incorporate right/bottom overflow into width/height. This is the reason many layout
+ tests change. (Not doing this makes the layout test changes far worse, since overflow propagates across self-painting
+ layers now.)
+
+ (WebCore::RenderLayer::overflowTop):
+ (WebCore::RenderLayer::overflowBottom):
+ (WebCore::RenderLayer::overflowLeft):
+ (WebCore::RenderLayer::overflowRight):
+ overflowTop/Bottom/Left/Right return overflow that accounts for writing modes, i.e., purely physical overflow that can be used
+ to set up the scroll area.
+
+ (WebCore::RenderLayer::computeScrollDimensions):
+ Drastically simplified this method now that overflowTop/Bottom/Left/Right just do the right thing regarding unreachable overflow.
+
+ (WebCore::RenderLayer::updateScrollInfoAfterLayout):
+ Make sure to explicitly set the vertical scrollbar's position just as we did with horizontal scrollbars, so that clamping to the
+ bottom works.
+
+ (WebCore::performOverlapTests):
+ (WebCore::RenderLayer::paintLayer):
+ Fix a bug in performOverlapTests. It incorrectly used the layer's bounds, and so it didn't account for left/top overflow out
+ of the layer (see why I hate layers even having dimensions?). Changed it to use the bounding box of the layer instead.
+
+ (WebCore::RenderLayer::hitTest):
+ Fix a bug in hit testing. It incorrectly used the root layer's bounds as the limit of the hit test, and so it didn't account
+ for left/top overflow in a ScrollView (hate hate hate layers having dimensions). I changed it to use the hit test rect instead,
+ so that the damage rect never stops the point from being tested (unless the hit test request says not to ignore clipping).
+
+ (WebCore::RenderLayer::localBoundingBox):
+ visible -> visual.
+
+ * rendering/RenderLayer.h:
+ Added the new overflowTop/Left/Right/Bottom accessors.
+
+ * rendering/RenderLineBoxList.cpp:
+ (WebCore::RenderLineBoxList::anyLineIntersectsRect):
+ (WebCore::RenderLineBoxList::lineIntersectsDirtyRect):
+ (WebCore::RenderLineBoxList::paint):
+ (WebCore::RenderLineBoxList::hitTest):
+ visible -> visual.
+
+ * rendering/RenderListItem.cpp:
+ (WebCore::RenderListItem::addOverflowFromChildren):
+ (WebCore::RenderListItem::positionListMarker):
+ * rendering/RenderListItem.h:
+ RenderListItem now positions the list marker when computing its overflow, since the marker propagates overflow back up to the list item.
+
+ * rendering/RenderListMarker.cpp:
+ (WebCore::RenderListMarker::paint):
+ visible -> visual.
+
+ * rendering/RenderMarquee.cpp:
+ (WebCore::RenderMarquee::computePosition):
+ Changed to use overflow functions instead of rightmost/lowestPosition.
+
+ * rendering/RenderMedia.cpp:
+ * rendering/RenderMedia.h:
+ Removed the lowest/topmost/rightmost/leftmostPosition functions, since control overflow is handled properly already.
+
+ * rendering/RenderOverflow.h:
+ (WebCore::RenderOverflow::RenderOverflow):
+ (WebCore::RenderOverflow::setLayoutOverflow):
+ (WebCore::RenderOverflow::setVisualOverflow):
+ Add new setters for layout and visual overflow as rects.
+
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::shouldPaint):
+ (WebCore::RenderReplaced::clippedOverflowRectForRepaint):
+ visible -> visual.
+
+ * rendering/RenderRubyRun.cpp:
+ (WebCore::RenderRubyRun::layout):
+ Call computeOverflow to recompute our overflow information after we adjust the ruby.
+
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::layout):
+ (WebCore::RenderTable::addOverflowFromChildren):
+ (WebCore::RenderTable::paint):
+ * rendering/RenderTable.h:
+ Move section overflow propagation into addOverflowFromChildren, and change RenderTable to just call computeOverflow.
+
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::clippedOverflowRectForRepaint):
+ visible -> visual.
+
+ (WebCore::RenderTableCell::scrollbarsChanged):
+ Adding unreachable overflow support (something that in the old code only existed for positioned objects in the root view) exposed
+ a bug in table layout. If scrollbars are added during the layout that occurs after intrinsic padding was incorporated into the
+ cell, then the cell won't lay out properly the second time (after the scrollbars have been added). We have to adjust the intrinsic
+ padding accounting for the presence of the new scrollbar so the second layout will get the right dimensions.
+
+ * rendering/RenderTableCell.h:
+ (WebCore::RenderTableCell::hasVisualOverflow):
+ visible -> visual.
+
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::layoutRows):
+ * rendering/RenderTableSection.h:
+ visible -> visual. Removed the leftmost/rightmost/topmost/bottommostPosition functions.
+
+ * rendering/RenderTreeAsText.cpp:
+ (WebCore::writeLayers):
+ Added a hack to render tree dumping to include right/bottom overflow for the root layer only. This keeps a zillion layout tests
+ from failing.
+
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::layout):
+ (WebCore::RenderView::docTop):
+ (WebCore::RenderView::docBottom):
+ (WebCore::RenderView::docLeft):
+ (WebCore::RenderView::docRight):
+ * rendering/RenderView.h:
+ (WebCore::RenderView::docHeight):
+ (WebCore::RenderView::docWidth):
+ RenderView now uses docLeft/Top/Height/Width functions, which are just overflow queries that account for writing modes. These methods
+ are now the preferred way to query for the physical dimensions of a document.
+
+ * rendering/RootInlineBox.cpp:
+ (WebCore::RootInlineBox::addHighlightOverflow):
+ Changed to call setOverflowFromLogicalRects instead of the block/inline position functions.
+
+ (WebCore::RootInlineBox::alignBoxesInBlockDirection):
+ Remove the computation of block direction overflow, since it now all happens at once after the line is built.
+
+ (WebCore::RootInlineBox::paddedLayoutOverflowRect):
+ * rendering/RootInlineBox.h:
+ Added a new helper function for incorporating the end padding into a line. This end padding also includes the single pixel for a caret
+ in LTR if needed.
+
2010-12-06 Chris Marrin <cmarrin at apple.com>
Reviewed by Simon Fraser.
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index b14d11b..fdd6e93 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -435,9 +435,9 @@ void FrameView::adjustViewSize()
if (!root)
return;
- IntSize size = IntSize(root->rightLayoutOverflow() - root->leftLayoutOverflow(), root->bottomLayoutOverflow() - root->topLayoutOverflow());
+ IntSize size = IntSize(root->docWidth(), root->docHeight());
- ScrollView::setScrollOrigin(IntPoint(-root->leftLayoutOverflow(), -root->topLayoutOverflow()), size == contentsSize());
+ ScrollView::setScrollOrigin(IntPoint(-root->docLeft(), -root->docTop()), size == contentsSize());
setContentsSize(size);
}
@@ -2239,15 +2239,15 @@ void FrameView::forceLayoutForPagination(const FloatSize& pageSize, float maximu
// page width when shrunk, we will lay out at maximum shrink and clip extra content.
// FIXME: We are assuming a shrink-to-fit printing implementation. A cropping
// implementation should not do this!
- int rightmostPos = root->rightmostPosition();
- if (rightmostPos > pageSize.width()) {
- pageW = std::min<int>(rightmostPos, ceilf(pageSize.width() * maximumShrinkFactor));
+ int docWidth = root->docWidth();
+ if (docWidth > pageSize.width()) {
+ pageW = std::min<int>(docWidth, ceilf(pageSize.width() * maximumShrinkFactor));
if (pageSize.height())
root->setPageHeight(pageW / pageSize.width() * pageSize.height());
root->setWidth(pageW);
root->setNeedsLayoutAndPrefWidthsRecalc();
forceLayout();
- int docHeight = root->bottomLayoutOverflow();
+ int docHeight = root->docHeight();
root->clearLayoutOverflow();
root->addLayoutOverflow(IntRect(0, 0, pageW, docHeight)); // This is how we clip in case we overflow again.
}
diff --git a/WebCore/platform/graphics/IntRect.h b/WebCore/platform/graphics/IntRect.h
index e43e290..638db75 100644
--- a/WebCore/platform/graphics/IntRect.h
+++ b/WebCore/platform/graphics/IntRect.h
@@ -117,6 +117,29 @@ public:
void move(const IntSize& s) { m_location += s; }
void move(int dx, int dy) { m_location.move(dx, dy); }
+
+ void shiftLeftEdgeTo(int edge)
+ {
+ int delta = edge - x();
+ setX(edge);
+ setWidth(std::max(0, width() - delta));
+ }
+ void shiftRightEdgeTo(int edge)
+ {
+ int delta = edge - right();
+ setWidth(std::max(0, width() + delta));
+ }
+ void shiftTopEdgeTo(int edge)
+ {
+ int delta = edge - y();
+ setY(edge);
+ setHeight(std::max(0, height() - delta));
+ }
+ void shiftBottomEdgeTo(int edge)
+ {
+ int delta = edge - bottom();
+ setHeight(std::max(0, height() + delta));
+ }
bool intersects(const IntRect&) const;
bool contains(const IntRect&) const;
diff --git a/WebCore/rendering/InlineBox.h b/WebCore/rendering/InlineBox.h
index 991a3ff..e50a24c 100644
--- a/WebCore/rendering/InlineBox.h
+++ b/WebCore/rendering/InlineBox.h
@@ -233,6 +233,8 @@ public:
int width() const { return isHorizontal() ? logicalWidth() : logicalHeight(); }
int height() const { return isHorizontal() ? logicalHeight() : logicalWidth(); }
+ IntRect frameRect() const { return IntRect(x(), y(), width(), height()); }
+
// The logicalLeft position is the left edge of the line box in a horizontal line and the top edge in a vertical line.
int logicalLeft() const { return isHorizontal() ? m_x : m_y; }
int logicalRight() const { return logicalLeft() + logicalWidth(); }
@@ -265,7 +267,6 @@ public:
virtual int baselinePosition(FontBaseline baselineType) const { return boxModelObject()->baselinePosition(baselineType, m_firstLine, isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine); }
virtual int lineHeight() const { return boxModelObject()->lineHeight(m_firstLine, isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine); }
-
virtual int caretMinOffset() const;
virtual int caretMaxOffset() const;
virtual unsigned caretMaxRenderedOffset() const;
diff --git a/WebCore/rendering/InlineFlowBox.cpp b/WebCore/rendering/InlineFlowBox.cpp
index ee9fe9f..320a31a 100644
--- a/WebCore/rendering/InlineFlowBox.cpp
+++ b/WebCore/rendering/InlineFlowBox.cpp
@@ -259,18 +259,7 @@ int InlineFlowBox::placeBoxesInInlineDirection(int logicalLeft, bool& needsWordS
{
// Set our x position.
setLogicalLeft(logicalLeft);
-
- int logicalLeftLayoutOverflow = logicalLeft;
- int logicalRightLayoutOverflow = logicalLeft;
- int logicalLeftVisualOverflow = logicalLeft;
- int logicalRightVisualOverflow = logicalLeft;
-
- int boxShadowLogicalLeft;
- int boxShadowLogicalRight;
- renderer()->style(m_firstLine)->getBoxShadowInlineDirectionExtent(boxShadowLogicalLeft, boxShadowLogicalRight);
-
- logicalLeftVisualOverflow = min(logicalLeft + boxShadowLogicalLeft, logicalLeftVisualOverflow);
-
+
int startLogicalLeft = logicalLeft;
logicalLeft += borderLogicalLeft() + paddingLogicalLeft();
@@ -284,30 +273,6 @@ int InlineFlowBox::placeBoxesInInlineDirection(int logicalLeft, bool& needsWordS
needsWordSpacing = !isSpaceOrNewline(rt->characters()[text->end()]);
}
text->setLogicalLeft(logicalLeft);
-
- int strokeOverflow = static_cast<int>(ceilf(rt->style()->textStrokeWidth() / 2.0f));
-
- // If letter-spacing is negative, we should factor that into right layout overflow. (Even in RTL, letter-spacing is
- // applied to the right, so this is not an issue with left overflow.
- int letterSpacing = min(0, (int)rt->style(m_firstLine)->font().letterSpacing());
- logicalRightLayoutOverflow = max(logicalLeft + text->logicalWidth() - letterSpacing, logicalRightLayoutOverflow);
-
- GlyphOverflowAndFallbackFontsMap::iterator it = textBoxDataMap.find(static_cast<InlineTextBox*>(curr));
- GlyphOverflow* glyphOverflow = it == textBoxDataMap.end() ? 0 : &it->second.second;
-
- int logicalLeftGlyphOverflow = -strokeOverflow - (glyphOverflow ? glyphOverflow->left : 0);
- int logicalRightGlyphOverflow = strokeOverflow - letterSpacing + (glyphOverflow ? glyphOverflow->right : 0);
-
- int childOverflowLogicalLeft = logicalLeftGlyphOverflow;
- int childOverflowLogicalRight = logicalRightGlyphOverflow;
- int textShadowLogicalLeft;
- int textShadowLogicalRight;
- rt->style(m_firstLine)->getTextShadowInlineDirectionExtent(textShadowLogicalLeft, textShadowLogicalRight);
- childOverflowLogicalLeft = min(childOverflowLogicalLeft, textShadowLogicalLeft + logicalLeftGlyphOverflow);
- childOverflowLogicalRight = max(childOverflowLogicalRight, textShadowLogicalRight + logicalRightGlyphOverflow);
- logicalLeftVisualOverflow = min(logicalLeft + childOverflowLogicalLeft, logicalLeftVisualOverflow);
- logicalRightVisualOverflow = max(logicalLeft + text->logicalWidth() + childOverflowLogicalRight, logicalRightVisualOverflow);
-
logicalLeft += text->logicalWidth();
} else {
if (curr->renderer()->isPositioned()) {
@@ -325,10 +290,6 @@ int InlineFlowBox::placeBoxesInInlineDirection(int logicalLeft, bool& needsWordS
logicalLeft += flow->marginLogicalLeft();
logicalLeft = flow->placeBoxesInInlineDirection(logicalLeft, needsWordSpacing, textBoxDataMap);
logicalLeft += flow->marginLogicalRight();
- logicalLeftLayoutOverflow = min(logicalLeftLayoutOverflow, flow->logicalLeftLayoutOverflow());
- logicalRightLayoutOverflow = max(logicalRightLayoutOverflow, flow->logicalRightLayoutOverflow());
- logicalLeftVisualOverflow = min(logicalLeftVisualOverflow, flow->logicalLeftVisualOverflow());
- logicalRightVisualOverflow = max(logicalRightVisualOverflow, flow->logicalRightVisualOverflow());
} else if (!curr->renderer()->isListMarker() || toRenderListMarker(curr->renderer())->isInside()) {
// The box can have a different writing-mode than the overall line, so this is a bit complicated.
// Just get all the physical margin and overflow values by hand based off |isVertical|.
@@ -337,18 +298,6 @@ int InlineFlowBox::placeBoxesInInlineDirection(int logicalLeft, bool& needsWordS
logicalLeft += logicalLeftMargin;
curr->setLogicalLeft(logicalLeft);
-
- RenderBox* box = toRenderBox(curr->renderer());
-
- int childOverflowLogicalLeft = box->hasOverflowClip() ? 0 : (isHorizontal() ? box->leftLayoutOverflow() : box->topLayoutOverflow());
- int childOverflowLogicalRight = box->hasOverflowClip() ? curr->logicalWidth() : (isHorizontal() ? box->rightLayoutOverflow() : box->bottomLayoutOverflow());
-
- logicalLeftLayoutOverflow = min(logicalLeft + childOverflowLogicalLeft, logicalLeftLayoutOverflow);
- logicalRightLayoutOverflow = max(logicalLeft + childOverflowLogicalRight, logicalRightLayoutOverflow);
-
- logicalLeftVisualOverflow = min(logicalLeft + (isHorizontal() ? box->leftVisualOverflow() : box->topVisualOverflow()), logicalLeftVisualOverflow);
- logicalRightVisualOverflow = max(logicalLeft + (isHorizontal() ? box->rightVisualOverflow() : box->bottomVisualOverflow()), logicalRightVisualOverflow);
-
logicalLeft += curr->logicalWidth() + logicalRightMargin;
}
}
@@ -356,10 +305,6 @@ int InlineFlowBox::placeBoxesInInlineDirection(int logicalLeft, bool& needsWordS
logicalLeft += borderLogicalRight() + paddingLogicalRight();
setLogicalWidth(logicalLeft - startLogicalLeft);
- logicalRightVisualOverflow = max(logicalLeft + boxShadowLogicalRight, logicalRightVisualOverflow);
- logicalRightLayoutOverflow = max(logicalLeft, logicalRightLayoutOverflow);
-
- setInlineDirectionOverflowPositions(logicalLeftLayoutOverflow, logicalRightLayoutOverflow, logicalLeftVisualOverflow, logicalRightVisualOverflow);
return logicalLeft;
}
@@ -743,32 +688,112 @@ void InlineFlowBox::flipLinesInBlockDirection(int lineTop, int lineBottom)
}
}
-void InlineFlowBox::computeBlockDirectionOverflow(int lineTop, int lineBottom, bool strictMode, GlyphOverflowAndFallbackFontsMap& textBoxDataMap)
+void InlineFlowBox::addBoxShadowVisualOverflow(IntRect& logicalVisualOverflow)
{
+ if (!parent())
+ return; // Box-shadow doesn't apply to root line boxes.
+
+ int boxShadowLogicalTop;
+ int boxShadowLogicalBottom;
+ renderer()->style(m_firstLine)->getBoxShadowBlockDirectionExtent(boxShadowLogicalTop, boxShadowLogicalBottom);
+
+ int logicalTopVisualOverflow = min(logicalTop() + boxShadowLogicalTop, logicalVisualOverflow.y());
+ int logicalBottomVisualOverflow = max(logicalBottom() + boxShadowLogicalBottom, logicalVisualOverflow.bottom());
+
+ int boxShadowLogicalLeft;
+ int boxShadowLogicalRight;
+ renderer()->style(m_firstLine)->getBoxShadowInlineDirectionExtent(boxShadowLogicalLeft, boxShadowLogicalRight);
+
+ int logicalLeftVisualOverflow = min(logicalLeft() + boxShadowLogicalLeft, logicalVisualOverflow.x());
+ int logicalRightVisualOverflow = max(logicalRight() + boxShadowLogicalRight, logicalVisualOverflow.right());
+
+ logicalVisualOverflow = IntRect(logicalLeftVisualOverflow, logicalTopVisualOverflow,
+ logicalRightVisualOverflow - logicalLeftVisualOverflow, logicalBottomVisualOverflow - logicalTopVisualOverflow);
+}
+
+void InlineFlowBox::addTextBoxVisualOverflow(const InlineTextBox* textBox, GlyphOverflowAndFallbackFontsMap& textBoxDataMap, IntRect& logicalVisualOverflow)
+{
+ int strokeOverflow = static_cast<int>(ceilf(renderer()->style()->textStrokeWidth() / 2.0f));
+
+ GlyphOverflowAndFallbackFontsMap::iterator it = textBoxDataMap.find(textBox);
+ GlyphOverflow* glyphOverflow = it == textBoxDataMap.end() ? 0 : &it->second.second;
+
bool isFlippedLine = renderer()->style(m_firstLine)->isFlippedLinesWritingMode();
- int boxHeight = logicalHeight();
+ int topGlyphEdge = glyphOverflow ? (isFlippedLine ? glyphOverflow->bottom : glyphOverflow->top) : 0;
+ int bottomGlyphEdge = glyphOverflow ? (isFlippedLine ? glyphOverflow->top : glyphOverflow->bottom) : 0;
+ int leftGlyphEdge = glyphOverflow ? glyphOverflow->left : 0;
+ int rightGlyphEdge = glyphOverflow ? glyphOverflow->right : 0;
+
+ int topGlyphOverflow = -strokeOverflow - topGlyphEdge;
+ int bottomGlyphOverflow = strokeOverflow + bottomGlyphEdge;
+ int leftGlyphOverflow = -strokeOverflow - leftGlyphEdge;
+ int rightGlyphOverflow = strokeOverflow + rightGlyphEdge;
+
+ // If letter-spacing is negative, we should factor that into right layout overflow. (Even in RTL, letter-spacing is
+ // applied to the right, so this is not an issue with left overflow.
+ int letterSpacing = min(0, (int)renderer()->style(m_firstLine)->font().letterSpacing());
+ rightGlyphOverflow -= letterSpacing;
+
+ int textShadowLogicalTop;
+ int textShadowLogicalBottom;
+ renderer()->style(m_firstLine)->getTextShadowBlockDirectionExtent(textShadowLogicalTop, textShadowLogicalBottom);
+
+ int childOverflowLogicalTop = min(textShadowLogicalTop + topGlyphOverflow, topGlyphOverflow);
+ int childOverflowLogicalBottom = max(textShadowLogicalBottom + bottomGlyphOverflow, bottomGlyphOverflow);
+
+ int textShadowLogicalLeft;
+ int textShadowLogicalRight;
+ renderer()->style(m_firstLine)->getTextShadowInlineDirectionExtent(textShadowLogicalLeft, textShadowLogicalRight);
+
+ int childOverflowLogicalLeft = min(textShadowLogicalLeft + leftGlyphOverflow, leftGlyphOverflow);
+ int childOverflowLogicalRight = max(textShadowLogicalRight + rightGlyphOverflow, rightGlyphOverflow);
+
+ int logicalTopVisualOverflow = min(textBox->logicalTop() + childOverflowLogicalTop, logicalVisualOverflow.y());
+ int logicalBottomVisualOverflow = max(textBox->logicalBottom() + childOverflowLogicalBottom, logicalVisualOverflow.bottom());
+ int logicalLeftVisualOverflow = min(textBox->logicalLeft() + childOverflowLogicalLeft, logicalVisualOverflow.x());
+ int logicalRightVisualOverflow = max(textBox->logicalRight() + childOverflowLogicalRight, logicalVisualOverflow.right());
+
+ logicalVisualOverflow = IntRect(logicalLeftVisualOverflow, logicalTopVisualOverflow,
+ logicalRightVisualOverflow - logicalLeftVisualOverflow, logicalBottomVisualOverflow - logicalTopVisualOverflow);
+}
+void InlineFlowBox::addReplacedChildOverflow(const InlineBox* inlineBox, IntRect& logicalLayoutOverflow, IntRect& logicalVisualOverflow)
+{
+ RenderBox* box = toRenderBox(inlineBox->renderer());
+
+ // Visual overflow only propagates if the box doesn't have a self-painting layer. This rectangle does not include
+ // transforms or relative positioning (since those objects always have self-painting layers), but it does need to be adjusted
+ // for writing-mode differences.
+ if (!box->hasSelfPaintingLayer()) {
+ IntRect childLogicalVisualOverflow = box->logicalVisualOverflowRectForPropagation(renderer()->style());
+ childLogicalVisualOverflow.move(inlineBox->logicalLeft(), inlineBox->logicalTop());
+ logicalVisualOverflow.unite(childLogicalVisualOverflow);
+ }
+
+ // Layout overflow internal to the child box only propagates if the child box doesn't have overflow clip set.
+ // Otherwise the child border box propagates as layout overflow. This rectangle must include transforms and relative positioning
+ // and be adjusted for writing-mode differences.
+ IntRect childLogicalLayoutOverflow = box->logicalLayoutOverflowRectForPropagation(renderer()->style());
+ childLogicalLayoutOverflow.move(inlineBox->logicalLeft(), inlineBox->logicalTop());
+ logicalLayoutOverflow.unite(childLogicalLayoutOverflow);
+}
+
+void InlineFlowBox::computeOverflow(int lineTop, int lineBottom, bool strictMode, GlyphOverflowAndFallbackFontsMap& textBoxDataMap)
+{
// Any spillage outside of the line top and bottom is not considered overflow. We just ignore this, since it only happens
// from the "your ascent/descent don't affect the line" quirk.
int topOverflow = max(logicalTop(), lineTop);
- int bottomOverflow = min(logicalTop() + boxHeight, lineBottom);
-
- int topLayoutOverflow = topOverflow;
- int bottomLayoutOverflow = bottomOverflow;
+ int bottomOverflow = min(logicalBottom(), lineBottom);
- int topVisualOverflow = topOverflow;
- int bottomVisualOverflow = bottomOverflow;
+ // Visual overflow just includes overflow for stuff we need to repaint ourselves. Self-painting layers are ignored.
+ // Layout overflow is used to determine scrolling extent, so it still includes child layers and also factors in
+ // transforms, relative positioning, etc.
+ IntRect logicalLayoutOverflow(logicalLeft(), topOverflow, logicalWidth(), bottomOverflow - topOverflow);
+ IntRect logicalVisualOverflow(logicalLayoutOverflow);
// box-shadow on root line boxes is applying to the block and not to the lines.
- if (parent()) {
- int boxShadowTop;
- int boxShadowBottom;
- renderer()->style(m_firstLine)->getBoxShadowBlockDirectionExtent(boxShadowTop, boxShadowBottom);
-
- topVisualOverflow = min(logicalTop() + boxShadowTop, topVisualOverflow);
- bottomVisualOverflow = max(logicalTop() + boxHeight + boxShadowBottom, bottomVisualOverflow);
- }
+ addBoxShadowVisualOverflow(logicalVisualOverflow);
for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
if (curr->renderer()->isPositioned())
@@ -779,64 +804,70 @@ void InlineFlowBox::computeBlockDirectionOverflow(int lineTop, int lineBottom, b
RenderText* rt = toRenderText(text->renderer());
if (rt->isBR())
continue;
+ addTextBoxVisualOverflow(text, textBoxDataMap, logicalVisualOverflow);
+ } else if (curr->renderer()->isRenderInline()) {
+ InlineFlowBox* flow = static_cast<InlineFlowBox*>(curr);
+ flow->computeOverflow(lineTop, lineBottom, strictMode, textBoxDataMap);
+ if (!flow->boxModelObject()->hasSelfPaintingLayer())
+ logicalVisualOverflow.unite(flow->logicalVisualOverflowRect());
+ IntRect childLayoutOverflow = flow->logicalLayoutOverflowRect();
+ childLayoutOverflow.move(flow->boxModelObject()->relativePositionLogicalOffset());
+ logicalLayoutOverflow.unite(childLayoutOverflow);
+ } else
+ addReplacedChildOverflow(curr, logicalLayoutOverflow, logicalVisualOverflow);
+ }
+
+ setOverflowFromLogicalRects(logicalLayoutOverflow, logicalVisualOverflow);
+}
- int strokeOverflow = static_cast<int>(ceilf(rt->style()->textStrokeWidth() / 2.0f));
-
- GlyphOverflowAndFallbackFontsMap::iterator it = textBoxDataMap.find(static_cast<InlineTextBox*>(curr));
- GlyphOverflow* glyphOverflow = it == textBoxDataMap.end() ? 0 : &it->second.second;
-
- int topGlyphEdge = glyphOverflow ? (isFlippedLine ? glyphOverflow->bottom : glyphOverflow->top) : 0;
- int bottomGlyphEdge = glyphOverflow ? (isFlippedLine ? glyphOverflow->top : glyphOverflow->bottom) : 0;
-
- int topGlyphOverflow = -strokeOverflow - topGlyphEdge;
- int bottomGlyphOverflow = strokeOverflow + bottomGlyphEdge;
+// FIXME: You will notice there is no contains() check here. If the rect is smaller than the frame box it actually
+// becomes the new overflow. The reason for this is that in quirks mode we don't let inline flow boxes paint
+// outside of the root line box's lineTop and lineBottom values. We accomplish this visual clamping by actually
+// insetting the overflow rect so that it's smaller than the frame rect.
+//
+// The reason we don't just mutate the frameRect in quirks mode is that we'd have to put the m_height member variable
+// back into InlineBox. Basically the tradeoff is 4 bytes in all modes (for m_height) added to InlineFlowBox, or
+// the allocation of a RenderOverflow struct for InlineFlowBoxes in quirks mode only. For now, we're opting to award
+// the smaller memory consumption to strict mode pages.
+//
+// It might be possible to hash a custom height, or to require that lineTop and lineBottom be passed in to
+// all functions that query overflow.
+void InlineFlowBox::setLayoutOverflow(const IntRect& rect)
+{
+ IntRect frameBox = frameRect();
+ if (frameBox == rect || rect.isEmpty())
+ return;
+
+ if (!m_overflow)
+ m_overflow.set(new RenderOverflow(frameBox, frameBox));
+
+ m_overflow->setLayoutOverflow(rect);
+}
- int textShadowTop;
- int textShadowBottom;
- curr->renderer()->style(m_firstLine)->getTextShadowBlockDirectionExtent(textShadowTop, textShadowBottom);
+void InlineFlowBox::setVisualOverflow(const IntRect& rect)
+{
+ IntRect frameBox = frameRect();
+ if (frameBox == rect || rect.isEmpty())
+ return;
- int childOverflowTop = min(textShadowTop + topGlyphOverflow, topGlyphOverflow);
- int childOverflowBottom = max(textShadowBottom + bottomGlyphOverflow, bottomGlyphOverflow);
+ if (!m_overflow)
+ m_overflow.set(new RenderOverflow(frameBox, frameBox));
- topVisualOverflow = min(curr->logicalTop() + childOverflowTop, topVisualOverflow);
- bottomVisualOverflow = max(curr->logicalTop() + text->logicalHeight() + childOverflowBottom, bottomVisualOverflow);
- } else if (curr->renderer()->isRenderInline()) {
- InlineFlowBox* flow = static_cast<InlineFlowBox*>(curr);
- flow->computeBlockDirectionOverflow(lineTop, lineBottom, strictMode, textBoxDataMap);
- topLayoutOverflow = min(topLayoutOverflow, flow->logicalTopLayoutOverflow());
- bottomLayoutOverflow = max(bottomLayoutOverflow, flow->logicalBottomLayoutOverflow());
- topVisualOverflow = min(topVisualOverflow, flow->logicalTopVisualOverflow());
- bottomVisualOverflow = max(bottomVisualOverflow, flow->logicalBottomVisualOverflow());
- } else if (!curr->boxModelObject()->hasSelfPaintingLayer()){
- // Only include overflow from replaced inlines if they do not paint themselves.
- int boxLogicalTop = curr->logicalTop();
- int childTopLayoutOverflow;
- int childBottomLayoutOverflow;
- int childTopVisualOverflow;
- int childBottomVisualOverflow;
-
- RenderBox* box = toRenderBox(curr->renderer());
- box->blockDirectionOverflow(isHorizontal(), childTopLayoutOverflow, childBottomLayoutOverflow,
- childTopVisualOverflow, childBottomVisualOverflow);
-
- if (box->hasOverflowClip()) {
- childTopLayoutOverflow = 0;
- childBottomLayoutOverflow = curr->logicalHeight();
- }
+ m_overflow->setVisualOverflow(rect);
+}
- topLayoutOverflow = min(boxLogicalTop + childTopLayoutOverflow, topLayoutOverflow);
- bottomLayoutOverflow = max(boxLogicalTop + childBottomLayoutOverflow, bottomLayoutOverflow);
- topVisualOverflow = min(boxLogicalTop + childTopVisualOverflow, topVisualOverflow);
- bottomVisualOverflow = max(boxLogicalTop + childBottomVisualOverflow, bottomVisualOverflow);
- }
- }
+void InlineFlowBox::setOverflowFromLogicalRects(const IntRect& logicalLayoutOverflow, const IntRect& logicalVisualOverflow)
+{
+ IntRect layoutOverflow(isHorizontal() ? logicalLayoutOverflow : logicalLayoutOverflow.transposedRect());
+ setLayoutOverflow(layoutOverflow);
- setBlockDirectionOverflowPositions(topLayoutOverflow, bottomLayoutOverflow, topVisualOverflow, bottomVisualOverflow);
+ IntRect visualOverflow(isHorizontal() ? logicalVisualOverflow : logicalVisualOverflow.transposedRect());
+ setVisualOverflow(visualOverflow);
}
bool InlineFlowBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, int x, int y, int tx, int ty)
{
- IntRect overflowRect(visibleOverflowRect());
+ IntRect overflowRect(visualOverflowRect());
flipForWritingMode(overflowRect);
overflowRect.move(tx, ty);
if (!overflowRect.intersects(result.rectForPoint(x, y)))
@@ -865,7 +896,7 @@ bool InlineFlowBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& re
void InlineFlowBox::paint(PaintInfo& paintInfo, int tx, int ty)
{
- IntRect overflowRect(visibleOverflowRect());
+ IntRect overflowRect(visualOverflowRect());
overflowRect.inflate(renderer()->maximalOutlineSize(paintInfo.phase));
flipForWritingMode(overflowRect);
overflowRect.move(tx, ty);
diff --git a/WebCore/rendering/InlineFlowBox.h b/WebCore/rendering/InlineFlowBox.h
index 6e06a75..b92a829 100644
--- a/WebCore/rendering/InlineFlowBox.h
+++ b/WebCore/rendering/InlineFlowBox.h
@@ -163,10 +163,11 @@ public:
void placeBoxesInBlockDirection(int logicalTop, int maxHeight, int maxAscent, bool strictMode, int& lineTop, int& lineBottom, bool& setLineTop,
int& lineTopIncludingMargins, int& lineBottomIncludingMargins, bool& containsRuby, FontBaseline);
void flipLinesInBlockDirection(int lineTop, int lineBottom);
- void computeBlockDirectionOverflow(int lineTop, int lineBottom, bool strictMode, GlyphOverflowAndFallbackFontsMap&);
bool requiresIdeographicBaseline(const GlyphOverflowAndFallbackFontsMap&) const;
int computeBlockDirectionRubyAdjustment(int allowedPosition) const;
+ void computeOverflow(int lineTop, int lineBottom, bool strictMode, GlyphOverflowAndFallbackFontsMap&);
+
void removeChild(InlineBox* child);
virtual RenderObject::SelectionState selectionState();
@@ -183,17 +184,6 @@ public:
// top/right/bottom/left in the code - these aren't purely physical directions. For horizontal-tb and vertical-lr they will match physical
// directions, but for horizontal-bt and vertical-rl, the top/bottom and left/right respectively are inverted when compared to
// their physical counterparts.
- int topVisibleOverflow() const { return std::min(topLayoutOverflow(), topVisualOverflow()); }
- int bottomVisibleOverflow() const { return std::max(bottomLayoutOverflow(), bottomVisualOverflow()); }
- int leftVisibleOverflow() const { return std::min(leftLayoutOverflow(), leftVisualOverflow()); }
- int rightVisibleOverflow() const { return std::max(rightLayoutOverflow(), rightVisualOverflow()); }
- int logicalLeftVisibleOverflow() const { return std::min(logicalLeftLayoutOverflow(), logicalLeftVisualOverflow()); }
- int logicalRightVisibleOverflow() const { return std::max(logicalRightLayoutOverflow(), logicalRightVisualOverflow()); }
- int logicalTopVisibleOverflow() const { return std::min(logicalTopLayoutOverflow(), logicalTopVisualOverflow()); }
- int logicalBottomVisibleOverflow() const { return std::max(logicalBottomLayoutOverflow(), logicalBottomVisualOverflow()); }
-
- IntRect visibleOverflowRect() const { return m_overflow ? m_overflow->visibleOverflowRect() : IntRect(m_x, m_y, width(), height()); }
-
int topLayoutOverflow() const { return m_overflow ? m_overflow->topLayoutOverflow() : m_y; }
int bottomLayoutOverflow() const { return m_overflow ? m_overflow->bottomLayoutOverflow() : m_y + height(); }
int leftLayoutOverflow() const { return m_overflow ? m_overflow->leftLayoutOverflow() : m_x; }
@@ -203,6 +193,13 @@ public:
int logicalRightLayoutOverflow() const { return renderer()->style()->isHorizontalWritingMode() ? rightLayoutOverflow() : bottomLayoutOverflow(); }
int logicalTopLayoutOverflow() const { return renderer()->style()->isHorizontalWritingMode() ? topVisualOverflow() : leftVisualOverflow(); }
int logicalBottomLayoutOverflow() const { return renderer()->style()->isHorizontalWritingMode() ? bottomLayoutOverflow() : rightLayoutOverflow(); }
+ IntRect logicalLayoutOverflowRect() const
+ {
+ IntRect result = layoutOverflowRect();
+ if (!renderer()->style()->isHorizontalWritingMode())
+ result = result.transposedRect();
+ return result;
+ }
int topVisualOverflow() const { return m_overflow ? m_overflow->topVisualOverflow() : m_y; }
int bottomVisualOverflow() const { return m_overflow ? m_overflow->bottomVisualOverflow() : m_y + height(); }
@@ -213,11 +210,22 @@ public:
int logicalRightVisualOverflow() const { return renderer()->style()->isHorizontalWritingMode() ? rightVisualOverflow() : bottomVisualOverflow(); }
int logicalTopVisualOverflow() const { return renderer()->style()->isHorizontalWritingMode() ? topVisualOverflow() : leftVisualOverflow(); }
int logicalBottomVisualOverflow() const { return renderer()->style()->isHorizontalWritingMode() ? bottomVisualOverflow() : rightVisualOverflow(); }
+ IntRect logicalVisualOverflowRect() const
+ {
+ IntRect result = visualOverflowRect();
+ if (!renderer()->style()->isHorizontalWritingMode())
+ result = result.transposedRect();
+ return result;
+ }
+
+ void setOverflowFromLogicalRects(const IntRect& logicalLayoutOverflow, const IntRect& logicalVisualOverflow);
+ void setLayoutOverflow(const IntRect&);
+ void setVisualOverflow(const IntRect&);
- void setInlineDirectionOverflowPositions(int logicalLeftLayoutOverflow, int logicalRightLayoutOverflow,
- int logicalLeftVisualOverflow, int logicalRightVisualOverflow);
- void setBlockDirectionOverflowPositions(int logicalTopLayoutOverflow, int logicalBottomLayoutOverflow,
- int logicalTopVisualOverflow, int logicalBottomVisualOverflow);
+private:
+ void addBoxShadowVisualOverflow(IntRect& logicalVisualOverflow);
+ void addTextBoxVisualOverflow(const InlineTextBox*, GlyphOverflowAndFallbackFontsMap&, IntRect& logicalVisualOverflow);
+ void addReplacedChildOverflow(const InlineBox*, IntRect& logicalLayoutOverflow, IntRect& logicalVisualOverflow);
protected:
OwnPtr<RenderOverflow> m_overflow;
@@ -239,52 +247,6 @@ protected:
#endif
};
-inline void InlineFlowBox::setInlineDirectionOverflowPositions(int logicalLeftLayoutOverflow, int logicalRightLayoutOverflow,
- int logicalLeftVisualOverflow, int logicalRightVisualOverflow)
-{
- if (!m_overflow) {
- if (logicalLeftLayoutOverflow == logicalLeft() && logicalRightLayoutOverflow == logicalRight()
- && logicalLeftVisualOverflow == logicalLeft() && logicalRightVisualOverflow == logicalRight())
- return;
- m_overflow = adoptPtr(new RenderOverflow(IntRect(m_x, m_y, width(), height())));
- }
-
- if (isHorizontal()) {
- m_overflow->setLeftLayoutOverflow(logicalLeftLayoutOverflow);
- m_overflow->setRightLayoutOverflow(logicalRightLayoutOverflow);
- m_overflow->setLeftVisualOverflow(logicalLeftVisualOverflow);
- m_overflow->setRightVisualOverflow(logicalRightVisualOverflow);
- } else {
- m_overflow->setTopLayoutOverflow(logicalLeftLayoutOverflow);
- m_overflow->setBottomLayoutOverflow(logicalRightLayoutOverflow);
- m_overflow->setTopVisualOverflow(logicalLeftVisualOverflow);
- m_overflow->setBottomVisualOverflow(logicalRightVisualOverflow);
- }
-}
-
-inline void InlineFlowBox::setBlockDirectionOverflowPositions(int logicalTopLayoutOverflow, int logicalBottomLayoutOverflow,
- int logicalTopVisualOverflow, int logicalBottomVisualOverflow)
-{
- if (!m_overflow) {
- if (logicalTopLayoutOverflow == logicalTop() && logicalBottomLayoutOverflow == logicalBottom()
- && logicalTopVisualOverflow == logicalTop() && logicalBottomVisualOverflow == logicalBottom())
- return;
- m_overflow = adoptPtr(new RenderOverflow(IntRect(m_x, m_y, width(), height())));
- }
-
- if (isHorizontal()) {
- m_overflow->setTopLayoutOverflow(logicalTopLayoutOverflow);
- m_overflow->setBottomLayoutOverflow(logicalBottomLayoutOverflow);
- m_overflow->setTopVisualOverflow(logicalTopVisualOverflow);
- m_overflow->setBottomVisualOverflow(logicalBottomVisualOverflow);
- } else {
- m_overflow->setLeftLayoutOverflow(logicalTopLayoutOverflow);
- m_overflow->setRightLayoutOverflow(logicalBottomLayoutOverflow);
- m_overflow->setLeftVisualOverflow(logicalTopVisualOverflow);
- m_overflow->setRightVisualOverflow(logicalBottomVisualOverflow);
- }
-}
-
#ifdef NDEBUG
inline void InlineFlowBox::checkConsistency() const
{
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 63daf98..436def9 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -1217,6 +1217,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren, int pageHeight)
// Calculate our new height.
int oldHeight = logicalHeight();
+ int oldClientAfterEdge = clientLogicalBottom();
computeLogicalHeight();
int newHeight = logicalHeight();
if (oldHeight != newHeight) {
@@ -1235,25 +1236,10 @@ void RenderBlock::layoutBlock(bool relayoutChildren, int pageHeight)
if (previousHeight != newHeight)
relayoutChildren = true;
- // Add overflow from children (unless we're multi-column, since in that case all our child overflow is clipped anyway).
- if (!hasColumns()) {
- // This check is designed to catch anyone
- // who wasn't going to propagate float information up to the parent and yet could potentially be painted by its ancestor.
- if (isRoot() || expandsToEncloseOverhangingFloats())
- addOverflowFromFloats();
-
- if (childrenInline())
- addOverflowFromInlineChildren();
- else
- addOverflowFromBlockChildren();
- }
-
- // Add visual overflow from box-shadow and reflections.
- addShadowOverflow();
-
layoutPositionedObjects(relayoutChildren || isRoot());
- positionListMarker();
+ // Add overflow from children (unless we're multi-column, since in that case all our child overflow is clipped anyway).
+ computeOverflow(oldClientAfterEdge);
statePusher.pop();
@@ -1269,8 +1255,17 @@ void RenderBlock::layoutBlock(bool relayoutChildren, int pageHeight)
// Repaint with our new bounds if they are different from our old bounds.
bool didFullRepaint = repainter.repaintAfterLayout();
if (!didFullRepaint && repaintLogicalTop != repaintLogicalBottom && (style()->visibility() == VISIBLE || enclosingLayer()->hasVisibleContent())) {
- int repaintLogicalLeft = min(logicalLeftVisualOverflow(), logicalLeftLayoutOverflow());
- int repaintLogicalRight = max(logicalRightVisualOverflow(), logicalRightLayoutOverflow());
+ // FIXME: We could tighten up the left and right invalidation points if we let layoutInlineChildren fill them in based off the particular lines
+ // it had to lay out. We wouldn't need the hasOverflowClip() hack in that case either.
+ int repaintLogicalLeft = logicalLeftVisualOverflow();
+ int repaintLogicalRight = logicalRightVisualOverflow();
+ if (hasOverflowClip()) {
+ // If we have clipped overflow, we should use layout overflow as well, since visual overflow from lines didn't propagate to our block's overflow.
+ // Note the old code did this as well but even for overflow:visible. The addition of hasOverflowClip() at least tightens up the hack a bit.
+ // layoutInlineChildren should be patched to compute the entire repaint rect.
+ repaintLogicalLeft = min(repaintLogicalLeft, logicalLeftLayoutOverflow());
+ repaintLogicalRight = max(repaintLogicalRight, logicalRightLayoutOverflow());
+ }
IntRect repaintRect;
if (style()->isHorizontalWritingMode())
@@ -1301,6 +1296,53 @@ void RenderBlock::layoutBlock(bool relayoutChildren, int pageHeight)
setNeedsLayout(false);
}
+void RenderBlock::addOverflowFromChildren()
+{
+ if (!hasColumns()) {
+ if (childrenInline())
+ addOverflowFromInlineChildren();
+ else
+ addOverflowFromBlockChildren();
+ } else {
+ ColumnInfo* colInfo = columnInfo();
+ if (columnCount(colInfo)) {
+ IntRect lastRect = columnRectAt(colInfo, columnCount(colInfo) - 1);
+ int overflowLeft = !style()->isLeftToRightDirection() ? min(0, lastRect.x()) : 0;
+ int overflowRight = style()->isLeftToRightDirection() ? max(width(), lastRect.x() + lastRect.width()) : 0;
+ int overflowHeight = borderTop() + paddingTop() + colInfo->columnHeight();
+ addLayoutOverflow(IntRect(overflowLeft, 0, overflowRight - overflowLeft, overflowHeight));
+ }
+ }
+}
+
+void RenderBlock::computeOverflow(int oldClientAfterEdge, bool recomputeFloats)
+{
+ // Add overflow from children.
+ addOverflowFromChildren();
+
+ if (!hasColumns() && (recomputeFloats || isRoot() || expandsToEncloseOverhangingFloats() || hasSelfPaintingLayer()))
+ addOverflowFromFloats();
+
+ // Add in the overflow from positioned objects.
+ addOverflowFromPositionedObjects();
+
+ if (hasOverflowClip()) {
+ // When we have overflow clip, propagate the original spillout since it will include collapsed bottom margins
+ // and bottom padding. Set the axis we don't care about to be 1, since we want this overflow to always
+ // be considered reachable.
+ IntRect clientRect(clientBoxRect());
+ IntRect rectToApply;
+ if (style()->isHorizontalWritingMode())
+ rectToApply = IntRect(clientRect.x(), clientRect.y(), 1, max(0, oldClientAfterEdge - clientRect.y()));
+ else
+ rectToApply = IntRect(clientRect.x(), clientRect.y(), max(0, oldClientAfterEdge - clientRect.x()), 1);
+ addLayoutOverflow(rectToApply);
+ }
+
+ // Add visual overflow from box-shadow and reflections.
+ addShadowOverflow();
+}
+
void RenderBlock::addOverflowFromBlockChildren()
{
for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
@@ -1317,12 +1359,28 @@ void RenderBlock::addOverflowFromFloats()
FloatingObject* r;
DeprecatedPtrListIterator<FloatingObject> it(*m_floatingObjects);
for (; (r = it.current()); ++it) {
- if (r->m_shouldPaint && !r->m_renderer->hasSelfPaintingLayer())
+ if (r->m_isDescendant)
addOverflowFromChild(r->m_renderer, IntSize(r->left() + r->m_renderer->marginLeft(), r->top() + r->m_renderer->marginTop()));
}
return;
}
+void RenderBlock::addOverflowFromPositionedObjects()
+{
+ if (!m_positionedObjects)
+ return;
+
+ RenderBox* positionedObject;
+ Iterator end = m_positionedObjects->end();
+ for (Iterator it = m_positionedObjects->begin(); it != end; ++it) {
+ positionedObject = *it;
+
+ // Fixed positioned elements don't contribute to layout overflow, since they don't scroll with the content.
+ if (positionedObject->style()->position() != FixedPosition)
+ addOverflowFromChild(positionedObject);
+ }
+}
+
bool RenderBlock::expandsToEncloseOverhangingFloats() const
{
return isInlineBlockOrInlineTable() || isFloatingOrPositioned() || hasOverflowClip() || (parent() && parent()->isFlexibleBox())
@@ -2005,6 +2063,14 @@ bool RenderBlock::layoutOnlyPositionedObjects()
// All we have to is lay out our positioned objects.
layoutPositionedObjects(false);
+ // Recompute our overflow information.
+ // FIXME: We could do better here by computing a temporary overflow object from layoutPositionedObjects and only
+ // updating our overflow if we either used to have overflow or if the new temporary object has overflow.
+ // For now just always recompute overflow. This is no worse performance-wise than the old code that called rightmostPosition and
+ // lowestPosition on every relayout so it's not a regression.
+ m_overflow.clear();
+ computeOverflow(clientLogicalBottom(), true);
+
statePusher.pop();
updateLayerTransform();
@@ -2017,38 +2083,39 @@ bool RenderBlock::layoutOnlyPositionedObjects()
void RenderBlock::layoutPositionedObjects(bool relayoutChildren)
{
- if (m_positionedObjects) {
- if (hasColumns())
- view()->layoutState()->clearPaginationInformation(); // Positioned objects are not part of the column flow, so they don't paginate with the columns.
+ if (!m_positionedObjects)
+ return;
+
+ if (hasColumns())
+ view()->layoutState()->clearPaginationInformation(); // Positioned objects are not part of the column flow, so they don't paginate with the columns.
- RenderBox* r;
- Iterator end = m_positionedObjects->end();
- for (Iterator it = m_positionedObjects->begin(); it != end; ++it) {
- r = *it;
- // When a non-positioned block element moves, it may have positioned children that are implicitly positioned relative to the
- // non-positioned block. Rather than trying to detect all of these movement cases, we just always lay out positioned
- // objects that are positioned implicitly like this. Such objects are rare, and so in typical DHTML menu usage (where everything is
- // positioned explicitly) this should not incur a performance penalty.
- if (relayoutChildren || (r->style()->hasStaticY() && r->parent() != this && r->parent()->isBlockFlow()))
- r->setChildNeedsLayout(true, false);
-
- // If relayoutChildren is set and we have percentage padding, we also need to invalidate the child's pref widths.
- if (relayoutChildren && (r->style()->paddingStart().isPercent() || r->style()->paddingEnd().isPercent()))
- r->setPreferredLogicalWidthsDirty(true, false);
+ RenderBox* r;
+ Iterator end = m_positionedObjects->end();
+ for (Iterator it = m_positionedObjects->begin(); it != end; ++it) {
+ r = *it;
+ // When a non-positioned block element moves, it may have positioned children that are implicitly positioned relative to the
+ // non-positioned block. Rather than trying to detect all of these movement cases, we just always lay out positioned
+ // objects that are positioned implicitly like this. Such objects are rare, and so in typical DHTML menu usage (where everything is
+ // positioned explicitly) this should not incur a performance penalty.
+ if (relayoutChildren || (r->style()->hasStaticY() && r->parent() != this && r->parent()->isBlockFlow()))
+ r->setChildNeedsLayout(true, false);
- if (!r->needsLayout())
- r->markForPaginationRelayoutIfNeeded();
-
- // We don't have to do a full layout. We just have to update our position. Try that first. If we have shrink-to-fit width
- // and we hit the available width constraint, the layoutIfNeeded() will catch it and do a full layout.
- if (r->needsPositionedMovementLayoutOnly())
- r->tryLayoutDoingPositionedMovementOnly();
- r->layoutIfNeeded();
- }
+ // If relayoutChildren is set and we have percentage padding, we also need to invalidate the child's pref widths.
+ if (relayoutChildren && (r->style()->paddingStart().isPercent() || r->style()->paddingEnd().isPercent()))
+ r->setPreferredLogicalWidthsDirty(true, false);
- if (hasColumns())
- view()->layoutState()->m_columnInfo = columnInfo(); // FIXME: Kind of gross. We just put this back into the layout state so that pop() will work.
+ if (!r->needsLayout())
+ r->markForPaginationRelayoutIfNeeded();
+
+ // We don't have to do a full layout. We just have to update our position. Try that first. If we have shrink-to-fit width
+ // and we hit the available width constraint, the layoutIfNeeded() will catch it and do a full layout.
+ if (r->needsPositionedMovementLayoutOnly())
+ r->tryLayoutDoingPositionedMovementOnly();
+ r->layoutIfNeeded();
}
+
+ if (hasColumns())
+ view()->layoutState()->m_columnInfo = columnInfo(); // FIXME: Kind of gross. We just put this back into the layout state so that pop() will work.
}
void RenderBlock::markPositionedObjectsForLayout()
@@ -2113,7 +2180,7 @@ void RenderBlock::paint(PaintInfo& paintInfo, int tx, int ty)
// FIXME: Could eliminate the isRoot() check if we fix background painting so that the RenderView
// paints the root's background.
if (!isRoot()) {
- IntRect overflowBox = visibleOverflowRect();
+ IntRect overflowBox = visualOverflowRect();
overflowBox.inflate(maximalOutlineSize(paintInfo.phase));
overflowBox.move(tx, ty);
if (!overflowBox.intersects(paintInfo.rect))
@@ -3354,418 +3421,6 @@ int RenderBlock::lowestFloatLogicalBottom(FloatingObject::Type floatType) const
return lowestFloatBottom;
}
-int RenderBlock::topmostPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform applyTransform) const
-{
- IntRect transformedRect = transformedFrameRect();
- int transformedTop = includeSelf && transformedRect.width() > 0 ? 0 : transformedRect.height();
-
- if (!includeOverflowInterior && (hasOverflowClip() || hasControlClip()))
- return transformedTop;
-
- if (!firstChild() && (!transformedRect.width() || !transformedRect.height()))
- return transformedTop;
-
- int top = includeSelf && width() > 0 ? 0 : height();
-
- if (!hasColumns()) {
- // FIXME: Come up with a way to use the layer tree to avoid visiting all the kids.
- // For now, we have to descend into all the children, since we may have a huge abs div inside
- // a tiny rel div buried somewhere deep in our child tree. In this case we have to get to
- // the abs div.
- for (RenderObject* c = firstChild(); c; c = c->nextSibling()) {
- if (!c->isFloatingOrPositioned() && c->isBox()) {
- RenderBox* childBox = toRenderBox(c);
- top = min(top, childBox->transformedFrameRect().y() + childBox->topmostPosition(false));
- }
- }
- }
-
- if (includeSelf && isRelPositioned())
- top += relativePositionOffsetY();
-
- if (!includeOverflowInterior && hasOverflowClip())
- return top;
-
- int relativeOffset = includeSelf && isRelPositioned() ? relativePositionOffsetY() : 0;
-
- if (includeSelf)
- top = min(top, topLayoutOverflow() + relativeOffset);
-
- if (m_positionedObjects) {
- RenderBox* r;
- Iterator end = m_positionedObjects->end();
- for (Iterator it = m_positionedObjects->begin(); it != end; ++it) {
- r = *it;
- // Fixed positioned objects do not scroll and thus should not constitute
- // part of the topmost position.
- if (r->style()->position() != FixedPosition) {
- // FIXME: Should work for overflow sections too.
- // If a positioned object lies completely to the left of the root it will be unreachable via scrolling.
- // Therefore we should not allow it to contribute to the topmost position.
- IntRect transformedR = r->transformedFrameRect();
- if (!isRenderView() || transformedR.x() + transformedR.width() > 0 || transformedR.x() + r->rightmostPosition(false) > 0) {
- int tp = transformedR.y() + r->topmostPosition(false);
- top = min(top, tp + relativeOffset);
- }
- }
- }
- }
-
- if (hasColumns()) {
- ColumnInfo* colInfo = columnInfo();
- for (unsigned i = 0; i < columnCount(colInfo); i++)
- top = min(top, columnRectAt(colInfo, i).y() + relativeOffset);
- return top;
- }
-
- if (m_floatingObjects) {
- FloatingObject* r;
- DeprecatedPtrListIterator<FloatingObject> it(*m_floatingObjects);
- for ( ; (r = it.current()); ++it) {
- if (r->m_shouldPaint || r->m_renderer->hasSelfPaintingLayer()) {
- int tp = r->top() + r->m_renderer->marginTop() + r->m_renderer->topmostPosition(false);
- top = min(top, tp + relativeOffset);
- }
- }
- }
-
- if (!includeSelf && firstRootBox())
- top = min(top, firstRootBox()->selectionTop() + relativeOffset);
-
- if (applyTransform == IncludeTransform && includeSelf && layer() && layer()->hasTransform()) {
- int bottom = lowestPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int right = rightmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int left = leftmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- IntRect transformRect = applyLayerTransformToRect(IntRect(left, top, right - left, bottom - top));
- return transformRect.y();
- }
-
- return top;
-}
-
-int RenderBlock::lowestPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform applyTransform) const
-{
- IntRect transformedRect = transformedFrameRect();
- int transformedBottom = includeSelf && transformedRect.width() > 0 ? transformedRect.height() : 0;
-
- if (!includeOverflowInterior && (hasOverflowClip() || hasControlClip()))
- return transformedBottom;
-
- if (!firstChild() && (!transformedRect.width() || !transformedRect.height()))
- return transformedBottom;
-
- int bottom = includeSelf && width() > 0 ? height() : 0;
-
- if (!hasColumns()) {
- // FIXME: Come up with a way to use the layer tree to avoid visiting all the kids.
- // For now, we have to descend into all the children, since we may have a huge abs div inside
- // a tiny rel div buried somewhere deep in our child tree. In this case we have to get to
- // the abs div.
- // See the last test case in https://bugs.webkit.org/show_bug.cgi?id=9314 for why this is a problem.
- // For inline children, we miss relative positioned boxes that might be buried inside <span>s.
- for (RenderObject* c = firstChild(); c; c = c->nextSibling()) {
- if (!c->isFloatingOrPositioned() && c->isBox()) {
- RenderBox* childBox = toRenderBox(c);
- bottom = max(bottom, childBox->transformedFrameRect().y() + childBox->lowestPosition(false));
- }
- }
- }
-
- if (includeSelf && isRelPositioned())
- bottom += relativePositionOffsetY();
- if (!includeOverflowInterior && hasOverflowClip())
- return bottom;
-
- int relativeOffset = includeSelf && isRelPositioned() ? relativePositionOffsetY() : 0;
-
- if (includeSelf)
- bottom = max(bottom, bottomLayoutOverflow() + relativeOffset);
-
- if (m_positionedObjects) {
- RenderBox* r;
- Iterator end = m_positionedObjects->end();
- for (Iterator it = m_positionedObjects->begin(); it != end; ++it) {
- r = *it;
- // Fixed positioned objects do not scroll and thus should not constitute
- // part of the lowest position.
- if (r->style()->position() != FixedPosition) {
- // FIXME: Should work for overflow sections too.
- // If a positioned object lies completely to the left of the root it will be unreachable via scrolling.
- // Therefore we should not allow it to contribute to the lowest position.
- IntRect transformedR = r->transformedFrameRect();
- if (!isRenderView() || transformedR.x() + transformedR.width() > 0 || transformedR.x() + r->rightmostPosition(false) > 0) {
- int lp = transformedR.y() + r->lowestPosition(false);
- bottom = max(bottom, lp + relativeOffset);
- }
- }
- }
- }
-
- if (hasColumns()) {
- ColumnInfo* colInfo = columnInfo();
- for (unsigned i = 0; i < columnCount(colInfo); i++)
- bottom = max(bottom, columnRectAt(colInfo, i).bottom() + relativeOffset);
- return bottom;
- }
-
- if (m_floatingObjects) {
- FloatingObject* r;
- DeprecatedPtrListIterator<FloatingObject> it(*m_floatingObjects);
- for ( ; (r = it.current()); ++it ) {
- if (r->m_shouldPaint || r->m_renderer->hasSelfPaintingLayer()) {
- int lp = r->top() + r->m_renderer->marginTop() + r->m_renderer->lowestPosition(false);
- bottom = max(bottom, lp + relativeOffset);
- }
- }
- }
-
- if (!includeSelf) {
- bottom = max(bottom, borderTop() + paddingTop() + paddingBottom() + relativeOffset);
- if (childrenInline()) {
- if (lastRootBox()) {
- int childBottomEdge = lastRootBox()->selectionBottom();
- bottom = max(bottom, childBottomEdge + paddingBottom() + relativeOffset);
- }
- } else {
- // Find the last normal flow child.
- RenderBox* currBox = lastChildBox();
- while (currBox && currBox->isFloatingOrPositioned())
- currBox = currBox->previousSiblingBox();
- if (currBox) {
- IntRect transformedCurrBox = currBox->transformedFrameRect();
- int childBottomEdge = transformedCurrBox.y() + transformedCurrBox.height() + currBox->collapsedMarginAfter(); // FIXME: "after" is wrong here for lowestPosition.
- bottom = max(bottom, childBottomEdge + paddingBottom() + relativeOffset);
- }
- }
- }
-
- if (applyTransform == IncludeTransform && includeSelf && layer() && layer()->hasTransform()) {
- int top = topmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int right = rightmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int left = leftmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- IntRect transformRect = applyLayerTransformToRect(IntRect(left, top, right - left, bottom - top));
- return transformRect.height();
- }
-
- return bottom;
-}
-
-int RenderBlock::rightmostPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform applyTransform) const
-{
- IntRect transformedRect = transformedFrameRect();
- int transformedRight = includeSelf && transformedRect.height() > 0 ? transformedRect.width() : 0;
-
- if (!includeOverflowInterior && (hasOverflowClip() || hasControlClip()))
- return transformedRight;
-
- if (!firstChild() && (!transformedRect.width() || !transformedRect.height()))
- return transformedRight;
-
- int right = includeSelf && height() > 0 ? width() : 0;
-
- if (!hasColumns()) {
- // FIXME: Come up with a way to use the layer tree to avoid visiting all the kids.
- // For now, we have to descend into all the children, since we may have a huge abs div inside
- // a tiny rel div buried somewhere deep in our child tree. In this case we have to get to
- // the abs div.
- for (RenderObject* c = firstChild(); c; c = c->nextSibling()) {
- if (!c->isFloatingOrPositioned() && c->isBox()) {
- RenderBox* childBox = toRenderBox(c);
- right = max(right, childBox->transformedFrameRect().x() + childBox->rightmostPosition(false));
- }
- }
- }
-
- if (includeSelf && isRelPositioned())
- right += relativePositionOffsetX();
-
- if (!includeOverflowInterior && hasOverflowClip())
- return right;
-
- int relativeOffset = includeSelf && isRelPositioned() ? relativePositionOffsetX() : 0;
-
- if (includeSelf)
- right = max(right, rightLayoutOverflow() + relativeOffset);
-
- if (m_positionedObjects) {
- RenderBox* r;
- Iterator end = m_positionedObjects->end();
- for (Iterator it = m_positionedObjects->begin() ; it != end; ++it) {
- r = *it;
- // Fixed positioned objects do not scroll and thus should not constitute
- // part of the rightmost position.
- if (r->style()->position() != FixedPosition) {
- // FIXME: Should work for overflow sections too.
- // If a positioned object lies completely above the root it will be unreachable via scrolling.
- // Therefore we should not allow it to contribute to the rightmost position.
- IntRect transformedR = r->transformedFrameRect();
- if (!isRenderView() || transformedR.y() + transformedR.height() > 0 || transformedR.y() + r->lowestPosition(false) > 0) {
- int rp = transformedR.x() + r->rightmostPosition(false);
- right = max(right, rp + relativeOffset);
- }
- }
- }
- }
-
- if (hasColumns()) {
- // This only matters for LTR
- if (style()->isLeftToRightDirection()) {
- ColumnInfo* colInfo = columnInfo();
- unsigned count = columnCount(colInfo);
- if (count)
- right = max(columnRectAt(colInfo, count - 1).right() + relativeOffset, right);
- }
- if (applyTransform == IncludeTransform && includeSelf && layer() && layer()->hasTransform()) {
- int top = topmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int bottom = lowestPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int left = leftmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- IntRect transformRect = applyLayerTransformToRect(IntRect(left, top, right - left, bottom - top));
- return transformRect.width();
- }
- return right;
- }
-
- if (m_floatingObjects) {
- FloatingObject* r;
- DeprecatedPtrListIterator<FloatingObject> it(*m_floatingObjects);
- for ( ; (r = it.current()); ++it ) {
- if (r->m_shouldPaint || r->m_renderer->hasSelfPaintingLayer()) {
- int rp = r->left() + r->m_renderer->marginLeft() + r->m_renderer->rightmostPosition(false);
- right = max(right, rp + relativeOffset);
- }
- }
- }
-
- if (!includeSelf) {
- right = max(right, borderLeft() + paddingLeft() + paddingRight() + relativeOffset);
- if (childrenInline()) {
- for (InlineFlowBox* currBox = firstLineBox(); currBox; currBox = currBox->nextLineBox()) {
- int childRightEdge = currBox->x() + currBox->logicalWidth();
-
- // If this node is a root editable element, then the rightmostPosition should account for a caret at the end.
- // FIXME: Need to find another way to do this, since scrollbars could show when we don't want them to.
- if (node() && node()->isContentEditable() && node() == node()->rootEditableElement() && style()->isLeftToRightDirection() && !paddingRight())
- childRightEdge += 1;
- right = max(right, childRightEdge + paddingRight() + relativeOffset);
- }
- } else {
- // Walk all normal flow children.
- for (RenderBox* currBox = firstChildBox(); currBox; currBox = currBox->nextSiblingBox()) {
- if (currBox->isFloatingOrPositioned())
- continue;
- IntRect transformedChild = currBox->transformedFrameRect();
- int childRightEdge = transformedChild.x() + transformedChild.width() + currBox->marginRight();
- right = max(right, childRightEdge + paddingRight() + relativeOffset);
- }
- }
- }
-
- if (applyTransform == IncludeTransform && includeSelf && layer() && layer()->hasTransform()) {
- int top = topmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int bottom = lowestPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int left = leftmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- IntRect transformRect = applyLayerTransformToRect(IntRect(left, top, right - left, bottom - top));
- return transformRect.width();
- }
-
- return right;
-}
-
-int RenderBlock::leftmostPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform applyTransform) const
-{
- IntRect transformedRect = transformedFrameRect();
- int transformedLeft = includeSelf && transformedRect.height() > 0 ? 0 : transformedRect.width();
-
- if (!includeOverflowInterior && (hasOverflowClip() || hasControlClip()))
- return transformedLeft;
-
- if (!firstChild() && (!transformedRect.width() || !transformedRect.height()))
- return transformedLeft;
-
- int left = includeSelf && height() > 0 ? 0 : width();
-
- if (!hasColumns()) {
- // FIXME: Come up with a way to use the layer tree to avoid visiting all the kids.
- // For now, we have to descend into all the children, since we may have a huge abs div inside
- // a tiny rel div buried somewhere deep in our child tree. In this case we have to get to
- // the abs div.
- for (RenderObject* c = firstChild(); c; c = c->nextSibling()) {
- if (!c->isFloatingOrPositioned() && c->isBox()) {
- RenderBox* childBox = toRenderBox(c);
- left = min(left, childBox->transformedFrameRect().x() + childBox->leftmostPosition(false));
- }
- }
- }
-
- if (includeSelf && isRelPositioned())
- left += relativePositionOffsetX();
-
- if (!includeOverflowInterior && hasOverflowClip())
- return left;
-
- int relativeOffset = includeSelf && isRelPositioned() ? relativePositionOffsetX() : 0;
-
- if (includeSelf)
- left = min(left, leftLayoutOverflow() + relativeOffset);
-
- if (m_positionedObjects) {
- RenderBox* r;
- Iterator end = m_positionedObjects->end();
- for (Iterator it = m_positionedObjects->begin(); it != end; ++it) {
- r = *it;
- // Fixed positioned objects do not scroll and thus should not constitute
- // part of the leftmost position.
- if (r->style()->position() != FixedPosition) {
- // FIXME: Should work for overflow sections too.
- // If a positioned object lies completely above the root it will be unreachable via scrolling.
- // Therefore we should not allow it to contribute to the leftmost position.
- IntRect transformedR = r->transformedFrameRect();
- if (!isRenderView() || transformedR.y() + transformedR.height() > 0 || transformedR.y() + r->lowestPosition(false) > 0) {
- int lp = transformedR.x() + r->leftmostPosition(false);
- left = min(left, lp + relativeOffset);
- }
- }
- }
- }
-
- if (hasColumns()) {
- // This only matters for RTL
- if (!style()->isLeftToRightDirection()) {
- ColumnInfo* colInfo = columnInfo();
- unsigned count = columnCount(colInfo);
- if (count)
- left = min(columnRectAt(colInfo, count - 1).x() + relativeOffset, left);
- }
- return left;
- }
-
- if (m_floatingObjects) {
- FloatingObject* r;
- DeprecatedPtrListIterator<FloatingObject> it(*m_floatingObjects);
- for ( ; (r = it.current()); ++it ) {
- if (r->m_shouldPaint || r->m_renderer->hasSelfPaintingLayer()) {
- int lp = r->left() + r->m_renderer->marginLeft() + r->m_renderer->leftmostPosition(false);
- left = min(left, lp + relativeOffset);
- }
- }
- }
-
- if (!includeSelf && firstLineBox()) {
- for (InlineFlowBox* currBox = firstLineBox(); currBox; currBox = currBox->nextLineBox())
- left = min(left, (int)currBox->x() + relativeOffset);
- }
-
- if (applyTransform == IncludeTransform && includeSelf && layer() && layer()->hasTransform()) {
- int top = topmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int bottom = lowestPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int right = rightmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- IntRect transformRect = applyLayerTransformToRect(IntRect(left, top, right - left, bottom - top));
- return transformRect.x();
- }
-
- return left;
-}
-
void RenderBlock::markLinesDirtyInBlockRange(int logicalTop, int logicalBottom, RootInlineBox* highest)
{
if (logicalTop >= logicalBottom)
@@ -3916,6 +3571,8 @@ int RenderBlock::addOverhangingFloats(RenderBlock* child, int logicalLeftOffset,
else
floatingObj->m_shouldPaint = false;
+ floatingObj->m_isDescendant = true;
+
// We create the floating object list lazily.
if (!m_floatingObjects) {
m_floatingObjects = new DeprecatedPtrList<FloatingObject>;
@@ -3923,17 +3580,22 @@ int RenderBlock::addOverhangingFloats(RenderBlock* child, int logicalLeftOffset,
}
m_floatingObjects->append(floatingObj);
}
- } else if (makeChildPaintOtherFloats && !r->m_shouldPaint && !r->m_renderer->hasSelfPaintingLayer() &&
- r->m_renderer->isDescendantOf(child) && r->m_renderer->enclosingLayer() == child->enclosingLayer())
- // The float is not overhanging from this block, so if it is a descendant of the child, the child should
- // paint it (the other case is that it is intruding into the child), unless it has its own layer or enclosing
- // layer.
- // If makeChildPaintOtherFloats is false, it means that the child must already know about all the floats
- // it should paint.
- r->m_shouldPaint = true;
-
- if (r->m_shouldPaint && !r->m_renderer->hasSelfPaintingLayer())
- child->addOverflowFromChild(r->m_renderer, IntSize(r->left() + r->m_renderer->marginLeft(), r->top() + r->m_renderer->marginTop()));
+ } else {
+ if (makeChildPaintOtherFloats && !r->m_shouldPaint && !r->m_renderer->hasSelfPaintingLayer() &&
+ r->m_renderer->isDescendantOf(child) && r->m_renderer->enclosingLayer() == child->enclosingLayer()) {
+ // The float is not overhanging from this block, so if it is a descendant of the child, the child should
+ // paint it (the other case is that it is intruding into the child), unless it has its own layer or enclosing
+ // layer.
+ // If makeChildPaintOtherFloats is false, it means that the child must already know about all the floats
+ // it should paint.
+ r->m_shouldPaint = true;
+ }
+
+ // Since the float doesn't overhang, it didn't get put into our list. We need to go ahead and add its overflow in to the
+ // child now.
+ if (r->m_isDescendant)
+ child->addOverflowFromChild(r->m_renderer, IntSize(r->left() + r->m_renderer->marginLeft(), r->top() + r->m_renderer->marginTop()));
+ }
}
return lowestFloatLogicalBottom;
}
@@ -4101,7 +3763,7 @@ bool RenderBlock::nodeAtPoint(const HitTestRequest& request, HitTestResult& resu
if (!isRenderView()) {
// Check if we need to do anything at all.
- IntRect overflowBox = visibleOverflowRect();
+ IntRect overflowBox = visualOverflowRect();
overflowBox.move(tx, ty);
if (!overflowBox.intersects(result.rectForPoint(_x, _y)))
return false;
@@ -4561,49 +4223,43 @@ IntRect RenderBlock::columnRectAt(ColumnInfo* colInfo, unsigned index) const
bool RenderBlock::layoutColumns(bool hasSpecifiedPageHeight, int pageHeight, LayoutStateMaintainer& statePusher)
{
- if (hasColumns()) {
- // FIXME: We don't balance properly at all in the presence of forced page breaks. We need to understand what
- // the distance between forced page breaks is so that we can avoid making the minimum column height too tall.
- ColumnInfo* colInfo = columnInfo();
- int desiredColumnCount = colInfo->desiredColumnCount();
- if (!hasSpecifiedPageHeight) {
- int columnHeight = pageHeight;
- int minColumnCount = colInfo->forcedBreaks() + 1;
- if (minColumnCount >= desiredColumnCount) {
- // The forced page breaks are in control of the balancing. Just set the column height to the
- // maximum page break distance.
- if (!pageHeight) {
- int distanceBetweenBreaks = max(colInfo->maximumDistanceBetweenForcedBreaks(),
- view()->layoutState()->pageY(borderTop() + paddingTop() + contentHeight()) - colInfo->forcedBreakOffset());
- columnHeight = max(colInfo->minimumColumnHeight(), distanceBetweenBreaks);
- }
- } else if (contentHeight() > pageHeight * desiredColumnCount) {
- // Now that we know the intrinsic height of the columns, we have to rebalance them.
- columnHeight = max(colInfo->minimumColumnHeight(), (int)ceilf((float)contentHeight() / desiredColumnCount));
- }
-
- if (columnHeight && columnHeight != pageHeight) {
- statePusher.pop();
- m_everHadLayout = true;
- layoutBlock(false, columnHeight);
- return true;
+ if (!hasColumns())
+ return false;
+
+ // FIXME: We don't balance properly at all in the presence of forced page breaks. We need to understand what
+ // the distance between forced page breaks is so that we can avoid making the minimum column height too tall.
+ ColumnInfo* colInfo = columnInfo();
+ int desiredColumnCount = colInfo->desiredColumnCount();
+ if (!hasSpecifiedPageHeight) {
+ int columnHeight = pageHeight;
+ int minColumnCount = colInfo->forcedBreaks() + 1;
+ if (minColumnCount >= desiredColumnCount) {
+ // The forced page breaks are in control of the balancing. Just set the column height to the
+ // maximum page break distance.
+ if (!pageHeight) {
+ int distanceBetweenBreaks = max(colInfo->maximumDistanceBetweenForcedBreaks(),
+ view()->layoutState()->pageY(borderTop() + paddingTop() + contentHeight()) - colInfo->forcedBreakOffset());
+ columnHeight = max(colInfo->minimumColumnHeight(), distanceBetweenBreaks);
}
- }
+ } else if (contentHeight() > pageHeight * desiredColumnCount) {
+ // Now that we know the intrinsic height of the columns, we have to rebalance them.
+ columnHeight = max(colInfo->minimumColumnHeight(), (int)ceilf((float)contentHeight() / desiredColumnCount));
+ }
- if (pageHeight) // FIXME: Should we use lowestPosition (excluding our positioned objects) instead of contentHeight()?
- colInfo->setColumnCountAndHeight(ceilf((float)contentHeight() / pageHeight), pageHeight);
-
- if (columnCount(colInfo)) {
- IntRect lastRect = columnRectAt(colInfo, columnCount(colInfo) - 1);
- int overflowLeft = !style()->isLeftToRightDirection() ? min(0, lastRect.x()) : 0;
- int overflowRight = style()->isLeftToRightDirection() ? max(width(), lastRect.x() + lastRect.width()) : 0;
- int overflowHeight = borderTop() + paddingTop() + colInfo->columnHeight();
-
- setLogicalHeight(overflowHeight + borderBottom() + paddingBottom() + horizontalScrollbarHeight());
-
- m_overflow.clear();
- addLayoutOverflow(IntRect(overflowLeft, 0, overflowRight - overflowLeft, overflowHeight));
+ if (columnHeight && columnHeight != pageHeight) {
+ statePusher.pop();
+ m_everHadLayout = true;
+ layoutBlock(false, columnHeight);
+ return true;
}
+ }
+
+ if (pageHeight) // FIXME: Should we use lowestPosition (excluding our positioned objects) instead of contentHeight()?
+ colInfo->setColumnCountAndHeight(ceilf((float)contentHeight() / pageHeight), pageHeight);
+
+ if (columnCount(colInfo)) {
+ setLogicalHeight(borderTop() + paddingTop() + colInfo->columnHeight() + borderBottom() + paddingBottom() + horizontalScrollbarHeight());
+ m_overflow.clear();
}
return false;
@@ -6161,8 +5817,8 @@ void RenderBlock::adjustLinePositionForPagination(RootInlineBox* lineBox, int& d
// line and all following lines.
LayoutState* layoutState = view()->layoutState();
int pageHeight = layoutState->m_pageHeight;
- int yPos = lineBox->topVisibleOverflow();
- int lineHeight = lineBox->bottomVisibleOverflow() - yPos;
+ int yPos = lineBox->topVisualOverflow();
+ int lineHeight = lineBox->bottomVisualOverflow() - yPos;
if (layoutState->m_columnInfo)
layoutState->m_columnInfo->updateMinimumColumnHeight(lineHeight);
yPos += delta;
diff --git a/WebCore/rendering/RenderBlock.h b/WebCore/rendering/RenderBlock.h
index 5153218..94d6980 100644
--- a/WebCore/rendering/RenderBlock.h
+++ b/WebCore/rendering/RenderBlock.h
@@ -98,11 +98,6 @@ public:
int availableLogicalWidthForLine(int position, bool firstLine) const;
int logicalRightOffsetForLine(int position, bool firstLine) const { return logicalRightOffsetForLine(position, logicalRightOffsetForContent(), firstLine); }
int logicalLeftOffsetForLine(int position, bool firstLine) const { return logicalLeftOffsetForLine(position, logicalLeftOffsetForContent(), firstLine); }
-
- virtual int topmostPosition(bool includeOverflowInterior = true, bool includeSelf = true, ApplyTransform = IncludeTransform) const;
- virtual int lowestPosition(bool includeOverflowInterior = true, bool includeSelf = true, ApplyTransform = IncludeTransform) const;
- virtual int rightmostPosition(bool includeOverflowInterior = true, bool includeSelf = true, ApplyTransform = IncludeTransform) const;
- virtual int leftmostPosition(bool includeOverflowInterior = true, bool includeSelf = true, ApplyTransform = IncludeTransform) const;
virtual VisiblePosition positionForPoint(const IntPoint&);
@@ -209,6 +204,8 @@ public:
};
MarginValues marginValuesForChild(RenderBox* child);
+ virtual void scrollbarsChanged(bool /*horizontalScrollbarChanged*/, bool /*verticalScrollbarChanged*/) { };
+
protected:
// These functions are only used internally to manipulate the render tree structure via remove/insert/appendChildNode.
// Since they are typically called only to move objects around within anonymous blocks (which only have layers in
@@ -286,6 +283,13 @@ protected:
virtual bool hasLineIfEmpty() const;
bool layoutOnlyPositionedObjects();
+ void computeOverflow(int oldClientAfterEdge, bool recomputeFloats = false);
+ virtual void addOverflowFromChildren();
+ void addOverflowFromFloats();
+ void addOverflowFromPositionedObjects();
+ void addOverflowFromBlockChildren();
+ void addOverflowFromInlineChildren();
+
#if ENABLE(SVG)
protected:
@@ -298,8 +302,6 @@ protected:
}
#endif
- void addOverflowFromBlockChildren();
-
private:
virtual RenderObjectChildList* virtualChildren() { return children(); }
virtual const RenderObjectChildList* virtualChildren() const { return children(); }
@@ -330,8 +332,6 @@ private:
void layoutBlockChildren(bool relayoutChildren, int& maxFloatLogicalBottom);
void layoutInlineChildren(bool relayoutChildren, int& repaintLogicalTop, int& repaintLogicalBottom);
- virtual void positionListMarker() { }
-
virtual void borderFitAdjust(int& x, int& w) const; // Shrink the box in which the border paints if border-fit is set.
virtual void updateBeforeAfterContent(PseudoId);
@@ -463,15 +463,12 @@ private:
void computeBlockDirectionPositionsForLine(RootInlineBox*, BidiRun*, GlyphOverflowAndFallbackFontsMap&, VerticalPositionCache&);
void deleteEllipsisLineBoxes();
void checkLinesForTextOverflow();
- void addOverflowFromInlineChildren();
- int beforeSideVisibleOverflowForLine(RootInlineBox*) const;
- int afterSideVisibleOverflowForLine(RootInlineBox*) const;
+ int beforeSideVisualOverflowForLine(RootInlineBox*) const;
+ int afterSideVisualOverflowForLine(RootInlineBox*) const;
int beforeSideLayoutOverflowForLine(RootInlineBox*) const;
int afterSideLayoutOverflowForLine(RootInlineBox*) const;
// End of functions defined in RenderBlockLineLayout.cpp.
- void addOverflowFromFloats();
-
void paintFloats(PaintInfo&, int tx, int ty, bool preservePhase = false);
void paintContents(PaintInfo&, int tx, int ty);
void paintColumnContents(PaintInfo&, int tx, int ty, bool paintFloats = false);
diff --git a/WebCore/rendering/RenderBlockLineLayout.cpp b/WebCore/rendering/RenderBlockLineLayout.cpp
index e969a2a..f46da11 100644
--- a/WebCore/rendering/RenderBlockLineLayout.cpp
+++ b/WebCore/rendering/RenderBlockLineLayout.cpp
@@ -615,8 +615,8 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
RenderArena* arena = renderArena();
RootInlineBox* box = startLine;
while (box) {
- repaintLogicalTop = min(repaintLogicalTop, beforeSideVisibleOverflowForLine(box));
- repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisibleOverflowForLine(box));
+ repaintLogicalTop = min(repaintLogicalTop, beforeSideVisualOverflowForLine(box));
+ repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisualOverflowForLine(box));
RootInlineBox* next = box->nextRootBox();
box->deleteLine(arena);
box = next;
@@ -764,6 +764,9 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
}
#endif
+ // Compute our overflow now.
+ lineBox->computeOverflow(lineBox->lineTop(), lineBox->lineBottom(), document()->inNoQuirksMode(), textBoxDataMap);
+
#if PLATFORM(MAC)
// Highlight acts as an overflow inflation.
if (style()->highlight() != nullAtom)
@@ -777,8 +780,8 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
if (lineBox) {
lineBox->setLineBreakInfo(end.obj, end.pos, resolver.status());
if (useRepaintBounds) {
- repaintLogicalTop = min(repaintLogicalTop, beforeSideVisibleOverflowForLine(lineBox));
- repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisibleOverflowForLine(lineBox));
+ repaintLogicalTop = min(repaintLogicalTop, beforeSideVisualOverflowForLine(lineBox));
+ repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisualOverflowForLine(lineBox));
}
if (paginated) {
@@ -788,7 +791,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
int oldLineWidth = availableLogicalWidthForLine(oldLogicalHeight, firstLine);
lineBox->adjustPosition(0, adjustment);
if (useRepaintBounds) // This can only be a positive adjustment, so no need to update repaintTop.
- repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisibleOverflowForLine(lineBox));
+ repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisualOverflowForLine(lineBox));
if (availableLogicalWidthForLine(oldLogicalHeight + adjustment, firstLine) != oldLineWidth) {
// We have to delete this line, remove all floats that got added, and let line layout re-run.
@@ -842,8 +845,8 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
adjustLinePositionForPagination(line, delta);
}
if (delta) {
- repaintLogicalTop = min(repaintLogicalTop, beforeSideVisibleOverflowForLine(line) + min(delta, 0));
- repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisibleOverflowForLine(line) + max(delta, 0));
+ repaintLogicalTop = min(repaintLogicalTop, beforeSideVisualOverflowForLine(line) + min(delta, 0));
+ repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisualOverflowForLine(line) + max(delta, 0));
line->adjustPosition(0, delta);
}
if (Vector<RenderBox*>* cleanLineFloats = line->floatsPtr()) {
@@ -861,8 +864,8 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
RootInlineBox* line = endLine;
RenderArena* arena = renderArena();
while (line) {
- repaintLogicalTop = min(repaintLogicalTop, beforeSideVisibleOverflowForLine(line));
- repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisibleOverflowForLine(line));
+ repaintLogicalTop = min(repaintLogicalTop, beforeSideVisualOverflowForLine(line));
+ repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisualOverflowForLine(line));
RootInlineBox* next = line->nextRootBox();
line->deleteLine(arena);
line = next;
@@ -874,7 +877,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
// This has to be done before adding in the bottom border/padding, or the float will
// include the padding incorrectly. -dwh
if (checkForFloatsFromLastLine) {
- int bottomVisualOverflow = afterSideVisibleOverflowForLine(lastRootBox());
+ int bottomVisualOverflow = afterSideVisualOverflowForLine(lastRootBox());
int bottomLayoutOverflow = afterSideLayoutOverflowForLine(lastRootBox());
TrailingFloatsRootInlineBox* trailingFloatsLineBox = new (renderArena()) TrailingFloatsRootInlineBox(this);
m_lineBoxes.appendLineBox(trailingFloatsLineBox);
@@ -882,7 +885,9 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
GlyphOverflowAndFallbackFontsMap textBoxDataMap;
VerticalPositionCache verticalPositionCache;
trailingFloatsLineBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, verticalPositionCache);
- trailingFloatsLineBox->setBlockDirectionOverflowPositions(logicalHeight(), bottomLayoutOverflow, logicalHeight(), bottomVisualOverflow);
+ IntRect logicalLayoutOverflow(0, logicalHeight(), 1, bottomLayoutOverflow);
+ IntRect logicalVisualOverflow(0, logicalHeight(), 1, bottomVisualOverflow);
+ trailingFloatsLineBox->setOverflowFromLogicalRects(logicalLayoutOverflow, logicalVisualOverflow);
trailingFloatsLineBox->setBlockLogicalHeight(logicalHeight());
}
if (lastFloat) {
@@ -955,8 +960,8 @@ RootInlineBox* RenderBlock::determineStartPosition(bool& firstLine, bool& fullLa
if (!useRepaintBounds)
useRepaintBounds = true;
- repaintLogicalTop = min(repaintLogicalTop, beforeSideVisibleOverflowForLine(curr) + min(paginationDelta, 0));
- repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisibleOverflowForLine(curr) + max(paginationDelta, 0));
+ repaintLogicalTop = min(repaintLogicalTop, beforeSideVisualOverflowForLine(curr) + min(paginationDelta, 0));
+ repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisualOverflowForLine(curr) + max(paginationDelta, 0));
curr->adjustPosition(0, paginationDelta);
}
}
@@ -1172,8 +1177,8 @@ bool RenderBlock::matchedEndLine(const InlineBidiResolver& resolver, const Inlin
RootInlineBox* boxToDelete = endLine;
RenderArena* arena = renderArena();
while (boxToDelete && boxToDelete != result) {
- repaintLogicalTop = min(repaintLogicalTop, beforeSideVisibleOverflowForLine(boxToDelete));
- repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisibleOverflowForLine(boxToDelete));
+ repaintLogicalTop = min(repaintLogicalTop, beforeSideVisualOverflowForLine(boxToDelete));
+ repaintLogicalBottom = max(repaintLogicalBottom, afterSideVisualOverflowForLine(boxToDelete));
RootInlineBox* next = boxToDelete->nextRootBox();
boxToDelete->deleteLine(arena);
boxToDelete = next;
@@ -2029,29 +2034,33 @@ InlineIterator RenderBlock::findNextLineBreak(InlineBidiResolver& resolver, bool
void RenderBlock::addOverflowFromInlineChildren()
{
+ int endPadding = hasOverflowClip() ? paddingEnd() : 0;
+ // FIXME: Need to find another way to do this, since scrollbars could show when we don't want them to.
+ if (hasOverflowClip() && !endPadding && node() && node()->isContentEditable() && node() == node()->rootEditableElement() && style()->isLeftToRightDirection())
+ endPadding = 1;
for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
- addLayoutOverflow(curr->layoutOverflowRect());
+ addLayoutOverflow(curr->paddedLayoutOverflowRect(endPadding));
if (!hasOverflowClip())
addVisualOverflow(curr->visualOverflowRect());
}
}
-int RenderBlock::beforeSideVisibleOverflowForLine(RootInlineBox* line) const
+int RenderBlock::beforeSideVisualOverflowForLine(RootInlineBox* line) const
{
// Overflow is in the block's coordinate space, which means it isn't purely physical. For flipped blocks (rl and bt),
// we continue to use top and left overflow even though physically it's bottom and right.
if (style()->isHorizontalWritingMode())
- return line->topVisibleOverflow();
- return line->leftVisibleOverflow();
+ return line->topVisualOverflow();
+ return line->leftVisualOverflow();
}
-int RenderBlock::afterSideVisibleOverflowForLine(RootInlineBox* line) const
+int RenderBlock::afterSideVisualOverflowForLine(RootInlineBox* line) const
{
// Overflow is in the block's coordinate space, which means it isn't purely physical. For flipped blocks (rl and bt),
// we continue to use bottom and right overflow even though physically it's top and left.
if (style()->isHorizontalWritingMode())
- return line->bottomVisibleOverflow();
- return line->rightVisibleOverflow();
+ return line->bottomVisualOverflow();
+ return line->rightVisualOverflow();
}
int RenderBlock::beforeSideLayoutOverflowForLine(RootInlineBox* line) const
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index 9d5ff33..11ecf62 100644
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -406,9 +406,10 @@ int RenderBox::scrollWidth() const
if (hasOverflowClip())
return layer()->scrollWidth();
// For objects with visible overflow, this matches IE.
+ // FIXME: Need to work right with writing modes.
if (style()->isLeftToRightDirection())
- return max(clientWidth(), rightmostPosition(true, false) - borderLeft());
- return clientWidth() - min(0, leftmostPosition(true, false) - borderLeft());
+ return max(clientWidth(), rightLayoutOverflow() - borderLeft());
+ return clientWidth() - min(0, leftLayoutOverflow() - borderLeft());
}
int RenderBox::scrollHeight() const
@@ -416,7 +417,8 @@ int RenderBox::scrollHeight() const
if (hasOverflowClip())
return layer()->scrollHeight();
// For objects with visible overflow, this matches IE.
- return max(clientHeight(), lowestPosition(true, false) - borderTop());
+ // FIXME: Need to work right with writing modes.
+ return max(clientHeight(), bottomLayoutOverflow() - borderTop());
}
int RenderBox::scrollLeft() const
@@ -451,22 +453,6 @@ void RenderBox::absoluteQuads(Vector<FloatQuad>& quads)
quads.append(localToAbsoluteQuad(FloatRect(0, 0, width(), height())));
}
-IntRect RenderBox::applyLayerTransformToRect(const IntRect& rect) const
-{
- if (hasLayer() && layer()->hasTransform()) {
- TransformationMatrix transform;
- transform.translate(rect.x(), rect.y());
- transform.multLeft(layer()->currentTransform());
- return transform.mapRect(IntRect(0, 0, rect.width(), rect.height()));
- }
- return rect;
-}
-
-IntRect RenderBox::transformedFrameRect() const
-{
- return applyLayerTransformToRect(frameRect());
-}
-
void RenderBox::updateLayerTransform()
{
// Transform-origin depends on box size, so we need to update the layer transform after layout.
@@ -773,8 +759,8 @@ void RenderBox::paintRootBoxDecorations(PaintInfo& paintInfo, int tx, int ty)
// CSS2 14.2:
// The background of the box generated by the root element covers the entire canvas including
// its margins.
- int bx = tx - marginLeft() + view()->leftLayoutOverflow();
- int by = ty - marginTop() + view()->topLayoutOverflow();
+ int bx = tx - marginLeft() + view()->docLeft();
+ int by = ty - marginTop() + view()->docTop();
int bw = max(w + marginLeft() + marginRight() + borderLeft() + borderRight(), rw);
int bh = max(h + marginTop() + marginBottom() + borderTop() + borderBottom(), rh);
@@ -1316,7 +1302,7 @@ IntRect RenderBox::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintCo
if (style()->visibility() != VISIBLE && !enclosingLayer()->hasVisibleContent())
return IntRect();
- IntRect r = visibleOverflowRect();
+ IntRect r = visualOverflowRect();
RenderView* v = view();
if (v) {
@@ -2962,50 +2948,6 @@ IntRect RenderBox::localCaretRect(InlineBox* box, int caretOffset, int* extraWid
return rect;
}
-int RenderBox::topmostPosition(bool /*includeOverflowInterior*/, bool includeSelf, ApplyTransform applyTransform) const
-{
- IntRect transformedRect = applyTransform == IncludeTransform && includeSelf ? transformedFrameRect() : frameRect();
- if (!includeSelf || !transformedRect.width())
- return 0;
- int top = 0;
- if (isRelPositioned())
- top += relativePositionOffsetY();
- return top;
-}
-
-int RenderBox::lowestPosition(bool /*includeOverflowInterior*/, bool includeSelf, ApplyTransform applyTransform) const
-{
- IntRect transformedRect = applyTransform == IncludeTransform && includeSelf ? transformedFrameRect() : frameRect();
- if (!includeSelf || !transformedRect.width())
- return 0;
- int bottom = transformedRect.height();
- if (isRelPositioned())
- bottom += relativePositionOffsetY();
- return bottom;
-}
-
-int RenderBox::rightmostPosition(bool /*includeOverflowInterior*/, bool includeSelf, ApplyTransform applyTransform) const
-{
- IntRect transformedRect = applyTransform == IncludeTransform && includeSelf ? transformedFrameRect() : frameRect();
- if (!includeSelf || !transformedRect.height())
- return 0;
- int right = transformedRect.width();
- if (isRelPositioned())
- right += relativePositionOffsetX();
- return right;
-}
-
-int RenderBox::leftmostPosition(bool /*includeOverflowInterior*/, bool includeSelf, ApplyTransform applyTransform) const
-{
- IntRect transformedRect = applyTransform == IncludeTransform && includeSelf ? transformedFrameRect() : frameRect();
- if (!includeSelf || !transformedRect.height())
- return transformedRect.width();
- int left = 0;
- if (isRelPositioned())
- left += relativePositionOffsetX();
- return left;
-}
-
VisiblePosition RenderBox::positionForPoint(const IntPoint& point)
{
// no children...return this render object's element, if there is one, and offset 0
@@ -3130,47 +3072,67 @@ void RenderBox::addShadowOverflow()
void RenderBox::addOverflowFromChild(RenderBox* child, const IntSize& delta)
{
- // Update our overflow in case the child spills out the block, but only if we were going to paint
- // the child block ourselves.
- if (child->hasSelfPaintingLayer())
- return;
-
// Only propagate layout overflow from the child if the child isn't clipping its overflow. If it is, then
- // its overflow is internal to it, and we don't care about it.
- IntRect childLayoutOverflowRect = child->hasOverflowClip() ? child->borderBoxRect() : child->layoutOverflowRect();
+ // its overflow is internal to it, and we don't care about it. layoutOverflowRectForPropagation takes care of this
+ // and just propagates the border box rect instead.
+ IntRect childLayoutOverflowRect = child->layoutOverflowRectForPropagation(style());
childLayoutOverflowRect.move(delta);
addLayoutOverflow(childLayoutOverflowRect);
// Add in visual overflow from the child. Even if the child clips its overflow, it may still
// have visual overflow of its own set from box shadows or reflections. It is unnecessary to propagate this
// overflow if we are clipping our own overflow.
- if (hasOverflowClip())
+ if (child->hasSelfPaintingLayer() || hasOverflowClip())
return;
- IntRect childVisualOverflowRect = child->visualOverflowRect();
+ IntRect childVisualOverflowRect = child->visualOverflowRectForPropagation(style());
childVisualOverflowRect.move(delta);
addVisualOverflow(childVisualOverflowRect);
}
void RenderBox::addLayoutOverflow(const IntRect& rect)
{
- IntRect borderBox = borderBoxRect();
- if (borderBox.contains(rect))
+ IntRect clientBox = clientBoxRect();
+ if (clientBox.contains(rect) || rect.isEmpty())
return;
+
+ // For overflow clip objects, we don't want to propagate overflow into unreachable areas.
+ IntRect overflowRect(rect);
+ if (hasOverflowClip() || isRenderView()) {
+ // Overflow is in the block's coordinate space and thus is flipped for horizontal-bt and vertical-rl
+ // writing modes. At this stage that is actually a simplification, since we can treat horizontal-tb/bt as the same
+ // and vertical-lr/rl as the same.
+ bool hasTopOverflow = !style()->isLeftToRightDirection() && !style()->isHorizontalWritingMode();
+ bool hasLeftOverflow = !style()->isLeftToRightDirection() && style()->isHorizontalWritingMode();
+
+ if (!hasTopOverflow)
+ overflowRect.shiftTopEdgeTo(max(overflowRect.y(), clientBox.y()));
+ else
+ overflowRect.shiftBottomEdgeTo(min(overflowRect.bottom(), clientBox.bottom()));
+ if (!hasLeftOverflow)
+ overflowRect.shiftLeftEdgeTo(max(overflowRect.x(), clientBox.x()));
+ else
+ overflowRect.shiftRightEdgeTo(min(overflowRect.right(), clientBox.right()));
+ // Now re-test with the adjusted rectangle and see if it has become unreachable or fully
+ // contained.
+ if (clientBox.contains(overflowRect) || overflowRect.isEmpty())
+ return;
+ }
+
if (!m_overflow)
- m_overflow.set(new RenderOverflow(borderBox));
+ m_overflow.set(new RenderOverflow(clientBox, borderBoxRect()));
- m_overflow->addLayoutOverflow(rect);
+ m_overflow->addLayoutOverflow(overflowRect);
}
void RenderBox::addVisualOverflow(const IntRect& rect)
{
IntRect borderBox = borderBoxRect();
- if (borderBox.contains(rect))
+ if (borderBox.contains(rect) || rect.isEmpty())
return;
if (!m_overflow)
- m_overflow.set(new RenderOverflow(borderBox));
+ m_overflow.set(new RenderOverflow(clientBoxRect(), borderBox));
m_overflow->addVisualOverflow(rect);
}
@@ -3206,20 +3168,76 @@ int RenderBox::baselinePosition(FontBaseline baselineType, bool /*firstLine*/, L
return 0;
}
-void RenderBox::blockDirectionOverflow(bool isLineHorizontal, int& logicalTopLayoutOverflow, int& logicalBottomLayoutOverflow,
- int& logicalTopVisualOverflow, int& logicalBottomVisualOverflow)
+IntRect RenderBox::logicalVisualOverflowRectForPropagation(RenderStyle* parentStyle) const
{
- if (isLineHorizontal) {
- logicalTopLayoutOverflow = topLayoutOverflow();
- logicalBottomLayoutOverflow = bottomLayoutOverflow();
- logicalTopVisualOverflow = topVisualOverflow();
- logicalBottomVisualOverflow = bottomVisualOverflow();
- } else {
- logicalTopLayoutOverflow = leftLayoutOverflow();
- logicalBottomLayoutOverflow = rightLayoutOverflow();
- logicalTopVisualOverflow = leftVisualOverflow();
- logicalBottomVisualOverflow = rightVisualOverflow();
- }
+ IntRect rect = visualOverflowRectForPropagation(parentStyle);
+ if (!parentStyle->isHorizontalWritingMode())
+ return rect.transposedRect();
+ return rect;
+}
+
+IntRect RenderBox::visualOverflowRectForPropagation(RenderStyle* parentStyle) const
+{
+ // If the writing modes of the child and parent match, then we don't have to
+ // do anything fancy. Just return the result.
+ IntRect rect = visualOverflowRect();
+ if (parentStyle->writingMode() == style()->writingMode())
+ return rect;
+
+ // We are putting ourselves into our parent's coordinate space. If there is a flipped block mismatch
+ // in a particular axis, then we have to flip the rect along that axis.
+ if (style()->writingMode() == RightToLeftWritingMode || parentStyle->writingMode() == RightToLeftWritingMode)
+ rect.setX(width() - rect.right());
+ else if (style()->writingMode() == BottomToTopWritingMode || parentStyle->writingMode() == BottomToTopWritingMode)
+ rect.setY(height() - rect.bottom());
+
+ return rect;
+}
+
+IntRect RenderBox::logicalLayoutOverflowRectForPropagation(RenderStyle* parentStyle) const
+{
+ IntRect rect = layoutOverflowRectForPropagation(parentStyle);
+ if (!parentStyle->isHorizontalWritingMode())
+ return rect.transposedRect();
+ return rect;
+}
+
+IntRect RenderBox::layoutOverflowRectForPropagation(RenderStyle* parentStyle) const
+{
+ // Only propagate interior layout overflow if we don't clip it.
+ IntRect rect = borderBoxRect();
+ if (!hasOverflowClip())
+ rect.unite(layoutOverflowRect());
+
+ if (isRelPositioned() || hasTransform()) {
+ // If we are relatively positioned or if we have a transform, then we have to convert
+ // this rectangle into physical coordinates, apply relative positioning and transforms
+ // to it, and then convert it back.
+ flipForWritingMode(rect);
+
+ if (hasTransform())
+ rect = layer()->currentTransform().mapRect(rect);
+
+ if (isRelPositioned())
+ rect.move(relativePositionOffsetX(), relativePositionOffsetY());
+
+ // Now we need to flip back.
+ flipForWritingMode(rect);
+ }
+
+ // If the writing modes of the child and parent match, then we don't have to
+ // do anything fancy. Just return the result.
+ if (parentStyle->writingMode() == style()->writingMode())
+ return rect;
+
+ // We are putting ourselves into our parent's coordinate space. If there is a flipped block mismatch
+ // in a particular axis, then we have to flip the rect along that axis.
+ if (style()->writingMode() == RightToLeftWritingMode || parentStyle->writingMode() == RightToLeftWritingMode)
+ rect.setX(width() - rect.right());
+ else if (style()->writingMode() == BottomToTopWritingMode || parentStyle->writingMode() == BottomToTopWritingMode)
+ rect.setY(height() - rect.bottom());
+
+ return rect;
}
IntPoint RenderBox::flipForWritingMode(const RenderBox* child, const IntPoint& point, FlippingAdjustment adjustment) const
diff --git a/WebCore/rendering/RenderBox.h b/WebCore/rendering/RenderBox.h
index 1e17c4e..0cbe535 100644
--- a/WebCore/rendering/RenderBox.h
+++ b/WebCore/rendering/RenderBox.h
@@ -106,12 +106,9 @@ public:
IntRect frameRect() const { return m_frameRect; }
void setFrameRect(const IntRect& rect) { m_frameRect = rect; }
- IntRect transformedFrameRect() const;
- IntRect applyLayerTransformToRect(const IntRect&) const;
-
IntRect borderBoxRect() const { return IntRect(0, 0, width(), height()); }
virtual IntRect borderBoundingBox() const { return borderBoxRect(); }
-
+
// The content area of the box (excludes padding and border).
IntRect contentBoxRect() const { return IntRect(borderLeft() + paddingLeft(), borderTop() + paddingTop(), contentWidth(), contentHeight()); }
// The content box in absolute coords. Ignores transforms.
@@ -128,17 +125,11 @@ public:
RenderBox* nextSiblingBox() const;
RenderBox* parentBox() const;
- IntRect visibleOverflowRect() const { return hasOverflowClip() ? visualOverflowRect() : (m_overflow ? m_overflow->visibleOverflowRect() : borderBoxRect()); }
- int topVisibleOverflow() const { return hasOverflowClip() ? topVisualOverflow() : std::min(topLayoutOverflow(), topVisualOverflow()); }
- int bottomVisibleOverflow() const { return hasOverflowClip() ? bottomVisualOverflow() : std::max(bottomLayoutOverflow(), bottomVisualOverflow()); }
- int leftVisibleOverflow() const { return hasOverflowClip() ? leftVisualOverflow() : std::min(leftLayoutOverflow(), leftVisualOverflow()); }
- int rightVisibleOverflow() const { return hasOverflowClip() ? rightVisualOverflow() : std::max(rightLayoutOverflow(), rightVisualOverflow()); }
-
- IntRect layoutOverflowRect() const { return m_overflow ? m_overflow->layoutOverflowRect() : borderBoxRect(); }
- int topLayoutOverflow() const { return m_overflow? m_overflow->topLayoutOverflow() : 0; }
- int bottomLayoutOverflow() const { return m_overflow ? m_overflow->bottomLayoutOverflow() : height(); }
- int leftLayoutOverflow() const { return m_overflow ? m_overflow->leftLayoutOverflow() : 0; }
- int rightLayoutOverflow() const { return m_overflow ? m_overflow->rightLayoutOverflow() : width(); }
+ IntRect layoutOverflowRect() const { return m_overflow ? m_overflow->layoutOverflowRect() : clientBoxRect(); }
+ int topLayoutOverflow() const { return m_overflow? m_overflow->topLayoutOverflow() : borderTop(); }
+ int bottomLayoutOverflow() const { return m_overflow ? m_overflow->bottomLayoutOverflow() : borderTop() + clientHeight(); }
+ int leftLayoutOverflow() const { return m_overflow ? m_overflow->leftLayoutOverflow() : borderLeft(); }
+ int rightLayoutOverflow() const { return m_overflow ? m_overflow->rightLayoutOverflow() : borderLeft() + clientWidth(); }
int logicalLeftLayoutOverflow() const { return style()->isHorizontalWritingMode() ? leftLayoutOverflow() : topLayoutOverflow(); }
int logicalRightLayoutOverflow() const { return style()->isHorizontalWritingMode() ? rightLayoutOverflow() : bottomLayoutOverflow(); }
@@ -179,6 +170,8 @@ public:
int clientTop() const { return borderTop(); }
int clientWidth() const;
int clientHeight() const;
+ int clientLogicalBottom() const { return style()->isHorizontalWritingMode() ? clientTop() + clientHeight() : clientLeft() + clientWidth(); }
+ IntRect clientBoxRect() const { return IntRect(clientLeft(), clientTop(), clientWidth(), clientHeight()); }
// scrollWidth/scrollHeight will be the same as clientWidth/clientHeight unless the
// object has overflow:hidden/scroll/auto specified and also has overflow.
@@ -270,12 +263,6 @@ public:
void setInlineBoxWrapper(InlineBox* boxWrapper) { m_inlineBoxWrapper = boxWrapper; }
void deleteLineBoxWrapper();
- enum ApplyTransform { IncludeTransform, ExcludeTransform };
- virtual int topmostPosition(bool includeOverflowInterior = true, bool includeSelf = true, ApplyTransform = IncludeTransform) const;
- virtual int lowestPosition(bool includeOverflowInterior = true, bool includeSelf = true, ApplyTransform = IncludeTransform) const;
- virtual int rightmostPosition(bool includeOverflowInterior = true, bool includeSelf = true, ApplyTransform = IncludeTransform) const;
- virtual int leftmostPosition(bool includeOverflowInterior = true, bool includeSelf = true, ApplyTransform = IncludeTransform) const;
-
virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);
virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false);
@@ -390,6 +377,11 @@ public:
void flipForWritingMode(IntRect&) const;
IntSize locationOffsetIncludingFlipping() const;
+ IntRect logicalVisualOverflowRectForPropagation(RenderStyle*) const;
+ IntRect visualOverflowRectForPropagation(RenderStyle*) const;
+ IntRect logicalLayoutOverflowRectForPropagation(RenderStyle*) const;
+ IntRect layoutOverflowRectForPropagation(RenderStyle*) const;
+
protected:
virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
diff --git a/WebCore/rendering/RenderBoxModelObject.h b/WebCore/rendering/RenderBoxModelObject.h
index 988d61a..b697217 100644
--- a/WebCore/rendering/RenderBoxModelObject.h
+++ b/WebCore/rendering/RenderBoxModelObject.h
@@ -45,6 +45,7 @@ public:
int relativePositionOffsetX() const;
int relativePositionOffsetY() const;
IntSize relativePositionOffset() const { return IntSize(relativePositionOffsetX(), relativePositionOffsetY()); }
+ IntSize relativePositionLogicalOffset() const { return style()->isHorizontalWritingMode() ? relativePositionOffset() : relativePositionOffset().transposedSize(); }
// IE extensions. Used to calculate offsetWidth/Height. Overridden by inlines (RenderFlow)
// to return the remaining width on a given line (and the height of a single line).
diff --git a/WebCore/rendering/RenderFlexibleBox.cpp b/WebCore/rendering/RenderFlexibleBox.cpp
index 7612961..b132366 100644
--- a/WebCore/rendering/RenderFlexibleBox.cpp
+++ b/WebCore/rendering/RenderFlexibleBox.cpp
@@ -246,6 +246,7 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren, int /*pageHeight FIXM
else
layoutVerticalBox(relayoutChildren);
+ int oldClientAfterEdge = clientLogicalBottom();
computeLogicalHeight();
if (previousHeight != height())
@@ -271,13 +272,7 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren, int /*pageHeight FIXM
setMaxMarginAfterValues(0, 0);
}
- // Add in the overflow from children.
- FlexBoxIterator iterator(this);
- for (RenderBox* child = iterator.first(); child; child = iterator.next())
- addOverflowFromChild(child);
-
- // Add visual overflow from box-shadow and reflections.
- addShadowOverflow();
+ computeOverflow(oldClientAfterEdge);
statePusher.pop();
diff --git a/WebCore/rendering/RenderInline.cpp b/WebCore/rendering/RenderInline.cpp
index 8f828f9..4b5298c 100644
--- a/WebCore/rendering/RenderInline.cpp
+++ b/WebCore/rendering/RenderInline.cpp
@@ -579,7 +579,7 @@ IntRect RenderInline::linesBoundingBox() const
return result;
}
-IntRect RenderInline::linesVisibleOverflowBoundingBox() const
+IntRect RenderInline::linesVisualOverflowBoundingBox() const
{
if (!firstLineBox() || !lastLineBox())
return IntRect();
@@ -588,16 +588,16 @@ IntRect RenderInline::linesVisibleOverflowBoundingBox() const
int logicalLeftSide = numeric_limits<int>::max();
int logicalRightSide = numeric_limits<int>::min();
for (InlineFlowBox* curr = firstLineBox(); curr; curr = curr->nextLineBox()) {
- logicalLeftSide = min(logicalLeftSide, curr->logicalLeftVisibleOverflow());
- logicalRightSide = max(logicalRightSide, curr->logicalRightVisibleOverflow());
+ logicalLeftSide = min(logicalLeftSide, curr->logicalLeftVisualOverflow());
+ logicalRightSide = max(logicalRightSide, curr->logicalRightVisualOverflow());
}
bool isHorizontal = style()->isHorizontalWritingMode();
- int x = isHorizontal ? logicalLeftSide : firstLineBox()->leftVisibleOverflow();
- int y = isHorizontal ? firstLineBox()->topVisibleOverflow() : logicalLeftSide;
- int width = isHorizontal ? logicalRightSide - logicalLeftSide : lastLineBox()->rightVisibleOverflow() - firstLineBox()->leftVisibleOverflow();
- int height = isHorizontal ? lastLineBox()->bottomVisibleOverflow() - firstLineBox()->topVisibleOverflow() : logicalRightSide - logicalLeftSide;
+ int x = isHorizontal ? logicalLeftSide : firstLineBox()->leftVisualOverflow();
+ int y = isHorizontal ? firstLineBox()->topVisualOverflow() : logicalLeftSide;
+ int width = isHorizontal ? logicalRightSide - logicalLeftSide : lastLineBox()->rightVisualOverflow() - firstLineBox()->leftVisualOverflow();
+ int height = isHorizontal ? lastLineBox()->bottomVisualOverflow() - firstLineBox()->topVisualOverflow() : logicalRightSide - logicalLeftSide;
return IntRect(x, y, width, height);
}
@@ -610,7 +610,7 @@ IntRect RenderInline::clippedOverflowRectForRepaint(RenderBoxModelObject* repain
return IntRect();
// Find our leftmost position.
- IntRect boundingBox(linesVisibleOverflowBoundingBox());
+ IntRect boundingBox(linesVisualOverflowBoundingBox());
int left = boundingBox.x();
int top = boundingBox.y();
diff --git a/WebCore/rendering/RenderInline.h b/WebCore/rendering/RenderInline.h
index 399a167..f6f3908 100644
--- a/WebCore/rendering/RenderInline.h
+++ b/WebCore/rendering/RenderInline.h
@@ -53,7 +53,7 @@ public:
virtual IntSize offsetFromContainer(RenderObject*, const IntPoint&) const;
IntRect linesBoundingBox() const;
- IntRect linesVisibleOverflowBoundingBox() const;
+ IntRect linesVisualOverflowBoundingBox() const;
InlineFlowBox* createAndAppendInlineFlowBox();
diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index dc28fee..84dbd8f 100644
--- a/WebCore/rendering/RenderLayer.cpp
+++ b/WebCore/rendering/RenderLayer.cpp
@@ -676,14 +676,6 @@ void RenderLayer::updateLayerPosition()
} else if (RenderBox* box = renderBox()) {
setWidth(box->width());
setHeight(box->height());
-
- if (!box->hasOverflowClip()) {
- if (box->rightLayoutOverflow() > box->width())
- setWidth(box->rightLayoutOverflow());
- if (box->bottomLayoutOverflow() > box->height())
- setHeight(box->bottomLayoutOverflow());
- }
-
localPoint += box->locationOffsetIncludingFlipping();
}
@@ -1966,38 +1958,57 @@ int RenderLayer::scrollHeight()
return m_scrollHeight;
}
+int RenderLayer::overflowTop() const
+{
+ RenderBox* box = renderBox();
+ IntRect overflowRect(box->layoutOverflowRect());
+ box->flipForWritingMode(overflowRect);
+ return overflowRect.y();
+}
+
+int RenderLayer::overflowBottom() const
+{
+ RenderBox* box = renderBox();
+ IntRect overflowRect(box->layoutOverflowRect());
+ box->flipForWritingMode(overflowRect);
+ return overflowRect.bottom();
+}
+
+int RenderLayer::overflowLeft() const
+{
+ RenderBox* box = renderBox();
+ IntRect overflowRect(box->layoutOverflowRect());
+ box->flipForWritingMode(overflowRect);
+ return overflowRect.x();
+}
+
+int RenderLayer::overflowRight() const
+{
+ RenderBox* box = renderBox();
+ IntRect overflowRect(box->layoutOverflowRect());
+ box->flipForWritingMode(overflowRect);
+ return overflowRect.right();
+}
+
void RenderLayer::computeScrollDimensions(bool* needHBar, bool* needVBar)
{
RenderBox* box = renderBox();
ASSERT(box);
m_scrollDimensionsDirty = false;
-
- int clientWidth = box->clientWidth();
- int clientHeight = box->clientHeight();
-
- bool hasLeftOverflow = (!box->style()->isHorizontalWritingMode() || !box->style()->isLeftToRightDirection()) && box->style()->writingMode() != LeftToRightWritingMode;
- bool hasTopOverflow = (box->style()->isHorizontalWritingMode() || !box->style()->isLeftToRightDirection()) && box->style()->writingMode() != TopToBottomWritingMode;
- m_scrollLeftOverflow = !hasLeftOverflow ? 0 : min(0, box->leftmostPosition(true, false) - box->borderLeft());
- m_scrollTopOverflow = !hasTopOverflow ? 0 : min(0, box->topmostPosition(true, false) - box->borderTop());
+ m_scrollLeftOverflow = overflowLeft() - box->borderLeft();
+ m_scrollTopOverflow = overflowTop() - box->borderTop();
- int rightPos = !hasLeftOverflow ?
- box->rightmostPosition(true, false) - box->borderLeft() :
- clientWidth - m_scrollLeftOverflow;
- int bottomPos = !hasTopOverflow ?
- box->lowestPosition(true, false) - box->borderTop() :
- clientHeight - m_scrollTopOverflow;
-
- m_scrollWidth = max(rightPos, clientWidth);
- m_scrollHeight = max(bottomPos, clientHeight);
+ m_scrollWidth = overflowRight() - overflowLeft();
+ m_scrollHeight = overflowBottom() - overflowTop();
- m_scrollOrigin = IntPoint(!hasLeftOverflow ? 0 : m_scrollWidth - clientWidth, !hasTopOverflow ? 0 : m_scrollHeight - clientHeight);
+ m_scrollOrigin = IntPoint(-m_scrollLeftOverflow, -m_scrollTopOverflow);
if (needHBar)
- *needHBar = rightPos > clientWidth;
+ *needHBar = m_scrollWidth > box->clientWidth();
if (needVBar)
- *needVBar = bottomPos > clientHeight;
+ *needVBar = m_scrollHeight > box->clientHeight();
}
void RenderLayer::updateOverflowStatus(bool horizontalOverflow, bool verticalOverflow)
@@ -2092,9 +2103,12 @@ RenderLayer::updateScrollInfoAfterLayout()
// Our proprietary overflow: overlay value doesn't trigger a layout.
m_inOverflowRelayout = true;
renderer()->setNeedsLayout(true, false);
- if (renderer()->isRenderBlock())
- toRenderBlock(renderer())->layoutBlock(true);
- else
+ if (renderer()->isRenderBlock()) {
+ RenderBlock* block = toRenderBlock(renderer());
+ block->scrollbarsChanged(box->hasAutoHorizontalScrollbar() && haveHorizontalBar != horizontalOverflow,
+ box->hasAutoVerticalScrollbar() && haveVerticalBar != verticalOverflow);
+ block->layoutBlock(true);
+ } else
renderer()->layout();
m_inOverflowRelayout = false;
}
@@ -2118,9 +2132,7 @@ RenderLayer::updateScrollInfoAfterLayout()
// top right corner of the content doesn't shift with respect to the top
// right corner of the area. Conceptually, right-to-left areas have
// their origin at the top-right, but RenderLayer is top-left oriented,
- // so this is needed to keep everything working (see how scrollXOffset()
- // differs from scrollYOffset() to get an idea of why the horizontal and
- // vertical scrollbars need to be treated differently).
+ // so this is needed to keep everything working.
m_hBar->setValue(scrollXOffset(), Scrollbar::NotFromScrollAnimator);
}
if (m_vBar) {
@@ -2128,6 +2140,13 @@ RenderLayer::updateScrollInfoAfterLayout()
int pageStep = max(max<int>(clientHeight * Scrollbar::minFractionToStepWhenPaging(), clientHeight - Scrollbar::maxOverlapBetweenPages()), 1);
m_vBar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
m_vBar->setProportion(clientHeight, m_scrollHeight);
+ // Explicitly set the vertical scroll value. This ensures that when a
+ // right-to-left vertical writing-mode scrollable area's height (or content height) changes, the
+ // bottom right corner of the content doesn't shift with respect to the bottom
+ // right corner of the area. Conceptually, right-to-left vertical writing-mode areas have
+ // their origin at the bottom-right, but RenderLayer is top-left oriented,
+ // so this is needed to keep everything working.
+ m_vBar->setValue(scrollYOffset(), Scrollbar::NotFromScrollAnimator);
}
if (renderer()->node() && renderer()->document()->hasListenerType(Document::OVERFLOWCHANGED_LISTENER))
@@ -2324,12 +2343,13 @@ static void restoreClip(GraphicsContext* p, const IntRect& paintDirtyRect, const
p->restore();
}
-static void performOverlapTests(OverlapTestRequestMap& overlapTestRequests, const IntRect& layerBounds)
+static void performOverlapTests(OverlapTestRequestMap& overlapTestRequests, const RenderLayer* rootLayer, const RenderLayer* layer)
{
Vector<OverlapTestRequestClient*> overlappedRequestClients;
OverlapTestRequestMap::iterator end = overlapTestRequests.end();
+ IntRect boundingBox = layer->boundingBox(rootLayer);
for (OverlapTestRequestMap::iterator it = overlapTestRequests.begin(); it != end; ++it) {
- if (!layerBounds.intersects(it->second))
+ if (!boundingBox.intersects(it->second))
continue;
it->first->setOverlapTestResult(true);
@@ -2456,7 +2476,7 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, GraphicsContext* p,
paintingRootForRenderer = paintingRoot;
if (overlapTestRequests && isSelfPaintingLayer())
- performOverlapTests(*overlapTestRequests, layerBounds);
+ performOverlapTests(*overlapTestRequests, rootLayer, this);
// We want to paint our layer, but only if we intersect the damage rect.
bool shouldPaint = intersectsDamageRect(layerBounds, damageRect, rootLayer) && m_hasVisibleContent && isSelfPaintingLayer();
@@ -2665,11 +2685,11 @@ bool RenderLayer::hitTest(const HitTestRequest& request, HitTestResult& result)
{
renderer()->document()->updateLayout();
- IntRect boundsRect(m_x, m_y, width(), height());
+ IntRect hitTestArea = result.rectForPoint(result.point());
if (!request.ignoreClipping())
- boundsRect.intersect(frameVisibleRect(renderer()));
+ hitTestArea.intersect(frameVisibleRect(renderer()));
- RenderLayer* insideLayer = hitTestLayer(this, 0, request, result, boundsRect, result.point(), false);
+ RenderLayer* insideLayer = hitTestLayer(this, 0, request, result, hitTestArea, result.point(), false);
if (!insideLayer) {
// We didn't hit any layer. If we are the root layer and the mouse is -- or just was -- down,
// return ourselves. We do this so mouse events continue getting delivered after a drag has
@@ -3375,8 +3395,8 @@ IntRect RenderLayer::localBoundingBox() const
InlineFlowBox* firstBox = inlineFlow->firstLineBox();
if (!firstBox)
return result;
- int top = firstBox->topVisibleOverflow();
- int bottom = inlineFlow->lastLineBox()->bottomVisibleOverflow();
+ int top = firstBox->topVisualOverflow();
+ int bottom = inlineFlow->lastLineBox()->bottomVisualOverflow();
int left = firstBox->x();
for (InlineFlowBox* curr = firstBox->nextLineBox(); curr; curr = curr->nextLineBox())
left = min(left, curr->x());
@@ -3387,7 +3407,7 @@ IntRect RenderLayer::localBoundingBox() const
if (child->isTableCell()) {
IntRect bbox = toRenderBox(child)->borderBoxRect();
result.unite(bbox);
- IntRect overflowRect = renderBox()->visibleOverflowRect();
+ IntRect overflowRect = renderBox()->visualOverflowRect();
if (bbox != overflowRect)
result.unite(overflowRect);
}
@@ -3400,7 +3420,7 @@ IntRect RenderLayer::localBoundingBox() const
else {
IntRect bbox = box->borderBoxRect();
result = bbox;
- IntRect overflowRect = box->visibleOverflowRect();
+ IntRect overflowRect = box->visualOverflowRect();
if (bbox != overflowRect)
result.unite(overflowRect);
}
diff --git a/WebCore/rendering/RenderLayer.h b/WebCore/rendering/RenderLayer.h
index d041e3d..5d941c1 100644
--- a/WebCore/rendering/RenderLayer.h
+++ b/WebCore/rendering/RenderLayer.h
@@ -581,6 +581,11 @@ private:
// Only safe to call from RenderBoxModelObject::destroyLayer(RenderArena*)
void destroy(RenderArena*);
+ int overflowTop() const;
+ int overflowBottom() const;
+ int overflowLeft() const;
+ int overflowRight() const;
+
protected:
RenderBoxModelObject* m_renderer;
diff --git a/WebCore/rendering/RenderLineBoxList.cpp b/WebCore/rendering/RenderLineBoxList.cpp
index 3139fd5..85d7f18 100644
--- a/WebCore/rendering/RenderLineBoxList.cpp
+++ b/WebCore/rendering/RenderLineBoxList.cpp
@@ -176,10 +176,10 @@ bool RenderLineBoxList::anyLineIntersectsRect(RenderBoxModelObject* renderer, co
// intersect. This is a quick short-circuit that we can take to avoid walking any lines.
// FIXME: This check is flawed in the following extremely obscure way:
// if some line in the middle has a huge overflow, it might actually extend below the last line.
- int firstLineTop = firstLineBox()->logicalTopVisibleOverflow();
+ int firstLineTop = firstLineBox()->logicalTopVisualOverflow();
if (usePrintRect && !firstLineBox()->parent())
firstLineTop = min(firstLineTop, firstLineBox()->root()->lineTop());
- int lastLineBottom = lastLineBox()->logicalBottomVisibleOverflow();
+ int lastLineBottom = lastLineBox()->logicalBottomVisualOverflow();
if (usePrintRect && !lastLineBox()->parent())
lastLineBottom = max(lastLineBottom, lastLineBox()->root()->lineBottom());
int logicalTop = firstLineTop - outlineSize;
@@ -190,8 +190,8 @@ bool RenderLineBoxList::anyLineIntersectsRect(RenderBoxModelObject* renderer, co
bool RenderLineBoxList::lineIntersectsDirtyRect(RenderBoxModelObject* renderer, InlineFlowBox* box, const PaintInfo& paintInfo, int tx, int ty) const
{
- int logicalTop = min(box->logicalTopVisibleOverflow(), box->root()->selectionTop()) - renderer->maximalOutlineSize(paintInfo.phase);
- int logicalBottom = box->logicalBottomVisibleOverflow() + renderer->maximalOutlineSize(paintInfo.phase);
+ int logicalTop = min(box->logicalTopVisualOverflow(), box->root()->selectionTop()) - renderer->maximalOutlineSize(paintInfo.phase);
+ int logicalBottom = box->logicalBottomVisualOverflow() + renderer->maximalOutlineSize(paintInfo.phase);
return rangeIntersectsRect(renderer, logicalTop, logicalBottom, paintInfo.rect, tx, ty);
}
@@ -230,8 +230,8 @@ void RenderLineBoxList::paint(RenderBoxModelObject* renderer, PaintInfo& paintIn
// FIXME: This is the deprecated pagination model that is still needed
// for embedded views inside AppKit. AppKit is incapable of paginating vertical
// text pages, so we don't have to deal with vertical lines at all here.
- int topForPaginationCheck = curr->topVisibleOverflow();
- int bottomForPaginationCheck = curr->bottomVisibleOverflow();
+ int topForPaginationCheck = curr->topVisualOverflow();
+ int bottomForPaginationCheck = curr->bottomVisualOverflow();
if (!curr->parent()) {
// We're a root box. Use lineTop and lineBottom as well here.
topForPaginationCheck = min(topForPaginationCheck, curr->root()->lineTop());
@@ -240,7 +240,7 @@ void RenderLineBoxList::paint(RenderBoxModelObject* renderer, PaintInfo& paintIn
if (bottomForPaginationCheck - topForPaginationCheck <= v->printRect().height()) {
if (ty + bottomForPaginationCheck > v->printRect().bottom()) {
if (RootInlineBox* nextRootBox = curr->root()->nextRootBox())
- bottomForPaginationCheck = min(bottomForPaginationCheck, min(nextRootBox->topVisibleOverflow(), nextRootBox->lineTop()));
+ bottomForPaginationCheck = min(bottomForPaginationCheck, min(nextRootBox->topVisualOverflow(), nextRootBox->lineTop()));
}
if (ty + bottomForPaginationCheck > v->printRect().bottom()) {
if (ty + topForPaginationCheck < v->truncatedAt())
@@ -292,7 +292,7 @@ bool RenderLineBoxList::hitTest(RenderBoxModelObject* renderer, const HitTestReq
// them further. Note that boxes can easily overlap, so we can't make any assumptions
// based off positions of our first line box or our last line box.
for (InlineFlowBox* curr = lastLineBox(); curr; curr = curr->prevLineBox()) {
- if (rangeIntersectsRect(renderer, curr->logicalTopVisibleOverflow(), curr->logicalBottomVisibleOverflow(), rect, tx, ty)) {
+ if (rangeIntersectsRect(renderer, curr->logicalTopVisualOverflow(), curr->logicalBottomVisualOverflow(), rect, tx, ty)) {
bool inside = curr->nodeAtPoint(request, result, x, y, tx, ty);
if (inside) {
renderer->updateHitTestResult(result, IntPoint(x - tx, y - ty));
diff --git a/WebCore/rendering/RenderListItem.cpp b/WebCore/rendering/RenderListItem.cpp
index ba10706..65606f3 100644
--- a/WebCore/rendering/RenderListItem.cpp
+++ b/WebCore/rendering/RenderListItem.cpp
@@ -243,6 +243,12 @@ void RenderListItem::layout()
RenderBlock::layout();
}
+void RenderListItem::addOverflowFromChildren()
+{
+ RenderBlock::addOverflowFromChildren();
+ positionListMarker();
+}
+
void RenderListItem::positionListMarker()
{
if (m_marker && m_marker->parent()->isBox() && !m_marker->isInside() && m_marker->inlineBoxWrapper()) {
@@ -257,20 +263,31 @@ void RenderListItem::positionListMarker()
bool adjustOverflow = false;
int markerLogicalLeft;
RootInlineBox* root = m_marker->inlineBoxWrapper()->root();
+ bool hitSelfPaintingLayer = false;
- // FIXME: Inline flows in the line box hierarchy that have self-painting layers should act as cutoff points
- // and really shouldn't keep propagating overflow up. This won't really break anything other than repainting
- // not being as tight as it could be though.
+ // FIXME: Need to account for relative positioning in the layout overflow.
if (style()->isLeftToRightDirection()) {
int leftLineOffset = logicalLeftOffsetForLine(blockOffset, logicalLeftOffsetForLine(blockOffset, false), false);
markerLogicalLeft = leftLineOffset - lineOffset - paddingStart() - borderStart() + m_marker->marginStart();
m_marker->inlineBoxWrapper()->adjustLineDirectionPosition(markerLogicalLeft - markerOldLogicalLeft);
for (InlineFlowBox* box = m_marker->inlineBoxWrapper()->parent(); box; box = box->parent()) {
- if (markerLogicalLeft < box->logicalLeftLayoutOverflow()) {
- box->setInlineDirectionOverflowPositions(markerLogicalLeft, box->logicalRightLayoutOverflow(), box->logicalLeftVisualOverflow(), box->logicalRightVisualOverflow());
+ IntRect newLogicalVisualOverflowRect = box->logicalVisualOverflowRect();
+ IntRect newLogicalLayoutOverflowRect = box->logicalLayoutOverflowRect();
+ if (markerLogicalLeft < newLogicalVisualOverflowRect.x() && !hitSelfPaintingLayer) {
+ newLogicalVisualOverflowRect.setX(markerLogicalLeft);
+ newLogicalVisualOverflowRect.setWidth(box->logicalRightVisualOverflow() - newLogicalVisualOverflowRect.x());
+ if (box == root)
+ adjustOverflow = true;
+ }
+ if (markerLogicalLeft < newLogicalLayoutOverflowRect.x()) {
+ newLogicalLayoutOverflowRect.setX(markerLogicalLeft);
+ newLogicalLayoutOverflowRect.setWidth(box->logicalRightLayoutOverflow() - newLogicalLayoutOverflowRect.x());
if (box == root)
adjustOverflow = true;
}
+ box->setOverflowFromLogicalRects(newLogicalLayoutOverflowRect, newLogicalVisualOverflowRect);
+ if (box->boxModelObject()->hasSelfPaintingLayer())
+ hitSelfPaintingLayer = true;
}
} else {
markerLogicalLeft = m_marker->logicalLeft() + paddingStart() + borderStart() + m_marker->marginEnd();
@@ -278,11 +295,22 @@ void RenderListItem::positionListMarker()
markerLogicalLeft = rightLineOffset - lineOffset + paddingStart() + borderStart() + m_marker->marginEnd();
m_marker->inlineBoxWrapper()->adjustLineDirectionPosition(markerLogicalLeft - markerOldLogicalLeft);
for (InlineFlowBox* box = m_marker->inlineBoxWrapper()->parent(); box; box = box->parent()) {
- if (markerLogicalLeft + m_marker->logicalWidth() > box->logicalRightLayoutOverflow()) {
- box->setInlineDirectionOverflowPositions(box->logicalLeftLayoutOverflow(), markerLogicalLeft + m_marker->logicalWidth(), box->logicalLeftVisualOverflow(), box->logicalRightVisualOverflow());
+ IntRect newLogicalVisualOverflowRect = box->logicalVisualOverflowRect();
+ IntRect newLogicalLayoutOverflowRect = box->logicalLayoutOverflowRect();
+ if (markerLogicalLeft + m_marker->logicalWidth() > newLogicalVisualOverflowRect.right() && !hitSelfPaintingLayer) {
+ newLogicalVisualOverflowRect.setWidth(markerLogicalLeft + m_marker->logicalWidth() - box->logicalLeftVisualOverflow());
if (box == root)
adjustOverflow = true;
}
+ if (markerLogicalLeft + m_marker->logicalWidth() > newLogicalLayoutOverflowRect.right()) {
+ newLogicalLayoutOverflowRect.setWidth(markerLogicalLeft + m_marker->logicalWidth() - box->logicalLeftLayoutOverflow());
+ if (box == root)
+ adjustOverflow = true;
+ }
+ box->setOverflowFromLogicalRects(newLogicalLayoutOverflowRect, newLogicalVisualOverflowRect);
+
+ if (box->boxModelObject()->hasSelfPaintingLayer())
+ hitSelfPaintingLayer = true;
}
}
@@ -291,12 +319,24 @@ void RenderListItem::positionListMarker()
if (!style()->isHorizontalWritingMode())
markerRect = markerRect.transposedRect();
RenderBox* o = m_marker;
+ bool propagateVisualOverflow = true;
+ bool propagateLayoutOverflow = true;
do {
o = o->parentBox();
- if (o->isRenderBlock())
- toRenderBlock(o)->addLayoutOverflow(markerRect);
+ if (o->hasOverflowClip())
+ propagateVisualOverflow = false;
+ if (o->isRenderBlock()) {
+ if (propagateVisualOverflow)
+ toRenderBlock(o)->addVisualOverflow(markerRect);
+ if (propagateLayoutOverflow)
+ toRenderBlock(o)->addLayoutOverflow(markerRect);
+ }
+ if (o->hasOverflowClip())
+ propagateLayoutOverflow = false;
+ if (o->hasSelfPaintingLayer())
+ propagateVisualOverflow = false;
markerRect.move(-o->x(), -o->y());
- } while (o != this && !o->hasSelfPaintingLayer());
+ } while (o != this && propagateVisualOverflow && propagateLayoutOverflow);
}
}
}
diff --git a/WebCore/rendering/RenderListItem.h b/WebCore/rendering/RenderListItem.h
index 2fcb6c4..fe2cb6a 100644
--- a/WebCore/rendering/RenderListItem.h
+++ b/WebCore/rendering/RenderListItem.h
@@ -62,12 +62,14 @@ private:
virtual void layout();
virtual void computePreferredLogicalWidths();
- virtual void positionListMarker();
+ void positionListMarker();
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+ virtual void addOverflowFromChildren();
+
void updateMarkerLocation();
inline int calcValue() const;
void updateValueNow() const;
diff --git a/WebCore/rendering/RenderListMarker.cpp b/WebCore/rendering/RenderListMarker.cpp
index d48ab26..71b1eae 100644
--- a/WebCore/rendering/RenderListMarker.cpp
+++ b/WebCore/rendering/RenderListMarker.cpp
@@ -1110,7 +1110,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int tx, int ty)
return;
IntPoint boxOrigin(tx + x(), ty + y());
- IntRect overflowRect(visibleOverflowRect());
+ IntRect overflowRect(visualOverflowRect());
overflowRect.move(boxOrigin.x(), boxOrigin.y());
overflowRect.inflate(maximalOutlineSize(paintInfo.phase));
diff --git a/WebCore/rendering/RenderMarquee.cpp b/WebCore/rendering/RenderMarquee.cpp
index 90383d8..8b8530b 100644
--- a/WebCore/rendering/RenderMarquee.cpp
+++ b/WebCore/rendering/RenderMarquee.cpp
@@ -116,7 +116,7 @@ int RenderMarquee::computePosition(EMarqueeDirection dir, bool stopAtContentEdge
if (isHorizontal()) {
bool ltr = s->isLeftToRightDirection();
int clientWidth = box->clientWidth();
- int contentWidth = ltr ? box->rightmostPosition(true, false) : box->leftmostPosition(true, false);
+ int contentWidth = ltr ? box->rightLayoutOverflow() : box->leftLayoutOverflow();
if (ltr)
contentWidth += (box->paddingRight() - box->borderLeft());
else {
@@ -137,8 +137,7 @@ int RenderMarquee::computePosition(EMarqueeDirection dir, bool stopAtContentEdge
}
}
else {
- int contentHeight = box->lowestPosition(true, false) -
- box->borderTop() + box->paddingBottom();
+ int contentHeight = box->bottomLayoutOverflow() - box->borderTop() + box->paddingBottom();
int clientHeight = box->clientHeight();
if (dir == MUP) {
if (stopAtContentEdge)
diff --git a/WebCore/rendering/RenderMedia.cpp b/WebCore/rendering/RenderMedia.cpp
index 49a536c..7da72db 100644
--- a/WebCore/rendering/RenderMedia.cpp
+++ b/WebCore/rendering/RenderMedia.cpp
@@ -600,83 +600,6 @@ void RenderMedia::forwardEvent(Event* event)
}
}
-int RenderMedia::topmostPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform applyTransform) const
-{
- int top = RenderImage::topmostPosition(includeOverflowInterior, includeSelf, applyTransform);
- if (!m_controlsShadowRoot || !m_controlsShadowRoot->renderer())
- return top;
-
- top = min(top, m_controlsShadowRoot->renderBox()->transformedFrameRect().y() + m_controlsShadowRoot->renderBox()->topmostPosition(includeOverflowInterior, includeSelf, applyTransform));
-
- if (applyTransform == IncludeTransform && includeSelf && layer() && layer()->hasTransform()) {
- int bottom = lowestPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int right = rightmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int left = leftmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- IntRect transformRect = applyLayerTransformToRect(IntRect(left, top, right - left, bottom - top));
- return transformRect.y();
- }
-
- return top;
-}
-
-int RenderMedia::lowestPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform applyTransform) const
-{
- int bottom = RenderImage::lowestPosition(includeOverflowInterior, includeSelf, applyTransform);
- if (!m_controlsShadowRoot || !m_controlsShadowRoot->renderer())
- return bottom;
-
- bottom = max(bottom, m_controlsShadowRoot->renderBox()->transformedFrameRect().y() + m_controlsShadowRoot->renderBox()->lowestPosition(includeOverflowInterior, includeSelf, applyTransform));
-
- if (applyTransform == IncludeTransform && includeSelf && layer() && layer()->hasTransform()) {
- int top = topmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int right = rightmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int left = leftmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- IntRect transformRect = applyLayerTransformToRect(IntRect(left, top, right - left, bottom - top));
- return transformRect.height() + transformRect.y();
- }
-
- return bottom;
-}
-
-int RenderMedia::rightmostPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform applyTransform) const
-{
- int right = RenderImage::rightmostPosition(includeOverflowInterior, includeSelf, applyTransform);
- if (!m_controlsShadowRoot || !m_controlsShadowRoot->renderer())
- return right;
-
- right = max(right, m_controlsShadowRoot->renderBox()->transformedFrameRect().x() + m_controlsShadowRoot->renderBox()->rightmostPosition(includeOverflowInterior, includeSelf, applyTransform));
-
- if (applyTransform == IncludeTransform && includeSelf && layer() && layer()->hasTransform()) {
- int top = rightmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int bottom = lowestPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int left = leftmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- IntRect transformRect = applyLayerTransformToRect(IntRect(left, top, right - left, bottom - top));
- return transformRect.width() + transformRect.x();
- }
-
- return right;
-}
-
-int RenderMedia::leftmostPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform applyTransform) const
-{
- int left = RenderImage::leftmostPosition(includeOverflowInterior, includeSelf, applyTransform);
- if (!m_controlsShadowRoot || !m_controlsShadowRoot->renderer())
- return left;
-
- left = min(left, m_controlsShadowRoot->renderBox()->transformedFrameRect().x() + m_controlsShadowRoot->renderBox()->leftmostPosition(includeOverflowInterior, includeSelf, applyTransform));
-
- if (applyTransform == IncludeTransform && includeSelf && layer() && layer()->hasTransform()) {
- int top = rightmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int bottom = lowestPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- int right = rightmostPosition(includeOverflowInterior, includeSelf, ExcludeTransform);
- IntRect transformRect = applyLayerTransformToRect(IntRect(left, top, right - left, bottom - top));
- return transformRect.x();
- }
-
- return left;
-}
-
-
// We want the timeline slider to be at least 100 pixels wide.
static const int minWidthToDisplayTimeDisplays = 16 + 16 + 45 + 100 + 45 + 16 + 1;
diff --git a/WebCore/rendering/RenderMedia.h b/WebCore/rendering/RenderMedia.h
index aa725ff..983f7f0 100644
--- a/WebCore/rendering/RenderMedia.h
+++ b/WebCore/rendering/RenderMedia.h
@@ -85,11 +85,6 @@ private:
virtual bool isMedia() const { return true; }
virtual bool isImage() const { return false; }
- virtual int topmostPosition(bool includeOverflowInterior = true, bool includeSelf = true, ApplyTransform = IncludeTransform) const;
- virtual int lowestPosition(bool includeOverflowInterior = true, bool includeSelf = true, ApplyTransform = IncludeTransform) const;
- virtual int rightmostPosition(bool includeOverflowInterior = true, bool includeSelf = true, ApplyTransform = IncludeTransform) const;
- virtual int leftmostPosition(bool includeOverflowInterior = true, bool includeSelf = true, ApplyTransform = IncludeTransform) const;
-
void createControlsShadowRoot();
void destroyControlsShadowRoot();
void createPanel();
diff --git a/WebCore/rendering/RenderOverflow.h b/WebCore/rendering/RenderOverflow.h
index 253a672..7dc2bcb 100644
--- a/WebCore/rendering/RenderOverflow.h
+++ b/WebCore/rendering/RenderOverflow.h
@@ -39,15 +39,15 @@ namespace WebCore
// This object is allocated only when some of these fields have non-default values in the owning box.
class RenderOverflow : public Noncopyable {
public:
- RenderOverflow(const IntRect& defaultRect = IntRect())
- : m_topLayoutOverflow(defaultRect.y())
- , m_bottomLayoutOverflow(defaultRect.bottom())
- , m_leftLayoutOverflow(defaultRect.x())
- , m_rightLayoutOverflow(defaultRect.right())
- , m_topVisualOverflow(defaultRect.y())
- , m_bottomVisualOverflow(defaultRect.bottom())
- , m_leftVisualOverflow(defaultRect.x())
- , m_rightVisualOverflow(defaultRect.right())
+ RenderOverflow(const IntRect& layoutRect, const IntRect& visualRect)
+ : m_topLayoutOverflow(layoutRect.y())
+ , m_bottomLayoutOverflow(layoutRect.bottom())
+ , m_leftLayoutOverflow(layoutRect.x())
+ , m_rightLayoutOverflow(layoutRect.right())
+ , m_topVisualOverflow(visualRect.y())
+ , m_bottomVisualOverflow(visualRect.bottom())
+ , m_leftVisualOverflow(visualRect.x())
+ , m_rightVisualOverflow(visualRect.right())
{
}
@@ -63,8 +63,6 @@ public:
int rightVisualOverflow() const { return m_rightVisualOverflow; }
IntRect visualOverflowRect() const;
- IntRect visibleOverflowRect() const;
-
void setTopLayoutOverflow(int overflow) { m_topLayoutOverflow = overflow; }
void setBottomLayoutOverflow(int overflow) { m_bottomLayoutOverflow = overflow; }
void setLeftLayoutOverflow(int overflow) { m_leftLayoutOverflow = overflow; }
@@ -80,6 +78,9 @@ public:
void addLayoutOverflow(const IntRect&);
void addVisualOverflow(const IntRect&);
+ void setLayoutOverflow(const IntRect&);
+ void setVisualOverflow(const IntRect&);
+
void resetLayoutOverflow(const IntRect& defaultRect);
private:
@@ -104,13 +105,6 @@ inline IntRect RenderOverflow::visualOverflowRect() const
return IntRect(m_leftVisualOverflow, m_topVisualOverflow, m_rightVisualOverflow - m_leftVisualOverflow, m_bottomVisualOverflow - m_topVisualOverflow);
}
-inline IntRect RenderOverflow::visibleOverflowRect() const
-{
- IntRect combinedRect(layoutOverflowRect());
- combinedRect.unite(visualOverflowRect());
- return combinedRect;
-}
-
inline void RenderOverflow::move(int dx, int dy)
{
m_topLayoutOverflow += dy;
@@ -140,6 +134,22 @@ inline void RenderOverflow::addVisualOverflow(const IntRect& rect)
m_rightVisualOverflow = std::max(rect.right(), m_rightVisualOverflow);
}
+inline void RenderOverflow::setLayoutOverflow(const IntRect& rect)
+{
+ m_topLayoutOverflow = rect.y();
+ m_bottomLayoutOverflow = rect.bottom();
+ m_leftLayoutOverflow = rect.x();
+ m_rightLayoutOverflow = rect.right();
+}
+
+inline void RenderOverflow::setVisualOverflow(const IntRect& rect)
+{
+ m_topVisualOverflow = rect.y();
+ m_bottomVisualOverflow = rect.bottom();
+ m_leftVisualOverflow = rect.x();
+ m_rightVisualOverflow = rect.right();
+}
+
inline void RenderOverflow::resetLayoutOverflow(const IntRect& rect)
{
m_topLayoutOverflow = rect.y();
diff --git a/WebCore/rendering/RenderReplaced.cpp b/WebCore/rendering/RenderReplaced.cpp
index 9a809fc..974a8d0 100644
--- a/WebCore/rendering/RenderReplaced.cpp
+++ b/WebCore/rendering/RenderReplaced.cpp
@@ -176,8 +176,8 @@ bool RenderReplaced::shouldPaint(PaintInfo& paintInfo, int& tx, int& ty)
int currentTY = ty + y();
// Early exit if the element touches the edges.
- int top = currentTY + topVisibleOverflow();
- int bottom = currentTY + bottomVisibleOverflow();
+ int top = currentTY + topVisualOverflow();
+ int bottom = currentTY + bottomVisualOverflow();
if (isSelected() && m_inlineBoxWrapper) {
int selTop = ty + m_inlineBoxWrapper->root()->selectionTop();
int selBottom = ty + selTop + m_inlineBoxWrapper->root()->selectionHeight();
@@ -186,7 +186,7 @@ bool RenderReplaced::shouldPaint(PaintInfo& paintInfo, int& tx, int& ty)
}
int os = 2 * maximalOutlineSize(paintInfo.phase);
- if (currentTX + leftVisibleOverflow() >= paintInfo.rect.right() + os || currentTX + rightVisibleOverflow() <= paintInfo.rect.x() - os)
+ if (currentTX + leftVisualOverflow() >= paintInfo.rect.right() + os || currentTX + rightVisualOverflow() <= paintInfo.rect.x() - os)
return false;
if (top >= paintInfo.rect.bottom() + os || bottom <= paintInfo.rect.y() - os)
return false;
@@ -389,7 +389,7 @@ IntRect RenderReplaced::clippedOverflowRectForRepaint(RenderBoxModelObject* repa
// The selectionRect can project outside of the overflowRect, so take their union
// for repainting to avoid selection painting glitches.
- IntRect r = unionRect(localSelectionRect(false), visibleOverflowRect());
+ IntRect r = unionRect(localSelectionRect(false), visualOverflowRect());
RenderView* v = view();
if (v) {
diff --git a/WebCore/rendering/RenderRubyRun.cpp b/WebCore/rendering/RenderRubyRun.cpp
index 5c92c04..c12e543 100644
--- a/WebCore/rendering/RenderRubyRun.cpp
+++ b/WebCore/rendering/RenderRubyRun.cpp
@@ -278,7 +278,7 @@ void RenderRubyRun::layout()
// Update our overflow to account for the new RenderRubyText position.
m_overflow.clear();
- addOverflowFromBlockChildren();
+ computeOverflow(clientLogicalBottom());
}
} // namespace WebCore
diff --git a/WebCore/rendering/RenderTable.cpp b/WebCore/rendering/RenderTable.cpp
index b761aea..57efb33 100644
--- a/WebCore/rendering/RenderTable.cpp
+++ b/WebCore/rendering/RenderTable.cpp
@@ -357,7 +357,7 @@ void RenderTable::layout()
while (section) {
if (!sectionMoved && section->logicalTop() != logicalHeight()) {
sectionMoved = true;
- movedSectionLogicalTop = min(logicalHeight(), section->logicalTop()) + (style()->isHorizontalWritingMode() ? section->topVisibleOverflow() : section->leftVisibleOverflow());
+ movedSectionLogicalTop = min(logicalHeight(), section->logicalTop()) + (style()->isHorizontalWritingMode() ? section->topVisualOverflow() : section->leftVisualOverflow());
}
section->setLogicalLocation(sectionLogicalLeft, logicalHeight());
@@ -386,27 +386,7 @@ void RenderTable::layout()
updateLayerTransform();
- // Add overflow from borders.
- int rightBorderOverflow = width() + (collapsing ? outerBorderRight() - borderRight() : 0);
- int leftBorderOverflow = collapsing ? borderLeft() - outerBorderLeft() : 0;
- int bottomBorderOverflow = height() + (collapsing ? outerBorderBottom() - borderBottom() : 0);
- int topBorderOverflow = collapsing ? borderTop() - outerBorderTop() : 0;
- addLayoutOverflow(IntRect(leftBorderOverflow, topBorderOverflow, rightBorderOverflow - leftBorderOverflow, bottomBorderOverflow - topBorderOverflow));
-
- // Add visual overflow from box-shadow and reflections.
- addShadowOverflow();
-
- // Add overflow from our caption.
- if (m_caption)
- addOverflowFromChild(m_caption);
-
- // Add overflow from our sections.
- for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
- if (child->isTableSection()) {
- RenderTableSection* section = toRenderTableSection(child);
- addOverflowFromChild(section);
- }
- }
+ computeOverflow(clientLogicalBottom());
statePusher.pop();
@@ -417,14 +397,44 @@ void RenderTable::layout()
// Repaint with our new bounds if they are different from our old bounds.
if (!didFullRepaint && sectionMoved) {
if (style()->isHorizontalWritingMode())
- repaintRectangle(IntRect(leftVisibleOverflow(), movedSectionLogicalTop, rightVisibleOverflow() - leftVisibleOverflow(), bottomVisibleOverflow() - movedSectionLogicalTop));
+ repaintRectangle(IntRect(leftVisualOverflow(), movedSectionLogicalTop, rightVisualOverflow() - leftVisualOverflow(), bottomVisualOverflow() - movedSectionLogicalTop));
else
- repaintRectangle(IntRect(movedSectionLogicalTop, topVisibleOverflow(), rightVisibleOverflow() - movedSectionLogicalTop, bottomVisibleOverflow() - topVisibleOverflow()));
+ repaintRectangle(IntRect(movedSectionLogicalTop, topVisualOverflow(), rightVisualOverflow() - movedSectionLogicalTop, bottomVisualOverflow() - topVisualOverflow()));
}
setNeedsLayout(false);
}
+void RenderTable::addOverflowFromChildren()
+{
+ // Add overflow from borders.
+ // Technically it's odd that we are incorporating the borders into layout overflow, which is only supposed to be about overflow from our
+ // descendant objects, but since tables don't support overflow:auto, this works out fine.
+ if (collapseBorders()) {
+ int rightBorderOverflow = width() + outerBorderRight() - borderRight();
+ int leftBorderOverflow = borderLeft() - outerBorderLeft();
+ int bottomBorderOverflow = height() + outerBorderBottom() - borderBottom();
+ int topBorderOverflow = borderTop() - outerBorderTop();
+ IntRect borderOverflowRect(leftBorderOverflow, topBorderOverflow, rightBorderOverflow - leftBorderOverflow, bottomBorderOverflow - topBorderOverflow);
+ if (borderOverflowRect != borderBoxRect()) {
+ addLayoutOverflow(borderOverflowRect);
+ addVisualOverflow(borderOverflowRect);
+ }
+ }
+
+ // Add overflow from our caption.
+ if (m_caption)
+ addOverflowFromChild(m_caption);
+
+ // Add overflow from our sections.
+ for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
+ if (child->isTableSection()) {
+ RenderTableSection* section = toRenderTableSection(child);
+ addOverflowFromChild(section);
+ }
+ }
+}
+
void RenderTable::setCellLogicalWidths()
{
for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
@@ -441,9 +451,9 @@ void RenderTable::paint(PaintInfo& paintInfo, int tx, int ty)
PaintPhase paintPhase = paintInfo.phase;
int os = 2 * maximalOutlineSize(paintPhase);
- if (ty + topVisibleOverflow() >= paintInfo.rect.bottom() + os || ty + bottomVisibleOverflow() <= paintInfo.rect.y() - os)
+ if (ty + topVisualOverflow() >= paintInfo.rect.bottom() + os || ty + bottomVisualOverflow() <= paintInfo.rect.y() - os)
return;
- if (tx + leftVisibleOverflow() >= paintInfo.rect.right() + os || tx + rightVisibleOverflow() <= paintInfo.rect.x() - os)
+ if (tx + leftVisualOverflow() >= paintInfo.rect.right() + os || tx + rightVisualOverflow() <= paintInfo.rect.x() - os)
return;
bool pushedClip = pushContentsClip(paintInfo, tx, ty);
diff --git a/WebCore/rendering/RenderTable.h b/WebCore/rendering/RenderTable.h
index 36609c5..2bda68e 100644
--- a/WebCore/rendering/RenderTable.h
+++ b/WebCore/rendering/RenderTable.h
@@ -232,6 +232,8 @@ private:
virtual IntRect overflowClipRect(int tx, int ty);
+ virtual void addOverflowFromChildren();
+
void subtractCaptionRect(IntRect&) const;
void recalcSections() const;
diff --git a/WebCore/rendering/RenderTableCell.cpp b/WebCore/rendering/RenderTableCell.cpp
index 9f6d174..bd443e8 100644
--- a/WebCore/rendering/RenderTableCell.cpp
+++ b/WebCore/rendering/RenderTableCell.cpp
@@ -266,9 +266,9 @@ IntRect RenderTableCell::clippedOverflowRectForRepaint(RenderBoxModelObject* rep
right = max(right, below->borderHalfRight(true));
}
}
- left = max(left, -leftVisibleOverflow());
- top = max(top, -topVisibleOverflow());
- IntRect r(-left, - top, left + max(width() + right, rightVisibleOverflow()), top + max(height() + bottom, bottomVisibleOverflow()));
+ left = max(left, -leftVisualOverflow());
+ top = max(top, -topVisualOverflow());
+ IntRect r(-left, - top, left + max(width() + right, rightVisualOverflow()), top + max(height() + bottom, bottomVisualOverflow()));
if (RenderView* v = view()) {
// FIXME: layoutDelta needs to be applied in parts before/after transforms and
@@ -1033,4 +1033,28 @@ void RenderTableCell::paintMask(PaintInfo& paintInfo, int tx, int ty)
paintMaskImages(paintInfo, tx, ty, w, h);
}
+void RenderTableCell::scrollbarsChanged(bool horizontalScrollbarChanged, bool verticalScrollbarChanged)
+{
+ int scrollbarHeight = scrollbarLogicalHeight();
+ if (!scrollbarHeight)
+ return; // Not sure if we should be doing something when a scrollbar goes away or not.
+
+ // We only care if the scrollbar that affects our intrinsic padding has been added.
+ if ((style()->isHorizontalWritingMode() && !horizontalScrollbarChanged) ||
+ (!style()->isHorizontalWritingMode() && !verticalScrollbarChanged))
+ return;
+
+ // Shrink our intrinsic padding as much as possible to accommodate the scrollbar.
+ if (style()->verticalAlign() == MIDDLE) {
+ int totalHeight = logicalHeight();
+ int heightWithoutIntrinsicPadding = totalHeight - intrinsicPaddingBefore() - intrinsicPaddingAfter();
+ totalHeight -= scrollbarHeight;
+ int newBeforePadding = (totalHeight - heightWithoutIntrinsicPadding) / 2;
+ int newAfterPadding = totalHeight - heightWithoutIntrinsicPadding - newBeforePadding;
+ setIntrinsicPaddingBefore(newBeforePadding);
+ setIntrinsicPaddingAfter(newAfterPadding);
+ } else
+ setIntrinsicPaddingAfter(intrinsicPaddingAfter() - scrollbarHeight);
+}
+
} // namespace WebCore
diff --git a/WebCore/rendering/RenderTableCell.h b/WebCore/rendering/RenderTableCell.h
index 281c226..91eddc8 100644
--- a/WebCore/rendering/RenderTableCell.h
+++ b/WebCore/rendering/RenderTableCell.h
@@ -121,7 +121,9 @@ public:
virtual void setOverrideSize(int);
- bool hasVisibleOverflow() const { return m_overflow; }
+ bool hasVisualOverflow() const { return m_overflow && !borderBoxRect().contains(m_overflow->visualOverflowRect()); }
+
+ virtual void scrollbarsChanged(bool horizontalScrollbarChanged, bool verticalScrollbarChanged);
protected:
virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
diff --git a/WebCore/rendering/RenderTableSection.cpp b/WebCore/rendering/RenderTableSection.cpp
index 829bf5b..069e71a 100644
--- a/WebCore/rendering/RenderTableSection.cpp
+++ b/WebCore/rendering/RenderTableSection.cpp
@@ -654,7 +654,7 @@ int RenderTableSection::layoutRows(int toAdd)
if (r < totalRows - 1 && cell == primaryCellAt(r + 1, c))
continue;
addOverflowFromChild(cell);
- m_hasOverflowingCell |= cell->hasVisibleOverflow();
+ m_hasOverflowingCell |= cell->hasVisualOverflow();
}
}
@@ -662,78 +662,6 @@ int RenderTableSection::layoutRows(int toAdd)
return height();
}
-int RenderTableSection::topmostPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform applyTransform) const
-{
- int top = RenderBox::topmostPosition(includeOverflowInterior, includeSelf, applyTransform);
- if (!includeOverflowInterior && hasOverflowClip())
- return top;
-
- for (RenderObject* row = firstChild(); row; row = row->nextSibling()) {
- for (RenderObject* curr = row->firstChild(); curr; curr = curr->nextSibling()) {
- if (curr->isTableCell()) {
- RenderTableCell* cell = toRenderTableCell(curr);
- top = min(top, cell->transformedFrameRect().y() + cell->topmostPosition(false));
- }
- }
- }
-
- return top;
-}
-
-int RenderTableSection::lowestPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform applyTransform) const
-{
- int bottom = RenderBox::lowestPosition(includeOverflowInterior, includeSelf, applyTransform);
- if (!includeOverflowInterior && hasOverflowClip())
- return bottom;
-
- for (RenderObject* row = firstChild(); row; row = row->nextSibling()) {
- for (RenderObject* curr = row->firstChild(); curr; curr = curr->nextSibling()) {
- if (curr->isTableCell()) {
- RenderTableCell* cell = toRenderTableCell(curr);
- bottom = max(bottom, cell->transformedFrameRect().y() + cell->lowestPosition(false));
- }
- }
- }
-
- return bottom;
-}
-
-int RenderTableSection::rightmostPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform applyTransform) const
-{
- int right = RenderBox::rightmostPosition(includeOverflowInterior, includeSelf, applyTransform);
- if (!includeOverflowInterior && hasOverflowClip())
- return right;
-
- for (RenderObject* row = firstChild(); row; row = row->nextSibling()) {
- for (RenderObject* curr = row->firstChild(); curr; curr = curr->nextSibling()) {
- if (curr->isTableCell()) {
- RenderTableCell* cell = toRenderTableCell(curr);
- right = max(right, cell->transformedFrameRect().x() + cell->rightmostPosition(false));
- }
- }
- }
-
- return right;
-}
-
-int RenderTableSection::leftmostPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform applyTransform) const
-{
- int left = RenderBox::leftmostPosition(includeOverflowInterior, includeSelf, applyTransform);
- if (!includeOverflowInterior && hasOverflowClip())
- return left;
-
- for (RenderObject* row = firstChild(); row; row = row->nextSibling()) {
- for (RenderObject* curr = row->firstChild(); curr; curr = curr->nextSibling()) {
- if (curr->isTableCell()) {
- RenderTableCell* cell = toRenderTableCell(curr);
- left = min(left, cell->transformedFrameRect().x() + cell->leftmostPosition(false));
- }
- }
- }
-
- return left;
-}
-
int RenderTableSection::calcOuterBorderBefore() const
{
int totalCols = table()->numEffCols();
diff --git a/WebCore/rendering/RenderTableSection.h b/WebCore/rendering/RenderTableSection.h
index 0327d59..fac6a84 100644
--- a/WebCore/rendering/RenderTableSection.h
+++ b/WebCore/rendering/RenderTableSection.h
@@ -136,11 +136,6 @@ private:
virtual void removeChild(RenderObject* oldChild);
- virtual int topmostPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform = IncludeTransform) const;
- virtual int lowestPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform = IncludeTransform) const;
- virtual int rightmostPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform = IncludeTransform) const;
- virtual int leftmostPosition(bool includeOverflowInterior, bool includeSelf, ApplyTransform = IncludeTransform) const;
-
virtual void paint(PaintInfo&, int tx, int ty);
virtual void paintCell(RenderTableCell*, PaintInfo&, int tx, int ty);
virtual void paintObject(PaintInfo&, int tx, int ty);
diff --git a/WebCore/rendering/RenderTreeAsText.cpp b/WebCore/rendering/RenderTreeAsText.cpp
index f93cd55..22ee620 100644
--- a/WebCore/rendering/RenderTreeAsText.cpp
+++ b/WebCore/rendering/RenderTreeAsText.cpp
@@ -616,8 +616,17 @@ static void write(TextStream& ts, RenderLayer& l,
}
static void writeLayers(TextStream& ts, const RenderLayer* rootLayer, RenderLayer* l,
- const IntRect& paintDirtyRect, int indent, RenderAsTextBehavior behavior)
+ const IntRect& paintRect, int indent, RenderAsTextBehavior behavior)
{
+ // FIXME: Apply overflow to the root layer to not break every test. Complete hack. Sigh.
+ IntRect paintDirtyRect(paintRect);
+ if (rootLayer == l) {
+ paintDirtyRect.setWidth(max(paintDirtyRect.width(), rootLayer->renderBox()->rightLayoutOverflow()));
+ paintDirtyRect.setHeight(max(paintDirtyRect.height(), rootLayer->renderBox()->bottomLayoutOverflow()));
+ l->setWidth(max(l->width(), l->renderBox()->rightLayoutOverflow()));
+ l->setHeight(max(l->height(), l->renderBox()->bottomLayoutOverflow()));
+ }
+
// Calculate the clip rects we should use.
IntRect layerBounds, damageRect, clipRectToApply, outlineRect;
l->calculateRects(rootLayer, paintDirtyRect, layerBounds, damageRect, clipRectToApply, outlineRect, true);
diff --git a/WebCore/rendering/RenderView.cpp b/WebCore/rendering/RenderView.cpp
index d6790fc..846098d 100644
--- a/WebCore/rendering/RenderView.cpp
+++ b/WebCore/rendering/RenderView.cpp
@@ -129,12 +129,6 @@ void RenderView::layout()
if (needsLayout())
RenderBlock::layout();
- // Reset overflow and then replace it with docWidth and docHeight.
- m_overflow.clear();
- int leftOverflow = docLeft();
- int topOverflow = docTop();
- addLayoutOverflow(IntRect(leftOverflow, topOverflow, docWidth(leftOverflow), docHeight(topOverflow)));
-
ASSERT(layoutDelta() == IntSize());
ASSERT(m_layoutStateDisableCount == 0);
ASSERT(m_layoutState == &state);
@@ -620,50 +614,30 @@ IntRect RenderView::viewRect() const
int RenderView::docTop() const
{
- // Clip out top overflow in vertical LTR pages or horizontal-tb pages.
- if ((!style()->isHorizontalWritingMode() && style()->isLeftToRightDirection()) || style()->writingMode() == TopToBottomWritingMode)
- return 0;
- return std::min(0, topmostPosition());
+ IntRect overflowRect(0, topLayoutOverflow(), 0, bottomLayoutOverflow() - topLayoutOverflow());
+ flipForWritingMode(overflowRect);
+ return overflowRect.y();
}
-int RenderView::docHeight(int topOverflow) const
+int RenderView::docBottom() const
{
- int h = ((!style()->isHorizontalWritingMode() && style()->isLeftToRightDirection()) || style()->writingMode() == TopToBottomWritingMode) ?
- lowestPosition() : height() - topOverflow;
-
- // FIXME: This doesn't do any margin collapsing.
- // Instead of this dh computation we should keep the result
- // when we call RenderBlock::layout.
- int dh = 0;
- for (RenderBox* c = firstChildBox(); c; c = c->nextSiblingBox())
- dh += c->height() + c->marginTop() + c->marginBottom();
-
- if (dh > h)
- h = dh;
-
- return h;
+ IntRect overflowRect(layoutOverflowRect());
+ flipForWritingMode(overflowRect);
+ return overflowRect.bottom();
}
int RenderView::docLeft() const
{
- // Clip out left overflow in horizontal LTR pages or vertical-lr pages.
- if ((style()->isHorizontalWritingMode() && style()->isLeftToRightDirection()) || style()->writingMode() == LeftToRightWritingMode)
- return 0;
- return std::min(0, leftmostPosition());
+ IntRect overflowRect(layoutOverflowRect());
+ flipForWritingMode(overflowRect);
+ return overflowRect.x();
}
-int RenderView::docWidth(int leftOverflow) const
+int RenderView::docRight() const
{
- int w = ((style()->isHorizontalWritingMode() && style()->isLeftToRightDirection()) || style()->writingMode() == LeftToRightWritingMode) ?
- rightmostPosition() : width() - leftOverflow;
-
- for (RenderBox* c = firstChildBox(); c; c = c->nextSiblingBox()) {
- int dw = c->width() + c->marginLeft() + c->marginRight();
- if (dw > w)
- w = dw;
- }
-
- return w;
+ IntRect overflowRect(layoutOverflowRect());
+ flipForWritingMode(overflowRect);
+ return overflowRect.right();
}
int RenderView::viewHeight() const
diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h
index b5d0294..d736e3d 100644
--- a/WebCore/rendering/RenderView.h
+++ b/WebCore/rendering/RenderView.h
@@ -166,6 +166,13 @@ public:
bool usesCompositing() const;
#endif
+ int docTop() const;
+ int docBottom() const;
+ int docHeight() const { return docBottom() - docTop(); }
+ int docLeft() const;
+ int docRight() const;
+ int docWidth() const { return docRight() - docLeft(); }
+
protected:
virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const;
virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
@@ -173,11 +180,6 @@ protected:
private:
bool shouldRepaint(const IntRect& r) const;
- int docTop() const;
- int docHeight(int topOverflow) const;
- int docLeft() const;
- int docWidth(int leftOverflow) const;
-
// These functions may only be accessed by LayoutStateMaintainer.
bool pushLayoutState(RenderBox* renderer, const IntSize& offset, int pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0)
{
diff --git a/WebCore/rendering/RootInlineBox.cpp b/WebCore/rendering/RootInlineBox.cpp
index da7d037..3bcaa18 100644
--- a/WebCore/rendering/RootInlineBox.cpp
+++ b/WebCore/rendering/RootInlineBox.cpp
@@ -150,8 +150,7 @@ void RootInlineBox::addHighlightOverflow()
// Highlight acts as a selection inflation.
FloatRect rootRect(0, selectionTop(), logicalWidth(), selectionHeight());
IntRect inflatedRect = enclosingIntRect(page->chrome()->client()->customHighlightRect(renderer()->node(), renderer()->style()->highlight(), rootRect));
- setInlineDirectionOverflowPositions(leftLayoutOverflow(), rightLayoutOverflow(), min(leftVisualOverflow(), inflatedRect.x()), max(rightVisualOverflow(), inflatedRect.right()));
- setBlockDirectionOverflowPositions(topLayoutOverflow(), bottomLayoutOverflow(), min(topVisualOverflow(), inflatedRect.y()), max(bottomVisualOverflow(), inflatedRect.bottom()));
+ setOverflowFromLogicalRects(inflatedRect, inflatedRect);
}
void RootInlineBox::paintCustomHighlight(PaintInfo& paintInfo, int tx, int ty, const AtomicString& highlightType)
@@ -252,7 +251,6 @@ int RootInlineBox::alignBoxesInBlockDirection(int heightOfBlock, GlyphOverflowAn
bool containsRuby = false;
placeBoxesInBlockDirection(heightOfBlock, maxHeight, maxAscent, noQuirksMode, lineTop, lineBottom, setLineTop,
lineTopIncludingMargins, lineBottomIncludingMargins, containsRuby, m_baselineType);
- computeBlockDirectionOverflow(lineTop, lineBottom, noQuirksMode, textBoxDataMap);
setLineTopBottomPositions(lineTop, lineBottom);
m_containsRuby = containsRuby;
@@ -509,4 +507,25 @@ void RootInlineBox::attachLineBoxToRenderObject()
block()->lineBoxes()->attachLineBox(this);
}
+IntRect RootInlineBox::paddedLayoutOverflowRect(int endPadding) const
+{
+ IntRect lineLayoutOverflow = layoutOverflowRect();
+ if (!endPadding)
+ return lineLayoutOverflow;
+
+ if (isHorizontal()) {
+ if (isLeftToRightDirection())
+ lineLayoutOverflow.shiftRightEdgeTo(max(lineLayoutOverflow.right(), logicalRight() + endPadding));
+ else
+ lineLayoutOverflow.shiftLeftEdgeTo(min(lineLayoutOverflow.x(), logicalLeft() - endPadding));
+ } else {
+ if (isLeftToRightDirection())
+ lineLayoutOverflow.shiftBottomEdgeTo(max(lineLayoutOverflow.bottom(), logicalRight() + endPadding));
+ else
+ lineLayoutOverflow.shiftTopEdgeTo(min(lineLayoutOverflow.y(), logicalRight() - endPadding));
+ }
+
+ return lineLayoutOverflow;
+}
+
} // namespace WebCore
diff --git a/WebCore/rendering/RootInlineBox.h b/WebCore/rendering/RootInlineBox.h
index 42ad4da..12c7233 100644
--- a/WebCore/rendering/RootInlineBox.h
+++ b/WebCore/rendering/RootInlineBox.h
@@ -130,6 +130,8 @@ public:
bool containsRuby() const { return m_containsRuby; }
+ IntRect paddedLayoutOverflowRect(int endPadding) const;
+
private:
bool hasEllipsisBox() const { return m_hasEllipsisBoxOrHyphen; }
void setHasEllipsisBox(bool hasEllipsisBox) { m_hasEllipsisBoxOrHyphen = hasEllipsisBox; }
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list