third_party/WebKit/Source/core/dom/TextLinkColors.cpp - Issue 1376573004: Split out Color from CSSPrimitiveValue

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/dom/TextLinkColors.cpp

Issue 1376573004: Split out Color from CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_property

Patch Set: Rebase Created 5 years, 2 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:

Index: third_party/WebKit/Source/core/dom/TextLinkColors.cpp

diff --git a/third_party/WebKit/Source/core/dom/TextLinkColors.cpp b/third_party/WebKit/Source/core/dom/TextLinkColors.cpp

index 64ad2c09e412215b9680c87a13f6eff8a60ae76c..d26bb348dd8e639d41b38b8c8fe0572406efc6e4 100644

--- a/third_party/WebKit/Source/core/dom/TextLinkColors.cpp

+++ b/third_party/WebKit/Source/core/dom/TextLinkColors.cpp

@@ -28,6 +28,7 @@

#include "config.h"

#include "core/dom/TextLinkColors.h"

+#include "core/css/CSSColorValue.h"

#include "core/css/CSSPrimitiveValue.h"

#include "core/css/StyleColor.h"

#include "core/layout/LayoutTheme.h"

@@ -58,12 +59,12 @@ void TextLinkColors::resetActiveLinkColor()

m_activeLinkColor = Color(255, 0, 0);

}

-Color TextLinkColors::colorFromPrimitiveValue(const CSSPrimitiveValue* value, Color currentColor, bool forVisitedLink) const

+Color TextLinkColors::colorFromCSSValue(const CSSValue* value, Color currentColor, bool forVisitedLink) const

{

- if (value->isRGBColor())

- return Color(value->getRGBA32Value());

+ if (value->isColorValue())

+ return Color(toCSSColorValue(value)->value());

- CSSValueID valueID = value->getValueID();

+ CSSValueID valueID = toCSSPrimitiveValue(value)->getValueID();

switch (valueID) {

case 0:

return Color();