| Index: trunk/Source/core/loader/DocumentLoader.cpp
|
| ===================================================================
|
| --- trunk/Source/core/loader/DocumentLoader.cpp (revision 154456)
|
| +++ trunk/Source/core/loader/DocumentLoader.cpp (working copy)
|
| @@ -302,9 +302,6 @@
|
| {
|
| ASSERT_UNUSED(resource, m_mainResource == resource);
|
| ASSERT(m_mainResource);
|
| -
|
| - RefPtr<DocumentLoader> protect(this);
|
| -
|
| if (!m_mainResource->errorOccurred() && !m_mainResource->wasCanceled()) {
|
| finishedLoading(m_mainResource->loadFinishTime());
|
| return;
|
| @@ -873,7 +870,7 @@
|
| // Multiple frames may be loading the same main resource simultaneously. If deferral state changes,
|
| // each frame's DocumentLoader will try to send a setDefersLoading() to the same underlying ResourceLoader. Ensure only
|
| // the "owning" DocumentLoader does so, as setDefersLoading() is not resilient to setting the same value repeatedly.
|
| - if (mainResourceLoader() && mainResourceLoader()->isLoadedBy(m_cachedResourceLoader.get()))
|
| + if (mainResourceLoader() && mainResourceLoader()->documentLoader() == this)
|
| mainResourceLoader()->setDefersLoading(defers);
|
|
|
| setAllDefersLoading(m_resourceLoaders, defers);
|
|
|