diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-27 09:28:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-27 09:28:46 +0200 |
| commit | 6668b07fcd51f86be243b9e08e667224e30c0cf8 (patch) | |
| tree | 64f466e09b68a77ae1156c0d35cd5b95e18a34ca /Source/WebKit/blackberry/Api/WebPage.cpp | |
| parent | e7923d9de38974f0c6fb7646c898a6ea618261e8 (diff) | |
| download | qtwebkit-6668b07fcd51f86be243b9e08e667224e30c0cf8.tar.gz | |
Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325)
New snapshot with more Windows build fixes
Diffstat (limited to 'Source/WebKit/blackberry/Api/WebPage.cpp')
| -rw-r--r-- | Source/WebKit/blackberry/Api/WebPage.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Source/WebKit/blackberry/Api/WebPage.cpp b/Source/WebKit/blackberry/Api/WebPage.cpp index 411fcb3ab..a37826baf 100644 --- a/Source/WebKit/blackberry/Api/WebPage.cpp +++ b/Source/WebKit/blackberry/Api/WebPage.cpp @@ -4510,6 +4510,11 @@ void WebPage::setSpellCheckingEnabled(bool enabled) static_cast<EditorClientBlackBerry*>(d->m_page->editorClient())->enableSpellChecking(enabled); } +void WebPage::spellCheckingRequestProcessed(int32_t id, spannable_string_t* spannableString) +{ + d->m_inputHandler->spellCheckingRequestProcessed(id, spannableString); +} + class DeferredTaskSelectionCancelled: public DeferredTask<&WebPagePrivate::m_wouldCancelSelection> { public: explicit DeferredTaskSelectionCancelled(WebPagePrivate* webPagePrivate) @@ -5572,8 +5577,10 @@ void WebPage::notifyAppActivationStateChange(ActivationStateType activationState void WebPage::notifySwipeEvent() { - FOR_EACH_PLUGINVIEW(d->m_pluginViews) - (*it)->handleSwipeEvent(); + if (d->m_fullScreenPluginView.get()) + d->m_fullScreenPluginView->handleSwipeEvent(); + else + notifyFullScreenVideoExited(true); } void WebPage::notifyScreenPowerStateChanged(bool powered) @@ -6310,6 +6317,7 @@ void WebPagePrivate::didChangeSettings(WebSettings* webSettings) coreSettings->setOfflineWebApplicationCacheEnabled(webSettings->isAppCacheEnabled()); m_page->group().groupSettings()->setLocalStorageQuotaBytes(webSettings->localStorageQuota()); + coreSettings->setSessionStorageQuota(webSettings->sessionStorageQuota()); coreSettings->setUsesPageCache(webSettings->maximumPagesInCache()); coreSettings->setFrameFlatteningEnabled(webSettings->isFrameFlatteningEnabled()); #endif |