No need to keep anonymous RenderBlock in DETAILS.

https://bugs.webkit.org/show_bug.cgi?id=77322

Patch by Shinya Kawanaka <shinyak@google.com> on 2012-01-30
Reviewed by Hajime Morita.

Anonymous RenderBlock of DETAILS element was not squashed when detaching them.
However, it should be removed.

No new tests. Should be covered by existing tests.

* rendering/RenderBlock.cpp:
(WebCore::canMergeContiguousAnonymousBlocks):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106228 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6408901..74d7945 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2012-01-30  Shinya Kawanaka  <shinyak@google.com>
+
+        No need to keep anonymous RenderBlock in DETAILS.
+        https://bugs.webkit.org/show_bug.cgi?id=77322
+
+        Reviewed by Hajime Morita.
+
+        Anonymous RenderBlock of DETAILS element was not squashed when detaching them.
+        However, it should be removed.
+
+        No new tests. Should be covered by existing tests.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::canMergeContiguousAnonymousBlocks):
+
 2012-01-30  Zoltan Herczeg  <zherczeg@webkit.org>
 
         Custom written CSS lexer

diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp
index 71c5d4b..2bced0f 100755 (executable)
--- a/Source/WebCore/rendering/RenderBlock.cpp
+++ b/Source/WebCore/rendering/RenderBlock.cpp
@@ -1000,11 +1000,6 @@ static bool canMergeContiguousAnonymousBlocks(RenderObject* oldChild, RenderObje
     if (oldChild->documentBeingDestroyed() || oldChild->isInline() || oldChild->virtualContinuation())
         return false;
 
-#if ENABLE(DETAILS)
-    if (oldChild->parent() && oldChild->parent()->isDetails())
-        return false;
-#endif
-
     if ((prev && (!prev->isAnonymousBlock() || toRenderBlock(prev)->continuation() || toRenderBlock(prev)->beingDestroyed()))
         || (next && (!next->isAnonymousBlock() || toRenderBlock(next)->continuation() || toRenderBlock(next)->beingDestroyed())))
         return false;