components/printing/renderer/print_web_view_helper.cc - Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments for tests + merge blink/cr changes. Created 5 years, 3 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

« components/html_viewer/replicated_frame_state.h ('K') | « components/html_viewer/replicated_frame_state.cc ('k') | content/browser/DEPS » ('j') | content/browser/frame_host/frame_tree_node.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 27419d64229f4f3ba535f6f8091174a1628a156f..ba7ebe527c950e25bd7ee125d96e0e8f85f8e072 100644

--- a/components/printing/renderer/print_web_view_helper.cc

+++ b/components/printing/renderer/print_web_view_helper.cc

@@ -32,6 +32,7 @@

#include "third_party/WebKit/public/web/WebDocument.h"

#include "third_party/WebKit/public/web/WebElement.h"

#include "third_party/WebKit/public/web/WebFrameClient.h"

+#include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"

#include "third_party/WebKit/public/web/WebLocalFrame.h"

#include "third_party/WebKit/public/web/WebPlugin.h"

#include "third_party/WebKit/public/web/WebPluginDocument.h"

@@ -595,8 +596,9 @@ class PrepareFrameAndViewForPrint : public blink::WebViewClient,

blink::WebLocalFrame* parent,

blink::WebTreeScopeType scope,

const blink::WebString& name,

- blink::WebSandboxFlags sandboxFlags) override;

- void frameDetached(blink::WebFrame* frame, DetachType type) override;

+ blink::WebSandboxFlags sandboxFlags,

+ const blink::WebFrameOwnerProperties& frameOwnerProperties) override;

+ virtual void frameDetached(blink::WebFrame* frame, DetachType type);

alexmos 2015/10/02 21:24:19 why the override->virtual change on frameDetached?

lazyboy 2015/10/05 22:16:08 Think this noise was introduced during merge, fixe

void CallOnReady();

void ResizeForPrinting();

@@ -738,7 +740,8 @@ blink::WebFrame* PrepareFrameAndViewForPrint::createChildFrame(

blink::WebLocalFrame* parent,

blink::WebTreeScopeType scope,

const blink::WebString& name,

- blink::WebSandboxFlags sandboxFlags) {

+ blink::WebSandboxFlags sandboxFlags,

+ const blink::WebFrameOwnerProperties& frameOwnerProperties) {

blink::WebFrame* frame = blink::WebLocalFrame::create(scope, this);

parent->appendChild(frame);

return frame;