[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 14:52:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 33ed14253c06f4c2f33777e762ccd55bf00e9145
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 22 20:21:14 2010 +0000
Rename processDidExit to processDidCrash
https://bugs.webkit.org/show_bug.cgi?id=48146
Reviewed by Sam Weinig.
* UIProcess/API/C/WKPage.h:
* UIProcess/API/mac/PageClientImpl.h:
* UIProcess/API/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::processDidCrash):
* UIProcess/API/mac/WKView.mm:
(-[WKView _processDidCrash]):
* UIProcess/API/mac/WKViewInternal.h:
* UIProcess/API/qt/qwkpage.cpp:
(QWKPage::QWKPage):
* UIProcess/API/qt/qwkpage_p.h:
(QWKPagePrivate::processDidCrash):
* UIProcess/PageClient.h:
* UIProcess/WebLoaderClient.cpp:
(WebKit::WebLoaderClient::processDidBecomeUnresponsive):
(WebKit::WebLoaderClient::processDidBecomeResponsive):
(WebKit::WebLoaderClient::processDidCrash):
* UIProcess/WebLoaderClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::processDidBecomeUnresponsive):
(WebKit::WebPageProxy::processDidBecomeResponsive):
(WebKit::WebPageProxy::processDidCrash):
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::didClose):
* UIProcess/win/WebView.cpp:
(WebKit::WebView::processDidCrash):
* UIProcess/win/WebView.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70329 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a8c6215..7e31255 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,38 @@
+2010-10-22 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Rename processDidExit to processDidCrash
+ https://bugs.webkit.org/show_bug.cgi?id=48146
+
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::processDidCrash):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _processDidCrash]):
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPage::QWKPage):
+ * UIProcess/API/qt/qwkpage_p.h:
+ (QWKPagePrivate::processDidCrash):
+ * UIProcess/PageClient.h:
+ * UIProcess/WebLoaderClient.cpp:
+ (WebKit::WebLoaderClient::processDidBecomeUnresponsive):
+ (WebKit::WebLoaderClient::processDidBecomeResponsive):
+ (WebKit::WebLoaderClient::processDidCrash):
+ * UIProcess/WebLoaderClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::processDidBecomeUnresponsive):
+ (WebKit::WebPageProxy::processDidBecomeResponsive):
+ (WebKit::WebPageProxy::processDidCrash):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::didClose):
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::processDidCrash):
+ * UIProcess/win/WebView.h:
+
2010-10-22 Dan Bernstein <mitz at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/API/C/WKPage.h b/WebKit2/UIProcess/API/C/WKPage.h
index 40e46fd..534a343 100644
--- a/WebKit2/UIProcess/API/C/WKPage.h
+++ b/WebKit2/UIProcess/API/C/WKPage.h
@@ -69,9 +69,9 @@ typedef void (*WKPageDidFinishProgressCallback)(WKPageRef page, const void *clie
// WebPageNamespace Client
// FIXME: These three functions should not be part of this client.
-typedef void (*WKPageDidBecomeUnresponsiveCallback)(WKPageRef page, const void *clientInfo);
-typedef void (*WKPageDidBecomeResponsiveCallback)(WKPageRef page, const void *clientInfo);
-typedef void (*WKPageProcessDidExitCallback)(WKPageRef page, const void *clientInfo);
+typedef void (*WKPageProcessDidBecomeUnresponsiveCallback)(WKPageRef page, const void *clientInfo);
+typedef void (*WKPageProcessDidBecomeResponsiveCallback)(WKPageRef page, const void *clientInfo);
+typedef void (*WKPageProcessDidCrashCallback)(WKPageRef page, const void *clientInfo);
typedef void (*WKPageDidChangeBackForwardListCallback)(WKPageRef page, const void *clientInfo);
@@ -96,9 +96,9 @@ struct WKPageLoaderClient {
WKPageDidFinishProgressCallback didFinishProgress;
// FIXME: These three functions should not be part of this client.
- WKPageDidBecomeUnresponsiveCallback didBecomeUnresponsive;
- WKPageDidBecomeResponsiveCallback didBecomeResponsive;
- WKPageProcessDidExitCallback processDidExit;
+ WKPageProcessDidBecomeUnresponsiveCallback processDidBecomeUnresponsive;
+ WKPageProcessDidBecomeResponsiveCallback processDidBecomeResponsive;
+ WKPageProcessDidCrashCallback processDidCrash;
WKPageDidChangeBackForwardListCallback didChangeBackForwardList;
};
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.h b/WebKit2/UIProcess/API/mac/PageClientImpl.h
index 52f3b4b..a36cc6a 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.h
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.h
@@ -48,7 +48,7 @@ public:
private:
PageClientImpl(WKView*);
- virtual void processDidExit();
+ virtual void processDidCrash();
virtual void processDidRevive();
virtual void takeFocus(bool direction);
virtual void toolTipChanged(const String& oldToolTip, const String& newToolTip);
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.mm b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
index 74d7dd1..017380e 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.mm
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
@@ -114,9 +114,9 @@ PageClientImpl::~PageClientImpl()
{
}
-void PageClientImpl::processDidExit()
+void PageClientImpl::processDidCrash()
{
- [m_wkView _processDidExit];
+ [m_wkView _processDidCrash];
}
void PageClientImpl::processDidRevive()
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 02deb6f..7343a8a 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -501,7 +501,7 @@ static bool isViewVisible(NSView *view)
@implementation WKView (Internal)
-- (void)_processDidExit
+- (void)_processDidCrash
{
[self setNeedsDisplay:YES];
}
diff --git a/WebKit2/UIProcess/API/mac/WKViewInternal.h b/WebKit2/UIProcess/API/mac/WKViewInternal.h
index 083a75d..bf0b925 100644
--- a/WebKit2/UIProcess/API/mac/WKViewInternal.h
+++ b/WebKit2/UIProcess/API/mac/WKViewInternal.h
@@ -30,7 +30,7 @@ namespace WebKit {
}
@interface WKView (Internal)
-- (void)_processDidExit;
+- (void)_processDidCrash;
- (void)_processDidRevive;
- (void)_takeFocus:(BOOL)direction;
- (void)_toolTipChangedFrom:(NSString *)oldToolTip to:(NSString *)newToolTip;
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 1193141..272d0fc 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -289,7 +289,7 @@ QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)
qt_wk_didFinishProgress,
qt_wk_didBecomeUnresponsive,
qt_wk_didBecomeResponsive,
- 0, /* processDidExit */
+ 0, /* processDidCrash */
0 /* didChangeBackForwardList */
};
WKPageSetPageLoaderClient(pageRef(), &loadClient);
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index 373ec2d..0e02005 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -48,7 +48,7 @@ public:
void pageDidEnterAcceleratedCompositing() { }
void pageDidLeaveAcceleratedCompositing() { }
#endif // USE(ACCELERATED_COMPOSITING)
- virtual void processDidExit() { }
+ virtual void processDidCrash() { }
virtual void processDidRevive() { }
virtual void setCursor(const WebCore::Cursor&);
virtual void setViewportArguments(const WebCore::ViewportArguments&);
diff --git a/WebKit2/UIProcess/PageClient.h b/WebKit2/UIProcess/PageClient.h
index c2da296..af2d740 100644
--- a/WebKit2/UIProcess/PageClient.h
+++ b/WebKit2/UIProcess/PageClient.h
@@ -46,7 +46,7 @@ class PageClient {
public:
virtual ~PageClient() { }
- virtual void processDidExit() = 0;
+ virtual void processDidCrash() = 0;
virtual void processDidRevive() = 0;
virtual void takeFocus(bool direction) = 0;
diff --git a/WebKit2/UIProcess/WebLoaderClient.cpp b/WebKit2/UIProcess/WebLoaderClient.cpp
index ef4c48f..3ccc5d6 100644
--- a/WebKit2/UIProcess/WebLoaderClient.cpp
+++ b/WebKit2/UIProcess/WebLoaderClient.cpp
@@ -157,28 +157,28 @@ void WebLoaderClient::didFinishProgress(WebPageProxy* page)
m_pageLoaderClient.didFinishProgress(toAPI(page), m_pageLoaderClient.clientInfo);
}
-void WebLoaderClient::didBecomeUnresponsive(WebPageProxy* page)
+void WebLoaderClient::processDidBecomeUnresponsive(WebPageProxy* page)
{
- if (!m_pageLoaderClient.didBecomeUnresponsive)
+ if (!m_pageLoaderClient.processDidBecomeUnresponsive)
return;
- m_pageLoaderClient.didBecomeUnresponsive(toAPI(page), m_pageLoaderClient.clientInfo);
+ m_pageLoaderClient.processDidBecomeUnresponsive(toAPI(page), m_pageLoaderClient.clientInfo);
}
-void WebLoaderClient::didBecomeResponsive(WebPageProxy* page)
+void WebLoaderClient::processDidBecomeResponsive(WebPageProxy* page)
{
- if (!m_pageLoaderClient.didBecomeResponsive)
+ if (!m_pageLoaderClient.processDidBecomeResponsive)
return;
- m_pageLoaderClient.didBecomeResponsive(toAPI(page), m_pageLoaderClient.clientInfo);
+ m_pageLoaderClient.processDidBecomeResponsive(toAPI(page), m_pageLoaderClient.clientInfo);
}
-void WebLoaderClient::processDidExit(WebPageProxy* page)
+void WebLoaderClient::processDidCrash(WebPageProxy* page)
{
- if (!m_pageLoaderClient.processDidExit)
+ if (!m_pageLoaderClient.processDidCrash)
return;
- m_pageLoaderClient.processDidExit(toAPI(page), m_pageLoaderClient.clientInfo);
+ m_pageLoaderClient.processDidCrash(toAPI(page), m_pageLoaderClient.clientInfo);
}
void WebLoaderClient::didChangeBackForwardList(WebPageProxy* page)
diff --git a/WebKit2/UIProcess/WebLoaderClient.h b/WebKit2/UIProcess/WebLoaderClient.h
index 1d28dee..4a338dd 100644
--- a/WebKit2/UIProcess/WebLoaderClient.h
+++ b/WebKit2/UIProcess/WebLoaderClient.h
@@ -61,9 +61,9 @@ public:
void didFinishProgress(WebPageProxy*);
// FIXME: These three functions should not be part of this client.
- void didBecomeUnresponsive(WebPageProxy*);
- void didBecomeResponsive(WebPageProxy*);
- void processDidExit(WebPageProxy*);
+ void processDidBecomeUnresponsive(WebPageProxy*);
+ void processDidBecomeResponsive(WebPageProxy*);
+ void processDidCrash(WebPageProxy*);
void didChangeBackForwardList(WebPageProxy*);
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 73b92dd..fd2d705 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -1139,15 +1139,15 @@ void WebPageProxy::didChangeAcceleratedCompositing(bool compositing, DrawingArea
void WebPageProxy::processDidBecomeUnresponsive()
{
- m_loaderClient.didBecomeUnresponsive(this);
+ m_loaderClient.processDidBecomeUnresponsive(this);
}
void WebPageProxy::processDidBecomeResponsive()
{
- m_loaderClient.didBecomeResponsive(this);
+ m_loaderClient.processDidBecomeResponsive(this);
}
-void WebPageProxy::processDidExit()
+void WebPageProxy::processDidCrash()
{
ASSERT(m_pageClient);
@@ -1190,8 +1190,8 @@ void WebPageProxy::processDidExit()
m_estimatedProgress = 0.0;
- m_pageClient->processDidExit();
- m_loaderClient.processDidExit(this);
+ m_pageClient->processDidCrash();
+ m_loaderClient.processDidCrash(this);
}
void WebPageProxy::processDidRevive()
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index ba2f2e1..343bf39 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -195,7 +195,7 @@ public:
void processDidBecomeUnresponsive();
void processDidBecomeResponsive();
- void processDidExit();
+ void processDidCrash();
void processDidRevive();
#if USE(ACCELERATED_COMPOSITING)
diff --git a/WebKit2/UIProcess/WebProcessProxy.cpp b/WebKit2/UIProcess/WebProcessProxy.cpp
index 3c81287..89d9651 100644
--- a/WebKit2/UIProcess/WebProcessProxy.cpp
+++ b/WebKit2/UIProcess/WebProcessProxy.cpp
@@ -412,7 +412,7 @@ void WebProcessProxy::didClose(CoreIPC::Connection*)
copyValuesToVector(m_pageMap, pages);
for (size_t i = 0, size = pages.size(); i < size; ++i)
- pages[i]->processDidExit();
+ pages[i]->processDidCrash();
// This may cause us to be deleted.
WebProcessManager::shared().processDidClose(this, m_context);
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index 922a904..a4a64d7 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -537,7 +537,7 @@ void WebView::close()
// PageClient
-void WebView::processDidExit()
+void WebView::processDidCrash()
{
}
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index f426984..6def276 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -92,7 +92,7 @@ private:
void updateNativeCursor();
// PageClient
- virtual void processDidExit();
+ virtual void processDidCrash();
virtual void processDidRevive();
virtual void takeFocus(bool direction);
virtual void toolTipChanged(const WTF::String&, const WTF::String&);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list