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

Side by Side Diff: Source/web/ColorChooserUIController.cpp

Issue 23236002: Prepare for color input datalist support on Android (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 void ColorChooserUIController::didEndChooser() 73 void ColorChooserUIController::didEndChooser()
74 { 74 {
75 ASSERT(m_client); 75 ASSERT(m_client);
76 m_chooser = nullptr; 76 m_chooser = nullptr;
77 m_client->didEndChooser(); 77 m_client->didEndChooser();
78 } 78 }
79 79
80 void ColorChooserUIController::openColorChooser() 80 void ColorChooserUIController::openColorChooser()
81 { 81 {
82 ASSERT(!m_chooser); 82 ASSERT(!m_chooser);
83 m_chooser = m_chromeClient->createWebColorChooser(this, static_cast<WebColor >(m_client->currentColor().rgb())); 83 const Vector<Color>& suggestions = m_client->suggestions();
84 Vector<WebColor> suggestionColors(suggestions.size());
85 for (size_t i = 0; i < suggestions.size(); i++) {
tkent 2013/08/16 02:21:03 We prefer ++i.
keishi 2013/08/19 13:48:18 Done.
86 suggestionColors[i] = static_cast<WebColor>(suggestions[i].rgb());
87 }
88 m_chooser = m_chromeClient->createWebColorChooser(this, static_cast<WebColor >(m_client->currentColor().rgb()), suggestionColors);
84 } 89 }
85 90
86 } // namespace WebKit 91 } // namespace WebKit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698