Commit 75a33c8f authored by Takuto Ikuta's avatar Takuto Ikuta Committed by Commit Bot

Apply modernize-use-override for blink/renderer/platform

I applied modernize-use-override in blink/renderer/platform
http://clang.llvm.org/extra/clang-tidy/checks/modernize-use-override.html

Bug: 428099
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I481f68cd5dfce10e19e938fdee31d4efcadfabef
Reviewed-on: https://chromium-review.googlesource.com/1027230Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553524}
parent f8f8f958
...@@ -110,7 +110,7 @@ class MockGLES2InterfaceWithImageSupport : public FakeGLES2Interface { ...@@ -110,7 +110,7 @@ class MockGLES2InterfaceWithImageSupport : public FakeGLES2Interface {
MOCK_METHOD2(GenTextures, void(GLsizei, GLuint*)); MOCK_METHOD2(GenTextures, void(GLsizei, GLuint*));
MOCK_METHOD2(DeleteTextures, void(GLsizei, const GLuint*)); MOCK_METHOD2(DeleteTextures, void(GLsizei, const GLuint*));
// Fake // Fake
void GenMailboxCHROMIUM(GLbyte* name) { void GenMailboxCHROMIUM(GLbyte* name) override {
name[0] = 1; // Make non-zero mailbox names name[0] = 1; // Make non-zero mailbox names
} }
}; };
...@@ -458,14 +458,14 @@ class MockLogger : public Canvas2DLayerBridge::Logger { ...@@ -458,14 +458,14 @@ class MockLogger : public Canvas2DLayerBridge::Logger {
MOCK_METHOD1(ReportHibernationEvent, MOCK_METHOD1(ReportHibernationEvent,
void(Canvas2DLayerBridge::HibernationEvent)); void(Canvas2DLayerBridge::HibernationEvent));
MOCK_METHOD0(DidStartHibernating, void()); MOCK_METHOD0(DidStartHibernating, void());
virtual ~MockLogger() = default; ~MockLogger() override = default;
}; };
class MockCanvasResourceHost : public CanvasResourceHost { class MockCanvasResourceHost : public CanvasResourceHost {
public: public:
void NotifySurfaceInvalid() {} void NotifySurfaceInvalid() override {}
void SetNeedsCompositingUpdate() {} void SetNeedsCompositingUpdate() override {}
void UpdateMemoryUsage() {} void UpdateMemoryUsage() override {}
MOCK_CONST_METHOD1(RestoreCanvasMatrixClipStack, void(PaintCanvas*)); MOCK_CONST_METHOD1(RestoreCanvasMatrixClipStack, void(PaintCanvas*));
}; };
......
...@@ -108,12 +108,12 @@ class GLES2InterfaceForTests : public gpu::gles2::GLES2InterfaceStub, ...@@ -108,12 +108,12 @@ class GLES2InterfaceForTests : public gpu::gles2::GLES2InterfaceStub,
state_.renderbuffer_binding = renderbuffer; state_.renderbuffer_binding = renderbuffer;
} }
void Enable(GLenum cap) { void Enable(GLenum cap) override {
if (cap == GL_SCISSOR_TEST) if (cap == GL_SCISSOR_TEST)
state_.scissor_enabled = true; state_.scissor_enabled = true;
} }
void Disable(GLenum cap) { void Disable(GLenum cap) override {
if (cap == GL_SCISSOR_TEST) if (cap == GL_SCISSOR_TEST)
state_.scissor_enabled = false; state_.scissor_enabled = false;
} }
...@@ -232,7 +232,7 @@ class GLES2InterfaceForTests : public gpu::gles2::GLES2InterfaceStub, ...@@ -232,7 +232,7 @@ class GLES2InterfaceForTests : public gpu::gles2::GLES2InterfaceStub,
} }
MOCK_METHOD1(DestroyImageMock, void(GLuint imageId)); MOCK_METHOD1(DestroyImageMock, void(GLuint imageId));
void DestroyImageCHROMIUM(GLuint image_id) { void DestroyImageCHROMIUM(GLuint image_id) override {
image_sizes_.erase(image_id); image_sizes_.erase(image_id);
// No textures should be bound to this. // No textures should be bound to this.
CHECK(image_to_texture_map_.find(image_id) == image_to_texture_map_.end()); CHECK(image_to_texture_map_.find(image_id) == image_to_texture_map_.end());
...@@ -241,7 +241,7 @@ class GLES2InterfaceForTests : public gpu::gles2::GLES2InterfaceStub, ...@@ -241,7 +241,7 @@ class GLES2InterfaceForTests : public gpu::gles2::GLES2InterfaceStub,
} }
MOCK_METHOD1(BindTexImage2DMock, void(GLint imageId)); MOCK_METHOD1(BindTexImage2DMock, void(GLint imageId));
void BindTexImage2DCHROMIUM(GLenum target, GLint image_id) { void BindTexImage2DCHROMIUM(GLenum target, GLint image_id) override {
if (target == ImageCHROMIUMTextureTarget()) { if (target == ImageCHROMIUMTextureTarget()) {
texture_sizes_.Set(bound_textures_[target], texture_sizes_.Set(bound_textures_[target],
image_sizes_.find(image_id)->value); image_sizes_.find(image_id)->value);
...@@ -251,7 +251,7 @@ class GLES2InterfaceForTests : public gpu::gles2::GLES2InterfaceStub, ...@@ -251,7 +251,7 @@ class GLES2InterfaceForTests : public gpu::gles2::GLES2InterfaceStub,
} }
MOCK_METHOD1(ReleaseTexImage2DMock, void(GLint imageId)); MOCK_METHOD1(ReleaseTexImage2DMock, void(GLint imageId));
void ReleaseTexImage2DCHROMIUM(GLenum target, GLint image_id) { void ReleaseTexImage2DCHROMIUM(GLenum target, GLint image_id) override {
if (target == ImageCHROMIUMTextureTarget()) { if (target == ImageCHROMIUMTextureTarget()) {
image_sizes_.Set(current_image_id_, IntSize()); image_sizes_.Set(current_image_id_, IntSize());
image_to_texture_map_.erase(image_id); image_to_texture_map_.erase(image_id);
......
...@@ -35,7 +35,7 @@ namespace { ...@@ -35,7 +35,7 @@ namespace {
class MockVideoFrameProvider : public cc::VideoFrameProvider { class MockVideoFrameProvider : public cc::VideoFrameProvider {
public: public:
MockVideoFrameProvider() = default; MockVideoFrameProvider() = default;
~MockVideoFrameProvider() = default; ~MockVideoFrameProvider() override = default;
MOCK_METHOD1(SetVideoFrameProviderClient, void(Client*)); MOCK_METHOD1(SetVideoFrameProviderClient, void(Client*));
MOCK_METHOD2(UpdateCurrentFrame, bool(base::TimeTicks, base::TimeTicks)); MOCK_METHOD2(UpdateCurrentFrame, bool(base::TimeTicks, base::TimeTicks));
...@@ -52,7 +52,7 @@ class MockCompositorFrameSink : public viz::mojom::blink::CompositorFrameSink { ...@@ -52,7 +52,7 @@ class MockCompositorFrameSink : public viz::mojom::blink::CompositorFrameSink {
MockCompositorFrameSink( MockCompositorFrameSink(
viz::mojom::blink::CompositorFrameSinkRequest* request) viz::mojom::blink::CompositorFrameSinkRequest* request)
: binding_(this, std::move(*request)) {} : binding_(this, std::move(*request)) {}
~MockCompositorFrameSink() = default; ~MockCompositorFrameSink() override = default;
MOCK_METHOD1(SetNeedsBeginFrame, void(bool)); MOCK_METHOD1(SetNeedsBeginFrame, void(bool));
MOCK_METHOD0(SetWantsAnimateOnlyBeginFrames, void()); MOCK_METHOD0(SetWantsAnimateOnlyBeginFrames, void());
...@@ -99,7 +99,7 @@ class MockVideoFrameResourceProvider ...@@ -99,7 +99,7 @@ class MockVideoFrameResourceProvider
cc::LayerTreeSettings()) { cc::LayerTreeSettings()) {
blink::VideoFrameResourceProvider::Initialize(context_provider); blink::VideoFrameResourceProvider::Initialize(context_provider);
} }
~MockVideoFrameResourceProvider() = default; ~MockVideoFrameResourceProvider() override = default;
MOCK_METHOD1(Initialize, void(viz::ContextProvider*)); MOCK_METHOD1(Initialize, void(viz::ContextProvider*));
MOCK_METHOD3(AppendQuads, MOCK_METHOD3(AppendQuads,
......
...@@ -50,7 +50,7 @@ class LifecycleNotifier : public GarbageCollectedMixin { ...@@ -50,7 +50,7 @@ class LifecycleNotifier : public GarbageCollectedMixin {
// and safe to use while handling the notification. // and safe to use while handling the notification.
virtual void NotifyContextDestroyed(); virtual void NotifyContextDestroyed();
virtual void Trace(blink::Visitor* visitor) { visitor->Trace(observers_); } void Trace(blink::Visitor* visitor) override { visitor->Trace(observers_); }
bool IsIteratingOverObservers() const { bool IsIteratingOverObservers() const {
return iteration_state_ != kNotIterating; return iteration_state_ != kNotIterating;
......
...@@ -37,7 +37,7 @@ class LifecycleNotifier; ...@@ -37,7 +37,7 @@ class LifecycleNotifier;
template <typename Context, typename Observer> template <typename Context, typename Observer>
class LifecycleObserver : public GarbageCollectedMixin { class LifecycleObserver : public GarbageCollectedMixin {
public: public:
virtual void Trace(blink::Visitor* visitor) { void Trace(blink::Visitor* visitor) override {
visitor->Trace(lifecycle_context_); visitor->Trace(lifecycle_context_);
} }
......
...@@ -709,7 +709,7 @@ class PODRedBlackTree { ...@@ -709,7 +709,7 @@ class PODRedBlackTree {
public: public:
Counter() : count_(0) {} Counter() : count_(0) {}
virtual void Visit(const T&) { ++count_; } void Visit(const T&) override { ++count_; }
int Count() const { return count_; } int Count() const { return count_; }
private: private:
......
...@@ -31,7 +31,7 @@ namespace task_queue_selector_unittest { ...@@ -31,7 +31,7 @@ namespace task_queue_selector_unittest {
class MockObserver : public TaskQueueSelector::Observer { class MockObserver : public TaskQueueSelector::Observer {
public: public:
MockObserver() = default; MockObserver() = default;
virtual ~MockObserver() = default; ~MockObserver() override = default;
MOCK_METHOD1(OnTaskQueueEnabled, void(internal::TaskQueueImpl*)); MOCK_METHOD1(OnTaskQueueEnabled, void(internal::TaskQueueImpl*));
......
...@@ -21,7 +21,7 @@ namespace render_widget_signals_unittest { ...@@ -21,7 +21,7 @@ namespace render_widget_signals_unittest {
class MockObserver : public RenderWidgetSignals::Observer { class MockObserver : public RenderWidgetSignals::Observer {
public: public:
MockObserver() = default; MockObserver() = default;
virtual ~MockObserver() = default; ~MockObserver() override = default;
MOCK_METHOD1(SetAllRenderWidgetsHidden, void(bool hidden)); MOCK_METHOD1(SetAllRenderWidgetsHidden, void(bool hidden));
MOCK_METHOD1(SetHasVisibleRenderWidgetWithTouchHandler, MOCK_METHOD1(SetHasVisibleRenderWidgetWithTouchHandler,
......
...@@ -111,9 +111,10 @@ class MockScrollableAreaForAnimatorTest ...@@ -111,9 +111,10 @@ class MockScrollableAreaForAnimatorTest
return ScrollableArea::GetScrollOffset(); return ScrollableArea::GetScrollOffset();
} }
void SetScrollOffset(const ScrollOffset& offset, void SetScrollOffset(
ScrollType type, const ScrollOffset& offset,
ScrollBehavior behavior = kScrollBehaviorInstant) { ScrollType type,
ScrollBehavior behavior = kScrollBehaviorInstant) override {
if (animator) if (animator)
animator->SetCurrentOffset(offset); animator->SetCurrentOffset(offset);
ScrollableArea::SetScrollOffset(offset, type, behavior); ScrollableArea::SetScrollOffset(offset, type, behavior);
...@@ -131,7 +132,7 @@ class MockScrollableAreaForAnimatorTest ...@@ -131,7 +132,7 @@ class MockScrollableAreaForAnimatorTest
return ScrollbarTheme::DeprecatedStaticGetTheme(); return ScrollbarTheme::DeprecatedStaticGetTheme();
} }
virtual void Trace(blink::Visitor* visitor) { void Trace(blink::Visitor* visitor) override {
visitor->Trace(animator); visitor->Trace(animator);
ScrollableArea::Trace(visitor); ScrollableArea::Trace(visitor);
} }
......
...@@ -90,7 +90,7 @@ class MockScrollableArea : public GarbageCollectedFinalized<MockScrollableArea>, ...@@ -90,7 +90,7 @@ class MockScrollableArea : public GarbageCollectedFinalized<MockScrollableArea>,
} }
bool ScrollAnimatorEnabled() const override { return false; } bool ScrollAnimatorEnabled() const override { return false; }
int PageStep(ScrollbarOrientation) const override { return 0; } int PageStep(ScrollbarOrientation) const override { return 0; }
void ScrollControlWasSetNeedsPaintInvalidation() {} void ScrollControlWasSetNeedsPaintInvalidation() override {}
void SetScrollOrigin(const IntPoint& origin) { void SetScrollOrigin(const IntPoint& origin) {
ScrollableArea::SetScrollOrigin(origin); ScrollableArea::SetScrollOrigin(origin);
} }
...@@ -114,7 +114,7 @@ class MockScrollableArea : public GarbageCollectedFinalized<MockScrollableArea>, ...@@ -114,7 +114,7 @@ class MockScrollableArea : public GarbageCollectedFinalized<MockScrollableArea>,
using ScrollableArea::VerticalScrollbarNeedsPaintInvalidation; using ScrollableArea::VerticalScrollbarNeedsPaintInvalidation;
using ScrollableArea::ClearNeedsPaintInvalidationForScrollControls; using ScrollableArea::ClearNeedsPaintInvalidationForScrollControls;
virtual void Trace(blink::Visitor* visitor) { void Trace(blink::Visitor* visitor) override {
visitor->Trace(chrome_client_); visitor->Trace(chrome_client_);
ScrollableArea::Trace(visitor); ScrollableArea::Trace(visitor);
} }
......
...@@ -148,7 +148,7 @@ class Supplement : public GarbageCollectedMixin, ...@@ -148,7 +148,7 @@ class Supplement : public GarbageCollectedMixin,
: nullptr; : nullptr;
} }
virtual void Trace(blink::Visitor* visitor) { void Trace(blink::Visitor* visitor) override {
visitor->Trace(supplementable_); visitor->Trace(supplementable_);
} }
...@@ -204,7 +204,7 @@ class Supplementable : public GarbageCollectedMixin { ...@@ -204,7 +204,7 @@ class Supplementable : public GarbageCollectedMixin {
#endif #endif
} }
virtual void Trace(blink::Visitor* visitor) { visitor->Trace(supplements_); } void Trace(blink::Visitor* visitor) override { visitor->Trace(supplements_); }
virtual void TraceWrappers(const ScriptWrappableVisitor* visitor) const { virtual void TraceWrappers(const ScriptWrappableVisitor* visitor) const {
for (const auto& supplement : supplements_.Values()) for (const auto& supplement : supplements_.Values())
visitor->TraceWrappers(supplement); visitor->TraceWrappers(supplement);
......
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