Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: cherry-pick 3feda0244490 from chromium
- Loading branch information
Showing
2 changed files
with
40 additions
and
0 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
From 3feda02444909f1c713264a5740ae43c0258815c Mon Sep 17 00:00:00 2001 | ||
From: Reilly Grant <reillyg@chromium.org> | ||
Date: Mon, 28 Jun 2021 21:55:24 +0000 | ||
Subject: [PATCH] serial: Fix parent class tracing for SerialPort | ||
|
||
When SerialPort was updated to be ActiveScriptWrappable and an | ||
EventTarget the Trace method was not updated to call the parent class | ||
trace methods. | ||
|
||
(cherry picked from commit 4059ecc3a5352601a4d79196f90c8ca19262afe1) | ||
|
||
Bug: 1220078 | ||
Change-Id: If6967a913268bce86d4488359a9418a814530f84 | ||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2965255 | ||
Auto-Submit: Reilly Grant <reillyg@chromium.org> | ||
Commit-Queue: Tom Sepez <tsepez@chromium.org> | ||
Reviewed-by: Tom Sepez <tsepez@chromium.org> | ||
Cr-Original-Commit-Position: refs/heads/master@{#893039} | ||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2992740 | ||
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> | ||
Commit-Queue: Reilly Grant <reillyg@chromium.org> | ||
Cr-Commit-Position: refs/branch-heads/4472@{#1531} | ||
Cr-Branched-From: 3d60439cfb36485e76a1c5bb7f513d3721b20da1-refs/heads/master@{#870763} | ||
--- | ||
|
||
diff --git a/third_party/blink/renderer/modules/serial/serial_port.cc b/third_party/blink/renderer/modules/serial/serial_port.cc | ||
index 681820a..61fe614 100644 | ||
--- a/third_party/blink/renderer/modules/serial/serial_port.cc | ||
+++ b/third_party/blink/renderer/modules/serial/serial_port.cc | ||
@@ -508,7 +508,8 @@ | ||
visitor->Trace(open_resolver_); | ||
visitor->Trace(signal_resolvers_); | ||
visitor->Trace(close_resolver_); | ||
- ScriptWrappable::Trace(visitor); | ||
+ EventTargetWithInlineData::Trace(visitor); | ||
+ ActiveScriptWrappable<SerialPort>::Trace(visitor); | ||
} | ||
|
||
bool SerialPort::HasPendingActivity() const { |