| Index: Source/web/ChromeClientImpl.cpp
|
| diff --git a/Source/web/ChromeClientImpl.cpp b/Source/web/ChromeClientImpl.cpp
|
| index d2509cb753d7578f28b878508367ea087ae96337..7f9a042d01ec0e85281c163c0b44092ce54cd99a 100644
|
| --- a/Source/web/ChromeClientImpl.cpp
|
| +++ b/Source/web/ChromeClientImpl.cpp
|
| @@ -616,12 +616,16 @@ PassOwnPtr<ColorChooser> ChromeClientImpl::createColorChooser(ColorChooserClient
|
| controller->openUI();
|
| return controller.release();
|
| }
|
| -PassOwnPtr<WebColorChooser> ChromeClientImpl::createWebColorChooser(WebColorChooserClient* chooserClient, const WebColor& initialColor)
|
| +PassOwnPtr<WebColorChooser> ChromeClientImpl::createWebColorChooser(WebColorChooserClient* chooserClient, const WebColor& initialColor, const Vector<Color>& suggestions, const Vector<String>& suggestionLabels)
|
| {
|
| WebViewClient* client = m_webView->client();
|
| if (!client)
|
| return nullptr;
|
| - return adoptPtr(client->createColorChooser(chooserClient, initialColor));
|
| + Vector<WebColor> suggestionColors(suggestions.size());
|
| + for (size_t i = 0; i < suggestions.size(); ++i) {
|
| + suggestionColors[i] = static_cast<WebColor>(suggestions[i].rgb());
|
| + }
|
| + return adoptPtr(client->createColorChooser(chooserClient, initialColor, suggestionColors, suggestionLabels));
|
| }
|
|
|
| PassRefPtr<DateTimeChooser> ChromeClientImpl::openDateTimeChooser(DateTimeChooserClient* pickerClient, const DateTimeChooserParameters& parameters)
|
|
|