Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8820)

Unified Diff: chrome/renderer/printing/print_web_view_helper.cc

Issue 837283003: Start replicating sandbox flags for OOPIF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/frame_host/frame_tree_node.h » ('j') | content/common/frame_messages.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/printing/print_web_view_helper.cc
diff --git a/chrome/renderer/printing/print_web_view_helper.cc b/chrome/renderer/printing/print_web_view_helper.cc
index f038ed665eab5232fe2a008389d9fdbaf4e358c2..d47217ec55a24b06b9cf0daca9bba1a21aa9f409 100644
--- a/chrome/renderer/printing/print_web_view_helper.cc
+++ b/chrome/renderer/printing/print_web_view_helper.cc
@@ -40,6 +40,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"
@@ -586,8 +587,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:
@@ -730,9 +737,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::WebSandboxNone);
+}
+
+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;
« no previous file with comments | « no previous file | content/browser/frame_host/frame_tree_node.h » ('j') | content/common/frame_messages.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698