[CSS] Fix not to render inline-block boxes twice; cf. css-003.html

(StackingContext::addBase) : Fix a bug testdata/css-003.html : New
esrille · May 31, 2013 · b860795 · b860795
1 parent 6800297
commit b860795
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/src/css/StackingContext.cpp b/src/css/StackingContext.cpp
@@ -355,10 +355,20 @@ void StackingContext::renderFloats(ViewCSSImp* view, Box* last, Box* current)
 
 void StackingContext::addBase(Box* box)
 {
-#ifndef NDEBUG
-    for (Box* i = firstBase; i; i = i->nextBase)
+    Box* prev = 0;
+    for (Box* i = firstBase; i; prev = i, i = i->nextBase) {
         assert(box != i);
-#endif
+        if (i->parentBox == box) {  // This happens with positioned inline-level boxes
+            if (prev)
+                prev->nextBase = box;
+            else
+                firstBase = box;
+            box->nextBase = i->nextBase;
+            if (lastBase == i)
+                lastBase = box;
+            return;
+        }
+    }
     if (!firstBase)
         firstBase = lastBase = box;
     else {

diff --git a/testdata/css-003.html b/testdata/css-003.html
@@ -0,0 +1,21 @@
+<html>
+<head>
+<style>
+#test {
+  display: inline-block;
+  overflow: hidden;
+  position: relative;
+}
+.float {
+  float: left;
+}
+</style>
+</head>
+<body>
+  <div class="float">
+    <div id="test">
+      <div class="float">PASS</div>
+    </div>
+  </div>
+</body>
+</html>