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

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

Issue 961553003: Remove dead code from RenderLayer and inline filter methods. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderLayer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 if (layer()->isTransparent()) { 838 if (layer()->isTransparent()) {
839 context->save(); 839 context->save();
840 LayoutRect clipRect = intersection(paintingInfo.paintDirtyRect, 840 LayoutRect clipRect = intersection(paintingInfo.paintDirtyRect,
841 transparencyClipBox(layer(), localPaintingInfo.rootLayer, localPaint ingInfo.subPixelAccumulation)); 841 transparencyClipBox(layer(), localPaintingInfo.rootLayer, localPaint ingInfo.subPixelAccumulation));
842 context->clip(clipRect); 842 context->clip(clipRect);
843 context->beginTransparencyLayer(opacity()); 843 context->beginTransparencyLayer(opacity());
844 } 844 }
845 845
846 layer()->clipToRect(localPaintingInfo, context, contentRect); 846 layer()->clipToRect(localPaintingInfo, context, contentRect);
847 847
848 FilterEffectRendererHelper filterPainter(layer()->filterRenderer() && layer( )->paintsWithFilters()); 848 FilterEffectRendererHelper filterPainter(layer()->filterRenderer() && hasFil ter());
849 849
850 if (filterPainter.haveFilterEffect()) { 850 if (filterPainter.haveFilterEffect()) {
851 ASSERT(layer()->filterInfo()); 851 ASSERT(layer()->filterInfo());
852 852
853 if (!rootRelativeBoundsComputed) 853 if (!rootRelativeBoundsComputed)
854 rootRelativeBounds = layer()->physicalBoundingBoxIncludingReflection AndStackingChildren(paintingInfo.rootLayer, offsetFromRoot); 854 rootRelativeBounds = layer()->physicalBoundingBoxIncludingReflection AndStackingChildren(paintingInfo.rootLayer, offsetFromRoot);
855 855
856 if (filterPainter.prepareFilterEffect(layer(), rootRelativeBounds, paint ingInfo.paintDirtyRect)) 856 if (filterPainter.prepareFilterEffect(layer(), rootRelativeBounds, paint ingInfo.paintDirtyRect))
857 context = filterPainter.beginFilterEffect(context); 857 context = filterPainter.beginFilterEffect(context);
858 } 858 }
(...skipping 2155 matching lines...) Expand 10 before | Expand all | Expand 10 after
3014 3014
3015 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) 3015 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
3016 { 3016 {
3017 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); 3017 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
3018 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); 3018 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
3019 ASSERT(hasBackground == style.hasBackground()); 3019 ASSERT(hasBackground == style.hasBackground());
3020 hasBorder = style.hasBorder(); 3020 hasBorder = style.hasBorder();
3021 } 3021 }
3022 3022
3023 } // namespace blink 3023 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698