Title: [135447] trunk/Source/WebCore
- Revision
- 135447
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-21 16:02:23 -0800 (Wed, 21 Nov 2012)
Log Message
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).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-11-21
* dom/NodeRenderingContext.cpp:
(WebCore::NodeRenderingContext::createRendererIfNeeded):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::createObject):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135446 => 135447)
--- trunk/Source/WebCore/ChangeLog 2012-11-22 00:00:07 UTC (rev 135446)
+++ trunk/Source/WebCore/ChangeLog 2012-11-22 00:02:23 UTC (rev 135447)
@@ -1,3 +1,17 @@
+2012-11-21 Sheriff Bot <webkit.review....@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 <akl...@apple.com>
Style sharing: Compare class lists via SpaceSplitString instead of string comparison.
Modified: trunk/Source/WebCore/dom/NodeRenderingContext.cpp (135446 => 135447)
--- trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2012-11-22 00:00:07 UTC (rev 135446)
+++ trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2012-11-22 00:02:23 UTC (rev 135447)
@@ -229,11 +229,8 @@
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;
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (135446 => 135447)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2012-11-22 00:00:07 UTC (rev 135446)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2012-11-22 00:02:23 UTC (rev 135447)
@@ -170,7 +170,6 @@
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 @@
return new (arena) RenderGrid(node);
}
- ASSERT_NOT_REACHED();
return 0;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
