← Back to branch summary

~ubuntu-branches/ubuntu/karmic/webkit/karmic-proposed

« back to all changes in this revision

Viewing changes to WebCore/loader/SubresourceLoader.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-05-15 18:30:58 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090515183058-50q5exjo9b1kxy9s
Tags: 1.1.7-1
http://bugs.debian.org/526683
* New upstream release
* debian/libwebkit-1.0-2.symbols:
- updated with the new symbols in 1.1.7
* debian/libwebkit-dev.install, debian/libwebkit-dev.links,
  debian/rules:
- Build, and ship gtk-doc documentation (Closes: #526683)
* debian/copyright:
- updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/loader/SubresourceLoader.cpp
222
222
    
223
223
    if (cancelled())
224
224
        return;
 
225
    
 
226
    // The only way the subresource loader can reach the terminal state here is if the run loop spins when calling
 
227
    // m_client->didFail. This should in theory not happen which is why the assert is here. 
 
228
    ASSERT(!reachedTerminalState());
 
229
    if (reachedTerminalState())
 
230
        return;
 
231
    
225
232
    m_documentLoader->removeSubresourceLoader(this);
226
233
    ResourceLoader::didCancel(error);
227
234
}