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

Side by Side Diff: Source/core/css/resolver/ElementStyleResources.cpp

Issue 20061003: Move isValid/isCurrentColor from Color to StyleColor (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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2013 Google Inc. All rights reserved. 4 * Copyright (C) 2013 Google Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 20 matching lines...) Expand all
31 #include "core/rendering/style/StylePendingImage.h" 31 #include "core/rendering/style/StylePendingImage.h"
32 32
33 namespace WebCore { 33 namespace WebCore {
34 34
35 ElementStyleResources::ElementStyleResources() 35 ElementStyleResources::ElementStyleResources()
36 : m_hasPendingShaders(false) 36 : m_hasPendingShaders(false)
37 , m_deviceScaleFactor(1) 37 , m_deviceScaleFactor(1)
38 { 38 {
39 } 39 }
40 40
41 PassRefPtr<StyleImage> ElementStyleResources::styleImage(const TextLinkColors& t extLinkColors, Color currentColor, CSSPropertyID property, CSSValue* value) 41 PassRefPtr<StyleImage> ElementStyleResources::styleImage(const TextLinkColors& t extLinkColors, CSSPropertyID property, CSSValue* value)
42 { 42 {
43 if (value->isImageValue()) 43 if (value->isImageValue())
44 return cachedOrPendingFromValue(property, toCSSImageValue(value)); 44 return cachedOrPendingFromValue(property, toCSSImageValue(value));
45 45
46 if (value->isImageGeneratorValue()) { 46 if (value->isImageGeneratorValue()) {
47 if (value->isGradientValue()) 47 if (value->isGradientValue())
48 return generatedOrPendingFromValue(property, static_cast<CSSGradient Value*>(value)->gradientWithStylesResolved(textLinkColors, currentColor).get()); 48 return generatedOrPendingFromValue(property, static_cast<CSSGradient Value*>(value)->gradientWithStylesResolved(textLinkColors).get());
49 return generatedOrPendingFromValue(property, static_cast<CSSImageGenerat orValue*>(value)); 49 return generatedOrPendingFromValue(property, static_cast<CSSImageGenerat orValue*>(value));
50 } 50 }
51 51
52 if (value->isImageSetValue()) 52 if (value->isImageSetValue())
53 return setOrPendingFromValue(property, static_cast<CSSImageSetValue*>(va lue)); 53 return setOrPendingFromValue(property, static_cast<CSSImageSetValue*>(va lue));
54 54
55 if (value->isCursorImageValue()) 55 if (value->isCursorImageValue())
56 return cursorOrPendingFromValue(property, static_cast<CSSCursorImageValu e*>(value)); 56 return cursorOrPendingFromValue(property, static_cast<CSSCursorImageValu e*>(value));
57 57
58 return 0; 58 return 0;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 void ElementStyleResources::clear() 99 void ElementStyleResources::clear()
100 { 100 {
101 m_pendingImageProperties.clear(); 101 m_pendingImageProperties.clear();
102 m_pendingSVGDocuments.clear(); 102 m_pendingSVGDocuments.clear();
103 m_hasPendingShaders = false; 103 m_hasPendingShaders = false;
104 m_deviceScaleFactor = 1; 104 m_deviceScaleFactor = 1;
105 } 105 }
106 106
107 } 107 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698