diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-22 13:36:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-22 13:36:28 +0200 |
| commit | c311cf639cc1d6570d67b0a80a8ba04dc992a658 (patch) | |
| tree | 6e16fefc7ece11ce4ec1e475a58a537a7acebaf8 /Source/WebKit/blackberry/Api/WebPage.cpp | |
| parent | 5ef7c8a6a70875d4430752d146bdcb069605d71d (diff) | |
| download | qtwebkit-c311cf639cc1d6570d67b0a80a8ba04dc992a658.tar.gz | |
Imported WebKit commit 35255d8c2fd37ba4359e75fe0ebe6aec87687f9c (http://svn.webkit.org/repository/webkit/trunk@126284)
New snapshot that includes MSVC 64-bit build fix
Diffstat (limited to 'Source/WebKit/blackberry/Api/WebPage.cpp')
| -rw-r--r-- | Source/WebKit/blackberry/Api/WebPage.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Source/WebKit/blackberry/Api/WebPage.cpp b/Source/WebKit/blackberry/Api/WebPage.cpp index 137bc23cb..c50c39829 100644 --- a/Source/WebKit/blackberry/Api/WebPage.cpp +++ b/Source/WebKit/blackberry/Api/WebPage.cpp @@ -331,6 +331,11 @@ void WebPage::autofillTextField(const string& item) d->m_autofillManager->autofillTextField(item.c_str()); } +void WebPage::enableQnxJavaScriptObject(bool enabled) +{ + d->m_enableQnxJavaScriptObject = enabled; +} + WebPagePrivate::WebPagePrivate(WebPage* webPage, WebPageClient* client, const IntRect& rect) : m_webPage(webPage) , m_client(client) @@ -404,6 +409,7 @@ WebPagePrivate::WebPagePrivate(WebPage* webPage, WebPageClient* client, const In , m_fullscreenVideoNode(0) , m_hasInRegionScrollableAreas(false) , m_updateDelegatedOverlaysDispatched(false) + , m_enableQnxJavaScriptObject(true) , m_deferredTasksTimer(this, &WebPagePrivate::deferredTasksTimerFired) , m_selectPopup(0) , m_autofillManager(AutofillManager::create(this)) @@ -1497,17 +1503,17 @@ bool WebPage::scrollBy(const Platform::IntSize& delta, bool scrollMainFrame) return b; } -void WebPagePrivate::notifyInRegionScrollStatusChanged(bool status) +void WebPagePrivate::notifyInRegionScrollStopped() { - if (!status && m_inRegionScroller->d->hasNode()) { + if (m_inRegionScroller->d->hasNode()) { enqueueRenderingOfClippedContentOfScrollableNodeAfterInRegionScrolling(m_inRegionScroller->d->node()); m_inRegionScroller->d->reset(); } } -void WebPage::notifyInRegionScrollStatusChanged(bool status) +void WebPage::notifyInRegionScrollStopped() { - d->notifyInRegionScrollStatusChanged(status); + d->notifyInRegionScrollStopped(); } void WebPagePrivate::enqueueRenderingOfClippedContentOfScrollableNodeAfterInRegionScrolling(Node* scrolledNode) |