Title: [102164] trunk/Source/WebCore
Revision
102164
Author
[email protected]
Date
2011-12-06 12:17:02 -0800 (Tue, 06 Dec 2011)

Log Message

[Chromium] Make root layer always opaque
https://bugs.webkit.org/show_bug.cgi?id=70564

Patch by Dana Jansens <[email protected]> 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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (102163 => 102164)


--- trunk/Source/WebCore/ChangeLog	2011-12-06 20:04:25 UTC (rev 102163)
+++ trunk/Source/WebCore/ChangeLog	2011-12-06 20:17:02 UTC (rev 102164)
@@ -1,3 +1,15 @@
+2011-12-06  Dana Jansens  <[email protected]>
+
+        [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  <[email protected]>
 
         WebPImageDecoder computes image width and height multiple times

Modified: trunk/Source/WebCore/platform/graphics/chromium/NonCompositedContentHost.cpp (102163 => 102164)


--- trunk/Source/WebCore/platform/graphics/chromium/NonCompositedContentHost.cpp	2011-12-06 20:04:25 UTC (rev 102163)
+++ trunk/Source/WebCore/platform/graphics/chromium/NonCompositedContentHost.cpp	2011-12-06 20:17:02 UTC (rev 102164)
@@ -44,6 +44,7 @@
 #endif
     m_graphicsLayer->setDrawsContent(true);
     m_graphicsLayer->platformLayer()->setIsNonCompositedContent(true);
+    m_graphicsLayer->platformLayer()->setOpaque(true);
 }
 
 NonCompositedContentHost::~NonCompositedContentHost()

Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp (102163 => 102164)


--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp	2011-12-06 20:04:25 UTC (rev 102163)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp	2011-12-06 20:17:02 UTC (rev 102164)
@@ -138,10 +138,6 @@
         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 @@
     default:
         ASSERT_NOT_REACHED();
     }
-
-    if (isNonCompositedContent())
-        GLC(context, context->enable(GraphicsContext3D::BLEND));
 }
 
 void CCTiledLayerImpl::setTilingData(const CCLayerTilingData& tiler)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to