Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: backport printing changes (#15023, #15143) to 4-0-x #15976

Merged
merged 3 commits into from
Dec 17, 2018

Conversation

bengotow
Copy link
Contributor

@bengotow bengotow commented Dec 7, 2018

Description of Change

This PR backports #15023, #15143 to the 4-0-x branch

TODO: I've fixed conflicts in all of the relevant files and tried to update the BUILD.gn files, but I'm experiencing a problem where everything builds and then crashes at runtime with a dyld error. I'm hoping one of the PR authors might be able to spot the build config error—my Chromium-build-foo is weak!

CC @deepak1556 @brenca

Checklist

  • PR description included and stakeholders cc'd
  • npm test passes
  • tests are not modified
  • relevant documentation is changed or added
  • PR title follows semantic commit guidelines

Release Notes

Notes: The goal here is to release the fixes for these bugs in 4-0-x.:

@bengotow bengotow requested review from a team December 7, 2018 21:59
@nornagon
Copy link
Member

I don't see any dyld errors in the CI output. Windows looks like it's failing on a compile-time link error, but mac and linux are failing with segfaults that don't look related to dynamic linking to me. The windows link error looks related to 5ef5d60f77

brenca and others added 2 commits December 15, 2018 03:31
* remove printing related things from chromium_src

* chore: add printing build flag and patch

* fix: include PrintingService on other platforms too

* fix: printing_handler is only needed on Windows

* fix: format BUILD.gn properly

* fix: rename printing build flag to avoid conflict with chromium

* fix: place previously missed printing calls behind build flag

* fix: accidentally renamed flag in patch file

* fix: don't include all printing strings

* fix: allow ShowItemInFolder and OpenItem to block, fixing a DCHECK crash

* fix: make things compile, some changes got lost while rebasing

* fix: remove rogue line from BUILD.gn

* chore: update patch description

* style: lint fix

* chore: use chromium printing buildflag, move node related stuff out of patch

* revert: remove ScopedAllowBlockingForTesting call

* fix: fix my rebase blooper

* fix: re-add header lost during rebase, update patch

* fix: add <map> include, tweak the patch a bit

* revert: remove rogue diff from patch

* fix: clean up after rebase
* refactor: basic printing

* move build files to chromium_src/BUILD.gn
* remove dependency on chrome prerender sources

* spec: move printing specs behind feature flag

* build: register pdf compositor service
@deepak1556 deepak1556 force-pushed the bengotow/4-0-x+printing branch 2 times, most recently from 338ccc9 to 7f57e31 Compare December 14, 2018 23:21
Copy link
Member

@codebytere codebytere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given the massive diff on this; we know that it's functioning correctly on master and so now that this is passing all checks (indicating that it was backported correctly to this staging branch) i think we can be comfortable merging it :)

@ckerr ckerr merged commit f6fa88a into electron:4-0-x Dec 17, 2018
@release-clerk
Copy link

release-clerk bot commented Dec 17, 2018

Release Notes Persisted

The goal here is to release the fixes for these bugs in 4-0-x.:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants