Unreviewed, rolling out r135437.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Nov 2012 00:02:23 +0000 (00:02 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Nov 2012 00:02:23 +0000 (00:02 +0000)
http://trac.webkit.org/changeset/135437
https://bugs.webkit.org/show_bug.cgi?id=102986

This patch causes crash to some layout tests (Requested by
jianli on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-11-21

* dom/NodeRenderingContext.cpp:
(WebCore::NodeRenderingContext::createRendererIfNeeded):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::createObject):

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

Source/WebCore/ChangeLog
Source/WebCore/dom/NodeRenderingContext.cpp
Source/WebCore/rendering/RenderObject.cpp

index 9515e71..cbbd30c 100644 (file)
@@ -1,3 +1,17 @@
+2012-11-21  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r135437.
+        http://trac.webkit.org/changeset/135437
+        https://bugs.webkit.org/show_bug.cgi?id=102986
+
+        This patch causes crash to some layout tests (Requested by
+        jianli on #webkit).
+
+        * dom/NodeRenderingContext.cpp:
+        (WebCore::NodeRenderingContext::createRendererIfNeeded):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::createObject):
+
 2012-11-21  Andreas Kling  <akling@apple.com>
 
         Style sharing: Compare class lists via SpaceSplitString instead of string comparison.
index cd26250..9aeeacf 100644 (file)
@@ -229,11 +229,8 @@ void NodeRenderingContext::createRendererIfNeeded()
 
     Document* document = m_node->document();
     RenderObject* newRenderer = m_node->createRenderer(document->renderArena(), m_style.get());
-    if (!newRenderer) {
-        ASSERT_NOT_REACHED();
+    if (!newRenderer)
         return;
-    }
-
     if (!parentRenderer->isChildAllowed(newRenderer, m_style.get())) {
         newRenderer->destroy();
         return;
index 15d21a6..15dcdd0 100644 (file)
@@ -170,7 +170,6 @@ RenderObject* RenderObject::createObject(Node* node, RenderStyle* style)
         return new (arena) RenderRegion(node, 0);
     switch (style->display()) {
     case NONE:
-        ASSERT_NOT_REACHED();
         return 0;
     case INLINE:
         return new (arena) RenderInline(node);
@@ -210,7 +209,6 @@ RenderObject* RenderObject::createObject(Node* node, RenderStyle* style)
         return new (arena) RenderGrid(node);
     }
 
-    ASSERT_NOT_REACHED();
     return 0;
 }