[Chromium] Make root layer always opaque
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Dec 2011 20:17:02 +0000 (20:17 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Dec 2011 20:17:02 +0000 (20:17 +0000)
https://bugs.webkit.org/show_bug.cgi?id=70564

Patch by Dana Jansens <danakj@chromium.org> on 2011-12-06
Reviewed by James Robinson.

* platform/graphics/chromium/NonCompositedContentHost.cpp:
(WebCore::NonCompositedContentHost::NonCompositedContentHost):
* platform/graphics/chromium/cc/CCTiledLayerImpl.cpp:
(WebCore::CCTiledLayerImpl::draw):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@102164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/chromium/NonCompositedContentHost.cpp
Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp

index 809cd8f..329eb6a 100644 (file)
@@ -1,3 +1,15 @@
+2011-12-06  Dana Jansens  <danakj@chromium.org>
+
+        [Chromium] Make root layer always opaque
+        https://bugs.webkit.org/show_bug.cgi?id=70564
+
+        Reviewed by James Robinson.
+
+        * platform/graphics/chromium/NonCompositedContentHost.cpp:
+        (WebCore::NonCompositedContentHost::NonCompositedContentHost):
+        * platform/graphics/chromium/cc/CCTiledLayerImpl.cpp:
+        (WebCore::CCTiledLayerImpl::draw):
+
 2011-12-06  Noel Gordon  <noel.gordon@gmail.com>
 
         WebPImageDecoder computes image width and height multiple times
index ceebded..093ea68 100644 (file)
@@ -44,6 +44,7 @@ NonCompositedContentHost::NonCompositedContentHost(PassOwnPtr<LayerPainterChromi
 #endif
     m_graphicsLayer->setDrawsContent(true);
     m_graphicsLayer->platformLayer()->setIsNonCompositedContent(true);
+    m_graphicsLayer->platformLayer()->setOpaque(true);
 }
 
 NonCompositedContentHost::~NonCompositedContentHost()
index 511d85f..49d1df3 100644 (file)
@@ -138,10 +138,6 @@ void CCTiledLayerImpl::draw(LayerRendererChromium* layerRenderer)
         layerQuad.inflateAntiAliasingDistance();
     }
 
-    GraphicsContext3D* context = layerRenderer->context();
-    if (isNonCompositedContent())
-        GLC(context, context->disable(GraphicsContext3D::BLEND));
-
     switch (m_sampledTexelFormat) {
     case LayerTextureUpdater::SampledTexelFormatRGBA:
         if (useAA) {
@@ -174,9 +170,6 @@ void CCTiledLayerImpl::draw(LayerRendererChromium* layerRenderer)
     default:
         ASSERT_NOT_REACHED();
     }
-
-    if (isNonCompositedContent())
-        GLC(context, context->enable(GraphicsContext3D::BLEND));
 }
 
 void CCTiledLayerImpl::setTilingData(const CCLayerTilingData& tiler)