Skip to content

Commit c88926b

Browse files
rogerwangrogerwang
committed
Merge branch 'nw49' into nw50
2 parents b48a5dc + 2ff01ab commit c88926b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+885
-102
lines changed

‎CHANGELOG.md

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,192 @@
1+
0.49.0 / 10-07-2020
2+
===================
3+
- Update Chromium to [86.0.4240.75](https://developers.google.com/web/updates/2020/10/nic86)
4+
- Fix: Transparency broken on Linux [(#7564)](https://github.com/nwjs/nw.js/issues/7564)
5+
6+
0.48.4 / 10-04-2020
7+
===================
8+
- Fix: g_stop_nw_instance crash on close [(#7569)](https://github.com/nwjs/nw.js/issues/7569)
9+
- Fix: Window.setBadgeLabel and Window.setProgressBar in nw2 mode [(#7464)](https://github.com/nwjs/nw.js/issues/7464)
10+
- Fix: Normal flavor crashes in macOS [(#7582)](https://github.com/nwjs/nw.js/issues/7582)
11+
12+
0.48.3 / 09-26-2020
13+
===================
14+
- Update Node.js to [v14.12.0](https://nodejs.org/en/blog/release/v14.12.0/)
15+
- Update Chromium to [85.0.4183.121](https://chromereleases.googleblog.com/2020/09/stable-channel-update-for-desktop_21.html)
16+
17+
0.48.2 / 09-15-2020
18+
===================
19+
- Update Node.js to [v14.10.1](https://nodejs.org/en/blog/release/v14.10.1/)
20+
- Fix: regression in [(#6216)](https://github.com/nwjs/nw.js/issues/6216): blocking flash player
21+
- Fix: Enter fullscreen by script in Node frame [(#7566)](https://github.com/nwjs/nw.js/issues/7566)
22+
23+
0.48.1 / 09-01-2020
24+
===================
25+
- Update Node.js to [v14.9.0](https://nodejs.org/en/blog/release/v14.9.0/)
26+
- Fix: webview.addContentScripts cause TypeError: Illegal invocation [(#7087)](https://github.com/nwjs/nw.js/issues/7087)
27+
28+
0.48.0 / 08-27-2020
29+
===================
30+
- Update Chromium to [85.0.4183.83](https://chromereleases.googleblog.com/2020/08/stable-channel-update-for-desktop_25.html)
31+
32+
0.47.3 / 08-16-2020
33+
===================
34+
- Update Node.js to [v14.8.0](https://nodejs.org/en/blog/release/v14.8.0/)
35+
- Update Chromium to [84.0.4147.125](https://chromereleases.googleblog.com/2020/08/stable-channel-update-for-desktop.html)
36+
- build: pinning win sdk version to 10.0.18362.0
37+
- build: fix resources in fresh normal build [(#7541)](https://github.com/nwjs/nw.js/issues/7541)
38+
- [docs] Update Web Worker documentation
39+
40+
0.47.2 / 08-05-2020
41+
===================
42+
- Update Node.js to [v14.7.0](https://nodejs.org/en/blog/release/v14.7.0/)
43+
- Update Chromium to [84.0.4147.105](https://chromereleases.googleblog.com/2020/07/stable-channel-update-for-desktop_27.html)
44+
- Fix: Window.setResizable [(#7521)](https://github.com/nwjs/nw.js/issues/7521)
45+
46+
0.47.1 / 07-24-2020
47+
===================
48+
- Update Node.js to [v14.6.0](https://nodejs.org/en/blog/release/v14.6.0/)
49+
- Fix: Window opened with new_instance creates always mixed context [(#7344)](https://github.com/nwjs/nw.js/issues/7344)
50+
- [docs] add clang option for building Node
51+
52+
0.47.0 / 07-15-2020
53+
===================
54+
- Update Chromium to [84.0.4147.89](https://chromereleases.googleblog.com/2020/07/stable-channel-update-for-desktop.html)
55+
56+
0.46.4 / 07-08-2020
57+
===================
58+
- Node.js: Update to [v14.5.0](https://nodejs.org/en/blog/release/v14.5.0/)
59+
60+
0.46.3 / 06-25-2020
61+
===================
62+
- Chromium: update to [83.0.4103.116](https://chromereleases.googleblog.com/2020/06/stable-channel-update-for-desktop_22.html)
63+
- Fix: nw2: Window.setPosition(mouse) [(#7505)](https://github.com/nwjs/nw.js/issues/7505)
64+
65+
0.46.2 / 06-07-2020
66+
===================
67+
- Chromium: update to [83.0.4103.97](https://chromereleases.googleblog.com/2020/06/stable-channel-update-for-desktop.html)
68+
- Fix: process.env crash, access Node variable across contexts [(#7493)](https://github.com/nwjs/nw.js/issues/7493)
69+
70+
0.46.1 / 06-04-2020
71+
===================
72+
- Node: update to [v14.4.0](https://nodejs.org/en/blog/release/v14.4.0/)
73+
- Fix: Native Modules can't be required for second time in Web Workers [(#7239)](https://github.com/nwjs/nw.js/issues/7239)
74+
- Fix: app crashed after reload/refresh using web workers [(#7487)](https://github.com/nwjs/nw.js/issues/7487)
75+
- Fix: [Regression] Window bar app icon is low quality again [(#7361)](https://github.com/nwjs/nw.js/issues/7361)
76+
77+
0.46.0 / 05-20-2020
78+
===================
79+
- Update to Chromium [83.0.4103.61](https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop_19.html)
80+
- Fix: native module node-pty fails to build [(#7473)](https://github.com/nwjs/nw.js/issues/7473)
81+
- Fix: Setting --user-data-dir to custom location still causes AppData folder to be created [(#6328)](https://github.com/nwjs/nw.js/issues/6328)
82+
83+
0.45.6 / 05-10-2020
84+
===================
85+
- Update to chromium [81.0.4044.138](https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html)
86+
- Node: Update to [v14.2.0](https://nodejs.org/en/blog/release/v14.2.0/)
87+
- Fix: NW2 Standard alert/confirm.. clip in main window [(#7422)](https://github.com/nwjs/nw.js/issues/7422)
88+
- Fix: win.print will only print the parent window [(#7377)](https://github.com/nwjs/nw.js/issues/7377)
89+
- Fix: crash "Invalid instance ID(0) from WebviewActionRequest.defaultAction" [(#7457)](https://github.com/nwjs/nw.js/issues/7457)
90+
91+
0.45.5 / 05-04-2020
92+
===================
93+
- Update to Chromium [81.0.4044.129](https://chromereleases.googleblog.com/2020/04/stable-channel-update-for-desktop_27.html)
94+
- Fix: error in initializing browser_switcher_service [(#7436)](https://github.com/nwjs/nw.js/issues/7436)
95+
- Fix: /lib64/libc.so.6: version `GLIBC_2.18' not found [(#7452)](https://github.com/nwjs/nw.js/issues/7452)
96+
- Fix: Many error messages re navigation since 0.43.5 [(#7346)](https://github.com/nwjs/nw.js/issues/7346)
97+
- Fix: NW.js crashes soon after opening [(#7450)](https://github.com/nwjs/nw.js/issues/7450)
98+
99+
0.45.4 / 04-23-2020
100+
===================
101+
- Update to Node.js [v14.0.0](https://nodejs.org/en/blog/release/v14.0.0/)
102+
- Fix: broken iframe nwfaketop cookies [(#7448)](https://github.com/nwjs/nw.js/issues/7448)
103+
104+
0.45.3 / 04-19-2020
105+
===================
106+
- Update to Chromium [81.0.4044.113](https://chromereleases.googleblog.com/2020/04/stable-channel-update-for-desktop_15.html)
107+
108+
0.45.2 / 04-16-2020
109+
===================
110+
- Update to Node.js [v13.13.0](https://nodejs.org/en/blog/release/v13.13.0/)
111+
- Fix: Remove permission prompts when using Chrome Native File System API [(#7351)](https://github.com/nwjs/nw.js/issues/7351)
112+
- Fix: Linux: wrong app name in native desktop notifications [(#7437)](https://github.com/nwjs/nw.js/issues/7437)
113+
114+
0.45.1 / 04-10-2020
115+
===================
116+
- Update to Node.js [v13.12.0](https://nodejs.org/en/blog/release/v13.12.0/)
117+
- Fix: crash in transparency support [(#7433)](https://github.com/nwjs/nw.js/issues/7433)
118+
119+
0.45.0 / 04-08-2020
120+
===================
121+
- Update to Chromium [81.0.4044.92](https://chromereleases.googleblog.com/2020/04/stable-channel-update-for-desktop_7.html)
122+
123+
0.44.6 / 04-01-2020
124+
===================
125+
- Update to Chromium [80.0.3987.162](https://chromereleases.googleblog.com/2020/03/stable-channel-update-for-desktop_31.html)
126+
- Fix: allow file system api in NW origin [(#7351)](https://github.com/nwjs/nw.js/issues/7351)
127+
- Fix: websocket debug crash [(#7427)](https://github.com/nwjs/nw.js/issues/7427)
128+
129+
0.44.5 / 03-18-2020
130+
===================
131+
- Update to Chromium 80.0.3987.149
132+
- Fix: Crash on Windows 10 at saving window dimentions [(#7412)](https://github.com/nwjs/nw.js/issues/7412)
133+
134+
0.44.4 / 03-09-2020
135+
===================
136+
- Update to Chromium [80.0.3987.132](https://chromereleases.googleblog.com/2020/03/stable-channel-update-for-desktop.html)
137+
- Node: update to [v13.10.1](https://nodejs.org/en/blog/release/v13.10.1/)
138+
- Fix: Window maximized on re-open [(#7370)](https://github.com/nwjs/nw.js/issues/7370)
139+
- Fix: disable throttling of worker / broadcast channel messages [(#7090)](https://github.com/nwjs/nw.js/issues/7090)
140+
141+
0.44.3 / 02-26-2020
142+
===================
143+
- Update to Chromium [80.0.3987.122](https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop_24.html)
144+
- Node: Fix windows worker support [(#7114)](https://github.com/nwjs/nw.js/issues/7114)
145+
- Update build script to support cross-compiling for ARM (Thanks to Marcus T)
146+
- Node: update to [v13.9.0](https://nodejs.org/en/blog/release/v13.9.0/)
147+
- Fix: Function enterfullscreen brokes app on MacOS [(#7254)](https://github.com/nwjs/nw.js/issues/7254)
148+
- Fix: [NW2 issue] : Setting two binded windows to a fullscreen state doesn't work anymore [(#7368)](https://github.com/nwjs/nw.js/issues/7368)
149+
- Fix: NW2: nw.App.crashRenderer() doesn't kill nw like NW1 does [(#7383)](https://github.com/nwjs/nw.js/issues/7383)
150+
- Fix: Unable to build NW.js distribution (missing natives_blob.bin) [(#7378)](https://github.com/nwjs/nw.js/issues/7378)
151+
152+
0.44.2 / 02-19-2020
153+
===================
154+
- Update to Chromium 80.0.3987.116
155+
- Fix: Copy & paste between input fields adds spurious space [(#7363)](https://github.com/nwjs/nw.js/issues/7363)
156+
- Fix: 43.0 reload app doesn't close and open new window [(#7271)](https://github.com/nwjs/nw.js/issues/7271)
157+
- Fix: Local sourcemaps can not be parsed in 0.44.1 [(#7373)](https://github.com/nwjs/nw.js/issues/7373)
158+
- Fix: Quit on macOS from top or dock icon menus does not have "quit" value in "close" event [(#7365)](https://github.com/nwjs/nw.js/issues/7365)
159+
160+
0.44.1 / 02-11-2020
161+
===================
162+
- Node: Update to [v13.8.0](https://nodejs.org/en/blog/release/v13.8.0/)
163+
- Fix: Quit on macOS from top or dock icon menus does not have "quit" value in "close" event [(#7365)](https://github.com/nwjs/nw.js/issues/7365)
164+
- Fix: MacOS builtin menu can not switch according to the focused Window [(#7366)](https://github.com/nwjs/nw.js/issues/7366)
165+
- Fix: App starts with min_height and min_width instead of height and width [(#7358)](https://github.com/nwjs/nw.js/issues/7358)
166+
- Fix: App won't quit on Mac [(#7355)](https://github.com/nwjs/nw.js/issues/7355)
167+
- Fix: File & Folder dialogs of the wrong type and undraggable on MacOS [(#7349)](https://github.com/nwjs/nw.js/issues/7349)
168+
- Fix: NW2 issue : (Linux) NW.js crashes when an opened window has attached the 'move' event [(#7359)](https://github.com/nwjs/nw.js/issues/7359)
169+
- Fix: NW2 issue : (Linux) Nw.js should NOT show the chromium default menu bar as global [(#7364)](https://github.com/nwjs/nw.js/issues/7364)
170+
- Fix: Regression of allowed String length, `buffer.constants.MAX_STRING_LENGTH` [(#7356)](https://github.com/nwjs/nw.js/issues/7356)
171+
172+
0.44.0 / 02-05-2020
173+
===================
174+
- Update to Chromium 80.0.3987.87
175+
- Linux: Fix ANGLE lib loading path
176+
- Fix mac crash reporting
177+
- [docs] add Window.captureScreenshot
178+
- NW2: add Window.captureScreenshot - support fullpage screenshot
179+
- Fix: Pressing the ESC key will now EXIT "FullScreen mode" with RM MV. [(#7324)](https://github.com/nwjs/nw.js/issues/7324)
180+
- Fix: NW2: Crashing renderer shows Aw, Snap! [(#7339)](https://github.com/nwjs/nw.js/issues/7339)
181+
- Fix: folder select dialog shows upload button instead of select on MacOS [(#7338)](https://github.com/nwjs/nw.js/issues/7338)
182+
- Fix: NW2: (Linux) Transparency and resize handling in frameless windows not working as intended [(#7325)](https://github.com/nwjs/nw.js/issues/7325)
183+
- Fix: NW2: win.blur() does not fire correctly [(#7327)](https://github.com/nwjs/nw.js/issues/7327)
184+
- Fix: NW2: Sometimes the window cannot be closed [(#7326)](https://github.com/nwjs/nw.js/issues/7326)
185+
- Fix: NW2: User Window Metrics Not Saved/Respected [(#7322)](https://github.com/nwjs/nw.js/issues/7322)
186+
- Fix: `window.open` does not load `inject_js_start` or `inject_js_end` when opening the page. [(#7320)](https://github.com/nwjs/nw.js/issues/7320)
187+
- Fix: Autoprint is not completely silent [(#6269)](https://github.com/nwjs/nw.js/issues/6269)
188+
- Fix: win.window is undefined after navigation to remote url [(#7304)](https://github.com/nwjs/nw.js/issues/7304)
189+
1190
0.43.6 / 01-17-2020
2191
===================
3192
- Update to Chromium [79.0.3945.130](https://chromereleases.googleblog.com/2020/01/stable-channel-update-for-desktop_16.html)

‎LICENSE

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ Copyright (c) 2011-2019 The Chromium Authors
33
Copyright (c) 2011-2018 Intel Corp
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
6-
this software and associated documentation files (the "Software"), to deal in th
7-
e Software without restriction, including without limitation the rights to use,
6+
this software and associated documentation files (the "Software"), to deal in
7+
the Software without restriction, including without limitation the rights to use,
88
copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
9-
Software, and to permit persons to whom the Software is furnished to do so, subj
10-
ect to the following conditions:
9+
Software, and to permit persons to whom the Software is furnished to do so,
10+
subject to the following conditions:
1111

12-
The above copyright notice and this permission notice shall be included in all c
13-
opies or substantial portions of the Software.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
1414

15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
16-
ED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR
17-
A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYR
18-
IGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
19-
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WIT
20-
H THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
16+
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR
17+
A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
18+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
19+
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
20+
THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ It was created in the Intel Open Source Technology Center.
2525
* Available on Linux, Mac OS X and Windows.
2626

2727
## Downloads
28-
* **v0.43.6:** (Jan 17, 2020, based off of Node.js v13.6.0, Chromium 79.0.3945.130) : [release notes](https://nwjs.io/blog/v0.43.6/)
28+
* **v0.49.0:** (Oct 7, 2020, based off of Node.js v14.12.0, Chromium 86.0.4240.75) : [release notes](https://nwjs.io/blog/v0.49.0/)
2929
**NOTE** You might want the **SDK build**. Please read the release notes.
30-
* Linux: [32bit](https://dl.nwjs.io/v0.43.6/nwjs-v0.43.6-linux-ia32.tar.gz) / [64bit](https://dl.nwjs.io/v0.43.6/nwjs-v0.43.6-linux-x64.tar.gz)
31-
* Windows: [32bit](https://dl.nwjs.io/v0.43.6/nwjs-v0.43.6-win-ia32.zip) / [64bit](https://dl.nwjs.io/v0.43.6/nwjs-v0.43.6-win-x64.zip)
32-
* Mac 10.10+: [64bit](https://dl.nwjs.io/v0.43.6/nwjs-v0.43.6-osx-x64.zip)
30+
* Linux: [32bit](https://dl.nwjs.io/v0.49.0/nwjs-v0.49.0-linux-ia32.tar.gz) / [64bit](https://dl.nwjs.io/v0.49.0/nwjs-v0.49.0-linux-x64.tar.gz)
31+
* Windows: [32bit](https://dl.nwjs.io/v0.49.0/nwjs-v0.49.0-win-ia32.zip) / [64bit](https://dl.nwjs.io/v0.49.0/nwjs-v0.49.0-win-x64.zip)
32+
* Mac 10.10+: [64bit](https://dl.nwjs.io/v0.49.0/nwjs-v0.49.0-osx-x64.zip)
3333
* Use [Legacy build](http://nwjs.io/downloads/) for Win XP and early OSX.
3434

3535
* **latest nightly build from git tip**: https://dl.nwjs.io/live-build/

‎docs/For Developers/Building NW.js.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,16 @@ See the upstream documentation for the mapping between GN and GYP flags: https:/
8888

8989
```bash
9090
cd src
91-
GYP_CHROMIUM_NO_ACTION=0 ./build/gyp_chromium -I third_party/node-nw/common.gypi -D building_nw=1 third_party/node-nw/node.gyp
91+
GYP_CHROMIUM_NO_ACTION=0 ./build/gyp_chromium -I \
92+
third_party/node-nw/common.gypi -D building_nw=1 \
93+
-D clang=1 third_party/node-nw/node.gyp
9294
```
9395

9496
or use the following if you're doing a component build:
9597
```bash
96-
./build/gyp_chromium -D component=shared_library -I third_party/node-nw/common.gypi -D building_nw=1 third_party/node-nw/node.gyp
98+
./build/gyp_chromium -D component=shared_library -I \
99+
third_party/node-nw/common.gypi -D building_nw=1 \
100+
-D clang=1 third_party/node-nw/node.gyp
97101
```
98102
To change the build configuration for Node, you need to setup the GYP_DEFINES environment variable:
99103

‎docs/For Users/Advanced/JavaScript Contexts in NW.js.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ In NW.js, Node.js modules can be loaded in the context running in background pag
2626
Besides the contexts created by browsers, NW.js introduced additional Node context for running Node modules in the background page by default. So NW.js has two types of JavaScript contexts: **Browser Context** and **Node Context**.
2727

2828
!!! note "Web Worker"
29-
Actually Web Workers are running in a separate JavaScript context which is neither browser context nor node context. But you can't access Web or Node.js or NW.js APIs in Web Worker's context.
29+
[You can access Node.js APIs](https://nwjs.io/blog/v0.18.4/) in a Web Worker by setting adding `"chromium-args": "--enable-node-worker"` to your Manifest
3030

3131
### Browser Context
3232

‎docs/For Users/Debugging with DevTools.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ The app is a simple react app with 'package.json' added. The devtools files are
3535

3636
### Vue Example
3737

38-
1. `npm install --save-dev nw-vue-devtools`
38+
1. `npm install --save-dev nw-vue-devtools-prebuilt`
3939
1. Add this to your `package.json`:
4040
```js
41-
"chromium-args": "--load-extension='./node_modules/nw-vue-devtools/extension'",
41+
"chromium-args": "--load-extension='./node_modules/nw-vue-devtools-prebuilt/extension'",
4242
```
4343
1. Vue.js must be in use in your app, and cannot be minified (use `vue.js` not `vue.min.js`).
4444

45-
This will automatically download, build, and install the latest Vue-DevTools into NW.js.
45+
This will automatically download the latest Vue-DevTools from the Chrome WebStore, unpack and modify it to work in NW.js.
4646

4747
If you are using `nwjs-builder-phoenix` then add in `"chromium-args"` to your `package.json` `build.strippedProperties` array.

‎docs/For Users/Package and Distribute.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ copy /b nw.exe+package.nw app.exe
6767
```
6868
or following command on Linux:
6969
```bash
70-
cat nw app.nw > app && chmod +x app
70+
cat nw package.nw > app && chmod +x app
7171
```
7272

7373
## Platform Specific Steps

‎patch/patch.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,9 @@ patches = [
1818
{
1919
'name': 'icu',
2020
'path': 'third_party/icu/',
21+
},
22+
{
23+
'name': 'perfetto',
24+
'path': 'third_party/perfetto/',
2125
}
2226
]

‎patch/patches/perfetto.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/src/trace_processor/importers/proto/packet_sequence_state.cc b/src/trace_processor/importers/proto/packet_sequence_state.cc
2+
index c63c2d749..2918cd720 100644
3+
--- src/trace_processor/importers/proto/packet_sequence_state.cc
4+
+++ src/trace_processor/importers/proto/packet_sequence_state.cc
5+
@@ -14,6 +14,7 @@
6+
* limitations under the License.
7+
*/
8+
9+
+#pragma clang diagnostic ignored "-Wunused-private-field"
10+
#include "src/trace_processor/importers/proto/packet_sequence_state.h"
11+
12+
namespace perfetto {

‎requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pymdown-extensions
1+
pymdown-extensions == 6.2.1

‎src/api/menu/menu.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <string>
2929
#include <vector>
3030

31-
#if defined(OS_MACOSX)
31+
#if defined(OS_MAC)
3232
#if __OBJC__
3333
@class NSMenu;
3434
@class NWMenuDelegate;
@@ -103,7 +103,7 @@ class Menu : public Base {
103103
const base::ListValue& arguments,
104104
content::RenderFrameHost* rvh = nullptr) override;
105105

106-
#if defined(OS_MACOSX)
106+
#if defined(OS_MAC)
107107
static Menu* GetMenuFromNative(NSMenu* menu);
108108
#endif
109109

@@ -125,7 +125,7 @@ class Menu : public Base {
125125
void Remove(MenuItem* menu_item, int pos);
126126
void Popup(int x, int y, content::RenderFrameHost*);
127127

128-
#if defined(OS_MACOSX)
128+
#if defined(OS_MAC)
129129
NSMenu* menu_;
130130
NWMenuDelegate* menu_delegate_;
131131
#elif defined(OS_LINUX) || defined(OS_WIN)

‎src/api/menu/menu_mac.mm

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020

2121
#include "content/nw/src/api/menu/menu.h"
2222

23-
#include "base/message_loop/message_loop.h"
24-
#include "base/message_loop/message_loop_current.h"
2523
#include "base/mac/scoped_sending_event.h"
24+
#include "base/task/current_thread.h"
2625
#include "base/values.h"
2726
#import <Cocoa/Cocoa.h>
2827
#include "content/public/browser/web_contents.h"
@@ -85,7 +84,7 @@
8584

8685
{
8786
// Make sure events can be pumped while the menu is up.
88-
base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
87+
base::CurrentThread::ScopedNestableTaskAllower allow;
8988

9089
// One of the events that could be pumped is |window.close()|.
9190
// User-initiated event-tracking loops protect against this by

0 commit comments

Comments
 (0)