refactor: prevent node macros from overriding base #17178
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
This will unblock fixing #17090 , the ordering of |
MarshallOfSound
approved these changes
Mar 1, 2019
|
No Release Notes |
nitsakh
pushed a commit
that referenced
this pull request
Mar 27, 2019
nitsakh
pushed a commit
that referenced
this pull request
Mar 28, 2019
Contributor
|
/trop run backport-to 5-0-x |
Contributor
|
The backport process for this PR has been manually initiated, |
Contributor
|
I have automatically backported this PR to "5-0-x", please check out #17739 |
zcbenz
pushed a commit
that referenced
this pull request
Apr 10, 2019
ckerr
pushed a commit
that referenced
this pull request
Apr 16, 2019
* fix: backport boringssl patches for node compat * refactor: prevent node macros from overriding base (#17178) * fix: backport boring ssl patch OPENSSL_clear_free * refactor: load electron builtin modules with process._linkedBinding (#17247) * refactor: load electron builtin modules with process._linkedBinding NODE_BUILTING_MODULE_CONTEXT_AWARE and process.binding are removed in nodejs/node#25829. This changes uses the alternative available without any functionality change. * chore: roll node * fix: add boringssl backport to support node upgrade * fix: Update node_includes.h, add DCHECK macros * fix: Update node Debug Options parser usage * fix: Fix asar setup * fix: using v8Util in isolated context * fix: make "process" available in preload scripts * fix: use proper options parser and remove setting of _breakFirstLine _breakFirstLine was being set on the process, but that has changed in node 12 and so is no longer needed. Node will handle it properly when --inspect-brk is provided * fix: process.binding => _linkedBinding in sandboxed isolated preload * chore: update node dep sha * fix: make original-fs work with streams
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
These redefinitions meant that any Electron file that had
#include "node_includes.h"would be unable to useCHECK,DCHECK, etc. frombase/. This change makes it so that Electron code will use Chromium's logging macros, instead of Node's, but keep Node using Node's logging macros.push_macroandpop_macroare non-standard C++, but are used by Chromium occasionally.Checklist
npm testpassesRelease Notes
Notes: no-notes