Commit 6fcee33d authored by jochen@chromium.org's avatar jochen@chromium.org

Whitelist unreachable webdata pages for content settings

BUG=125488
TEST=disable JS, go to https://no.such.host/. Should show a regular error page
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/10412053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138464 0039d316-1c4b-4281-b951-d872f2087c98
parent d269bf4f
......@@ -319,6 +319,9 @@ bool ContentSettingsObserver::IsWhitelistedForContentSettings(WebFrame* frame) {
bool ContentSettingsObserver::IsWhitelistedForContentSettings(
const WebSecurityOrigin& origin,
const GURL& document_url) {
if (document_url == GURL(content::kUnreachableWebDataURL))
return true;
if (origin.isUnique())
return false; // Uninitialized document?
......
......@@ -60,7 +60,7 @@ namespace content {
CONTENT_EXPORT extern const char kStandardSchemeSeparator[];
// Special URL used to start a navigation to an error page.
extern const char kUnreachableWebDataURL[];
CONTENT_EXPORT extern const char kUnreachableWebDataURL[];
// Special URL used to swap out a view being rendered by another process.
extern const char kSwappedOutURL[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment