From f29a08e7d791ea9efa8439124a58b3eaaa33f5d1 Mon Sep 17 00:00:00 2001 From: Dave Moore Date: Tue, 10 Mar 2015 15:23:04 -0700 Subject: [PATCH] Update from https://crrev.com/319330 - New chromium clang rules require explicit external destructors so system/lib added for MessagePipe, DataPipe and SharedBuffer - New chromium clang rules require override and no virtual in declarations, so many files updated. - cc_strip_video patch updated. BUG= R=jamesr@chromium.org Review URL: https://codereview.chromium.org/988693005 --- engine/src/flutter/compositor/layer_host.h | 2 +- engine/src/flutter/tools/debugger/debugger.cc | 2 +- .../flutter/tools/debugger/trace_collector.h | 2 +- .../flutter/tools/tester/test_harness_impl.h | 2 +- .../src/flutter/tools/tester/test_runner.cc | 4 +-- engine/src/flutter/tools/tester/test_runner.h | 2 +- engine/src/flutter/tools/tester/tester.cc | 29 +++++++++---------- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/engine/src/flutter/compositor/layer_host.h b/engine/src/flutter/compositor/layer_host.h index 1e4fcc7b17b..36bf2df53a5 100644 --- a/engine/src/flutter/compositor/layer_host.h +++ b/engine/src/flutter/compositor/layer_host.h @@ -22,7 +22,7 @@ class LayerHostClient; class LayerHost : public SurfaceHolder::Client { public: explicit LayerHost(LayerHostClient* client); - ~LayerHost(); + ~LayerHost() override; LayerHostClient* client() const { return client_; } diff --git a/engine/src/flutter/tools/debugger/debugger.cc b/engine/src/flutter/tools/debugger/debugger.cc index ed17436a23b..7ba8c5f14cd 100644 --- a/engine/src/flutter/tools/debugger/debugger.cc +++ b/engine/src/flutter/tools/debugger/debugger.cc @@ -29,7 +29,7 @@ class SkyDebugger : public mojo::ApplicationDelegate, public http_server::HttpHandler { public: SkyDebugger() : is_tracing_(false), handler_binding_(this) {} - virtual ~SkyDebugger() {} + ~SkyDebugger() override {} private: // mojo::ApplicationDelegate: diff --git a/engine/src/flutter/tools/debugger/trace_collector.h b/engine/src/flutter/tools/debugger/trace_collector.h index ce8db02de6f..8c6c322f6e8 100644 --- a/engine/src/flutter/tools/debugger/trace_collector.h +++ b/engine/src/flutter/tools/debugger/trace_collector.h @@ -18,7 +18,7 @@ class TraceCollector : public mojo::common::DataPipeDrainer::Client { typedef base::Callback TraceCallback; explicit TraceCollector(mojo::ScopedDataPipeConsumerHandle source); - ~TraceCollector(); + ~TraceCollector() override; void GetTrace(TraceCallback callback); diff --git a/engine/src/flutter/tools/tester/test_harness_impl.h b/engine/src/flutter/tools/tester/test_harness_impl.h index 3067b525f62..18f86966ee9 100644 --- a/engine/src/flutter/tools/tester/test_harness_impl.h +++ b/engine/src/flutter/tools/tester/test_harness_impl.h @@ -19,7 +19,7 @@ class TestHarnessImpl : public TestHarness { public: TestHarnessImpl(TestRunner* runner, mojo::InterfaceRequest request); - virtual ~TestHarnessImpl(); + ~TestHarnessImpl() override; private: // TestHarness implementation. diff --git a/engine/src/flutter/tools/tester/test_runner.cc b/engine/src/flutter/tools/tester/test_runner.cc index c726989ce10..5982382a543 100644 --- a/engine/src/flutter/tools/tester/test_runner.cc +++ b/engine/src/flutter/tools/tester/test_runner.cc @@ -20,8 +20,8 @@ TestRunner::TestRunner(TestRunnerClient* client, const std::string& url, bool enable_pixel_dumping) : client_(client), - weak_ptr_factory_(this), - enable_pixel_dumping_(enable_pixel_dumping) { + enable_pixel_dumping_(enable_pixel_dumping), + weak_ptr_factory_(this) { CHECK(client); mojo::ServiceProviderPtr test_harness_provider; diff --git a/engine/src/flutter/tools/tester/test_runner.h b/engine/src/flutter/tools/tester/test_runner.h index 57bfab2cac2..88102407afe 100644 --- a/engine/src/flutter/tools/tester/test_runner.h +++ b/engine/src/flutter/tools/tester/test_runner.h @@ -45,8 +45,8 @@ class TestRunner : public mojo::InterfaceFactory { mojo::ServiceProviderImpl test_harness_provider_impl_; TestRunnerClient* client_; - base::WeakPtrFactory weak_ptr_factory_; bool enable_pixel_dumping_; + base::WeakPtrFactory weak_ptr_factory_; MOJO_DISALLOW_COPY_AND_ASSIGN(TestRunner); }; diff --git a/engine/src/flutter/tools/tester/tester.cc b/engine/src/flutter/tools/tester/tester.cc index 631ca4e2604..f0af25c6654 100644 --- a/engine/src/flutter/tools/tester/tester.cc +++ b/engine/src/flutter/tools/tester/tester.cc @@ -64,17 +64,17 @@ class SkyTester : public mojo::ApplicationDelegate, root_(NULL), content_(NULL), weak_ptr_factory_(this) {} - virtual ~SkyTester() {} + ~SkyTester() override {} private: // Overridden from mojo::ApplicationDelegate: - virtual void Initialize(mojo::ApplicationImpl* impl) override { + void Initialize(mojo::ApplicationImpl* impl) override { window_manager_app_->Initialize(impl); if (impl->args().size() >= 2) url_from_args_ = impl->args()[1]; } - virtual bool ConfigureIncomingConnection( + bool ConfigureIncomingConnection( mojo::ApplicationConnection* connection) override { window_manager_app_->ConfigureIncomingConnection(connection); if (test_runner_) @@ -83,9 +83,9 @@ class SkyTester : public mojo::ApplicationDelegate, } // Overridden from mojo::ViewManagerDelegate: - virtual void OnEmbed(mojo::View* root, - mojo::InterfaceRequest services, - mojo::ServiceProviderPtr exposed_services) override { + void OnEmbed(mojo::View* root, + mojo::InterfaceRequest services, + mojo::ServiceProviderPtr exposed_services) override { root_ = root; root_->AddObserver(this); @@ -100,22 +100,21 @@ class SkyTester : public mojo::ApplicationDelegate, } // Overridden from window_manager::WindowManagerDelegate: - virtual void Embed(const mojo::String& url, - mojo::InterfaceRequest services, - mojo::ServiceProviderPtr exposed_services) override {} + void Embed(const mojo::String& url, + mojo::InterfaceRequest services, + mojo::ServiceProviderPtr exposed_services) override {} - virtual void OnViewManagerDisconnected( - mojo::ViewManager* view_manager) override { + void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override { root_ = NULL; } - virtual void OnViewDestroyed(mojo::View* view) override { + void OnViewDestroyed(mojo::View* view) override { view->RemoveObserver(this); } - virtual void OnViewBoundsChanged(mojo::View* view, - const mojo::Rect& old_bounds, - const mojo::Rect& new_bounds) override { + void OnViewBoundsChanged(mojo::View* view, + const mojo::Rect& old_bounds, + const mojo::Rect& new_bounds) override { content_->SetBounds(new_bounds); }