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

Side by Side Diff: sky/engine/core/rendering/RenderBox.cpp

Issue 962543003: Simplify RenderLayer's handling of filters. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 transparencyClipBox(layer(), localPaintingInfo.rootLayer, localPaint ingInfo.subPixelAccumulation)); 852 transparencyClipBox(layer(), localPaintingInfo.rootLayer, localPaint ingInfo.subPixelAccumulation));
853 context->clip(clipRect); 853 context->clip(clipRect);
854 context->beginTransparencyLayer(opacity()); 854 context->beginTransparencyLayer(opacity());
855 } 855 }
856 856
857 layer()->clipToRect(localPaintingInfo, context, contentRect); 857 layer()->clipToRect(localPaintingInfo, context, contentRect);
858 858
859 FilterEffectRendererHelper filterPainter(layer()->filterRenderer() && hasFil ter()); 859 FilterEffectRendererHelper filterPainter(layer()->filterRenderer() && hasFil ter());
860 860
861 if (filterPainter.haveFilterEffect()) { 861 if (filterPainter.haveFilterEffect()) {
862 ASSERT(layer()->filterInfo());
863
864 if (!rootRelativeBoundsComputed) 862 if (!rootRelativeBoundsComputed)
865 rootRelativeBounds = layer()->physicalBoundingBoxIncludingReflection AndStackingChildren(paintingInfo.rootLayer, offsetFromRoot); 863 rootRelativeBounds = layer()->physicalBoundingBoxIncludingReflection AndStackingChildren(paintingInfo.rootLayer, offsetFromRoot);
866 864
867 if (filterPainter.prepareFilterEffect(layer(), rootRelativeBounds, paint ingInfo.paintDirtyRect)) 865 if (filterPainter.prepareFilterEffect(layer(), rootRelativeBounds, paint ingInfo.paintDirtyRect))
868 context = filterPainter.beginFilterEffect(context); 866 context = filterPainter.beginFilterEffect(context);
869 } 867 }
870 868
871 LayoutPoint layerLocation = toPoint(layerBounds.location() - location() + lo calPaintingInfo.subPixelAccumulation); 869 LayoutPoint layerLocation = toPoint(layerBounds.location() - location() + lo calPaintingInfo.subPixelAccumulation);
872 870
873 Vector<RenderBox*> layers; 871 Vector<RenderBox*> layers;
(...skipping 2151 matching lines...) Expand 10 before | Expand all | Expand 10 after
3025 3023
3026 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) 3024 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
3027 { 3025 {
3028 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); 3026 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
3029 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); 3027 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
3030 ASSERT(hasBackground == style.hasBackground()); 3028 ASSERT(hasBackground == style.hasBackground());
3031 hasBorder = style.hasBorder(); 3029 hasBorder = style.hasBorder();
3032 } 3030 }
3033 3031
3034 } // namespace blink 3032 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/FilterEffectRenderer.cpp ('k') | sky/engine/core/rendering/RenderLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698