diff options
author | avi <avi@chromium.org> | 2015-12-07 08:11:54 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-07 16:13:09 +0000 |
commit | 50e3df675d58385e566645effb6ccfd3c8562443 (patch) | |
tree | 6519f875491e57f5795bd68fc3249303a3a33d98 | |
parent | b2d3d602cd213055bb54117152926c9989e3938f (diff) | |
download | chromium_src-50e3df675d58385e566645effb6ccfd3c8562443.zip chromium_src-50e3df675d58385e566645effb6ccfd3c8562443.tar.gz chromium_src-50e3df675d58385e566645effb6ccfd3c8562443.tar.bz2 |
Revert of Enforce marking "override" for functions overriding Blink. (patchset #19 id:360001 of https://codereview.chromium.org/1370923002/ )
Reason for revert:
Missed one.
Original issue's description:
> Enforce marking "override" for functions overriding Blink.
>
> BUG=535367
> TEST=it all stays working
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
> TBR=ben@chromium.org
>
> Committed: https://crrev.com/32ff552858e014d454ce8b181f5aca1dfcf8f8fd
> Cr-Commit-Position: refs/heads/master@{#363482}
TBR=thakis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=535367
Review URL: https://codereview.chromium.org/1504913002
Cr-Commit-Position: refs/heads/master@{#363492}
19 files changed, 132 insertions, 126 deletions
diff --git a/android_webview/renderer/aw_content_settings_client.h b/android_webview/renderer/aw_content_settings_client.h index 90a9479..5d44551 100644 --- a/android_webview/renderer/aw_content_settings_client.h +++ b/android_webview/renderer/aw_content_settings_client.h @@ -20,14 +20,14 @@ class AwContentSettingsClient : public content::RenderFrameObserver, ~AwContentSettingsClient() override; // blink::WebContentSettingsClient implementation. - bool allowDisplayingInsecureContent( + virtual bool allowDisplayingInsecureContent( bool enabled_per_settings, const blink::WebSecurityOrigin& origin, - const blink::WebURL& url) override; - bool allowRunningInsecureContent( + const blink::WebURL& url); + virtual bool allowRunningInsecureContent( bool enabled_per_settings, const blink::WebSecurityOrigin& origin, - const blink::WebURL& url) override; + const blink::WebURL& url); DISALLOW_COPY_AND_ASSIGN(AwContentSettingsClient); }; diff --git a/build/common.gypi b/build/common.gypi index 6b2cb0a..544f964 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2227,8 +2227,7 @@ 'clang_dynlib_flags%': '', }], ], - 'clang_plugin_args%': '-Xclang -plugin-arg-find-bad-constructs -Xclang check-templates ' - '-Xclang -plugin-arg-find-bad-constructs -Xclang enforce-overriding-blink ', + 'clang_plugin_args%': '-Xclang -plugin-arg-find-bad-constructs -Xclang check-templates ', }, # If you change these, also change build/config/clang/BUILD.gn. 'clang_chrome_plugins_flags%': diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn index e560431..02c5f2c 100644 --- a/build/config/clang/BUILD.gn +++ b/build/config/clang/BUILD.gn @@ -40,10 +40,6 @@ config("find_bad_constructs") { "-plugin-arg-find-bad-constructs", "-Xclang", "check-templates", - "-Xclang", - "-plugin-arg-find-bad-constructs", - "-Xclang", - "enforce-overriding-blink", ] } } diff --git a/cc/blink/web_scroll_offset_animation_curve_impl.h b/cc/blink/web_scroll_offset_animation_curve_impl.h index 3a21853..32c6fb9 100644 --- a/cc/blink/web_scroll_offset_animation_curve_impl.h +++ b/cc/blink/web_scroll_offset_animation_curve_impl.h @@ -33,8 +33,8 @@ class WebScrollOffsetAnimationCurveImpl blink::WebFloatPoint getValue(double time) const override; double duration() const override; - blink::WebFloatPoint targetValue() const override; - void updateTarget(double time, blink::WebFloatPoint new_target) override; + virtual blink::WebFloatPoint targetValue() const; + virtual void updateTarget(double time, blink::WebFloatPoint new_target); scoped_ptr<cc::AnimationCurve> CloneToAnimationCurve() const; diff --git a/components/test_runner/mock_web_theme_engine.h b/components/test_runner/mock_web_theme_engine.h index fc6d0ac..362ed02 100644 --- a/components/test_runner/mock_web_theme_engine.h +++ b/components/test_runner/mock_web_theme_engine.h @@ -15,12 +15,12 @@ class MockWebThemeEngine : public blink::WebThemeEngine { #if !defined(OS_MACOSX) // blink::WebThemeEngine: - blink::WebSize getSize(blink::WebThemeEngine::Part) override; - void paint(blink::WebCanvas*, - blink::WebThemeEngine::Part, - blink::WebThemeEngine::State, - const blink::WebRect&, - const blink::WebThemeEngine::ExtraParams*) override; + virtual blink::WebSize getSize(blink::WebThemeEngine::Part); + virtual void paint(blink::WebCanvas*, + blink::WebThemeEngine::Part, + blink::WebThemeEngine::State, + const blink::WebRect&, + const blink::WebThemeEngine::ExtraParams*); #endif // !defined(OS_MACOSX) }; diff --git a/content/browser/android/in_process/context_provider_in_process.cc b/content/browser/android/in_process/context_provider_in_process.cc index cd9bd7d..71f8010 100644 --- a/content/browser/android/in_process/context_provider_in_process.cc +++ b/content/browser/android/in_process/context_provider_in_process.cc @@ -25,11 +25,11 @@ class ContextProviderInProcess::LostContextCallbackProxy provider_->WebContext3DImpl()->setContextLostCallback(this); } - ~LostContextCallbackProxy() override { + virtual ~LostContextCallbackProxy() { provider_->WebContext3DImpl()->setContextLostCallback(NULL); } - void onContextLost() override { + virtual void onContextLost() { provider_->OnLostContext(); } diff --git a/content/child/blink_platform_impl.h b/content/child/blink_platform_impl.h index c77dd9a..b6850f2 100644 --- a/content/child/blink_platform_impl.h +++ b/content/child/blink_platform_impl.h @@ -119,7 +119,7 @@ class CONTENT_EXPORT BlinkPlatformImpl const char* category_name) override; TraceEventAPIAtomicWord* getTraceSamplingState( const unsigned thread_bucket) override; - TraceEventHandle addTraceEvent( + virtual TraceEventHandle addTraceEvent( char phase, const unsigned char* category_group_enabled, const char* name, @@ -131,7 +131,7 @@ class CONTENT_EXPORT BlinkPlatformImpl const unsigned char* arg_types, const unsigned long long* arg_values, blink::WebConvertableToTraceFormat* convertable_values, - unsigned int flags) override; + unsigned int flags); virtual TraceEventHandle addTraceEvent( char phase, const unsigned char* category_group_enabled, diff --git a/content/child/service_worker/service_worker_dispatcher_unittest.cc b/content/child/service_worker/service_worker_dispatcher_unittest.cc index 93d9465..5df0501 100644 --- a/content/child/service_worker/service_worker_dispatcher_unittest.cc +++ b/content/child/service_worker/service_worker_dispatcher_unittest.cc @@ -116,13 +116,13 @@ class MockWebServiceWorkerProviderClientImpl dispatcher_->AddProviderClient(provider_id, this); } - ~MockWebServiceWorkerProviderClientImpl() override { + ~MockWebServiceWorkerProviderClientImpl() { dispatcher_->RemoveProviderClient(provider_id_); } void setController( blink::WebPassOwnPtr<blink::WebServiceWorker::Handle> handle, - bool shouldNotifyControllerChange) override { + bool shouldNotifyControllerChange) { // WebPassOwnPtr cannot be owned in Chromium, so drop the handle here. // The destruction releases ServiceWorkerHandleReference. is_set_controlled_called_ = true; diff --git a/content/child/webthemeengine_impl_android.h b/content/child/webthemeengine_impl_android.h index 3483ab5..e641a60 100644 --- a/content/child/webthemeengine_impl_android.h +++ b/content/child/webthemeengine_impl_android.h @@ -12,12 +12,13 @@ namespace content { class WebThemeEngineImpl : public blink::WebThemeEngine { public: // WebThemeEngine methods: - blink::WebSize getSize(blink::WebThemeEngine::Part) override; - void paint(blink::WebCanvas* canvas, - blink::WebThemeEngine::Part part, - blink::WebThemeEngine::State state, - const blink::WebRect& rect, - const blink::WebThemeEngine::ExtraParams* extra_params) override; + virtual blink::WebSize getSize(blink::WebThemeEngine::Part); + virtual void paint( + blink::WebCanvas* canvas, + blink::WebThemeEngine::Part part, + blink::WebThemeEngine::State state, + const blink::WebRect& rect, + const blink::WebThemeEngine::ExtraParams* extra_params); }; } // namespace content diff --git a/content/child/webthemeengine_impl_default.h b/content/child/webthemeengine_impl_default.h index df25238..a05313a 100644 --- a/content/child/webthemeengine_impl_default.h +++ b/content/child/webthemeengine_impl_default.h @@ -12,12 +12,13 @@ namespace content { class WebThemeEngineImpl : public blink::WebThemeEngine { public: // WebThemeEngine methods: - blink::WebSize getSize(blink::WebThemeEngine::Part) override; - void paint(blink::WebCanvas* canvas, - blink::WebThemeEngine::Part part, - blink::WebThemeEngine::State state, - const blink::WebRect& rect, - const blink::WebThemeEngine::ExtraParams* extra_params) override; + virtual blink::WebSize getSize(blink::WebThemeEngine::Part); + virtual void paint( + blink::WebCanvas* canvas, + blink::WebThemeEngine::Part part, + blink::WebThemeEngine::State state, + const blink::WebRect& rect, + const blink::WebThemeEngine::ExtraParams* extra_params); virtual void paintStateTransition(blink::WebCanvas* canvas, blink::WebThemeEngine::Part part, blink::WebThemeEngine::State startState, diff --git a/content/ppapi_plugin/ppapi_blink_platform_impl.cc b/content/ppapi_plugin/ppapi_blink_platform_impl.cc index de977b2..ddfdc78 100644 --- a/content/ppapi_plugin/ppapi_blink_platform_impl.cc +++ b/content/ppapi_plugin/ppapi_blink_platform_impl.cc @@ -45,10 +45,9 @@ class PpapiBlinkPlatformImpl::SandboxSupport : public WebSandboxSupport { bool loadFont(NSFont* srcFont, CGFontRef* out, uint32_t* fontID) override; #elif defined(OS_POSIX) SandboxSupport(); - void getFallbackFontForCharacter( - WebUChar32 character, - const char* preferred_locale, - blink::WebFallbackFont* fallbackFont) override; + void getFallbackFontForCharacter(WebUChar32 character, + const char* preferred_locale, + blink::WebFallbackFont* fallbackFont); void getRenderStyleForStrike(const char* family, int sizeAndStyle, blink::WebFontRenderStyle* out) override; diff --git a/content/renderer/media/android/media_info_loader.h b/content/renderer/media/android/media_info_loader.h index 067e580..b421fb3 100644 --- a/content/renderer/media/android/media_info_loader.h +++ b/content/renderer/media/android/media_info_loader.h @@ -59,7 +59,7 @@ class CONTENT_EXPORT MediaInfoLoader : private blink::WebURLLoaderClient { const GURL& url, blink::WebMediaPlayer::CORSMode cors_mode, const ReadyCB& ready_cb); - ~MediaInfoLoader() override; + virtual ~MediaInfoLoader(); // Start loading media info. void Start(blink::WebFrame* frame); @@ -80,25 +80,32 @@ class CONTENT_EXPORT MediaInfoLoader : private blink::WebURLLoaderClient { blink::WebURLLoader* loader, blink::WebURLRequest& newRequest, const blink::WebURLResponse& redirectResponse); - void didSendData(blink::WebURLLoader* loader, - unsigned long long bytesSent, - unsigned long long totalBytesToBeSent) override; - void didReceiveResponse(blink::WebURLLoader* loader, - const blink::WebURLResponse& response) override; - void didDownloadData(blink::WebURLLoader* loader, - int data_length, - int encodedDataLength) override; - void didReceiveData(blink::WebURLLoader* loader, - const char* data, - int data_length, - int encoded_data_length) override; - void didReceiveCachedMetadata(blink::WebURLLoader* loader, - const char* data, - int dataLength) override; - void didFinishLoading(blink::WebURLLoader* loader, - double finishTime, - int64_t total_encoded_data_length) override; - void didFail(blink::WebURLLoader* loader, const blink::WebURLError&) override; + virtual void didSendData( + blink::WebURLLoader* loader, + unsigned long long bytesSent, + unsigned long long totalBytesToBeSent); + virtual void didReceiveResponse( + blink::WebURLLoader* loader, + const blink::WebURLResponse& response); + virtual void didDownloadData( + blink::WebURLLoader* loader, + int data_length, + int encodedDataLength); + virtual void didReceiveData( + blink::WebURLLoader* loader, + const char* data, + int data_length, + int encoded_data_length); + virtual void didReceiveCachedMetadata( + blink::WebURLLoader* loader, + const char* data, int dataLength); + virtual void didFinishLoading( + blink::WebURLLoader* loader, + double finishTime, + int64_t total_encoded_data_length); + virtual void didFail( + blink::WebURLLoader* loader, + const blink::WebURLError&); void DidBecomeReady(Status status); diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h index 5b41f2c..d9b7fe8 100644 --- a/content/renderer/media/android/webmediaplayer_android.h +++ b/content/renderer/media/android/webmediaplayer_android.h @@ -97,44 +97,44 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, scoped_refptr<StreamTextureFactory> factory, int frame_id, const media::WebMediaPlayerParams& params); - ~WebMediaPlayerAndroid() override; + virtual ~WebMediaPlayerAndroid(); // blink::WebMediaPlayer implementation. - bool supportsOverlayFullscreenVideo() override; - void enterFullscreen() override; + virtual bool supportsOverlayFullscreenVideo(); + virtual void enterFullscreen(); // Resource loading. - void load(LoadType load_type, - const blink::WebURL& url, - CORSMode cors_mode) override; + virtual void load(LoadType load_type, + const blink::WebURL& url, + CORSMode cors_mode); // Playback controls. - void play() override; - void pause() override; - void seek(double seconds) override; - bool supportsSave() const override; - void setRate(double rate) override; - void setVolume(double volume) override; - void setSinkId(const blink::WebString& sink_id, - const blink::WebSecurityOrigin& security_origin, - blink::WebSetSinkIdCallbacks* web_callback) override; - void requestRemotePlayback() override; - void requestRemotePlaybackControl() override; - blink::WebTimeRanges buffered() const override; - blink::WebTimeRanges seekable() const override; + virtual void play(); + virtual void pause(); + virtual void seek(double seconds); + virtual bool supportsSave() const; + virtual void setRate(double rate); + virtual void setVolume(double volume); + virtual void setSinkId(const blink::WebString& sink_id, + const blink::WebSecurityOrigin& security_origin, + blink::WebSetSinkIdCallbacks* web_callback); + virtual void requestRemotePlayback(); + virtual void requestRemotePlaybackControl(); + virtual blink::WebTimeRanges buffered() const; + virtual blink::WebTimeRanges seekable() const; // Poster image, as defined in the <video> element. - void setPoster(const blink::WebURL& poster) override; + virtual void setPoster(const blink::WebURL& poster) override; // Methods for painting. // FIXME: This path "only works" on Android. It is a workaround for the // issue that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES texture // internally. It should be removed and replaced by the normal paint path. // https://code.google.com/p/skia/issues/detail?id=1189 - void paint(blink::WebCanvas* canvas, - const blink::WebRect& rect, - unsigned char alpha, - SkXfermode::Mode mode) override; + virtual void paint(blink::WebCanvas* canvas, + const blink::WebRect& rect, + unsigned char alpha, + SkXfermode::Mode mode); bool copyVideoTextureToPlatformTexture( blink::WebGraphicsContext3D* web_graphics_context, @@ -145,37 +145,37 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, bool flip_y) override; // True if the loaded media has a playable video/audio track. - bool hasVideo() const override; - bool hasAudio() const override; + virtual bool hasVideo() const; + virtual bool hasAudio() const; - bool isRemote() const override; + virtual bool isRemote() const; // Dimensions of the video. - blink::WebSize naturalSize() const override; + virtual blink::WebSize naturalSize() const; // Getters of playback state. - bool paused() const override; - bool seeking() const override; - double duration() const override; + virtual bool paused() const; + virtual bool seeking() const; + virtual double duration() const; virtual double timelineOffset() const; - double currentTime() const override; + virtual double currentTime() const; - bool didLoadingProgress() override; + virtual bool didLoadingProgress(); // Internal states of loading and network. - blink::WebMediaPlayer::NetworkState networkState() const override; - blink::WebMediaPlayer::ReadyState readyState() const override; + virtual blink::WebMediaPlayer::NetworkState networkState() const; + virtual blink::WebMediaPlayer::ReadyState readyState() const; - bool hasSingleSecurityOrigin() const override; - bool didPassCORSAccessCheck() const override; + virtual bool hasSingleSecurityOrigin() const; + virtual bool didPassCORSAccessCheck() const; - double mediaTimeForTimeValue(double timeValue) const override; + virtual double mediaTimeForTimeValue(double timeValue) const; // Provide statistics. - unsigned decodedFrameCount() const override; - unsigned droppedFrameCount() const override; - unsigned audioDecodedByteCount() const override; - unsigned videoDecodedByteCount() const override; + virtual unsigned decodedFrameCount() const; + virtual unsigned droppedFrameCount() const; + virtual unsigned audioDecodedByteCount() const; + virtual unsigned videoDecodedByteCount() const; // cc::VideoFrameProvider implementation. These methods are running on the // compositor thread. @@ -233,22 +233,24 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, const gfx::RectF GetBoundaryRectangle(); #endif // defined(VIDEO_HOLE) - MediaKeyException generateKeyRequest(const blink::WebString& key_system, - const unsigned char* init_data, - unsigned init_data_length) override; - MediaKeyException addKey(const blink::WebString& key_system, - const unsigned char* key, - unsigned key_length, - const unsigned char* init_data, - unsigned init_data_length, - const blink::WebString& session_id) override; - MediaKeyException cancelKeyRequest( + virtual MediaKeyException generateKeyRequest( const blink::WebString& key_system, - const blink::WebString& session_id) override; + const unsigned char* init_data, + unsigned init_data_length); + virtual MediaKeyException addKey( + const blink::WebString& key_system, + const unsigned char* key, + unsigned key_length, + const unsigned char* init_data, + unsigned init_data_length, + const blink::WebString& session_id); + virtual MediaKeyException cancelKeyRequest( + const blink::WebString& key_system, + const blink::WebString& session_id); - void setContentDecryptionModule( + virtual void setContentDecryptionModule( blink::WebContentDecryptionModule* cdm, - blink::WebContentDecryptionModuleResult result) override; + blink::WebContentDecryptionModuleResult result); void OnKeyAdded(const std::string& session_id); void OnKeyError(const std::string& session_id, diff --git a/content/renderer/media/android/webmediasession_android.h b/content/renderer/media/android/webmediasession_android.h index 498cb94..b27d51a 100644 --- a/content/renderer/media/android/webmediasession_android.h +++ b/content/renderer/media/android/webmediasession_android.h @@ -16,7 +16,7 @@ class RendererMediaSessionManager; class CONTENT_EXPORT WebMediaSessionAndroid : public blink::WebMediaSession { public: WebMediaSessionAndroid(RendererMediaSessionManager* session_manager); - ~WebMediaSessionAndroid() override; + virtual ~WebMediaSessionAndroid() override; void activate(blink::WebMediaSessionActivateCallback*) override; void deactivate(blink::WebMediaSessionDeactivateCallback*) override; diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h index baed47f..c357ff8 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h @@ -432,7 +432,7 @@ class CONTENT_EXPORT RenderFrameImpl const blink::WebString& name) override; void didChangeSandboxFlags(blink::WebFrame* child_frame, blink::WebSandboxFlags flags) override; - void didChangeFrameOwnerProperties( + virtual void didChangeFrameOwnerProperties( blink::WebFrame* child_frame, const blink::WebFrameOwnerProperties& frame_owner_properties) override; void didMatchCSS( diff --git a/content/renderer/vr/vr_dispatcher.h b/content/renderer/vr/vr_dispatcher.h index 1dc79f4..7e5d56b 100644 --- a/content/renderer/vr/vr_dispatcher.h +++ b/content/renderer/vr/vr_dispatcher.h @@ -20,7 +20,7 @@ class ServiceRegistry; class VRDispatcher : NON_EXPORTED_BASE(public blink::WebVRClient) { public: explicit VRDispatcher(ServiceRegistry* service_registry); - ~VRDispatcher() override; + ~VRDispatcher(); // blink::WebVRClient implementation. void getDevices(blink::WebVRGetDevicesCallback* callback) override; diff --git a/content/renderer/wake_lock/wake_lock_dispatcher.h b/content/renderer/wake_lock/wake_lock_dispatcher.h index 70ce86a..e36a3e0 100644 --- a/content/renderer/wake_lock/wake_lock_dispatcher.h +++ b/content/renderer/wake_lock/wake_lock_dispatcher.h @@ -21,7 +21,7 @@ class WakeLockDispatcher : public RenderFrameObserver, private: // WebWakeLockClient implementation. - void requestKeepScreenAwake(bool keepScreenAwake) override; + virtual void requestKeepScreenAwake(bool keepScreenAwake); WakeLockServicePtr wake_lock_service_; }; diff --git a/content/renderer/webscrollbarbehavior_impl_gtkoraura.h b/content/renderer/webscrollbarbehavior_impl_gtkoraura.h index 3b0eb61..30ccb23 100644 --- a/content/renderer/webscrollbarbehavior_impl_gtkoraura.h +++ b/content/renderer/webscrollbarbehavior_impl_gtkoraura.h @@ -11,12 +11,13 @@ namespace content { class WebScrollbarBehaviorImpl : public blink::WebScrollbarBehavior { public: - bool shouldCenterOnThumb(blink::WebScrollbarBehavior::Button mouseButton, - bool shiftKeyPressed, - bool altKeyPressed) override; - bool shouldSnapBackToDragOrigin(const blink::WebPoint& eventPoint, - const blink::WebRect& scrollbarRect, - bool isHorizontal) override; + virtual bool shouldCenterOnThumb( + blink::WebScrollbarBehavior::Button mouseButton, + bool shiftKeyPressed, + bool altKeyPressed); + virtual bool shouldSnapBackToDragOrigin(const blink::WebPoint& eventPoint, + const blink::WebRect& scrollbarRect, + bool isHorizontal); }; } // namespace content diff --git a/media/blink/multibuffer_data_source_unittest.cc b/media/blink/multibuffer_data_source_unittest.cc index 3890af9..661840d 100644 --- a/media/blink/multibuffer_data_source_unittest.cc +++ b/media/blink/multibuffer_data_source_unittest.cc @@ -47,7 +47,7 @@ class TestMultiBufferDataProvider : public ResourceMultiBufferDataProvider { : ResourceMultiBufferDataProvider(url_data, pos), loading_(false) { CHECK(test_data_providers.insert(this).second); } - ~TestMultiBufferDataProvider() override { + ~TestMultiBufferDataProvider() { CHECK_EQ(static_cast<size_t>(1), test_data_providers.erase(this)); } void Start() override { |