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

Wed Dec 22 18:21:28 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 3337ca8050b5a59b40b26c12f4f9f4edc2618e61
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 04:43:06 2010 +0000

    2010-12-09  Abhishek Arya  <inferno at chromium.org>
    
            Reviewed by James Robinson.
    
            For details element, ensure that if we ended up being inline that we set out replaced
            flag so that we are treated like an inline block.
            https://bugs.webkit.org/show_bug.cgi?id=50671
    
            Test: fast/html/details-element-render-inline-crash.html
    
            * rendering/RenderDetails.cpp:
            (WebCore::RenderDetails::styleDidChange): setReplaced to true if we are set as inline.
            * rendering/RenderDetails.h: function definition.
    2010-12-09  Abhishek Arya  <inferno at chromium.org>
    
            Reviewed by James Robinson.
    
            Tests that we do not crash when we set details element with children to show as inline.
            https://bugs.webkit.org/show_bug.cgi?id=50671
    
            * fast/html/details-element-render-inline-crash-expected.txt: Added.
            * fast/html/details-element-render-inline-crash.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7b3904e..1481ade 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-09  Abhishek Arya  <inferno at chromium.org>
+
+        Reviewed by James Robinson.
+
+        Tests that we do not crash when we set details element with children to show as inline.
+        https://bugs.webkit.org/show_bug.cgi?id=50671
+
+        * fast/html/details-element-render-inline-crash-expected.txt: Added.
+        * fast/html/details-element-render-inline-crash.html: Added.
+
 2010-12-09  James Robinson  <jamesr at chromium.org>
 
         Unreviewed. Update Chromium GPU test expecations for canvas/philip.
diff --git a/LayoutTests/fast/dom/Attr/child-nodes-cache-expected.txt b/LayoutTests/fast/html/details-element-render-inline-crash-expected.txt
similarity index 100%
copy from LayoutTests/fast/dom/Attr/child-nodes-cache-expected.txt
copy to LayoutTests/fast/html/details-element-render-inline-crash-expected.txt
diff --git a/LayoutTests/fast/html/details-element-render-inline-crash.html b/LayoutTests/fast/html/details-element-render-inline-crash.html
new file mode 100644
index 0000000..159cf0d
--- /dev/null
+++ b/LayoutTests/fast/html/details-element-render-inline-crash.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+<script>
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+</script>
+</head>
+<body>
+<style>
+   .control { display: inline; }
+</style>
+PASS<details class="control"><p><a></p></details>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a4db212..cbb4350 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-09  Abhishek Arya  <inferno at chromium.org>
+
+        Reviewed by James Robinson.
+
+        For details element, ensure that if we ended up being inline that we set out replaced
+        flag so that we are treated like an inline block.
+        https://bugs.webkit.org/show_bug.cgi?id=50671
+
+        Test: fast/html/details-element-render-inline-crash.html
+
+        * rendering/RenderDetails.cpp:
+        (WebCore::RenderDetails::styleDidChange): setReplaced to true if we are set as inline.
+        * rendering/RenderDetails.h: function definition.
+
 2010-12-09  Jasmin Lapalme  <jlapalme at druide.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/WebCore/rendering/RenderDetails.cpp b/WebCore/rendering/RenderDetails.cpp
index c14fdfd..a1039f9 100644
--- a/WebCore/rendering/RenderDetails.cpp
+++ b/WebCore/rendering/RenderDetails.cpp
@@ -28,4 +28,13 @@ RenderDetails::RenderDetails(Node* element)
 {
 }
 
+void RenderDetails::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
+{
+    RenderBlock::styleDidChange(diff, oldStyle);
+
+    // Ensure that if we ended up being inline that we set our replaced flag
+    // so that we're treated like an inline-block.
+    setReplaced(isInline());
+}
+
 }
diff --git a/WebCore/rendering/RenderDetails.h b/WebCore/rendering/RenderDetails.h
index 901b197..b8aebab 100644
--- a/WebCore/rendering/RenderDetails.h
+++ b/WebCore/rendering/RenderDetails.h
@@ -32,6 +32,7 @@ public:
 private:
     virtual const char* renderName() const { return "RenderDetails"; }
     virtual bool isDetails() const { return true; }
+    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
 };
 
 inline RenderDetails* toRenderDetails(RenderObject* object)

-- 
WebKit Debian packaging

