Commit 93edaa27 authored by Primiano Tucci's avatar Primiano Tucci Committed by Commit Bot

Manual Roll src/third_party/perfetto 0aa745498c75..307b31ea2a17 (3 commits)

https://android.googlesource.com/platform/external/perfetto.git/+log/0aa745498c75..307b31ea2a17

git log 0aa745498c75..307b31ea2a17 --date=short --first-parent --format='%ad %ae %s'
2020-04-17 treehugger-gerrit@google.com Merge "Merged proto: Add TracingServiceState to merged protos"
2020-04-17 fmayer@google.com Improve symbolization docs.
2020-04-17 treehugger-gerrit@google.com Merge "IPC: Add Sync() method to synchronize Producer and Service"

Created with:
  gclient setdep -r src/third_party/perfetto@307b31ea2a17

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/perfetto-chromium-autoroll
Please CC perfetto-bugs@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

Bug: chromium:154237981
Change-Id: Iffb65e9784181e4d42311b9bac94631b67732277
Tbr: perfetto-bugs@google.com
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152792Reviewed-by: default avatarSami Kyöstilä <skyostil@chromium.org>
Commit-Queue: Sami Kyöstilä <skyostil@chromium.org>
Commit-Queue: Primiano Tucci <primiano@chromium.org>
Auto-Submit: Primiano Tucci <primiano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760042}
parent 51dbd7f7
...@@ -1217,7 +1217,7 @@ deps = { ...@@ -1217,7 +1217,7 @@ deps = {
}, },
'src/third_party/perfetto': 'src/third_party/perfetto':
Var('android_git') + '/platform/external/perfetto.git' + '@' + '0aa745498c75343ec13a043015ab8f0bc2e36c47', Var('android_git') + '/platform/external/perfetto.git' + '@' + '307b31ea2a1789820d4422463fc11bb19d90b973',
'src/third_party/perl': { 'src/third_party/perl': {
'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3', 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
......
...@@ -354,6 +354,10 @@ bool ProducerClient::IsShmemProvidedByProducer() const { ...@@ -354,6 +354,10 @@ bool ProducerClient::IsShmemProvidedByProducer() const {
return false; return false;
} }
void ProducerClient::Sync(std::function<void()>) {
NOTREACHED();
}
void ProducerClient::BindClientAndHostPipesForTesting( void ProducerClient::BindClientAndHostPipesForTesting(
mojo::PendingReceiver<mojom::ProducerClient> producer_client_receiver, mojo::PendingReceiver<mojom::ProducerClient> producer_client_receiver,
mojo::PendingRemote<mojom::ProducerHost> producer_host_remote) { mojo::PendingRemote<mojom::ProducerHost> producer_host_remote) {
......
...@@ -101,6 +101,7 @@ class COMPONENT_EXPORT(TRACING_CPP) ProducerClient ...@@ -101,6 +101,7 @@ class COMPONENT_EXPORT(TRACING_CPP) ProducerClient
void ActivateTriggers(const std::vector<std::string>&) override; void ActivateTriggers(const std::vector<std::string>&) override;
size_t shared_buffer_page_size_kb() const override; size_t shared_buffer_page_size_kb() const override;
bool IsShmemProvidedByProducer() const override; bool IsShmemProvidedByProducer() const override;
void Sync(std::function<void()> callback) override;
void BindClientAndHostPipesForTesting( void BindClientAndHostPipesForTesting(
mojo::PendingReceiver<mojom::ProducerClient>, mojo::PendingReceiver<mojom::ProducerClient>,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment