mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
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
This commit is contained in:
parent
b3d20fac21
commit
a5904449e2
@ -22,7 +22,7 @@ class LayerHostClient;
|
||||
class LayerHost : public SurfaceHolder::Client {
|
||||
public:
|
||||
explicit LayerHost(LayerHostClient* client);
|
||||
~LayerHost();
|
||||
~LayerHost() override;
|
||||
|
||||
LayerHostClient* client() const { return client_; }
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ config("config") {
|
||||
# nullptr) conflict with upcoming c++0x types.
|
||||
cflags_cc = [ "-Wno-c++0x-compat" ]
|
||||
|
||||
if (is_linux && cpu_arch == "arm") {
|
||||
if (is_linux && target_cpu == "arm") {
|
||||
# Due to a bug in gcc arm, we get warnings about uninitialized
|
||||
# timesNewRoman.unstatic.3258 and colorTransparent.unstatic.4879.
|
||||
cflags += [ "-Wno-uninitialized" ]
|
||||
|
||||
@ -8,7 +8,7 @@ if (is_android) {
|
||||
import("//build/config/android/config.gni")
|
||||
}
|
||||
|
||||
if (cpu_arch == "arm") {
|
||||
if (target_cpu == "arm") {
|
||||
import("//build/config/arm.gni")
|
||||
} else {
|
||||
# TODO(brettw) remove this once && early-out is checked in.
|
||||
|
||||
@ -640,7 +640,7 @@ source_set("platform") {
|
||||
direct_dependent_configs = [ "//build/config/linux:fontconfig" ]
|
||||
}
|
||||
|
||||
if (cpu_arch == "arm") {
|
||||
if (target_cpu == "arm") {
|
||||
deps += [ ":sky_arm_neon" ]
|
||||
}
|
||||
}
|
||||
@ -713,7 +713,7 @@ test("platform_unittests") {
|
||||
include_dirs = [ "$root_build_dir" ]
|
||||
}
|
||||
|
||||
if (cpu_arch == "arm") {
|
||||
if (target_cpu == "arm") {
|
||||
source_set("sky_arm_neon") {
|
||||
sources = [
|
||||
"graphics/cpu/arm/WebGLImageConversionNEON.h",
|
||||
|
||||
@ -38,7 +38,7 @@ namespace {
|
||||
|
||||
class ImageDecodingStoreTest : public ::testing::Test, public MockImageDecoderClient {
|
||||
public:
|
||||
virtual void SetUp()
|
||||
void SetUp() override
|
||||
{
|
||||
ImageDecodingStore::instance()->setCacheLimitInBytes(1024 * 1024);
|
||||
m_data = SharedBuffer::create();
|
||||
@ -46,17 +46,17 @@ public:
|
||||
m_decodersDestroyed = 0;
|
||||
}
|
||||
|
||||
virtual void TearDown()
|
||||
void TearDown() override
|
||||
{
|
||||
ImageDecodingStore::instance()->clear();
|
||||
}
|
||||
|
||||
virtual void decoderBeingDestroyed()
|
||||
void decoderBeingDestroyed() override
|
||||
{
|
||||
++m_decodersDestroyed;
|
||||
}
|
||||
|
||||
virtual void frameBufferRequested()
|
||||
void frameBufferRequested() override
|
||||
{
|
||||
// Decoder is never used by ImageDecodingStore.
|
||||
ASSERT_TRUE(false);
|
||||
|
||||
@ -205,7 +205,7 @@ public:
|
||||
|
||||
class DrawingBufferTest : public Test {
|
||||
protected:
|
||||
virtual void SetUp()
|
||||
void SetUp() override
|
||||
{
|
||||
RefPtr<FakeContextEvictionManager> contextEvictionManager = adoptRef(new FakeContextEvictionManager());
|
||||
OwnPtr<WebGraphicsContext3DForTests> context = adoptPtr(new WebGraphicsContext3DForTests);
|
||||
@ -443,7 +443,7 @@ TEST_F(DrawingBufferTest, verifyInsertAndWaitSyncPointCorrectly)
|
||||
|
||||
class DrawingBufferImageChromiumTest : public DrawingBufferTest {
|
||||
protected:
|
||||
virtual void SetUp()
|
||||
void SetUp() override
|
||||
{
|
||||
RefPtr<FakeContextEvictionManager> contextEvictionManager = adoptRef(new FakeContextEvictionManager());
|
||||
OwnPtr<WebGraphicsContext3DForTests> context = adoptPtr(new WebGraphicsContext3DForTests);
|
||||
@ -456,7 +456,7 @@ protected:
|
||||
testing::Mock::VerifyAndClearExpectations(webContext());
|
||||
}
|
||||
|
||||
virtual void TearDown()
|
||||
void TearDown() override
|
||||
{
|
||||
RuntimeEnabledFeatures::setWebGLImageChromiumEnabled(false);
|
||||
}
|
||||
|
||||
@ -50,16 +50,16 @@ public:
|
||||
: m_buffer(buffer)
|
||||
{
|
||||
}
|
||||
virtual ~CStringBuffer() { }
|
||||
~CStringBuffer() override { }
|
||||
|
||||
virtual char* allocate(size_t size) override
|
||||
char* allocate(size_t size) override
|
||||
{
|
||||
char* ptr;
|
||||
m_buffer = CString::newUninitialized(size, ptr);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
virtual void copy(const CString& source) override
|
||||
void copy(const CString& source) override
|
||||
{
|
||||
m_buffer = source;
|
||||
}
|
||||
@ -76,16 +76,16 @@ public:
|
||||
: m_buffer(buffer)
|
||||
{
|
||||
}
|
||||
virtual ~VectorCharAppendBuffer() { }
|
||||
~VectorCharAppendBuffer() override { }
|
||||
|
||||
virtual char* allocate(size_t size) override
|
||||
char* allocate(size_t size) override
|
||||
{
|
||||
size_t oldSize = m_buffer.size();
|
||||
m_buffer.grow(oldSize + size);
|
||||
return m_buffer.data() + oldSize;
|
||||
}
|
||||
|
||||
virtual void copy(const CString& source) override
|
||||
void copy(const CString& source) override
|
||||
{
|
||||
m_buffer.append(source.data(), source.length());
|
||||
}
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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);
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ class TestHarnessImpl : public TestHarness {
|
||||
public:
|
||||
TestHarnessImpl(TestRunner* runner,
|
||||
mojo::InterfaceRequest<TestHarness> request);
|
||||
virtual ~TestHarnessImpl();
|
||||
~TestHarnessImpl() override;
|
||||
|
||||
private:
|
||||
// TestHarness implementation.
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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);
|
||||
};
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ class DocumentView;
|
||||
class Internals : public base::SupportsUserData::Data,
|
||||
public mojo::Shell {
|
||||
public:
|
||||
virtual ~Internals();
|
||||
~Internals() override;
|
||||
|
||||
static void Create(Dart_Isolate isolate, DocumentView* document_view);
|
||||
|
||||
|
||||
@ -27,11 +27,11 @@ class Viewer : public mojo::ApplicationDelegate,
|
||||
public:
|
||||
Viewer() {}
|
||||
|
||||
virtual ~Viewer() { blink::shutdown(); }
|
||||
~Viewer() override { blink::shutdown(); }
|
||||
|
||||
private:
|
||||
// Overridden from ApplicationDelegate:
|
||||
virtual void Initialize(mojo::ApplicationImpl* app) override {
|
||||
void Initialize(mojo::ApplicationImpl* app) override {
|
||||
RuntimeFlags::Initialize(app);
|
||||
|
||||
mojo::NetworkServicePtr network_service;
|
||||
@ -43,15 +43,15 @@ class Viewer : public mojo::ApplicationDelegate,
|
||||
tracing_.Initialize(app);
|
||||
}
|
||||
|
||||
virtual bool ConfigureIncomingConnection(
|
||||
bool ConfigureIncomingConnection(
|
||||
mojo::ApplicationConnection* connection) override {
|
||||
connection->AddService<mojo::ContentHandler>(this);
|
||||
return true;
|
||||
}
|
||||
|
||||
// Overridden from InterfaceFactory<ContentHandler>
|
||||
virtual void Create(mojo::ApplicationConnection* connection,
|
||||
mojo::InterfaceRequest<mojo::ContentHandler> request) override {
|
||||
void Create(mojo::ApplicationConnection* connection,
|
||||
mojo::InterfaceRequest<mojo::ContentHandler> request) override {
|
||||
new ContentHandlerImpl(request.Pass());
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user