Title: [135437] trunk/Source/WebCore
- Revision
- 135437
- Author
- [email protected]
- Date
- 2012-11-21 14:36:02 -0800 (Wed, 21 Nov 2012)
Log Message
Node::createRenderer should never return null
https://bugs.webkit.org/show_bug.cgi?id=102975
Patch by Elliott Sprehn <[email protected]> on 2012-11-21
Reviewed by Ojan Vafai.
Node::createRenderer should never return null, instead Node::rendererIsNeeded
should return false if a node doesn't wish to have a renderer. This method
never actually returns null right now, but the code makes it look like it
could.
No new tests, just refactoring.
* dom/NodeRenderingContext.cpp:
(WebCore::NodeRenderingContext::createRendererIfNeeded):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::createObject):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135436 => 135437)
--- trunk/Source/WebCore/ChangeLog 2012-11-21 22:34:01 UTC (rev 135436)
+++ trunk/Source/WebCore/ChangeLog 2012-11-21 22:36:02 UTC (rev 135437)
@@ -1,3 +1,22 @@
+2012-11-21 Elliott Sprehn <[email protected]>
+
+ Node::createRenderer should never return null
+ https://bugs.webkit.org/show_bug.cgi?id=102975
+
+ Reviewed by Ojan Vafai.
+
+ Node::createRenderer should never return null, instead Node::rendererIsNeeded
+ should return false if a node doesn't wish to have a renderer. This method
+ never actually returns null right now, but the code makes it look like it
+ could.
+
+ No new tests, just refactoring.
+
+ * dom/NodeRenderingContext.cpp:
+ (WebCore::NodeRenderingContext::createRendererIfNeeded):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::createObject):
+
2012-11-21 Fady Samuel <[email protected]>
Clear MousePressed state on context menu to avoid initiating a drag
Modified: trunk/Source/WebCore/dom/NodeRenderingContext.cpp (135436 => 135437)
--- trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2012-11-21 22:34:01 UTC (rev 135436)
+++ trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2012-11-21 22:36:02 UTC (rev 135437)
@@ -229,8 +229,11 @@
Document* document = m_node->document();
RenderObject* newRenderer = m_node->createRenderer(document->renderArena(), m_style.get());
- if (!newRenderer)
+ if (!newRenderer) {
+ ASSERT_NOT_REACHED();
return;
+ }
+
if (!parentRenderer->isChildAllowed(newRenderer, m_style.get())) {
newRenderer->destroy();
return;
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (135436 => 135437)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2012-11-21 22:34:01 UTC (rev 135436)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2012-11-21 22:36:02 UTC (rev 135437)
@@ -170,6 +170,7 @@
return new (arena) RenderRegion(node, 0);
switch (style->display()) {
case NONE:
+ ASSERT_NOT_REACHED();
return 0;
case INLINE:
return new (arena) RenderInline(node);
@@ -209,6 +210,7 @@
return new (arena) RenderGrid(node);
}
+ ASSERT_NOT_REACHED();
return 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
