Merge 70681

WebCore/rendering/RenderView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 81 matching lines @@
 
 void RenderView::calcPrefWidths()
 {
     ASSERT(prefWidthsDirty());
 
     RenderBlock::calcPrefWidths();
 
     m_maxPrefWidth = m_minPrefWidth;
 }
 
+bool RenderView::isChildAllowed(RenderObject* child, RenderStyle*) const
+{
+    return child->isBox();
+}
+
 void RenderView::layout()
 {
     if (printing())
         m_minPrefWidth = m_maxPrefWidth = width();
 
     // Use calcWidth/Height to get the new width/height, since this will take the full page zoom factor into account.
     bool relayoutChildren = !printing() && (!m_frameView || width() != viewWidth() || height() != viewHeight());
     if (relayoutChildren) {
         setChildNeedsLayout(true, false);
         for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
@@ skipping 640 matching lines @@
 
 void RenderView::willMoveOffscreen()
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (m_compositor)
         m_compositor->willMoveOffscreen();
 #endif
 }
 
 } // namespace WebCore