Commit d83d34db authored by jberlin@webkit.org's avatar jberlin@webkit.org
Browse files

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
parent d418a3a1
2011-01-18 Jessie Berlin <jberlin@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@apple.com>
 
Reviewed by Sam Weinig.
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment