Title: [201556] trunk/Source/WebCore
- Revision
- 201556
- Author
- [email protected]
- Date
- 2016-06-01 09:58:08 -0700 (Wed, 01 Jun 2016)
Log Message
Remove allocation of SubresourceLoader::m_requestCountTracker
https://bugs.webkit.org/show_bug.cgi?id=158255
Reviewed by Chris Dumez.
No change of behavior.
Making m_requestCountTracker an Optional in lieu of a unique_ptr.
This requires constructing m_requestCountTracker in place so that constructor and destructor are called only once.
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::SubresourceLoader):
(WebCore::SubresourceLoader::didReceiveResponse):
(WebCore::SubresourceLoader::notifyDone):
* loader/SubresourceLoader.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201555 => 201556)
--- trunk/Source/WebCore/ChangeLog 2016-06-01 16:22:01 UTC (rev 201555)
+++ trunk/Source/WebCore/ChangeLog 2016-06-01 16:58:08 UTC (rev 201556)
@@ -1,3 +1,21 @@
+2016-06-01 Youenn Fablet <[email protected]>
+
+ Remove allocation of SubresourceLoader::m_requestCountTracker
+ https://bugs.webkit.org/show_bug.cgi?id=158255
+
+ Reviewed by Chris Dumez.
+
+ No change of behavior.
+
+ Making m_requestCountTracker an Optional in lieu of a unique_ptr.
+ This requires constructing m_requestCountTracker in place so that constructor and destructor are called only once.
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::SubresourceLoader):
+ (WebCore::SubresourceLoader::didReceiveResponse):
+ (WebCore::SubresourceLoader::notifyDone):
+ * loader/SubresourceLoader.h:
+
2016-06-01 Antti Koivisto <[email protected]>
Remove accidental fprintf.
Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (201555 => 201556)
--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-06-01 16:22:01 UTC (rev 201555)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-06-01 16:58:08 UTC (rev 201556)
@@ -78,7 +78,7 @@
, m_resource(resource)
, m_loadingMultipartContent(false)
, m_state(Uninitialized)
- , m_requestCountTracker(std::make_unique<RequestCountTracker>(frame->document()->cachedResourceLoader(), resource))
+ , m_requestCountTracker(InPlace, frame->document()->cachedResourceLoader(), resource)
{
#ifndef NDEBUG
subresourceLoaderCounter.increment();
@@ -283,7 +283,7 @@
m_loadingMultipartContent = true;
// We don't count multiParts in a CachedResourceLoader's request count
- m_requestCountTracker = nullptr;
+ m_requestCountTracker = Nullopt;
if (!m_resource->isImage()) {
cancel();
return;
@@ -514,7 +514,7 @@
if (reachedTerminalState())
return;
- m_requestCountTracker = nullptr;
+ m_requestCountTracker = Nullopt;
#if PLATFORM(IOS)
m_documentLoader->cachedResourceLoader().loadDone(m_resource, m_state != CancelledWhileInitializing);
#else
Modified: trunk/Source/WebCore/loader/SubresourceLoader.h (201555 => 201556)
--- trunk/Source/WebCore/loader/SubresourceLoader.h 2016-06-01 16:22:01 UTC (rev 201555)
+++ trunk/Source/WebCore/loader/SubresourceLoader.h 2016-06-01 16:58:08 UTC (rev 201556)
@@ -125,7 +125,7 @@
CachedResource* m_resource;
bool m_loadingMultipartContent;
SubresourceLoaderState m_state;
- std::unique_ptr<RequestCountTracker> m_requestCountTracker;
+ Optional<RequestCountTracker> m_requestCountTracker;
RefPtr<SecurityOrigin> m_origin;
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
