[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:53 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 05bf825d564ce9a63c2d7fabe37e94825ba14241
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 22 22:40:33 2010 +0000
Rename revive to relaunch everywhere.
Reviewed by Sam Weinig.
* UIProcess/API/mac/PageClientImpl.h:
* UIProcess/API/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::didRelaunchProcess):
* UIProcess/API/mac/WKView.mm:
(-[WKView _didRelaunchProcess]):
* UIProcess/API/mac/WKViewInternal.h:
* UIProcess/PageClient.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::relaunchProcessIfNecessary):
* UIProcess/WebContext.h:
* UIProcess/WebPageNamespace.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::relaunch):
(WebKit::WebPageProxy::initializeWebPage):
(WebKit::WebPageProxy::loadURL):
(WebKit::WebPageProxy::loadURLRequest):
* UIProcess/WebPageProxy.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70357 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index bdd89af..5bdee50 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,29 @@
2010-10-22 Anders Carlsson <andersca at apple.com>
+ Reviewed by Sam Weinig.
+
+ Rename revive to relaunch everywhere.
+
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::didRelaunchProcess):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _didRelaunchProcess]):
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::relaunchProcessIfNecessary):
+ * UIProcess/WebContext.h:
+ * UIProcess/WebPageNamespace.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::relaunch):
+ (WebKit::WebPageProxy::initializeWebPage):
+ (WebKit::WebPageProxy::loadURL):
+ (WebKit::WebPageProxy::loadURLRequest):
+ * UIProcess/WebPageProxy.h:
+
+2010-10-22 Anders Carlsson <andersca at apple.com>
+
Reviewed by Adam Roben.
Fix assert when a NetscapePluginModule loses its last NetscapePlugin.
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.h b/WebKit2/UIProcess/API/mac/PageClientImpl.h
index a36cc6a..dd62b6a 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.h
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.h
@@ -49,7 +49,7 @@ private:
PageClientImpl(WKView*);
virtual void processDidCrash();
- virtual void processDidRevive();
+ virtual void didRelaunchProcess();
virtual void takeFocus(bool direction);
virtual void toolTipChanged(const String& oldToolTip, const String& newToolTip);
virtual void setCursor(const WebCore::Cursor&);
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.mm b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
index 017380e..6cc3f61 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.mm
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
@@ -119,9 +119,9 @@ void PageClientImpl::processDidCrash()
[m_wkView _processDidCrash];
}
-void PageClientImpl::processDidRevive()
+void PageClientImpl::didRelaunchProcess()
{
- [m_wkView _processDidRevive];
+ [m_wkView _didRelaunchProcess];
}
void PageClientImpl::takeFocus(bool direction)
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 7343a8a..c203554 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -506,9 +506,9 @@ static bool isViewVisible(NSView *view)
[self setNeedsDisplay:YES];
}
-- (void)_processDidRevive
+- (void)_didRelaunchProcess
{
- _data->_page->reinitializeWebPage(IntSize([self visibleRect].size));
+ _data->_page->reinitializeWebPage(IntSize([self bounds].size));
_data->_page->setActive([[self window] isKeyWindow]);
_data->_page->setFocused([[self window] firstResponder] == self);
diff --git a/WebKit2/UIProcess/API/mac/WKViewInternal.h b/WebKit2/UIProcess/API/mac/WKViewInternal.h
index bf0b925..b6a8804 100644
--- a/WebKit2/UIProcess/API/mac/WKViewInternal.h
+++ b/WebKit2/UIProcess/API/mac/WKViewInternal.h
@@ -31,7 +31,7 @@ namespace WebKit {
@interface WKView (Internal)
- (void)_processDidCrash;
-- (void)_processDidRevive;
+- (void)_didRelaunchProcess;
- (void)_takeFocus:(BOOL)direction;
- (void)_toolTipChangedFrom:(NSString *)oldToolTip to:(NSString *)newToolTip;
- (void)_setCursor:(NSCursor *)cursor;
diff --git a/WebKit2/UIProcess/PageClient.h b/WebKit2/UIProcess/PageClient.h
index af2d740..3782efd 100644
--- a/WebKit2/UIProcess/PageClient.h
+++ b/WebKit2/UIProcess/PageClient.h
@@ -47,7 +47,7 @@ public:
virtual ~PageClient() { }
virtual void processDidCrash() = 0;
- virtual void processDidRevive() = 0;
+ virtual void didRelaunchProcess() = 0;
virtual void takeFocus(bool direction) = 0;
virtual void toolTipChanged(const String&, const String&) = 0;
diff --git a/WebKit2/UIProcess/WebContext.cpp b/WebKit2/UIProcess/WebContext.cpp
index 28fe68f..497bdec 100644
--- a/WebKit2/UIProcess/WebContext.cpp
+++ b/WebKit2/UIProcess/WebContext.cpp
@@ -210,7 +210,7 @@ WebPageProxy* WebContext::createWebPage(WebPageNamespace* pageNamespace)
return m_process->createWebPage(pageNamespace);
}
-void WebContext::reviveIfNecessary()
+void WebContext::relaunchProcessIfNecessary()
{
ensureWebProcess();
}
diff --git a/WebKit2/UIProcess/WebContext.h b/WebKit2/UIProcess/WebContext.h
index 709c351..6ff5b3f 100644
--- a/WebKit2/UIProcess/WebContext.h
+++ b/WebKit2/UIProcess/WebContext.h
@@ -72,7 +72,7 @@ public:
WebPageProxy* createWebPage(WebPageNamespace*);
- void reviveIfNecessary();
+ void relaunchProcessIfNecessary();
WebPageNamespace* createPageNamespace();
void pageNamespaceWasDestroyed(WebPageNamespace*);
diff --git a/WebKit2/UIProcess/WebPageNamespace.h b/WebKit2/UIProcess/WebPageNamespace.h
index 3eca9d8..b5eaf1e 100644
--- a/WebKit2/UIProcess/WebPageNamespace.h
+++ b/WebKit2/UIProcess/WebPageNamespace.h
@@ -52,7 +52,6 @@ public:
WebContext* context() const { return m_context.get(); }
WebProcessProxy* process() const { return m_context->process(); }
- void reviveIfNecessary() { m_context->reviveIfNecessary(); }
void preferencesDidChange();
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index a0d491c..4d259fd 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -147,19 +147,19 @@ void WebPageProxy::initializeFindClient(const WKPageFindClient* client)
m_findClient.initialize(client);
}
-void WebPageProxy::revive()
+void WebPageProxy::relaunch()
{
m_valid = true;
- m_pageNamespace->reviveIfNecessary();
+ m_pageNamespace->context()->relaunchProcessIfNecessary();
m_pageNamespace->process()->addExistingWebPage(this, m_pageID);
- processDidRevive();
+ m_pageClient->didRelaunchProcess();
}
void WebPageProxy::initializeWebPage(const IntSize& size)
{
if (!isValid()) {
- revive();
+ relaunch();
return;
}
@@ -240,7 +240,7 @@ void WebPageProxy::loadURL(const String& url)
{
if (!isValid()) {
puts("loadURL called with a dead WebProcess");
- revive();
+ relaunch();
}
process()->send(Messages::WebPage::LoadURL(url), m_pageID);
@@ -250,7 +250,7 @@ void WebPageProxy::loadURLRequest(WebURLRequest* urlRequest)
{
if (!isValid()) {
puts("loadURLRequest called with a dead WebProcess");
- revive();
+ relaunch();
}
process()->send(Messages::WebPage::LoadURLRequest(urlRequest->resourceRequest()), m_pageID);
@@ -1195,12 +1195,6 @@ void WebPageProxy::processDidCrash()
m_loaderClient.processDidCrash(this);
}
-void WebPageProxy::processDidRevive()
-{
- ASSERT(m_pageClient);
- m_pageClient->processDidRevive();
-}
-
WebPageCreationParameters WebPageProxy::creationParameters(const IntSize& size) const
{
WebPageCreationParameters parameters;
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index bfdfd93..69c7a72 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -114,7 +114,7 @@ public:
void initializeFormClient(const WKPageFormClient*);
void initializeUIClient(const WKPageUIClient*);
void initializeFindClient(const WKPageFindClient*);
- void revive();
+ void relaunch();
void initializeWebPage(const WebCore::IntSize&);
void reinitializeWebPage(const WebCore::IntSize&);
@@ -197,7 +197,6 @@ public:
void processDidBecomeUnresponsive();
void processDidBecomeResponsive();
void processDidCrash();
- void processDidRevive();
#if USE(ACCELERATED_COMPOSITING)
void didEnterAcceleratedCompositing();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list