Chromium Code Reviews| Index: components/printing/renderer/print_web_view_helper.cc |
| diff --git a/components/printing/renderer/print_web_view_helper.cc b/components/printing/renderer/print_web_view_helper.cc |
| index 4c9368b8fec3e1d9aebc9b8cf7ba28596c8502d9..2027778795efa58f728938b8d7efe93ca14001f5 100644 |
| --- a/components/printing/renderer/print_web_view_helper.cc |
| +++ b/components/printing/renderer/print_web_view_helper.cc |
| @@ -36,6 +36,7 @@ |
| #include "third_party/WebKit/public/web/WebPrintParams.h" |
| #include "third_party/WebKit/public/web/WebPrintPresetOptions.h" |
| #include "third_party/WebKit/public/web/WebPrintScalingOption.h" |
| +#include "third_party/WebKit/public/web/WebSandboxFlags.h" |
| #include "third_party/WebKit/public/web/WebScriptSource.h" |
| #include "third_party/WebKit/public/web/WebSettings.h" |
| #include "third_party/WebKit/public/web/WebView.h" |
| @@ -570,8 +571,14 @@ class PrepareFrameAndViewForPrint : public blink::WebViewClient, |
| virtual void didStopLoading(); |
| // blink::WebFrameClient override: |
| - virtual blink::WebFrame* createChildFrame(blink::WebLocalFrame* parent, |
| - const blink::WebString& name); |
| + // TODO(alexmos): Remove once Blink is updated to use sandbox flags. |
| + virtual blink::WebFrame* createChildFrame( |
| + blink::WebLocalFrame* parent, |
| + const blink::WebString& name); |
| + virtual blink::WebFrame* createChildFrame( |
| + blink::WebLocalFrame* parent, |
| + const blink::WebString& name, |
| + blink::WebSandboxFlags sandboxFlags); |
| virtual void frameDetached(blink::WebFrame* frame); |
| private: |
| @@ -714,9 +721,17 @@ void PrepareFrameAndViewForPrint::didStopLoading() { |
| weak_ptr_factory_.GetWeakPtr())); |
| } |
| +// TODO(alexmos): Remove once Blink is updated to use sandbox flags. |
| blink::WebFrame* PrepareFrameAndViewForPrint::createChildFrame( |
| blink::WebLocalFrame* parent, |
| const blink::WebString& name) { |
| + return createChildFrame(parent, name, blink::WebSandboxFlags::None); |
|
nasko
2015/01/15 19:59:11
I wonder if printing rendering allows for executin
alexmos
2015/01/15 21:53:51
Well, this method will go away once the next Blink
|
| +} |
| + |
| +blink::WebFrame* PrepareFrameAndViewForPrint::createChildFrame( |
| + blink::WebLocalFrame* parent, |
| + const blink::WebString& name, |
| + blink::WebSandboxFlags sandboxFlags) { |
| blink::WebFrame* frame = blink::WebLocalFrame::create(this); |
| parent->appendChild(frame); |
| return frame; |