Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(801)

Unified Diff: sky/engine/core/rendering/RenderLayer.cpp

Issue 886263003: Remove mask painting. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: fix comment Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/rendering/RenderLayer.h ('k') | sky/engine/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderLayer.cpp
diff --git a/sky/engine/core/rendering/RenderLayer.cpp b/sky/engine/core/rendering/RenderLayer.cpp
index 4c3996eb57a2e78c19f067b9faf993ceb64aeb94..bb03e92a2aad9fb33e4e1b8cbe9b1082cb38adbe 100644
--- a/sky/engine/core/rendering/RenderLayer.cpp
+++ b/sky/engine/core/rendering/RenderLayer.cpp
@@ -950,9 +950,6 @@ void RenderLayer::paintLayerContents(GraphicsContext* context, const LayerPainti
// Make sure that we now use the original transparency context.
ASSERT(transparencyLayerContext == context);
- if (shouldPaintContent && renderer()->hasMask())
- paintMask(context, localPaintingInfo, layerLocation, backgroundRect);
-
// End our transparency layer
if (haveTransparency && m_usedTransparency) {
context->endLayer();
@@ -1027,21 +1024,6 @@ void RenderLayer::paintForeground(GraphicsContext* context, GraphicsContext* tra
restoreClip(context, localPaintingInfo.paintDirtyRect, layerForegroundRect);
}
-void RenderLayer::paintMask(GraphicsContext* context, const LayerPaintingInfo& localPaintingInfo,
- LayoutPoint& layerLocation, ClipRect& layerBackgroundRect)
-{
- if (localPaintingInfo.clipToDirtyRect)
- clipToRect(localPaintingInfo, context, layerBackgroundRect, DoNotIncludeSelfForBorderRadius); // Mask painting will handle clipping to self.
-
- // Paint the mask.
- // FIXME: Eventually we will collect the region from the fragment itself instead of just from the paint info.
- PaintInfo paintInfo(context, pixelSnappedIntRect(layerBackgroundRect.rect()), PaintPhaseMask, localPaintingInfo.rootLayer->renderer());
- renderer()->paint(paintInfo, layerLocation);
-
- if (localPaintingInfo.clipToDirtyRect)
- restoreClip(context, localPaintingInfo.paintDirtyRect, layerBackgroundRect);
-}
-
static inline LayoutRect frameVisibleRect(RenderObject* renderer)
{
FrameView* frameView = renderer->document().view();
« no previous file with comments | « sky/engine/core/rendering/RenderLayer.h ('k') | sky/engine/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698