Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067)

New snapshot that fixes build without QtWidgets

3 files changed, 23 insertions, 8 deletions

diff --git a/Source/WebKit/blackberry/Api/InRegionScroller.cpp b/Source/WebKit/blackberry/Api/InRegionScroller.cpp
index cd68c4c76..0913405f8 100644
--- a/Source/WebKit/blackberry/Api/InRegionScroller.cpp
+++ b/Source/WebKit/blackberry/Api/InRegionScroller.cpp
@@ -219,6 +219,9 @@ void InRegionScrollerPrivate::calculateInRegionScrollableAreasForPoint(const Web
                     return;
                 }
 
+                if (!renderView->compositor()->scrollLayer())
+                    continue;
+
                 if (canScrollInnerFrame(view->frame())) {
                     pushBackInRegionScrollable(new InRegionScrollableArea(m_webPage, layer));
                     continue;
diff --git a/Source/WebKit/blackberry/Api/WebPage.cpp b/Source/WebKit/blackberry/Api/WebPage.cpp
index bbf8425cb..d2b7f7898 100644
--- a/Source/WebKit/blackberry/Api/WebPage.cpp
+++ b/Source/WebKit/blackberry/Api/WebPage.cpp
@@ -55,6 +55,7 @@
 #endif
 #include "EditorClientBlackBerry.h"
 #include "FocusController.h"
+#include "Frame.h"
 #include "FrameLoaderClientBlackBerry.h"
 #if !defined(PUBLIC_BUILD) || !PUBLIC_BUILD
 #include "GeolocationClientMock.h"
@@ -1160,8 +1161,6 @@ void WebPagePrivate::setLoadState(LoadState state)
             if (m_backingStore->d->renderVisibleContents() && !m_backingStore->d->isSuspended() && !m_backingStore->d->shouldDirectRenderingToWindow())
                 m_backingStore->d->blitVisibleContents();
 
-            zoomToInitialScaleOnLoad();
-
             // Update cursor status.
             updateCursor();
 
@@ -3201,12 +3200,21 @@ void WebPagePrivate::setPageVisibilityState()
 
 void WebPagePrivate::setVisible(bool visible)
 {
-    m_visible = visible;
+    if (visible != m_visible) {
+        if (visible) {
+            if (m_mainFrame)
+                m_mainFrame->animation()->resumeAnimations();
+            if (m_page->scriptedAnimationsSuspended())
+                m_page->resumeScriptedAnimations();
+        } else {
+            if (m_mainFrame)
+                m_mainFrame->animation()->suspendAnimations();
+            if (!m_page->scriptedAnimationsSuspended())
+                m_page->suspendScriptedAnimations();
+        }
 
-    if (visible && m_page->scriptedAnimationsSuspended())
-        m_page->resumeScriptedAnimations();
-    if (!visible && !m_page->scriptedAnimationsSuspended())
-        m_page->suspendScriptedAnimations();
+        m_visible = visible;
+    }
 
 #if ENABLE(PAGE_VISIBILITY_API)
     setPageVisibilityState();
@@ -5454,6 +5462,10 @@ void WebPagePrivate::setCompositorDrawsRootLayer(bool compositorDrawsRootLayer)
     // When the BlackBerry port forces compositing mode, the root layer stops
     // painting to window and starts painting to layer instead.
     m_page->settings()->setForceCompositingMode(compositorDrawsRootLayer);
+
+    if (!m_mainFrame)
+        return;
+
     if (FrameView* view = m_mainFrame->view())
         view->updateCompositingLayers();
 #endif
diff --git a/Source/WebKit/blackberry/Api/WebPageClient.h b/Source/WebKit/blackberry/Api/WebPageClient.h
index aab7d09bc..e3e05c83e 100644
--- a/Source/WebKit/blackberry/Api/WebPageClient.h
+++ b/Source/WebKit/blackberry/Api/WebPageClient.h
@@ -139,7 +139,7 @@ public:
     virtual void notifyContentRendered(const Platform::IntRect&) = 0;
     virtual void resizeSurfaceIfNeeded() = 0;
 
-    virtual void inputFocusGained(Platform::BlackBerryInputType, int inputStyle, Platform::VirtualKeyboardType, Platform::VirtualKeyboardEnterKeyType) = 0;
+    virtual void inputFocusGained(int64_t inputStyle, Platform::VirtualKeyboardType, Platform::VirtualKeyboardEnterKeyType) = 0;
     virtual void inputFocusLost() = 0;
     virtual void inputTextChanged() = 0;
     virtual void inputSelectionChanged(unsigned selectionStart, unsigned selectionEnd) = 0;