diff options
author | Ben Murdoch <benm@google.com> | 2010-08-13 05:20:16 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-13 05:20:16 -0700 |
commit | f4958a7d95cd5fbc1c74905e229b02c95cd5ee78 (patch) | |
tree | 14a0f1b07a19948c2ed93d0d8547caa7fe10aa0e /WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp | |
parent | d074a7997da8ce379434eb6e208b97cde8a0841c (diff) | |
parent | f964bc1fd59a545a80a0cc2529ad8830be514871 (diff) | |
download | external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.zip external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.gz external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.bz2 |
Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849
* changes:
Merge WebKit at r65072 : Update WebKit revision number.
Merge WebKit at r65072 : Update test_expectations.
Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
Merge WebKit at r65072: JSC build fix in InspectorController.h
Merge WebKit at r65072: Fix V8 code generator.
Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
Merge WebKit at r65072: String class has moved to the WTF namespace.
Merge Webkit at r65072 : Fix conflicts.
Merge Webkit at r65072 : Fix Makefiles.
Merge WebKit at r65072 : Initial merge by git.
Diffstat (limited to 'WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp')
-rw-r--r-- | WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp | 75 |
1 files changed, 2 insertions, 73 deletions
diff --git a/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp b/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp index cccb07c..fd86e91 100644 --- a/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp +++ b/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp @@ -29,70 +29,6 @@ namespace WebCore { -class SelectData : public QWebSelectData { -public: - SelectData(QtAbstractWebPopup* data) : d(data) {} - - virtual ItemType itemType(int) const; - virtual QString itemText(int index) const { return d->itemText(index); } - virtual QString itemToolTip(int index) const { return d->itemToolTip(index); } - virtual bool itemIsEnabled(int index) const { return d->itemIsEnabled(index); } - virtual int itemCount() const { return d->itemCount(); } - virtual bool itemIsSelected(int index) const { return d->itemIsSelected(index); } - virtual bool multiple() const { return d->multiple(); } - -private: - QtAbstractWebPopup* d; -}; - -QWebSelectData::ItemType SelectData::itemType(int index) const -{ - switch (d->itemType(index)) { - case QtAbstractWebPopup::Separator: return Separator; - case QtAbstractWebPopup::Group: return Group; - default: return Option; - } -} - -SelectInputMethodWrapper::SelectInputMethodWrapper(QWebSelectMethod* plugin) - : m_plugin(plugin) - , m_selectData(0) -{ - m_plugin->setParent(this); - connect(m_plugin, SIGNAL(didHide()), this, SLOT(didHide())); - connect(m_plugin, SIGNAL(selectItem(int, bool, bool)), this, SLOT(selectItem(int, bool, bool))); -} - -SelectInputMethodWrapper::~SelectInputMethodWrapper() -{ - delete m_selectData; -} - -void SelectInputMethodWrapper::show() -{ - if (m_selectData) - delete m_selectData; - m_selectData = new SelectData(this); - m_plugin->show(*m_selectData); -} - -void SelectInputMethodWrapper::hide() -{ - m_plugin->hide(); -} - -void SelectInputMethodWrapper::selectItem(int index, bool allowMultiplySelections, bool shift) -{ - QtAbstractWebPopup::selectItem(index, allowMultiplySelections, shift); -} - -void SelectInputMethodWrapper::didHide() -{ - QtAbstractWebPopup::popupDidHide(); -} - -// QtPlatformPlugin - bool QtPlatformPlugin::load(const QString& file) { m_loader.setFileName(file); @@ -152,17 +88,10 @@ QWebKitPlatformPlugin* QtPlatformPlugin::plugin() return m_plugin; } -QtAbstractWebPopup* QtPlatformPlugin::createSelectInputMethod() +QWebSelectMethod* QtPlatformPlugin::createSelectInputMethod() { QWebKitPlatformPlugin* p = plugin(); - if (!p) - return 0; - - QWebSelectMethod* selector = p->createSelectInputMethod(); - if (!selector) - return 0; - - return new SelectInputMethodWrapper(selector); + return p ? p->createSelectInputMethod() : 0; } |