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

[jberlin at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit d83d34db3cdc7250790530c33076ce3fb894b641
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 19:06:58 2011 +0000

    WebKit2: Do not assert that the provisional and committed URLs cannot be empty/null
    https://bugs.webkit.org/show_bug.cgi?id=52641
    
    Reviewed by Darin Adler.
    
    * UIProcess/WebFrameProxy.cpp:
    (WebKit::WebFrameProxy::didStartProvisionalLoad):
    (WebKit::WebFrameProxy::didCommitLoad):
    (WebKit::WebFrameProxy::didFinishLoad):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76040 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 9b0250d..f719a27 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-18  Jessie Berlin  <jberlin at apple.com>
+
+        Reviewed by Darin Adler.
+
+        WebKit2: Do not assert that the provisional and committed URLs cannot be empty/null
+        https://bugs.webkit.org/show_bug.cgi?id=52641
+
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::didStartProvisionalLoad):
+        (WebKit::WebFrameProxy::didCommitLoad):
+        (WebKit::WebFrameProxy::didFinishLoad):
+
 2011-01-18  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/Source/WebKit2/UIProcess/WebFrameProxy.cpp b/Source/WebKit2/UIProcess/WebFrameProxy.cpp
index d3a36f9..9e9b4b7 100644
--- a/Source/WebKit2/UIProcess/WebFrameProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebFrameProxy.cpp
@@ -117,7 +117,6 @@ bool WebFrameProxy::isDisplayingMarkupDocument() const
 
 void WebFrameProxy::didStartProvisionalLoad(const String& url)
 {
-    ASSERT(!url.isEmpty());
     ASSERT(m_loadState == LoadStateFinished);
     ASSERT(m_provisionalURL.isEmpty());
     m_loadState = LoadStateProvisional;
@@ -143,7 +142,6 @@ void WebFrameProxy::didFailProvisionalLoad()
 void WebFrameProxy::didCommitLoad(const String& contentType, const PlatformCertificateInfo& certificateInfo)
 {
     ASSERT(m_loadState == LoadStateProvisional);
-    ASSERT(!m_provisionalURL.isEmpty());
     m_loadState = LoadStateCommitted;
     m_url = m_provisionalURL;
     m_provisionalURL = String();
@@ -157,7 +155,6 @@ void WebFrameProxy::didFinishLoad()
 {
     ASSERT(m_loadState == LoadStateCommitted);
     ASSERT(m_provisionalURL.isEmpty());
-    ASSERT(!m_url.isEmpty());
     m_loadState = LoadStateFinished;
 }
 

-- 
WebKit Debian packaging