Remove NonCompositedContentHost -- Take 2

Source/core/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 412 matching lines @@
     // a transform, transparency layer, etc.
     Element* elt;
     for (elt = document()->ownerElement(); view() && elt && elt->renderer(); elt = elt->document()->ownerElement()) {
         RenderLayer* layer = elt->renderer()->enclosingLayer();
         if (layer->cannotBlitToWindow()) {
             frameView()->setCannotBlitToWindow();
             break;
         }
 
         if (RenderLayer* compositingLayer = layer->enclosingCompositingLayerForRepaint()) {
-            if (!compositingLayer->backing()->paintsIntoWindow()) {
-                frameView()->setCannotBlitToWindow();
-                break;
-            }
+            frameView()->setCannotBlitToWindow();
+            break;
         }
     }
 
     if (document()->ownerElement() || !view())
         return;
 
     if (paintInfo.skipRootBackground())
         return;
 
     bool rootFillsViewport = false;
@@ skipping 629 matching lines @@
     return m_flowThreadController.get();
 }
 
 RenderBlock::IntervalArena* RenderView::intervalArena()
 {
     if (!m_intervalArena)
         m_intervalArena = IntervalArena::create();
     return m_intervalArena.get();
 }
 
+bool RenderView::backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const
+{
+    // FIXME: Remove this main frame check. Same concept applies to subframes too.
+    Page* page = document()->page();
+    Frame* mainFrame = page ? page->mainFrame() : 0;
+    if (!m_frameView || m_frameView->frame() != mainFrame)
+        return false;
+
+    return m_frameView->hasOpaqueBackground();
+}
+
 void RenderView::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering);
     RenderBlock::reportMemoryUsage(memoryObjectInfo);
     info.addWeakPointer(m_frameView);
     info.addWeakPointer(m_selectionStart);
     info.addWeakPointer(m_selectionEnd);
     info.addMember(m_widgets, "widgets");
     info.addMember(m_layoutState, "layoutState");
     info.addMember(m_compositor, "compositor");
@@ skipping 35 matching lines @@
 #endif
 
     if (layoutState)
         layoutState->m_isPaginated = m_fragmenting;
         
     if (m_flowThreadState != RenderObject::NotInsideFlowThread)
         m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState);
 }
 
 } // namespace WebCore