| Index: Source/web/ColorChooserUIController.cpp
|
| diff --git a/Source/web/ColorChooserUIController.cpp b/Source/web/ColorChooserUIController.cpp
|
| index 125d2e6808dd8d968dd9defb6e79a21f157c714e..ddc08d47a3dcb04d2e8b21c7c28bc5f060d07bb1 100644
|
| --- a/Source/web/ColorChooserUIController.cpp
|
| +++ b/Source/web/ColorChooserUIController.cpp
|
| @@ -28,6 +28,9 @@
|
|
|
| #include "ChromeClientImpl.h"
|
| #include "WebColorChooser.h"
|
| +#include "WebColorSuggestion.h"
|
| +#include "WebViewClient.h"
|
| +#include "WebViewImpl.h"
|
| #include "core/platform/ColorChooserClient.h"
|
| #include "core/platform/graphics/Color.h"
|
| #include "public/platform/WebColor.h"
|
| @@ -80,7 +83,10 @@ void ColorChooserUIController::didEndChooser()
|
| void ColorChooserUIController::openColorChooser()
|
| {
|
| ASSERT(!m_chooser);
|
| - m_chooser = m_chromeClient->createWebColorChooser(this, static_cast<WebColor>(m_client->currentColor().rgb()));
|
| + WebViewClient* webViewClient = static_cast<WebViewImpl*>(m_chromeClient->webView())->client();
|
| + if (!webViewClient)
|
| + return;
|
| + webViewClient->createColorChooser(this, static_cast<WebColor>(m_client->currentColor().rgb()), m_client->suggestions());
|
| }
|
|
|
| } // namespace WebKit
|
|
|