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

Side by Side Diff: components/printing/renderer/print_web_view_helper.cc

Issue 797813006: Replicate sandbox flags for OOPIF (Chromium part 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@iframe-sandbox-flags-part1
Patch Set: Rebase 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/printing/renderer/print_web_view_helper.h" 5 #include "components/printing/renderer/print_web_view_helper.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 // TODO(ojan): Remove this override and have this class use a non-null 564 // TODO(ojan): Remove this override and have this class use a non-null
565 // layerTreeView. 565 // layerTreeView.
566 // blink::WebViewClient override: 566 // blink::WebViewClient override:
567 virtual bool allowsBrokenNullLayerTreeView() const; 567 virtual bool allowsBrokenNullLayerTreeView() const;
568 568
569 protected: 569 protected:
570 // blink::WebViewClient override: 570 // blink::WebViewClient override:
571 virtual void didStopLoading(); 571 virtual void didStopLoading();
572 572
573 // blink::WebFrameClient override: 573 // blink::WebFrameClient override:
574 // TODO(alexmos): Remove once Blink is updated to use sandbox flags.
575 virtual blink::WebFrame* createChildFrame(
576 blink::WebLocalFrame* parent,
577 const blink::WebString& name);
578 virtual blink::WebFrame* createChildFrame( 574 virtual blink::WebFrame* createChildFrame(
579 blink::WebLocalFrame* parent, 575 blink::WebLocalFrame* parent,
580 const blink::WebString& name, 576 const blink::WebString& name,
581 blink::WebSandboxFlags sandboxFlags); 577 blink::WebSandboxFlags sandboxFlags);
582 virtual void frameDetached(blink::WebFrame* frame); 578 virtual void frameDetached(blink::WebFrame* frame);
583 579
584 private: 580 private:
585 void CallOnReady(); 581 void CallOnReady();
586 void ResizeForPrinting(); 582 void ResizeForPrinting();
587 void RestoreSize(); 583 void RestoreSize();
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 void PrepareFrameAndViewForPrint::didStopLoading() { 710 void PrepareFrameAndViewForPrint::didStopLoading() {
715 DCHECK(!on_ready_.is_null()); 711 DCHECK(!on_ready_.is_null());
716 // Don't call callback here, because it can delete |this| and WebView that is 712 // Don't call callback here, because it can delete |this| and WebView that is
717 // called didStopLoading. 713 // called didStopLoading.
718 base::MessageLoop::current()->PostTask( 714 base::MessageLoop::current()->PostTask(
719 FROM_HERE, 715 FROM_HERE,
720 base::Bind(&PrepareFrameAndViewForPrint::CallOnReady, 716 base::Bind(&PrepareFrameAndViewForPrint::CallOnReady,
721 weak_ptr_factory_.GetWeakPtr())); 717 weak_ptr_factory_.GetWeakPtr()));
722 } 718 }
723 719
724 // TODO(alexmos): Remove once Blink is updated to use sandbox flags.
725 blink::WebFrame* PrepareFrameAndViewForPrint::createChildFrame(
726 blink::WebLocalFrame* parent,
727 const blink::WebString& name) {
728 return createChildFrame(parent, name, blink::WebSandboxFlags::None);
729 }
730
731 blink::WebFrame* PrepareFrameAndViewForPrint::createChildFrame( 720 blink::WebFrame* PrepareFrameAndViewForPrint::createChildFrame(
732 blink::WebLocalFrame* parent, 721 blink::WebLocalFrame* parent,
733 const blink::WebString& name, 722 const blink::WebString& name,
734 blink::WebSandboxFlags sandboxFlags) { 723 blink::WebSandboxFlags sandboxFlags) {
735 blink::WebFrame* frame = blink::WebLocalFrame::create(this); 724 blink::WebFrame* frame = blink::WebLocalFrame::create(this);
736 parent->appendChild(frame); 725 parent->appendChild(frame);
737 return frame; 726 return frame;
738 } 727 }
739 728
740 void PrepareFrameAndViewForPrint::frameDetached(blink::WebFrame* frame) { 729 void PrepareFrameAndViewForPrint::frameDetached(blink::WebFrame* frame) {
(...skipping 1302 matching lines...) Expand 10 before | Expand all | Expand 10 after
2043 blink::WebConsoleMessage::LevelWarning, message)); 2032 blink::WebConsoleMessage::LevelWarning, message));
2044 return false; 2033 return false;
2045 } 2034 }
2046 2035
2047 void PrintWebViewHelper::ScriptingThrottler::Reset() { 2036 void PrintWebViewHelper::ScriptingThrottler::Reset() {
2048 // Reset counter on successful print. 2037 // Reset counter on successful print.
2049 count_ = 0; 2038 count_ = 0;
2050 } 2039 }
2051 2040
2052 } // namespace printing 2041 } // namespace printing
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/frame_tree_browsertest.cc » ('j') | content/browser/site_per_process_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698