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

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2653963002: [Experimental] Supporting OOPIF printing
Patch Set: Rename service, fix for webview, and connect to DiscardableMemoryManager Created 3 years, 9 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 | « skia/ext/skia_utils_base.cc ('k') | third_party/WebKit/Source/core/frame/RemoteFrameClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index 588507c25ae389c0e2c4265b702a8840cdae3b48..4edfb426b2477fa272d9dc3c18d5c454a6c2491f 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -614,8 +614,9 @@ bool LocalFrame::shouldUsePrintingLayout() const {
// Only top frame being printed should be fit to page size.
// Subframes should be constrained by parents only.
return document()->printing() &&
- (!tree().parent() || !tree().parent()->isLocalFrame() ||
- !toLocalFrame(tree().parent())->document()->printing());
+ (!tree().parent() ||
+ (tree().parent()->isLocalFrame() &&
+ !toLocalFrame(tree().parent())->document()->printing()));
}
FloatSize LocalFrame::resizePageRectsKeepingRatio(
« no previous file with comments | « skia/ext/skia_utils_base.cc ('k') | third_party/WebKit/Source/core/frame/RemoteFrameClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698