Title: [185841] trunk/Source/WebCore
- Revision
- 185841
- Author
- [email protected]
- Date
- 2015-06-22 13:49:53 -0700 (Mon, 22 Jun 2015)
Log Message
Unreviewed non-mac debug build fix after r185840.
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::willSendRequest):
Added enable flag around assertion.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (185840 => 185841)
--- trunk/Source/WebCore/ChangeLog 2015-06-22 20:10:50 UTC (rev 185840)
+++ trunk/Source/WebCore/ChangeLog 2015-06-22 20:49:53 UTC (rev 185841)
@@ -1,3 +1,11 @@
+2015-06-22 Alex Christensen <[email protected]>
+
+ Unreviewed non-mac debug build fix after r185840.
+
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::willSendRequest):
+ Added enable flag around assertion.
+
2015-06-20 Alex Christensen <[email protected]>
[Content Extensions] Add SPI to reload without content blocking.
Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (185840 => 185841)
--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2015-06-22 20:10:50 UTC (rev 185840)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2015-06-22 20:49:53 UTC (rev 185841)
@@ -293,7 +293,9 @@
Ref<ResourceLoader> protect(*this);
ASSERT(!m_reachedTerminalState);
+#if ENABLE(CONTENT_EXTENSIONS)
ASSERT(m_resourceType != ResourceType::Invalid);
+#endif
if (!frameLoader()) {
didFail(cannotShowURLError());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
