Commit 18b7ccb5 authored by jberlin@webkit.org's avatar jberlin@webkit.org

Fix assertion failure seen in plugins/return-npobject.html on Windows XP Debug bots.

Rubber-stamped by Adam Roben.

* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::didReceiveData):
It is possible for a subclass to cancel the load from within didReceiveData, which would
set m_documentLoader to 0.
Remove the assertion I added that the DocumentLoader's frame is non-null.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@91263 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3e6877b5
2011-07-19 Jessie Berlin <jberlin@apple.com>
Fix assertion failure seen in plugins/return-npobject.html on Windows XP Debug bots.
Rubber-stamped by Adam Roben.
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::didReceiveData):
It is possible for a subclass to cancel the load from within didReceiveData, which would
set m_documentLoader to 0.
Remove the assertion I added that the DocumentLoader's frame is non-null.
2011-07-19 Steve Block <steveblock@google.com>
REGRESSION (r82194): jvalueToJavaValue() does not correctly set length of String property
......@@ -270,7 +270,6 @@ void ResourceLoader::didReceiveResponse(const ResourceResponse& r)
void ResourceLoader::didReceiveData(const char* data, int length, long long encodedDataLength, bool allAtOnce)
{
ASSERT(documentLoader()->frame());
// The following assertions are not quite valid here, since a subclass
// might override didReceiveData in a way that invalidates them. This
// happens with the steps listed in 3266216
......
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