Changeset 201556 in webkit

Timestamp:

Jun 1, 2016, 9:58:08 AM (10 years ago)

Author:

youenn.fablet@crf.canon.fr

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/SubresourceLoader.cpp (modified) (3 diffs)
• loader/SubresourceLoader.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-01  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        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  <antti@apple.com>
 

trunk/Source/WebCore/loader/SubresourceLoader.cpp

@@ -79 +79 @@
     , 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
@@ -284 +284 @@
 
         // We don't count multiParts in a CachedResourceLoader's request count
-        m_requestCountTracker = nullptr;
+        m_requestCountTracker = Nullopt;
         if (!m_resource->isImage()) {
             cancel();
@@ -515 +515 @@
         return;
 
-    m_requestCountTracker = nullptr;
+    m_requestCountTracker = Nullopt;
 #if PLATFORM(IOS)
     m_documentLoader->cachedResourceLoader().loadDone(m_resource, m_state != CancelledWhileInitializing);

trunk/Source/WebCore/loader/SubresourceLoader.h

@@ -126 +126 @@
     bool m_loadingMultipartContent;
     SubresourceLoaderState m_state;
-    std::unique_ptr<RequestCountTracker> m_requestCountTracker;
+    Optional<RequestCountTracker> m_requestCountTracker;
     RefPtr<SecurityOrigin> m_origin;
 };