[webkit-changes] [148523] trunk

Tue, 16 Apr 2013 10:55:03 -0700

Title: [148523] trunk
Revision
148523
Author
[email protected]
Date
2013-04-16 10:56:15 -0700 (Tue, 16 Apr 2013)

Log Message

Float at exact multiple of line-height affects too many lines
https://bugs.webkit.org/show_bug.cgi?id=112744

Reviewed by David Hyatt.

Source/WebCore:

Tests: fast/block/float/float-with-fractional-height-vertical-lr.html
       fast/block/float/float-with-fractional-height.html

When adding floats to the interval tree used for testing floats' overlap with lineboxes
truncate the dimensions of the float rather than rounding them. This matches the
treatment of linebox dimensions so ensures the test for overlap is comparing like
with like.

* rendering/RenderBlock.cpp:
(WebCore::::collectIfNeeded):
(WebCore::RenderBlock::FloatingObjects::intervalForFloatingObject):
(WebCore::::string):

LayoutTests:

* fast/block/float/float-with-fractional-height-expected.html: Added.
* fast/block/float/float-with-fractional-height-vertical-lr-expected.html: Added.
* fast/block/float/float-with-fractional-height-vertical-lr.html: Added.
* fast/block/float/float-with-fractional-height.html: Added.
* platform/mac/fast/backgrounds/background-position-parsing-expected.txt:

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (148522 => 148523)


--- trunk/LayoutTests/ChangeLog	2013-04-16 17:52:12 UTC (rev 148522)
+++ trunk/LayoutTests/ChangeLog	2013-04-16 17:56:15 UTC (rev 148523)
@@ -1,3 +1,16 @@
+2013-04-16  Robert Hogan  <[email protected]>
+
+        Float at exact multiple of line-height affects too many lines
+        https://bugs.webkit.org/show_bug.cgi?id=112744
+
+        Reviewed by David Hyatt.
+
+        * fast/block/float/float-with-fractional-height-expected.html: Added.
+        * fast/block/float/float-with-fractional-height-vertical-lr-expected.html: Added.
+        * fast/block/float/float-with-fractional-height-vertical-lr.html: Added.
+        * fast/block/float/float-with-fractional-height.html: Added.
+        * platform/mac/fast/backgrounds/background-position-parsing-expected.txt:
+
 2013-04-16  Chris Fleizach  <[email protected]>
 
         AX: aria-valuetext is not exposed on OS X.

Added: trunk/LayoutTests/fast/block/float/float-with-fractional-height-expected.html (0 => 148523)


--- trunk/LayoutTests/fast/block/float/float-with-fractional-height-expected.html	                        (rev 0)
+++ trunk/LayoutTests/fast/block/float/float-with-fractional-height-expected.html	2013-04-16 17:56:15 UTC (rev 148523)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Too many lines affected by float</title>
+  <style>
+    .container {
+      margin: 0;
+      width: 10em;
+      font: 16px/1 Times;
+    }
+    .float {
+      float: left;
+      height: 54px;
+      width: 3em;
+    }
+    p {
+      margin: 0;
+      line-height: 1.2em;
+    }
+  </style>
+</head>
+<body>
+  <p> webkit.org/b/112744 : Only the first three lines below should be right-aligned. </p>
+  <div class="container">
+      <div class="float"></div>
+      <p>Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.</p>
+  </div>
+</body>
+</html>
+

Added: trunk/LayoutTests/fast/block/float/float-with-fractional-height-vertical-lr-expected.html (0 => 148523)


--- trunk/LayoutTests/fast/block/float/float-with-fractional-height-vertical-lr-expected.html	                        (rev 0)
+++ trunk/LayoutTests/fast/block/float/float-with-fractional-height-vertical-lr-expected.html	2013-04-16 17:56:15 UTC (rev 148523)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html style="-webkit-writing-mode:vertical-lr">
+<head>
+<title>Too many lines affected by float</title>
+<style>
+.container {
+  margin: 0;
+  height: 10em;
+  font: 16px/1 Times;
+}
+.float {
+  float: left;
+  height: 3em;
+  width: 56px;
+}
+p {
+  margin: 0;
+  line-height: 1.2em;
+}
+</style>
+</head>
+<body>
+<p> webkit.org/b/112744 : Only the first three lines below should be right-aligned. </p>
+<div class="container">
+  <div class="float"></div>
+  <p>Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.</p>
+</div>
+</body>
+</html>
+

Added: trunk/LayoutTests/fast/block/float/float-with-fractional-height-vertical-lr.html (0 => 148523)


--- trunk/LayoutTests/fast/block/float/float-with-fractional-height-vertical-lr.html	                        (rev 0)
+++ trunk/LayoutTests/fast/block/float/float-with-fractional-height-vertical-lr.html	2013-04-16 17:56:15 UTC (rev 148523)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html style="-webkit-writing-mode:vertical-lr">
+<head>
+<title>Too many lines affected by float</title>
+<style>
+.container {
+  margin: 0;
+  height: 10em;
+  font: 16px/1 Times;
+}
+.float {
+  float: left;
+  height: 3em;
+  width: 3.6em;
+}
+p {
+  margin: 0;
+  line-height: 1.2em;
+}
+</style>
+</head>
+<body>
+<p> webkit.org/b/112744 : Only the first three lines below should be right-aligned. </p>
+<div class="container">
+  <div class="float"></div>
+  <p>Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.</p>
+</div>
+</body>
+</html>
+

Added: trunk/LayoutTests/fast/block/float/float-with-fractional-height.html (0 => 148523)


--- trunk/LayoutTests/fast/block/float/float-with-fractional-height.html	                        (rev 0)
+++ trunk/LayoutTests/fast/block/float/float-with-fractional-height.html	2013-04-16 17:56:15 UTC (rev 148523)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Too many lines affected by float</title>
+  <style>
+    .container {
+      margin: 0;
+      width: 10em;
+      font: 16px/1 Times;
+    }
+    .float {
+      float: left;
+      height: 3.6em;
+      width: 3em;
+    }
+    p {
+      margin: 0;
+      line-height: 1.2em;
+    }
+  </style>
+</head>
+<body>
+  <p> webkit.org/b/112744 : Only the first three lines below should be right-aligned. </p>
+  <div class="container">
+      <div class="float"></div>
+      <p>Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.</p>
+  </div>
+</body>
+</html>
+

Modified: trunk/LayoutTests/platform/mac/fast/backgrounds/background-position-parsing-expected.txt (148522 => 148523)


--- trunk/LayoutTests/platform/mac/fast/backgrounds/background-position-parsing-expected.txt	2013-04-16 17:52:12 UTC (rev 148522)
+++ trunk/LayoutTests/platform/mac/fast/backgrounds/background-position-parsing-expected.txt	2013-04-16 17:56:15 UTC (rev 148523)
@@ -1,7 +1,7 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x405
-  RenderBlock {HTML} at (0,0) size 800x406
+  RenderBlock {HTML} at (0,0) size 800x405
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
         RenderText {#text} at (0,0) size 500x18
@@ -33,126 +33,126 @@
       RenderBlock (floating) {DIV} at (678,35) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (1,95) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (1,94) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (86,95) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (86,94) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (170,95) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (170,94) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (255,95) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (255,94) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (340,95) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (340,94) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (424,95) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (424,94) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (509,95) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (509,94) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (593,95) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (593,94) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (678,95) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (678,94) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (1,154) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (1,153) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (86,154) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (86,153) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (170,154) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (170,153) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (255,154) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (255,153) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (340,154) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (340,153) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (424,154) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (424,153) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (509,154) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (509,153) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (593,154) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (593,153) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (678,154) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (678,153) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (1,213) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (1,212) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (86,213) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (86,212) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (170,213) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (170,212) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (255,213) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (255,212) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (340,213) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (340,212) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (424,213) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (424,212) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (509,213) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (509,212) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (593,213) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (593,212) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (678,213) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (678,212) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (1,272) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (1,271) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (86,272) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (86,271) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (170,272) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (170,271) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (255,272) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (255,271) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (340,272) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (340,271) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (424,272) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (424,271) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (509,272) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (509,271) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (593,272) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (593,271) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (678,272) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (678,271) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (1,331) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (1,330) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (86,331) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (86,330) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (170,331) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (170,330) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (255,331) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (255,330) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34
-      RenderBlock (floating) {DIV} at (340,331) size 82x57 [border: (3px solid #000000)]
+      RenderBlock (floating) {DIV} at (340,330) size 82x57 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 75x50 [bgcolor=#FFFFCC]
           RenderBlock {DIV} at (8,8) size 59x34

Modified: trunk/Source/WebCore/ChangeLog (148522 => 148523)


--- trunk/Source/WebCore/ChangeLog	2013-04-16 17:52:12 UTC (rev 148522)
+++ trunk/Source/WebCore/ChangeLog	2013-04-16 17:56:15 UTC (rev 148523)
@@ -1,3 +1,23 @@
+2013-04-16  Robert Hogan  <[email protected]>
+
+        Float at exact multiple of line-height affects too many lines
+        https://bugs.webkit.org/show_bug.cgi?id=112744
+
+        Reviewed by David Hyatt.
+
+        Tests: fast/block/float/float-with-fractional-height-vertical-lr.html
+               fast/block/float/float-with-fractional-height.html
+
+        When adding floats to the interval tree used for testing floats' overlap with lineboxes
+        truncate the dimensions of the float rather than rounding them. This matches the
+        treatment of linebox dimensions so ensures the test for overlap is comparing like
+        with like.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::::collectIfNeeded):
+        (WebCore::RenderBlock::FloatingObjects::intervalForFloatingObject):
+        (WebCore::::string):
+
 2013-04-16  Chris Fleizach  <[email protected]>
 
         AX: aria-valuetext is not exposed on OS X.

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (148522 => 148523)


--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2013-04-16 17:52:12 UTC (rev 148522)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2013-04-16 17:56:15 UTC (rev 148523)
@@ -4285,7 +4285,7 @@
         return;
 
     // All the objects returned from the tree should be already placed.
-    ASSERT(r->isPlaced() && rangesIntersect(m_renderer->pixelSnappedLogicalTopForFloat(r), m_renderer->pixelSnappedLogicalBottomForFloat(r), m_lowValue, m_highValue));
+    ASSERT(r->isPlaced() && rangesIntersect(m_renderer->logicalTopForFloat(r), m_renderer->logicalBottomForFloat(r), m_lowValue, m_highValue));
 
     if (FloatTypeValue == FloatingObject::FloatLeft 
         && m_renderer->logicalRightForFloat(r) > m_offset) {
@@ -7905,8 +7905,8 @@
 inline RenderBlock::FloatingObjectInterval RenderBlock::FloatingObjects::intervalForFloatingObject(FloatingObject* floatingObject)
 {
     if (m_horizontalWritingMode)
-        return RenderBlock::FloatingObjectInterval(floatingObject->frameRect().pixelSnappedY(), floatingObject->frameRect().pixelSnappedMaxY(), floatingObject);
-    return RenderBlock::FloatingObjectInterval(floatingObject->frameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedMaxX(), floatingObject);
+        return RenderBlock::FloatingObjectInterval(floatingObject->frameRect().y(), floatingObject->frameRect().maxY(), floatingObject);
+    return RenderBlock::FloatingObjectInterval(floatingObject->frameRect().x(), floatingObject->frameRect().maxX(), floatingObject);
 }
 
 void RenderBlock::FloatingObjects::addPlacedObject(FloatingObject* floatingObject)
@@ -8124,7 +8124,7 @@
 
 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::FloatingObject* floatingObject)
 {
-    return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->frameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floatingObject->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnappedMaxY());
+    return String::format("%p (%ix%i %ix%i)", floatingObject, floatingObject->frameRect().x().toInt(), floatingObject->frameRect().y().toInt(), floatingObject->frameRect().maxX().toInt(), floatingObject->frameRect().maxY().toInt());
 }
 
 #endif

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to