[webkit-changes] [201018] trunk/Source/WebCore

Tue, 17 May 2016 10:08:14 -0700

Title: [201018] trunk/Source/WebCore
Revision
201018
Author
[email protected]
Date
2016-05-17 10:07:19 -0700 (Tue, 17 May 2016)

Log Message

Fix the !ENABLE(WEB_TIMING) build after r200887
https://bugs.webkit.org/show_bug.cgi?id=157796

Reviewed by Chris Dumez.

* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::didFinishLoading):
(WebCore::DocumentThreadableLoader::loadRequest):
* loader/DocumentThreadableLoader.h:
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestResource):
(WebCore::CachedResourceLoader::revalidateResource):
(WebCore::CachedResourceLoader::loadResource):
* loader/cache/CachedResourceLoader.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (201017 => 201018)


--- trunk/Source/WebCore/ChangeLog	2016-05-17 17:03:28 UTC (rev 201017)
+++ trunk/Source/WebCore/ChangeLog	2016-05-17 17:07:19 UTC (rev 201018)
@@ -1,3 +1,20 @@
+2016-05-17  Csaba Osztrogonác  <[email protected]>
+
+        Fix the !ENABLE(WEB_TIMING) build after r200887
+        https://bugs.webkit.org/show_bug.cgi?id=157796
+
+        Reviewed by Chris Dumez.
+
+        * loader/DocumentThreadableLoader.cpp:
+        (WebCore::DocumentThreadableLoader::didFinishLoading):
+        (WebCore::DocumentThreadableLoader::loadRequest):
+        * loader/DocumentThreadableLoader.h:
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::requestResource):
+        (WebCore::CachedResourceLoader::revalidateResource):
+        (WebCore::CachedResourceLoader::loadResource):
+        * loader/cache/CachedResourceLoader.h:
+
 2016-05-17  Myles C. Maxfield  <[email protected]>
 
         REGRESSION(r54729): Line breaking in complex mixed-direction text is inconsistent across page refreshes

Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (201017 => 201018)


--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp	2016-05-17 17:03:28 UTC (rev 201017)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp	2016-05-17 17:07:19 UTC (rev 201018)
@@ -325,8 +325,10 @@
 
 void DocumentThreadableLoader::didFinishLoading(unsigned long identifier, double finishTime)
 {
+#if ENABLE(WEB_TIMING)
     if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
         m_resourceTimingInfo.addResourceTiming(m_resource.get(), &m_document);
+#endif
 
     if (m_actualRequest) {
         InspectorInstrumentation::didFinishLoading(m_document.frame(), m_document.frame()->loader().documentLoader(), identifier, finishTime);
@@ -396,8 +398,10 @@
         if (m_resource) {
             m_resource->addClient(this);
 
+#if ENABLE(WEB_TIMING)
             if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
                 m_resourceTimingInfo.storeResourceTimingInitiatorInformation(m_resource, newRequest, m_document.frame());
+#endif
         }
 
         return;

Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.h (201017 => 201018)


--- trunk/Source/WebCore/loader/DocumentThreadableLoader.h	2016-05-17 17:03:28 UTC (rev 201017)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.h	2016-05-17 17:07:19 UTC (rev 201018)
@@ -106,7 +106,9 @@
         ThreadableLoaderClient* m_client;
         Document& m_document;
         ThreadableLoaderOptions m_options;
+#if ENABLE(WEB_TIMING)
         ResourceTimingInformation m_resourceTimingInfo;
+#endif
         bool m_sameOriginRequest;
         bool m_simpleRequest;
         bool m_async;

Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (201017 => 201018)


--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp	2016-05-17 17:03:28 UTC (rev 201017)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp	2016-05-17 17:07:19 UTC (rev 201018)
@@ -618,10 +618,12 @@
             return nullptr;
         logMemoryCacheResourceRequest(frame(), DiagnosticLoggingKeys::inMemoryCacheKey(), DiagnosticLoggingKeys::usedKey());
         memoryCache.resourceAccessed(*resource);
+#if ENABLE(WEB_TIMING)
         if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled()) {
             m_resourceTimingInfo.storeResourceTimingInitiatorInformation(resource, request, frame());
             m_resourceTimingInfo.addResourceTiming(resource.get(), document());
         }
+#endif
         break;
     }
 
@@ -673,8 +675,12 @@
     
     memoryCache.remove(*resource);
     memoryCache.add(*newResource);
+#if ENABLE(WEB_TIMING)
     if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
         m_resourceTimingInfo.storeResourceTimingInitiatorInformation(resource, request, frame());
+#else
+    UNUSED_PARAM(request);
+#endif
     return newResource;
 }
 
@@ -689,8 +695,10 @@
 
     if (request.allowsCaching() && !memoryCache.add(*resource))
         resource->setOwningCachedResourceLoader(this);
+#if ENABLE(WEB_TIMING)
     if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
         m_resourceTimingInfo.storeResourceTimingInitiatorInformation(resource, request, frame());
+#endif
     return resource;
 }

Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (201017 => 201018)


--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h	2016-05-17 17:03:28 UTC (rev 201017)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h	2016-05-17 17:07:19 UTC (rev 201018)
@@ -177,7 +177,9 @@
 
     Timer m_garbageCollectDocumentResourcesTimer;
 
+#if ENABLE(WEB_TIMING)
     ResourceTimingInformation m_resourceTimingInfo;
+#endif
 
     // 29 bits left
     bool m_autoLoadImages : 1;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to