Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

7 files changed, 48 insertions, 5 deletions

diff --git a/Source/WebKit2/UIProcess/API/qt/ClientImpl.cpp b/Source/WebKit2/UIProcess/API/qt/ClientImpl.cpp
index 642e529..8197236 100644
--- a/Source/WebKit2/UIProcess/API/qt/ClientImpl.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/ClientImpl.cpp
@@ -17,6 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
+#include "config.h"
 #include "ClientImpl.h"
 
 #include "WebFrameProxy.h"
diff --git a/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp b/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
index ec23760..748b1bd 100644
--- a/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
@@ -18,6 +18,7 @@
  *
  */
 
+#include "config.h"
 #include "qgraphicswkview.h"
 
 #include "ChunkedUpdateDrawingAreaProxy.h"
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkcontext.cpp b/Source/WebKit2/UIProcess/API/qt/qwkcontext.cpp
index b17c100..5f05f93 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkcontext.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qwkcontext.cpp
@@ -18,6 +18,7 @@
  *
  */
 
+#include "config.h"
 #include "qwkcontext.h"
 #include "qwkcontext_p.h"
 
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp b/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 72c1322..16e1cdd 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -18,6 +18,7 @@
  *
  */
 
+#include "config.h"
 #include "qwkpage.h"
 #include "qwkpage_p.h"
 
@@ -89,6 +90,7 @@ QWKPagePrivate::QWKPagePrivate(QWKPage* qq, QWKContext* c)
     , preferences(0)
     , createNewPageFn(0)
     , backingStoreType(QGraphicsWKView::Simple)
+    , isConnectedToEngine(true)
 {
     memset(actions, 0, sizeof(actions));
     page = context->d->context->createWebPage(this, 0);
@@ -183,6 +185,16 @@ bool QWKPagePrivate::isViewInWindow()
     return true;
 }
 
+void QWKPagePrivate::enterAcceleratedCompositingMode(const LayerTreeContext&)
+{
+    // FIXME: Implement.
+}
+
+void QWKPagePrivate::exitAcceleratedCompositingMode()
+{
+    // FIXME: Implement.
+}
+
 void QWKPagePrivate::pageDidRequestScroll(const IntSize& delta)
 {
     emit q->scrollRequested(delta.width(), delta.height());
@@ -220,7 +232,7 @@ void QWKPagePrivate::selectionChanged(bool, bool, bool, bool)
 {
 }
 
-void QWKPagePrivate::didNotHandleKeyEvent(const NativeWebKeyboardEvent&)
+void QWKPagePrivate::doneWithKeyEvent(const NativeWebKeyboardEvent&, bool)
 {
 }
 
@@ -391,6 +403,15 @@ void QWKPagePrivate::didRelaunchProcess()
     QGraphicsWKView* wkView = static_cast<QGraphicsWKView*>(view);
     if (wkView)
         q->setViewportSize(wkView->size().toSize());
+
+    isConnectedToEngine = true;
+    emit q->engineConnectionChanged(true);
+}
+
+void QWKPagePrivate::processDidCrash()
+{
+    isConnectedToEngine = false;
+    emit q->engineConnectionChanged(false);
 }
 
 QWKPage::QWKPage(QWKContext* context)
@@ -459,7 +480,8 @@ QWKPage::QWKPage(QWKContext* context)
         0,  /* drawHeader */
         0,  /* drawFooter */
         0,  /* printFrame */
-        0   /* runModal */
+        0,  /* runModal */
+        0   /* didCompleteRubberBandForMainFrame */
     };
     WKPageSetPageUIClient(pageRef(), &uiClient);
 }
@@ -622,7 +644,7 @@ QString QWKPage::title() const
 void QWKPage::setViewportSize(const QSize& size)
 {
     if (d->page->drawingArea())
-        d->page->drawingArea()->setSize(IntSize(size));
+        d->page->drawingArea()->setSize(IntSize(size), IntSize());
 }
 
 qreal QWKPage::textZoomFactor() const
@@ -775,4 +797,9 @@ void QWKPagePrivate::didFindZoomableArea(const IntRect& area)
     emit q->zoomableAreaFound(QRect(area));
 }
 
+bool QWKPage::isConnectedToEngine() const
+{
+    return d->isConnectedToEngine;
+}
+
 #include "moc_qwkpage.cpp"
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkpage.h b/Source/WebKit2/UIProcess/API/qt/qwkpage.h
index e0bb4c3..cb7933a 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkpage.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwkpage.h
@@ -117,6 +117,8 @@ public:
 
     void findZoomableAreaForPoint(const QPoint&);
 
+    bool isConnectedToEngine() const;
+
 public:
     Q_SIGNAL void statusBarMessage(const QString&);
     Q_SIGNAL void titleChanged(const QString&);
@@ -133,6 +135,7 @@ public:
     Q_SIGNAL void zoomableAreaFound(const QRect&);
     Q_SIGNAL void focusNextPrevChild(bool);
     Q_SIGNAL void showContextMenu(QMenu*);
+    Q_SIGNAL void engineConnectionChanged(bool connected);
 
 protected:
     void timerEvent(QTimerEvent*);
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h b/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h
index 420ff62..65f64ff 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -22,6 +22,7 @@
 #define qwkpage_p_h
 
 #include "DrawingAreaProxy.h"
+#include "LayerTreeContext.h"
 #include "PageClient.h"
 #include "qwkpage.h"
 #include "qgraphicswkview.h"
@@ -35,6 +36,8 @@
 class QGraphicsWKView;
 class QWKPreferences;
 
+using namespace WebKit;
+
 class QWKPagePrivate : WebKit::PageClient {
 public:
     QWKPagePrivate(QWKPage*, QWKContext*);
@@ -57,11 +60,14 @@ public:
     virtual bool isViewInWindow();
 
 #if USE(ACCELERATED_COMPOSITING)
+    virtual void enterAcceleratedCompositingMode(const LayerTreeContext&);
+    virtual void exitAcceleratedCompositingMode();
     void pageDidEnterAcceleratedCompositing() { }
     void pageDidLeaveAcceleratedCompositing() { }
 #endif // USE(ACCELERATED_COMPOSITING)
     virtual void pageDidRequestScroll(const WebCore::IntSize&);
-    virtual void processDidCrash() { }
+    virtual void processDidCrash();
+    virtual void pageClosed() { }
     virtual void didRelaunchProcess();
     virtual void didChangeContentsSize(const WebCore::IntSize&);
     virtual void didFindZoomableArea(const WebCore::IntRect&);
@@ -73,7 +79,7 @@ public:
     virtual void clearAllEditCommands();
     virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&);
     virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&);
-    virtual void didNotHandleKeyEvent(const WebKit::NativeWebKeyboardEvent&);
+    virtual void doneWithKeyEvent(const WebKit::NativeWebKeyboardEvent&, bool wasEventHandled);
     virtual void selectionChanged(bool, bool, bool, bool);
     virtual PassRefPtr<WebKit::WebPopupMenuProxy> createPopupMenuProxy(WebKit::WebPageProxy*);
     virtual PassRefPtr<WebKit::WebContextMenuProxy> createContextMenuProxy(WebKit::WebPageProxy*);
@@ -84,6 +90,7 @@ public:
     virtual void didFinishLoadingDataForCustomRepresentation(const CoreIPC::DataReference&);
     virtual double customRepresentationZoomFactor() { return 1; }
     virtual void setCustomRepresentationZoomFactor(double) { }
+    virtual void didChangeScrollbarsForMainFrame() const { }
 
     void paint(QPainter* painter, QRect);
 
@@ -122,6 +129,8 @@ public:
     QPoint tripleClick;
     QBasicTimer tripleClickTimer;
     QGraphicsWKView::BackingStoreType backingStoreType;
+
+    bool isConnectedToEngine;
 };
 
 class QtViewportAttributesPrivate : public QSharedData {
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkpreferences.cpp b/Source/WebKit2/UIProcess/API/qt/qwkpreferences.cpp
index dea18aa..4ba18a3 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkpreferences.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qwkpreferences.cpp
@@ -17,6 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
+#include "config.h"
 #include "qwkpreferences.h"
 
 #include "WKPageGroup.h"