[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

Thu Oct 29 20:34:03 UTC 2009

The following commit has been merged in the webkit-1.1 branch:
commit 8808e238906e218f3da5ff5fde87d047c9ed3d5d
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 25 02:25:04 2009 +0000

    WebCore: Fix <rdar://problem/7162000> Crash while trying to
    calculate the horizontal position of image
    
    Reviewed by Sam Weinig.
    
    Test: fast/inline-block/relative-positioned-rtl-crash.html
    
    * rendering/RenderBox.cpp:
    (WebCore::RenderBox::calcAbsoluteHorizontalReplaced): Corrected an
    isInline() test to isRenderInline(). This is similar to r41259.
    
    LayoutTests: Test for <rdar://problem/7162000> Crash while trying to
    calculate the horizontal position of image
    
    Reviewed by Sam Weinig.
    
    * fast/inline-block/relative-positioned-rtl-crash-expected.txt: Added.
    * fast/inline-block/relative-positioned-rtl-crash.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48743 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a0023a9..1a4106b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-24  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Test for <rdar://problem/7162000> Crash while trying to
+        calculate the horizontal position of image
+
+        * fast/inline-block/relative-positioned-rtl-crash-expected.txt: Added.
+        * fast/inline-block/relative-positioned-rtl-crash.html: Added.
+
 2009-09-24  Carol Szabo  <carol.szabo at nokia.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/JavaScriptCore/tests/mozilla/js1_6/Array/browser.js b/LayoutTests/fast/inline-block/relative-positioned-rtl-crash-expected.txt
similarity index 100%
copy from JavaScriptCore/tests/mozilla/js1_6/Array/browser.js
copy to LayoutTests/fast/inline-block/relative-positioned-rtl-crash-expected.txt
diff --git a/LayoutTests/fast/inline-block/relative-positioned-rtl-crash.html b/LayoutTests/fast/inline-block/relative-positioned-rtl-crash.html
new file mode 100644
index 0000000..9e300a3
--- /dev/null
+++ b/LayoutTests/fast/inline-block/relative-positioned-rtl-crash.html
@@ -0,0 +1,9 @@
+<script>
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+</script>
+<body style="direction: rtl;">
+    <div style="display: inline-block; width: 100px; position: relative; height: 10px;">
+        <img style="position: absolute;"/>
+    </div>
+</body>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 57bb760..ebf88d1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-09-24  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Fix <rdar://problem/7162000> Crash while trying to
+        calculate the horizontal position of image
+
+        Test: fast/inline-block/relative-positioned-rtl-crash.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::calcAbsoluteHorizontalReplaced): Corrected an
+        isInline() test to isRenderInline(). This is similar to r41259.
+
 2009-09-24  Jessie Berlin  <jberlin at webkit.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index cea226e..dd58ed1 100644
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -2456,7 +2456,7 @@ void RenderBox::calcAbsoluteHorizontalReplaced()
     // positioned, inline containing block because right now, it is using the xPos
     // of the first line box when really it should use the last line box.  When
     // this is fixed elsewhere, this block should be removed.
-    if (containerBlock->isInline() && containerBlock->style()->direction() == RTL) {
+    if (containerBlock->isRenderInline() && containerBlock->style()->direction() == RTL) {
         const RenderInline* flow = toRenderInline(containerBlock);
         InlineFlowBox* firstLine = flow->firstLineBox();
         InlineFlowBox* lastLine = flow->lastLineBox();

-- 
WebKit Debian packaging

