Chromium Code Reviews| Index: android_webview/renderer/aw_render_view_ext.cc |
| diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc |
| index 8452b458f05621bfd606c004db669942927a94ac..8f1b8b0eca3fc9d903cf277d59cb486512d524d6 100644 |
| --- a/android_webview/renderer/aw_render_view_ext.cc |
| +++ b/android_webview/renderer/aw_render_view_ext.cc |
| @@ -34,6 +34,15 @@ namespace android_webview { |
| namespace { |
| +bool allowMixedContent(const WebKit::WebURL& url) { |
|
joth
2013/06/13 19:16:28
nit: wrong Camelification
|
| + // We treat non-standard schemes as "secure" in the WebView to allow them to |
| + // be used for request interception. |
| + // TODO(benm): Tighten this restriction by requiring embedders to register |
| + // their custom schemes? See b/9420953. |
| + GURL gurl(url); |
| + return !gurl.IsStandard(); |
| +} |
| + |
| GURL GetAbsoluteUrl(const WebKit::WebNode& node, const string16& url_fragment) { |
| return GURL(node.document().completeURL(url_fragment)); |
| } |
| @@ -182,6 +191,22 @@ bool AwRenderViewExt::allowImage(WebKit::WebFrame* frame, |
| url.SchemeIs(chrome::kFtpScheme)); |
| } |
| +bool AwRenderViewExt::allowDisplayingInsecureContent( |
| + WebKit::WebFrame* frame, |
| + bool enabled_per_settings, |
| + const WebKit::WebSecurityOrigin& origin, |
| + const WebKit::WebURL& url) { |
| + return enabled_per_settings ? true : allowMixedContent(url); |
| +} |
| + |
| +bool AwRenderViewExt::allowRunningInsecureContent( |
| + WebKit::WebFrame* frame, |
| + bool enabled_per_settings, |
| + const WebKit::WebSecurityOrigin& origin, |
| + const WebKit::WebURL& url) { |
| + return enabled_per_settings ? true : allowMixedContent(url); |
| +} |
| + |
| void AwRenderViewExt::DidCommitProvisionalLoad(WebKit::WebFrame* frame, |
| bool is_new_navigation) { |
| content::DocumentState* document_state = |