Title: [91263] trunk/Source/WebCore
- Revision
- 91263
- Author
- [email protected]
- Date
- 2011-07-19 09:36:26 -0700 (Tue, 19 Jul 2011)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (91262 => 91263)
--- trunk/Source/WebCore/ChangeLog 2011-07-19 16:28:55 UTC (rev 91262)
+++ trunk/Source/WebCore/ChangeLog 2011-07-19 16:36:26 UTC (rev 91263)
@@ -1,3 +1,15 @@
+2011-07-19 Jessie Berlin <[email protected]>
+
+ 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 <[email protected]>
REGRESSION (r82194): jvalueToJavaValue() does not correctly set length of String property
Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (91262 => 91263)
--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2011-07-19 16:28:55 UTC (rev 91262)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2011-07-19 16:36:26 UTC (rev 91263)
@@ -270,7 +270,6 @@
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
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
