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

Unified Diff: Source/core/fetch/ResourceFetcher.cpp

Issue 976263002: HTML Imports: Teach preloader about HTML Imports. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: update Created 5 years, 6 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/core/fetch/ResourceFetcher.cpp
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
index 1fd1930a0f76405498476a9932ed330311c817e0..e6c18a1ac9a4ffd11cfd2920d8c9b610ebfa5ba5 100644
--- a/Source/core/fetch/ResourceFetcher.cpp
+++ b/Source/core/fetch/ResourceFetcher.cpp
@@ -941,10 +941,10 @@ void ResourceFetcher::preload(Resource::Type type, FetchRequest& request, const
if (type == Resource::MainResource)
return;
- ASSERT(type == Resource::Script || type == Resource::CSSStyleSheet || type == Resource::Image);
+ ASSERT(type == Resource::Script || type == Resource::CSSStyleSheet || type == Resource::Image || type == Resource::ImportResource);
String encoding;
- if (type == Resource::Script || type == Resource::CSSStyleSheet) {
+ if (type == Resource::Script || type == Resource::CSSStyleSheet || type == Resource::ImportResource) {
encoding = charset.isEmpty() ? context().charset() : charset;
// RequestContext for Resource::Image is set in fetchImage below.

Powered by Google App Engine
This is Rietveld 408576698