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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 19697011: Change rendering code to use RenderObject::resolveColor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/InlineTextBox.cpp ('k') | Source/core/rendering/RenderBox.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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 2951 matching lines...) Expand 10 before | Expand all | Expand 10 after
2962 // sit above the background/border. 2962 // sit above the background/border.
2963 if (hasOverflowClip() && style()->visibility() == VISIBLE && (phase == Paint PhaseBlockBackground || phase == PaintPhaseChildBlockBackground) && paintInfo.sh ouldPaintWithinRoot(this) && !paintInfo.paintRootBackgroundOnly()) 2963 if (hasOverflowClip() && style()->visibility() == VISIBLE && (phase == Paint PhaseBlockBackground || phase == PaintPhaseChildBlockBackground) && paintInfo.sh ouldPaintWithinRoot(this) && !paintInfo.paintRootBackgroundOnly())
2964 layer()->paintOverflowControls(paintInfo.context, roundedIntPoint(adjust edPaintOffset), paintInfo.rect); 2964 layer()->paintOverflowControls(paintInfo.context, roundedIntPoint(adjust edPaintOffset), paintInfo.rect);
2965 } 2965 }
2966 2966
2967 void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const LayoutPoint& pain tOffset) 2967 void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const LayoutPoint& pain tOffset)
2968 { 2968 {
2969 if (paintInfo.context->paintingDisabled()) 2969 if (paintInfo.context->paintingDisabled())
2970 return; 2970 return;
2971 2971
2972 const Color& ruleColor = style()->visitedDependentColor(CSSPropertyWebkitCol umnRuleColor); 2972 const Color& ruleColor = resolveColor(CSSPropertyWebkitColumnRuleColor);
2973 bool ruleTransparent = style()->columnRuleIsTransparent(); 2973 bool ruleTransparent = style()->columnRuleIsTransparent();
2974 EBorderStyle ruleStyle = style()->columnRuleStyle(); 2974 EBorderStyle ruleStyle = style()->columnRuleStyle();
2975 LayoutUnit ruleThickness = style()->columnRuleWidth(); 2975 LayoutUnit ruleThickness = style()->columnRuleWidth();
2976 LayoutUnit colGap = columnGap(); 2976 LayoutUnit colGap = columnGap();
2977 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent; 2977 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent;
2978 if (!renderRule) 2978 if (!renderRule)
2979 return; 2979 return;
2980 2980
2981 ColumnInfo* colInfo = columnInfo(); 2981 ColumnInfo* colInfo = columnInfo();
2982 unsigned colCount = columnCount(colInfo); 2982 unsigned colCount = columnCount(colInfo);
(...skipping 5266 matching lines...) Expand 10 before | Expand all | Expand 10 after
8249 } 8249 }
8250 8250
8251 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject) 8251 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject)
8252 { 8252 {
8253 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped MaxY()); 8253 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped MaxY());
8254 } 8254 }
8255 8255
8256 #endif 8256 #endif
8257 8257
8258 } // namespace WebCore 8258 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/InlineTextBox.cpp ('k') | Source/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698