webkit/appcache/appcache_update_job.cc - Issue 8949001: Fix some loose ends around recently introduced AppCache INTERCEPT namespaces

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/appcache/appcache_update_job.cc

Issue 8949001: Fix some loose ends around recently introduced AppCache INTERCEPT namespaces (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 8 years, 12 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:

Index: webkit/appcache/appcache_update_job.cc

===================================================================

--- webkit/appcache/appcache_update_job.cc (revision 116156)

+++ webkit/appcache/appcache_update_job.cc (working copy)

@@ -553,7 +553,7 @@

// TODO(michaeln): Check for <html manifest=xxx>

// See http://code.google.com/p/chromium/issues/detail?id=97930

- // if (entry.IsMaster() && !entry.IsExplicit())

+ // if (entry.IsMaster() && !(entry.IsExplicit() || fallback || intercept))

// if (!manifestAttribute) skip it

// Foreign entries will be detected during cache selection.

@@ -565,7 +565,7 @@

VLOG(1) << "Request status: " << request->status().status()

<< " error: " << request->status().error()

<< " response code: " << response_code;

- if (entry.IsExplicit() || entry.IsFallback()) {

+ if (entry.IsExplicit() || entry.IsFallback() || entry.IsIntercept()) {

if (response_code == 304 && fetcher->existing_entry().has_response_id()) {

// Keep the existing response.

entry.set_response_id(fetcher->existing_entry().response_id());

@@ -977,9 +977,8 @@

// If the resource URL being processed was flagged as neither an

// "explicit entry" nor or a "fallback entry", then the user agent

// may skip this URL.

- if (entry.IsExplicit() || entry.IsFallback()) {

+ if (entry.IsExplicit() || entry.IsFallback() || entry.IsIntercept())

return false;

- }

// TODO(jennb): decide if entry should be skipped to expire it from cache

return false;