Diff
Modified: trunk/LayoutTests/ChangeLog (156105 => 156106)
--- trunk/LayoutTests/ChangeLog 2013-09-19 18:13:19 UTC (rev 156105)
+++ trunk/LayoutTests/ChangeLog 2013-09-19 18:18:39 UTC (rev 156106)
@@ -1,3 +1,18 @@
+2013-09-19 Bem Jones-Bey <[email protected]>
+
+ Fix handling of top margin on float with shape-outside
+ https://bugs.webkit.org/show_bug.cgi?id=121614
+
+ Reviewed by Alexandru Chiculita.
+
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-000-expected.html: Added.
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-000.html: Added.
+ Test for a positive left/right margin.
+
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-001-expected.html: Added.
+ * csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html: Added.
+ Test for a positive top margin.
+
2013-09-19 Ryosuke Niwa <[email protected]>
Add XHR tests checking readyState transition when abort() is invoked in various states
Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-000-expected.html (0 => 156106)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-000-expected.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-000-expected.html 2013-09-19 18:18:39 UTC (rev 156106)
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<title>CSS Reference</title>
+<link rel="author" title="Adobe" href=""
+<link rel="author" title="Bem Jones-Bey" href=""
+<link rel="help" href=""
+<meta name="flags" content="ahem">
+<head>
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 100px;
+ height: 20px;
+ border: 1px solid black;
+ color: green;
+ display: inline-block;
+}
+
+#float-left {
+ float: left;
+ width: 20px;
+ height: 20px;
+}
+
+#float-right {
+ float: right;
+ width: 20px;
+ height: 20px;
+}
+</style>
+
+<body>
+ <p>This should display two green bars, with white squares on opposite sides.</p>
+ <div class="container">
+ <div id="float-left">
+ </div>
+ XXXX
+ </div>
+ <div class="container">
+ <div id="float-right">
+ </div>
+ XXXX
+ </div>
+</body>
Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-000.html (0 => 156106)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-000.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-000.html 2013-09-19 18:18:39 UTC (rev 156106)
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<title>CSS Test: shape-outside on floats with a positive margin</title>
+<link rel="author" title="Adobe" href=""
+<link rel="author" title="Bem Jones-Bey" href=""
+<link rel="help" href=""
+<link rel="match" href=""
+<meta name="flags" content="ahem">
+<head>
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 100px;
+ height: 20px;
+ border: 1px solid black;
+ color: green;
+ display: inline-block;
+}
+
+#float-left {
+ float: left;
+ width: 100px;
+ height: 20px;
+ -webkit-shape-outside: rectangle(0, 0, 0, 100%);
+ margin-left: 20px;
+}
+
+#float-right {
+ float: right;
+ width: 100px;
+ height: 20px;
+ -webkit-shape-outside: rectangle(0, 0, 0, 100%);
+ margin-right: 20px;
+}
+</style>
+
+<body>
+ <p>This should display two green bars, with white squares on opposite sides.</p>
+ <div class="container">
+ <div id="float-left">
+ </div>
+ XXXX
+ </div>
+ <div class="container">
+ <div id="float-right">
+ </div>
+ XXXX
+ </div>
+</body>
Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-001-expected.html (0 => 156106)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-001-expected.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-001-expected.html 2013-09-19 18:18:39 UTC (rev 156106)
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<title>CSS Reference</title>
+<link rel="author" title="Adobe" href=""
+<link rel="author" title="Bem Jones-Bey" href=""
+<link rel="help" href=""
+<meta name="flags" content="ahem">
+<head>
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 100px;
+ height: 40px;
+ border: 1px solid black;
+ color: green;
+ display: inline-block;
+ background-color: red;
+}
+
+#float-left {
+ float: left;
+ width: 100px;
+ height: 20px;
+ background-color: green;
+}
+
+#float-right {
+ float: right;
+ width: 100px;
+ height: 20px;
+ background-color: green;
+}
+</style>
+
+<body>
+ <p>This should display two green rectangles. You should not see any red.</p>
+ <div class="container">
+ XXXXX
+ <div id="float-left">
+ </div>
+ </div>
+ <div class="container">
+ XXXXX
+ <div id="float-right">
+ </div>
+ </div>
+</body>
Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html (0 => 156106)
--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html 2013-09-19 18:18:39 UTC (rev 156106)
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<title>CSS Test: shape-outside on floats with a positive top margin</title>
+<link rel="author" title="Adobe" href=""
+<link rel="author" title="Bem Jones-Bey" href=""
+<link rel="help" href=""
+<link rel="match" href=""
+<meta name="flags" content="ahem">
+<head>
+<style>
+.container {
+ font: 20px/1 Ahem, sans-serif;
+ line-height: 20px;
+ width: 100px;
+ height: 40px;
+ border: 1px solid black;
+ color: green;
+ display: inline-block;
+ background-color: red;
+}
+
+#float-left {
+ float: left;
+ width: 100px;
+ height: 20px;
+ -webkit-shape-outside: rectangle(0, 0, 50%, 100%);
+ margin-top: 20px;
+ background-color: green;
+}
+
+#float-right {
+ float: right;
+ width: 100px;
+ height: 20px;
+ -webkit-shape-outside: rectangle(0, 0, 50%, 100%);
+ margin-top: 20px;
+ background-color: green;
+}
+</style>
+
+<body>
+ <p>This should display two green rectangles. You should not see any red.</p>
+ <div class="container">
+ <div id="float-left">
+ </div>
+ XXXXX
+ </div>
+ <div class="container">
+ <div id="float-right">
+ </div>
+ XXXXX
+ </div>
+</body>
Modified: trunk/Source/WebCore/ChangeLog (156105 => 156106)
--- trunk/Source/WebCore/ChangeLog 2013-09-19 18:13:19 UTC (rev 156105)
+++ trunk/Source/WebCore/ChangeLog 2013-09-19 18:18:39 UTC (rev 156106)
@@ -1,3 +1,43 @@
+2013-09-19 Bem Jones-Bey <[email protected]>
+
+ Fix handling of top margin on float with shape-outside
+ https://bugs.webkit.org/show_bug.cgi?id=121614
+
+ Reviewed by Alexandru Chiculita.
+
+ When a float has shape outside, the top margin should be treated as if
+ there is no shape there, so inline content should be allowed to flow
+ into that space. This patch fixes two issues:
+
+ 1) If the top margin is the same as the line height, a line should be
+ able to fit into the margin. Before this patch, that line was being
+ treated as if it intersected with the shape.
+
+ 2) The shape should be positioned (x, y) relative to the box sizing
+ box of the float. While the x coordinate was being treated properly,
+ the y coordinate was relative to the top of the margin box. This patch
+ fixes this behavior.
+
+ This patch also includes a simple test for right and left margins, as
+ I wrote that test and then discovered the problems listed above.
+
+ This patch also removes an unused override of the
+ lineOverlapsShapeBounds method.
+
+ Tests: csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-000.html
+ csswg/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html
+
+ * rendering/FloatingObjects.cpp:
+ (WebCore::FloatingObjects::logicalLeftOffset):
+ (WebCore::FloatingObjects::logicalRightOffset):
+ * rendering/LineWidth.cpp:
+ (WebCore::LineWidth::shrinkAvailableWidthForNewFloatIfNeeded):
+ * rendering/shapes/ShapeInfo.h:
+ * rendering/shapes/ShapeInsideInfo.h:
+ * rendering/shapes/ShapeOutsideInfo.cpp:
+ (WebCore::ShapeOutsideInfo::computeSegmentsForContainingBlockLine):
+ * rendering/shapes/ShapeOutsideInfo.h:
+
2013-09-19 Antti Koivisto <[email protected]>
Add RenderElement
Modified: trunk/Source/WebCore/rendering/FloatingObjects.cpp (156105 => 156106)
--- trunk/Source/WebCore/rendering/FloatingObjects.cpp 2013-09-19 18:13:19 UTC (rev 156105)
+++ trunk/Source/WebCore/rendering/FloatingObjects.cpp 2013-09-19 18:18:39 UTC (rev 156106)
@@ -288,7 +288,7 @@
const FloatingObject* outermostFloat = adapter.outermostFloat();
if (offsetMode == ShapeOutsideFloatShapeOffset && outermostFloat) {
if (ShapeOutsideInfo* shapeOutside = outermostFloat->renderer()->shapeOutsideInfo()) {
- shapeOutside->computeSegmentsForContainingBlockLine(logicalTop, outermostFloat->logicalTop(m_horizontalWritingMode), logicalHeight);
+ shapeOutside->computeSegmentsForContainingBlockLine(m_renderer, outermostFloat, logicalTop, logicalHeight);
offset += shapeOutside->rightSegmentMarginBoxDelta();
}
}
@@ -314,7 +314,7 @@
const FloatingObject* outermostFloat = adapter.outermostFloat();
if (offsetMode == ShapeOutsideFloatShapeOffset && outermostFloat) {
if (ShapeOutsideInfo* shapeOutside = outermostFloat->renderer()->shapeOutsideInfo()) {
- shapeOutside->computeSegmentsForContainingBlockLine(logicalTop, outermostFloat->logicalTop(m_horizontalWritingMode), logicalHeight);
+ shapeOutside->computeSegmentsForContainingBlockLine(m_renderer, outermostFloat, logicalTop, logicalHeight);
offset += shapeOutside->leftSegmentMarginBoxDelta();
}
}
Modified: trunk/Source/WebCore/rendering/LineWidth.cpp (156105 => 156106)
--- trunk/Source/WebCore/rendering/LineWidth.cpp 2013-09-19 18:13:19 UTC (rev 156105)
+++ trunk/Source/WebCore/rendering/LineWidth.cpp 2013-09-19 18:18:39 UTC (rev 156106)
@@ -107,14 +107,14 @@
if (previousFloat != newFloat && previousFloat->type() == newFloat->type()) {
previousShapeOutsideInfo = previousFloat->renderer()->shapeOutsideInfo();
if (previousShapeOutsideInfo)
- previousShapeOutsideInfo->computeSegmentsForContainingBlockLine(m_block.logicalHeight(), previousFloat->logicalTop(m_block.isHorizontalWritingMode()), logicalHeightForLine(&m_block, m_isFirstLine));
+ previousShapeOutsideInfo->computeSegmentsForContainingBlockLine(&m_block, previousFloat, m_block.logicalHeight(), logicalHeightForLine(&m_block, m_isFirstLine));
break;
}
}
ShapeOutsideInfo* shapeOutsideInfo = newFloat->renderer()->shapeOutsideInfo();
if (shapeOutsideInfo)
- shapeOutsideInfo->computeSegmentsForContainingBlockLine(m_block.logicalHeight(), newFloat->logicalTop(m_block.isHorizontalWritingMode()), logicalHeightForLine(&m_block, m_isFirstLine));
+ shapeOutsideInfo->computeSegmentsForContainingBlockLine(&m_block, newFloat, m_block.logicalHeight(), logicalHeightForLine(&m_block, m_isFirstLine));
#endif
if (newFloat->type() == FloatingObject::FloatLeft) {
Modified: trunk/Source/WebCore/rendering/shapes/ShapeInfo.h (156105 => 156106)
--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2013-09-19 18:13:19 UTC (rev 156105)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2013-09-19 18:18:39 UTC (rev 156106)
@@ -100,8 +100,7 @@
LayoutUnit shapeContainingBlockLogicalHeight() const { return (m_renderer->style()->boxSizing() == CONTENT_BOX) ? (m_shapeLogicalSize.height() + m_renderer->borderAndPaddingLogicalHeight()) : m_shapeLogicalSize.height(); }
- bool lineOverlapsShapeBounds() const { return logicalLineTop() < shapeLogicalBottom() && shapeLogicalTop() <= logicalLineBottom(); }
- bool lineOverlapsShapeBounds(LayoutUnit lineHeight) const { return logicalLineTop() < shapeLogicalBottom() && shapeLogicalTop() <= logicalLineBottom(lineHeight); }
+ virtual bool lineOverlapsShapeBounds() const = 0;
void dirtyShapeSize() { m_shape.clear(); }
bool shapeSizeDirty() { return !m_shape.get(); }
Modified: trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h (156105 => 156106)
--- trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2013-09-19 18:13:19 UTC (rev 156105)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2013-09-19 18:18:39 UTC (rev 156106)
@@ -109,6 +109,12 @@
void setNeedsLayout(bool value) { m_needsLayout = value; }
bool needsLayout() { return m_needsLayout; }
+ virtual bool lineOverlapsShapeBounds() const OVERRIDE
+ {
+ // The <= test is to handle the case of a zero height line or a zero height shape.
+ return logicalLineTop() < shapeLogicalBottom() && shapeLogicalTop() <= logicalLineBottom();
+ }
+
protected:
virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape()->shapePaddingLogicalBoundingBox(); }
virtual ShapeValue* shapeValue() const OVERRIDE;
Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp (156105 => 156106)
--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2013-09-19 18:13:19 UTC (rev 156105)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2013-09-19 18:18:39 UTC (rev 156106)
@@ -33,6 +33,8 @@
#include "ShapeOutsideInfo.h"
+#include "FloatingObjects.h"
+#include "RenderBlock.h"
#include "RenderBox.h"
namespace WebCore {
@@ -52,9 +54,10 @@
}
}
-bool ShapeOutsideInfo::computeSegmentsForContainingBlockLine(LayoutUnit lineTop, LayoutUnit floatTop, LayoutUnit lineHeight)
+bool ShapeOutsideInfo::computeSegmentsForContainingBlockLine(const RenderBlock* containingBlock, const FloatingObject* floatingObject, LayoutUnit lineTop, LayoutUnit lineHeight)
{
- LayoutUnit lineTopInShapeCoordinates = lineTop - floatTop + logicalTopOffset();
+ LayoutUnit shapeTop = floatingObject->logicalTop(containingBlock->isHorizontalWritingMode()) + std::max(LayoutUnit(), containingBlock->marginBeforeForChild(m_renderer));
+ LayoutUnit lineTopInShapeCoordinates = lineTop - shapeTop + logicalTopOffset();
return updateSegmentsForLine(lineTopInShapeCoordinates, lineHeight);
}
Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h (156105 => 156106)
--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2013-09-19 18:13:19 UTC (rev 156105)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2013-09-19 18:18:39 UTC (rev 156106)
@@ -37,19 +37,27 @@
namespace WebCore {
+class RenderBlock;
class RenderBox;
+class FloatingObject;
class ShapeOutsideInfo FINAL : public ShapeInfo<RenderBox>, public MappedInfo<RenderBox, ShapeOutsideInfo> {
public:
LayoutUnit leftSegmentMarginBoxDelta() const { return m_leftSegmentMarginBoxDelta; }
LayoutUnit rightSegmentMarginBoxDelta() const { return m_rightSegmentMarginBoxDelta; }
- bool computeSegmentsForContainingBlockLine(LayoutUnit lineTop, LayoutUnit floatTop, LayoutUnit lineHeight);
+ bool computeSegmentsForContainingBlockLine(const RenderBlock*, const FloatingObject*, LayoutUnit lineTop, LayoutUnit lineHeight);
virtual bool updateSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight) OVERRIDE;
static PassOwnPtr<ShapeOutsideInfo> createInfo(const RenderBox* renderer) { return adoptPtr(new ShapeOutsideInfo(renderer)); }
static bool isEnabledFor(const RenderBox*);
+ virtual bool lineOverlapsShapeBounds() const OVERRIDE
+ {
+ return (logicalLineTop() < shapeLogicalBottom() && shapeLogicalTop() < logicalLineBottom())
+ || logicalLineTop() == shapeLogicalTop(); // case of zero height line or zero height shape
+ }
+
protected:
virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape()->shapeMarginLogicalBoundingBox(); }
virtual ShapeValue* shapeValue() const OVERRIDE;
