Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1

Change-Id: I824a984e8552340c2f9f631ac951f2c9eaa90b74

2 files changed, 12 insertions, 0 deletions

diff --git a/Source/WebKit/qt/WidgetSupport/PageClientQt.cpp b/Source/WebKit/qt/WidgetSupport/PageClientQt.cpp
index 8333a59cc..858290f6e 100644
--- a/Source/WebKit/qt/WidgetSupport/PageClientQt.cpp
+++ b/Source/WebKit/qt/WidgetSupport/PageClientQt.cpp
@@ -157,6 +157,11 @@ void PageClientQWidget::setWidgetVisible(Widget* widget, bool visible)
     qtWidget->setVisible(visible);
 }
 
+bool PageClientQWidget::isViewVisible()
+{
+    return view ? view->isVisible() : false;
+}
+
 #if !defined(QT_NO_GRAPHICSVIEW)
 PageClientQGraphicsWidget::~PageClientQGraphicsWidget()
 {
@@ -343,6 +348,11 @@ QGraphicsView* PageClientQGraphicsWidget::firstGraphicsView() const
         return view->scene()->views().first();
     return 0;
 }
+
+bool PageClientQGraphicsWidget::isViewVisible()
+{
+    return view ? view->isVisible() : false;
+}
 #endif // QT_NO_GRAPHICSVIEW
 
 } // namespace WebCore
diff --git a/Source/WebKit/qt/WidgetSupport/PageClientQt.h b/Source/WebKit/qt/WidgetSupport/PageClientQt.h
index 5db890eb5..8c7953634 100644
--- a/Source/WebKit/qt/WidgetSupport/PageClientQt.h
+++ b/Source/WebKit/qt/WidgetSupport/PageClientQt.h
@@ -83,6 +83,7 @@ public:
     virtual QRectF windowRect() const;
 
     virtual void setWidgetVisible(Widget*, bool visible);
+    virtual bool isViewVisible();
 
     QWidget* view;
     QWebPage* page;
@@ -168,6 +169,7 @@ public:
     virtual bool viewResizesToContentsEnabled() const { return viewResizesToContents; }
 
     virtual void setWidgetVisible(Widget*, bool);
+    virtual bool isViewVisible();
 
 #if USE(TILED_BACKING_STORE)
     virtual QRectF graphicsItemVisibleRect() const;