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

Side by Side Diff: Source/core/rendering/RenderListMarker.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/RenderListBox.cpp ('k') | Source/core/rendering/RenderMenuList.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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com) 6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
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 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1155 } 1155 }
1156 return; 1156 return;
1157 } 1157 }
1158 1158
1159 if (selectionState() != SelectionNone) { 1159 if (selectionState() != SelectionNone) {
1160 LayoutRect selRect = localSelectionRect(); 1160 LayoutRect selRect = localSelectionRect();
1161 selRect.moveBy(boxOrigin); 1161 selRect.moveBy(boxOrigin);
1162 context->fillRect(pixelSnappedIntRect(selRect), selectionBackgroundColor ()); 1162 context->fillRect(pixelSnappedIntRect(selRect), selectionBackgroundColor ());
1163 } 1163 }
1164 1164
1165 const Color color(style()->visitedDependentColor(CSSPropertyColor)); 1165 const Color color(resolveColor(CSSPropertyColor));
1166 context->setStrokeColor(color); 1166 context->setStrokeColor(color);
1167 context->setStrokeStyle(SolidStroke); 1167 context->setStrokeStyle(SolidStroke);
1168 context->setStrokeThickness(1.0f); 1168 context->setStrokeThickness(1.0f);
1169 context->setFillColor(color); 1169 context->setFillColor(color);
1170 1170
1171 EListStyleType type = style()->listStyleType(); 1171 EListStyleType type = style()->listStyleType();
1172 switch (type) { 1172 switch (type) {
1173 case Disc: 1173 case Disc:
1174 context->fillEllipse(marker); 1174 context->fillEllipse(marker);
1175 return; 1175 return;
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
1841 1841
1842 if (clipToVisibleContent) 1842 if (clipToVisibleContent)
1843 computeRectForRepaint(repaintContainer, rect); 1843 computeRectForRepaint(repaintContainer, rect);
1844 else 1844 else
1845 rect = localToContainerQuad(FloatRect(rect), repaintContainer).enclosing BoundingBox(); 1845 rect = localToContainerQuad(FloatRect(rect), repaintContainer).enclosing BoundingBox();
1846 1846
1847 return rect; 1847 return rect;
1848 } 1848 }
1849 1849
1850 } // namespace WebCore 1850 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListBox.cpp ('k') | Source/core/rendering/RenderMenuList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698