[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andersca at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 0c07b2166f5135c176d97534dd35d864d2a008c7
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 18:49:13 2011 +0000

    2011-01-11  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Dan Bernstein.
    
            Automatically reinitialize the web page on relaunch
            https://bugs.webkit.org/show_bug.cgi?id=52224
            <rdar://problem/8765695>
    
            * UIProcess/API/mac/WKView.mm:
            (-[WKView _didRelaunchProcess]):
            Remove call to reinitializeWebPage.
    
            * UIProcess/WebPageProxy.cpp:
            (WebKit::WebPageProxy::relaunch):
            Call initializeWebPage().
    
            (WebKit::WebPageProxy::initializeWebPage):
            Assert that the web page is valid here.
    
            * UIProcess/WebPageProxy.h:
            Remove reinitializeWebPage.
    
            * UIProcess/win/WebView.cpp:
            (WebKit::WebView::didRelaunchProcess):
            Remove call to reinitializeWebPage.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 581aa6a..3a67c2e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,29 @@
+2011-01-11  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Automatically reinitialize the web page on relaunch
+        https://bugs.webkit.org/show_bug.cgi?id=52224
+        <rdar://problem/8765695>
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _didRelaunchProcess]):
+        Remove call to reinitializeWebPage.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::relaunch):
+        Call initializeWebPage().
+
+        (WebKit::WebPageProxy::initializeWebPage):
+        Assert that the web page is valid here.
+
+        * UIProcess/WebPageProxy.h:
+        Remove reinitializeWebPage.
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::didRelaunchProcess):
+        Remove call to reinitializeWebPage.
+
 2011-01-10  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 5322d7e..0820016 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -1219,8 +1219,6 @@ static void extractUnderlines(NSAttributedString *string, Vector<CompositionUnde
 
 - (void)_didRelaunchProcess
 {
-    _data->_page->reinitializeWebPage(IntSize([self bounds].size));
-    
     [self setNeedsDisplay:YES];
 }
 
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index a541763..0ed7625 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -206,29 +206,18 @@ void WebPageProxy::initializeContextMenuClient(const WKPageContextMenuClient* cl
 void WebPageProxy::relaunch()
 {
     m_isValid = true;
+
     context()->relaunchProcessIfNecessary();
     process()->addExistingWebPage(this, m_pageID);
 
+    initializeWebPage();
+
     m_pageClient->didRelaunchProcess();
 }
 
 void WebPageProxy::initializeWebPage()
 {
-    if (!isValid()) {
-        relaunch();
-        return;
-    }
-
-    m_drawingArea = m_pageClient->createDrawingAreaProxy();
-    ASSERT(m_drawingArea);
-
-    process()->send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters()), 0);
-}
-
-void WebPageProxy::reinitializeWebPage(const WebCore::IntSize& size)
-{
-    if (!isValid())
-        return;
+    ASSERT(isValid());
 
     m_drawingArea = m_pageClient->createDrawingAreaProxy();
     ASSERT(m_drawingArea);
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 80ee07d..7330bcc 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -135,7 +135,6 @@ public:
     void relaunch();
 
     void initializeWebPage();
-    void reinitializeWebPage(const WebCore::IntSize&);
 
     void close();
     bool tryClose();
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index c22d54d..9fe71a1 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -622,13 +622,7 @@ void WebView::processDidCrash()
 
 void WebView::didRelaunchProcess()
 {
-    RECT clientRect;
-    if (!::GetClientRect(m_window, &clientRect))
-        return;
-
-    m_page->reinitializeWebPage(IntRect(clientRect).size());
     updateNativeCursor();
-
     ::InvalidateRect(m_window, 0, TRUE);
 }
 

-- 
WebKit Debian packaging