DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update from https://crrev.com/319330

Browse Source 
- 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
This commit is contained in:
Dave Moore 2015-03-10 15:23:04 -07:00
parent f54dbe91e1
commit f29a08e7d7
7 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/compositor/layer_host.h
View File

@ -22,7 +22,7 @@ class LayerHostClient;
class LayerHost : public SurfaceHolder::Client {
public:
explicit LayerHost(LayerHostClient* client);
~LayerHost();
~LayerHost() override;
LayerHostClient* client() const { return client_; }

2
engine/src/flutter/tools/debugger/debugger.cc
View File

@ -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:

2
engine/src/flutter/tools/debugger/trace_collector.h
View File

@ -18,7 +18,7 @@ class TraceCollector : public mojo::common::DataPipeDrainer::Client {
typedef base::Callback<void(std::string)> TraceCallback;
explicit TraceCollector(mojo::ScopedDataPipeConsumerHandle source);
~TraceCollector();
~TraceCollector() override;
void GetTrace(TraceCallback callback);

2
engine/src/flutter/tools/tester/test_harness_impl.h
View File

@ -19,7 +19,7 @@ class TestHarnessImpl : public TestHarness {
public:
TestHarnessImpl(TestRunner* runner,
mojo::InterfaceRequest<TestHarness> request);
virtual ~TestHarnessImpl();
~TestHarnessImpl() override;
private:
// TestHarness implementation.

4
engine/src/flutter/tools/tester/test_runner.cc
View File

@ -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;

2
engine/src/flutter/tools/tester/test_runner.h
View File

@ -45,8 +45,8 @@ class TestRunner : public mojo::InterfaceFactory<TestHarness> {
mojo::ServiceProviderImpl test_harness_provider_impl_;
TestRunnerClient* client_;
base::WeakPtrFactory<TestRunner> weak_ptr_factory_;
bool enable_pixel_dumping_;
base::WeakPtrFactory<TestRunner> weak_ptr_factory_;
MOJO_DISALLOW_COPY_AND_ASSIGN(TestRunner);
};

29
engine/src/flutter/tools/tester/tester.cc
View File

@ -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<mojo::ServiceProvider> services,
mojo::ServiceProviderPtr exposed_services) override {
void OnEmbed(mojo::View* root,
mojo::InterfaceRequest<mojo::ServiceProvider> 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<mojo::ServiceProvider> services,
mojo::ServiceProviderPtr exposed_services) override {}
void Embed(const mojo::String& url,
mojo::InterfaceRequest<mojo::ServiceProvider> 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);
}