3 files changed, 16 insertions, 6 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)
diff --git a/Source/WebKit/blackberry/Api/WebPage.h b/Source/WebKit/blackberry/Api/WebPage.h
index 06aabeb94..dc4cf165d 100644
--- a/Source/WebKit/blackberry/Api/WebPage.h
+++ b/Source/WebKit/blackberry/Api/WebPage.h
@@ -176,7 +176,7 @@ public:
     // Scroll position provided should be in transformed coordinates.
     void setScrollPosition(const Platform::IntPoint&);
     bool scrollBy(const Platform::IntSize&, bool scrollMainFrame = true);
-    void notifyInRegionScrollStatusChanged(bool status);
+    void notifyInRegionScrollStopped();
     void setScrollOriginPoint(const Platform::IntPoint&);
 
     BackingStore* backingStore() const;
@@ -380,6 +380,8 @@ public:
 
     void autofillTextField(const std::string&);
 
+    void enableQnxJavaScriptObject(bool);
+
 private:
     virtual ~WebPage();
 
diff --git a/Source/WebKit/blackberry/Api/WebPage_p.h b/Source/WebKit/blackberry/Api/WebPage_p.h
index 04eb1b7fc..2ee4d6a04 100644
--- a/Source/WebKit/blackberry/Api/WebPage_p.h
+++ b/Source/WebKit/blackberry/Api/WebPage_p.h
@@ -150,7 +150,7 @@ public:
     bool scrollBy(int deltaX, int deltaY, bool scrollMainFrame = true);
 
     void enqueueRenderingOfClippedContentOfScrollableNodeAfterInRegionScrolling(WebCore::Node*);
-    void notifyInRegionScrollStatusChanged(bool status);
+    void notifyInRegionScrollStopped();
     void setScrollOriginPoint(const Platform::IntPoint&);
     void setHasInRegionScrollableAreas(bool);
 
@@ -615,6 +615,8 @@ public:
     WebCore::KURL m_cachedManualScript;
     bool m_cachedFocused;
 
+    bool m_enableQnxJavaScriptObject;
+
     class DeferredTaskBase {
     public:
         void perform(WebPagePrivate* webPagePrivate)