From a705280c2556f5bbd57daf64baa33070d82e259a Mon Sep 17 00:00:00 2001
From: "bjonesbe@adobe.com"
 <bjonesbe@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat, 7 Sep 2013 06:05:23 +0000
Subject: [PATCH] [CSS Shapes] Floats with shape-outside aren't painting in the
 correct order https://bugs.webkit.org/show_bug.cgi?id=118492

Reviewed by Darin Adler.

Source/WebCore:

When removing the old positioning behavior, the code that makes a
float with shape-outside gain a layer was left behind. This patch
removes that, so now floats with shape-outside are painted just like
floats without shape-outside.

Also remove the isFloatingWithShapeOutside helper method because its
use is now somewhat redundant, and the check it does is now only
needed in one place.

Test: fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html

* rendering/RenderBox.h:
(WebCore::RenderBox::shapeOutsideInfo):
* rendering/RenderObject.h:
* rendering/shapes/ShapeOutsideInfo.cpp:
(WebCore::ShapeOutsideInfo::isEnabledFor):

LayoutTests:

Update tests to reflect correct painting order. Add a new test for the
correct painting behavior.

* csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html:
* csswg/submitted/shapes/shape-outside/shape-outside-floats-stacked-000.html:
* fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html: Added.


git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155244 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 LayoutTests/ChangeLog                              | 28 ++++++++++++
 .../shape-outside-floats-circle-000-expected.html  |  3 ++
 .../shape-outside-floats-circle-000.html           |  1 +
 .../shape-outside-floats-ellipse-000-expected.html |  3 ++
 .../shape-outside-floats-ellipse-000.html          |  3 +-
 ...utside-floats-inset-rectangle-001-expected.html |  3 ++
 .../shape-outside-floats-inset-rectangle-001.html  |  1 +
 ...side-floats-rounded-rectangle-001-expected.html |  3 ++
 ...shape-outside-floats-rounded-rectangle-001.html |  1 +
 ...side-floats-rounded-rectangle-002-expected.html |  3 ++
 ...shape-outside-floats-rounded-rectangle-002.html |  1 +
 ...side-floats-rounded-rectangle-003-expected.html |  3 ++
 ...shape-outside-floats-rounded-rectangle-003.html |  1 +
 ...side-floats-rounded-rectangle-004-expected.html | 50 +++++++++++-----------
 ...shape-outside-floats-rounded-rectangle-004.html | 17 ++++----
 .../shape-outside-floats-stacked-000.html          |  1 +
 .../shape-outside-floats-not-a-layer-expected.html | 24 +++++++++++
 .../shape-outside-floats-not-a-layer.html          | 21 +++++++++
 Source/WebCore/ChangeLog                           | 24 +++++++++++
 Source/WebCore/rendering/RenderBox.h               |  5 +--
 Source/WebCore/rendering/RenderObject.h            |  3 --
 .../WebCore/rendering/shapes/ShapeOutsideInfo.cpp  |  2 +-
 22 files changed, 159 insertions(+), 42 deletions(-)
 create mode 100644 LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer-expected.html
 create mode 100644 LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1f7d290..93b463c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,31 @@
+2013-09-06  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        [CSS Shapes] Floats with shape-outside aren't painting in the correct order
+        https://bugs.webkit.org/show_bug.cgi?id=118492
+
+        Reviewed by Darin Adler.
+
+        Update tests to reflect correct painting order. Add a new test for the
+        correct painting behavior.
+
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html:
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-stacked-000.html:
+        * fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer-expected.html: Added.
+        * fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html: Added.
+
 2013-09-06  Dirk Schulze  <krit@webkit.org>
 
         Interpolate between CSS filter() and cached images
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html
index afdf02a..a2e734e 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000-expected.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-circle-000-reference.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <meta name="flags" content="ahem dom">
 <style>
@@ -20,12 +21,14 @@
 
 #left-circle-outline {
     position: absolute;
+    z-index: -1;
     top: 20px;
     left: 0px;
 }
 
 #right-circle-outline {
     position: absolute;
+    z-index: -1;
     top: 20px;
     right: 0px;
 }
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html
index d6d39ba..73d457b 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-circle-000.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>CSS Test: circle shape-outside on floats</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property">
 <link rel="match" href="shape-outside-floats-circle-000-ref.html">
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html
index e6b880f..5552e1c 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000-expected.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-ellipse-000-reference.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <meta name="flags" content="ahem dom">
 <style>
@@ -20,12 +21,14 @@
 
 #left-ellipse-outline {
     position: absolute;
+    z-index: -1;
     top: 20px;
     left: 0px;
 }
 
 #right-ellipse-outline {
     position: absolute;
+    z-index: -1;
     top: 20px;
     right: 0px;
 }
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html
index 7426dc5..64cc106 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-ellipse-000.html
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <title>CSS Test: circle shape-outside on floats</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property">
-<link rel="match" href="shape-outside-floats-ellipse-000-reference.html">
+<link rel="match" href="shape-outside-floats-ellipse-000-ref.html">
 <meta name="flags" content="ahem">
 <style>
 .container {
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html
index 5dc15b6c..8856b62 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001-expected.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-inset-rectangle-001-reference.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <meta name="flags" content="ahem dom">
 <style>
@@ -20,12 +21,14 @@
 
 #left-rounded-rect-outline {
     position: absolute;
+    z-index: -1;
     top: 20px;
     left: 0px;
 }
 
 #right-rounded-rect-outline {
     position: absolute;
+    z-index: -1;
     top: 20px;
     right: 0px;
 }
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html
index 9a6e6d6..61929cd 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-inset-rectangle-001.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>CSS Test: inset rectangle shape-outside on floats</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <link rel="help" href="http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property">
 <link rel="match" href="shape-outside-floats-inset-rectangle-001-ref.html">
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html
index d5f8387..1fcf1a2 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-rounded-rectangle-001-reference.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <meta name="flags" content="ahem dom">
 <style>
@@ -21,12 +22,14 @@
 
 #left-rounded-rect-outline {
     position: absolute;
+    z-index: -1;
     top: 20px;
     left: 0px;
 }
 
 #right-rounded-rect-outline {
     position: absolute;
+    z-index: -1;
     top: 20px;
     right: 0px;
 }
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html
index 8b3b747..8d01bad 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-rounded-rectangle-001.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
 <link rel="match" href="shape-outside-floats-rounded-rectangle-001-ref.html">
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html
index b1345a1..19206b7 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-rounded-rectangle-002-reference.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <meta name="flags" content="ahem dom">
 <style>
@@ -21,12 +22,14 @@
 
 #left-rounded-rect-circle-outline {
     position: absolute;
+    z-index: -1;
     top: 20px;
     left: 0px;
 }
 
 #right-rounded-rect-circle-outline {
     position: absolute;
+    z-index: -1;
     top: 20px;
     right: 0px;
 }
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html
index 5dd7025..8251cce 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-rounded-rectangle-002.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
 <link rel="match" href="shape-outside-floats-rounded-rectangle-002-ref.html">
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html
index c9aca8a..88f10ad 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-rounded-rectangle-003-reference.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <meta name="flags" content="ahem dom">
 <style>
@@ -21,12 +22,14 @@
 
 #left-rounded-rect-ellipse-outline {
     position: absolute;
+    z-index: -1;
     top: 20px;
     left: 0px;
 }
 
 #right-rounded-rect-ellipse-outline {
     position: absolute;
+    z-index: -1;
     top: 20px;
     right: 0px;
 }
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html
index f4ffa6d..11b27c6 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-rounded-rectangle-003.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
 <link rel="match" href="shape-outside-floats-rounded-rectangle-003-ref.html">
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html
index d00b524..cd64fc9 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html
@@ -1,29 +1,31 @@
 <!DOCTYPE html>
 <title>shape-outside-floats-rounded-rectangle-004-reference.html</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <meta name="flags" content="ahem dom">
 <style>
 .container {
     position: relative;
-    font: 10px/1 Ahem, sans-serif;
-    width: 80px;
-    height: 40px;
-    border: 1px solid black;
+    font: 20px/1 Ahem, sans-serif;
+    line-height: 20px;
+    width: 160px;
+    height: 80px;
     margin: 5px;
 }
 .rounded-rect {
     position: absolute;
+    z-index: -1;
     top: 0px;
     left: 0px;
-    width: 40px;
-    height: 40px;
+    width: 80px;
+    height: 80px;
     border: 1px solid blue;
     border-radius: 50%;
 }
 .left-rounded-rect-float-line {
     float: left;
     clear: left;
-    height: 10px;
+    height: 20px;
 }
 </style>
 <body>
@@ -58,37 +60,35 @@
     <script src="resources/rounded-rectangle.js"></script>
     <script src="resources/subpixel-utils.js"></script>
     <script>
-    // Note that the border must be added into the width to account for its
-    // affect on float positioning.
     genLeftRoundedRectFloatShapeOutsideRefTest({
-        roundedRect: {x: 0, y: 0, width: 41, height: 40, rx: 20, ry: 20},
-        containerWidth: 80, 
-        containerHeight: 40,
-        lineHeight: 10,
+        roundedRect: {x: 0, y: 0, width: 81, height: 80, rx: 40, ry: 40},
+        containerWidth: 160,
+        containerHeight: 80,
+        lineHeight: 20,
         floatElementClassSuffix: "rounded-rect-float-line",
         insertElementIdSuffix: "fixed-units"
     });
     genLeftRoundedRectFloatShapeOutsideRefTest({
-        roundedRect: {x: 0, y: 0, width: 41, height: 40, rx: 20, ry: 20},
-        containerWidth: 80, 
-        containerHeight: 40,
-        lineHeight: 10,
+        roundedRect: {x: 0, y: 0, width: 81, height: 80, rx: 40, ry: 40},
+        containerWidth: 160,
+        containerHeight: 80,
+        lineHeight: 20,
         floatElementClassSuffix: "rounded-rect-float-line",
         insertElementIdSuffix: "relative-units"
     });
     genLeftRoundedRectFloatShapeOutsideRefTest({
-        roundedRect: {x: 0, y: 0, width: 41, height: 40, rx: 20, ry: 20},
-        containerWidth: 80, 
-        containerHeight: 40,
-        lineHeight: 10,
+        roundedRect: {x: 0, y: 0, width: 81, height: 80, rx: 40, ry: 40},
+        containerWidth: 160,
+        containerHeight: 80,
+        lineHeight: 20,
         floatElementClassSuffix: "rounded-rect-float-line",
         insertElementIdSuffix: "different-units"
     });
     genLeftRoundedRectFloatShapeOutsideRefTest({
-        roundedRect: {x: 0, y: 0, width: 41, height: 40, rx: 20, ry: 20},
-        containerWidth: 80, 
-        containerHeight: 40,
-        lineHeight: 10,
+        roundedRect: {x: 0, y: 0, width: 81, height: 80, rx: 40, ry: 40},
+        containerWidth: 160,
+        containerHeight: 80,
+        lineHeight: 20,
         floatElementClassSuffix: "rounded-rect-float-line",
         insertElementIdSuffix: "edge-case"
     });
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html
index 6feec2c..04fd695 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html
@@ -1,29 +1,30 @@
 <!DOCTYPE html>
 <title>CSS Test: rounded rectangle shape-outside on floats with clamped radii values</title>
+<link rel="author" title="Adobe" href="http://html.adobe.com/">
 <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com">
 <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
 <link rel="match" href="shape-outside-floats-rounded-rectangle-004-ref.html">
 <meta name="flags" content="ahem">
 <style>
 .container {
-    font: 10px/1 Ahem, sans-serif;
-    width: 80px;
-    height: 40px;
-    border: 1px solid black;
+    font: 20px/1 Ahem, sans-serif;
+    line-height: 20px;
+    width: 160px;
+    height: 80px;
     margin: 5px;
 }
 .float {
     float: left;
-    width: 40px;
-    height: 40px;
+    width: 80px;
+    height: 80px;
     border: 1px solid blue;
     border-radius: 50%;
 }
 .fixed-units {
-    -webkit-shape-outside: rectangle(0px, 0px, 40px, 40px, 40px, 40px);
+    -webkit-shape-outside: rectangle(0px, 0px, 80px, 80px, 80px, 80px);
 }
 .different-units {
-    -webkit-shape-outside: rectangle(0px, 0px, 40px, 40px, 100%, 100%);
+    -webkit-shape-outside: rectangle(0px, 0px, 80px, 80px, 100%, 100%);
 }
 .relative-units {
     -webkit-shape-outside: rectangle(0px, 0px, 100%, 100%, 700em, 700em);
diff --git a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-stacked-000.html b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-stacked-000.html
index e76a1e5..b08242b 100644
--- a/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-stacked-000.html
+++ b/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-stacked-000.html
@@ -13,6 +13,7 @@
     background-color: red;
     margin-bottom: 50px;
     overflow: hidden;
+    color: green;
 }
 .float-left {
     width: 100px;
diff --git a/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer-expected.html b/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer-expected.html
new file mode 100644
index 0000000..5b31813
--- /dev/null
+++ b/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer-expected.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<style>
+    .container {
+        position: relative;
+        height: 10px;
+        width: 50px;
+        background-color: red;
+    }
+    .left {
+        position: absolute;
+        left: 0;
+        top: 0;
+        font: 10px/1 Ahem;
+        color: green;
+    }
+</style>
+<body>
+    You should see a green rectangle. You shouldn't see any red.
+    <div class="container">
+        <div class="left">
+            XXXXX
+        </div>
+    </div>
+</body>
diff --git a/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html b/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html
new file mode 100644
index 0000000..d03c705
--- /dev/null
+++ b/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<style>
+    .container {
+        font: 10px/1 Ahem;
+        color: green;
+    }
+    .left {
+        float: left;
+        height: 10px;
+        width: 50px;
+        background-color: red;
+        -webkit-shape-outside: rectangle(0, 0, 0, 100%);
+    }
+</style>
+<body>
+    You should see a green rectangle. You shouldn't see any red.
+    <div class="container">
+        <div class="left"></div>
+        XXXXX
+    </div>
+</body>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f36871f..75136e0 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2013-09-06  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        [CSS Shapes] Floats with shape-outside aren't painting in the correct order
+        https://bugs.webkit.org/show_bug.cgi?id=118492
+
+        Reviewed by Darin Adler.
+
+        When removing the old positioning behavior, the code that makes a
+        float with shape-outside gain a layer was left behind. This patch
+        removes that, so now floats with shape-outside are painted just like
+        floats without shape-outside.
+
+        Also remove the isFloatingWithShapeOutside helper method because its
+        use is now somewhat redundant, and the check it does is now only
+        needed in one place.
+
+        Test: fast/shapes/shape-outside-floats/shape-outside-floats-not-a-layer.html
+
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::shapeOutsideInfo):
+        * rendering/RenderObject.h:
+        * rendering/shapes/ShapeOutsideInfo.cpp:
+        (WebCore::ShapeOutsideInfo::isEnabledFor): 
+
 2013-09-06  Anders Carlsson  <andersca@apple.com>
 
         Add a new smart pointer type for fastMalloc'ed memory
diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h
index 20050fd..0fd437b 100644
--- a/Source/WebCore/rendering/RenderBox.h
+++ b/Source/WebCore/rendering/RenderBox.h
@@ -53,9 +53,6 @@ public:
     {
         return isRoot() || isPositioned() || createsGroup() || hasClipPath() || hasOverflowClip()
             || hasTransform() || hasHiddenBackface() || hasReflection() || style()->specifiesColumns()
-#if ENABLE(CSS_SHAPES)
-            || isFloatingWithShapeOutside()
-#endif
             || !style()->hasAutoZIndex();
     }
 
@@ -596,7 +593,7 @@ public:
 #if ENABLE(CSS_SHAPES)
     ShapeOutsideInfo* shapeOutsideInfo() const
     {
-        return isFloatingWithShapeOutside() && ShapeOutsideInfo::isEnabledFor(this) ? ShapeOutsideInfo::info(this) : 0;
+        return ShapeOutsideInfo::isEnabledFor(this) ? ShapeOutsideInfo::info(this) : 0;
     }
 #endif
 
diff --git a/Source/WebCore/rendering/RenderObject.h b/Source/WebCore/rendering/RenderObject.h
index 2918710..b1be1af 100644
--- a/Source/WebCore/rendering/RenderObject.h
+++ b/Source/WebCore/rendering/RenderObject.h
@@ -872,9 +872,6 @@ public:
     virtual unsigned int length() const { return 1; }
 
     bool isFloatingOrOutOfFlowPositioned() const { return (isFloating() || isOutOfFlowPositioned()); }
-#if ENABLE(CSS_SHAPES)
-    bool isFloatingWithShapeOutside() const { return isBox() && isFloating() && style()->shapeOutside(); }
-#endif
 
     bool isTransparent() const { return style()->opacity() < 1.0f; }
     float opacity() const { return style()->opacity(); }
diff --git a/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp b/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp
index 265dd65..06c7908 100644
--- a/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp
+++ b/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp
@@ -39,7 +39,7 @@ namespace WebCore {
 bool ShapeOutsideInfo::isEnabledFor(const RenderBox* box)
 {
     ShapeValue* shapeValue = box->style()->shapeOutside();
-    if (!box->isFloatingWithShapeOutside() || !shapeValue)
+    if (!box->isFloating() || !shapeValue)
         return false;
 
     switch (shapeValue->type()) {
-- 
1.8.3.1