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

Side by Side Diff: Source/core/css/CSSToStyleMap.cpp

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 return m_state.rootElementStyle(); 51 return m_state.rootElementStyle();
52 } 52 }
53 53
54 bool CSSToStyleMap::useSVGZoomRules() const 54 bool CSSToStyleMap::useSVGZoomRules() const
55 { 55 {
56 return m_state.useSVGZoomRules(); 56 return m_state.useSVGZoomRules();
57 } 57 }
58 58
59 PassRefPtr<StyleImage> CSSToStyleMap::styleImage(CSSPropertyID propertyId, CSSVa lue* value) 59 PassRefPtr<StyleImage> CSSToStyleMap::styleImage(CSSPropertyID propertyId, CSSVa lue* value)
60 { 60 {
61 return m_elementStyleResources.styleImage(m_state.document().textLinkColors( ), propertyId, value); 61 return m_elementStyleResources.styleImage(m_state.document().textLinkColors( ), m_state.style()->visitedDependentColor(CSSPropertyColor), propertyId, value);
62 } 62 }
63 63
64 void CSSToStyleMap::mapFillAttachment(CSSPropertyID, FillLayer* layer, CSSValue* value) const 64 void CSSToStyleMap::mapFillAttachment(CSSPropertyID, FillLayer* layer, CSSValue* value) const
65 { 65 {
66 if (value->isInitialValue()) { 66 if (value->isInitialValue()) {
67 layer->setAttachment(FillLayer::initialFillAttachment(layer->type())); 67 layer->setAttachment(FillLayer::initialFillAttachment(layer->type()));
68 return; 68 return;
69 } 69 }
70 70
71 if (!value->isPrimitiveValue()) 71 if (!value->isPrimitiveValue())
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 verticalRule = SpaceImageRule; 681 verticalRule = SpaceImageRule;
682 break; 682 break;
683 default: // CSSValueRepeat 683 default: // CSSValueRepeat
684 verticalRule = RepeatImageRule; 684 verticalRule = RepeatImageRule;
685 break; 685 break;
686 } 686 }
687 image.setVerticalRule(verticalRule); 687 image.setVerticalRule(verticalRule);
688 } 688 }
689 689
690 }; 690 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698