From ce85188820b30c57d769af27b3dce266c0f27a9c Mon Sep 17 00:00:00 2001 From: "andreas.kling@nokia.com" Date: Tue, 25 Jan 2011 12:43:02 +0000 Subject: [PATCH] 2011-01-25 Andreas Kling Reviewed by Kenneth Rohde Christiansen. [Qt][WK2] Add QWKPage::processCrashed() signal https://bugs.webkit.org/show_bug.cgi?id=53076 * UIProcess/API/qt/qwkpage.cpp: (QWKPagePrivate::processDidCrash): * UIProcess/API/qt/qwkpage.h: * UIProcess/API/qt/qwkpage_p.h: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76585 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 12 ++++++++++++ Source/WebKit2/UIProcess/API/qt/qwkpage.cpp | 5 +++++ Source/WebKit2/UIProcess/API/qt/qwkpage.h | 1 + Source/WebKit2/UIProcess/API/qt/qwkpage_p.h | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 8a8ed30..7d20887 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,15 @@ +2011-01-25 Andreas Kling + + Reviewed by Kenneth Rohde Christiansen. + + [Qt][WK2] Add QWKPage::processCrashed() signal + https://bugs.webkit.org/show_bug.cgi?id=53076 + + * UIProcess/API/qt/qwkpage.cpp: + (QWKPagePrivate::processDidCrash): + * UIProcess/API/qt/qwkpage.h: + * UIProcess/API/qt/qwkpage_p.h: + 2011-01-24 Anders Carlsson Fix build. diff --git a/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp b/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp index 72c1322..0ef603c 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp @@ -393,6 +393,11 @@ void QWKPagePrivate::didRelaunchProcess() q->setViewportSize(wkView->size().toSize()); } +void QWKPagePrivate::processDidCrash() +{ + emit q->processCrashed(); +} + QWKPage::QWKPage(QWKContext* context) : d(new QWKPagePrivate(this, context)) { diff --git a/Source/WebKit2/UIProcess/API/qt/qwkpage.h b/Source/WebKit2/UIProcess/API/qt/qwkpage.h index e0bb4c3..163ba41 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwkpage.h +++ b/Source/WebKit2/UIProcess/API/qt/qwkpage.h @@ -133,6 +133,7 @@ public: Q_SIGNAL void zoomableAreaFound(const QRect&); Q_SIGNAL void focusNextPrevChild(bool); Q_SIGNAL void showContextMenu(QMenu*); + Q_SIGNAL void processCrashed(); 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..ec1a6a2 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h @@ -61,7 +61,7 @@ public: void pageDidLeaveAcceleratedCompositing() { } #endif // USE(ACCELERATED_COMPOSITING) virtual void pageDidRequestScroll(const WebCore::IntSize&); - virtual void processDidCrash() { } + virtual void processDidCrash(); virtual void didRelaunchProcess(); virtual void didChangeContentsSize(const WebCore::IntSize&); virtual void didFindZoomableArea(const WebCore::IntRect&); -- 1.8.3.1