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

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
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 2943 matching lines...) Expand 10 before | Expand all | Expand 10 after
2954 // sit above the background/border. 2954 // sit above the background/border.
2955 if (hasOverflowClip() && style()->visibility() == VISIBLE && (phase == Paint PhaseBlockBackground || phase == PaintPhaseChildBlockBackground) && paintInfo.sh ouldPaintWithinRoot(this) && !paintInfo.paintRootBackgroundOnly()) 2955 if (hasOverflowClip() && style()->visibility() == VISIBLE && (phase == Paint PhaseBlockBackground || phase == PaintPhaseChildBlockBackground) && paintInfo.sh ouldPaintWithinRoot(this) && !paintInfo.paintRootBackgroundOnly())
2956 layer()->paintOverflowControls(paintInfo.context, roundedIntPoint(adjust edPaintOffset), paintInfo.rect); 2956 layer()->paintOverflowControls(paintInfo.context, roundedIntPoint(adjust edPaintOffset), paintInfo.rect);
2957 } 2957 }
2958 2958
2959 void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const LayoutPoint& pain tOffset) 2959 void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const LayoutPoint& pain tOffset)
2960 { 2960 {
2961 if (paintInfo.context->paintingDisabled()) 2961 if (paintInfo.context->paintingDisabled())
2962 return; 2962 return;
2963 2963
2964 const Color& ruleColor = style()->visitedDependentColor(CSSPropertyWebkitCol umnRuleColor); 2964 const Color& ruleColor = resolveColor(CSSPropertyWebkitColumnRuleColor);
2965 bool ruleTransparent = style()->columnRuleIsTransparent(); 2965 bool ruleTransparent = style()->columnRuleIsTransparent();
2966 EBorderStyle ruleStyle = style()->columnRuleStyle(); 2966 EBorderStyle ruleStyle = style()->columnRuleStyle();
2967 LayoutUnit ruleThickness = style()->columnRuleWidth(); 2967 LayoutUnit ruleThickness = style()->columnRuleWidth();
2968 LayoutUnit colGap = columnGap(); 2968 LayoutUnit colGap = columnGap();
2969 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent; 2969 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent;
2970 if (!renderRule) 2970 if (!renderRule)
2971 return; 2971 return;
2972 2972
2973 ColumnInfo* colInfo = columnInfo(); 2973 ColumnInfo* colInfo = columnInfo();
2974 unsigned colCount = columnCount(colInfo); 2974 unsigned colCount = columnCount(colInfo);
(...skipping 5266 matching lines...) Expand 10 before | Expand all | Expand 10 after
8241 } 8241 }
8242 8242
8243 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject) 8243 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject)
8244 { 8244 {
8245 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped MaxY()); 8245 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped MaxY());
8246 } 8246 }
8247 8247
8248 #endif 8248 #endif
8249 8249
8250 } // namespace WebCore 8250 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698