From 18b7ccb5e5030af1372aac758d78b1260b3195e0 Mon Sep 17 00:00:00 2001 From: "jberlin@webkit.org" Date: Tue, 19 Jul 2011 16:36:26 +0000 Subject: [PATCH] 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 --- Source/WebCore/ChangeLog | 12 ++++++++++++ Source/WebCore/loader/ResourceLoader.cpp | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 60a5df91074..7014ca55ed2 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2011-07-19 Jessie Berlin + + 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 REGRESSION (r82194): jvalueToJavaValue() does not correctly set length of String property diff --git a/Source/WebCore/loader/ResourceLoader.cpp b/Source/WebCore/loader/ResourceLoader.cpp index 15ccc94e945..18d338e2e91 100644 --- a/Source/WebCore/loader/ResourceLoader.cpp +++ b/Source/WebCore/loader/ResourceLoader.cpp @@ -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 -- GitLab