diff options
| author | sanjoy.pal@samsung.com <sanjoy.pal@samsung.com> | 2015-06-08 11:08:05 +0000 |
|---|---|---|
| committer | sanjoy.pal@samsung.com <sanjoy.pal@samsung.com> | 2015-06-08 11:08:05 +0000 |
| commit | 52141a3c66fcab1c94b090e7d08b60253a0350cf (patch) | |
| tree | 303337ca8a59f3226bb6822d5d7ce9e8cbca3d85 /third_party | |
| parent | 4ad631bc4443438c89b92be2f7df33392cf5f316 (diff) | |
| download | chromium_src-52141a3c66fcab1c94b090e7d08b60253a0350cf.zip chromium_src-52141a3c66fcab1c94b090e7d08b60253a0350cf.tar.gz chromium_src-52141a3c66fcab1c94b090e7d08b60253a0350cf.tar.bz2 | |
scheduleArchiveLoad should return false if archived resource is not available.
scheduleArchiveLoad should return false if archived resource is not available in the archive.
BUG=492041
Review URL: https://codereview.chromium.org/1156663005
git-svn-id: svn://svn.chromium.org/blink/trunk@196665 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party')
3 files changed, 43 insertions, 1 deletions
diff --git a/third_party/WebKit/LayoutTests/mhtml/resource_not_in_archive-expected.html b/third_party/WebKit/LayoutTests/mhtml/resource_not_in_archive-expected.html new file mode 100644 index 0000000..29e248b --- /dev/null +++ b/third_party/WebKit/LayoutTests/mhtml/resource_not_in_archive-expected.html @@ -0,0 +1,15 @@ +<!DOCTYPE html> +<html> +<head> +<style> +body { + background-image: url("http://localhost/resources/red_square.png"); +} +</style> +</head> +<body> + +<h1>Background should be red in color.</h1> + +</body> +</html> diff --git a/third_party/WebKit/LayoutTests/mhtml/resource_not_in_archive.mht b/third_party/WebKit/LayoutTests/mhtml/resource_not_in_archive.mht new file mode 100644 index 0000000..374472e --- /dev/null +++ b/third_party/WebKit/LayoutTests/mhtml/resource_not_in_archive.mht @@ -0,0 +1,27 @@ +From: <Saved by WebKit>
+Subject:
+Date: Mon, 5 Apr 2015 18:24:52 -0000
+MIME-Version: 1.0
+Content-Type: MULTIPART/RELATED;
+ type="text/html";
+ boundary="----=_NextPart_000_47B2_8E62210C.84C5CCF5"
+
+------=_NextPart_000_47B2_8E62210C.84C5CCF5
+Content-Type: text/html
+Content-Transfer-Encoding: quoted-printable
+Content-Location: http://localhost/resource_not_in_archive-expected.html
+
+<!DOCTYPE html><html><head><meta charset=3D"ISO-8859-1">
+<style>
+body {
+ background-image: url("http://localhost/resources/red_square.png");
+}
+</style>
+</head>
+<body>
+
+<h1>Background should be red in color.</h1>
+
+
+</body></html>
+------=_NextPart_000_47B2_8E62210C.84C5CCF5--
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp index 1fd1930..dc146e5 100644 --- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp +++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp @@ -1019,7 +1019,7 @@ bool ResourceFetcher::scheduleArchiveLoad(Resource* resource, const ResourceRequ ArchiveResource* archiveResource = m_archiveResourceCollection->archiveResourceForURL(request.url()); if (!archiveResource) { resource->error(Resource::LoadError); - return true; + return false; } resource->setLoading(true); |