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.

Sign up for GitHub

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

Jump to bottom

Tell Git to ignore //third_party/node-nw. #85

Open
wants to merge 1 commit into
base: nw25
Choose a base branch
from
Open

Tell Git to ignore //third_party/node-nw. #85

wants to merge 1 commit into from

Conversation

hujiajie
Copy link

No description provided.

@rogerwang rogerwang force-pushed the nw24 branch 2 times, most recently from e0e7aeb to 13bc321 Compare July 20, 2017 05:04
@rogerwang
Copy link
Member

We'll review this after 0.24.0 release as the PR is for nw24. Thanks.

@rogerwang rogerwang force-pushed the nw24 branch 2 times, most recently from ffa178c to 7a80b4f Compare July 25, 2017 23:11
@hujiajie
Copy link
Author

@rogerwang, please take a look, thanks!

@GnorTech GnorTech force-pushed the nw24 branch 3 times, most recently from da91293 to 9a7251d Compare August 3, 2017 09:18
GnorTech pushed a commit that referenced this pull request Aug 5, 2017
Chrome Cleanup WebUI: polishing fixes from implementation review
a5a3466 
Resize spinner, standardize color use, add learn more to error state,
change reboot required icon

Also makes chrome://settings/help use the right colors.

Bug: 747124
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ifae6b61cc4ffa668dbe095333f3590a2d97277a4
Reviewed-on: https://chromium-review.googlesource.com/580360
Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: proberge <proberge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488992}
(cherry picked from commit 435ed18)

Change-Id: I6f20ec0a45aec8f19e4df42921a994567576c7d9
Reviewed-on: https://chromium-review.googlesource.com/590349
Reviewed-by: proberge <proberge@chromium.org>
Cr-Commit-Position: refs/branch-heads/3163@{#85}
Cr-Branched-From: ff259ba-refs/heads/master@{#488528}
@hujiajie hujiajie changed the base branch from nw24 to nw25 September 1, 2017 07:02
@hujiajie
Copy link
Author

hujiajie commented Sep 1, 2017

Please consider to review this one line change at your convenience. Thanks!

GnorTech pushed a commit that referenced this pull request Sep 14, 2017
@henbos
Fix crash where a remote stream is removed before the promise resolves.
e6053d8 
setRemoteDescription() ("SRD") is executed on the main thread, does work
on the webrtc signaling thread which has callbacks that jump back to the
main thread to fire events and resolve the promise.

The callback on the main thread needs to know about the stream, tracks
and their receivers. Previously, we invoked native_peer_connection_
->GetReceivers() in the main thread callback. This was problematic in
this case:

SRD that adds stream x
SRD that removes stream x

By the time we do GetReceivers() in the main thread callback the stream
may already have been removed from the native_peer_connection_ by the
second SRD call. This lead to a crash because it couldn't find the
receivers of the added stream.

The fix is to do the GetReceivers() call while still on the webrtc
signaling thread and not do any querying of the
native_peer_connection_'s state from the main thread callback.

Calling SRD in succession without waiting for the promises to resolve
is inherently racey but this ensures the events fire without crashing
and that we end up in the correct state. The indeterminate (racey) part
is whether or not the stream fired in the first ontrack/onaddstream
events contain the first track or is empty.

TBR=hbos@chromium.org

(cherry picked from commit 545dbdf)

Bug: 759324
Change-Id: Icdbf6f255a046ddf67feee2e59dab48952219184
Reviewed-on: https://chromium-review.googlesource.com/647531
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Henrik Boström <hbos@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#499601}
Reviewed-on: https://chromium-review.googlesource.com/657101
Reviewed-by: Henrik Boström <hbos@chromium.org>
Cr-Commit-Position: refs/branch-heads/3202@{#85}
Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}
hujiajie pushed a commit to hujiajie/chromium.src that referenced this pull request Sep 14, 2017
@xhwang-chromium
(merge m59) media: Add UMA to record whether encrypted media is enabled
935d969 
The UMA is recorded when requestMediaKeySystemAccess is called on
non-ClearKey key system but will reported at most once per renderer
process.

BUG=711348
TEST=Manually tested

Review-Url: https://codereview.chromium.org/2824643002
Cr-Commit-Position: refs/heads/master@{#465159}
(cherry picked from commit 6041683)

Review-Url: https://codereview.chromium.org/2834653002 .
Cr-Commit-Position: refs/branch-heads/3071@{nwjs#85}
Cr-Branched-From: a106f0a-refs/heads/master@{#464641}
GnorTech pushed a commit that referenced this pull request Oct 27, 2017
@mfalken
M63: Revert "[ServiceWorker] Implement ServiceWorkerContainer.SetCont…
75baffd 
…roller"

This reverts commit 24e5c55.

Bug: 774681
Change-Id: I2624c46835a32d60a7361077b3bbe20939faa307
TBR: kinuko
Reviewed-on: https://chromium-review.googlesource.com/728879
Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/branch-heads/3239@{#85}
Cr-Branched-From: adb61db-refs/heads/master@{#508578}
rogerwang pushed a commit that referenced this pull request Jan 29, 2018
Incrementing VERSION to 65.0.3325.21
41c1e95 
TBR=dimu@chromium.org

Change-Id: Ifad61ab729a7f93913e0a668ef53a994aa723c1c
Reviewed-on: https://chromium-review.googlesource.com/885302
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3325@{#85}
Cr-Branched-From: bc084a8-refs/heads/master@{#530369}
GnorTech pushed a commit that referenced this pull request Mar 20, 2018
[merge into M66]Fix crash in safe_browsing::IsURLWhitelistedByPolicy
1b13eba 
TBR=jialiul@chromium.org

(cherry picked from commit d80964d)

Bug: 818559
Change-Id: I81db22fded6d75fe74098177fc8eecd4f0ffcbec
Reviewed-on: https://chromium-review.googlesource.com/948069
Commit-Queue: Jialiu Lin <jialiul@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#541076}
Reviewed-on: https://chromium-review.googlesource.com/954609
Reviewed-by: Jialiu Lin <jialiul@chromium.org>
Cr-Commit-Position: refs/branch-heads/3359@{#85}
Cr-Branched-From: 66afc5e-refs/heads/master@{#540276}
rogerwang pushed a commit that referenced this pull request Apr 25, 2018
[Presentation API] Fix race condition where Mojo pipes aren't closed.
77e751d 
Race condition introduced in:
https://chromium-review.googlesource.com/c/chromium/src/+/724724

The crash is caused by a race condition, where the the renderer attempted
to register another PresentationController to PresentationServiceImpl
while there is still a (soon-to-be invalid) one already. When we moved
the PresentationController implementation from PresentationDispatcher to
blink::PresentationController, we are now creating/destoying the
PresentationController across navigation (instead of having it
long-lived in the PresentationDispatcher / RenderFrameImpl).

The fix is to close all message pipes / Reset() in
PresentationServiceImpl when a Mojo connection error is detected.
This way, the PresentationServiceImpl will be in a clean state when
the renderer connects to it again.

This also fixes PresentationReceiver's behavior of obtaining a
connection to PresentationService and immediately dropping it after
calling SetReceiver(), which would let to Reset() getting called with
this patch.

To merge back to 66 (if possible) and 67.

Bug: 832176
Change-Id: Ic7cd2601a107024143936fa9e1ae197505e4cf64
Reviewed-on: https://chromium-review.googlesource.com/1011289
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Reviewed-by: Derek Cheng <imcheng@chromium.org>
Commit-Queue: Derek Cheng <imcheng@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#551057}(cherry picked from commit 1ad7724)
Reviewed-on: https://chromium-review.googlesource.com/1017319
Cr-Commit-Position: refs/branch-heads/3396@{#85}
Cr-Branched-From: 9ef2aa8-refs/heads/master@{#550428}
rogerwang pushed a commit that referenced this pull request Jun 19, 2018
@EiraGe
Revert "Disable legacy touch event APIs on desktop"
c4e3ca9 
This CL reverts commit a6a203c.
(crrev.com/c/729220)

We'll leave these feature detection API disabled in canary and
dev channel to gather some feedback. But don't let it in Beta
and Stable channel because it breaks embed map.

This revert will merge into into M68, but not landed in master branch

Bug: 804890
Change-Id: Ib017006081baf12b69fe137ba9aeae915b5274a3
Reviewed-on: https://chromium-review.googlesource.com/1081874
Reviewed-by: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/branch-heads/3440@{#85}
Cr-Branched-From: 010ddcf-refs/heads/master@{#561733}
GnorTech pushed a commit that referenced this pull request Aug 4, 2018
@sebmarchand
Prevent a tab from being discarded if it shares its BrowsingInstance
4dc421a 
This CL add a feature parameter to the Proactive Tab Discarding and
Freezing experiment to prevent discarding tabs that share their browsing
instance with another tab. This might be too agressive, in practice we
might just want to consider tabs under the same SiteInstance but this is
not an information that we can access yet.

Check this page for more details about the SiteInstance/BrowsingInstance
concepts: https://www.chromium.org/developers/design-documents/process-models#Implementation_Notes

UKM privacy document has been updated here (pending approval): https://docs.google.com/a/google.com/document/d/1BNQ5nLOtPuwP7oxr9r-XKNKr5iObXEiA_69WXAvuYAo/edit?disco=AAAABzM-vE0

Bug: 775644, 862203
Change-Id: Iaf5107db1d68aa4a0155ecbae7283f487c23bb7c
Reviewed-on: https://chromium-review.googlesource.com/1144188
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
Reviewed-by: Chris Hamilton <chrisha@chromium.org>
Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#576789}(cherry picked from commit 94d6d39)
Reviewed-on: https://chromium-review.googlesource.com/1150261
Reviewed-by: Sébastien Marchand <sebmarchand@chromium.org>
Cr-Commit-Position: refs/branch-heads/3497@{#85}
Cr-Branched-From: 271eaf5-refs/heads/master@{#576753}
rogerwang pushed a commit that referenced this pull request Sep 15, 2018
[unified-consent] Move IsUnifiedConsentFeatureEnabled to components/u…
01d8307 
…nified_consent.

Unified Consent feature is no longer dependent on Desktop Identity Consistency being
enabled. This means that the Unified Consent feature is no longer a per-profile feature.

This CL removes the argument profile from IsUnifiedConsentFeatureEnabled and
IsUnifiedConsentFeatureWithBumpEnabled and moves these functions in the unified
consent component.

Bug: 873064
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: Ifc338dbcb48500bc17d52bf5bcf52a45ea46860d
Reviewed-on: https://chromium-review.googlesource.com/1202702
Commit-Queue: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#588891}
Reviewed-on: https://chromium-review.googlesource.com/1209362
Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/branch-heads/3538@{#85}
Cr-Branched-From: 79f7c91-refs/heads/master@{#587811}
rogerwang pushed a commit that referenced this pull request Oct 31, 2018
@jklein24
Switch Android SMS to prod endpoint by default
aa5f794 
Bug: 881664
Change-Id: If8bc6ea2368c32a4a76d474ed625a0db5da0492d
Reviewed-on: https://chromium-review.googlesource.com/c/1279426
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Jeremy Klein <jlklein@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#599792}(cherry picked from commit bbe547a)
Reviewed-on: https://chromium-review.googlesource.com/c/1286874
Reviewed-by: Jeremy Klein <jlklein@chromium.org>
Cr-Commit-Position: refs/branch-heads/3578@{#85}
Cr-Branched-From: 4226ddf-refs/heads/master@{#599034}
rogerwang pushed a commit that referenced this pull request Dec 18, 2018
@chrishtr
[IO] Return correct non-empty value in slow path with effects.
6771ba5 
Previously, we always returned true for "is mapped rect non-
empty?" from LocalToAncestorVisualRect in the presence of
effect nodes which may move pixels.

Now return true only if the actual computed rect is non-empty.

Bug:910741

TBR=chrishtr@chromium.org

(cherry picked from commit 5aeac68)

Change-Id: I41935060706b887f58ed14a179d8975bee02c39f
Reviewed-on: https://chromium-review.googlesource.com/c/1359692
Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#613625}
Reviewed-on: https://chromium-review.googlesource.com/c/1363954
Cr-Commit-Position: refs/branch-heads/3626@{#85}
Cr-Branched-From: d897fb1-refs/heads/master@{#612437}
rogerwang pushed a commit that referenced this pull request Feb 10, 2019
@toyoshim
Enable WebFonts cache-aware timeout adaption
d1aca9d 
Enable the feature by default, but with a FeatureList kill-switch.

Bug: 570205
Change-Id: I003c21871ab71e47a863707b9709a39d76883635
Reviewed-on: https://chromium-review.googlesource.com/c/1429820
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Reviewed-by: Kunihiko Sakamoto <ksakamoto@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Takashi Toyoshima <toyoshim@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#626969}(cherry picked from commit 67bee39)
Reviewed-on: https://chromium-review.googlesource.com/c/1446263
Reviewed-by: Takashi Toyoshima <toyoshim@chromium.org>
Cr-Commit-Position: refs/branch-heads/3683@{#85}
Cr-Branched-From: e510299-refs/heads/master@{#625896}
rogerwang pushed a commit that referenced this pull request Mar 24, 2019
[Video Capture Service] Allow buffer retired while still in use in Br…
97528db 
…oadcastingReceiver

In the recently added class BroadcastingReceiver for enabling multi-client
access to video capture devices, see design doc [1], an assumption was made
that producers never retire buffers while they are still in use. Even though
this assumption may have held at some point during development, a test
failure at a CL [2] that moves the service to the browser process on
ChromeOS revealed that it no longer holds.

This CL removes this assumption and adds correct handling of the case.

[1] https://docs.google.com/document/d/1mYnsZfLBRmbsDpUtfb6C7dzhfw2Kcxg_-uiG_6MnWVQ/edit?usp=sharing
[2] https://chromium-review.googlesource.com/c/chromium/src/+/1506604/1

test: services_unittests --gtest_filter=BroadcastingReceiverTest.*
test: services_unittests --gtest_filter=MockVideoCaptureDeviceSharedAccessTest.*
test: content_browsertests --gtest_filter=WebRtcVideoCaptureServiceBrowserTest.*

Bug: 783442, 939587
Change-Id: I9d27c69386e76c2ea472f8549721fa5cf890ae61
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1509902
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Emircan Uysaler <emircan@chromium.org>
Commit-Queue: Christian Fremerey <chfremer@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#639747}(cherry picked from commit ce0b05d2aa49a6b22c1033c4d1081a3d923248a7)
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1520348
Reviewed-by: Christian Fremerey <chfremer@chromium.org>
Cr-Commit-Position: refs/branch-heads/3729@{#85}
Cr-Branched-From: d4a8972-refs/heads/master@{#638880}
@ayushmanchhabra ayushmanchhabra mentioned this pull request Apr 9, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@hujiajie @rogerwang