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

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

Issue 766303002: Remove some dead paint flags. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « sky/engine/core/rendering/RenderBlock.cpp ('k') | sky/engine/core/rendering/RenderLayer.cpp » ('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 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 LayoutPoint adjustedPaintOffset = paintOffset + location(); 661 LayoutPoint adjustedPaintOffset = paintOffset + location();
662 // default implementation. Just pass paint through to the children 662 // default implementation. Just pass paint through to the children
663 PaintInfo childInfo(paintInfo); 663 PaintInfo childInfo(paintInfo);
664 childInfo.updatePaintingRootForChildren(this); 664 childInfo.updatePaintingRootForChildren(this);
665 for (RenderObject* child = slowFirstChild(); child; child = child->nextSibli ng()) 665 for (RenderObject* child = slowFirstChild(); child; child = child->nextSibli ng())
666 child->paint(childInfo, adjustedPaintOffset); 666 child->paint(childInfo, adjustedPaintOffset);
667 } 667 }
668 668
669 void RenderBox::paintRootBoxFillLayers(const PaintInfo& paintInfo) 669 void RenderBox::paintRootBoxFillLayers(const PaintInfo& paintInfo)
670 { 670 {
671 if (paintInfo.skipRootBackground())
672 return;
673
674 const FillLayer& bgLayer = style()->backgroundLayers(); 671 const FillLayer& bgLayer = style()->backgroundLayers();
675 Color bgColor = resolveColor(CSSPropertyBackgroundColor); 672 Color bgColor = resolveColor(CSSPropertyBackgroundColor);
676 673
677 paintFillLayers(paintInfo, bgColor, bgLayer, view()->backgroundRect(this), B ackgroundBleedNone, this); 674 paintFillLayers(paintInfo, bgColor, bgLayer, view()->backgroundRect(this), B ackgroundBleedNone, this);
678 } 675 }
679 676
680 BackgroundBleedAvoidance RenderBox::determineBackgroundBleedAvoidance(GraphicsCo ntext* context, const BoxDecorationData& boxDecorationData) const 677 BackgroundBleedAvoidance RenderBox::determineBackgroundBleedAvoidance(GraphicsCo ntext* context, const BoxDecorationData& boxDecorationData) const
681 { 678 {
682 if (!boxDecorationData.hasBackground || !boxDecorationData.hasBorder || !sty le()->hasBorderRadius() || canRenderBorderImage()) 679 if (!boxDecorationData.hasBackground || !boxDecorationData.hasBorder || !sty le()->hasBorderRadius() || canRenderBorderImage())
683 return BackgroundBleedNone; 680 return BackgroundBleedNone;
(...skipping 2776 matching lines...) Expand 10 before | Expand all | Expand 10 after
3460 3457
3461 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) 3458 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
3462 { 3459 {
3463 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); 3460 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
3464 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); 3461 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
3465 ASSERT(hasBackground == style.hasBackground()); 3462 ASSERT(hasBackground == style.hasBackground());
3466 hasBorder = style.hasBorder(); 3463 hasBorder = style.hasBorder();
3467 } 3464 }
3468 3465
3469 } // namespace blink 3466 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.cpp ('k') | sky/engine/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698