Remove NonCompositedContentHost

Source/core/rendering/RenderLayerBacking.cpp

Index: Source/core/rendering/RenderLayerBacking.cpp
diff --git a/Source/core/rendering/RenderLayerBacking.cpp b/Source/core/rendering/RenderLayerBacking.cpp
index 9b93e04d97f9b1b41cd6e176335c4474c94cd4d9..3b1cb24e4e06a9843511af0d20eb94cfcb0ed192 100644
--- a/Source/core/rendering/RenderLayerBacking.cpp
+++ b/Source/core/rendering/RenderLayerBacking.cpp
@@ -36,6 +36,7 @@
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "GraphicsLayer.h"
+#include "GraphicsLayerChromium.h"
 #include "HTMLCanvasElement.h"
 #include "HTMLIFrameElement.h"
 #include "HTMLMediaElement.h"
@@ -54,6 +55,7 @@
 #include "Settings.h"
 #include "StyleResolver.h"
 #include "WebCoreMemoryInstrumentation.h"
+#include <public/WebContentLayer.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/text/StringBuilder.h>
 
@@ -196,6 +198,14 @@ void RenderLayerBacking::createPrimaryGraphicsLayer()
     if (m_isMainFrameRenderViewLayer) {
         m_graphicsLayer->setContentsOpaque(true);

[trchen, 2013/04/24 21:16:51]

Here, look at me.

         m_graphicsLayer->setAppliesPageScale();
+
+        WebKit::WebContentLayer* layer = static_cast<WebCore::GraphicsLayerChromium*>(m_graphicsLayer.get())->contentLayer();

[jamesr, 2013/04/24 03:16:35]

we need to fold GraphicsLayerChromium into GraphicsLayer already

+#if !OS(ANDROID)
+        layer->setDrawCheckerboardForMissingTiles(true);
+#endif
+
+        // FIXME: Remove LCD text setting after it is implemented in chromium.

[enne (OOO), 2013/04/24 14:00:24]

I suspect but am not positive that this could be removed at this point.  As long
as the graphics layer gets its background color set to opaque (which it should),
we should automatically turn on LCD text.

Can you verify that with this change that this layer is still marked as contents
opaque so that we turn off blending?

[trchen, 2013/04/24 21:16:51]

I'm positive. Just found that setUseLCDText is an empty stub in
WebContentLayerImpl. lol
Will remove this hunk along with the API.
Yes see my comments above. Is it the sufficient condition?

+        layer->setUseLCDText(true);
     }
 
     updateOpacity(renderer()->style());
@@ -374,7 +384,7 @@ void RenderLayerBacking::updateAfterLayout(UpdateAfterLayoutFlags flags)
         }
     }
     
-    if (flags & NeedsFullRepaint && !paintsIntoWindow() && !paintsIntoCompositedAncestor())
+    if (flags & NeedsFullRepaint && !paintsIntoCompositedAncestor())
         setContentsNeedDisplay();
 }
 
@@ -1332,7 +1342,7 @@ bool RenderLayerBacking::hasVisibleNonCompositingDescendantLayers() const
 
 bool RenderLayerBacking::containsPaintedContent() const
 {
-    if (isSimpleContainerCompositingLayer() || paintsIntoWindow() || paintsIntoCompositedAncestor() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())
+    if (isSimpleContainerCompositingLayer() || paintsIntoCompositedAncestor() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())
         return false;
 
     if (isDirectlyCompositedImage())
@@ -1518,15 +1528,6 @@ GraphicsLayer* RenderLayerBacking::childForSuperlayers() const
     return m_graphicsLayer.get();
 }
 
-bool RenderLayerBacking::paintsIntoWindow() const
-{
-    if (m_owningLayer->isRootLayer()) {
-        return compositor()->rootLayerAttachment() != RenderLayerCompositor::RootLayerAttachedViaEnclosingFrame;
-    }
-    
-    return false;
-}
-
 void RenderLayerBacking::setRequiresOwnBackingStore(bool requiresOwnBacking)
 {
     if (requiresOwnBacking == m_requiresOwnBackingStore)
@@ -1609,7 +1610,7 @@ void RenderLayerBacking::paintIntoLayer(const GraphicsLayer* graphicsLayer, Grap
                     const IntRect& paintDirtyRect, // In the coords of rootLayer.
                     PaintBehavior paintBehavior, GraphicsLayerPaintingPhase paintingPhase)
 {
-    if (paintsIntoWindow() || paintsIntoCompositedAncestor()) {
+    if (paintsIntoCompositedAncestor()) {
         ASSERT_NOT_REACHED();
         return;
     }