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

Unified Diff: Source/web/ColorChooserPopupUIController.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 side-by-side diff with in-line comments
Download patch
Index: Source/web/ColorChooserPopupUIController.cpp
diff --git a/Source/web/ColorChooserPopupUIController.cpp b/Source/web/ColorChooserPopupUIController.cpp
index 5869a2d05474181e4e72a29ae3321973d956ff83..ed2ad855a028872a0b247a84901f289da0b39d0c 100644
--- a/Source/web/ColorChooserPopupUIController.cpp
+++ b/Source/web/ColorChooserPopupUIController.cpp
@@ -115,7 +115,7 @@ void ColorChooserPopupUIController::setValueAndClosePopup(int numValue, const St
ASSERT(m_popup);
ASSERT(m_client);
if (numValue == ColorPickerPopupActionSetValue)
- m_client->didChooseColor(Color(stringValue));
+ m_client->didChooseColor(StyleColor(stringValue).color());
if (numValue == ColorPickerPopupActionChooseOtherColor)
openColorChooser();
closePopup();
@@ -124,7 +124,7 @@ void ColorChooserPopupUIController::setValueAndClosePopup(int numValue, const St
void ColorChooserPopupUIController::setValue(const String& value)
{
ASSERT(m_client);
- m_client->didChooseColor(Color(value));
+ m_client->didChooseColor(StyleColor(value).color());
}
void ColorChooserPopupUIController::didClosePopup()

Powered by Google App Engine
This is Rietveld 408576698