Title: [187703] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187703
- Author
- [email protected]
- Date
- 2015-07-31 19:39:28 -0700 (Fri, 31 Jul 2015)
Log Message
Roll out r187466. rdar://problem/21960398
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187702 => 187703)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-01 01:56:57 UTC (rev 187702)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-01 02:39:28 UTC (rev 187703)
@@ -1,5 +1,9 @@
2015-07-31 Babak Shafiei <[email protected]>
+ Roll out r187466.
+
+2015-07-31 Babak Shafiei <[email protected]>
+
Merge r187694.
2015-07-31 Eric Carlson <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.cpp (187702 => 187703)
--- branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-08-01 01:56:57 UTC (rev 187702)
+++ branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-08-01 02:39:28 UTC (rev 187703)
@@ -550,10 +550,8 @@
// We checked application cache for initial URL, now we need to check it for redirected one.
ASSERT(!m_substituteData.isValid());
m_applicationCacheHost->maybeLoadMainResourceForRedirect(newRequest, m_substituteData);
- if (m_substituteData.isValid()) {
- RELEASE_ASSERT(m_mainResource);
- m_identifierForLoadWithoutResourceLoader = m_mainResource->identifierForLoadWithoutResourceLoader();
- }
+ if (m_substituteData.isValid())
+ m_identifierForLoadWithoutResourceLoader = mainResourceLoader()->identifier();
}
// FIXME: Ideally we'd stop the I/O until we hear back from the navigation policy delegate
@@ -583,15 +581,10 @@
// However, from an API perspective, this isn't a cancellation. Therefore, sever our relationship with the network load,
// but prevent the ResourceLoader from sending ResourceLoadNotifier callbacks.
RefPtr<ResourceLoader> resourceLoader = mainResourceLoader();
- if (resourceLoader) {
- ASSERT(resourceLoader->shouldSendResourceLoadCallbacks());
- resourceLoader->setSendCallbackPolicy(DoNotSendCallbacks);
- }
-
+ ASSERT(resourceLoader->shouldSendResourceLoadCallbacks());
+ resourceLoader->setSendCallbackPolicy(DoNotSendCallbacks);
clearMainResource();
-
- if (resourceLoader)
- resourceLoader->setSendCallbackPolicy(SendCallbacks);
+ resourceLoader->setSendCallbackPolicy(SendCallbacks);
handleSubstituteDataLoadSoon();
}
}
Modified: branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.cpp (187702 => 187703)
--- branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.cpp 2015-08-01 01:56:57 UTC (rev 187702)
+++ branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.cpp 2015-08-01 02:39:28 UTC (rev 187703)
@@ -405,7 +405,6 @@
void CachedResource::clearLoader()
{
ASSERT(m_loader);
- m_identifierForLoadWithoutResourceLoader = m_loader->identifier();
m_loader = nullptr;
deleteIfPossible();
}
Modified: branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.h (187702 => 187703)
--- branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.h 2015-08-01 01:56:57 UTC (rev 187702)
+++ branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.h 2015-08-01 02:39:28 UTC (rev 187703)
@@ -260,8 +260,6 @@
virtual char* getOrCreateReadBuffer(size_t /* requestedSize */, size_t& /* actualSize */) { return nullptr; }
#endif
- unsigned long identifierForLoadWithoutResourceLoader() const { return m_identifierForLoadWithoutResourceLoader; }
-
protected:
void setEncodedSize(unsigned);
void setDecodedSize(unsigned);
@@ -343,8 +341,6 @@
HashSet<CachedResourceHandleBase*> m_handlesToRevalidate;
RedirectChainCacheStatus m_redirectChainCacheStatus;
-
- unsigned long m_identifierForLoadWithoutResourceLoader { 0 };
};
class CachedResource::Callback {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
