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

Wed Dec 22 15:02:54 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit c5c83635626c35f5a0a3a882b10db59b3b388895
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 18:46:12 2010 +0000

    2010-10-27  Abhishek Arya  <inferno at chromium.org>
    
            Reviewed by Dave Hyatt.
    
            Add a function to make sure child is allowed before adding to a
            render view.
            https://bugs.webkit.org/show_bug.cgi?id=48328
    
            Test: fast/inline/inline-child-height-width-calc-crash.html
    
            * rendering/RenderView.cpp:
            (WebCore::RenderView::isChildAllowed):
            * rendering/RenderView.h:
    2010-10-27  Abhishek Arya  <inferno at chromium.org>
    
            Reviewed by Dave Hyatt.
    
            Tests that adding a br element to a new document does not result in crash.
            https://bugs.webkit.org/show_bug.cgi?id=48328
    
            * fast/inline/inline-child-height-width-calc-crash-expected.txt: Added.
            * fast/inline/inline-child-height-width-calc-crash.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6ed9318..4819bcf 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-27  Abhishek Arya  <inferno at chromium.org>
+
+        Reviewed by Dave Hyatt.
+
+        Tests that adding a br element to a new document does not result in crash.
+        https://bugs.webkit.org/show_bug.cgi?id=48328 
+
+        * fast/inline/inline-child-height-width-calc-crash-expected.txt: Added.
+        * fast/inline/inline-child-height-width-calc-crash.html: Added.
+
 2010-10-27  Dimitri Glazkov  <dglazkov at chromium.org>
 
         [Chromium] Update expectations after r70664 and r70657.
diff --git a/LayoutTests/fast/inline/inline-child-height-width-calc-crash-expected.txt b/LayoutTests/fast/inline/inline-child-height-width-calc-crash-expected.txt
new file mode 100644
index 0000000..6c7d115
--- /dev/null
+++ b/LayoutTests/fast/inline/inline-child-height-width-calc-crash-expected.txt
@@ -0,0 +1,3 @@
+ALERT: PASS
+
+
diff --git a/LayoutTests/fast/inline/inline-child-height-width-calc-crash.html b/LayoutTests/fast/inline/inline-child-height-width-calc-crash.html
new file mode 100644
index 0000000..ac03b71
--- /dev/null
+++ b/LayoutTests/fast/inline/inline-child-height-width-calc-crash.html
@@ -0,0 +1,27 @@
+<html>
+    <head>
+        <script>
+            if (window.layoutTestController)
+            {
+                layoutTestController.dumpAsText();
+                layoutTestController.waitUntilDone();
+            }
+
+            function runTest() {
+                brElement = document.getElementById('test');
+                document.open();
+                setTimeout(function () {
+                    document.appendChild(brElement);
+                    
+                    alert('PASS');
+                    if (window.layoutTestController)
+                        layoutTestController.notifyDone();
+                }, 0);
+            }
+        </script>
+    </head>
+    <body onload="runTest()">
+        <br id='test'>
+    </body>
+</html>
+
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a01bcf9..09fbe97 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-27  Abhishek Arya  <inferno at chromium.org>
+
+        Reviewed by Dave Hyatt.
+
+        Add a function to make sure child is allowed before adding to a
+        render view. 
+        https://bugs.webkit.org/show_bug.cgi?id=48328 
+
+        Test: fast/inline/inline-child-height-width-calc-crash.html
+
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::isChildAllowed):
+        * rendering/RenderView.h:
+
 2010-10-27  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebCore/rendering/RenderView.cpp b/WebCore/rendering/RenderView.cpp
index d11ea6e..16bb6b3 100644
--- a/WebCore/rendering/RenderView.cpp
+++ b/WebCore/rendering/RenderView.cpp
@@ -94,6 +94,11 @@ void RenderView::computePreferredLogicalWidths()
     m_maxPreferredLogicalWidth = m_minPreferredLogicalWidth;
 }
 
+bool RenderView::isChildAllowed(RenderObject* child, RenderStyle*) const
+{
+    return child->isBox();
+}
+
 void RenderView::layout()
 {
     if (!document()->paginated())
diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h
index d3d7a08..07f933f 100644
--- a/WebCore/rendering/RenderView.h
+++ b/WebCore/rendering/RenderView.h
@@ -46,6 +46,8 @@ public:
 
     virtual bool requiresLayer() const { return true; }
 
+    virtual bool isChildAllowed(RenderObject*, RenderStyle*) const;
+
     virtual void layout();
     virtual void computeLogicalWidth();
     virtual void computeLogicalHeight();

-- 
WebKit Debian packaging

