Merge Webkit at r70949: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / rendering / RenderView.cpp

diff --git a/WebCore/rendering/RenderView.cpp b/WebCore/rendering/RenderView.cpp
index 0538d99..3349403 100644 (file)
--- a/WebCore/rendering/RenderView.cpp
+++ b/WebCore/rendering/RenderView.cpp
@@ -105,6 +105,11 @@ void RenderView::computePreferredLogicalWidths()
     m_maxPreferredLogicalWidth = m_minPreferredLogicalWidth;
 }
 
+bool RenderView::isChildAllowed(RenderObject* child, RenderStyle*) const
+{
+    return child->isBox();
+}
+
 void RenderView::layout()
 {
     if (!document()->paginated())