Changeset 76798 in webkit

Timestamp:

Jan 27, 2011 7:07:35 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2011-01-27 Andreas Kling <​kling@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt][WK2] Add QWKPage APIs regarding engine process availability
​https://bugs.webkit.org/show_bug.cgi?id=53237

QWKPage will now emit engineConnected() and engineDisconnected()
when the web process crashes and is relaunched respectively.

Also added QWKPage::isConnectedToEngine() for convenience.

• UIProcess/API/qt/qwkpage.cpp: (QWKPagePrivate::QWKPagePrivate): (QWKPagePrivate::didRelaunchProcess): (QWKPagePrivate::processDidCrash): (QWKPage::isConnectedToEngine):
• UIProcess/API/qt/qwkpage.h:
• UIProcess/API/qt/qwkpage_p.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qwkpage.cpp (modified) (3 diffs)
• UIProcess/API/qt/qwkpage.h (modified) (2 diffs)
• UIProcess/API/qt/qwkpage_p.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-01-27  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt][WK2] Add QWKPage APIs regarding engine process availability
+        https://bugs.webkit.org/show_bug.cgi?id=53237
+
+        QWKPage will now emit engineConnected() and engineDisconnected()
+        when the web process crashes and is relaunched respectively.
+
+        Also added QWKPage::isConnectedToEngine() for convenience.
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPagePrivate::QWKPagePrivate):
+        (QWKPagePrivate::didRelaunchProcess):
+        (QWKPagePrivate::processDidCrash):
+        (QWKPage::isConnectedToEngine):
+        * UIProcess/API/qt/qwkpage.h:
+        * UIProcess/API/qt/qwkpage_p.h:
+
 2011-01-27  Balazs Kelemen  <kbalazs@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp

@@ -90 +90 @@
     , createNewPageFn(0)
     , backingStoreType(QGraphicsWKView::Simple)
+    , isConnectedToEngine(true)
 {
     memset(actions, 0, sizeof(actions));
@@ -392 +393 @@
     if (wkView)
         q->setViewportSize(wkView->size().toSize());
+
+    isConnectedToEngine = true;
+    emit q->engineConnected();
 }
 
 void QWKPagePrivate::processDidCrash()
 {
-    emit q->processCrashed();
+    isConnectedToEngine = false;
+    emit q->engineDisconnected();
 }
 
@@ -781 +786 @@
 }
 
+bool QWKPage::isConnectedToEngine() const
+{
+    return d->isConnectedToEngine;
+}
+
 #include "moc_qwkpage.cpp"

trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.h

@@ -118 +118 @@
     void findZoomableAreaForPoint(const QPoint&);
 
+    bool isConnectedToEngine() const;
+
 public:
     Q_SIGNAL void statusBarMessage(const QString&);
@@ -134 +136 @@
     Q_SIGNAL void focusNextPrevChild(bool);
     Q_SIGNAL void showContextMenu(QMenu*);
-    Q_SIGNAL void processCrashed();
+    Q_SIGNAL void engineConnected();
+    Q_SIGNAL void engineDisconnected();
 
 protected:

trunk/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h

@@ -124 +124 @@
     QBasicTimer tripleClickTimer;
     QGraphicsWKView::BackingStoreType backingStoreType;
+
+    bool isConnectedToEngine;
 };