Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: Source/WebCore/loader/cache/CachedResourceLoader.cpp

Issue 13839016: Remove CSS_SHADERS compile-time flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/loader/cache/CachedResourceLoader.cpp
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
index eeffbe7789fdb55d374b47785dbcd4168c33af11..132496aaf80bf6d4546b1b3f3a7b6564928e4ba2 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
@@ -61,9 +61,7 @@
#include "CachedTextTrack.h"
#endif
-#if ENABLE(CSS_SHADERS)
#include "CachedShader.h"
-#endif
#if ENABLE(RESOURCE_TIMING)
#include "Performance.h"
@@ -105,10 +103,8 @@ static CachedResource* createResource(CachedResource::Type type, ResourceRequest
case CachedResource::TextTrackResource:
return new CachedTextTrack(request);
#endif
-#if ENABLE(CSS_SHADERS)
case CachedResource::ShaderResource:
return new CachedShader(request);
-#endif
}
ASSERT_NOT_REACHED();
return 0;
@@ -182,12 +178,10 @@ CachedResourceHandle<CachedTextTrack> CachedResourceLoader::requestTextTrack(Cac
}
#endif
-#if ENABLE(CSS_SHADERS)
CachedResourceHandle<CachedShader> CachedResourceLoader::requestShader(CachedResourceRequest& request)
{
return static_cast<CachedShader*>(requestResource(CachedResource::ShaderResource, request).get());
}
-#endif
CachedResourceHandle<CachedCSSStyleSheet> CachedResourceLoader::requestCSSStyleSheet(CachedResourceRequest& request)
{
@@ -274,9 +268,7 @@ bool CachedResourceLoader::checkInsecureContent(CachedResource::Type type, const
#if ENABLE(VIDEO_TRACK)
case CachedResource::TextTrackResource:
#endif
-#if ENABLE(CSS_SHADERS)
case CachedResource::ShaderResource:
-#endif
case CachedResource::RawResource:
case CachedResource::ImageResource:
case CachedResource::FontResource: {
@@ -328,9 +320,7 @@ bool CachedResourceLoader::canRequest(CachedResource::Type type, const KURL& url
#if ENABLE(VIDEO_TRACK)
case CachedResource::TextTrackResource:
#endif
-#if ENABLE(CSS_SHADERS)
case CachedResource::ShaderResource:
-#endif
// These types of resources can be loaded from any origin.
// FIXME: Are we sure about CachedResource::FontResource?
break;
@@ -366,10 +356,8 @@ bool CachedResourceLoader::canRequest(CachedResource::Type type, const KURL& url
}
}
break;
-#if ENABLE(CSS_SHADERS)
case CachedResource::ShaderResource:
// Since shaders are referenced from CSS Styles use the same rules here.
-#endif
case CachedResource::CSSStyleSheet:
if (!shouldBypassMainWorldContentSecurityPolicy && !m_document->contentSecurityPolicy()->allowStyleFromSource(url))
return false;

Powered by Google App Engine
This is Rietveld 408576698