fix to normalize with the old version

Author: mnutt

Source/WebCore/PlatformQt.cmake

@@ -90,7 +90,6 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     platform/qt/QStyleFacade.h
     platform/qt/QStyleHelpers.h
     platform/qt/QWebPageClient.h
-    platform/qt/ResourceLoadTrackerQt.h
     platform/qt/RenderThemeQt.h
     platform/qt/RenderThemeQStyle.h
     platform/qt/ScrollbarThemeQStyle.h
@@ -207,7 +206,6 @@ list(APPEND WebCore_SOURCES
     platform/qt/RenderThemeQStyle.cpp
     platform/qt/RenderThemeQt.cpp
     platform/qt/RenderThemeQtMobile.cpp
-    platform/qt/ResourceLoadTrackerQt.cpp
     platform/qt/ScrollViewQt.cpp
     platform/qt/ScrollbarThemeQStyle.cpp
     platform/qt/ScrollbarThemeQt.cpp
@@ -239,7 +237,6 @@ QTWEBKIT_GENERATE_MOC_FILES_H(WebCore
     platform/network/qt/QNetworkReplyHandler.h
     platform/network/qt/QtMIMETypeSniffer.h
     platform/network/qt/SharedCookieJarQt.h
-    platform/qt/ResourceLoadTrackerQt.h
 )
 
 QTWEBKIT_GENERATE_MOC_FILE_H(WebCore platform/network/qt/NetworkStateNotifierPrivate.h platform/network/qt/NetworkStateNotifierQt.cpp)

Source/WebCore/loader/DocumentThreadableLoader.cpp

@@ -474,6 +474,12 @@ void DocumentThreadableLoader::notifyFinished(CachedResource& resource, const Ne
     ASSERT(m_client);
     ASSERT_UNUSED(resource, &resource == m_resource);
 
+#if PLATFORM(QT)
+    LocalFrame* localFrame = document().frame();
+    if (localFrame)
+        localFrame->loader().client().dispatchDidFinishResourceLoad(resource);    
+#endif    
+
     if (m_resource->errorOccurred())
         didFail(m_resource->resourceLoaderIdentifier(), m_resource->resourceError());
     else
@@ -595,6 +601,13 @@ void DocumentThreadableLoader::loadRequest(ResourceRequest&& request, SecurityCh
 
         auto cachedResource = m_document->protectedCachedResourceLoader()->requestRawResource(WTFMove(newRequest));
         m_resource = cachedResource.value_or(nullptr);
+
+#if PLATFORM(QT)
+        LocalFrame* localFrame = document().frame();
+        if (localFrame && m_resource.get())
+            localFrame->loader().client().dispatchDidStartResourceLoad(*m_resource.get());
+#endif
+
         if (CachedResourceHandle resource = m_resource)
             resource->addClient(*this);
         else

Source/WebCore/loader/ImageLoader.cpp

@@ -469,6 +469,12 @@ void ImageLoader::notifyFinished(CachedResource& resource, const NetworkLoadMetr
 {
     LOG_WITH_STREAM(LazyLoading, stream << "ImageLoader " << this << " notifyFinished - hasPendingLoadEvent " << m_hasPendingLoadEvent);
 
+#if PLATFORM(QT)
+    LocalFrame* localFrame = element().document().frame();
+    if (localFrame)
+        localFrame->loader().client().dispatchDidFinishResourceLoad(resource);
+#endif
+
     ASSERT(m_failedLoadURL.isEmpty());
     ASSERT_UNUSED(resource, &resource == m_image.get());
 
@@ -690,6 +696,12 @@ void ImageLoader::dispatchPendingBeforeLoadEvent()
         return;
     if (!element().document().hasLivingRenderTree())
         return;
+#if PLATFORM(QT)
+    LocalFrame* localFrame = element().document().frame();
+    if (localFrame)
+        localFrame->loader().client().dispatchDidStartResourceLoad(*m_image.get());
+#endif
+
     m_hasPendingBeforeLoadEvent = false;
     if (!element().isConnected())
         return;

Source/WebCore/loader/LocalFrameLoaderClient.h

@@ -41,6 +41,10 @@
 #include <wtf/WeakRef.h>
 #include <wtf/text/WTFString.h>
 
+#if PLATFORM(QT)
+#include "CachedResource.h"
+#endif
+
 #if ENABLE(APPLICATION_MANIFEST)
 #include "ApplicationManifest.h"
 #endif
@@ -160,6 +164,10 @@ class WEBCORE_EXPORT LocalFrameLoaderClient : public FrameLoaderClient {
     virtual void dispatchDidFinishLoading(DocumentLoader*, IsMainResourceLoad, ResourceLoaderIdentifier) = 0;
     virtual void dispatchDidFailLoading(DocumentLoader*, IsMainResourceLoad, ResourceLoaderIdentifier, const ResourceError&) = 0;
     virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length) = 0;
+#if PLATFORM(QT)
+    virtual void dispatchDidStartResourceLoad(const CachedResource&) { }
+    virtual void dispatchDidFinishResourceLoad(const CachedResource&) { }
+#endif
 
     virtual void dispatchDidDispatchOnloadEvents() = 0;
     virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() = 0;

Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -93,9 +93,6 @@
 #include <wtf/text/MakeString.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(QT)
-#include "ResourceLoadTrackerQt.h"
-#endif
 
 #if ENABLE(APPLICATION_MANIFEST)
 #include "CachedApplicationManifest.h"
@@ -1126,10 +1123,6 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
 
     LOG(ResourceLoading, "CachedResourceLoader::requestResource '%.255s', charset '%s', priority=%d, forPreload=%u", url.stringCenterEllipsizedToLength().latin1().data(), request.charset().latin1().data(), request.priority() ? static_cast<int>(request.priority().value()) : -1, forPreload == ForPreload::Yes);
 
-#if PLATFORM(QT)
-    ResourceLoadTrackerQt::instance().trackRequestStarted(url, type, request, frame.ptr());
-#endif
-
     request.setDestinationIfNotSet(destinationForType(type, frame));
 
     // Entry point to https://fetch.spec.whatwg.org/#main-fetch.
@@ -1350,9 +1343,6 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
                 if (auto metricsFromResource = resource->takeNetworkLoadMetrics(); metricsFromResource && documentLoader && metricsFromResource->redirectStart >= documentLoader->timing().timeOrigin())
                     metrics = WTFMove(metricsFromResource);
                 auto resourceTiming = ResourceTiming::fromMemoryCache(url, request.initiatorType(), loadTiming, resource->response(), metrics ? *metrics : NetworkLoadMetrics::emptyMetrics(), *request.protectedOrigin());
-#if PLATFORM(QT)
-                ResourceLoadTrackerQt::instance().trackMemoryCacheHit(url, resource->encodedSize(), metrics ? *metrics : NetworkLoadMetrics::emptyMetrics(), frame.ptr());
-#endif
                 if (initiatorContext == InitiatorContext::Worker)
                     downcast<CachedRawResource>(resource.get())->finishedTimingForWorkerLoad(WTFMove(resourceTiming));
                 else {
@@ -1805,10 +1795,6 @@ void CachedResourceLoader::decrementRequestCount(const CachedResource& resource)
 
     --m_requestCount;
     ASSERT(m_requestCount > -1);
-
-#if PLATFORM(QT)
-    ResourceLoadTrackerQt::instance().trackRequestFinished(resource, frame());
-#endif
 }
 
 void CachedResourceLoader::notifyFinished(const CachedResource& resource)