Changeset 100621 in webkit

Timestamp:

Nov 17, 2011 7:38:14 AM (12 years ago)

Author:

kenneth@webkit.org

Message:

Print warning for the Qt port when a process crashes and is relaunched
​https://bugs.webkit.org/show_bug.cgi?id=72607

Reviewed by Antonio Gomes.

Make the QtViewInterface::processDidCrash take a URL string argument,
for being able to say which url was the origin of the crash.

We now additionally store the load state and url at process exit. This
is needed for printing the warning and for further crash handling.

• UIProcess/PageClient.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::processDidCrash):

• UIProcess/qt/QtViewInterface.cpp:

(WebKit::QtViewInterface::processDidCrash):
(WebKit::QtViewInterface::didRelaunchProcess):

• UIProcess/qt/QtViewInterface.h:
• UIProcess/qt/QtWebPageProxy.cpp:

(QtWebPageProxy::processDidCrash):

• UIProcess/qt/QtWebPageProxy.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• UIProcess/WebPageProxy.h (modified) (2 diffs)
• UIProcess/qt/QtViewInterface.cpp (modified) (1 diff)
• UIProcess/qt/QtViewInterface.h (modified) (1 diff)
• UIProcess/qt/QtWebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-17  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Print warning for the Qt port when a process crashes and is relaunched
+        https://bugs.webkit.org/show_bug.cgi?id=72607
+
+        Reviewed by Antonio Gomes.
+
+        Make the QtViewInterface::processDidCrash take a URL string argument,
+        for being able to say which url was the origin of the crash.
+
+        We now additionally store the load state and url at process exit. This
+        is needed for printing the warning and for further crash handling.
+
+        * UIProcess/PageClient.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::processDidCrash):
+        * UIProcess/qt/QtViewInterface.cpp:
+        (WebKit::QtViewInterface::processDidCrash):
+        (WebKit::QtViewInterface::didRelaunchProcess):
+        * UIProcess/qt/QtViewInterface.h:
+        * UIProcess/qt/QtWebPageProxy.cpp:
+        (QtWebPageProxy::processDidCrash):
+        * UIProcess/qt/QtWebPageProxy.h:
+
 2011-11-17  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -151 +151 @@
     , m_isVisible(m_pageClient->isViewVisible())
     , m_backForwardList(WebBackForwardList::create(this))
+    , m_loadStateAtProcessExit(WebFrameProxy::LoadStateFinished)
     , m_textZoomFactor(1)
     , m_pageZoomFactor(1)
@@ -3078 +3079 @@
     m_isValid = false;
 
+    if (m_mainFrame) {
+        m_urlAtProcessExit = m_mainFrame->url();
+        m_loadStateAtProcessExit = m_mainFrame->loadState();
+    }
+
     m_mainFrame = nullptr;
     m_drawingArea = nullptr;

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -513 +513 @@
 
     bool isValid();
-    
+
+    const String& urlAtProcessExit() const { return m_urlAtProcessExit; }
+    WebFrameProxy::LoadState loadStateAtProcessExit() const { return m_loadStateAtProcessExit; }
+
     WebCore::DragSession dragSession() const { return m_currentDragSession; }
     void resetDragOperation() { m_currentDragSession = WebCore::DragSession(); }
@@ -877 +880 @@
     String m_toolTip;
 
+    String m_urlAtProcessExit;
+    WebFrameProxy::LoadState m_loadStateAtProcessExit;
+
     EditorState m_editorState;
 

trunk/Source/WebKit2/UIProcess/qt/QtViewInterface.cpp

@@ -215 +215 @@
 }
 
-void QtViewInterface::processDidCrash()
-{
-    // FIXME
+void QtViewInterface::processDidCrash(const QUrl& url)
+{
+    qWarning("WARNING: The web process experienced a crash on '%s'.", qPrintable(url.toString(QUrl::RemoveUserInfo)));
+
 }
 
 void QtViewInterface::didRelaunchProcess()
 {
-    // FIXME
+    qWarning("WARNING: The web process has been successfully restarted.");
 }
 

trunk/Source/WebKit2/UIProcess/qt/QtViewInterface.h

@@ -96 +96 @@
     virtual QString runJavaScriptPrompt(const QString&, const QString& defaultValue, bool& ok);
 
-    virtual void processDidCrash();
+    virtual void processDidCrash(const QUrl&);
     virtual void didRelaunchProcess();
 

trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp

@@ -670 +670 @@
     m_pinchGestureRecognizer.reset();
     m_tapGestureRecognizer.reset();
-    m_viewInterface->processDidCrash();
+
+    WebCore::KURL url(WebCore::ParsedURLString, m_webPageProxy->urlAtProcessExit());
+    m_viewInterface->processDidCrash(QUrl(url));
 }