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

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

Issue 786003002: Remove PaintPhaseClippingMask. (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/RenderBox.h ('k') | sky/engine/core/rendering/RenderReplaced.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 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 904
905 void RenderBox::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 905 void RenderBox::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
906 { 906 {
907 if (!paintInfo.shouldPaintWithinRoot(this) || paintInfo.phase != PaintPhaseM ask) 907 if (!paintInfo.shouldPaintWithinRoot(this) || paintInfo.phase != PaintPhaseM ask)
908 return; 908 return;
909 909
910 LayoutRect paintRect = LayoutRect(paintOffset, size()); 910 LayoutRect paintRect = LayoutRect(paintOffset, size());
911 paintMaskImages(paintInfo, paintRect); 911 paintMaskImages(paintInfo, paintRect);
912 } 912 }
913 913
914 void RenderBox::paintClippingMask(PaintInfo& paintInfo, const LayoutPoint& paint Offset)
915 {
916 // FIXME(sky): Remove
917 }
918
919 void RenderBox::paintMaskImages(const PaintInfo& paintInfo, const LayoutRect& pa intRect) 914 void RenderBox::paintMaskImages(const PaintInfo& paintInfo, const LayoutRect& pa intRect)
920 { 915 {
921 paintFillLayers(paintInfo, Color::transparent, style()->maskLayers(), paintR ect, BackgroundBleedNone); 916 paintFillLayers(paintInfo, Color::transparent, style()->maskLayers(), paintR ect, BackgroundBleedNone);
922 paintNinePieceImage(paintInfo.context, paintRect, style(), style()->maskBoxI mage()); 917 paintNinePieceImage(paintInfo.context, paintRect, style(), style()->maskBoxI mage());
923 } 918 }
924 919
925 void RenderBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, cons t FillLayer& fillLayer, const LayoutRect& rect, 920 void RenderBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, cons t FillLayer& fillLayer, const LayoutRect& rect,
926 BackgroundBleedAvoidance bleedAvoidance, RenderObject* backgroundObject) 921 BackgroundBleedAvoidance bleedAvoidance, RenderObject* backgroundObject)
927 { 922 {
928 Vector<const FillLayer*, 8> layers; 923 Vector<const FillLayer*, 8> layers;
(...skipping 2528 matching lines...) Expand 10 before | Expand all | Expand 10 after
3457 3452
3458 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) 3453 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
3459 { 3454 {
3460 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); 3455 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
3461 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); 3456 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
3462 ASSERT(hasBackground == style.hasBackground()); 3457 ASSERT(hasBackground == style.hasBackground());
3463 hasBorder = style.hasBorder(); 3458 hasBorder = style.hasBorder();
3464 } 3459 }
3465 3460
3466 } // namespace blink 3461 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBox.h ('k') | sky/engine/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698