diff options
Diffstat (limited to 'WebKit/qt/WebCoreSupport/ChromeClientQt.cpp')
| -rw-r--r-- | WebKit/qt/WebCoreSupport/ChromeClientQt.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp index a0bac72..0b77ea6 100644 --- a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp +++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp @@ -591,16 +591,16 @@ IntRect ChromeClientQt::visibleRectForTiledBackingStore() const } #endif -QtAbstractWebPopup* ChromeClientQt::createSelectPopup() +QWebSelectMethod* ChromeClientQt::createSelectPopup() const { - QtAbstractWebPopup* result = m_platformPlugin.createSelectInputMethod(); + QWebSelectMethod* result = m_platformPlugin.createSelectInputMethod(); if (result) return result; #if defined(Q_WS_MAEMO_5) return new QtMaemoWebPopup; #elif !defined(QT_NO_COMBOBOX) - return new QtFallbackWebPopup; + return new QtFallbackWebPopup(this); #else return 0; #endif @@ -620,6 +620,7 @@ void ChromeClientQt::didReceiveViewportArguments(Frame* frame, const ViewportArg hints.m_initialScaleFactor = arguments.initialScale; hints.m_minimumScaleFactor = arguments.minimumScale; hints.m_maximumScaleFactor = arguments.maximumScale; + hints.m_targetDensityDpi = arguments.targetDensityDpi; hints.m_isUserScalable = isUserScalable; emit m_webPage->viewportChangeRequested(hints); @@ -632,12 +633,12 @@ bool ChromeClientQt::selectItemWritingDirectionIsNatural() PassRefPtr<PopupMenu> ChromeClientQt::createPopupMenu(PopupMenuClient* client) const { - return adoptRef(new PopupMenuQt(client)); + return adoptRef(new PopupMenuQt(client, this)); } PassRefPtr<SearchPopupMenu> ChromeClientQt::createSearchPopupMenu(PopupMenuClient* client) const { - return adoptRef(new SearchPopupMenuQt(client)); + return adoptRef(new SearchPopupMenuQt(createPopupMenu(client))); } } // namespace WebCore |