Source/WebCore/ChangeLog

 12012-11-07 Zoltan Horvath <zoltan@webkit.org>
 2
 3 [CSS Exclusions] Shape-inside content area may be larger than default content area
 4 https://bugs.webkit.org/show_bug.cgi?id=100999
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 The shape-inside content area can be bigger than the default content area, so we need
 9 to support this behavior.
 10
 11 Test: fast/exclusions/shape-inside/shape-inside-with-larger-content-area.html
 12
 13 * rendering/RenderBlockLineLayout.cpp:
 14 (WebCore::LineWidth::updateAvailableWidth):
 15
1162012-11-07 Adam Barth <abarth@webkit.org>
217
318 [V8] IntrusiveDOMWrapperMap should be usable for more than just Nodes
133811

Source/WebCore/rendering/RenderBlockLineLayout.cpp

158158#if ENABLE(CSS_EXCLUSIONS)
159159 if (m_segment) {
160160 m_left = max<float>(m_segment->logicalLeft, m_left);
161  m_right = min<float>(m_segment->logicalRight, m_right);
 161
 162 if (!(m_block->m_floatingObjects && m_block->m_floatingObjects->hasRightObjects()) && m_segment->logicalRight > m_right)
 163 m_right = m_segment->logicalRight;
 164 else
 165 m_right = min<float>(m_segment->logicalRight, m_right);
162166 }
163167#endif
164168
133503

LayoutTests/fast/exclusions/shape-inside/shape-inside-with-larger-content-area-expected.html

 1<!DOCTYPE html>
 2<html>
 3<head>
 4<style>
 5 div {
 6 font: Ahem, sans-serif;
 7 }
 8 #shape-inside {
 9 border: 2px solid blue;
 10 position: absolute;
 11 left: 10px;
 12 top: 10px;
 13 width: 100px;
 14 height: 100px;
 15 z-index: -1;
 16 }
 17 #shape-inside-rectangle {
 18 border: 2px solid green;
 19 width: 198px;
 20 height: 198px;
 21 padding: 2px 0 0 2px;
 22 }
 23</style>
 24</head>
 25<body>
 26 <div id="shape-inside-rectangle">
 27 The blue rectangle represents the size of the content area, the green rectangle represents the size of the shape what is bigger than the content area. The text should not be clipped to the (blue) default area, but fill the space inside the green shape. The text should overflow the blue rectangle both horizontally and vertically.
 28 </div>
 29 <div id="shape-inside"></div>
 30</body>
 31</html>
0

LayoutTests/fast/exclusions/shape-inside/shape-inside-with-larger-content-area.html

 1<!DOCTYPE html>
 2<html>
 3<head>
 4<script>
 5 if (window.internals)
 6 window.internals.settings.setCSSExclusionsEnabled(true);
 7</script>
 8<style>
 9 div {
 10 font: Ahem, sans-serif;
 11 }
 12 #shape-inside {
 13 border: 2px solid blue;
 14 width: 100px;
 15 height: 100px;
 16 -webkit-shape-inside: rectangle(0, 0, 200px, 200px);
 17 }
 18 #shape-inside-helper-rectangle {
 19 border: 2px solid green;
 20 width: 200px;
 21 height: 200px;
 22 }
 23</style>
 24</head>
 25<body>
 26 <div id="shape-inside-helper-rectangle">
 27 <div id="shape-inside">
 28 The blue rectangle represents the size of the content area, the green rectangle represents the size of the shape what is bigger than the content area. The text should not be clipped to the (blue) default area, but fill the space inside the green shape. The text should overflow the blue rectangle both horizontally and vertically.
 29 </div>
 30 </div>
 31</body>
 32</html>
0

LayoutTests/ChangeLog

 12012-11-07 Zoltan Horvath <zoltan@webkit.org>
 2
 3 [CSS Exclusions] Shape-inside content area may be larger than default content area
 4 https://bugs.webkit.org/show_bug.cgi?id=100999
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 The shape-inside content area can be bigger than the default content area, so we need
 9 to support this behavior.
 10
 11 * fast/exclusions/shape-inside/shape-inside-with-larger-content-area-expected.html: Added.
 12 * fast/exclusions/shape-inside/shape-inside-with-larger-content-area.html: Added.
 13
1142012-11-07 Dirk Pranke <dpranke@chromium.org>
215
316 Unreviewed, update chromium-mac-mountainlion baselines for css2.1/2011/0323
133811