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

Unified Diff: Source/core/css/CSSGradientValue.h

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 side-by-side diff with in-line comments
Download patch
Index: Source/core/css/CSSGradientValue.h
diff --git a/Source/core/css/CSSGradientValue.h b/Source/core/css/CSSGradientValue.h
index 2eed10b981fca8325909b1e00bbb968bf649d65a..75e51520a94fa585304e913c64213d77d19be1c4 100644
--- a/Source/core/css/CSSGradientValue.h
+++ b/Source/core/css/CSSGradientValue.h
@@ -28,7 +28,6 @@
#include "core/css/CSSImageGeneratorValue.h"
#include "core/css/CSSPrimitiveValue.h"
-#include "core/css/StyleColor.h"
#include "wtf/RefPtr.h"
#include "wtf/Vector.h"
@@ -52,7 +51,7 @@ struct CSSGradientColorStop {
CSSGradientColorStop() : m_colorIsDerivedFromElement(false) { };
RefPtr<CSSPrimitiveValue> m_position; // percentage or length
RefPtr<CSSPrimitiveValue> m_color;
- StyleColor m_resolvedColor;
+ Color m_resolvedColor;
bool m_colorIsDerivedFromElement;
bool operator==(const CSSGradientColorStop& other) const
{
@@ -90,7 +89,7 @@ public:
bool knownToBeOpaque(const RenderObject*) const;
void loadSubimages(ResourceFetcher*) { }
- PassRefPtr<CSSGradientValue> gradientWithStylesResolved(const TextLinkColors&);
+ PassRefPtr<CSSGradientValue> gradientWithStylesResolved(const TextLinkColors&, Color currentColor);
protected:
CSSGradientValue(ClassType classType, CSSGradientRepeat repeat, CSSGradientType gradientType)

Powered by Google App Engine
This is Rietveld 408576698