third_party/WebKit/Source/core/frame/LocalFrame.cpp - Issue 2802903002: Move PrintBrowser from SPV2 to SPV1

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

Issue 2802903002: Move PrintBrowser from SPV2 to SPV1 (Closed)

Patch Set: In the case of PrintBrowser PrintContext::end should not relayout. It should retain layout as is. Created 3 years, 8 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

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 b64d75d627f1238ca45956bd77918f23f4ac64a6..401352dd85eadd2f7fcc5837068f143694d8ae9c 100644

--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp

+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp

@@ -600,7 +600,7 @@ void LocalFrame::SetPrinting(bool printing,

if (ShouldUsePrintingLayout()) {

View()->ForceLayoutForPagination(page_size, original_page_size,

maximum_shrink_ratio);

- } else {

+ } else if (!RuntimeEnabledFeatures::printBrowserEnabled()) {

pdr. 2017/04/14 23:28:04 I see what you mean. Hmm... I don't know this code

nainar 2017/04/14 23:43:33 No we want that layout to happen so that we force

pdr. 2017/04/14 23:54:00 Couldn't UpdateLayout get called later? SetPrintin

nainar 2017/04/15 00:13:45 Yup, I see what you mean - we can indeed force a L

Yup, I see what you mean - we can indeed force a Layout update from JS and NeedsLayout is true in UpdateStyleAndLayoutIfNeededRecursive() calling UpdateLayout there too.

Sorry for the giant wall of text... Visiting https://wikipedia.org/wiki/Passports with --enable-print-browser gets you this: [38303:775:0414/165915.090642:275688420149106:FATAL:ThreadState.h(541)] Check failed: !state->SweepForbidden(). 0 libbase.dylib 0x0000000117c5bfae base::debug::StackTrace::StackTrace(unsigned long) + 174 1 libbase.dylib 0x0000000117c5c04d base::debug::StackTrace::StackTrace(unsigned long) + 29 2 libbase.dylib 0x0000000117c5a4ac base::debug::StackTrace::StackTrace() + 28 3 libbase.dylib 0x0000000117cf9130 logging::LogMessage::~LogMessage() + 80 4 libbase.dylib 0x0000000117cf6c35 logging::LogMessage::~LogMessage() + 21 5 libblink_platform.dylib 0x000000012307c318 blink::ThreadState::PrefinalizerRegistration<blink::ResourceFetcher>::PrefinalizerRegistration(blink::ResourceFetcher*) + 360 6 libblink_platform.dylib 0x000000012306e01d blink::ThreadState::PrefinalizerRegistration<blink::ResourceFetcher>::PrefinalizerRegistration(blink::ResourceFetcher*) + 29 7 libblink_platform.dylib 0x000000012306dcbf blink::ResourceFetcher::ResourceFetcher(blink::FetchContext*) + 95 8 libblink_platform.dylib 0x000000012306e3ad blink::ResourceFetcher::ResourceFetcher(blink::FetchContext*) + 29 9 libblink_core.dylib 0x000000012673389b blink::ResourceFetcher::Create(blink::FetchContext*) + 43 10 libblink_core.dylib 0x000000012782a529 blink::FrameFetchContext::CreateFetcherFromDocumentLoader(blink::DocumentLoader*) + 57 11 libblink_core.dylib 0x000000012782a060 blink::DocumentLoader::DocumentLoader(blink::LocalFrame*, blink::ResourceRequest const&, blink::SubstituteData const&, blink::ClientRedirectPolicy) + 208 12 libblink_core.dylib 0x000000012782a675 blink::DocumentLoader::DocumentLoader(blink::LocalFrame*, blink::ResourceRequest const&, blink::SubstituteData const&, blink::ClientRedirectPolicy) + 53 13 libblink_core.dylib 0x0000000127851e00 blink::DocumentLoader::Create(blink::LocalFrame*, blink::ResourceRequest const&, blink::SubstituteData const&, blink::ClientRedirectPolicy) + 256 14 libblink_core.dylib 0x0000000127851cc1 blink::EmptyLocalFrameClient::CreateDocumentLoader(blink::LocalFrame*, blink::ResourceRequest const&, blink::SubstituteData const&, blink::ClientRedirectPolicy) + 241 15 libblink_core.dylib 0x0000000127860cbe blink::FrameLoader::Init() + 286 16 libblink_core.dylib 0x0000000126d62ce7 blink::LocalFrame::Init() + 343 17 libblink_core.dylib 0x0000000127c6f0eb blink::SVGImage::DataChanged(bool) + 1851 18 libblink_platform.dylib 0x00000001229ff812 blink::Image::SetData(WTF::PassRefPtr<blink::SharedBuffer>, bool) + 210 19 libblink_core.dylib 0x00000001278eb5ef blink::ImageResourceContent::UpdateImage(WTF::PassRefPtr<blink::SharedBuffer>, blink::ImageResourceContent::UpdateImageOption, bool) + 1231 20 libblink_core.dylib 0x00000001278e23da blink::ImageResource::UpdateImage(WTF::PassRefPtr<blink::SharedBuffer>, blink::ImageResourceContent::UpdateImageOption, bool) + 106 21 libblink_core.dylib 0x00000001278e356d blink::ImageResource::Finish(double) + 173 22 libblink_platform.dylib 0x000000012307021c blink::Resource::Finish() + 28 23 libblink_platform.dylib 0x000000012306fe99 blink::ResourceFetcher::ResourceForStaticData(blink::FetchParameters const&, blink::ResourceFactory const&, blink::SubstituteData const&) + 2041 24 libblink_platform.dylib 0x0000000123072e3e blink::ResourceFetcher::RequestResource(blink::FetchParameters&, blink::ResourceFactory const&, blink::SubstituteData const&) + 1374 25 libblink_core.dylib 0x00000001278e131e blink::ImageResource::Fetch(blink::FetchParameters&, blink::ResourceFetcher*) + 574 26 libblink_core.dylib 0x00000001278e898d blink::ImageResourceContent::Fetch(blink::FetchParameters&, blink::ResourceFetcher*) + 29 27 libblink_core.dylib 0x00000001263fc570 blink::CSSImageValue::CacheImage(blink::Document const&, blink::CrossOriginAttributeValue) + 560 28 libblink_core.dylib 0x00000001266394c5 blink::ElementStyleResources::LoadPendingImage(blink::ComputedStyle*, blink::StylePendingImage*, blink::CrossOriginAttributeValue) + 149 29 libblink_core.dylib 0x0000000126639d7c blink::ElementStyleResources::LoadPendingImages(blink::ComputedStyle*) + 1292 30 libblink_core.dylib 0x000000012663a99f blink::ElementStyleResources::LoadPendingResources(blink::ComputedStyle*) + 47 31 libblink_core.dylib 0x000000012667f912 blink::StyleResolver::LoadPendingResources(blink::StyleResolverState&) + 50 32 libblink_core.dylib 0x00000001266867c9 blink::StyleResolver::ApplyMatchedStandardProperties(blink::StyleResolverState&, blink::MatchResult const&, blink::StyleResolver::CacheSuccess const&, blink::StyleResolver::NeedsApplyPass&) + 1913 33 libblink_core.dylib 0x0000000126680f92 blink::StyleResolver::ApplyMatchedPropertiesAndCustomPropertyAnimations(blink::StyleResolverState&, blink::MatchResult const&, blink::Element const*) + 370 34 libblink_core.dylib 0x0000000126680477 blink::StyleResolver::StyleForElement(blink::Element*, blink::ComputedStyle const*, blink::ComputedStyle const*, blink::StyleSharingBehavior, blink::RuleMatchingBehavior) + 2903 35 libblink_core.dylib 0x00000001267fe746 blink::Element::OriginalStyleForLayoutObject() + 310 36 libblink_core.dylib 0x00000001267fe36d blink::Element::StyleForLayoutObject() + 461 37 libblink_core.dylib 0x00000001267ff348 blink::Element::RecalcOwnStyle(blink::StyleRecalcChange) + 840 38 libblink_core.dylib 0x00000001267fec7c blink::Element::RecalcStyle(blink::StyleRecalcChange) + 1084 39 libblink_core.dylib 0x00000001266f1a96 blink::ContainerNode::RecalcDescendantStyles(blink::StyleRecalcChange) + 758 40 libblink_core.dylib 0x00000001267fee05 blink::Element::RecalcStyle(blink::StyleRecalcChange) + 1477 41 libblink_core.dylib 0x00000001266f1a96 blink::ContainerNode::RecalcDescendantStyles(blink::StyleRecalcChange) + 758 42 libblink_core.dylib 0x00000001267fee05 blink::Element::RecalcStyle(blink::StyleRecalcChange) + 1477 43 libblink_core.dylib 0x00000001266f1a96 blink::ContainerNode::RecalcDescendantStyles(blink::StyleRecalcChange) + 758 44 libblink_core.dylib 0x00000001267fee05 blink::Element::RecalcStyle(blink::StyleRecalcChange) + 1477 45 libblink_core.dylib 0x00000001266f1a96 blink::ContainerNode::RecalcDescendantStyles(blink::StyleRecalcChange) + 758 46 libblink_core.dylib 0x00000001267fee05 blink::Element::RecalcStyle(blink::StyleRecalcChange) + 1477 47 libblink_core.dylib 0x00000001266f1a96 blink::ContainerNode::RecalcDescendantStyles(blink::StyleRecalcChange) + 758 48 libblink_core.dylib 0x00000001267fee05 blink::Element::RecalcStyle(blink::StyleRecalcChange) + 1477 49 libblink_core.dylib 0x0000000126743040 blink::Document::UpdateStyle() + 1408 50 libblink_core.dylib 0x000000012673db38 blink::Document::UpdateStyleAndLayoutTree() + 1320 51 libblink_core.dylib 0x0000000126cd03c4 blink::FrameView::PerformPreLayoutTasks() + 724 52 libblink_core.dylib 0x0000000126ccd712 blink::FrameView::UpdateLayout() + 1634 53 libblink_core.dylib 0x0000000126d6567d blink::LocalFrame::SetPrinting(bool, blink::FloatSize const&, blink::FloatSize const&, float) + 317 54 libblink_core.dylib 0x000000012794e023 blink::PrintContext::end() + 275 55 libblink_core.dylib 0x000000012794d169 blink::PrintContext::~PrintContext() + 57 56 libblink_core.dylib 0x000000012794d1b5 blink::PrintContext::~PrintContext() + 21 57 libblink_core.dylib 0x0000000126d00963 blink::GarbageCollectedFinalized<blink::PrintContext>::FinalizeGarbageCollectedObject() + 35 58 libblink_core.dylib 0x0000000126d00935 blink::FinalizerTraitImpl<blink::PrintContext, true>::Finalize(void*) + 21 59 libblink_core.dylib 0x0000000126d00915 blink::FinalizerTrait<blink::PrintContext>::Finalize(void*) + 21 60 libblink_platform.dylib 0x0000000122ffa801 blink::HeapObjectHeader::Finalize(unsigned char*, unsigned long) + 97 61 libblink_platform.dylib 0x0000000123003063 blink::NormalPage::Sweep() + 819

if (LayoutView* layout_view = View()->GetLayoutView()) {

layout_view->SetPreferredLogicalWidthsDirty();

layout_view->SetNeedsLayout(LayoutInvalidationReason::kPrintingChanged);

« no previous file with comments | « no previous file | third_party/WebKit/Source/core/paint/TextPainter.cpp » ('j') | no next file with comments »