1 files changed, 7 insertions, 6 deletions
diff --git a/Source/WebKit2/UIProcess/qt/WebColorPickerQt.cpp b/Source/WebKit2/UIProcess/qt/WebColorPickerQt.cpp
index d23cff04a..031c32d9e 100644
--- a/Source/WebKit2/UIProcess/qt/WebColorPickerQt.cpp
+++ b/Source/WebKit2/UIProcess/qt/WebColorPickerQt.cpp
@@ -110,7 +110,7 @@ void WebColorPickerQt::createContext(QQmlComponent* component, QObject* contextO
     m_context.reset(new QQmlContext(baseContext));
 
     contextObject->setParent(m_context.get());
-    m_context->setContextProperty(QLatin1String("model"), contextObject);
+    m_context->setContextProperty(QStringLiteral("model"), contextObject);
     m_context->setContextObject(contextObject);
 }
 
@@ -123,6 +123,12 @@ void WebColorPickerQt::setSelectedColor(const Color&)
     // And yes, the name sounds misleading but comes from WebCore.
 }
 
+void WebColorPickerQt::showColorPicker(const Color&)
+{
+    // We use ENABLE(INPUT_TYPE_COLOR_POPOVER), so new color picker is created
+    // each time
+}
+
 void WebColorPickerQt::notifyColorSelected(const QColor& color)
 {
     if (!m_client)
@@ -139,11 +145,6 @@ void WebColorPickerQt::endPicker()
 {
     m_colorChooser = nullptr;
     m_context = nullptr;
-
-    if (!m_client)
-        return;
-
-    m_client->didEndColorPicker();
 }
 
 } // namespace WebKit