Changeset 219236 in webkit

Timestamp:

Jul 6, 2017 9:15:09 PM (7 years ago)

Author:

Chris Dumez

Message:

Drop unnecessary uses of targetStatistics.dataRecordsRemoved in ResourceLoadObserver
​https://bugs.webkit.org/show_bug.cgi?id=174234

Reviewed by Brent Fulgham.

Drop unnecessary uses of targetStatistics.dataRecordsRemoved in ResourceLoadObserver. It is
always 0 since this member is only initialized later on, in the UIProcess.

• loader/ResourceLoadObserver.cpp:

(WebCore::ResourceLoadObserver::logFrameNavigation):
(WebCore::ResourceLoadObserver::logSubresourceLoading):
(WebCore::ResourceLoadObserver::logWebSocketLoading):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/ResourceLoadObserver.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-06  Chris Dumez  <cdumez@apple.com>
+
+        Drop unnecessary uses of targetStatistics.dataRecordsRemoved in ResourceLoadObserver
+        https://bugs.webkit.org/show_bug.cgi?id=174234
+
+        Reviewed by Brent Fulgham.
+
+        Drop unnecessary uses of targetStatistics.dataRecordsRemoved in ResourceLoadObserver. It is
+        always 0 since this member is only initialized later on, in the UIProcess.
+
+        * loader/ResourceLoadObserver.cpp:
+        (WebCore::ResourceLoadObserver::logFrameNavigation):
+        (WebCore::ResourceLoadObserver::logSubresourceLoading):
+        (WebCore::ResourceLoadObserver::logWebSocketLoading):
+
 2017-07-06  Yoav Weiss  <yoav@yoav.ws>
 

trunk/Source/WebCore/loader/ResourceLoadObserver.cpp

@@ -85 +85 @@
     ASSERT(topFrame.document());
     ASSERT(topFrame.page());
+
+    if (frame.isMainFrame())
+        return;
     
     if (!shouldLog(topFrame.page()))
@@ -110 +113 @@
 
     auto& targetStatistics = ensureResourceStatisticsForPrimaryDomain(targetPrimaryDomain);
-
-    // Always fire if we have previously removed data records for this domain
-    // FIXME: targetStatistics.dataRecordsRemoved is always 0 in WebCore as it gets populated in the UIProcess.
-    bool shouldCallNotificationCallback = targetStatistics.dataRecordsRemoved > 0;
-
-    if (!frame.isMainFrame()) {
-        auto subframeUnderTopFrameOriginsResult = targetStatistics.subframeUnderTopFrameOrigins.add(mainFramePrimaryDomain);
-        if (subframeUnderTopFrameOriginsResult.isNewEntry)
-            shouldCallNotificationCallback = true;
-    }
-
-    if (shouldCallNotificationCallback)
+    auto subframeUnderTopFrameOriginsResult = targetStatistics.subframeUnderTopFrameOrigins.add(mainFramePrimaryDomain);
+    if (subframeUnderTopFrameOriginsResult.isNewEntry)
         scheduleNotificationIfNeeded();
 }
@@ -151 +144 @@
 
     bool shouldCallNotificationCallback = false;
-
     {
         auto& targetStatistics = ensureResourceStatisticsForPrimaryDomain(targetPrimaryDomain);
-
-        // Always fire if we have previously removed data records for this domain
-        // FIXME: targetStatistics.dataRecordsRemoved is always 0 in WebCore as it gets populated in the UIProcess.
-        shouldCallNotificationCallback = targetStatistics.dataRecordsRemoved > 0;
-
-        auto subresourceUnderTopFrameOriginsResult = targetStatistics.subresourceUnderTopFrameOrigins.add(mainFramePrimaryDomain);
-        if (subresourceUnderTopFrameOriginsResult.isNewEntry)
+        if (targetStatistics.subresourceUnderTopFrameOrigins.add(mainFramePrimaryDomain).isNewEntry)
             shouldCallNotificationCallback = true;
     }
@@ -166 +152 @@
     if (isRedirect) {
         auto& redirectingOriginStatistics = ensureResourceStatisticsForPrimaryDomain(sourcePrimaryDomain);
-        auto subresourceUniqueRedirectsToResult = redirectingOriginStatistics.subresourceUniqueRedirectsTo.add(targetPrimaryDomain);
-        if (subresourceUniqueRedirectsToResult.isNewEntry)
+        if (redirectingOriginStatistics.subresourceUniqueRedirectsTo.add(targetPrimaryDomain).isNewEntry)
             shouldCallNotificationCallback = true;
     }
@@ -200 +185 @@
 
     auto& targetStatistics = ensureResourceStatisticsForPrimaryDomain(targetPrimaryDomain);
-
-    // Always fire if we have previously removed data records for this domain
-    // FIXME: targetStatistics.dataRecordsRemoved is always 0 in WebCore as it gets populated in the UIProcess.
-    bool shouldCallNotificationCallback = targetStatistics.dataRecordsRemoved > 0;
-
-    auto subresourceUnderTopFrameOriginsResult = targetStatistics.subresourceUnderTopFrameOrigins.add(mainFramePrimaryDomain);
-    if (subresourceUnderTopFrameOriginsResult.isNewEntry)
-        shouldCallNotificationCallback = true;
-
-    if (shouldCallNotificationCallback)
+    if (targetStatistics.subresourceUnderTopFrameOrigins.add(mainFramePrimaryDomain).isNewEntry)
         scheduleNotificationIfNeeded();
 }