[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 40ec2b2968818fa031125c27dd4c5503018baec9
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 21:26:42 2010 +0000

    Move more of WebPageProxy::didCommitLoadForFrame into WebFrameProxy::didCommitLoad.
    
    Reviewed by Sam Weinig.
    
    * UIProcess/WebFrameProxy.cpp:
    (WebKit::WebFrameProxy::didCommitLoad): Added type and certificate info arguments,
    and set m_MIMEType, m_isFrameSet, and m_certificateInfo.
    * UIProcess/WebFrameProxy.h: Removed setMIMEType and setCertificateInfo and added
    arguments to didCommitLoad.
    * UIProcess/WebPageProxy.cpp:
    (WebKit::WebPageProxy::didCommitLoadForFrame): Removed code that is now inside the
    WebFrameProxy::didCommitLoad function.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74500 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 7c75084..04c7b1f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-22  Darin Adler  <darin at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Move more of WebPageProxy::didCommitLoadForFrame into WebFrameProxy::didCommitLoad.
+
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::didCommitLoad): Added type and certificate info arguments,
+        and set m_MIMEType, m_isFrameSet, and m_certificateInfo.
+        * UIProcess/WebFrameProxy.h: Removed setMIMEType and setCertificateInfo and added
+        arguments to didCommitLoad.
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didCommitLoadForFrame): Removed code that is now inside the
+        WebFrameProxy::didCommitLoad function.
+
 2010-12-21  Darin Adler  <darin at apple.com>
 
         Reviewed by Brady Eidson and Sam Weinig.
diff --git a/WebKit2/UIProcess/WebFrameProxy.cpp b/WebKit2/UIProcess/WebFrameProxy.cpp
index 46d64ff..7bd4cd7 100644
--- a/WebKit2/UIProcess/WebFrameProxy.cpp
+++ b/WebKit2/UIProcess/WebFrameProxy.cpp
@@ -69,11 +69,6 @@ bool WebFrameProxy::isMainFrame() const
     return this == m_page->mainFrame();
 }
 
-void WebFrameProxy::setCertificateInfo(PassRefPtr<WebCertificateInfo> certificateInfo)
-{
-    m_certificateInfo = certificateInfo;
-}
-
 bool WebFrameProxy::canProvideSource() const
 {
     return isDisplayingMarkupDocument();
@@ -132,7 +127,7 @@ void WebFrameProxy::didFailProvisionalLoad()
     m_provisionalURL = String();
 }
 
-void WebFrameProxy::didCommitLoad()
+void WebFrameProxy::didCommitLoad(const String& mimeType, const PlatformCertificateInfo& certificateInfo)
 {
     ASSERT(m_loadState == LoadStateProvisional);
     ASSERT(!m_provisionalURL.isEmpty());
@@ -140,6 +135,9 @@ void WebFrameProxy::didCommitLoad()
     m_url = m_provisionalURL;
     m_provisionalURL = String();
     m_title = String();
+    m_MIMEType = mimeType;
+    m_isFrameSet = false;
+    m_certificateInfo = WebCertificateInfo::create(certificateInfo);
 }
 
 void WebFrameProxy::didFinishLoad()
diff --git a/WebKit2/UIProcess/WebFrameProxy.h b/WebKit2/UIProcess/WebFrameProxy.h
index e0159bb..b5cd9cb 100644
--- a/WebKit2/UIProcess/WebFrameProxy.h
+++ b/WebKit2/UIProcess/WebFrameProxy.h
@@ -84,12 +84,10 @@ public:
     void setUnreachableURL(const String& unreachableURL) { m_unreachableURL = unreachableURL; }
     const String& unreachableURL() const { return m_unreachableURL; }
 
-    void setMIMEType(const String& mimeType) { m_MIMEType = mimeType; }
     const String& mimeType() const { return m_MIMEType; }
 
     const String& title() const { return m_title; }
 
-    void setCertificateInfo(PassRefPtr<WebCertificateInfo>);
     WebCertificateInfo* certificateInfo() const { return m_certificateInfo.get(); }
 
     bool canProvideSource() const;
@@ -103,7 +101,7 @@ public:
     void didStartProvisionalLoad(const String& url);
     void didReceiveServerRedirectForProvisionalLoad(const String& url);
     void didFailProvisionalLoad();
-    void didCommitLoad();
+    void didCommitLoad(const String& contentType, const PlatformCertificateInfo&);
     void didFinishLoad();
     void didFailLoad();
     void didSameDocumentNavigation(const String&); // eg. anchor navigation, session state change.
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index abd6add..2a0e77c 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -972,10 +972,7 @@ void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeTyp
 
     WebFrameProxy* frame = process()->webFrame(frameID);
 
-    frame->setMIMEType(mimeType);
-    frame->setIsFrameSet(false);
-    frame->setCertificateInfo(WebCertificateInfo::create(certificateInfo));
-    frame->didCommitLoad();
+    frame->didCommitLoad(mimeType, certificateInfo);
 
     if (frame->isMainFrame()) {
         m_mainFrameHasCustomRepresentation = frameHasCustomRepresentation;

-- 
WebKit Debian packaging