third_party/WebKit/Source/web/tests/sim/SimDisplayItemList.cpp - Issue 1399853005: Changed CSSColorValue to return a Color

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/web/tests/sim/SimDisplayItemList.cpp

Issue 1399853005: Changed CSSColorValue to return a Color (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_color

Patch Set: Fix for ManifestParser 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/web/tests/sim/SimDisplayItemList.cpp

diff --git a/third_party/WebKit/Source/web/tests/sim/SimDisplayItemList.cpp b/third_party/WebKit/Source/web/tests/sim/SimDisplayItemList.cpp

index 1fa83b9d8129ae1a49473c784c96a9d096aae55a..e95fbc84c8fe08c69318677a95e7ec7c40455c24 100644

--- a/third_party/WebKit/Source/web/tests/sim/SimDisplayItemList.cpp

+++ b/third_party/WebKit/Source/web/tests/sim/SimDisplayItemList.cpp

@@ -29,11 +29,11 @@ void SimDisplayItemList::appendDrawingItem(const SkPicture* picture)

bool SimDisplayItemList::contains(SimCanvas::CommandType type, const String& colorString) const

{

- RGBA32 color = 0;

+ Color color = 0;

if (!colorString.isNull())

RELEASE_ASSERT(CSSParser::parseColor(color, colorString, true));

for (auto& command : m_commands) {

- if (command.type == type && (colorString.isNull() || command.color == color))

+ if (command.type == type && (colorString.isNull() || command.color == color.rgb()))

return true;

}

return false;