Title: [205028] trunk/Source/WebCore
- Revision
- 205028
- Author
- o...@webkit.org
- Date
- 2016-08-26 10:58:46 -0700 (Fri, 26 Aug 2016)
Log Message
Fix the !ENABLE(WEB_TIMING) build
https://bugs.webkit.org/show_bug.cgi?id=161250
Reviewed by Alex Christensen.
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::didFinishLoading):
* loader/cache/CachedResourceLoader.h:
(WebCore::CachedResourceLoader::resourceTimingInformation):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (205027 => 205028)
--- trunk/Source/WebCore/ChangeLog 2016-08-26 17:37:31 UTC (rev 205027)
+++ trunk/Source/WebCore/ChangeLog 2016-08-26 17:58:46 UTC (rev 205028)
@@ -1,3 +1,15 @@
+2016-08-26 Csaba Osztrogonác <o...@webkit.org>
+
+ Fix the !ENABLE(WEB_TIMING) build
+ https://bugs.webkit.org/show_bug.cgi?id=161250
+
+ Reviewed by Alex Christensen.
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::didFinishLoading):
+ * loader/cache/CachedResourceLoader.h:
+ (WebCore::CachedResourceLoader::resourceTimingInformation):
+
2016-08-26 Chris Dumez <cdu...@apple.com>
Trying to access cross-origin Location properties should throw a SecurityError
Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (205027 => 205028)
--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-08-26 17:37:31 UTC (rev 205027)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-08-26 17:58:46 UTC (rev 205028)
@@ -463,8 +463,10 @@
finishTime = monotonicallyIncreasingTime();
m_loadTiming.setResponseEnd(finishTime);
+#if ENABLE(WEB_TIMING)
if (m_documentLoader->cachedResourceLoader().document() && RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
m_documentLoader->cachedResourceLoader().resourceTimingInformation().addResourceTiming(m_resource, *m_documentLoader->cachedResourceLoader().document(), m_resource->loader()->loadTiming());
+#endif
m_state = Finishing;
m_resource->setLoadFinishTime(finishTime);
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (205027 => 205028)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2016-08-26 17:37:31 UTC (rev 205027)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2016-08-26 17:58:46 UTC (rev 205028)
@@ -140,7 +140,9 @@
void documentDidFinishLoadEvent();
+#if ENABLE(WEB_TIMING)
ResourceTimingInformation& resourceTimingInformation() { return m_resourceTimingInfo; }
+#endif
private:
explicit CachedResourceLoader(DocumentLoader*);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
