[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 12:47:24 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 9b381bf1893ae5bf55b3e47428836f6ceb057ce4
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 30 07:35:30 2010 +0000

    2010-08-30  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            WebCore::RenderBlock::addChild* NULL ptrs
            https://bugs.webkit.org/show_bug.cgi?id=43722
    
            * fast/ruby/before-doesnt-crash-expected.txt: Added.
            * fast/ruby/before-doesnt-crash.html: Added.
    2010-08-30  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            WebCore::RenderBlock::addChild* NULL ptrs
            https://bugs.webkit.org/show_bug.cgi?id=43722
    
            Also includes some cleanup of comments and ASSERTs.
    
            Test: fast/ruby/before-doesnt-crash.html
    
            * rendering/RenderRuby.cpp:
            (WebCore::RenderRubyAsInline::addChild):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66371 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 543f83a..665d84b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-30  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        WebCore::RenderBlock::addChild* NULL ptrs
+        https://bugs.webkit.org/show_bug.cgi?id=43722
+
+        * fast/ruby/before-doesnt-crash-expected.txt: Added.
+        * fast/ruby/before-doesnt-crash.html: Added.
+
 2010-08-29  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/ruby/before-doesnt-crash-expected.txt b/LayoutTests/fast/ruby/before-doesnt-crash-expected.txt
new file mode 100644
index 0000000..3b0bc20
--- /dev/null
+++ b/LayoutTests/fast/ruby/before-doesnt-crash-expected.txt
@@ -0,0 +1,2 @@
+ 
+ This test passes if it doesn't crash.
diff --git a/LayoutTests/fast/ruby/before-doesnt-crash.html b/LayoutTests/fast/ruby/before-doesnt-crash.html
new file mode 100644
index 0000000..c93af26
--- /dev/null
+++ b/LayoutTests/fast/ruby/before-doesnt-crash.html
@@ -0,0 +1,19 @@
+<html>
+  <head>
+    <style>
+      :before{
+        content:""
+      };
+    </style>
+  </head>
+  <body onload="document.linkColor=0;">
+    <ruby>
+      <rt></rt>
+    </ruby>
+    <script>
+      if (window.layoutTestController)
+          layoutTestController.dumpAsText();
+    </script>
+    This test passes if it doesn't crash.
+  </body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9e9d960..665823c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-30  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        WebCore::RenderBlock::addChild* NULL ptrs
+        https://bugs.webkit.org/show_bug.cgi?id=43722
+
+        Also includes some cleanup of comments and ASSERTs.
+
+        Test: fast/ruby/before-doesnt-crash.html
+
+        * rendering/RenderRuby.cpp:
+        (WebCore::RenderRubyAsInline::addChild):
+
 2010-08-30  Marc-Antoine Ruel  <maruel at chromium.org>
 
         Reviewed by Kent Tamura
diff --git a/WebCore/rendering/RenderRuby.cpp b/WebCore/rendering/RenderRuby.cpp
index 4ab9d73..2f543d5 100644
--- a/WebCore/rendering/RenderRuby.cpp
+++ b/WebCore/rendering/RenderRuby.cpp
@@ -75,24 +75,19 @@ bool RenderRubyAsInline::isChildAllowed(RenderObject* child, RenderStyle*) const
 
 void RenderRubyAsInline::addChild(RenderObject* child, RenderObject* beforeChild)
 {
-    // Note: ':after' content is handled implicitely below
+    // Note: ':after' content is handled implicitly below
 
-    // if child is a ruby run, just add it normally
     if (child->isRubyRun()) {
         RenderInline::addChild(child, beforeChild);
         return;
     }
 
-    if (beforeChild && !isAfterContent(beforeChild)) {
-        // insert child into run
-        ASSERT(!beforeChild->isRubyRun());
-        RenderRubyRun* run = findRubyRunParent(beforeChild);
-        ASSERT(run); // beforeChild should always have a run as parent
-        if (run) {
+    if (beforeChild && !isAfterContent(beforeChild) && !beforeChild->isRubyRun()) {
+        if (RenderRubyRun* run = findRubyRunParent(beforeChild)) {
             run->addChild(child, beforeChild);
             return;
         }
-        ASSERT(false); // beforeChild should always have a run as parent!
+        ASSERT_NOT_REACHED(); // beforeChild should always have a run as parent!
         // Emergency fallback: fall through and just append.
     }
 

-- 
WebKit Debian packaging

