Title: [200324] trunk/Source/WebCore
- Revision
- 200324
- Author
- [email protected]
- Date
- 2016-05-02 09:21:33 -0700 (Mon, 02 May 2016)
Log Message
Speculatively fix the cmake build
https://bugs.webkit.org/show_bug.cgi?id=157262
Reviewed by Darin Adler.
This patch adds WEB_TIMING build flag guards around calls to DOMWindow()->performance(),
in order to make sure builds that have WEB_TIMING disabled (e.g. cmake on Mac) continue
to build.
No new tests as there's no functional change.
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::loadDone):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (200323 => 200324)
--- trunk/Source/WebCore/ChangeLog 2016-05-02 16:15:57 UTC (rev 200323)
+++ trunk/Source/WebCore/ChangeLog 2016-05-02 16:21:33 UTC (rev 200324)
@@ -1,3 +1,19 @@
+2016-05-02 Yoav Weiss <[email protected]>
+
+ Speculatively fix the cmake build
+ https://bugs.webkit.org/show_bug.cgi?id=157262
+
+ Reviewed by Darin Adler.
+
+ This patch adds WEB_TIMING build flag guards around calls to DOMWindow()->performance(),
+ in order to make sure builds that have WEB_TIMING disabled (e.g. cmake on Mac) continue
+ to build.
+
+ No new tests as there's no functional change.
+
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::loadDone):
+
2016-05-02 Daniel Bates <[email protected]>
CSP: Add workaround for XtraMath
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (200323 => 200324)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-05-02 16:15:57 UTC (rev 200323)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-05-02 16:21:33 UTC (rev 200324)
@@ -969,6 +969,7 @@
RefPtr<DocumentLoader> protectDocumentLoader(m_documentLoader);
RefPtr<Document> protectDocument(m_document);
+#if ENABLE(WEB_TIMING)
if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled()
&& resource && resource->response().isHTTP()
&& ((!resource->errorOccurred() && !resource->wasCanceled()) || resource->response().httpStatusCode() == 304)) {
@@ -984,6 +985,7 @@
m_initiatorMap.remove(initiatorIt);
}
}
+#endif
if (frame())
frame()->loader().loadDone();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
