[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:53:09 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit bf75df3ccc5b90357ca2e9f0fb2a5ab65683f149
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 22 23:08:02 2010 +0000

    Fix build.
    
    * UIProcess/API/qt/qwkpage_p.h:
    (QWKPagePrivate::didRelaunchProcess):
    * UIProcess/win/WebView.cpp:
    (WebKit::WebView::didRelaunchProcess):
    * UIProcess/win/WebView.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70362 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a474211..56d959e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,16 @@
 2010-10-22  Anders Carlsson  <andersca at apple.com>
 
+        Fix build.
+
+        * UIProcess/API/qt/qwkpage_p.h:
+        (QWKPagePrivate::didRelaunchProcess):
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::didRelaunchProcess):
+        * UIProcess/win/WebView.h:
+        * WebKit2.xcodeproj/project.pbxproj:
+
+2010-10-22  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Sam Weinig.
 
         WebContext::ensureWebProcess shouldn't send multiple InitializeWebProcess messages.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index 0e02005..fb8ad0d 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -49,7 +49,7 @@ public:
     void pageDidLeaveAcceleratedCompositing() { }
 #endif // USE(ACCELERATED_COMPOSITING)
     virtual void processDidCrash() { }
-    virtual void processDidRevive() { }
+    virtual void didRelaunchProcess() { }
     virtual void setCursor(const WebCore::Cursor&);
     virtual void setViewportArguments(const WebCore::ViewportArguments&);
     virtual void takeFocus(bool direction) { }
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index a4a64d7..c6fd9de 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -541,7 +541,7 @@ void WebView::processDidCrash()
 {
 }
 
-void WebView::processDidRevive()
+void WebView::didRelaunchProcess()
 {
 }
 
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index 6def276..054c650 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -93,7 +93,7 @@ private:
 
     // PageClient
     virtual void processDidCrash();
-    virtual void processDidRevive();
+    virtual void didRelaunchProcess();
     virtual void takeFocus(bool direction);
     virtual void toolTipChanged(const WTF::String&, const WTF::String&);
     virtual void setCursor(const WebCore::Cursor&);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list