diff options
244 files changed, 2125 insertions, 2295 deletions
diff --git a/content/renderer/accessibility/blink_ax_tree_source.h b/content/renderer/accessibility/blink_ax_tree_source.h index f09ebdc..fe338b9 100644 --- a/content/renderer/accessibility/blink_ax_tree_source.h +++ b/content/renderer/accessibility/blink_ax_tree_source.h @@ -17,7 +17,7 @@ class BlinkAXTreeSource : public ui::AXTreeSource<blink::WebAXObject> { public: BlinkAXTreeSource(RenderFrameImpl* render_frame); - virtual ~BlinkAXTreeSource(); + ~BlinkAXTreeSource() override; // Call this to have BlinkAXTreeSource collect a mapping from // node ids to the frame routing id for an out-of-process iframe during @@ -30,20 +30,19 @@ class BlinkAXTreeSource bool IsInTree(blink::WebAXObject node) const; // AXTreeSource implementation. - virtual blink::WebAXObject GetRoot() const override; - virtual blink::WebAXObject GetFromId(int32 id) const override; - virtual int32 GetId(blink::WebAXObject node) const override; - virtual void GetChildren( + blink::WebAXObject GetRoot() const override; + blink::WebAXObject GetFromId(int32 id) const override; + int32 GetId(blink::WebAXObject node) const override; + void GetChildren( blink::WebAXObject node, std::vector<blink::WebAXObject>* out_children) const override; - virtual blink::WebAXObject GetParent(blink::WebAXObject node) const - override; - virtual void SerializeNode(blink::WebAXObject node, - ui::AXNodeData* out_data) const override; - virtual bool IsValid(blink::WebAXObject node) const override; - virtual bool IsEqual(blink::WebAXObject node1, - blink::WebAXObject node2) const override; - virtual blink::WebAXObject GetNull() const override; + blink::WebAXObject GetParent(blink::WebAXObject node) const override; + void SerializeNode(blink::WebAXObject node, + ui::AXNodeData* out_data) const override; + bool IsValid(blink::WebAXObject node) const override; + bool IsEqual(blink::WebAXObject node1, + blink::WebAXObject node2) const override; + blink::WebAXObject GetNull() const override; blink::WebDocument GetMainDocument() const; diff --git a/content/renderer/accessibility/renderer_accessibility.h b/content/renderer/accessibility/renderer_accessibility.h index b10d21f..2c016d7 100644 --- a/content/renderer/accessibility/renderer_accessibility.h +++ b/content/renderer/accessibility/renderer_accessibility.h @@ -61,7 +61,7 @@ enum RendererAccessibilityType { class CONTENT_EXPORT RendererAccessibility : public RenderFrameObserver { public: explicit RendererAccessibility(RenderFrameImpl* render_frame); - virtual ~RendererAccessibility(); + ~RendererAccessibility() override; // Called when an accessibility notification occurs in Blink. virtual void HandleWebAccessibilityEvent( diff --git a/content/renderer/accessibility/renderer_accessibility_complete.h b/content/renderer/accessibility/renderer_accessibility_complete.h index 6158dd0..095b062 100644 --- a/content/renderer/accessibility/renderer_accessibility_complete.h +++ b/content/renderer/accessibility/renderer_accessibility_complete.h @@ -38,16 +38,16 @@ class CONTENT_EXPORT RendererAccessibilityComplete : public RendererAccessibility { public: explicit RendererAccessibilityComplete(RenderFrameImpl* render_frame); - virtual ~RendererAccessibilityComplete(); + ~RendererAccessibilityComplete() override; // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // RendererAccessibility. - virtual void HandleWebAccessibilityEvent( - const blink::WebAXObject& obj, blink::WebAXEvent event) override; - virtual RendererAccessibilityType GetType() override; - virtual void FocusedNodeChanged(const blink::WebNode& node) override; + void HandleWebAccessibilityEvent(const blink::WebAXObject& obj, + blink::WebAXEvent event) override; + RendererAccessibilityType GetType() override; + void FocusedNodeChanged(const blink::WebNode& node) override; void HandleAXEvent(const blink::WebAXObject& obj, ui::AXEvent event); diff --git a/content/renderer/accessibility/renderer_accessibility_focus_only.h b/content/renderer/accessibility/renderer_accessibility_focus_only.h index df42303..19a1520 100644 --- a/content/renderer/accessibility/renderer_accessibility_focus_only.h +++ b/content/renderer/accessibility/renderer_accessibility_focus_only.h @@ -50,16 +50,16 @@ namespace content { class RendererAccessibilityFocusOnly : public RendererAccessibility { public: explicit RendererAccessibilityFocusOnly(RenderFrameImpl* render_frame); - virtual ~RendererAccessibilityFocusOnly(); + ~RendererAccessibilityFocusOnly() override; // RendererAccessibility implementation. - virtual void HandleWebAccessibilityEvent( - const blink::WebAXObject& obj, blink::WebAXEvent event) override; - virtual RendererAccessibilityType GetType() override; - virtual void FocusedNodeChanged(const blink::WebNode& node) override; + void HandleWebAccessibilityEvent(const blink::WebAXObject& obj, + blink::WebAXEvent event) override; + RendererAccessibilityType GetType() override; + void FocusedNodeChanged(const blink::WebNode& node) override; // RenderFrameObserver implementation. - virtual void DidFinishLoad() override; + void DidFinishLoad() override; private: void HandleFocusedNodeChanged(const blink::WebNode& node, diff --git a/content/renderer/battery_status/battery_status_dispatcher.h b/content/renderer/battery_status/battery_status_dispatcher.h index 38240bc..61af8c3 100644 --- a/content/renderer/battery_status/battery_status_dispatcher.h +++ b/content/renderer/battery_status/battery_status_dispatcher.h @@ -20,16 +20,16 @@ class CONTENT_EXPORT BatteryStatusDispatcher public PlatformEventObserver<blink::WebBatteryStatusListener>) { public: explicit BatteryStatusDispatcher(RenderThread* thread); - virtual ~BatteryStatusDispatcher(); + ~BatteryStatusDispatcher() override; // PlatformEventObserver public methods. - virtual bool OnControlMessageReceived(const IPC::Message& message) override; - virtual void SendFakeDataForTesting(void* data) override; + bool OnControlMessageReceived(const IPC::Message& message) override; + void SendFakeDataForTesting(void* data) override; protected: // PlatformEventObserver protected methods. - virtual void SendStartMessage() override; - virtual void SendStopMessage() override; + void SendStartMessage() override; + void SendStopMessage() override; private: void OnDidChange(const blink::WebBatteryStatus& status); diff --git a/content/renderer/bmp_image_decoder_unittest.cc b/content/renderer/bmp_image_decoder_unittest.cc index e509d58..14193cc 100644 --- a/content/renderer/bmp_image_decoder_unittest.cc +++ b/content/renderer/bmp_image_decoder_unittest.cc @@ -10,7 +10,7 @@ class BMPImageDecoderTest : public ImageDecoderTest { BMPImageDecoderTest() : ImageDecoderTest("bmp") { } protected: - virtual blink::WebImageDecoder* CreateWebKitImageDecoder() const override { + blink::WebImageDecoder* CreateWebKitImageDecoder() const override { return new blink::WebImageDecoder(blink::WebImageDecoder::TypeBMP); } diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h index 2712b1a..22de692 100644 --- a/content/renderer/browser_plugin/browser_plugin.h +++ b/content/renderer/browser_plugin/browser_plugin.h @@ -129,10 +129,9 @@ class CONTENT_EXPORT BrowserPlugin : virtual void extendSelectionAndDelete(int before, int after) override; // MouseLockDispatcher::LockTarget implementation. - virtual void OnLockMouseACK(bool succeeded) override; - virtual void OnMouseLockLost() override; - virtual bool HandleMouseLockedInputEvent( - const blink::WebMouseEvent& event) override; + void OnLockMouseACK(bool succeeded) override; + void OnMouseLockLost() override; + bool HandleMouseLockedInputEvent(const blink::WebMouseEvent& event) override; private: friend class base::DeleteHelper<BrowserPlugin>; @@ -152,7 +151,7 @@ class CONTENT_EXPORT BrowserPlugin : blink::WebFrame* frame, scoped_ptr<BrowserPluginDelegate> delegate); - virtual ~BrowserPlugin(); + ~BrowserPlugin() override; int width() const { return plugin_rect_.width(); } int height() const { return plugin_rect_.height(); } diff --git a/content/renderer/browser_plugin/browser_plugin_manager.h b/content/renderer/browser_plugin/browser_plugin_manager.h index 3793ae6..9895318 100644 --- a/content/renderer/browser_plugin/browser_plugin_manager.h +++ b/content/renderer/browser_plugin/browser_plugin_manager.h @@ -54,21 +54,21 @@ class CONTENT_EXPORT BrowserPluginManager int GetNextInstanceID(); // RenderViewObserver override. Call on render thread. - virtual void DidCommitCompositorFrame() override; - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual bool Send(IPC::Message* msg) override; + void DidCommitCompositorFrame() override; + bool OnMessageReceived(const IPC::Message& message) override; + bool Send(IPC::Message* msg) override; // Don't destroy the BrowserPluginManager when the RenderViewImpl goes away. // BrowserPluginManager's lifetime is managed by a reference count. Once // the host RenderViewImpl and all BrowserPlugins release their references, // then the BrowserPluginManager will be destroyed. - virtual void OnDestruct() override {} + void OnDestruct() override {} protected: // Friend RefCounted so that the dtor can be non-public. friend class base::RefCounted<BrowserPluginManager>; - virtual ~BrowserPluginManager(); + ~BrowserPluginManager() override; // This map is keyed by guest instance IDs. IDMap<BrowserPlugin> instances_; int current_instance_id_; diff --git a/content/renderer/browser_render_view_browsertest.cc b/content/renderer/browser_render_view_browsertest.cc index dd7cc7d..2c12bc7 100644 --- a/content/renderer/browser_render_view_browsertest.cc +++ b/content/renderer/browser_render_view_browsertest.cc @@ -49,13 +49,12 @@ class TestShellContentRendererClient : public ShellContentRendererClient { latest_error_reason_(0), latest_error_stale_copy_in_cache_(false) {} - virtual void GetNavigationErrorStrings( - content::RenderView* render_view, - blink::WebFrame* frame, - const blink::WebURLRequest& failed_request, - const blink::WebURLError& error, - std::string* error_html, - base::string16* error_description) override { + void GetNavigationErrorStrings(content::RenderView* render_view, + blink::WebFrame* frame, + const blink::WebURLRequest& failed_request, + const blink::WebURLError& error, + std::string* error_html, + base::string16* error_description) override { if (error_html) *error_html = "A suffusion of yellow."; latest_error_valid_ = true; @@ -138,13 +137,13 @@ class RenderViewBrowserTest : public ContentBrowserTest { public: RenderViewBrowserTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) override { + void SetUpCommandLine(CommandLine* command_line) override { // This method is needed to allow interaction with in-process renderer // and use of a test ContentRendererClient. command_line->AppendSwitch(switches::kSingleProcess); } - virtual void SetUpOnMainThread() override { + void SetUpOnMainThread() override { // Override setting of renderer client. renderer_client_ = new TestShellContentRendererClient(); // Explicitly leaks ownership; this object will remain alive diff --git a/content/renderer/child_frame_compositing_helper.h b/content/renderer/child_frame_compositing_helper.h index aca87db..3bb4c28 100644 --- a/content/renderer/child_frame_compositing_helper.h +++ b/content/renderer/child_frame_compositing_helper.h @@ -74,7 +74,7 @@ class CONTENT_EXPORT ChildFrameCompositingHelper void ChildFrameGone(); // cc::DelegatedFrameProviderClient implementation. - virtual void UnusedResourcesAreAvailable() override; + void UnusedResourcesAreAvailable() override; void SetContentsOpaque(bool); protected: diff --git a/content/renderer/device_sensors/device_light_event_pump.h b/content/renderer/device_sensors/device_light_event_pump.h index 46766ec..b5dd1f4 100644 --- a/content/renderer/device_sensors/device_light_event_pump.h +++ b/content/renderer/device_sensors/device_light_event_pump.h @@ -23,24 +23,24 @@ class CONTENT_EXPORT DeviceLightEventPump : public DeviceSensorEventPump<blink::WebDeviceLightListener> { public: explicit DeviceLightEventPump(RenderThread* thread); - virtual ~DeviceLightEventPump(); + ~DeviceLightEventPump() override; // Sets the listener to receive updates for device light data at // regular intervals. Returns true if the registration was successful. bool SetListener(blink::WebDeviceLightListener* listener); // PlatformEventObserver implementation. - virtual bool OnControlMessageReceived(const IPC::Message& message) override; - virtual void SendFakeDataForTesting(void* data) override; + bool OnControlMessageReceived(const IPC::Message& message) override; + void SendFakeDataForTesting(void* data) override; protected: // Methods overriden from base class DeviceSensorEventPump - virtual void FireEvent() override; - virtual bool InitializeReader(base::SharedMemoryHandle handle) override; + void FireEvent() override; + bool InitializeReader(base::SharedMemoryHandle handle) override; // PlatformEventObserver implementation. - virtual void SendStartMessage() override; - virtual void SendStopMessage() override; + void SendStartMessage() override; + void SendStopMessage() override; private: bool ShouldFireEvent(double data) const; diff --git a/content/renderer/device_sensors/device_light_event_pump_unittest.cc b/content/renderer/device_sensors/device_light_event_pump_unittest.cc index f6eec3d..59569f5 100644 --- a/content/renderer/device_sensors/device_light_event_pump_unittest.cc +++ b/content/renderer/device_sensors/device_light_event_pump_unittest.cc @@ -41,14 +41,14 @@ class DeviceLightEventPumpForTesting : public DeviceLightEventPump { public: DeviceLightEventPumpForTesting() : DeviceLightEventPump(0) {} - virtual ~DeviceLightEventPumpForTesting() {} + ~DeviceLightEventPumpForTesting() override {} void OnDidStart(base::SharedMemoryHandle renderer_handle) { DeviceLightEventPump::OnDidStart(renderer_handle); } - virtual void SendStartMessage() override { } - virtual void SendStopMessage() override { } - virtual void FireEvent() override { + void SendStartMessage() override {} + void SendStopMessage() override {} + void FireEvent() override { DeviceLightEventPump::FireEvent(); Stop(); base::MessageLoop::current()->QuitWhenIdle(); diff --git a/content/renderer/device_sensors/device_motion_event_pump.h b/content/renderer/device_sensors/device_motion_event_pump.h index 37d4262..af24caa 100644 --- a/content/renderer/device_sensors/device_motion_event_pump.h +++ b/content/renderer/device_sensors/device_motion_event_pump.h @@ -23,19 +23,19 @@ class CONTENT_EXPORT DeviceMotionEventPump : public DeviceSensorEventPump<blink::WebDeviceMotionListener> { public: explicit DeviceMotionEventPump(RenderThread* thread); - virtual ~DeviceMotionEventPump(); + ~DeviceMotionEventPump() override; // // PlatformEventObserver. - virtual bool OnControlMessageReceived(const IPC::Message& message) override; - virtual void SendFakeDataForTesting(void* fake_data) override; + bool OnControlMessageReceived(const IPC::Message& message) override; + void SendFakeDataForTesting(void* fake_data) override; protected: - virtual void FireEvent() override; - virtual bool InitializeReader(base::SharedMemoryHandle handle) override; + void FireEvent() override; + bool InitializeReader(base::SharedMemoryHandle handle) override; // PlatformEventObserver. - virtual void SendStartMessage() override; - virtual void SendStopMessage() override; + void SendStartMessage() override; + void SendStopMessage() override; scoped_ptr<DeviceMotionSharedMemoryReader> reader_; diff --git a/content/renderer/device_sensors/device_motion_event_pump_unittest.cc b/content/renderer/device_sensors/device_motion_event_pump_unittest.cc index c008cdc..bb22747 100644 --- a/content/renderer/device_sensors/device_motion_event_pump_unittest.cc +++ b/content/renderer/device_sensors/device_motion_event_pump_unittest.cc @@ -45,14 +45,14 @@ class DeviceMotionEventPumpForTesting : public DeviceMotionEventPump { public: DeviceMotionEventPumpForTesting() : DeviceMotionEventPump(0) { } - virtual ~DeviceMotionEventPumpForTesting() { } + ~DeviceMotionEventPumpForTesting() override {} void OnDidStart(base::SharedMemoryHandle renderer_handle) { DeviceMotionEventPump::OnDidStart(renderer_handle); } - virtual void SendStartMessage() override { } - virtual void SendStopMessage() override { } - virtual void FireEvent() override { + void SendStartMessage() override {} + void SendStopMessage() override {} + void FireEvent() override { DeviceMotionEventPump::FireEvent(); Stop(); base::MessageLoop::current()->QuitWhenIdle(); diff --git a/content/renderer/device_sensors/device_orientation_event_pump.h b/content/renderer/device_sensors/device_orientation_event_pump.h index 43e566d..d9564e1 100644 --- a/content/renderer/device_sensors/device_orientation_event_pump.h +++ b/content/renderer/device_sensors/device_orientation_event_pump.h @@ -27,19 +27,19 @@ class CONTENT_EXPORT DeviceOrientationEventPump static const double kOrientationThreshold; explicit DeviceOrientationEventPump(RenderThread* thread); - virtual ~DeviceOrientationEventPump(); + ~DeviceOrientationEventPump() override; // PlatformEventObserver. - virtual bool OnControlMessageReceived(const IPC::Message& message) override; - virtual void SendFakeDataForTesting(void* data) override; + bool OnControlMessageReceived(const IPC::Message& message) override; + void SendFakeDataForTesting(void* data) override; protected: - virtual void FireEvent() override; - virtual bool InitializeReader(base::SharedMemoryHandle handle) override; + void FireEvent() override; + bool InitializeReader(base::SharedMemoryHandle handle) override; // PlatformEventObserver. - virtual void SendStartMessage() override; - virtual void SendStopMessage() override; + void SendStartMessage() override; + void SendStopMessage() override; bool ShouldFireEvent(const blink::WebDeviceOrientationData& data) const; diff --git a/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc b/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc index f958501..f21071b 100644 --- a/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc +++ b/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc @@ -48,14 +48,14 @@ class DeviceOrientationEventPumpForTesting : public DeviceOrientationEventPump { public: DeviceOrientationEventPumpForTesting() : DeviceOrientationEventPump(0) { } - virtual ~DeviceOrientationEventPumpForTesting() { } + ~DeviceOrientationEventPumpForTesting() override {} void OnDidStart(base::SharedMemoryHandle renderer_handle) { DeviceOrientationEventPump::OnDidStart(renderer_handle); } - virtual void SendStartMessage() override { } - virtual void SendStopMessage() override { } - virtual void FireEvent() override { + void SendStartMessage() override {} + void SendStopMessage() override {} + void FireEvent() override { DeviceOrientationEventPump::FireEvent(); Stop(); base::MessageLoop::current()->QuitWhenIdle(); diff --git a/content/renderer/devtools/devtools_agent.h b/content/renderer/devtools/devtools_agent.h index 660acbc..dcb70c5 100644 --- a/content/renderer/devtools/devtools_agent.h +++ b/content/renderer/devtools/devtools_agent.h @@ -34,7 +34,7 @@ class DevToolsAgent : public RenderViewObserver, public blink::WebDevToolsAgentClient { public: explicit DevToolsAgent(RenderViewImpl* render_view); - virtual ~DevToolsAgent(); + ~DevToolsAgent() override; // Returns agent instance for its routing id. static DevToolsAgent* FromRoutingId(int routing_id); @@ -45,7 +45,7 @@ class DevToolsAgent : public RenderViewObserver, private: // RenderView::Observer implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // WebDevToolsAgentClient implementation virtual void sendMessageToInspectorFrontend(const blink::WebString& data); diff --git a/content/renderer/devtools/devtools_agent_filter.h b/content/renderer/devtools/devtools_agent_filter.h index a3470ee..48831a3 100644 --- a/content/renderer/devtools/devtools_agent_filter.h +++ b/content/renderer/devtools/devtools_agent_filter.h @@ -33,14 +33,14 @@ class DevToolsAgentFilter : public IPC::MessageFilter { static void SendRpcMessage(const DevToolsMessageData& data); // IPC::MessageFilter override. Called on IO thread. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // Called on the main thread. void AddEmbeddedWorkerRouteOnMainThread(int32 routing_id); void RemoveEmbeddedWorkerRouteOnMainThread(int32 routing_id); protected: - virtual ~DevToolsAgentFilter(); + ~DevToolsAgentFilter() override; private: void OnDispatchOnInspectorBackend(const std::string& message); diff --git a/content/renderer/dom_automation_controller.h b/content/renderer/dom_automation_controller.h index cefb510..29b1db37 100644 --- a/content/renderer/dom_automation_controller.h +++ b/content/renderer/dom_automation_controller.h @@ -107,14 +107,14 @@ class DomAutomationController : public gin::Wrappable<DomAutomationController>, private: explicit DomAutomationController(RenderFrame* render_view); - virtual ~DomAutomationController(); + ~DomAutomationController() override; // gin::WrappableBase - virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( + gin::ObjectTemplateBuilder GetObjectTemplateBuilder( v8::Isolate* isolate) override; // RenderViewObserver - virtual void OnDestruct() override; + void OnDestruct() override; int automation_id_; // routing id to be used by the next channel. diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index cdce1d6..7b885f8 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -155,7 +155,7 @@ class LoadObserver : public RenderViewObserver { : RenderViewObserver(render_view), quit_closure_(quit_closure) {} - virtual void DidFinishLoad(blink::WebLocalFrame* frame) override { + void DidFinishLoad(blink::WebLocalFrame* frame) override { if (frame == render_view()->GetWebView()->mainFrame()) quit_closure_.Run(); } @@ -171,7 +171,7 @@ class DomSerializerTests : public ContentBrowserTest, : serialized_(false), local_directory_name_(FILE_PATH_LITERAL("./dummy_files/")) {} - virtual void SetUpCommandLine(CommandLine* command_line) override { + void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kSingleProcess); #if defined(OS_WIN) // Don't want to try to create a GPU process. diff --git a/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc b/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc index 39b1eb7..7429458 100644 --- a/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc +++ b/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc @@ -23,10 +23,10 @@ class MockProxy : public DOMStorageProxy { // DOMStorageProxy interface for use by DOMStorageCachedArea. - virtual void LoadArea(int connection_id, - DOMStorageValuesMap* values, - bool* send_log_get_messages, - const CompletionCallback& callback) override { + void LoadArea(int connection_id, + DOMStorageValuesMap* values, + bool* send_log_get_messages, + const CompletionCallback& callback) override { pending_callbacks_.push_back(callback); observed_load_area_ = true; observed_connection_id_ = connection_id; @@ -34,11 +34,11 @@ class MockProxy : public DOMStorageProxy { *send_log_get_messages = false; } - virtual void SetItem(int connection_id, - const base::string16& key, - const base::string16& value, - const GURL& page_url, - const CompletionCallback& callback) override { + void SetItem(int connection_id, + const base::string16& key, + const base::string16& value, + const GURL& page_url, + const CompletionCallback& callback) override { pending_callbacks_.push_back(callback); observed_set_item_ = true; observed_connection_id_ = connection_id; @@ -47,15 +47,14 @@ class MockProxy : public DOMStorageProxy { observed_page_url_ = page_url; } - virtual void LogGetItem(int connection_id, - const base::string16& key, - const base::NullableString16& value) override { - } + void LogGetItem(int connection_id, + const base::string16& key, + const base::NullableString16& value) override {} - virtual void RemoveItem(int connection_id, - const base::string16& key, - const GURL& page_url, - const CompletionCallback& callback) override { + void RemoveItem(int connection_id, + const base::string16& key, + const GURL& page_url, + const CompletionCallback& callback) override { pending_callbacks_.push_back(callback); observed_remove_item_ = true; observed_connection_id_ = connection_id; @@ -63,9 +62,9 @@ class MockProxy : public DOMStorageProxy { observed_page_url_ = page_url; } - virtual void ClearArea(int connection_id, - const GURL& page_url, - const CompletionCallback& callback) override { + void ClearArea(int connection_id, + const GURL& page_url, + const CompletionCallback& callback) override { pending_callbacks_.push_back(callback); observed_clear_area_ = true; observed_connection_id_ = connection_id; @@ -110,7 +109,7 @@ class MockProxy : public DOMStorageProxy { GURL observed_page_url_; private: - virtual ~MockProxy() {} + ~MockProxy() override {} }; } // namespace diff --git a/content/renderer/dom_storage/dom_storage_dispatcher.cc b/content/renderer/dom_storage/dom_storage_dispatcher.cc index 6d44966..9433270 100644 --- a/content/renderer/dom_storage/dom_storage_dispatcher.cc +++ b/content/renderer/dom_storage/dom_storage_dispatcher.cc @@ -39,9 +39,9 @@ class MessageThrottlingFilter : public IPC::MessageFilter { void Shutdown() { sender_ = NULL; } private: - virtual ~MessageThrottlingFilter() {} + ~MessageThrottlingFilter() override {} - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; int GetPendingCount() { return IncrementPendingCountN(0); } int IncrementPendingCount() { return IncrementPendingCountN(1); } @@ -109,20 +109,25 @@ class DomStorageDispatcher::ProxyImpl : public DOMStorageProxy { void Shutdown(); // DOMStorageProxy interface for use by DOMStorageCachedArea. - virtual void LoadArea(int connection_id, DOMStorageValuesMap* values, - bool* send_log_get_messages, - const CompletionCallback& callback) override; - virtual void SetItem(int connection_id, const base::string16& key, - const base::string16& value, const GURL& page_url, - const CompletionCallback& callback) override; - virtual void LogGetItem(int connection_id, const base::string16& key, - const base::NullableString16& value) override; - virtual void RemoveItem(int connection_id, const base::string16& key, - const GURL& page_url, - const CompletionCallback& callback) override; - virtual void ClearArea(int connection_id, - const GURL& page_url, - const CompletionCallback& callback) override; + void LoadArea(int connection_id, + DOMStorageValuesMap* values, + bool* send_log_get_messages, + const CompletionCallback& callback) override; + void SetItem(int connection_id, + const base::string16& key, + const base::string16& value, + const GURL& page_url, + const CompletionCallback& callback) override; + void LogGetItem(int connection_id, + const base::string16& key, + const base::NullableString16& value) override; + void RemoveItem(int connection_id, + const base::string16& key, + const GURL& page_url, + const CompletionCallback& callback) override; + void ClearArea(int connection_id, + const GURL& page_url, + const CompletionCallback& callback) override; private: // Struct to hold references to our contained areas and @@ -139,8 +144,7 @@ class DomStorageDispatcher::ProxyImpl : public DOMStorageProxy { typedef std::map<std::string, CachedAreaHolder> CachedAreaMap; typedef std::list<CompletionCallback> CallbackList; - virtual ~ProxyImpl() { - } + ~ProxyImpl() override {} // Sudden termination is disabled when there are callbacks pending // to more reliably commit changes during shutdown. diff --git a/content/renderer/external_popup_menu_browsertest.cc b/content/renderer/external_popup_menu_browsertest.cc index e23573d..cadb51f 100644 --- a/content/renderer/external_popup_menu_browsertest.cc +++ b/content/renderer/external_popup_menu_browsertest.cc @@ -133,7 +133,7 @@ class ExternalPopupMenuRemoveTest : public ExternalPopupMenuTest { ExternalPopupMenuRemoveTest() {} protected: - virtual bool ShouldRemoveSelectOnChange() const override { return true; } + bool ShouldRemoveSelectOnChange() const override { return true; } }; // Tests that nothing bad happen when the page removes the select when it diff --git a/content/renderer/fetchers/resource_fetcher_impl.h b/content/renderer/fetchers/resource_fetcher_impl.h index 73c55b3..8064c1a2 100644 --- a/content/renderer/fetchers/resource_fetcher_impl.h +++ b/content/renderer/fetchers/resource_fetcher_impl.h @@ -31,16 +31,15 @@ class ResourceFetcherImpl : public ResourceFetcher, public WebURLLoaderClientImpl { public: // ResourceFetcher implementation: - virtual void SetMethod(const std::string& method) override; - virtual void SetBody(const std::string& body) override; - virtual void SetHeader(const std::string& header, - const std::string& value) override; - virtual void Start(blink::WebFrame* frame, - blink::WebURLRequest::RequestContext request_context, - blink::WebURLRequest::FrameType frame_type, - LoaderType loader_type, - const Callback& callback) override; - virtual void SetTimeout(const base::TimeDelta& timeout) override; + void SetMethod(const std::string& method) override; + void SetBody(const std::string& body) override; + void SetHeader(const std::string& header, const std::string& value) override; + void Start(blink::WebFrame* frame, + blink::WebURLRequest::RequestContext request_context, + blink::WebURLRequest::FrameType frame_type, + LoaderType loader_type, + const Callback& callback) override; + void SetTimeout(const base::TimeDelta& timeout) override; private: friend class ResourceFetcher; @@ -54,8 +53,8 @@ class ResourceFetcherImpl : public ResourceFetcher, void TimeoutFired(); // WebURLLoaderClientImpl methods: - virtual void OnLoadComplete() override; - virtual void Cancel() override; + void OnLoadComplete() override; + void Cancel() override; scoped_ptr<blink::WebURLLoader> loader_; diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h index f7343ae..40af1b8 100644 --- a/content/renderer/gamepad_shared_memory_reader.h +++ b/content/renderer/gamepad_shared_memory_reader.h @@ -18,18 +18,17 @@ struct GamepadHardwareBuffer; class GamepadSharedMemoryReader : public RendererGamepadProvider { public: explicit GamepadSharedMemoryReader(RenderThread* thread); - virtual ~GamepadSharedMemoryReader(); + ~GamepadSharedMemoryReader() override; // RendererGamepadProvider implementation. - virtual void SampleGamepads( - blink::WebGamepads& gamepads) override; - virtual bool OnControlMessageReceived(const IPC::Message& message) override; - virtual void Start(blink::WebPlatformEventListener* listener) override; + void SampleGamepads(blink::WebGamepads& gamepads) override; + bool OnControlMessageReceived(const IPC::Message& message) override; + void Start(blink::WebPlatformEventListener* listener) override; protected: // PlatformEventObserver protected methods. - virtual void SendStartMessage() override; - virtual void SendStopMessage() override; + void SendStartMessage() override; + void SendStopMessage() override; private: void OnGamepadConnected(int index, const blink::WebGamepad& gamepad); diff --git a/content/renderer/geolocation_dispatcher.h b/content/renderer/geolocation_dispatcher.h index 8508514..53fa151 100644 --- a/content/renderer/geolocation_dispatcher.h +++ b/content/renderer/geolocation_dispatcher.h @@ -31,7 +31,7 @@ class GeolocationDispatcher : public RenderFrameObserver, private: // RenderFrame::Observer implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // WebGeolocationClient virtual void startUpdating(); diff --git a/content/renderer/gin_browsertest.cc b/content/renderer/gin_browsertest.cc index 7b92c7d..11a6ae9 100644 --- a/content/renderer/gin_browsertest.cc +++ b/content/renderer/gin_browsertest.cc @@ -28,7 +28,7 @@ class TestGinObject : public gin::Wrappable<TestGinObject> { private: TestGinObject(bool* alive) : alive_(alive) { *alive_ = true; } - virtual ~TestGinObject() { *alive_ = false; } + ~TestGinObject() override { *alive_ = false; } bool* alive_; diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h index 51cc317..7ee9427 100644 --- a/content/renderer/gpu/compositor_output_surface.h +++ b/content/renderer/gpu/compositor_output_surface.h @@ -53,18 +53,18 @@ class CompositorOutputSurface scoped_ptr<cc::SoftwareOutputDevice> software, scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue, bool use_swap_compositor_frame_message); - virtual ~CompositorOutputSurface(); + ~CompositorOutputSurface() override; // cc::OutputSurface implementation. - virtual bool BindToClient(cc::OutputSurfaceClient* client) override; - virtual void SwapBuffers(cc::CompositorFrame* frame) override; + bool BindToClient(cc::OutputSurfaceClient* client) override; + void SwapBuffers(cc::CompositorFrame* frame) override; #if defined(OS_ANDROID) virtual void SetNeedsBeginFrame(bool enable) override; #endif // TODO(epenner): This seems out of place here and would be a better fit // int CompositorThread after it is fully refactored (http://crbug/170828) - virtual void UpdateSmoothnessTakesPriority(bool prefer_smoothness) override; + void UpdateSmoothnessTakesPriority(bool prefer_smoothness) override; protected: void ShortcutSwapAck(uint32 output_surface_id, diff --git a/content/renderer/gpu/compositor_software_output_device.h b/content/renderer/gpu/compositor_software_output_device.h index b57ac26..48fa050 100644 --- a/content/renderer/gpu/compositor_software_output_device.h +++ b/content/renderer/gpu/compositor_software_output_device.h @@ -29,16 +29,16 @@ class CompositorSoftwareOutputDevice NON_EXPORTED_BASE(public base::NonThreadSafe) { public: CompositorSoftwareOutputDevice(); - virtual ~CompositorSoftwareOutputDevice(); + ~CompositorSoftwareOutputDevice() override; - virtual void Resize(const gfx::Size& pixel_size, float scale_factor) override; + void Resize(const gfx::Size& pixel_size, float scale_factor) override; - virtual SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override; - virtual void EndPaint(cc::SoftwareFrameData* frame_data) override; - virtual void EnsureBackbuffer() override; - virtual void DiscardBackbuffer() override; + SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override; + void EndPaint(cc::SoftwareFrameData* frame_data) override; + void EnsureBackbuffer() override; + void DiscardBackbuffer() override; - virtual void ReclaimSoftwareFrame(unsigned id) override; + void ReclaimSoftwareFrame(unsigned id) override; private: // Internal buffer class that manages shared memory lifetime and ownership. diff --git a/content/renderer/gpu/delegated_compositor_output_surface.h b/content/renderer/gpu/delegated_compositor_output_surface.h index b8ece97..6edc2d6 100644 --- a/content/renderer/gpu/delegated_compositor_output_surface.h +++ b/content/renderer/gpu/delegated_compositor_output_surface.h @@ -18,7 +18,7 @@ class DelegatedCompositorOutputSurface : public CompositorOutputSurface { uint32 output_surface_id, const scoped_refptr<ContextProviderCommandBuffer>& context_provider, scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue); - virtual ~DelegatedCompositorOutputSurface() {} + ~DelegatedCompositorOutputSurface() override {} }; } // namespace content diff --git a/content/renderer/gpu/frame_swap_message_queue.cc b/content/renderer/gpu/frame_swap_message_queue.cc index e48daa8..bf91dd8 100644 --- a/content/renderer/gpu/frame_swap_message_queue.cc +++ b/content/renderer/gpu/frame_swap_message_queue.cc @@ -36,7 +36,7 @@ namespace { class SendMessageScopeImpl : public FrameSwapMessageQueue::SendMessageScope { public: SendMessageScopeImpl(base::Lock* lock) : auto_lock_(*lock) {} - virtual ~SendMessageScopeImpl() override {} + ~SendMessageScopeImpl() override {} private: base::AutoLock auto_lock_; @@ -46,26 +46,26 @@ class VisualStateQueue : public FrameSwapMessageSubQueue { public: VisualStateQueue() {} - virtual ~VisualStateQueue() { + ~VisualStateQueue() override { for (VisualStateQueueMap::iterator i = queue_.begin(); i != queue_.end(); i++) { STLDeleteElements(&i->second); } } - virtual bool Empty() const override { return queue_.empty(); } + bool Empty() const override { return queue_.empty(); } - virtual void QueueMessage(int source_frame_number, - scoped_ptr<IPC::Message> msg, - bool* is_first) override { + void QueueMessage(int source_frame_number, + scoped_ptr<IPC::Message> msg, + bool* is_first) override { if (is_first) *is_first = (queue_.count(source_frame_number) == 0); queue_[source_frame_number].push_back(msg.release()); } - virtual void DrainMessages(int source_frame_number, - ScopedVector<IPC::Message>* messages) override { + void DrainMessages(int source_frame_number, + ScopedVector<IPC::Message>* messages) override { VisualStateQueueMap::iterator end = queue_.upper_bound(source_frame_number); for (VisualStateQueueMap::iterator i = queue_.begin(); i != end; i++) { DCHECK(i->first <= source_frame_number); @@ -86,18 +86,18 @@ class VisualStateQueue : public FrameSwapMessageSubQueue { class SwapQueue : public FrameSwapMessageSubQueue { public: SwapQueue() {} - virtual bool Empty() const override { return queue_.empty(); } + bool Empty() const override { return queue_.empty(); } - virtual void QueueMessage(int source_frame_number, - scoped_ptr<IPC::Message> msg, - bool* is_first) override { + void QueueMessage(int source_frame_number, + scoped_ptr<IPC::Message> msg, + bool* is_first) override { if (is_first) *is_first = Empty(); queue_.push_back(msg.release()); } - virtual void DrainMessages(int source_frame_number, - ScopedVector<IPC::Message>* messages) override { + void DrainMessages(int source_frame_number, + ScopedVector<IPC::Message>* messages) override { messages->insert(messages->end(), queue_.begin(), queue_.end()); queue_.weak_clear(); } diff --git a/content/renderer/gpu/frame_swap_message_queue_unittest.cc b/content/renderer/gpu/frame_swap_message_queue_unittest.cc index d8eeb55..0b0ba8d 100644 --- a/content/renderer/gpu/frame_swap_message_queue_unittest.cc +++ b/content/renderer/gpu/frame_swap_message_queue_unittest.cc @@ -255,7 +255,7 @@ class NotifiesDeletionMessage : public IPC::Message { public: NotifiesDeletionMessage(bool* deleted, const IPC::Message& other) : IPC::Message(other), deleted_(deleted) {} - virtual ~NotifiesDeletionMessage() { *deleted_ = true; } + ~NotifiesDeletionMessage() override { *deleted_ = true; } private: bool* deleted_; diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc index 299f41e..dfc4abd 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu/gpu_benchmarking_extension.cc @@ -338,7 +338,7 @@ class GpuBenchmarkingWrapper : public v8::Extension { " return HasGpuProcess();" "};") {} - virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( + v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( v8::Isolate* isolate, v8::Handle<v8::String> name) override { if (name->Equals( diff --git a/content/renderer/gpu/mailbox_output_surface.h b/content/renderer/gpu/mailbox_output_surface.h index 53230c4..fc6ba22 100644 --- a/content/renderer/gpu/mailbox_output_surface.h +++ b/content/renderer/gpu/mailbox_output_surface.h @@ -33,19 +33,19 @@ class MailboxOutputSurface : public CompositorOutputSurface { scoped_ptr<cc::SoftwareOutputDevice> software_device, scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue, cc::ResourceFormat format); - virtual ~MailboxOutputSurface(); + ~MailboxOutputSurface() override; // cc::OutputSurface implementation. - virtual void EnsureBackbuffer() override; - virtual void DiscardBackbuffer() override; - virtual void Reshape(const gfx::Size& size, float scale_factor) override; - virtual void BindFramebuffer() override; - virtual void SwapBuffers(cc::CompositorFrame* frame) override; + void EnsureBackbuffer() override; + void DiscardBackbuffer() override; + void Reshape(const gfx::Size& size, float scale_factor) override; + void BindFramebuffer() override; + void SwapBuffers(cc::CompositorFrame* frame) override; private: // CompositorOutputSurface overrides. - virtual void OnSwapAck(uint32 output_surface_id, - const cc::CompositorFrameAck& ack) override; + void OnSwapAck(uint32 output_surface_id, + const cc::CompositorFrameAck& ack) override; size_t GetNumAcksPending(); diff --git a/content/renderer/gpu/queue_message_swap_promise.h b/content/renderer/gpu/queue_message_swap_promise.h index 0f4ea1d..4094b1b 100644 --- a/content/renderer/gpu/queue_message_swap_promise.h +++ b/content/renderer/gpu/queue_message_swap_promise.h @@ -23,13 +23,13 @@ class QueueMessageSwapPromise : public cc::SwapPromise { scoped_refptr<FrameSwapMessageQueue> message_queue, int source_frame_number); - virtual ~QueueMessageSwapPromise(); + ~QueueMessageSwapPromise() override; - virtual void DidSwap(cc::CompositorFrameMetadata* metadata) override; + void DidSwap(cc::CompositorFrameMetadata* metadata) override; - virtual void DidNotSwap(DidNotSwapReason reason) override; + void DidNotSwap(DidNotSwapReason reason) override; - virtual int64 TraceId() const override; + int64 TraceId() const override; private: void PromiseCompleted(); diff --git a/content/renderer/gpu/queue_message_swap_promise_unittest.cc b/content/renderer/gpu/queue_message_swap_promise_unittest.cc index 562f41c..f888642 100644 --- a/content/renderer/gpu/queue_message_swap_promise_unittest.cc +++ b/content/renderer/gpu/queue_message_swap_promise_unittest.cc @@ -24,7 +24,7 @@ class TestRenderWidget : public RenderWidget { using RenderWidget::QueueMessageImpl; private: - virtual ~TestRenderWidget() {} + ~TestRenderWidget() override {} DISALLOW_COPY_AND_ASSIGN(TestRenderWidget); }; @@ -33,7 +33,7 @@ class TestSyncMessageFilter : public IPC::SyncMessageFilter { public: TestSyncMessageFilter() : IPC::SyncMessageFilter(NULL) {} - virtual bool Send(IPC::Message* message) override { + bool Send(IPC::Message* message) override { messages_.push_back(message); return true; } @@ -41,7 +41,7 @@ class TestSyncMessageFilter : public IPC::SyncMessageFilter { ScopedVector<IPC::Message>& messages() { return messages_; } private: - virtual ~TestSyncMessageFilter() {} + ~TestSyncMessageFilter() override {} ScopedVector<IPC::Message> messages_; diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h index 044c953..e0f369a 100644 --- a/content/renderer/gpu/render_widget_compositor.h +++ b/content/renderer/gpu/render_widget_compositor.h @@ -129,29 +129,29 @@ class CONTENT_EXPORT RenderWidgetCompositor virtual void setTopControlsContentOffset(float); // cc::LayerTreeHostClient implementation. - virtual void WillBeginMainFrame(int frame_id) override; - virtual void DidBeginMainFrame() override; - virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override; - virtual void Layout() override; - virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta, - const gfx::Vector2d& outer_delta, - float page_scale, - float top_controls_delta) override; - virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, - float page_scale, - float top_controls_delta) override; - virtual void RequestNewOutputSurface(bool fallback) override; - virtual void DidInitializeOutputSurface() override; - virtual void WillCommit() override; - virtual void DidCommit() override; - virtual void DidCommitAndDrawFrame() override; - virtual void DidCompleteSwapBuffers() override; - virtual void RateLimitSharedMainThreadContext() override; + void WillBeginMainFrame(int frame_id) override; + void DidBeginMainFrame() override; + void BeginMainFrame(const cc::BeginFrameArgs& args) override; + void Layout() override; + void ApplyViewportDeltas(const gfx::Vector2d& inner_delta, + const gfx::Vector2d& outer_delta, + float page_scale, + float top_controls_delta) override; + void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, + float page_scale, + float top_controls_delta) override; + void RequestNewOutputSurface(bool fallback) override; + void DidInitializeOutputSurface() override; + void WillCommit() override; + void DidCommit() override; + void DidCommitAndDrawFrame() override; + void DidCompleteSwapBuffers() override; + void RateLimitSharedMainThreadContext() override; // cc::LayerTreeHostSingleThreadClient implementation. - virtual void ScheduleAnimation() override; - virtual void DidPostSwapBuffers() override; - virtual void DidAbortSwapBuffers() override; + void ScheduleAnimation() override; + void DidPostSwapBuffers() override; + void DidAbortSwapBuffers() override; private: RenderWidgetCompositor(RenderWidget* widget, bool threaded); diff --git a/content/renderer/gpu/render_widget_compositor_unittest.cc b/content/renderer/gpu/render_widget_compositor_unittest.cc index 598fe49..0dbbb20 100644 --- a/content/renderer/gpu/render_widget_compositor_unittest.cc +++ b/content/renderer/gpu/render_widget_compositor_unittest.cc @@ -35,7 +35,7 @@ class TestRenderWidget : public RenderWidget { MockWebWidget mock_webwidget_; private: - virtual ~TestRenderWidget() { webwidget_ = NULL; } + ~TestRenderWidget() override { webwidget_ = NULL; } DISALLOW_COPY_AND_ASSIGN(TestRenderWidget); }; diff --git a/content/renderer/ico_image_decoder_unittest.cc b/content/renderer/ico_image_decoder_unittest.cc index 28d18d6..5d1f235 100644 --- a/content/renderer/ico_image_decoder_unittest.cc +++ b/content/renderer/ico_image_decoder_unittest.cc @@ -13,7 +13,7 @@ class ICOImageDecoderTest : public ImageDecoderTest { ICOImageDecoderTest() : ImageDecoderTest("ico") { } protected: - virtual blink::WebImageDecoder* CreateWebKitImageDecoder() const override { + blink::WebImageDecoder* CreateWebKitImageDecoder() const override { return new blink::WebImageDecoder(blink::WebImageDecoder::TypeICO); } }; diff --git a/content/renderer/idle_user_detector.h b/content/renderer/idle_user_detector.h index 516706b..86a7eac 100644 --- a/content/renderer/idle_user_detector.h +++ b/content/renderer/idle_user_detector.h @@ -23,11 +23,11 @@ namespace content { class IdleUserDetector : public RenderViewObserver { public: IdleUserDetector(RenderView* render_view); - virtual ~IdleUserDetector(); + ~IdleUserDetector() override; private: // RenderViewObserver implementation: - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; void OnHandleInputEvent(const blink::WebInputEvent* event, const ui::LatencyInfo& latency_info, diff --git a/content/renderer/image_loading_helper.h b/content/renderer/image_loading_helper.h index 9772986..185f3b7 100644 --- a/content/renderer/image_loading_helper.h +++ b/content/renderer/image_loading_helper.h @@ -25,7 +25,7 @@ class ImageLoadingHelper : public RenderFrameObserver { explicit ImageLoadingHelper(RenderFrame* render_frame); private: - virtual ~ImageLoadingHelper(); + ~ImageLoadingHelper() override; // Message handler. void OnDownloadImage(int id, @@ -60,7 +60,7 @@ class ImageLoadingHelper : public RenderFrameObserver { SkBitmap ImageFromDataUrl(const GURL&) const; // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; typedef ScopedVector<MultiResolutionImageResourceFetcher> ImageResourceFetcherList; diff --git a/content/renderer/in_process_renderer_thread.h b/content/renderer/in_process_renderer_thread.h index 56b4a8b..4b4bc65 100644 --- a/content/renderer/in_process_renderer_thread.h +++ b/content/renderer/in_process_renderer_thread.h @@ -18,11 +18,11 @@ class RenderProcess; class InProcessRendererThread : public base::Thread { public: explicit InProcessRendererThread(const std::string& channel_id); - virtual ~InProcessRendererThread(); + ~InProcessRendererThread() override; protected: - virtual void Init() override; - virtual void CleanUp() override; + void Init() override; + void CleanUp() override; private: std::string channel_id_; diff --git a/content/renderer/input/input_event_filter.h b/content/renderer/input/input_event_filter.h index 59af5d4..e7982f6 100644 --- a/content/renderer/input/input_event_filter.h +++ b/content/renderer/input/input_event_filter.h @@ -54,22 +54,22 @@ class CONTENT_EXPORT InputEventFilter : public InputHandlerManagerClient, // is left to the eventual handler to deliver the corresponding // InputHostMsg_HandleInputEvent_ACK. // - virtual void SetBoundHandler(const Handler& handler) override; - virtual void DidAddInputHandler(int routing_id, - cc::InputHandler* input_handler) override; - virtual void DidRemoveInputHandler(int routing_id) override; - virtual void DidOverscroll(int routing_id, - const DidOverscrollParams& params) override; - virtual void DidStopFlinging(int routing_id) override; + void SetBoundHandler(const Handler& handler) override; + void DidAddInputHandler(int routing_id, + cc::InputHandler* input_handler) override; + void DidRemoveInputHandler(int routing_id) override; + void DidOverscroll(int routing_id, + const DidOverscrollParams& params) override; + void DidStopFlinging(int routing_id) override; // IPC::MessageFilter methods: - virtual void OnFilterAdded(IPC::Sender* sender) override; - virtual void OnFilterRemoved() override; - virtual void OnChannelClosing() override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + void OnFilterAdded(IPC::Sender* sender) override; + void OnFilterRemoved() override; + void OnChannelClosing() override; + bool OnMessageReceived(const IPC::Message& message) override; private: - virtual ~InputEventFilter(); + ~InputEventFilter() override; void ForwardToMainListener(const IPC::Message& message); void ForwardToHandler(const IPC::Message& message); diff --git a/content/renderer/input/input_event_filter_unittest.cc b/content/renderer/input/input_event_filter_unittest.cc index 34f0fa9..ab6111d 100644 --- a/content/renderer/input/input_event_filter_unittest.cc +++ b/content/renderer/input/input_event_filter_unittest.cc @@ -80,7 +80,7 @@ class InputEventRecorder { class IPCMessageRecorder : public IPC::Listener { public: - virtual bool OnMessageReceived(const IPC::Message& message) override { + bool OnMessageReceived(const IPC::Message& message) override { messages_.push_back(message); return true; } diff --git a/content/renderer/input/input_handler_proxy.h b/content/renderer/input/input_handler_proxy.h index 38262a0..3507551 100644 --- a/content/renderer/input/input_handler_proxy.h +++ b/content/renderer/input/input_handler_proxy.h @@ -42,13 +42,12 @@ class CONTENT_EXPORT InputHandlerProxy EventDisposition HandleInputEvent(const blink::WebInputEvent& event); // cc::InputHandlerClient implementation. - virtual void WillShutdown() override; - virtual void Animate(base::TimeTicks time) override; - virtual void MainThreadHasStoppedFlinging() override; - virtual void DidOverscroll( - const gfx::PointF& causal_event_viewport_point, - const gfx::Vector2dF& accumulated_overscroll, - const gfx::Vector2dF& latest_overscroll_delta) override; + void WillShutdown() override; + void Animate(base::TimeTicks time) override; + void MainThreadHasStoppedFlinging() override; + void DidOverscroll(const gfx::PointF& causal_event_viewport_point, + const gfx::Vector2dF& accumulated_overscroll, + const gfx::Vector2dF& latest_overscroll_delta) override; // blink::WebGestureCurveTarget implementation. virtual bool scrollBy(const blink::WebFloatSize& offset, diff --git a/content/renderer/input/input_handler_wrapper.h b/content/renderer/input/input_handler_wrapper.h index c465e9b..fd997ce 100644 --- a/content/renderer/input/input_handler_wrapper.h +++ b/content/renderer/input/input_handler_wrapper.h @@ -20,22 +20,22 @@ class InputHandlerWrapper : public InputHandlerProxyClient { const scoped_refptr<base::MessageLoopProxy>& main_loop, const base::WeakPtr<cc::InputHandler>& input_handler, const base::WeakPtr<RenderViewImpl>& render_view_impl); - virtual ~InputHandlerWrapper(); + ~InputHandlerWrapper() override; int routing_id() const { return routing_id_; } InputHandlerProxy* input_handler_proxy() { return &input_handler_proxy_; } // InputHandlerProxyClient implementation. - virtual void WillShutdown() override; - virtual void TransferActiveWheelFlingAnimation( + void WillShutdown() override; + void TransferActiveWheelFlingAnimation( const blink::WebActiveWheelFlingParameters& params) override; - virtual blink::WebGestureCurve* CreateFlingAnimationCurve( + blink::WebGestureCurve* CreateFlingAnimationCurve( blink::WebGestureDevice deviceSource, const blink::WebFloatPoint& velocity, const blink::WebSize& cumulativeScroll) override; - virtual void DidOverscroll(const DidOverscrollParams& params) override; - virtual void DidStopFlinging() override; - virtual void DidReceiveInputEvent() override; + void DidOverscroll(const DidOverscrollParams& params) override; + void DidStopFlinging() override; + void DidReceiveInputEvent() override; private: InputHandlerManager* input_handler_manager_; diff --git a/content/renderer/internal_document_state_data.h b/content/renderer/internal_document_state_data.h index d9c8c9f..27567c8 100644 --- a/content/renderer/internal_document_state_data.h +++ b/content/renderer/internal_document_state_data.h @@ -93,7 +93,7 @@ class InternalDocumentStateData : public base::SupportsUserData::Data { } protected: - virtual ~InternalDocumentStateData(); + ~InternalDocumentStateData() override; private: bool did_first_visually_non_empty_layout_; diff --git a/content/renderer/manifest/manifest_manager.h b/content/renderer/manifest/manifest_manager.h index bae1fef..5874724 100644 --- a/content/renderer/manifest/manifest_manager.h +++ b/content/renderer/manifest/manifest_manager.h @@ -33,15 +33,15 @@ class ManifestManager : public RenderFrameObserver { typedef base::Callback<void(const Manifest&)> GetManifestCallback; explicit ManifestManager(RenderFrame* render_frame); - virtual ~ManifestManager(); + ~ManifestManager() override; // Will call the given |callback| with the Manifest associated with the // RenderFrame if any. Will pass an empty Manifest in case of error. void GetManifest(const GetManifestCallback& callback); // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void DidChangeManifest() override; + bool OnMessageReceived(const IPC::Message& message) override; + void DidChangeManifest() override; private: enum ResolveState { diff --git a/content/renderer/media/aec_dump_message_filter.h b/content/renderer/media/aec_dump_message_filter.h index 835171b..7d7a3bf 100644 --- a/content/renderer/media/aec_dump_message_filter.h +++ b/content/renderer/media/aec_dump_message_filter.h @@ -49,7 +49,7 @@ class CONTENT_EXPORT AecDumpMessageFilter : public IPC::MessageFilter { } protected: - virtual ~AecDumpMessageFilter(); + ~AecDumpMessageFilter() override; private: // Sends an IPC message using |sender_|. @@ -64,10 +64,10 @@ class CONTENT_EXPORT AecDumpMessageFilter : public IPC::MessageFilter { void UnregisterAecDumpConsumer(int id); // IPC::MessageFilter override. Called on |io_message_loop|. - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void OnFilterAdded(IPC::Sender* sender) override; - virtual void OnFilterRemoved() override; - virtual void OnChannelClosing() override; + bool OnMessageReceived(const IPC::Message& message) override; + void OnFilterAdded(IPC::Sender* sender) override; + void OnFilterRemoved() override; + void OnChannelClosing() override; // Accessed on |io_message_loop|. void OnEnableAecDump(int id, IPC::PlatformFileForTransit file_handle); diff --git a/content/renderer/media/audio_input_message_filter.cc b/content/renderer/media/audio_input_message_filter.cc index e96b874..ac987af 100644 --- a/content/renderer/media/audio_input_message_filter.cc +++ b/content/renderer/media/audio_input_message_filter.cc @@ -32,17 +32,17 @@ class AudioInputMessageFilter::AudioInputIPCImpl public: AudioInputIPCImpl(const scoped_refptr<AudioInputMessageFilter>& filter, int render_view_id); - virtual ~AudioInputIPCImpl(); + ~AudioInputIPCImpl() override; // media::AudioInputIPC implementation. - virtual void CreateStream(media::AudioInputIPCDelegate* delegate, - int session_id, - const media::AudioParameters& params, - bool automatic_gain_control, - uint32 total_segments) override; - virtual void RecordStream() override; - virtual void SetVolume(double volume) override; - virtual void CloseStream() override; + void CreateStream(media::AudioInputIPCDelegate* delegate, + int session_id, + const media::AudioParameters& params, + bool automatic_gain_control, + uint32 total_segments) override; + void RecordStream() override; + void SetVolume(double volume) override; + void CloseStream() override; private: const scoped_refptr<AudioInputMessageFilter> filter_; diff --git a/content/renderer/media/audio_input_message_filter.h b/content/renderer/media/audio_input_message_filter.h index cc49d94..c1b4ba8 100644 --- a/content/renderer/media/audio_input_message_filter.h +++ b/content/renderer/media/audio_input_message_filter.h @@ -47,16 +47,16 @@ class CONTENT_EXPORT AudioInputMessageFilter : public IPC::MessageFilter { // stream_id and the destination render_view_id. class AudioInputIPCImpl; - virtual ~AudioInputMessageFilter(); + ~AudioInputMessageFilter() override; // Sends an IPC message using |channel_|. void Send(IPC::Message* message); // IPC::MessageFilter override. Called on |io_message_loop_|. - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void OnFilterAdded(IPC::Sender* sender) override; - virtual void OnFilterRemoved() override; - virtual void OnChannelClosing() override; + bool OnMessageReceived(const IPC::Message& message) override; + void OnFilterAdded(IPC::Sender* sender) override; + void OnFilterRemoved() override; + void OnChannelClosing() override; // Received when browser process has created an audio input stream. void OnStreamCreated(int stream_id, diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc index f72ae54..b03cdd6 100644 --- a/content/renderer/media/audio_message_filter.cc +++ b/content/renderer/media/audio_message_filter.cc @@ -24,16 +24,16 @@ class AudioMessageFilter::AudioOutputIPCImpl AudioOutputIPCImpl(const scoped_refptr<AudioMessageFilter>& filter, int render_view_id, int render_frame_id); - virtual ~AudioOutputIPCImpl(); + ~AudioOutputIPCImpl() override; // media::AudioOutputIPC implementation. - virtual void CreateStream(media::AudioOutputIPCDelegate* delegate, - const media::AudioParameters& params, - int session_id) override; - virtual void PlayStream() override; - virtual void PauseStream() override; - virtual void CloseStream() override; - virtual void SetVolume(double volume) override; + void CreateStream(media::AudioOutputIPCDelegate* delegate, + const media::AudioParameters& params, + int session_id) override; + void PlayStream() override; + void PauseStream() override; + void CloseStream() override; + void SetVolume(double volume) override; private: const scoped_refptr<AudioMessageFilter> filter_; diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h index 2783c72..db973d0 100644 --- a/content/renderer/media/audio_message_filter.h +++ b/content/renderer/media/audio_message_filter.h @@ -55,7 +55,7 @@ class CONTENT_EXPORT AudioMessageFilter : public IPC::MessageFilter { } protected: - virtual ~AudioMessageFilter(); + ~AudioMessageFilter() override; private: FRIEND_TEST_ALL_PREFIXES(AudioMessageFilterTest, Basic); @@ -69,10 +69,10 @@ class CONTENT_EXPORT AudioMessageFilter : public IPC::MessageFilter { void Send(IPC::Message* message); // IPC::MessageFilter override. Called on |io_message_loop|. - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void OnFilterAdded(IPC::Sender* sender) override; - virtual void OnFilterRemoved() override; - virtual void OnChannelClosing() override; + bool OnMessageReceived(const IPC::Message& message) override; + void OnFilterAdded(IPC::Sender* sender) override; + void OnFilterRemoved() override; + void OnChannelClosing() override; // Received when browser process has created an audio output stream. void OnStreamCreated(int stream_id, base::SharedMemoryHandle handle, diff --git a/content/renderer/media/audio_message_filter_unittest.cc b/content/renderer/media/audio_message_filter_unittest.cc index 9036b32c..2626f4e 100644 --- a/content/renderer/media/audio_message_filter_unittest.cc +++ b/content/renderer/media/audio_message_filter_unittest.cc @@ -20,21 +20,20 @@ class MockAudioDelegate : public media::AudioOutputIPCDelegate { Reset(); } - virtual void OnStateChanged( - media::AudioOutputIPCDelegate::State state) override { + void OnStateChanged(media::AudioOutputIPCDelegate::State state) override { state_changed_received_ = true; state_ = state; } - virtual void OnStreamCreated(base::SharedMemoryHandle handle, - base::SyncSocket::Handle, - int length) override { + void OnStreamCreated(base::SharedMemoryHandle handle, + base::SyncSocket::Handle, + int length) override { created_received_ = true; handle_ = handle; length_ = length; } - virtual void OnIPCClosed() override {} + void OnIPCClosed() override {} void Reset() { state_changed_received_ = false; diff --git a/content/renderer/media/crypto/encrypted_media_player_support_impl.h b/content/renderer/media/crypto/encrypted_media_player_support_impl.h index 6943d44..d68d40b 100644 --- a/content/renderer/media/crypto/encrypted_media_player_support_impl.h +++ b/content/renderer/media/crypto/encrypted_media_player_support_impl.h @@ -27,16 +27,16 @@ class EncryptedMediaPlayerSupportImpl static scoped_ptr<EncryptedMediaPlayerSupport> Create( blink::WebMediaPlayerClient* client); - virtual ~EncryptedMediaPlayerSupportImpl(); + ~EncryptedMediaPlayerSupportImpl() override; // EncryptedMediaPlayerSupport implementation. - virtual blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest( + blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest( blink::WebLocalFrame* frame, const blink::WebString& key_system, const unsigned char* init_data, - unsigned init_data_length) override; + unsigned init_data_length) override; - virtual blink::WebMediaPlayer::MediaKeyException AddKey( + blink::WebMediaPlayer::MediaKeyException AddKey( const blink::WebString& key_system, const unsigned char* key, unsigned key_length, @@ -44,23 +44,23 @@ class EncryptedMediaPlayerSupportImpl unsigned init_data_length, const blink::WebString& session_id) override; - virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest( + blink::WebMediaPlayer::MediaKeyException CancelKeyRequest( const blink::WebString& key_system, const blink::WebString& session_id) override; - virtual void SetInitialContentDecryptionModule( + void SetInitialContentDecryptionModule( blink::WebContentDecryptionModule* initial_cdm) override; - virtual void SetContentDecryptionModule( + void SetContentDecryptionModule( blink::WebContentDecryptionModule* cdm) override; - virtual void SetContentDecryptionModule( + void SetContentDecryptionModule( blink::WebContentDecryptionModule* cdm, blink::WebContentDecryptionModuleResult result) override; - virtual media::SetDecryptorReadyCB CreateSetDecryptorReadyCB() override; - virtual media::Demuxer::NeedKeyCB CreateNeedKeyCB() override; + media::SetDecryptorReadyCB CreateSetDecryptorReadyCB() override; + media::Demuxer::NeedKeyCB CreateNeedKeyCB() override; - virtual void OnPipelineDecryptError() override; + void OnPipelineDecryptError() override; private: explicit EncryptedMediaPlayerSupportImpl(blink::WebMediaPlayerClient* client); diff --git a/content/renderer/media/crypto/key_systems_unittest.cc b/content/renderer/media/crypto/key_systems_unittest.cc index f2657ab..7b877ee 100644 --- a/content/renderer/media/crypto/key_systems_unittest.cc +++ b/content/renderer/media/crypto/key_systems_unittest.cc @@ -92,8 +92,7 @@ static void AddContainerAndCodecMasksForTest() { } class TestContentRendererClient : public ContentRendererClient { - virtual void AddKeySystems( - std::vector<content::KeySystemInfo>* key_systems) override; + void AddKeySystems(std::vector<content::KeySystemInfo>* key_systems) override; }; void TestContentRendererClient::AddKeySystems( diff --git a/content/renderer/media/crypto/pepper_cdm_wrapper_impl.h b/content/renderer/media/crypto/pepper_cdm_wrapper_impl.h index 38e53c9..ea4f31c 100644 --- a/content/renderer/media/crypto/pepper_cdm_wrapper_impl.h +++ b/content/renderer/media/crypto/pepper_cdm_wrapper_impl.h @@ -44,10 +44,10 @@ class PepperCdmWrapperImpl : public PepperCdmWrapper { const std::string& pluginType, const GURL& security_origin); - virtual ~PepperCdmWrapperImpl(); + ~PepperCdmWrapperImpl() override; // Returns the ContentDecryptorDelegate* associated with this plugin. - virtual ContentDecryptorDelegate* GetCdmDelegate() override; + ContentDecryptorDelegate* GetCdmDelegate() override; private: typedef scoped_ptr<blink::WebHelperPlugin, WebHelperPluginDeleter> diff --git a/content/renderer/media/crypto/ppapi_decryptor.cc b/content/renderer/media/crypto/ppapi_decryptor.cc index b2b10d7..137e16c 100644 --- a/content/renderer/media/crypto/ppapi_decryptor.cc +++ b/content/renderer/media/crypto/ppapi_decryptor.cc @@ -35,15 +35,15 @@ class SessionUpdatedPromise : public media::CdmPromiseTemplate<> { : caller_promise_(caller_promise.Pass()), additional_resolve_cb_(additional_resolve_cb) {} - virtual void resolve() override { + void resolve() override { MarkPromiseSettled(); additional_resolve_cb_.Run(); caller_promise_->resolve(); } - virtual void reject(media::MediaKeys::Exception exception_code, - uint32 system_code, - const std::string& error_message) override { + void reject(media::MediaKeys::Exception exception_code, + uint32 system_code, + const std::string& error_message) override { MarkPromiseSettled(); caller_promise_->reject(exception_code, system_code, error_message); } @@ -64,15 +64,15 @@ class SessionLoadedPromise : public media::CdmPromiseTemplate<std::string> { : caller_promise_(caller_promise.Pass()), additional_resolve_cb_(additional_resolve_cb) {} - virtual void resolve(const std::string& web_session_id) override { + void resolve(const std::string& web_session_id) override { MarkPromiseSettled(); additional_resolve_cb_.Run(); caller_promise_->resolve(web_session_id); } - virtual void reject(media::MediaKeys::Exception exception_code, - uint32 system_code, - const std::string& error_message) override { + void reject(media::MediaKeys::Exception exception_code, + uint32 system_code, + const std::string& error_message) override { MarkPromiseSettled(); caller_promise_->reject(exception_code, system_code, error_message); } diff --git a/content/renderer/media/crypto/ppapi_decryptor.h b/content/renderer/media/crypto/ppapi_decryptor.h index b567d45..0c4c0dd 100644 --- a/content/renderer/media/crypto/ppapi_decryptor.h +++ b/content/renderer/media/crypto/ppapi_decryptor.h @@ -42,57 +42,51 @@ class PpapiDecryptor : public media::MediaKeys, public media::Decryptor { const media::SessionKeysChangeCB& session_keys_change_cb, const media::SessionExpirationUpdateCB& session_expiration_update_cb); - virtual ~PpapiDecryptor(); + ~PpapiDecryptor() override; // media::MediaKeys implementation. - virtual void SetServerCertificate( + void SetServerCertificate( const uint8* certificate_data, int certificate_data_length, scoped_ptr<media::SimpleCdmPromise> promise) override; - virtual void CreateSession( - const std::string& init_data_type, - const uint8* init_data, - int init_data_length, - SessionType session_type, - scoped_ptr<media::NewSessionCdmPromise> promise) override; - virtual void LoadSession( - const std::string& web_session_id, - scoped_ptr<media::NewSessionCdmPromise> promise) override; - virtual void UpdateSession( - const std::string& web_session_id, - const uint8* response, - int response_length, - scoped_ptr<media::SimpleCdmPromise> promise) override; - virtual void CloseSession( - const std::string& web_session_id, - scoped_ptr<media::SimpleCdmPromise> promise) override; - virtual void RemoveSession( - const std::string& web_session_id, - scoped_ptr<media::SimpleCdmPromise> promise) override; - virtual void GetUsableKeyIds( - const std::string& web_session_id, - scoped_ptr<media::KeyIdsPromise> promise) override; - virtual Decryptor* GetDecryptor() override; + void CreateSession(const std::string& init_data_type, + const uint8* init_data, + int init_data_length, + SessionType session_type, + scoped_ptr<media::NewSessionCdmPromise> promise) override; + void LoadSession(const std::string& web_session_id, + scoped_ptr<media::NewSessionCdmPromise> promise) override; + void UpdateSession(const std::string& web_session_id, + const uint8* response, + int response_length, + scoped_ptr<media::SimpleCdmPromise> promise) override; + void CloseSession(const std::string& web_session_id, + scoped_ptr<media::SimpleCdmPromise> promise) override; + void RemoveSession(const std::string& web_session_id, + scoped_ptr<media::SimpleCdmPromise> promise) override; + void GetUsableKeyIds(const std::string& web_session_id, + scoped_ptr<media::KeyIdsPromise> promise) override; + Decryptor* GetDecryptor() override; // media::Decryptor implementation. - virtual void RegisterNewKeyCB(StreamType stream_type, - const NewKeyCB& key_added_cb) override; - virtual void Decrypt(StreamType stream_type, - const scoped_refptr<media::DecoderBuffer>& encrypted, - const DecryptCB& decrypt_cb) override; - virtual void CancelDecrypt(StreamType stream_type) override; - virtual void InitializeAudioDecoder(const media::AudioDecoderConfig& config, - const DecoderInitCB& init_cb) override; - virtual void InitializeVideoDecoder(const media::VideoDecoderConfig& config, - const DecoderInitCB& init_cb) override; - virtual void DecryptAndDecodeAudio( + void RegisterNewKeyCB(StreamType stream_type, + const NewKeyCB& key_added_cb) override; + void Decrypt(StreamType stream_type, + const scoped_refptr<media::DecoderBuffer>& encrypted, + const DecryptCB& decrypt_cb) override; + void CancelDecrypt(StreamType stream_type) override; + void InitializeAudioDecoder(const media::AudioDecoderConfig& config, + const DecoderInitCB& init_cb) override; + void InitializeVideoDecoder(const media::VideoDecoderConfig& config, + const DecoderInitCB& init_cb) override; + void DecryptAndDecodeAudio( const scoped_refptr<media::DecoderBuffer>& encrypted, const AudioDecodeCB& audio_decode_cb) override; - virtual void DecryptAndDecodeVideo( + void DecryptAndDecodeVideo( const scoped_refptr<media::DecoderBuffer>& encrypted, const VideoDecodeCB& video_decode_cb) override; - virtual void ResetDecoder(StreamType stream_type) override; - virtual void DeinitializeDecoder(StreamType stream_type) override; + void ResetDecoder(StreamType stream_type) override; + void DeinitializeDecoder(StreamType stream_type) override; private: PpapiDecryptor( diff --git a/content/renderer/media/crypto/render_cdm_factory.h b/content/renderer/media/crypto/render_cdm_factory.h index 6861908..f09f01b 100644 --- a/content/renderer/media/crypto/render_cdm_factory.h +++ b/content/renderer/media/crypto/render_cdm_factory.h @@ -33,9 +33,9 @@ class RenderCdmFactory : public media::CdmFactory { RenderCdmFactory(); #endif // defined(ENABLE_PEPPER_CDMS) - virtual ~RenderCdmFactory(); + ~RenderCdmFactory() override; - virtual scoped_ptr<media::MediaKeys> Create( + scoped_ptr<media::MediaKeys> Create( const std::string& key_system, const GURL& security_origin, const media::SessionMessageCB& session_message_cb, diff --git a/content/renderer/media/media_stream_audio_processor.h b/content/renderer/media/media_stream_audio_processor.h index 40abb4e..0209bd6 100644 --- a/content/renderer/media/media_stream_audio_processor.h +++ b/content/renderer/media/media_stream_audio_processor.h @@ -107,14 +107,13 @@ class CONTENT_EXPORT MediaStreamAudioProcessor : // AecDumpMessageFilter::AecDumpDelegate implementation. // Called on the main render thread. - virtual void OnAecDumpFile( - const IPC::PlatformFileForTransit& file_handle) override; - virtual void OnDisableAecDump() override; - virtual void OnIpcClosing() override; + void OnAecDumpFile(const IPC::PlatformFileForTransit& file_handle) override; + void OnDisableAecDump() override; + void OnIpcClosing() override; protected: friend class base::RefCountedThreadSafe<MediaStreamAudioProcessor>; - virtual ~MediaStreamAudioProcessor(); + ~MediaStreamAudioProcessor() override; private: friend class MediaStreamAudioProcessorTest; @@ -122,14 +121,14 @@ class CONTENT_EXPORT MediaStreamAudioProcessor : GetAecDumpMessageFilter); // WebRtcPlayoutDataSource::Sink implementation. - virtual void OnPlayoutData(media::AudioBus* audio_bus, - int sample_rate, - int audio_delay_milliseconds) override; - virtual void OnPlayoutDataSourceChanged() override; + void OnPlayoutData(media::AudioBus* audio_bus, + int sample_rate, + int audio_delay_milliseconds) override; + void OnPlayoutDataSourceChanged() override; // webrtc::AudioProcessorInterface implementation. // This method is called on the libjingle thread. - virtual void GetStats(AudioProcessorStats* stats) override; + void GetStats(AudioProcessorStats* stats) override; // Helper to initialize the WebRtc AudioProcessing. void InitializeAudioProcessingModule( diff --git a/content/renderer/media/media_stream_audio_sink_owner.h b/content/renderer/media/media_stream_audio_sink_owner.h index 40c931d..23acf69 100644 --- a/content/renderer/media/media_stream_audio_sink_owner.h +++ b/content/renderer/media/media_stream_audio_sink_owner.h @@ -20,24 +20,24 @@ class MediaStreamAudioSinkOwner : public MediaStreamAudioTrackSink { explicit MediaStreamAudioSinkOwner(MediaStreamAudioSink* sink); // MediaStreamAudioTrackSink implementation. - virtual int OnData(const int16* audio_data, - int sample_rate, - int number_of_channels, - int number_of_frames, - const std::vector<int>& channels, - int audio_delay_milliseconds, - int current_volume, - bool need_audio_processing, - bool key_pressed) override; - virtual void OnSetFormat(const media::AudioParameters& params) override; - virtual void OnReadyStateChanged( + int OnData(const int16* audio_data, + int sample_rate, + int number_of_channels, + int number_of_frames, + const std::vector<int>& channels, + int audio_delay_milliseconds, + int current_volume, + bool need_audio_processing, + bool key_pressed) override; + void OnSetFormat(const media::AudioParameters& params) override; + void OnReadyStateChanged( blink::WebMediaStreamSource::ReadyState state) override; - virtual void Reset() override; - virtual bool IsEqual(const MediaStreamAudioSink* other) const override; - virtual bool IsEqual(const PeerConnectionAudioSink* other) const override; + void Reset() override; + bool IsEqual(const MediaStreamAudioSink* other) const override; + bool IsEqual(const PeerConnectionAudioSink* other) const override; protected: - virtual ~MediaStreamAudioSinkOwner() {} + ~MediaStreamAudioSinkOwner() override {} private: mutable base::Lock lock_; diff --git a/content/renderer/media/media_stream_audio_source.h b/content/renderer/media/media_stream_audio_source.h index bad08f3..23e68f6 100644 --- a/content/renderer/media/media_stream_audio_source.h +++ b/content/renderer/media/media_stream_audio_source.h @@ -46,7 +46,7 @@ class CONTENT_EXPORT MediaStreamAudioSource } protected: - virtual void DoStopSource() override; + void DoStopSource() override; private: const int render_view_id_; // Render view ID that created this source. diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h index 41410ac..74a06dc 100644 --- a/content/renderer/media/media_stream_dispatcher.h +++ b/content/renderer/media/media_stream_dispatcher.h @@ -35,7 +35,7 @@ class CONTENT_EXPORT MediaStreamDispatcher public base::SupportsWeakPtr<MediaStreamDispatcher> { public: explicit MediaStreamDispatcher(RenderFrame* render_frame); - virtual ~MediaStreamDispatcher(); + ~MediaStreamDispatcher() override; // Request a new media stream to be created. // This can be used either by WebKit or a plugin. @@ -111,9 +111,9 @@ class CONTENT_EXPORT MediaStreamDispatcher struct Stream; // RenderFrameObserver override. - virtual void OnDestruct() override; - virtual bool Send(IPC::Message* message) override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + void OnDestruct() override; + bool Send(IPC::Message* message) override; + bool OnMessageReceived(const IPC::Message& message) override; // Messages from the browser. void OnStreamGenerated( diff --git a/content/renderer/media/media_stream_dispatcher_unittest.cc b/content/renderer/media/media_stream_dispatcher_unittest.cc index ccf6fd5..32acc88 100644 --- a/content/renderer/media/media_stream_dispatcher_unittest.cc +++ b/content/renderer/media/media_stream_dispatcher_unittest.cc @@ -37,9 +37,9 @@ class MockMediaStreamDispatcherEventHandler MockMediaStreamDispatcherEventHandler() : request_id_(-1) {} - virtual void OnStreamGenerated( + void OnStreamGenerated( int request_id, - const std::string &label, + const std::string& label, const StreamDeviceInfoArray& audio_device_array, const StreamDeviceInfoArray& video_device_array) override { request_id_ = request_id; @@ -54,14 +54,14 @@ class MockMediaStreamDispatcherEventHandler } } - virtual void OnStreamGenerationFailed( + void OnStreamGenerationFailed( int request_id, content::MediaStreamRequestResult result) override { request_id_ = request_id; } - virtual void OnDeviceStopped(const std::string& label, - const StreamDeviceInfo& device_info) override { + void OnDeviceStopped(const std::string& label, + const StreamDeviceInfo& device_info) override { device_stopped_label_ = label; if (IsVideoMediaType(device_info.device.type)) { EXPECT_TRUE(StreamDeviceInfo::IsEqual(video_device_, device_info)); @@ -71,23 +71,19 @@ class MockMediaStreamDispatcherEventHandler } } - virtual void OnDevicesEnumerated( - int request_id, - const StreamDeviceInfoArray& device_array) override { + void OnDevicesEnumerated(int request_id, + const StreamDeviceInfoArray& device_array) override { request_id_ = request_id; } - virtual void OnDeviceOpened( - int request_id, - const std::string& label, - const StreamDeviceInfo& video_device) override { + void OnDeviceOpened(int request_id, + const std::string& label, + const StreamDeviceInfo& video_device) override { request_id_ = request_id; label_ = label; } - virtual void OnDeviceOpenFailed(int request_id) override { - request_id_ = request_id; - } + void OnDeviceOpenFailed(int request_id) override { request_id_ = request_id; } void ResetStoredParameters() { request_id_ = -1; diff --git a/content/renderer/media/media_stream_video_capturer_source.h b/content/renderer/media/media_stream_video_capturer_source.h index 6d27eb0..e22b6db 100644 --- a/content/renderer/media/media_stream_video_capturer_source.h +++ b/content/renderer/media/media_stream_video_capturer_source.h @@ -100,17 +100,17 @@ class CONTENT_EXPORT MediaStreamVideoCapturerSource protected: // Implements MediaStreamVideoSource. - virtual void GetCurrentSupportedFormats( + void GetCurrentSupportedFormats( int max_requested_width, int max_requested_height, double max_requested_frame_rate, const VideoCaptureDeviceFormatsCB& callback) override; - virtual void StartSourceImpl( + void StartSourceImpl( const media::VideoCaptureFormat& format, const VideoCaptureDeliverFrameCB& frame_callback) override; - virtual void StopSourceImpl() override; + void StopSourceImpl() override; private: // The delegate that provides video frames. diff --git a/content/renderer/media/media_stream_video_source.h b/content/renderer/media/media_stream_video_source.h index 4ff7594..e06dfc1 100644 --- a/content/renderer/media/media_stream_video_source.h +++ b/content/renderer/media/media_stream_video_source.h @@ -84,7 +84,7 @@ class CONTENT_EXPORT MediaStreamVideoSource static const int kUnknownFrameRate; protected: - virtual void DoStopSource() override; + void DoStopSource() override; // Sets ready state and notifies the ready state to all registered tracks. virtual void SetReadyState(blink::WebMediaStreamSource::ReadyState state); diff --git a/content/renderer/media/media_stream_video_track.h b/content/renderer/media/media_stream_video_track.h index de128b5..c3b5ed9 100644 --- a/content/renderer/media/media_stream_video_track.h +++ b/content/renderer/media/media_stream_video_track.h @@ -49,9 +49,9 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack { bool enabled); virtual ~MediaStreamVideoTrack(); - virtual void SetEnabled(bool enabled) override; + void SetEnabled(bool enabled) override; - virtual void Stop() override; + void Stop() override; void OnReadyStateChanged(blink::WebMediaStreamSource::ReadyState state); diff --git a/content/renderer/media/midi_dispatcher.h b/content/renderer/media/midi_dispatcher.h index b37085e..cfa77ee 100644 --- a/content/renderer/media/midi_dispatcher.h +++ b/content/renderer/media/midi_dispatcher.h @@ -28,7 +28,7 @@ class MidiDispatcher : public RenderFrameObserver, private: // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // blink::WebMIDIClient implementation. virtual void requestSysexPermission( diff --git a/content/renderer/media/midi_message_filter.h b/content/renderer/media/midi_message_filter.h index 8eed8ab..4aa560a 100644 --- a/content/renderer/media/midi_message_filter.h +++ b/content/renderer/media/midi_message_filter.h @@ -47,17 +47,17 @@ class CONTENT_EXPORT MidiMessageFilter : public IPC::MessageFilter { } protected: - virtual ~MidiMessageFilter(); + ~MidiMessageFilter() override; private: // Sends an IPC message using |sender_|. void Send(IPC::Message* message); // IPC::MessageFilter override. Called on |io_message_loop|. - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void OnFilterAdded(IPC::Sender* sender) override; - virtual void OnFilterRemoved() override; - virtual void OnChannelClosing() override; + bool OnMessageReceived(const IPC::Message& message) override; + void OnFilterAdded(IPC::Sender* sender) override; + void OnFilterRemoved() override; + void OnChannelClosing() override; // Called when the browser process has approved (or denied) access to // MIDI hardware. diff --git a/content/renderer/media/mock_media_stream_dispatcher.h b/content/renderer/media/mock_media_stream_dispatcher.h index e5f9129..d77327a 100644 --- a/content/renderer/media/mock_media_stream_dispatcher.h +++ b/content/renderer/media/mock_media_stream_dispatcher.h @@ -16,26 +16,26 @@ namespace content { class MockMediaStreamDispatcher : public MediaStreamDispatcher { public: MockMediaStreamDispatcher(); - virtual ~MockMediaStreamDispatcher(); + ~MockMediaStreamDispatcher() override; - virtual void GenerateStream( + void GenerateStream( int request_id, const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler, const StreamOptions& components, const GURL& url) override; - virtual void CancelGenerateStream( + void CancelGenerateStream( int request_id, - const base::WeakPtr<MediaStreamDispatcherEventHandler>& - event_handler) override; - virtual void EnumerateDevices( + const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler) + override; + void EnumerateDevices( int request_id, const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler, MediaStreamType type, const GURL& security_origin) override; - virtual void StopStreamDevice(const StreamDeviceInfo& device_info) override; - virtual bool IsStream(const std::string& label) override; - virtual int video_session_id(const std::string& label, int index) override; - virtual int audio_session_id(const std::string& label, int index) override; + void StopStreamDevice(const StreamDeviceInfo& device_info) override; + bool IsStream(const std::string& label) override; + int video_session_id(const std::string& label, int index) override; + int audio_session_id(const std::string& label, int index) override; int audio_input_request_id() const { return audio_input_request_id_; } int audio_output_request_id() const { return audio_output_request_id_; } diff --git a/content/renderer/media/mock_media_stream_registry.h b/content/renderer/media/mock_media_stream_registry.h index 9342323..ccae880 100644 --- a/content/renderer/media/mock_media_stream_registry.h +++ b/content/renderer/media/mock_media_stream_registry.h @@ -18,8 +18,7 @@ class MockMediaStreamRegistry : public MediaStreamRegistryInterface { void Init(const std::string& stream_label); void AddVideoTrack(const std::string& track_id); - virtual blink::WebMediaStream GetMediaStream( - const std::string& url) override; + blink::WebMediaStream GetMediaStream(const std::string& url) override; const blink::WebMediaStream test_stream() const; diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc index a2b13215..9457a3d 100644 --- a/content/renderer/media/mock_peer_connection_impl.cc +++ b/content/renderer/media/mock_peer_connection_impl.cc @@ -25,20 +25,16 @@ namespace content { class MockStreamCollection : public webrtc::StreamCollectionInterface { public: - virtual size_t count() override { - return streams_.size(); - } - virtual MediaStreamInterface* at(size_t index) override { - return streams_[index]; - } - virtual MediaStreamInterface* find(const std::string& label) override { + size_t count() override { return streams_.size(); } + MediaStreamInterface* at(size_t index) override { return streams_[index]; } + MediaStreamInterface* find(const std::string& label) override { for (size_t i = 0; i < streams_.size(); ++i) { if (streams_[i]->label() == label) return streams_[i]; } return NULL; } - virtual webrtc::MediaStreamTrackInterface* FindAudioTrack( + webrtc::MediaStreamTrackInterface* FindAudioTrack( const std::string& id) override { for (size_t i = 0; i < streams_.size(); ++i) { webrtc::MediaStreamTrackInterface* track = @@ -48,7 +44,7 @@ class MockStreamCollection : public webrtc::StreamCollectionInterface { } return NULL; } - virtual webrtc::MediaStreamTrackInterface* FindVideoTrack( + webrtc::MediaStreamTrackInterface* FindVideoTrack( const std::string& id) override { for (size_t i = 0; i < streams_.size(); ++i) { webrtc::MediaStreamTrackInterface* track = @@ -72,7 +68,7 @@ class MockStreamCollection : public webrtc::StreamCollectionInterface { } protected: - virtual ~MockStreamCollection() {} + ~MockStreamCollection() override {} private: typedef std::vector<rtc::scoped_refptr<MediaStreamInterface> > @@ -90,65 +86,48 @@ class MockDataChannel : public webrtc::DataChannelInterface { config_(*config) { } - virtual void RegisterObserver( - webrtc::DataChannelObserver* observer) override { - } + void RegisterObserver(webrtc::DataChannelObserver* observer) override {} - virtual void UnregisterObserver() override { - } + void UnregisterObserver() override {} - virtual std::string label() const override { - return label_; - } + std::string label() const override { return label_; } - virtual bool reliable() const override { - return reliable_; - } + bool reliable() const override { return reliable_; } - virtual bool ordered() const override { - return config_.ordered; - } + bool ordered() const override { return config_.ordered; } - virtual unsigned short maxRetransmitTime() const override { + unsigned short maxRetransmitTime() const override { return config_.maxRetransmitTime; } - virtual unsigned short maxRetransmits() const override { + unsigned short maxRetransmits() const override { return config_.maxRetransmits; } - virtual std::string protocol() const override { - return config_.protocol; - } + std::string protocol() const override { return config_.protocol; } - virtual bool negotiated() const override { - return config_.negotiated; - } + bool negotiated() const override { return config_.negotiated; } - virtual int id() const override { + int id() const override { NOTIMPLEMENTED(); return 0; } - virtual DataState state() const override { - return state_; - } + DataState state() const override { return state_; } - virtual uint64 buffered_amount() const override { + uint64 buffered_amount() const override { NOTIMPLEMENTED(); return 0; } - virtual void Close() override { - state_ = webrtc::DataChannelInterface::kClosing; - } + void Close() override { state_ = webrtc::DataChannelInterface::kClosing; } - virtual bool Send(const webrtc::DataBuffer& buffer) override { + bool Send(const webrtc::DataBuffer& buffer) override { return state_ == webrtc::DataChannelInterface::kOpen; } protected: - virtual ~MockDataChannel() {} + ~MockDataChannel() override {} private: std::string label_; @@ -164,34 +143,26 @@ class MockDtmfSender : public DtmfSenderInterface { observer_(NULL), duration_(0), inter_tone_gap_(0) {} - virtual void RegisterObserver( - DtmfSenderObserverInterface* observer) override { + void RegisterObserver(DtmfSenderObserverInterface* observer) override { observer_ = observer; } - virtual void UnregisterObserver() override { - observer_ = NULL; - } - virtual bool CanInsertDtmf() override { - return true; - } - virtual bool InsertDtmf(const std::string& tones, int duration, - int inter_tone_gap) override { + void UnregisterObserver() override { observer_ = NULL; } + bool CanInsertDtmf() override { return true; } + bool InsertDtmf(const std::string& tones, + int duration, + int inter_tone_gap) override { tones_ = tones; duration_ = duration; inter_tone_gap_ = inter_tone_gap; return true; } - virtual const AudioTrackInterface* track() const override { - return track_.get(); - } - virtual std::string tones() const override { - return tones_; - } - virtual int duration() const override { return duration_; } - virtual int inter_tone_gap() const override { return inter_tone_gap_; } + const AudioTrackInterface* track() const override { return track_.get(); } + std::string tones() const override { return tones_; } + int duration() const override { return duration_; } + int inter_tone_gap() const override { return inter_tone_gap_; } protected: - virtual ~MockDtmfSender() {} + ~MockDtmfSender() override {} private: rtc::scoped_refptr<AudioTrackInterface> track_; diff --git a/content/renderer/media/native_handle_impl.h b/content/renderer/media/native_handle_impl.h index 7b5748b..20a4f03 100644 --- a/content/renderer/media/native_handle_impl.h +++ b/content/renderer/media/native_handle_impl.h @@ -15,11 +15,11 @@ class NativeHandleImpl : public webrtc::NativeHandle { public: // Wraps a video frame in the handle. explicit NativeHandleImpl(scoped_refptr<media::VideoFrame> frame); - virtual ~NativeHandleImpl(); + ~NativeHandleImpl() override; // Retrieves the video frame in the handle. The frame is still ref-counted by // the handle. The ref count decreases when NativeHandleImpl is destroyed. - virtual void* GetHandle() override; + void* GetHandle() override; private: scoped_refptr<media::VideoFrame> frame_; diff --git a/content/renderer/media/peer_connection_audio_sink_owner.h b/content/renderer/media/peer_connection_audio_sink_owner.h index abd1100..0aaa0ea 100644 --- a/content/renderer/media/peer_connection_audio_sink_owner.h +++ b/content/renderer/media/peer_connection_audio_sink_owner.h @@ -20,24 +20,24 @@ class PeerConnectionAudioSinkOwner : public MediaStreamAudioTrackSink { explicit PeerConnectionAudioSinkOwner(PeerConnectionAudioSink* sink); // MediaStreamAudioTrackSink implementation. - virtual int OnData(const int16* audio_data, - int sample_rate, - int number_of_channels, - int number_of_frames, - const std::vector<int>& channels, - int audio_delay_milliseconds, - int current_volume, - bool need_audio_processing, - bool key_pressed) override; - virtual void OnSetFormat(const media::AudioParameters& params) override; - virtual void OnReadyStateChanged( + int OnData(const int16* audio_data, + int sample_rate, + int number_of_channels, + int number_of_frames, + const std::vector<int>& channels, + int audio_delay_milliseconds, + int current_volume, + bool need_audio_processing, + bool key_pressed) override; + void OnSetFormat(const media::AudioParameters& params) override; + void OnReadyStateChanged( blink::WebMediaStreamSource::ReadyState state) override; - virtual void Reset() override; - virtual bool IsEqual(const MediaStreamAudioSink* other) const override; - virtual bool IsEqual(const PeerConnectionAudioSink* other) const override; + void Reset() override; + bool IsEqual(const MediaStreamAudioSink* other) const override; + bool IsEqual(const PeerConnectionAudioSink* other) const override; protected: - virtual ~PeerConnectionAudioSinkOwner() {} + ~PeerConnectionAudioSinkOwner() override {} private: mutable base::Lock lock_; diff --git a/content/renderer/media/peer_connection_identity_service.h b/content/renderer/media/peer_connection_identity_service.h index e931c99..c1c3323 100644 --- a/content/renderer/media/peer_connection_identity_service.h +++ b/content/renderer/media/peer_connection_identity_service.h @@ -21,13 +21,12 @@ class PeerConnectionIdentityService public: explicit PeerConnectionIdentityService(const GURL& origin); - virtual ~PeerConnectionIdentityService(); + ~PeerConnectionIdentityService() override; // webrtc::DTLSIdentityServiceInterface implementation. - virtual bool RequestIdentity( - const std::string& identity_name, - const std::string& common_name, - webrtc::DTLSIdentityRequestObserver* observer) override; + bool RequestIdentity(const std::string& identity_name, + const std::string& common_name, + webrtc::DTLSIdentityRequestObserver* observer) override; private: void OnIdentityReady(const std::string& certificate, diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc index d64a629..38ad623 100644 --- a/content/renderer/media/peer_connection_tracker.cc +++ b/content/renderer/media/peer_connection_tracker.cc @@ -246,8 +246,7 @@ class InternalStatsObserver : public webrtc::StatsObserver { InternalStatsObserver(int lid) : lid_(lid){} - virtual void OnComplete( - const std::vector<webrtc::StatsReport>& reports) override { + void OnComplete(const std::vector<webrtc::StatsReport>& reports) override { base::ListValue list; for (size_t i = 0; i < reports.size(); ++i) { @@ -262,7 +261,7 @@ class InternalStatsObserver : public webrtc::StatsObserver { } protected: - virtual ~InternalStatsObserver() {} + ~InternalStatsObserver() override {} private: int lid_; diff --git a/content/renderer/media/peer_connection_tracker.h b/content/renderer/media/peer_connection_tracker.h index 707e2ee..c48ed66b 100644 --- a/content/renderer/media/peer_connection_tracker.h +++ b/content/renderer/media/peer_connection_tracker.h @@ -36,7 +36,7 @@ class RTCPeerConnectionHandler; class CONTENT_EXPORT PeerConnectionTracker : public RenderProcessObserver { public: PeerConnectionTracker(); - virtual ~PeerConnectionTracker(); + ~PeerConnectionTracker() override; enum Source { SOURCE_LOCAL, @@ -51,7 +51,7 @@ class CONTENT_EXPORT PeerConnectionTracker : public RenderProcessObserver { }; // RenderProcessObserver implementation. - virtual bool OnControlMessageReceived(const IPC::Message& message) override; + bool OnControlMessageReceived(const IPC::Message& message) override; // // The following methods send an update to the browser process when a diff --git a/content/renderer/media/remote_media_stream_impl.cc b/content/renderer/media/remote_media_stream_impl.cc index b5c28e5..b526253 100644 --- a/content/renderer/media/remote_media_stream_impl.cc +++ b/content/renderer/media/remote_media_stream_impl.cc @@ -99,11 +99,11 @@ class RemoteAudioMediaStreamTrackAdapter RemoteAudioMediaStreamTrackAdapter( webrtc::MediaStreamTrackInterface* webrtc_track, const blink::WebMediaStreamTrack& webkit_track); - virtual ~RemoteAudioMediaStreamTrackAdapter(); + ~RemoteAudioMediaStreamTrackAdapter() override; private: // webrtc::ObserverInterface implementation. - virtual void OnChanged() override; + void OnChanged() override; webrtc::MediaStreamTrackInterface::TrackState state_; diff --git a/content/renderer/media/remote_media_stream_impl.h b/content/renderer/media/remote_media_stream_impl.h index f17d47e..bcecd62 100644 --- a/content/renderer/media/remote_media_stream_impl.h +++ b/content/renderer/media/remote_media_stream_impl.h @@ -30,13 +30,13 @@ class CONTENT_EXPORT RemoteMediaStreamImpl public: explicit RemoteMediaStreamImpl( webrtc::MediaStreamInterface* webrtc_stream); - virtual ~RemoteMediaStreamImpl(); + ~RemoteMediaStreamImpl() override; const blink::WebMediaStream& webkit_stream() { return webkit_stream_; } private: // webrtc::ObserverInterface implementation. - virtual void OnChanged() override; + void OnChanged() override; scoped_refptr<webrtc::MediaStreamInterface> webrtc_stream_; ScopedVector<RemoteMediaStreamTrackAdapter> video_track_observers_; diff --git a/content/renderer/media/render_media_log.h b/content/renderer/media/render_media_log.h index d17f543..dbadfa5 100644 --- a/content/renderer/media/render_media_log.h +++ b/content/renderer/media/render_media_log.h @@ -27,13 +27,13 @@ class CONTENT_EXPORT RenderMediaLog : public media::MediaLog { RenderMediaLog(); // MediaLog implementation. - virtual void AddEvent(scoped_ptr<media::MediaLogEvent> event) override; + void AddEvent(scoped_ptr<media::MediaLogEvent> event) override; // Will reset |last_ipc_send_time_| with the value of NowTicks(). void SetTickClockForTesting(scoped_ptr<base::TickClock> tick_clock); private: - virtual ~RenderMediaLog(); + ~RenderMediaLog() override; scoped_refptr<base::MessageLoopProxy> render_loop_; scoped_ptr<base::TickClock> tick_clock_; diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.h b/content/renderer/media/renderer_gpu_video_accelerator_factories.h index 55a2a46..4723230 100644 --- a/content/renderer/media/renderer_gpu_video_accelerator_factories.h +++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.h @@ -45,26 +45,26 @@ class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories const scoped_refptr<ContextProviderCommandBuffer>& context_provider); // media::GpuVideoAcceleratorFactories implementation. - virtual scoped_ptr<media::VideoDecodeAccelerator> - CreateVideoDecodeAccelerator() override; - virtual scoped_ptr<media::VideoEncodeAccelerator> - CreateVideoEncodeAccelerator() override; + scoped_ptr<media::VideoDecodeAccelerator> CreateVideoDecodeAccelerator() + override; + scoped_ptr<media::VideoEncodeAccelerator> CreateVideoEncodeAccelerator() + override; // Creates textures and produces them into mailboxes. Returns true on success // or false on failure. - virtual bool CreateTextures(int32 count, - const gfx::Size& size, - std::vector<uint32>* texture_ids, - std::vector<gpu::Mailbox>* texture_mailboxes, - uint32 texture_target) override; - virtual void DeleteTexture(uint32 texture_id) override; - virtual void WaitSyncPoint(uint32 sync_point) override; - virtual void ReadPixels(uint32 texture_id, - const gfx::Rect& visible_rect, - const SkBitmap& pixels) override; - virtual base::SharedMemory* CreateSharedMemory(size_t size) override; - virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override; - virtual std::vector<media::VideoEncodeAccelerator::SupportedProfile> - GetVideoEncodeAcceleratorSupportedProfiles() override; + bool CreateTextures(int32 count, + const gfx::Size& size, + std::vector<uint32>* texture_ids, + std::vector<gpu::Mailbox>* texture_mailboxes, + uint32 texture_target) override; + void DeleteTexture(uint32 texture_id) override; + void WaitSyncPoint(uint32 sync_point) override; + void ReadPixels(uint32 texture_id, + const gfx::Rect& visible_rect, + const SkBitmap& pixels) override; + base::SharedMemory* CreateSharedMemory(size_t size) override; + scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override; + std::vector<media::VideoEncodeAccelerator::SupportedProfile> + GetVideoEncodeAcceleratorSupportedProfiles() override; private: friend class base::RefCountedThreadSafe<RendererGpuVideoAcceleratorFactories>; @@ -72,7 +72,7 @@ class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories GpuChannelHost* gpu_channel_host, const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, const scoped_refptr<ContextProviderCommandBuffer>& context_provider); - virtual ~RendererGpuVideoAcceleratorFactories(); + ~RendererGpuVideoAcceleratorFactories() override; // Helper to bind |context_provider| to the |task_runner_| thread after // construction. diff --git a/content/renderer/media/renderer_webaudiodevice_impl.h b/content/renderer/media/renderer_webaudiodevice_impl.h index b81b9d5..03817fc 100644 --- a/content/renderer/media/renderer_webaudiodevice_impl.h +++ b/content/renderer/media/renderer_webaudiodevice_impl.h @@ -33,10 +33,9 @@ class RendererWebAudioDeviceImpl virtual double sampleRate(); // AudioRendererSink::RenderCallback implementation. - virtual int Render(media::AudioBus* dest, - int audio_delay_milliseconds) override; + int Render(media::AudioBus* dest, int audio_delay_milliseconds) override; - virtual void OnRenderError() override; + void OnRenderError() override; private: const media::AudioParameters params_; diff --git a/content/renderer/media/rtc_data_channel_handler.h b/content/renderer/media/rtc_data_channel_handler.h index 0912019..181ba97 100644 --- a/content/renderer/media/rtc_data_channel_handler.h +++ b/content/renderer/media/rtc_data_channel_handler.h @@ -45,8 +45,8 @@ class CONTENT_EXPORT RtcDataChannelHandler virtual void close() override; // webrtc::DataChannelObserver implementation. - virtual void OnStateChange() override; - virtual void OnMessage(const webrtc::DataBuffer& buffer) override; + void OnStateChange() override; + void OnMessage(const webrtc::DataBuffer& buffer) override; private: void RecordMessageSent(size_t num_bytes); diff --git a/content/renderer/media/rtc_dtmf_sender_handler.h b/content/renderer/media/rtc_dtmf_sender_handler.h index a7a79bb..7127150 100644 --- a/content/renderer/media/rtc_dtmf_sender_handler.h +++ b/content/renderer/media/rtc_dtmf_sender_handler.h @@ -39,7 +39,7 @@ class CONTENT_EXPORT RtcDtmfSenderHandler long interToneGap) override; // webrtc::DtmfSenderObserverInterface implementation. - virtual void OnToneChange(const std::string& tone) override; + void OnToneChange(const std::string& tone) override; private: scoped_refptr<webrtc::DtmfSenderInterface> dtmf_sender_; diff --git a/content/renderer/media/rtc_media_constraints.h b/content/renderer/media/rtc_media_constraints.h index d969df1..2c6ab27 100644 --- a/content/renderer/media/rtc_media_constraints.h +++ b/content/renderer/media/rtc_media_constraints.h @@ -24,9 +24,9 @@ class CONTENT_EXPORT RTCMediaConstraints RTCMediaConstraints(); explicit RTCMediaConstraints( const blink::WebMediaConstraints& constraints); - virtual ~RTCMediaConstraints(); - virtual const Constraints& GetMandatory() const override; - virtual const Constraints& GetOptional() const override; + ~RTCMediaConstraints() override; + const Constraints& GetMandatory() const override; + const Constraints& GetOptional() const override; // Adds a mandatory constraint, optionally overriding an existing one. // If the constraint is already set and |override_if_exists| is false, // the function will return false, otherwise true. diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc index 9adaa29..f07d88d 100644 --- a/content/renderer/media/rtc_peer_connection_handler.cc +++ b/content/renderer/media/rtc_peer_connection_handler.cc @@ -202,18 +202,18 @@ class CreateSessionDescriptionRequest PeerConnectionTracker::Action action) : webkit_request_(request), tracker_(handler, action) {} - virtual void OnSuccess(webrtc::SessionDescriptionInterface* desc) override { + void OnSuccess(webrtc::SessionDescriptionInterface* desc) override { tracker_.TrackOnSuccess(desc); webkit_request_.requestSucceeded(CreateWebKitSessionDescription(desc)); delete desc; } - virtual void OnFailure(const std::string& error) override { + void OnFailure(const std::string& error) override { tracker_.TrackOnFailure(error); webkit_request_.requestFailed(base::UTF8ToUTF16(error)); } protected: - virtual ~CreateSessionDescriptionRequest() {} + ~CreateSessionDescriptionRequest() override {} private: blink::WebRTCSessionDescriptionRequest webkit_request_; @@ -231,17 +231,17 @@ class SetSessionDescriptionRequest PeerConnectionTracker::Action action) : webkit_request_(request), tracker_(handler, action) {} - virtual void OnSuccess() override { + void OnSuccess() override { tracker_.TrackOnSuccess(NULL); webkit_request_.requestSucceeded(); } - virtual void OnFailure(const std::string& error) override { + void OnFailure(const std::string& error) override { tracker_.TrackOnFailure(error); webkit_request_.requestFailed(base::UTF8ToUTF16(error)); } protected: - virtual ~SetSessionDescriptionRequest() {} + ~SetSessionDescriptionRequest() override {} private: blink::WebRTCVoidRequest webkit_request_; @@ -258,7 +258,7 @@ class StatsResponse : public webrtc::StatsObserver { TRACE_EVENT_ASYNC_BEGIN0("webrtc", "getStats_Native", this); } - virtual void OnComplete(const StatsReports& reports) override { + void OnComplete(const StatsReports& reports) override { TRACE_EVENT0("webrtc", "StatsResponse::OnComplete") for (StatsReports::const_iterator it = reports.begin(); it != reports.end(); ++it) { @@ -347,17 +347,17 @@ namespace { class PeerConnectionUMAObserver : public webrtc::UMAObserver { public: PeerConnectionUMAObserver() {} - virtual ~PeerConnectionUMAObserver() {} + ~PeerConnectionUMAObserver() override {} - virtual void IncrementCounter( + void IncrementCounter( webrtc::PeerConnectionUMAMetricsCounter counter) override { UMA_HISTOGRAM_ENUMERATION("WebRTC.PeerConnection.IPMetrics", counter, webrtc::kBoundary); } - virtual void AddHistogramSample( - webrtc::PeerConnectionUMAMetricsName type, int value) override { + void AddHistogramSample(webrtc::PeerConnectionUMAMetricsName type, + int value) override { switch (type) { case webrtc::kTimeToConnect: UMA_HISTOGRAM_MEDIUM_TIMES( diff --git a/content/renderer/media/rtc_peer_connection_handler.h b/content/renderer/media/rtc_peer_connection_handler.h index 5446588..0a32c0f 100644 --- a/content/renderer/media/rtc_peer_connection_handler.h +++ b/content/renderer/media/rtc_peer_connection_handler.h @@ -46,7 +46,7 @@ class CONTENT_EXPORT LocalRTCStatsResponse blink::WebString name, blink::WebString value); protected: - virtual ~LocalRTCStatsResponse() {} + ~LocalRTCStatsResponse() override {} // Constructor for creating mocks. LocalRTCStatsResponse() {} @@ -68,7 +68,7 @@ class CONTENT_EXPORT LocalRTCStatsRequest virtual scoped_refptr<LocalRTCStatsResponse> createResponse(); protected: - virtual ~LocalRTCStatsRequest(); + ~LocalRTCStatsRequest() override; private: blink::WebRTCStatsRequest impl_; @@ -159,22 +159,20 @@ class CONTENT_EXPORT RTCPeerConnectionHandler virtual void stop() override; // webrtc::PeerConnectionObserver implementation - virtual void OnError() override; + void OnError() override; // Triggered when the SignalingState changed. - virtual void OnSignalingChange( + void OnSignalingChange( webrtc::PeerConnectionInterface::SignalingState new_state) override; - virtual void OnAddStream(webrtc::MediaStreamInterface* stream) override; - virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) override; - virtual void OnIceCandidate( - const webrtc::IceCandidateInterface* candidate) override; - virtual void OnIceConnectionChange( + void OnAddStream(webrtc::MediaStreamInterface* stream) override; + void OnRemoveStream(webrtc::MediaStreamInterface* stream) override; + void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override; + void OnIceConnectionChange( webrtc::PeerConnectionInterface::IceConnectionState new_state) override; - virtual void OnIceGatheringChange( + void OnIceGatheringChange( webrtc::PeerConnectionInterface::IceGatheringState new_state) override; - virtual void OnDataChannel( - webrtc::DataChannelInterface* data_channel) override; - virtual void OnRenegotiationNeeded() override; + void OnDataChannel(webrtc::DataChannelInterface* data_channel) override; + void OnRenegotiationNeeded() override; // Delegate functions to allow for mocking of WebKit interfaces. // getStats takes ownership of request parameter. diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc index 0c95ca0..aac5342 100644 --- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc +++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc @@ -60,16 +60,16 @@ class MockRTCStatsResponse : public LocalRTCStatsResponse { statistic_count_(0) { } - virtual size_t addReport(blink::WebString type, - blink::WebString id, - double timestamp) override { + size_t addReport(blink::WebString type, + blink::WebString id, + double timestamp) override { ++report_count_; return report_count_; } - virtual void addStatistic(size_t report, - blink::WebString name, blink::WebString value) - override { + void addStatistic(size_t report, + blink::WebString name, + blink::WebString value) override { ++statistic_count_; } int report_count() const { return report_count_; } @@ -86,20 +86,15 @@ class MockRTCStatsRequest : public LocalRTCStatsRequest { : has_selector_(false), request_succeeded_called_(false) {} - virtual bool hasSelector() const override { - return has_selector_; - } - virtual blink::WebMediaStreamTrack component() const override { - return component_; - } - virtual scoped_refptr<LocalRTCStatsResponse> createResponse() override { + bool hasSelector() const override { return has_selector_; } + blink::WebMediaStreamTrack component() const override { return component_; } + scoped_refptr<LocalRTCStatsResponse> createResponse() override { DCHECK(!response_.get()); response_ = new rtc::RefCountedObject<MockRTCStatsResponse>(); return response_; } - virtual void requestSucceeded(const LocalRTCStatsResponse* response) - override { + void requestSucceeded(const LocalRTCStatsResponse* response) override { EXPECT_EQ(response, response_.get()); request_succeeded_called_ = true; } diff --git a/content/renderer/media/rtc_video_decoder.h b/content/renderer/media/rtc_video_decoder.h index f2aff14..29adee6 100644 --- a/content/renderer/media/rtc_video_decoder.h +++ b/content/renderer/media/rtc_video_decoder.h @@ -45,7 +45,7 @@ class CONTENT_EXPORT RTCVideoDecoder : NON_EXPORTED_BASE(public webrtc::VideoDecoder), public media::VideoDecodeAccelerator::Client { public: - virtual ~RTCVideoDecoder(); + ~RTCVideoDecoder() override; // Creates a RTCVideoDecoder. Returns NULL if failed. The video decoder will // run on the message loop of |factories|. @@ -55,35 +55,34 @@ class CONTENT_EXPORT RTCVideoDecoder // webrtc::VideoDecoder implementation. // Called on WebRTC DecodingThread. - virtual int32_t InitDecode(const webrtc::VideoCodec* codecSettings, - int32_t numberOfCores) override; + int32_t InitDecode(const webrtc::VideoCodec* codecSettings, + int32_t numberOfCores) override; // Called on WebRTC DecodingThread. - virtual int32_t Decode( - const webrtc::EncodedImage& inputImage, - bool missingFrames, - const webrtc::RTPFragmentationHeader* fragmentation, - const webrtc::CodecSpecificInfo* codecSpecificInfo = NULL, - int64_t renderTimeMs = -1) override; + int32_t Decode(const webrtc::EncodedImage& inputImage, + bool missingFrames, + const webrtc::RTPFragmentationHeader* fragmentation, + const webrtc::CodecSpecificInfo* codecSpecificInfo = NULL, + int64_t renderTimeMs = -1) override; // Called on WebRTC DecodingThread. - virtual int32_t RegisterDecodeCompleteCallback( + int32_t RegisterDecodeCompleteCallback( webrtc::DecodedImageCallback* callback) override; // Called on Chrome_libJingle_WorkerThread. The child thread is blocked while // this runs. - virtual int32_t Release() override; + int32_t Release() override; // Called on Chrome_libJingle_WorkerThread. The child thread is blocked while // this runs. - virtual int32_t Reset() override; + int32_t Reset() override; // VideoDecodeAccelerator::Client implementation. - virtual void ProvidePictureBuffers(uint32 count, - const gfx::Size& size, - uint32 texture_target) override; - virtual void DismissPictureBuffer(int32 id) override; - virtual void PictureReady(const media::Picture& picture) override; - virtual void NotifyEndOfBitstreamBuffer(int32 id) override; - virtual void NotifyFlushDone() override; - virtual void NotifyResetDone() override; - virtual void NotifyError(media::VideoDecodeAccelerator::Error error) override; + void ProvidePictureBuffers(uint32 count, + const gfx::Size& size, + uint32 texture_target) override; + void DismissPictureBuffer(int32 id) override; + void PictureReady(const media::Picture& picture) override; + void NotifyEndOfBitstreamBuffer(int32 id) override; + void NotifyFlushDone() override; + void NotifyResetDone() override; + void NotifyError(media::VideoDecodeAccelerator::Error error) override; private: class SHMBuffer; diff --git a/content/renderer/media/rtc_video_decoder_factory.h b/content/renderer/media/rtc_video_decoder_factory.h index 860a4bd..19c8519 100644 --- a/content/renderer/media/rtc_video_decoder_factory.h +++ b/content/renderer/media/rtc_video_decoder_factory.h @@ -27,16 +27,16 @@ class CONTENT_EXPORT RTCVideoDecoderFactory public: explicit RTCVideoDecoderFactory( const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories); - virtual ~RTCVideoDecoderFactory(); + ~RTCVideoDecoderFactory() override; // Runs on Chrome_libJingle_WorkerThread. The child thread is blocked while // this runs. - virtual webrtc::VideoDecoder* CreateVideoDecoder(webrtc::VideoCodecType type) - override; + webrtc::VideoDecoder* CreateVideoDecoder( + webrtc::VideoCodecType type) override; // Runs on Chrome_libJingle_WorkerThread. The child thread is blocked while // this runs. - virtual void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) override; + void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) override; private: scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_; diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc index b32440c5..3c43e76 100644 --- a/content/renderer/media/rtc_video_decoder_unittest.cc +++ b/content/renderer/media/rtc_video_decoder_unittest.cc @@ -57,7 +57,7 @@ class RTCVideoDecoderTest : public ::testing::Test, vda_thread_.Stop(); } - virtual int32_t Decoded(webrtc::I420VideoFrame& decoded_image) override { + int32_t Decoded(webrtc::I420VideoFrame& decoded_image) override { VLOG(2) << "Decoded"; EXPECT_EQ(vda_task_runner_, base::MessageLoopProxy::current()); return WEBRTC_VIDEO_CODEC_OK; diff --git a/content/renderer/media/rtc_video_encoder.cc b/content/renderer/media/rtc_video_encoder.cc index 99e963a..89260fd 100644 --- a/content/renderer/media/rtc_video_encoder.cc +++ b/content/renderer/media/rtc_video_encoder.cc @@ -113,13 +113,13 @@ class RTCVideoEncoder::Impl void Destroy(); // media::VideoEncodeAccelerator::Client implementation. - virtual void RequireBitstreamBuffers(unsigned int input_count, - const gfx::Size& input_coded_size, - size_t output_buffer_size) override; - virtual void BitstreamBufferReady(int32 bitstream_buffer_id, - size_t payload_size, - bool key_frame) override; - virtual void NotifyError(media::VideoEncodeAccelerator::Error error) override; + void RequireBitstreamBuffers(unsigned int input_count, + const gfx::Size& input_coded_size, + size_t output_buffer_size) override; + void BitstreamBufferReady(int32 bitstream_buffer_id, + size_t payload_size, + bool key_frame) override; + void NotifyError(media::VideoEncodeAccelerator::Error error) override; private: friend class base::RefCountedThreadSafe<Impl>; @@ -131,7 +131,7 @@ class RTCVideoEncoder::Impl kOutputBufferCount = 3, }; - virtual ~Impl(); + ~Impl() override; // Perform encoding on an input frame from the input queue. void EncodeOneFrame(); diff --git a/content/renderer/media/rtc_video_encoder.h b/content/renderer/media/rtc_video_encoder.h index 43852ef..6422fb8 100644 --- a/content/renderer/media/rtc_video_encoder.h +++ b/content/renderer/media/rtc_video_encoder.h @@ -49,22 +49,22 @@ class CONTENT_EXPORT RTCVideoEncoder webrtc::VideoCodecType type, media::VideoCodecProfile profile, const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories); - virtual ~RTCVideoEncoder(); + ~RTCVideoEncoder() override; // webrtc::VideoEncoder implementation. Tasks are posted to |impl_| using the // appropriate VEA methods. - virtual int32_t InitEncode(const webrtc::VideoCodec* codec_settings, - int32_t number_of_cores, - uint32_t max_payload_size) override; - virtual int32_t Encode( + int32_t InitEncode(const webrtc::VideoCodec* codec_settings, + int32_t number_of_cores, + uint32_t max_payload_size) override; + int32_t Encode( const webrtc::I420VideoFrame& input_image, const webrtc::CodecSpecificInfo* codec_specific_info, const std::vector<webrtc::VideoFrameType>* frame_types) override; - virtual int32_t RegisterEncodeCompleteCallback( + int32_t RegisterEncodeCompleteCallback( webrtc::EncodedImageCallback* callback) override; - virtual int32_t Release() override; - virtual int32_t SetChannelParameters(uint32_t packet_loss, int rtt) override; - virtual int32_t SetRates(uint32_t new_bit_rate, uint32_t frame_rate) override; + int32_t Release() override; + int32_t SetChannelParameters(uint32_t packet_loss, int rtt) override; + int32_t SetRates(uint32_t new_bit_rate, uint32_t frame_rate) override; private: class Impl; diff --git a/content/renderer/media/rtc_video_encoder_factory.h b/content/renderer/media/rtc_video_encoder_factory.h index 953fe17..986e983 100644 --- a/content/renderer/media/rtc_video_encoder_factory.h +++ b/content/renderer/media/rtc_video_encoder_factory.h @@ -27,13 +27,13 @@ class CONTENT_EXPORT RTCVideoEncoderFactory public: explicit RTCVideoEncoderFactory( const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories); - virtual ~RTCVideoEncoderFactory(); + ~RTCVideoEncoderFactory() override; // cricket::WebRtcVideoEncoderFactory implementation. - virtual webrtc::VideoEncoder* CreateVideoEncoder( + webrtc::VideoEncoder* CreateVideoEncoder( webrtc::VideoCodecType type) override; - virtual const std::vector<VideoCodec>& codecs() const override; - virtual void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override; + const std::vector<VideoCodec>& codecs() const override; + void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override; private: const scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_; diff --git a/content/renderer/media/rtc_video_renderer.h b/content/renderer/media/rtc_video_renderer.h index 7776d8b..699fe84 100644 --- a/content/renderer/media/rtc_video_renderer.h +++ b/content/renderer/media/rtc_video_renderer.h @@ -39,13 +39,13 @@ class CONTENT_EXPORT RTCVideoRenderer const RepaintCB& repaint_cb); // VideoFrameProvider implementation. Called on the main thread. - virtual void Start() override; - virtual void Stop() override; - virtual void Play() override; - virtual void Pause() override; + void Start() override; + void Stop() override; + void Play() override; + void Pause() override; protected: - virtual ~RTCVideoRenderer(); + ~RTCVideoRenderer() override; private: enum State { @@ -59,7 +59,7 @@ class CONTENT_EXPORT RTCVideoRenderer const base::TimeTicks& estimated_capture_time); // VideoTrackSink implementation. Called on the main thread. - virtual void OnReadyStateChanged( + void OnReadyStateChanged( blink::WebMediaStreamSource::ReadyState state) override; void RenderSignalingFrame(); diff --git a/content/renderer/media/speech_recognition_audio_sink.h b/content/renderer/media/speech_recognition_audio_sink.h index 896ebf5..bef5e46 100644 --- a/content/renderer/media/speech_recognition_audio_sink.h +++ b/content/renderer/media/speech_recognition_audio_sink.h @@ -42,23 +42,25 @@ class CONTENT_EXPORT SpeechRecognitionAudioSink scoped_ptr<base::SyncSocket> socket, const OnStoppedCB& on_stopped_cb); - virtual ~SpeechRecognitionAudioSink(); + ~SpeechRecognitionAudioSink() override; // Returns whether the provided track is supported. static bool IsSupportedTrack(const blink::WebMediaStreamTrack& track); private: // content::MediaStreamAudioSink implementation. - virtual void OnReadyStateChanged( + void OnReadyStateChanged( blink::WebMediaStreamSource::ReadyState state) override; - virtual void OnData(const int16* audio_data, int sample_rate, - int number_of_channels, int number_of_frames) override; - virtual void OnSetFormat(const media::AudioParameters& params) override; + void OnData(const int16* audio_data, + int sample_rate, + int number_of_channels, + int number_of_frames) override; + void OnSetFormat(const media::AudioParameters& params) override; // media::AudioConverter::Inputcallback implementation. - virtual double ProvideInput(media::AudioBus* audio_bus, - base::TimeDelta buffer_delay) override; + double ProvideInput(media::AudioBus* audio_bus, + base::TimeDelta buffer_delay) override; // Returns the pointer to the audio input buffer mapped in the shared memory. media::AudioInputBuffer* GetAudioInputBuffer() const; diff --git a/content/renderer/media/speech_recognition_audio_sink_unittest.cc b/content/renderer/media/speech_recognition_audio_sink_unittest.cc index cb98dc9..4366309 100644 --- a/content/renderer/media/speech_recognition_audio_sink_unittest.cc +++ b/content/renderer/media/speech_recognition_audio_sink_unittest.cc @@ -65,8 +65,8 @@ class MockSyncSocket : public base::SyncSocket { on_send_cb_(on_send_cb), in_failure_mode_(false) {} - virtual size_t Send(const void* buffer, size_t length) override; - virtual size_t Receive(void* buffer, size_t length) override; + size_t Send(const void* buffer, size_t length) override; + size_t Receive(void* buffer, size_t length) override; // When |in_failure_mode_| == true, the socket fails to send. void SetFailureMode(bool in_failure_mode) { diff --git a/content/renderer/media/user_media_client_impl.h b/content/renderer/media/user_media_client_impl.h index 87a5958..9ec1e73 100644 --- a/content/renderer/media/user_media_client_impl.h +++ b/content/renderer/media/user_media_client_impl.h @@ -69,27 +69,23 @@ class CONTENT_EXPORT UserMediaClientImpl const blink::WebMediaStreamTrackSourcesRequest& sources_request) override; // MediaStreamDispatcherEventHandler implementation. - virtual void OnStreamGenerated( - int request_id, - const std::string& label, - const StreamDeviceInfoArray& audio_array, - const StreamDeviceInfoArray& video_array) override; - virtual void OnStreamGenerationFailed( - int request_id, - MediaStreamRequestResult result) override; - virtual void OnDeviceStopped(const std::string& label, - const StreamDeviceInfo& device_info) override; - virtual void OnDevicesEnumerated( - int request_id, - const StreamDeviceInfoArray& device_array) override; - virtual void OnDeviceOpened( - int request_id, - const std::string& label, - const StreamDeviceInfo& device_info) override; - virtual void OnDeviceOpenFailed(int request_id) override; + void OnStreamGenerated(int request_id, + const std::string& label, + const StreamDeviceInfoArray& audio_array, + const StreamDeviceInfoArray& video_array) override; + void OnStreamGenerationFailed(int request_id, + MediaStreamRequestResult result) override; + void OnDeviceStopped(const std::string& label, + const StreamDeviceInfo& device_info) override; + void OnDevicesEnumerated(int request_id, + const StreamDeviceInfoArray& device_array) override; + void OnDeviceOpened(int request_id, + const std::string& label, + const StreamDeviceInfo& device_info) override; + void OnDeviceOpenFailed(int request_id) override; // RenderFrameObserver override - virtual void FrameWillClose() override; + void FrameWillClose() override; protected: // Called when |source| has been stopped from JavaScript. diff --git a/content/renderer/media/user_media_client_impl_unittest.cc b/content/renderer/media/user_media_client_impl_unittest.cc index dba46e9..02fcfe0 100644 --- a/content/renderer/media/user_media_client_impl_unittest.cc +++ b/content/renderer/media/user_media_client_impl_unittest.cc @@ -75,14 +75,14 @@ class UserMediaClientImplUnderTest : public UserMediaClientImpl { requestSources(sources_request); } - virtual void GetUserMediaRequestSucceeded( + void GetUserMediaRequestSucceeded( const blink::WebMediaStream& stream, blink::WebUserMediaRequest* request_info) override { last_generated_stream_ = stream; state_ = REQUEST_SUCCEEDED; } - virtual void GetUserMediaRequestFailed( + void GetUserMediaRequestFailed( blink::WebUserMediaRequest* request_info, content::MediaStreamRequestResult result) override { last_generated_stream_.reset(); @@ -90,7 +90,7 @@ class UserMediaClientImplUnderTest : public UserMediaClientImpl { result_ = result; } - virtual void GetUserMediaRequestTrackStartedFailed( + void GetUserMediaRequestTrackStartedFailed( blink::WebUserMediaRequest* request_info, MediaStreamRequestResult result, const blink::WebString& result_name) override { @@ -100,21 +100,21 @@ class UserMediaClientImplUnderTest : public UserMediaClientImpl { result_name_ = result_name; } - virtual void EnumerateDevicesSucceded( + void EnumerateDevicesSucceded( blink::WebMediaDevicesRequest* request, blink::WebVector<blink::WebMediaDeviceInfo>& devices) override { state_ = REQUEST_SUCCEEDED; last_devices_ = devices; } - virtual void EnumerateSourcesSucceded( + void EnumerateSourcesSucceded( blink::WebMediaStreamTrackSourcesRequest* request, blink::WebVector<blink::WebSourceInfo>& sources) override { state_ = REQUEST_SUCCEEDED; last_sources_ = sources; } - virtual MediaStreamVideoSource* CreateVideoSource( + MediaStreamVideoSource* CreateVideoSource( const StreamDeviceInfo& device, const MediaStreamSource::SourceStoppedCallback& stop_callback) override { video_source_ = new MockMediaStreamVideoCapturerSource(device, diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h index 746f9e8..4b39d54 100644 --- a/content/renderer/media/video_capture_impl.h +++ b/content/renderer/media/video_capture_impl.h @@ -48,7 +48,7 @@ namespace content { class CONTENT_EXPORT VideoCaptureImpl : public VideoCaptureMessageFilter::Delegate { public: - virtual ~VideoCaptureImpl(); + ~VideoCaptureImpl() override; VideoCaptureImpl(media::VideoCaptureSessionId session_id, VideoCaptureMessageFilter* filter); @@ -108,24 +108,24 @@ class CONTENT_EXPORT VideoCaptureImpl typedef std::map<int, ClientInfo> ClientInfoMap; // VideoCaptureMessageFilter::Delegate interface. - virtual void OnBufferCreated(base::SharedMemoryHandle handle, - int length, - int buffer_id) override; - virtual void OnBufferDestroyed(int buffer_id) override; - virtual void OnBufferReceived(int buffer_id, - const media::VideoCaptureFormat& format, - const gfx::Rect& visible_rect, - base::TimeTicks) override; - virtual void OnMailboxBufferReceived(int buffer_id, - const gpu::MailboxHolder& mailbox_holder, - const media::VideoCaptureFormat& format, - base::TimeTicks timestamp) override; - virtual void OnStateChanged(VideoCaptureState state) override; - virtual void OnDeviceSupportedFormatsEnumerated( + void OnBufferCreated(base::SharedMemoryHandle handle, + int length, + int buffer_id) override; + void OnBufferDestroyed(int buffer_id) override; + void OnBufferReceived(int buffer_id, + const media::VideoCaptureFormat& format, + const gfx::Rect& visible_rect, + base::TimeTicks) override; + void OnMailboxBufferReceived(int buffer_id, + const gpu::MailboxHolder& mailbox_holder, + const media::VideoCaptureFormat& format, + base::TimeTicks timestamp) override; + void OnStateChanged(VideoCaptureState state) override; + void OnDeviceSupportedFormatsEnumerated( const media::VideoCaptureFormats& supported_formats) override; - virtual void OnDeviceFormatsInUseReceived( + void OnDeviceFormatsInUseReceived( const media::VideoCaptureFormats& formats_in_use) override; - virtual void OnDelegateAdded(int32 device_id) override; + void OnDelegateAdded(int32 device_id) override; // Sends an IPC message to browser process when all clients are done with the // buffer. diff --git a/content/renderer/media/video_capture_impl_manager_unittest.cc b/content/renderer/media/video_capture_impl_manager_unittest.cc index e1a3046..a688c12 100644 --- a/content/renderer/media/video_capture_impl_manager_unittest.cc +++ b/content/renderer/media/video_capture_impl_manager_unittest.cc @@ -35,9 +35,7 @@ class MockVideoCaptureImpl : public VideoCaptureImpl { destruct_callback_(destruct_callback) { } - virtual ~MockVideoCaptureImpl() { - destruct_callback_.Run(); - } + ~MockVideoCaptureImpl() override { destruct_callback_.Run(); } private: base::Closure destruct_callback_; @@ -51,10 +49,10 @@ class MockVideoCaptureImplManager : public VideoCaptureImplManager { base::Closure destruct_video_capture_callback) : destruct_video_capture_callback_( destruct_video_capture_callback) {} - virtual ~MockVideoCaptureImplManager() {} + ~MockVideoCaptureImplManager() override {} protected: - virtual VideoCaptureImpl* CreateVideoCaptureImplForTesting( + VideoCaptureImpl* CreateVideoCaptureImplForTesting( media::VideoCaptureSessionId id, VideoCaptureMessageFilter* filter) const override { return new MockVideoCaptureImpl(id, diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc index b06cc55..8c75e47 100644 --- a/content/renderer/media/video_capture_impl_unittest.cc +++ b/content/renderer/media/video_capture_impl_unittest.cc @@ -40,10 +40,10 @@ class VideoCaptureImplTest : public ::testing::Test { VideoCaptureMessageFilter* filter) : VideoCaptureImpl(id, filter) { } - virtual ~MockVideoCaptureImpl() {} + ~MockVideoCaptureImpl() override {} // Override Send() to mimic device to send events. - virtual void Send(IPC::Message* message) override { + void Send(IPC::Message* message) override { CHECK(message); // In this method, messages are sent to the according handlers as if diff --git a/content/renderer/media/video_capture_message_filter.h b/content/renderer/media/video_capture_message_filter.h index a875a95..c55d17f 100644 --- a/content/renderer/media/video_capture_message_filter.h +++ b/content/renderer/media/video_capture_message_filter.h @@ -80,13 +80,13 @@ class CONTENT_EXPORT VideoCaptureMessageFilter : public IPC::MessageFilter { virtual bool Send(IPC::Message* message); // IPC::MessageFilter override. Called on IO thread. - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void OnFilterAdded(IPC::Sender* sender) override; - virtual void OnFilterRemoved() override; - virtual void OnChannelClosing() override; + bool OnMessageReceived(const IPC::Message& message) override; + void OnFilterAdded(IPC::Sender* sender) override; + void OnFilterRemoved() override; + void OnChannelClosing() override; protected: - virtual ~VideoCaptureMessageFilter(); + ~VideoCaptureMessageFilter() override; private: typedef std::map<int32, Delegate*> Delegates; diff --git a/content/renderer/media/video_source_handler.cc b/content/renderer/media/video_source_handler.cc index a42f9d8..b3d8238 100644 --- a/content/renderer/media/video_source_handler.cc +++ b/content/renderer/media/video_source_handler.cc @@ -33,7 +33,7 @@ class PpFrameReceiver : public MediaStreamVideoSink { weak_factory_(this) { } - virtual ~PpFrameReceiver() {} + ~PpFrameReceiver() override {} void SetReader(FrameReaderInterface* reader) { if (reader) { diff --git a/content/renderer/media/video_source_handler_unittest.cc b/content/renderer/media/video_source_handler_unittest.cc index d7cad70..edffd1f 100644 --- a/content/renderer/media/video_source_handler_unittest.cc +++ b/content/renderer/media/video_source_handler_unittest.cc @@ -27,8 +27,7 @@ static const std::string kUnknownStreamUrl = "unknown_stream_url"; class FakeFrameReader : public FrameReaderInterface { public: - virtual void GotFrame( - const scoped_refptr<media::VideoFrame>& frame) override { + void GotFrame(const scoped_refptr<media::VideoFrame>& frame) override { last_frame_ = frame; } diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h index d67f7b7..3866777 100644 --- a/content/renderer/media/webmediaplayer_ms.h +++ b/content/renderer/media/webmediaplayer_ms.h @@ -114,11 +114,10 @@ class WebMediaPlayerMS virtual unsigned videoDecodedByteCount() const; // VideoFrameProvider implementation. - virtual void SetVideoFrameProviderClient( + void SetVideoFrameProviderClient( cc::VideoFrameProvider::Client* client) override; - virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() override; - virtual void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame) - override; + scoped_refptr<media::VideoFrame> GetCurrentFrame() override; + void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame) override; private: // The callback for VideoFrameProvider to signal a new frame is available. diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.cc b/content/renderer/media/webrtc/media_stream_remote_video_source.cc index 0cff197..02bd509 100644 --- a/content/renderer/media/webrtc/media_stream_remote_video_source.cc +++ b/content/renderer/media/webrtc/media_stream_remote_video_source.cc @@ -29,13 +29,13 @@ class MediaStreamRemoteVideoSource::RemoteVideoSourceDelegate protected: friend class base::RefCountedThreadSafe<RemoteVideoSourceDelegate>; - virtual ~RemoteVideoSourceDelegate(); + ~RemoteVideoSourceDelegate() override; // Implements webrtc::VideoRendererInterface used for receiving video frames // from the PeerConnection video track. May be called on a libjingle internal // thread. - virtual void SetSize(int width, int height) override; - virtual void RenderFrame(const cricket::VideoFrame* frame) override; + void SetSize(int width, int height) override; + void RenderFrame(const cricket::VideoFrame* frame) override; void DoRenderFrameOnIOThread(scoped_refptr<media::VideoFrame> video_frame, const media::VideoCaptureFormat& format); diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.h b/content/renderer/media/webrtc/media_stream_remote_video_source.h index ecf5aa5..5591b3e 100644 --- a/content/renderer/media/webrtc/media_stream_remote_video_source.h +++ b/content/renderer/media/webrtc/media_stream_remote_video_source.h @@ -27,17 +27,17 @@ class CONTENT_EXPORT MediaStreamRemoteVideoSource protected: // Implements MediaStreamVideoSource. - virtual void GetCurrentSupportedFormats( + void GetCurrentSupportedFormats( int max_requested_width, int max_requested_height, double max_requested_frame_rate, const VideoCaptureDeviceFormatsCB& callback) override; - virtual void StartSourceImpl( + void StartSourceImpl( const media::VideoCaptureFormat& format, const VideoCaptureDeliverFrameCB& frame_callback) override; - virtual void StopSourceImpl() override; + void StopSourceImpl() override; // Used by tests to test that a frame can be received and that the // MediaStreamRemoteVideoSource behaves as expected. @@ -45,7 +45,7 @@ class CONTENT_EXPORT MediaStreamRemoteVideoSource private: // webrtc::ObserverInterface implementation. - virtual void OnChanged() override; + void OnChanged() override; scoped_refptr<webrtc::VideoTrackInterface> remote_track_; webrtc::MediaStreamTrackInterface::TrackState last_state_; diff --git a/content/renderer/media/webrtc/media_stream_track_metrics.cc b/content/renderer/media/webrtc/media_stream_track_metrics.cc index f13d192..d4ce6b4 100644 --- a/content/renderer/media/webrtc/media_stream_track_metrics.cc +++ b/content/renderer/media/webrtc/media_stream_track_metrics.cc @@ -27,7 +27,7 @@ class MediaStreamTrackMetricsObserver : public webrtc::ObserverInterface { MediaStreamTrackMetrics::StreamType stream_type, MediaStreamInterface* stream, MediaStreamTrackMetrics* owner); - virtual ~MediaStreamTrackMetricsObserver(); + ~MediaStreamTrackMetricsObserver() override; // Sends begin/end messages for all tracks currently tracked. void SendLifetimeMessages(MediaStreamTrackMetrics::LifetimeEvent event); @@ -39,7 +39,7 @@ class MediaStreamTrackMetricsObserver : public webrtc::ObserverInterface { typedef std::set<std::string> IdSet; // webrtc::ObserverInterface implementation. - virtual void OnChanged() override; + void OnChanged() override; template <class T> IdSet GetTrackIds(const std::vector<rtc::scoped_refptr<T> >& tracks) { diff --git a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc index 7d7b49f..c219537 100644 --- a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc +++ b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc @@ -131,8 +131,7 @@ class MockRtcVideoCapturer : public WebRtcVideoCapturerAdapter { height_(0) { } - virtual void OnFrameCaptured( - const scoped_refptr<media::VideoFrame>& frame) override { + void OnFrameCaptured(const scoped_refptr<media::VideoFrame>& frame) override { ++number_of_capturered_frames_; width_ = frame->visible_rect().width(); height_ = frame->visible_rect().height(); @@ -352,41 +351,39 @@ class MockSessionDescription : public SessionDescriptionInterface { : type_(type), sdp_(sdp) { } - virtual ~MockSessionDescription() {} - virtual cricket::SessionDescription* description() override { + ~MockSessionDescription() override {} + cricket::SessionDescription* description() override { NOTIMPLEMENTED(); return NULL; } - virtual const cricket::SessionDescription* description() const override { + const cricket::SessionDescription* description() const override { NOTIMPLEMENTED(); return NULL; } - virtual std::string session_id() const override { + std::string session_id() const override { NOTIMPLEMENTED(); return std::string(); } - virtual std::string session_version() const override { + std::string session_version() const override { NOTIMPLEMENTED(); return std::string(); } - virtual std::string type() const override { - return type_; - } - virtual bool AddCandidate(const IceCandidateInterface* candidate) override { + std::string type() const override { return type_; } + bool AddCandidate(const IceCandidateInterface* candidate) override { NOTIMPLEMENTED(); return false; } - virtual size_t number_of_mediasections() const override { + size_t number_of_mediasections() const override { NOTIMPLEMENTED(); return 0; } - virtual const IceCandidateCollection* candidates( + const IceCandidateCollection* candidates( size_t mediasection_index) const override { NOTIMPLEMENTED(); return NULL; } - virtual bool ToString(std::string* out) const override { + bool ToString(std::string* out) const override { *out = sdp_; return true; } @@ -407,17 +404,11 @@ class MockIceCandidate : public IceCandidateInterface { // Assign an valid address to |candidate_| to pass assert in code. candidate_.set_address(rtc::SocketAddress("127.0.0.1", 5000)); } - virtual ~MockIceCandidate() {} - virtual std::string sdp_mid() const override { - return sdp_mid_; - } - virtual int sdp_mline_index() const override { - return sdp_mline_index_; - } - virtual const cricket::Candidate& candidate() const override { - return candidate_; - } - virtual bool ToString(std::string* out) const override { + ~MockIceCandidate() override {} + std::string sdp_mid() const override { return sdp_mid_; } + int sdp_mline_index() const override { return sdp_mline_index_; } + const cricket::Candidate& candidate() const override { return candidate_; } + bool ToString(std::string* out) const override { *out = sdp_; return true; } diff --git a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h index 367fb89..b75558b 100644 --- a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h +++ b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h @@ -21,9 +21,9 @@ class WebAudioCapturerSource; class MockVideoRenderer : public cricket::VideoRenderer { public: MockVideoRenderer(); - virtual ~MockVideoRenderer(); - virtual bool SetSize(int width, int height, int reserved) override; - virtual bool RenderFrame(const cricket::VideoFrame* frame) override; + ~MockVideoRenderer() override; + bool SetSize(int width, int height, int reserved) override; + bool RenderFrame(const cricket::VideoFrame* frame) override; int width() const { return width_; } int height() const { return height_; } @@ -39,14 +39,14 @@ class MockVideoSource : public webrtc::VideoSourceInterface { public: MockVideoSource(); - virtual void RegisterObserver(webrtc::ObserverInterface* observer) override; - virtual void UnregisterObserver(webrtc::ObserverInterface* observer) override; - virtual MediaSourceInterface::SourceState state() const override; - virtual cricket::VideoCapturer* GetVideoCapturer() override; - virtual void AddSink(cricket::VideoRenderer* output) override; - virtual void RemoveSink(cricket::VideoRenderer* output) override; - virtual cricket::VideoRenderer* FrameInput() override; - virtual const cricket::VideoOptions* options() const override; + void RegisterObserver(webrtc::ObserverInterface* observer) override; + void UnregisterObserver(webrtc::ObserverInterface* observer) override; + MediaSourceInterface::SourceState state() const override; + cricket::VideoCapturer* GetVideoCapturer() override; + void AddSink(cricket::VideoRenderer* output) override; + void RemoveSink(cricket::VideoRenderer* output) override; + cricket::VideoRenderer* FrameInput() override; + const cricket::VideoOptions* options() const override; // Changes the state of the source to live and notifies the observer. void SetLive(); @@ -61,7 +61,7 @@ class MockVideoSource : public webrtc::VideoSourceInterface { int GetFrameNum() const; protected: - virtual ~MockVideoSource(); + ~MockVideoSource() override; private: void FireOnChanged(); @@ -77,9 +77,9 @@ class MockAudioSource : public webrtc::AudioSourceInterface { explicit MockAudioSource( const webrtc::MediaConstraintsInterface* constraints); - virtual void RegisterObserver(webrtc::ObserverInterface* observer) override; - virtual void UnregisterObserver(webrtc::ObserverInterface* observer) override; - virtual MediaSourceInterface::SourceState state() const override; + void RegisterObserver(webrtc::ObserverInterface* observer) override; + void UnregisterObserver(webrtc::ObserverInterface* observer) override; + MediaSourceInterface::SourceState state() const override; // Changes the state of the source to live and notifies the observer. void SetLive(); @@ -96,7 +96,7 @@ class MockAudioSource : public webrtc::AudioSourceInterface { } protected: - virtual ~MockAudioSource(); + ~MockAudioSource() override; private: webrtc::ObserverInterface* observer_; @@ -109,21 +109,20 @@ class MockWebRtcVideoTrack : public webrtc::VideoTrackInterface { public: MockWebRtcVideoTrack(const std::string& id, webrtc::VideoSourceInterface* source); - virtual void AddRenderer(webrtc::VideoRendererInterface* renderer) override; - virtual void RemoveRenderer( - webrtc::VideoRendererInterface* renderer) override; - virtual std::string kind() const override; - virtual std::string id() const override; - virtual bool enabled() const override; - virtual TrackState state() const override; - virtual bool set_enabled(bool enable) override; - virtual bool set_state(TrackState new_state) override; - virtual void RegisterObserver(webrtc::ObserverInterface* observer) override; - virtual void UnregisterObserver(webrtc::ObserverInterface* observer) override; - virtual webrtc::VideoSourceInterface* GetSource() const override; + void AddRenderer(webrtc::VideoRendererInterface* renderer) override; + void RemoveRenderer(webrtc::VideoRendererInterface* renderer) override; + std::string kind() const override; + std::string id() const override; + bool enabled() const override; + TrackState state() const override; + bool set_enabled(bool enable) override; + bool set_state(TrackState new_state) override; + void RegisterObserver(webrtc::ObserverInterface* observer) override; + void UnregisterObserver(webrtc::ObserverInterface* observer) override; + webrtc::VideoSourceInterface* GetSource() const override; protected: - virtual ~MockWebRtcVideoTrack(); + ~MockWebRtcVideoTrack() override; private: bool enabled_; @@ -138,22 +137,22 @@ class MockMediaStream : public webrtc::MediaStreamInterface { public: explicit MockMediaStream(const std::string& label); - virtual bool AddTrack(webrtc::AudioTrackInterface* track) override; - virtual bool AddTrack(webrtc::VideoTrackInterface* track) override; - virtual bool RemoveTrack(webrtc::AudioTrackInterface* track) override; - virtual bool RemoveTrack(webrtc::VideoTrackInterface* track) override; - virtual std::string label() const override; - virtual webrtc::AudioTrackVector GetAudioTracks() override; - virtual webrtc::VideoTrackVector GetVideoTracks() override; - virtual rtc::scoped_refptr<webrtc::AudioTrackInterface> - FindAudioTrack(const std::string& track_id) override; - virtual rtc::scoped_refptr<webrtc::VideoTrackInterface> - FindVideoTrack(const std::string& track_id) override; - virtual void RegisterObserver(webrtc::ObserverInterface* observer) override; - virtual void UnregisterObserver(webrtc::ObserverInterface* observer) override; + bool AddTrack(webrtc::AudioTrackInterface* track) override; + bool AddTrack(webrtc::VideoTrackInterface* track) override; + bool RemoveTrack(webrtc::AudioTrackInterface* track) override; + bool RemoveTrack(webrtc::VideoTrackInterface* track) override; + std::string label() const override; + webrtc::AudioTrackVector GetAudioTracks() override; + webrtc::VideoTrackVector GetVideoTracks() override; + rtc::scoped_refptr<webrtc::AudioTrackInterface> FindAudioTrack( + const std::string& track_id) override; + rtc::scoped_refptr<webrtc::VideoTrackInterface> FindVideoTrack( + const std::string& track_id) override; + void RegisterObserver(webrtc::ObserverInterface* observer) override; + void UnregisterObserver(webrtc::ObserverInterface* observer) override; protected: - virtual ~MockMediaStream(); + ~MockMediaStream() override; private: void NotifyObservers(); @@ -172,51 +171,49 @@ class MockPeerConnectionDependencyFactory : public PeerConnectionDependencyFactory { public: MockPeerConnectionDependencyFactory(); - virtual ~MockPeerConnectionDependencyFactory(); + ~MockPeerConnectionDependencyFactory() override; - virtual scoped_refptr<webrtc::PeerConnectionInterface> CreatePeerConnection( + scoped_refptr<webrtc::PeerConnectionInterface> CreatePeerConnection( const webrtc::PeerConnectionInterface::RTCConfiguration& config, const webrtc::MediaConstraintsInterface* constraints, blink::WebFrame* frame, webrtc::PeerConnectionObserver* observer) override; - virtual scoped_refptr<webrtc::AudioSourceInterface> - CreateLocalAudioSource( - const webrtc::MediaConstraintsInterface* constraints) override; - virtual WebRtcVideoCapturerAdapter* CreateVideoCapturer( + scoped_refptr<webrtc::AudioSourceInterface> CreateLocalAudioSource( + const webrtc::MediaConstraintsInterface* constraints) override; + WebRtcVideoCapturerAdapter* CreateVideoCapturer( bool is_screen_capture) override; - virtual scoped_refptr<webrtc::VideoSourceInterface> - CreateVideoSource( - cricket::VideoCapturer* capturer, - const blink::WebMediaConstraints& constraints) override; - virtual scoped_refptr<WebAudioCapturerSource> CreateWebAudioSource( + scoped_refptr<webrtc::VideoSourceInterface> CreateVideoSource( + cricket::VideoCapturer* capturer, + const blink::WebMediaConstraints& constraints) override; + scoped_refptr<WebAudioCapturerSource> CreateWebAudioSource( blink::WebMediaStreamSource* source) override; - virtual scoped_refptr<webrtc::MediaStreamInterface> - CreateLocalMediaStream(const std::string& label) override; - virtual scoped_refptr<webrtc::VideoTrackInterface> - CreateLocalVideoTrack(const std::string& id, - webrtc::VideoSourceInterface* source) override; - virtual scoped_refptr<webrtc::VideoTrackInterface> - CreateLocalVideoTrack(const std::string& id, - cricket::VideoCapturer* capturer) override; - virtual webrtc::SessionDescriptionInterface* CreateSessionDescription( + scoped_refptr<webrtc::MediaStreamInterface> CreateLocalMediaStream( + const std::string& label) override; + scoped_refptr<webrtc::VideoTrackInterface> CreateLocalVideoTrack( + const std::string& id, + webrtc::VideoSourceInterface* source) override; + scoped_refptr<webrtc::VideoTrackInterface> CreateLocalVideoTrack( + const std::string& id, + cricket::VideoCapturer* capturer) override; + webrtc::SessionDescriptionInterface* CreateSessionDescription( const std::string& type, const std::string& sdp, webrtc::SdpParseError* error) override; - virtual webrtc::IceCandidateInterface* CreateIceCandidate( + webrtc::IceCandidateInterface* CreateIceCandidate( const std::string& sdp_mid, int sdp_mline_index, const std::string& sdp) override; - virtual scoped_refptr<WebRtcAudioCapturer> CreateAudioCapturer( - int render_view_id, const StreamDeviceInfo& device_info, + scoped_refptr<WebRtcAudioCapturer> CreateAudioCapturer( + int render_view_id, + const StreamDeviceInfo& device_info, const blink::WebMediaConstraints& constraints, MediaStreamAudioSource* audio_source) override; void FailToCreateNextAudioCapturer() { fail_to_create_next_audio_capturer_ = true; } - virtual void StartLocalAudioTrack( - WebRtcLocalAudioTrack* audio_track) override; + void StartLocalAudioTrack(WebRtcLocalAudioTrack* audio_track) override; MockAudioSource* last_audio_source() { return last_audio_source_.get(); } MockVideoSource* last_video_source() { return last_video_source_.get(); } diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc index c43f680..33406f21 100644 --- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc +++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc @@ -123,7 +123,7 @@ class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface { socket_factory_(socket_factory) { } - virtual cricket::PortAllocator* CreatePortAllocator( + cricket::PortAllocator* CreatePortAllocator( const std::vector<StunConfiguration>& stun_servers, const std::vector<TurnConfiguration>& turn_configurations) override { P2PPortAllocator::Config config; @@ -153,7 +153,7 @@ class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface { } protected: - virtual ~P2PPortAllocatorFactory() {} + ~P2PPortAllocatorFactory() override {} private: scoped_refptr<P2PSocketDispatcher> socket_dispatcher_; diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.h b/content/renderer/media/webrtc/peer_connection_dependency_factory.h index 694fd2f0..c42b023 100644 --- a/content/renderer/media/webrtc/peer_connection_dependency_factory.h +++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.h @@ -133,10 +133,9 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory // AecDumpMessageFilter::AecDumpDelegate implementation. // TODO(xians): Remove when option to disable audio track processing is // removed. - virtual void OnAecDumpFile( - const IPC::PlatformFileForTransit& file_handle) override; - virtual void OnDisableAecDump() override; - virtual void OnIpcClosing() override; + void OnAecDumpFile(const IPC::PlatformFileForTransit& file_handle) override; + void OnDisableAecDump() override; + void OnIpcClosing() override; protected: // Asks the PeerConnection factory to create a Local Audio Source. diff --git a/content/renderer/media/webrtc/video_destination_handler.h b/content/renderer/media/webrtc/video_destination_handler.h index e57039d..54b1330 100644 --- a/content/renderer/media/webrtc/video_destination_handler.h +++ b/content/renderer/media/webrtc/video_destination_handler.h @@ -57,15 +57,15 @@ class CONTENT_EXPORT PpFrameWriter protected: // MediaStreamVideoSource implementation. - virtual void GetCurrentSupportedFormats( + void GetCurrentSupportedFormats( int max_requested_width, int max_requested_height, double max_requested_frame_rate, const VideoCaptureDeviceFormatsCB& callback) override; - virtual void StartSourceImpl( + void StartSourceImpl( const media::VideoCaptureFormat& format, const VideoCaptureDeliverFrameCB& frame_callback) override; - virtual void StopSourceImpl() override; + void StopSourceImpl() override; private: class FrameWriterDelegate; diff --git a/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h b/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h index d0cc777..91d8fa1 100644 --- a/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h +++ b/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h @@ -23,17 +23,17 @@ class WebRtcAudioSinkAdapter : public MediaStreamAudioSink { public: explicit WebRtcAudioSinkAdapter( webrtc::AudioTrackSinkInterface* sink); - virtual ~WebRtcAudioSinkAdapter(); + ~WebRtcAudioSinkAdapter() override; bool IsEqual(const webrtc::AudioTrackSinkInterface* other) const; private: // MediaStreamAudioSink implementation. - virtual void OnData(const int16* audio_data, - int sample_rate, - int number_of_channels, - int number_of_frames) override; - virtual void OnSetFormat(const media::AudioParameters& params) override; + void OnData(const int16* audio_data, + int sample_rate, + int number_of_channels, + int number_of_frames) override; + void OnSetFormat(const media::AudioParameters& params) override; webrtc::AudioTrackSinkInterface* const sink_; diff --git a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h index fc4f52d..59e1125 100644 --- a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h +++ b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h @@ -42,7 +42,7 @@ class CONTENT_EXPORT WebRtcLocalAudioTrackAdapter const std::string& label, webrtc::AudioSourceInterface* track_source); - virtual ~WebRtcLocalAudioTrackAdapter(); + ~WebRtcLocalAudioTrackAdapter() override; void Initialize(WebRtcLocalAudioTrack* owner); @@ -61,22 +61,22 @@ class CONTENT_EXPORT WebRtcLocalAudioTrackAdapter private: // webrtc::MediaStreamTrack implementation. - virtual std::string kind() const override; + std::string kind() const override; // webrtc::AudioTrackInterface implementation. - virtual void AddSink(webrtc::AudioTrackSinkInterface* sink) override; - virtual void RemoveSink(webrtc::AudioTrackSinkInterface* sink) override; - virtual bool GetSignalLevel(int* level) override; - virtual rtc::scoped_refptr<webrtc::AudioProcessorInterface> - GetAudioProcessor() override; + void AddSink(webrtc::AudioTrackSinkInterface* sink) override; + void RemoveSink(webrtc::AudioTrackSinkInterface* sink) override; + bool GetSignalLevel(int* level) override; + rtc::scoped_refptr<webrtc::AudioProcessorInterface> GetAudioProcessor() + override; // cricket::AudioCapturer implementation. - virtual void AddChannel(int channel_id) override; - virtual void RemoveChannel(int channel_id) override; + void AddChannel(int channel_id) override; + void RemoveChannel(int channel_id) override; // webrtc::AudioTrackInterface implementation. - virtual webrtc::AudioSourceInterface* GetSource() const override; - virtual cricket::AudioRenderer* GetRenderer() override; + webrtc::AudioSourceInterface* GetSource() const override; + cricket::AudioRenderer* GetRenderer() override; // Weak reference. WebRtcLocalAudioTrack* owner_; diff --git a/content/renderer/media/webrtc/webrtc_media_stream_adapter.h b/content/renderer/media/webrtc/webrtc_media_stream_adapter.h index 6afa1c8..ff3ff33 100644 --- a/content/renderer/media/webrtc/webrtc_media_stream_adapter.h +++ b/content/renderer/media/webrtc/webrtc_media_stream_adapter.h @@ -31,7 +31,7 @@ class CONTENT_EXPORT WebRtcMediaStreamAdapter public: WebRtcMediaStreamAdapter(const blink::WebMediaStream& web_stream, PeerConnectionDependencyFactory* factory); - virtual ~WebRtcMediaStreamAdapter(); + ~WebRtcMediaStreamAdapter() override; bool IsEqual(const blink::WebMediaStream& web_stream) { return web_stream_.extraData() == web_stream.extraData(); @@ -43,8 +43,8 @@ class CONTENT_EXPORT WebRtcMediaStreamAdapter protected: // MediaStreamObserver implementation. - virtual void TrackAdded(const blink::WebMediaStreamTrack& track) override; - virtual void TrackRemoved(const blink::WebMediaStreamTrack& track) override; + void TrackAdded(const blink::WebMediaStreamTrack& track) override; + void TrackRemoved(const blink::WebMediaStreamTrack& track) override; private: void CreateAudioTrack(const blink::WebMediaStreamTrack& track); diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h index 5224552..d8cf554 100644 --- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h +++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h @@ -29,7 +29,7 @@ class CONTENT_EXPORT WebRtcVideoCapturerAdapter : NON_EXPORTED_BASE(public cricket::VideoCapturer) { public: explicit WebRtcVideoCapturerAdapter(bool is_screencast); - virtual ~WebRtcVideoCapturerAdapter(); + ~WebRtcVideoCapturerAdapter() override; // OnFrameCaptured delivers video frames to libjingle. It must be called on // libjingles worker thread. @@ -39,14 +39,14 @@ class CONTENT_EXPORT WebRtcVideoCapturerAdapter private: // cricket::VideoCapturer implementation. // These methods are accessed from a libJingle worker thread. - virtual cricket::CaptureState Start( + cricket::CaptureState Start( const cricket::VideoFormat& capture_format) override; - virtual void Stop() override; - virtual bool IsRunning() override; - virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs) override; - virtual bool GetBestCaptureFormat(const cricket::VideoFormat& desired, - cricket::VideoFormat* best_format) override; - virtual bool IsScreencast() const override; + void Stop() override; + bool IsRunning() override; + bool GetPreferredFourccs(std::vector<uint32>* fourccs) override; + bool GetBestCaptureFormat(const cricket::VideoFormat& desired, + cricket::VideoFormat* best_format) override; + bool IsScreencast() const override; void UpdateI420Buffer(const scoped_refptr<media::VideoFrame>& src); diff --git a/content/renderer/media/webrtc/webrtc_video_track_adapter.h b/content/renderer/media/webrtc/webrtc_video_track_adapter.h index f64e1e9..a073e5b 100644 --- a/content/renderer/media/webrtc/webrtc_video_track_adapter.h +++ b/content/renderer/media/webrtc/webrtc_video_track_adapter.h @@ -31,7 +31,7 @@ class WebRtcVideoTrackAdapter : public MediaStreamVideoSink { public: WebRtcVideoTrackAdapter(const blink::WebMediaStreamTrack& track, PeerConnectionDependencyFactory* factory); - virtual ~WebRtcVideoTrackAdapter(); + ~WebRtcVideoTrackAdapter() override; webrtc::VideoTrackInterface* webrtc_video_track() { return video_track_.get(); @@ -39,7 +39,7 @@ class WebRtcVideoTrackAdapter : public MediaStreamVideoSink { protected: // Implementation of MediaStreamSink. - virtual void OnEnabledChanged(bool enabled) override; + void OnEnabledChanged(bool enabled) override; private: // Used to DCHECK that we are called on the correct thread. diff --git a/content/renderer/media/webrtc_audio_capturer.h b/content/renderer/media/webrtc_audio_capturer.h index ade9de1..d98db0f 100644 --- a/content/renderer/media/webrtc_audio_capturer.h +++ b/content/renderer/media/webrtc_audio_capturer.h @@ -118,7 +118,7 @@ class CONTENT_EXPORT WebRtcAudioCapturer protected: friend class base::RefCountedThreadSafe<WebRtcAudioCapturer>; - virtual ~WebRtcAudioCapturer(); + ~WebRtcAudioCapturer() override; private: class TrackOwner; @@ -132,11 +132,11 @@ class CONTENT_EXPORT WebRtcAudioCapturer // AudioCapturerSource::CaptureCallback implementation. // Called on the AudioInputDevice audio thread. - virtual void Capture(const media::AudioBus* audio_source, - int audio_delay_milliseconds, - double volume, - bool key_pressed) override; - virtual void OnCaptureError() override; + void Capture(const media::AudioBus* audio_source, + int audio_delay_milliseconds, + double volume, + bool key_pressed) override; + void OnCaptureError() override; // Initializes the default audio capturing source using the provided render // view id and device information. Return true if success, otherwise false. diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h index 77b837c..55b3258 100644 --- a/content/renderer/media/webrtc_audio_device_impl.h +++ b/content/renderer/media/webrtc_audio_device_impl.h @@ -283,47 +283,47 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl // The creator must call AddRef() after construction and use Release() // to release the reference and delete this object. // Called on the main render thread. - virtual int32_t AddRef() override; - virtual int32_t Release() override; + int32_t AddRef() override; + int32_t Release() override; // webrtc::AudioDeviceModule implementation. // All implemented methods are called on the main render thread unless // anything else is stated. - virtual int32_t RegisterAudioCallback(webrtc::AudioTransport* audio_callback) - override; + int32_t RegisterAudioCallback( + webrtc::AudioTransport* audio_callback) override; - virtual int32_t Init() override; - virtual int32_t Terminate() override; - virtual bool Initialized() const override; + int32_t Init() override; + int32_t Terminate() override; + bool Initialized() const override; - virtual int32_t PlayoutIsAvailable(bool* available) override; - virtual bool PlayoutIsInitialized() const override; - virtual int32_t RecordingIsAvailable(bool* available) override; - virtual bool RecordingIsInitialized() const override; + int32_t PlayoutIsAvailable(bool* available) override; + bool PlayoutIsInitialized() const override; + int32_t RecordingIsAvailable(bool* available) override; + bool RecordingIsInitialized() const override; // All Start/Stop methods are called on a libJingle worker thread. - virtual int32_t StartPlayout() override; - virtual int32_t StopPlayout() override; - virtual bool Playing() const override; - virtual int32_t StartRecording() override; - virtual int32_t StopRecording() override; - virtual bool Recording() const override; + int32_t StartPlayout() override; + int32_t StopPlayout() override; + bool Playing() const override; + int32_t StartRecording() override; + int32_t StopRecording() override; + bool Recording() const override; // Called on the AudioInputDevice worker thread. - virtual int32_t SetMicrophoneVolume(uint32_t volume) override; + int32_t SetMicrophoneVolume(uint32_t volume) override; // TODO(henrika): sort out calling thread once we start using this API. - virtual int32_t MicrophoneVolume(uint32_t* volume) const override; + int32_t MicrophoneVolume(uint32_t* volume) const override; - virtual int32_t MaxMicrophoneVolume(uint32_t* max_volume) const override; - virtual int32_t MinMicrophoneVolume(uint32_t* min_volume) const override; - virtual int32_t StereoPlayoutIsAvailable(bool* available) const override; - virtual int32_t StereoRecordingIsAvailable(bool* available) const override; - virtual int32_t PlayoutDelay(uint16_t* delay_ms) const override; - virtual int32_t RecordingDelay(uint16_t* delay_ms) const override; - virtual int32_t RecordingSampleRate(uint32_t* sample_rate) const override; - virtual int32_t PlayoutSampleRate(uint32_t* sample_rate) const override; + int32_t MaxMicrophoneVolume(uint32_t* max_volume) const override; + int32_t MinMicrophoneVolume(uint32_t* min_volume) const override; + int32_t StereoPlayoutIsAvailable(bool* available) const override; + int32_t StereoRecordingIsAvailable(bool* available) const override; + int32_t PlayoutDelay(uint16_t* delay_ms) const override; + int32_t RecordingDelay(uint16_t* delay_ms) const override; + int32_t RecordingSampleRate(uint32_t* sample_rate) const override; + int32_t PlayoutSampleRate(uint32_t* sample_rate) const override; // Sets the |renderer_|, returns false if |renderer_| already exists. // Called on the main renderer thread. @@ -359,38 +359,38 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl class RenderBuffer; // Make destructor private to ensure that we can only be deleted by Release(). - virtual ~WebRtcAudioDeviceImpl(); + ~WebRtcAudioDeviceImpl() override; // PeerConnectionAudioSink implementation. // Called on the AudioInputDevice worker thread. - virtual int OnData(const int16* audio_data, - int sample_rate, - int number_of_channels, - int number_of_frames, - const std::vector<int>& channels, - int audio_delay_milliseconds, - int current_volume, - bool need_audio_processing, - bool key_pressed) override; + int OnData(const int16* audio_data, + int sample_rate, + int number_of_channels, + int number_of_frames, + const std::vector<int>& channels, + int audio_delay_milliseconds, + int current_volume, + bool need_audio_processing, + bool key_pressed) override; // Called on the AudioInputDevice worker thread. - virtual void OnSetFormat(const media::AudioParameters& params) override; + void OnSetFormat(const media::AudioParameters& params) override; // WebRtcAudioRendererSource implementation. // Called on the AudioOutputDevice worker thread. - virtual void RenderData(media::AudioBus* audio_bus, - int sample_rate, - int audio_delay_milliseconds, - base::TimeDelta* current_time) override; + void RenderData(media::AudioBus* audio_bus, + int sample_rate, + int audio_delay_milliseconds, + base::TimeDelta* current_time) override; // Called on the main render thread. - virtual void RemoveAudioRenderer(WebRtcAudioRenderer* renderer) override; + void RemoveAudioRenderer(WebRtcAudioRenderer* renderer) override; // WebRtcPlayoutDataSource implementation. - virtual void AddPlayoutSink(WebRtcPlayoutDataSource::Sink* sink) override; - virtual void RemovePlayoutSink(WebRtcPlayoutDataSource::Sink* sink) override; + void AddPlayoutSink(WebRtcPlayoutDataSource::Sink* sink) override; + void RemovePlayoutSink(WebRtcPlayoutDataSource::Sink* sink) override; // Used to DCHECK that we are called on the correct thread. base::ThreadChecker thread_checker_; diff --git a/content/renderer/media/webrtc_audio_device_not_impl.h b/content/renderer/media/webrtc_audio_device_not_impl.h index dc7fc8c..00c6a23 100644 --- a/content/renderer/media/webrtc_audio_device_not_impl.h +++ b/content/renderer/media/webrtc_audio_device_not_impl.h @@ -28,87 +28,82 @@ class CONTENT_EXPORT WebRtcAudioDeviceNotImpl // TODO(henrika): it is possible to add functionality in these methods. // Only adding very basic support for now without triggering any callback // in the webrtc::AudioDeviceObserver interface. - virtual int32_t ChangeUniqueId(const int32_t id) override; - virtual int32_t TimeUntilNextProcess() override; - virtual int32_t Process() override; + int32_t ChangeUniqueId(const int32_t id) override; + int32_t TimeUntilNextProcess() override; + int32_t Process() override; // Methods in webrtc::AudioDeviceModule which are not yet implemented. // The idea is that we can move methods from this class to the real // implementation in WebRtcAudioDeviceImpl when needed. - virtual int32_t RegisterEventObserver( + int32_t RegisterEventObserver( webrtc::AudioDeviceObserver* event_callback) override; - virtual int32_t ActiveAudioLayer(AudioLayer* audio_layer) const override; - virtual webrtc::AudioDeviceModule::ErrorCode LastError() const override; - virtual int16_t PlayoutDevices() override; - virtual int16_t RecordingDevices() override; - virtual int32_t PlayoutDeviceName( - uint16_t index, char name[webrtc::kAdmMaxDeviceNameSize], - char guid[webrtc::kAdmMaxGuidSize]) override; - virtual int32_t RecordingDeviceName( - uint16_t index, char name[webrtc::kAdmMaxDeviceNameSize], - char guid[webrtc::kAdmMaxGuidSize]) override; - virtual int32_t SetPlayoutDevice(uint16_t index) override; - virtual int32_t SetPlayoutDevice(WindowsDeviceType device) override; - virtual int32_t SetRecordingDevice(uint16_t index) override; - virtual int32_t SetRecordingDevice(WindowsDeviceType device) override; - virtual int32_t InitPlayout() override; - virtual int32_t InitRecording() override; - virtual int32_t SetWaveOutVolume(uint16_t volume_left, - uint16_t volume_right) override; - virtual int32_t WaveOutVolume(uint16_t* volume_left, - uint16_t* volume_right) const override; - virtual int32_t InitSpeaker() override; - virtual bool SpeakerIsInitialized() const override; - virtual int32_t InitMicrophone() override; - virtual bool MicrophoneIsInitialized() const override; - virtual int32_t SpeakerVolumeIsAvailable(bool* available) override; - virtual int32_t SetSpeakerVolume(uint32_t volume) override; - virtual int32_t SpeakerVolume(uint32_t* volume) const override; - virtual int32_t MaxSpeakerVolume(uint32_t* max_volume) const override; - virtual int32_t MinSpeakerVolume(uint32_t* min_volume) const override; - virtual int32_t SpeakerVolumeStepSize(uint16_t* step_size) const override; - virtual int32_t MicrophoneVolumeIsAvailable(bool* available) override; - virtual int32_t MicrophoneVolumeStepSize( - uint16_t* step_size) const override; - virtual int32_t SpeakerMuteIsAvailable(bool* available) override; - virtual int32_t SetSpeakerMute(bool enable) override; - virtual int32_t SpeakerMute(bool* enabled) const override; - virtual int32_t MicrophoneMuteIsAvailable(bool* available) override; - virtual int32_t SetMicrophoneMute(bool enable) override; - virtual int32_t MicrophoneMute(bool* enabled) const override; - virtual int32_t MicrophoneBoostIsAvailable(bool* available) override; - virtual int32_t SetMicrophoneBoost(bool enable) override; - virtual int32_t MicrophoneBoost(bool* enabled) const override; - virtual int32_t SetStereoPlayout(bool enable) override; - virtual int32_t StereoPlayout(bool* enabled) const override; - virtual int32_t SetStereoRecording(bool enable) override; - virtual int32_t StereoRecording(bool* enabled) const override; - virtual int32_t SetRecordingChannel(const ChannelType channel) override; - virtual int32_t RecordingChannel(ChannelType* channel) const override; - virtual int32_t SetPlayoutBuffer( - const BufferType type, uint16_t size_ms) override; - virtual int32_t PlayoutBuffer( - BufferType* type, uint16_t* size_ms) const override; - virtual int32_t CPULoad(uint16_t* load) const override; - virtual int32_t StartRawOutputFileRecording( + int32_t ActiveAudioLayer(AudioLayer* audio_layer) const override; + webrtc::AudioDeviceModule::ErrorCode LastError() const override; + int16_t PlayoutDevices() override; + int16_t RecordingDevices() override; + int32_t PlayoutDeviceName(uint16_t index, + char name[webrtc::kAdmMaxDeviceNameSize], + char guid[webrtc::kAdmMaxGuidSize]) override; + int32_t RecordingDeviceName(uint16_t index, + char name[webrtc::kAdmMaxDeviceNameSize], + char guid[webrtc::kAdmMaxGuidSize]) override; + int32_t SetPlayoutDevice(uint16_t index) override; + int32_t SetPlayoutDevice(WindowsDeviceType device) override; + int32_t SetRecordingDevice(uint16_t index) override; + int32_t SetRecordingDevice(WindowsDeviceType device) override; + int32_t InitPlayout() override; + int32_t InitRecording() override; + int32_t SetWaveOutVolume(uint16_t volume_left, + uint16_t volume_right) override; + int32_t WaveOutVolume(uint16_t* volume_left, + uint16_t* volume_right) const override; + int32_t InitSpeaker() override; + bool SpeakerIsInitialized() const override; + int32_t InitMicrophone() override; + bool MicrophoneIsInitialized() const override; + int32_t SpeakerVolumeIsAvailable(bool* available) override; + int32_t SetSpeakerVolume(uint32_t volume) override; + int32_t SpeakerVolume(uint32_t* volume) const override; + int32_t MaxSpeakerVolume(uint32_t* max_volume) const override; + int32_t MinSpeakerVolume(uint32_t* min_volume) const override; + int32_t SpeakerVolumeStepSize(uint16_t* step_size) const override; + int32_t MicrophoneVolumeIsAvailable(bool* available) override; + int32_t MicrophoneVolumeStepSize(uint16_t* step_size) const override; + int32_t SpeakerMuteIsAvailable(bool* available) override; + int32_t SetSpeakerMute(bool enable) override; + int32_t SpeakerMute(bool* enabled) const override; + int32_t MicrophoneMuteIsAvailable(bool* available) override; + int32_t SetMicrophoneMute(bool enable) override; + int32_t MicrophoneMute(bool* enabled) const override; + int32_t MicrophoneBoostIsAvailable(bool* available) override; + int32_t SetMicrophoneBoost(bool enable) override; + int32_t MicrophoneBoost(bool* enabled) const override; + int32_t SetStereoPlayout(bool enable) override; + int32_t StereoPlayout(bool* enabled) const override; + int32_t SetStereoRecording(bool enable) override; + int32_t StereoRecording(bool* enabled) const override; + int32_t SetRecordingChannel(const ChannelType channel) override; + int32_t RecordingChannel(ChannelType* channel) const override; + int32_t SetPlayoutBuffer(const BufferType type, uint16_t size_ms) override; + int32_t PlayoutBuffer(BufferType* type, uint16_t* size_ms) const override; + int32_t CPULoad(uint16_t* load) const override; + int32_t StartRawOutputFileRecording( const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) override; - virtual int32_t StopRawOutputFileRecording() override; - virtual int32_t StartRawInputFileRecording( + int32_t StopRawOutputFileRecording() override; + int32_t StartRawInputFileRecording( const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) override; - virtual int32_t StopRawInputFileRecording() override; - virtual int32_t SetRecordingSampleRate( - const uint32_t samples_per_sec) override; - virtual int32_t SetPlayoutSampleRate( - const uint32_t samples_per_sec) override; - virtual int32_t ResetAudioDevice() override; - virtual int32_t SetLoudspeakerStatus(bool enable) override; - virtual int32_t GetLoudspeakerStatus(bool* enabled) const override; - virtual int32_t SetAGC(bool enable) override; - virtual bool AGC() const override; + int32_t StopRawInputFileRecording() override; + int32_t SetRecordingSampleRate(const uint32_t samples_per_sec) override; + int32_t SetPlayoutSampleRate(const uint32_t samples_per_sec) override; + int32_t ResetAudioDevice() override; + int32_t SetLoudspeakerStatus(bool enable) override; + int32_t GetLoudspeakerStatus(bool* enabled) const override; + int32_t SetAGC(bool enable) override; + bool AGC() const override; protected: - virtual ~WebRtcAudioDeviceNotImpl() {}; + ~WebRtcAudioDeviceNotImpl() override{}; private: base::TimeTicks last_process_time_; diff --git a/content/renderer/media/webrtc_audio_renderer.cc b/content/renderer/media/webrtc_audio_renderer.cc index f409d5f..41e7cb9 100644 --- a/content/renderer/media/webrtc_audio_renderer.cc +++ b/content/renderer/media/webrtc_audio_renderer.cc @@ -58,13 +58,13 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer { } protected: - virtual ~SharedAudioRenderer() { + ~SharedAudioRenderer() override { DCHECK(thread_checker_.CalledOnValidThread()); DVLOG(1) << __FUNCTION__; Stop(); } - virtual void Start() override { + void Start() override { DCHECK(thread_checker_.CalledOnValidThread()); if (started_) return; @@ -72,7 +72,7 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer { delegate_->Start(); } - virtual void Play() override { + void Play() override { DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(started_); if (playing_state_.playing()) @@ -81,7 +81,7 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer { on_play_state_changed_.Run(media_stream_, &playing_state_); } - virtual void Pause() override { + void Pause() override { DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(started_); if (!playing_state_.playing()) @@ -90,7 +90,7 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer { on_play_state_changed_.Run(media_stream_, &playing_state_); } - virtual void Stop() override { + void Stop() override { DCHECK(thread_checker_.CalledOnValidThread()); if (!started_) return; @@ -99,19 +99,19 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer { delegate_->Stop(); } - virtual void SetVolume(float volume) override { + void SetVolume(float volume) override { DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(volume >= 0.0f && volume <= 1.0f); playing_state_.set_volume(volume); on_play_state_changed_.Run(media_stream_, &playing_state_); } - virtual base::TimeDelta GetCurrentRenderTime() const override { + base::TimeDelta GetCurrentRenderTime() const override { DCHECK(thread_checker_.CalledOnValidThread()); return delegate_->GetCurrentRenderTime(); } - virtual bool IsLocalRenderer() const override { + bool IsLocalRenderer() const override { DCHECK(thread_checker_.CalledOnValidThread()); return delegate_->IsLocalRenderer(); } diff --git a/content/renderer/media/webrtc_audio_renderer.h b/content/renderer/media/webrtc_audio_renderer.h index 08140bb..1198534 100644 --- a/content/renderer/media/webrtc_audio_renderer.h +++ b/content/renderer/media/webrtc_audio_renderer.h @@ -105,13 +105,13 @@ class CONTENT_EXPORT WebRtcAudioRenderer // MediaStreamAudioRenderer implementation. This is private since we want // callers to use proxy objects. // TODO(tommi): Make the MediaStreamAudioRenderer implementation a pimpl? - virtual void Start() override; - virtual void Play() override; - virtual void Pause() override; - virtual void Stop() override; - virtual void SetVolume(float volume) override; - virtual base::TimeDelta GetCurrentRenderTime() const override; - virtual bool IsLocalRenderer() const override; + void Start() override; + void Play() override; + void Pause() override; + void Stop() override; + void SetVolume(float volume) override; + base::TimeDelta GetCurrentRenderTime() const override; + bool IsLocalRenderer() const override; // Called when an audio renderer, either the main or a proxy, starts playing. // Here we maintain a reference count of how many renderers are currently @@ -124,7 +124,7 @@ class CONTENT_EXPORT WebRtcAudioRenderer void EnterPauseState(); protected: - virtual ~WebRtcAudioRenderer(); + ~WebRtcAudioRenderer() override; private: enum State { @@ -149,9 +149,8 @@ class CONTENT_EXPORT WebRtcAudioRenderer // media::AudioRendererSink::RenderCallback implementation. // These two methods are called on the AudioOutputDevice worker thread. - virtual int Render(media::AudioBus* audio_bus, - int audio_delay_milliseconds) override; - virtual void OnRenderError() override; + int Render(media::AudioBus* audio_bus, int audio_delay_milliseconds) override; + void OnRenderError() override; // Called by AudioPullFifo when more data is necessary. // This method is called on the AudioOutputDevice worker thread. diff --git a/content/renderer/media/webrtc_identity_service.h b/content/renderer/media/webrtc_identity_service.h index 422c500..12b2549 100644 --- a/content/renderer/media/webrtc_identity_service.h +++ b/content/renderer/media/webrtc_identity_service.h @@ -28,7 +28,7 @@ class CONTENT_EXPORT WebRTCIdentityService : public RenderProcessObserver { typedef base::Callback<void(int error)> FailureCallback; WebRTCIdentityService(); - virtual ~WebRTCIdentityService(); + ~WebRTCIdentityService() override; // Sends an identity request. // @@ -58,7 +58,7 @@ class CONTENT_EXPORT WebRTCIdentityService : public RenderProcessObserver { // For unittest to override. virtual bool Send(IPC::Message* message); // RenderProcessObserver implementation. Protected for testing. - virtual bool OnControlMessageReceived(const IPC::Message& message) override; + bool OnControlMessageReceived(const IPC::Message& message) override; private: struct RequestInfo { diff --git a/content/renderer/media/webrtc_identity_service_unittest.cc b/content/renderer/media/webrtc_identity_service_unittest.cc index b706258..3805971 100644 --- a/content/renderer/media/webrtc_identity_service_unittest.cc +++ b/content/renderer/media/webrtc_identity_service_unittest.cc @@ -22,13 +22,13 @@ static const int FAKE_ERROR = 100; class WebRTCIdentityServiceForTest : public WebRTCIdentityService { public: - virtual bool Send(IPC::Message* message) override { + bool Send(IPC::Message* message) override { messages_.push_back(*message); delete message; return true; } - virtual bool OnControlMessageReceived(const IPC::Message& message) override { + bool OnControlMessageReceived(const IPC::Message& message) override { return WebRTCIdentityService::OnControlMessageReceived(message); } diff --git a/content/renderer/media/webrtc_local_audio_renderer.h b/content/renderer/media/webrtc_local_audio_renderer.h index 271e71b..95987f4 100644 --- a/content/renderer/media/webrtc_local_audio_renderer.h +++ b/content/renderer/media/webrtc_local_audio_renderer.h @@ -58,39 +58,38 @@ class CONTENT_EXPORT WebRtcLocalAudioRenderer // MediaStreamAudioRenderer implementation. // Called on the main thread. - virtual void Start() override; - virtual void Stop() override; - virtual void Play() override; - virtual void Pause() override; - virtual void SetVolume(float volume) override; - virtual base::TimeDelta GetCurrentRenderTime() const override; - virtual bool IsLocalRenderer() const override; + void Start() override; + void Stop() override; + void Play() override; + void Pause() override; + void SetVolume(float volume) override; + base::TimeDelta GetCurrentRenderTime() const override; + bool IsLocalRenderer() const override; const base::TimeDelta& total_render_time() const { return total_render_time_; } protected: - virtual ~WebRtcLocalAudioRenderer(); + ~WebRtcLocalAudioRenderer() override; private: // MediaStreamAudioSink implementation. // Called on the AudioInputDevice worker thread. - virtual void OnData(const int16* audio_data, - int sample_rate, - int number_of_channels, - int number_of_frames) override; + void OnData(const int16* audio_data, + int sample_rate, + int number_of_channels, + int number_of_frames) override; // Called on the AudioInputDevice worker thread. - virtual void OnSetFormat(const media::AudioParameters& params) override; + void OnSetFormat(const media::AudioParameters& params) override; // media::AudioRendererSink::RenderCallback implementation. // Render() is called on the AudioOutputDevice thread and OnRenderError() // on the IO thread. - virtual int Render(media::AudioBus* audio_bus, - int audio_delay_milliseconds) override; - virtual void OnRenderError() override; + int Render(media::AudioBus* audio_bus, int audio_delay_milliseconds) override; + void OnRenderError() override; // Initializes and starts the |sink_| if // we have received valid |source_params_| && diff --git a/content/renderer/media/webrtc_local_audio_source_provider.h b/content/renderer/media/webrtc_local_audio_source_provider.h index e813cbe..24e873c 100644 --- a/content/renderer/media/webrtc_local_audio_source_provider.h +++ b/content/renderer/media/webrtc_local_audio_source_provider.h @@ -53,12 +53,12 @@ class CONTENT_EXPORT WebRtcLocalAudioSourceProvider virtual ~WebRtcLocalAudioSourceProvider(); // MediaStreamAudioSink implementation. - virtual void OnData(const int16* audio_data, - int sample_rate, - int number_of_channels, - int number_of_frames) override; - virtual void OnSetFormat(const media::AudioParameters& params) override; - virtual void OnReadyStateChanged( + void OnData(const int16* audio_data, + int sample_rate, + int number_of_channels, + int number_of_frames) override; + void OnSetFormat(const media::AudioParameters& params) override; + void OnReadyStateChanged( blink::WebMediaStreamSource::ReadyState state) override; // blink::WebAudioSourceProvider implementation. @@ -69,8 +69,8 @@ class CONTENT_EXPORT WebRtcLocalAudioSourceProvider // media::AudioConverter::Inputcallback implementation. // This function is triggered by provideInput()on the WebAudio audio thread, // so it has been under the protection of |lock_|. - virtual double ProvideInput(media::AudioBus* audio_bus, - base::TimeDelta buffer_delay) override; + double ProvideInput(media::AudioBus* audio_bus, + base::TimeDelta buffer_delay) override; // Method to allow the unittests to inject its own sink parameters to avoid // query the hardware. diff --git a/content/renderer/media/webrtc_local_audio_track.h b/content/renderer/media/webrtc_local_audio_track.h index 0405248..bbdc7f0 100644 --- a/content/renderer/media/webrtc_local_audio_track.h +++ b/content/renderer/media/webrtc_local_audio_track.h @@ -62,7 +62,7 @@ class CONTENT_EXPORT WebRtcLocalAudioTrack // Stops the local audio track. Called on the main render thread and // should be called only once when audio track going away. - virtual void Stop() override; + void Stop() override; // Method called by the capturer to deliver the capture data. // Called on the capture audio thread. diff --git a/content/renderer/media/webrtc_local_audio_track_unittest.cc b/content/renderer/media/webrtc_local_audio_track_unittest.cc index 79eecf0..947eab1 100644 --- a/content/renderer/media/webrtc_local_audio_track_unittest.cc +++ b/content/renderer/media/webrtc_local_audio_track_unittest.cc @@ -45,10 +45,10 @@ class FakeAudioThread : public base::PlatformThread::Delegate { audio_bus_ = media::AudioBus::Create(params); } - virtual ~FakeAudioThread() { DCHECK(thread_.is_null()); } + ~FakeAudioThread() override { DCHECK(thread_.is_null()); } // base::PlatformThread::Delegate: - virtual void ThreadMain() override { + void ThreadMain() override { while (true) { if (closure_.IsSignaled()) return; diff --git a/content/renderer/memory_benchmarking_extension.h b/content/renderer/memory_benchmarking_extension.h index ea7cc96..afbaf24 100644 --- a/content/renderer/memory_benchmarking_extension.h +++ b/content/renderer/memory_benchmarking_extension.h @@ -27,10 +27,10 @@ class MemoryBenchmarkingExtension private: MemoryBenchmarkingExtension(); - virtual ~MemoryBenchmarkingExtension(); + ~MemoryBenchmarkingExtension() override; // gin::Wrappable. - virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( + gin::ObjectTemplateBuilder GetObjectTemplateBuilder( v8::Isolate* isolate) override; bool IsHeapProfilerRunning(); diff --git a/content/renderer/mhtml_generator.h b/content/renderer/mhtml_generator.h index e308f35..8a65b46 100644 --- a/content/renderer/mhtml_generator.h +++ b/content/renderer/mhtml_generator.h @@ -15,11 +15,11 @@ class RenderViewImpl; class MHTMLGenerator : public RenderViewObserver { public: explicit MHTMLGenerator(RenderViewImpl* render_view); - virtual ~MHTMLGenerator(); + ~MHTMLGenerator() override; private: // RenderViewObserver implementation: - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; void OnSavePageAsMHTML(int job_id, IPC::PlatformFileForTransit file_for_transit); diff --git a/content/renderer/mojo/service_registry_js_wrapper.h b/content/renderer/mojo/service_registry_js_wrapper.h index e71fca7..2be7f95 100644 --- a/content/renderer/mojo/service_registry_js_wrapper.h +++ b/content/renderer/mojo/service_registry_js_wrapper.h @@ -22,13 +22,13 @@ class ServiceRegistry; class CONTENT_EXPORT ServiceRegistryJsWrapper : public gin::Wrappable<ServiceRegistryJsWrapper> { public: - virtual ~ServiceRegistryJsWrapper(); + ~ServiceRegistryJsWrapper() override; static gin::Handle<ServiceRegistryJsWrapper> Create( v8::Isolate* isolate, ServiceRegistry* service_registry); // gin::Wrappable<ServiceRegistryJsWrapper> overrides. - virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( + gin::ObjectTemplateBuilder GetObjectTemplateBuilder( v8::Isolate* isolate) override; // JS interface implementation. diff --git a/content/renderer/notification_permission_dispatcher.h b/content/renderer/notification_permission_dispatcher.h index 35f24c2..c01b063 100644 --- a/content/renderer/notification_permission_dispatcher.h +++ b/content/renderer/notification_permission_dispatcher.h @@ -21,7 +21,7 @@ namespace content { class NotificationPermissionDispatcher : public RenderFrameObserver { public: explicit NotificationPermissionDispatcher(RenderFrame* render_frame); - virtual ~NotificationPermissionDispatcher(); + ~NotificationPermissionDispatcher() override; // Requests permission to display Web Notifications for |origin|. The callback // will be invoked when the permission status is available. This class will @@ -32,7 +32,7 @@ class NotificationPermissionDispatcher : public RenderFrameObserver { private: // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; void OnPermissionRequestComplete( int request_id, blink::WebNotificationPermission result); diff --git a/content/renderer/notification_provider.h b/content/renderer/notification_provider.h index ea31a60..9015515 100644 --- a/content/renderer/notification_provider.h +++ b/content/renderer/notification_provider.h @@ -23,11 +23,11 @@ class NotificationProvider : public RenderFrameObserver, public blink::WebNotificationPresenter { public: explicit NotificationProvider(RenderFrame* render_frame); - virtual ~NotificationProvider(); + ~NotificationProvider() override; private: // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // blink::WebNotificationPresenter implementation. virtual bool show(const blink::WebNotification& proxy); diff --git a/content/renderer/npapi/plugin_channel_host.h b/content/renderer/npapi/plugin_channel_host.h index 2ab9ec8..a76f824 100644 --- a/content/renderer/npapi/plugin_channel_host.h +++ b/content/renderer/npapi/plugin_channel_host.h @@ -25,21 +25,21 @@ class PluginChannelHost : public NPChannelBase { const IPC::ChannelHandle& channel_handle, base::MessageLoopProxy* ipc_message_loop); - virtual bool Init(base::MessageLoopProxy* ipc_message_loop, - bool create_pipe_now, - base::WaitableEvent* shutdown_event) override; + bool Init(base::MessageLoopProxy* ipc_message_loop, + bool create_pipe_now, + base::WaitableEvent* shutdown_event) override; - virtual int GenerateRouteID() override; + int GenerateRouteID() override; void AddRoute(int route_id, IPC::Listener* listener, NPObjectBase* npobject); void RemoveRoute(int route_id); // NPChannelBase override: - virtual bool Send(IPC::Message* msg) override; + bool Send(IPC::Message* msg) override; // IPC::Listener override - virtual void OnChannelError() override; + void OnChannelError() override; static void Broadcast(IPC::Message* message) { NPChannelBase::Broadcast(message); @@ -50,11 +50,11 @@ class PluginChannelHost : public NPChannelBase { private: // Called on the render thread PluginChannelHost(); - virtual ~PluginChannelHost(); + ~PluginChannelHost() override; static NPChannelBase* ClassFactory() { return new PluginChannelHost(); } - virtual bool OnControlMessageReceived(const IPC::Message& message) override; + bool OnControlMessageReceived(const IPC::Message& message) override; void OnSetException(const std::string& message); void OnPluginShuttingDown(); diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc index f8532e6..d64c3a0 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.cc +++ b/content/renderer/npapi/webplugin_delegate_proxy.cc @@ -101,8 +101,7 @@ class ResourceClientProxy : public WebPluginResourceClient { multibyte_response_expected_(false) { } - virtual ~ResourceClientProxy() { - } + ~ResourceClientProxy() override {} void Initialize(unsigned long resource_id, const GURL& url, int notify_id) { resource_id_ = resource_id; @@ -119,17 +118,17 @@ class ResourceClientProxy : public WebPluginResourceClient { } // PluginResourceClient implementation: - virtual void WillSendRequest(const GURL& url, int http_status_code) override { + void WillSendRequest(const GURL& url, int http_status_code) override { DCHECK(channel_.get() != NULL); channel_->Send(new PluginMsg_WillSendRequest( instance_id_, resource_id_, url, http_status_code)); } - virtual void DidReceiveResponse(const std::string& mime_type, - const std::string& headers, - uint32 expected_length, - uint32 last_modified, - bool request_is_seekable) override { + void DidReceiveResponse(const std::string& mime_type, + const std::string& headers, + uint32 expected_length, + uint32 last_modified, + bool request_is_seekable) override { DCHECK(channel_.get() != NULL); PluginMsg_DidReceiveResponseParams params; params.id = resource_id_; @@ -144,9 +143,9 @@ class ResourceClientProxy : public WebPluginResourceClient { channel_->Send(new PluginMsg_DidReceiveResponse(instance_id_, params)); } - virtual void DidReceiveData(const char* buffer, - int length, - int data_offset) override { + void DidReceiveData(const char* buffer, + int length, + int data_offset) override { DCHECK(channel_.get() != NULL); DCHECK_GT(length, 0); std::vector<char> data; @@ -159,7 +158,7 @@ class ResourceClientProxy : public WebPluginResourceClient { data, data_offset)); } - virtual void DidFinishLoading(unsigned long resource_id) override { + void DidFinishLoading(unsigned long resource_id) override { DCHECK(channel_.get() != NULL); DCHECK_EQ(resource_id, resource_id_); channel_->Send(new PluginMsg_DidFinishLoading(instance_id_, resource_id_)); @@ -167,7 +166,7 @@ class ResourceClientProxy : public WebPluginResourceClient { base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); } - virtual void DidFail(unsigned long resource_id) override { + void DidFail(unsigned long resource_id) override { DCHECK(channel_.get() != NULL); DCHECK_EQ(resource_id, resource_id_); channel_->Send(new PluginMsg_DidFail(instance_id_, resource_id_)); @@ -175,13 +174,11 @@ class ResourceClientProxy : public WebPluginResourceClient { base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); } - virtual bool IsMultiByteResponseExpected() override { + bool IsMultiByteResponseExpected() override { return multibyte_response_expected_; } - virtual int ResourceId() override { - return resource_id_; - } + int ResourceId() override { return resource_id_; } private: scoped_refptr<PluginChannelHost> channel_; diff --git a/content/renderer/npapi/webplugin_delegate_proxy.h b/content/renderer/npapi/webplugin_delegate_proxy.h index 3029bd2..5b8c62c 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.h +++ b/content/renderer/npapi/webplugin_delegate_proxy.h @@ -56,23 +56,24 @@ class WebPluginDelegateProxy RenderFrameImpl* render_frame); // WebPluginDelegate implementation: - virtual void PluginDestroyed() override; - virtual bool Initialize(const GURL& url, - const std::vector<std::string>& arg_names, - const std::vector<std::string>& arg_values, - bool load_manually) override; - virtual void UpdateGeometry(const gfx::Rect& window_rect, - const gfx::Rect& clip_rect) override; - virtual void Paint(SkCanvas* canvas, const gfx::Rect& rect) override; - virtual NPObject* GetPluginScriptableObject() override; - virtual struct _NPP* GetPluginNPP() override; - virtual bool GetFormValue(base::string16* value) override; - virtual void DidFinishLoadWithReason(const GURL& url, NPReason reason, - int notify_id) override; - virtual void SetFocus(bool focused) override; - virtual bool HandleInputEvent(const blink::WebInputEvent& event, - WebCursor::CursorInfo* cursor) override; - virtual int GetProcessId() override; + void PluginDestroyed() override; + bool Initialize(const GURL& url, + const std::vector<std::string>& arg_names, + const std::vector<std::string>& arg_values, + bool load_manually) override; + void UpdateGeometry(const gfx::Rect& window_rect, + const gfx::Rect& clip_rect) override; + void Paint(SkCanvas* canvas, const gfx::Rect& rect) override; + NPObject* GetPluginScriptableObject() override; + struct _NPP* GetPluginNPP() override; + bool GetFormValue(base::string16* value) override; + void DidFinishLoadWithReason(const GURL& url, + NPReason reason, + int notify_id) override; + void SetFocus(bool focused) override; + bool HandleInputEvent(const blink::WebInputEvent& event, + WebCursor::CursorInfo* cursor) override; + int GetProcessId() override; // Informs the plugin that its containing content view has gained or lost // first responder status. @@ -104,48 +105,50 @@ class WebPluginDelegateProxy #endif // IPC::Listener implementation: - virtual bool OnMessageReceived(const IPC::Message& msg) override; - virtual void OnChannelError() override; + bool OnMessageReceived(const IPC::Message& msg) override; + void OnChannelError() override; // IPC::Sender implementation: - virtual bool Send(IPC::Message* msg) override; - - virtual void SendJavaScriptStream(const GURL& url, - const std::string& result, - bool success, - int notify_id) override; - - virtual void DidReceiveManualResponse(const GURL& url, - const std::string& mime_type, - const std::string& headers, - uint32 expected_length, - uint32 last_modified) override; - virtual void DidReceiveManualData(const char* buffer, int length) override; - virtual void DidFinishManualLoading() override; - virtual void DidManualLoadFail() override; - virtual WebPluginResourceClient* CreateResourceClient( - unsigned long resource_id, const GURL& url, int notify_id) override; - virtual WebPluginResourceClient* CreateSeekableResourceClient( - unsigned long resource_id, int range_request_id) override; - virtual void FetchURL(unsigned long resource_id, - int notify_id, - const GURL& url, - const GURL& first_party_for_cookies, - const std::string& method, - const char* buf, - unsigned int len, - const GURL& referrer, - bool notify_redirects, - bool is_plugin_src_load, - int origin_pid, - int render_frame_id, - int render_view_id) override; + bool Send(IPC::Message* msg) override; + + void SendJavaScriptStream(const GURL& url, + const std::string& result, + bool success, + int notify_id) override; + + void DidReceiveManualResponse(const GURL& url, + const std::string& mime_type, + const std::string& headers, + uint32 expected_length, + uint32 last_modified) override; + void DidReceiveManualData(const char* buffer, int length) override; + void DidFinishManualLoading() override; + void DidManualLoadFail() override; + WebPluginResourceClient* CreateResourceClient(unsigned long resource_id, + const GURL& url, + int notify_id) override; + WebPluginResourceClient* CreateSeekableResourceClient( + unsigned long resource_id, + int range_request_id) override; + void FetchURL(unsigned long resource_id, + int notify_id, + const GURL& url, + const GURL& first_party_for_cookies, + const std::string& method, + const char* buf, + unsigned int len, + const GURL& referrer, + bool notify_redirects, + bool is_plugin_src_load, + int origin_pid, + int render_frame_id, + int render_view_id) override; gfx::PluginWindowHandle GetPluginWindowHandle(); protected: friend class base::DeleteHelper<WebPluginDelegateProxy>; - virtual ~WebPluginDelegateProxy(); + ~WebPluginDelegateProxy() override; private: struct SharedBitmap { diff --git a/content/renderer/npapi/webplugin_impl.h b/content/renderer/npapi/webplugin_impl.h index f200795..6115d08 100644 --- a/content/renderer/npapi/webplugin_impl.h +++ b/content/renderer/npapi/webplugin_impl.h @@ -56,7 +56,7 @@ class WebPluginImpl : public WebPlugin, const base::FilePath& file_path, const base::WeakPtr<RenderViewImpl>& render_view, RenderFrameImpl* render_frame); - virtual ~WebPluginImpl(); + ~WebPluginImpl() override; // Helper function for sorting post data. CONTENT_EXPORT static bool SetPostData(blink::WebURLRequest* request, @@ -94,40 +94,38 @@ class WebPluginImpl : public WebPlugin, virtual bool isPlaceholder() override; // WebPlugin implementation: - virtual void SetWindow(gfx::PluginWindowHandle window) override; - virtual void SetAcceptsInputEvents(bool accepts) override; - virtual void WillDestroyWindow(gfx::PluginWindowHandle window) override; - virtual void CancelResource(unsigned long id) override; - virtual void Invalidate() override; - virtual void InvalidateRect(const gfx::Rect& rect) override; - virtual NPObject* GetWindowScriptNPObject() override; - virtual NPObject* GetPluginElement() override; - virtual bool FindProxyForUrl(const GURL& url, - std::string* proxy_list) override; - virtual void SetCookie(const GURL& url, - const GURL& first_party_for_cookies, - const std::string& cookie) override; - virtual std::string GetCookies(const GURL& url, - const GURL& first_party_for_cookies) override; - virtual void HandleURLRequest(const char* url, - const char *method, - const char* target, - const char* buf, - unsigned int len, - int notify_id, - bool popups_allowed, - bool notify_redirects) override; - virtual void CancelDocumentLoad() override; - virtual void InitiateHTTPRangeRequest(const char* url, - const char* range_info, - int pending_request_id) override; - virtual void DidStartLoading() override; - virtual void DidStopLoading() override; - virtual bool IsOffTheRecord() override; - virtual void SetDeferResourceLoading(unsigned long resource_id, - bool defer) override; - virtual void URLRedirectResponse(bool allow, int resource_id) override; - virtual bool CheckIfRunInsecureContent(const GURL& url) override; + void SetWindow(gfx::PluginWindowHandle window) override; + void SetAcceptsInputEvents(bool accepts) override; + void WillDestroyWindow(gfx::PluginWindowHandle window) override; + void CancelResource(unsigned long id) override; + void Invalidate() override; + void InvalidateRect(const gfx::Rect& rect) override; + NPObject* GetWindowScriptNPObject() override; + NPObject* GetPluginElement() override; + bool FindProxyForUrl(const GURL& url, std::string* proxy_list) override; + void SetCookie(const GURL& url, + const GURL& first_party_for_cookies, + const std::string& cookie) override; + std::string GetCookies(const GURL& url, + const GURL& first_party_for_cookies) override; + void HandleURLRequest(const char* url, + const char* method, + const char* target, + const char* buf, + unsigned int len, + int notify_id, + bool popups_allowed, + bool notify_redirects) override; + void CancelDocumentLoad() override; + void InitiateHTTPRangeRequest(const char* url, + const char* range_info, + int pending_request_id) override; + void DidStartLoading() override; + void DidStopLoading() override; + bool IsOffTheRecord() override; + void SetDeferResourceLoading(unsigned long resource_id, bool defer) override; + void URLRedirectResponse(bool allow, int resource_id) override; + bool CheckIfRunInsecureContent(const GURL& url) override; #if defined(OS_WIN) void SetWindowlessData(HANDLE pump_messages_event, gfx::NativeViewId dummy_activation_window) { } @@ -135,13 +133,13 @@ class WebPluginImpl : public WebPlugin, void ReportExecutableMemory(size_t size) { } #endif #if defined(OS_MACOSX) - virtual WebPluginAcceleratedSurface* GetAcceleratedSurface( + WebPluginAcceleratedSurface* GetAcceleratedSurface( gfx::GpuPreference gpu_preference) override; - virtual void AcceleratedPluginEnabledRendering() override; - virtual void AcceleratedPluginAllocatedIOSurface(int32 width, - int32 height, - uint32 surface_id) override; - virtual void AcceleratedPluginSwappedIOSurface() override; + void AcceleratedPluginEnabledRendering() override; + void AcceleratedPluginAllocatedIOSurface(int32 width, + int32 height, + uint32 surface_id) override; + void AcceleratedPluginSwappedIOSurface() override; #endif private: diff --git a/content/renderer/p2p/ipc_network_manager.h b/content/renderer/p2p/ipc_network_manager.h index ae2e4d2..81f673c 100644 --- a/content/renderer/p2p/ipc_network_manager.h +++ b/content/renderer/p2p/ipc_network_manager.h @@ -23,14 +23,13 @@ class IpcNetworkManager : public rtc::NetworkManagerBase, public: // Constructor doesn't take ownership of the |network_list_manager|. CONTENT_EXPORT IpcNetworkManager(NetworkListManager* network_list_manager); - virtual ~IpcNetworkManager(); + ~IpcNetworkManager() override; - virtual void StartUpdating() override; - virtual void StopUpdating() override; + void StartUpdating() override; + void StopUpdating() override; // P2PSocketDispatcher::NetworkListObserver interface. - virtual void OnNetworkListChanged( - const net::NetworkInterfaceList& list) override; + void OnNetworkListChanged(const net::NetworkInterfaceList& list) override; private: void SendNetworksChangedSignal(); diff --git a/content/renderer/p2p/ipc_network_manager_unittest.cc b/content/renderer/p2p/ipc_network_manager_unittest.cc index 9fdd456..85c6322 100644 --- a/content/renderer/p2p/ipc_network_manager_unittest.cc +++ b/content/renderer/p2p/ipc_network_manager_unittest.cc @@ -14,13 +14,13 @@ namespace { class MockP2PSocketDispatcher : public NetworkListManager { public: - virtual void AddNetworkListObserver( + void AddNetworkListObserver( NetworkListObserver* network_list_observer) override {} - virtual void RemoveNetworkListObserver( + void RemoveNetworkListObserver( NetworkListObserver* network_list_observer) override {} - virtual ~MockP2PSocketDispatcher() {} + ~MockP2PSocketDispatcher() override {} }; } // namespace diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc index 5611a3d..3dead8f 100644 --- a/content/renderer/p2p/ipc_socket_factory.cc +++ b/content/renderer/p2p/ipc_socket_factory.cc @@ -70,7 +70,7 @@ class IpcPacketSocket : public rtc::AsyncPacketSocket, public P2PSocketClientDelegate { public: IpcPacketSocket(); - virtual ~IpcPacketSocket(); + ~IpcPacketSocket() override; // Always takes ownership of client even if initialization fails. bool Init(P2PSocketType type, P2PSocketClientImpl* client, @@ -78,31 +78,32 @@ class IpcPacketSocket : public rtc::AsyncPacketSocket, const rtc::SocketAddress& remote_address); // rtc::AsyncPacketSocket interface. - virtual rtc::SocketAddress GetLocalAddress() const override; - virtual rtc::SocketAddress GetRemoteAddress() const override; - virtual int Send(const void *pv, size_t cb, - const rtc::PacketOptions& options) override; - virtual int SendTo(const void *pv, size_t cb, - const rtc::SocketAddress& addr, - const rtc::PacketOptions& options) override; - virtual int Close() override; - virtual State GetState() const override; - virtual int GetOption(rtc::Socket::Option option, int* value) override; - virtual int SetOption(rtc::Socket::Option option, int value) override; - virtual int GetError() const override; - virtual void SetError(int error) override; + rtc::SocketAddress GetLocalAddress() const override; + rtc::SocketAddress GetRemoteAddress() const override; + int Send(const void* pv, + size_t cb, + const rtc::PacketOptions& options) override; + int SendTo(const void* pv, + size_t cb, + const rtc::SocketAddress& addr, + const rtc::PacketOptions& options) override; + int Close() override; + State GetState() const override; + int GetOption(rtc::Socket::Option option, int* value) override; + int SetOption(rtc::Socket::Option option, int value) override; + int GetError() const override; + void SetError(int error) override; // P2PSocketClientDelegate implementation. - virtual void OnOpen(const net::IPEndPoint& local_address, - const net::IPEndPoint& remote_address) override; - virtual void OnIncomingTcpConnection( - const net::IPEndPoint& address, - P2PSocketClient* client) override; - virtual void OnSendComplete() override; - virtual void OnError() override; - virtual void OnDataReceived(const net::IPEndPoint& address, - const std::vector<char>& data, - const base::TimeTicks& timestamp) override; + void OnOpen(const net::IPEndPoint& local_address, + const net::IPEndPoint& remote_address) override; + void OnIncomingTcpConnection(const net::IPEndPoint& address, + P2PSocketClient* client) override; + void OnSendComplete() override; + void OnError() override; + void OnDataReceived(const net::IPEndPoint& address, + const std::vector<char>& data, + const base::TimeTicks& timestamp) override; private: enum InternalState { @@ -172,14 +173,13 @@ class AsyncAddressResolverImpl : public base::NonThreadSafe, public rtc::AsyncResolverInterface { public: AsyncAddressResolverImpl(P2PSocketDispatcher* dispatcher); - virtual ~AsyncAddressResolverImpl(); + ~AsyncAddressResolverImpl() override; // rtc::AsyncResolverInterface interface. - virtual void Start(const rtc::SocketAddress& addr) override; - virtual bool GetResolvedAddress( - int family, rtc::SocketAddress* addr) const override; - virtual int GetError() const override; - virtual void Destroy(bool wait) override; + void Start(const rtc::SocketAddress& addr) override; + bool GetResolvedAddress(int family, rtc::SocketAddress* addr) const override; + int GetError() const override; + void Destroy(bool wait) override; private: virtual void OnAddressResolved(const net::IPAddressList& addresses); diff --git a/content/renderer/p2p/ipc_socket_factory.h b/content/renderer/p2p/ipc_socket_factory.h index 74db1e6..3e8797a 100644 --- a/content/renderer/p2p/ipc_socket_factory.h +++ b/content/renderer/p2p/ipc_socket_factory.h @@ -24,23 +24,24 @@ class IpcPacketSocketFactory : public rtc::PacketSocketFactory { public: CONTENT_EXPORT explicit IpcPacketSocketFactory( P2PSocketDispatcher* socket_dispatcher); - virtual ~IpcPacketSocketFactory(); + ~IpcPacketSocketFactory() override; - virtual rtc::AsyncPacketSocket* CreateUdpSocket( + rtc::AsyncPacketSocket* CreateUdpSocket( const rtc::SocketAddress& local_address, - int min_port, int max_port) override; - virtual rtc::AsyncPacketSocket* CreateServerTcpSocket( + int min_port, + int max_port) override; + rtc::AsyncPacketSocket* CreateServerTcpSocket( const rtc::SocketAddress& local_address, int min_port, int max_port, int opts) override; - virtual rtc::AsyncPacketSocket* CreateClientTcpSocket( + rtc::AsyncPacketSocket* CreateClientTcpSocket( const rtc::SocketAddress& local_address, const rtc::SocketAddress& remote_address, const rtc::ProxyInfo& proxy_info, const std::string& user_agent, int opts) override; - virtual rtc::AsyncResolverInterface* CreateAsyncResolver() override; + rtc::AsyncResolverInterface* CreateAsyncResolver() override; private: P2PSocketDispatcher* socket_dispatcher_; diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h index 49563fa..f601a09 100644 --- a/content/renderer/p2p/port_allocator.h +++ b/content/renderer/p2p/port_allocator.h @@ -42,9 +42,9 @@ class P2PPortAllocator : public cricket::BasicPortAllocator { rtc::NetworkManager* network_manager, rtc::PacketSocketFactory* socket_factory, const Config& config); - virtual ~P2PPortAllocator(); + ~P2PPortAllocator() override; - virtual cricket::PortAllocatorSession* CreateSessionInternal( + cricket::PortAllocatorSession* CreateSessionInternal( const std::string& content_name, int component, const std::string& ice_username_fragment, @@ -67,11 +67,11 @@ class P2PPortAllocatorSession : public cricket::BasicPortAllocatorSession { int component, const std::string& ice_username_fragment, const std::string& ice_password); - virtual ~P2PPortAllocatorSession(); + ~P2PPortAllocatorSession() override; protected: // Overrides for cricket::BasicPortAllocatorSession. - virtual void GetPortConfigurations() override; + void GetPortConfigurations() override; private: P2PPortAllocator* allocator_; diff --git a/content/renderer/p2p/socket_client_impl.h b/content/renderer/p2p/socket_client_impl.h index 399d533..4cda52d 100644 --- a/content/renderer/p2p/socket_client_impl.h +++ b/content/renderer/p2p/socket_client_impl.h @@ -40,25 +40,25 @@ class P2PSocketClientImpl : public P2PSocketClient { P2PSocketClientDelegate* delegate); // Send the |data| to the |address|. - virtual void Send(const net::IPEndPoint& address, - const std::vector<char>& data) override; + void Send(const net::IPEndPoint& address, + const std::vector<char>& data) override; // Send the |data| to the |address| using Differentiated Services Code Point // |dscp|. - virtual void SendWithDscp(const net::IPEndPoint& address, - const std::vector<char>& data, - const rtc::PacketOptions& options) override; + void SendWithDscp(const net::IPEndPoint& address, + const std::vector<char>& data, + const rtc::PacketOptions& options) override; // Setting socket options. - virtual void SetOption(P2PSocketOption option, int value) override; + void SetOption(P2PSocketOption option, int value) override; // Must be called before the socket is destroyed. The delegate may // not be called after |closed_task| is executed. - virtual void Close() override; + void Close() override; - virtual int GetSocketID() const override; + int GetSocketID() const override; - virtual void SetDelegate(P2PSocketClientDelegate* delegate) override; + void SetDelegate(P2PSocketClientDelegate* delegate) override; private: enum State { @@ -71,7 +71,7 @@ class P2PSocketClientImpl : public P2PSocketClient { friend class P2PSocketDispatcher; - virtual ~P2PSocketClientImpl(); + ~P2PSocketClientImpl() override; // Message handlers that run on IPC thread. void OnSocketCreated(const net::IPEndPoint& local_address, diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h index 24999dc..69cb21f 100644 --- a/content/renderer/p2p/socket_dispatcher.h +++ b/content/renderer/p2p/socket_dispatcher.h @@ -55,13 +55,13 @@ class CONTENT_EXPORT P2PSocketDispatcher : public IPC::MessageFilter, explicit P2PSocketDispatcher(base::MessageLoopProxy* ipc_message_loop); // NetworkListManager interface: - virtual void AddNetworkListObserver( + void AddNetworkListObserver( NetworkListObserver* network_list_observer) override; - virtual void RemoveNetworkListObserver( + void RemoveNetworkListObserver( NetworkListObserver* network_list_observer) override; protected: - virtual ~P2PSocketDispatcher(); + ~P2PSocketDispatcher() override; private: friend class P2PAsyncAddressResolver; @@ -71,10 +71,10 @@ class CONTENT_EXPORT P2PSocketDispatcher : public IPC::MessageFilter, virtual void Send(IPC::Message* message); // IPC::MessageFilter override. Called on IO thread. - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void OnFilterAdded(IPC::Sender* sender) override; - virtual void OnFilterRemoved() override; - virtual void OnChannelClosing() override; + bool OnMessageReceived(const IPC::Message& message) override; + void OnFilterAdded(IPC::Sender* sender) override; + void OnFilterRemoved() override; + void OnChannelClosing() override; // Returns the IO message loop. base::MessageLoopProxy* message_loop(); diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.h b/content/renderer/pepper/content_renderer_pepper_host_factory.h index db31320..9a4ef85 100644 --- a/content/renderer/pepper/content_renderer_pepper_host_factory.h +++ b/content/renderer/pepper/content_renderer_pepper_host_factory.h @@ -21,9 +21,9 @@ class RenderViewImpl; class ContentRendererPepperHostFactory : public ppapi::host::HostFactory { public: explicit ContentRendererPepperHostFactory(RendererPpapiHostImpl* host); - virtual ~ContentRendererPepperHostFactory(); + ~ContentRendererPepperHostFactory() override; - virtual scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost( + scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost( ppapi::host::PpapiHost* host, const ppapi::proxy::ResourceMessageCallParams& params, PP_Instance instance, diff --git a/content/renderer/pepper/fake_pepper_plugin_instance.h b/content/renderer/pepper/fake_pepper_plugin_instance.h index 280f888..b5dcbe6 100644 --- a/content/renderer/pepper/fake_pepper_plugin_instance.h +++ b/content/renderer/pepper/fake_pepper_plugin_instance.h @@ -12,37 +12,35 @@ namespace content { class FakePepperPluginInstance : public PepperPluginInstance { public: - virtual ~FakePepperPluginInstance(); + ~FakePepperPluginInstance() override; // PepperPluginInstance overrides. - virtual content::RenderView* GetRenderView() override; - virtual blink::WebPluginContainer* GetContainer() override; - virtual v8::Isolate* GetIsolate() const override; - virtual ppapi::VarTracker* GetVarTracker() override; - virtual const GURL& GetPluginURL() override; - virtual base::FilePath GetModulePath() override; - virtual PP_Resource CreateImage(gfx::ImageSkia* source_image, - float scale) override; - virtual PP_ExternalPluginResult SwitchToOutOfProcessProxy( + content::RenderView* GetRenderView() override; + blink::WebPluginContainer* GetContainer() override; + v8::Isolate* GetIsolate() const override; + ppapi::VarTracker* GetVarTracker() override; + const GURL& GetPluginURL() override; + base::FilePath GetModulePath() override; + PP_Resource CreateImage(gfx::ImageSkia* source_image, float scale) override; + PP_ExternalPluginResult SwitchToOutOfProcessProxy( const base::FilePath& file_path, ppapi::PpapiPermissions permissions, const IPC::ChannelHandle& channel_handle, base::ProcessId plugin_pid, int plugin_child_id) override; - virtual void SetAlwaysOnTop(bool on_top) override; - virtual bool IsFullPagePlugin() override; - virtual bool FlashSetFullscreen(bool fullscreen, bool delay_report) override; - virtual bool IsRectTopmost(const gfx::Rect& rect) override; - virtual int32_t Navigate(const ppapi::URLRequestInfoData& request, - const char* target, - bool from_user_action) override; - virtual int MakePendingFileRefRendererHost(const base::FilePath& path) - override; - virtual void SetEmbedProperty(PP_Var key, PP_Var value) override; - virtual void SetSelectedText(const base::string16& selected_text) override; - virtual void SetLinkUnderCursor(const std::string& url) override; - virtual void SetTextInputType(ui::TextInputType type) override; - virtual void PostMessageToJavaScript(PP_Var message) override; + void SetAlwaysOnTop(bool on_top) override; + bool IsFullPagePlugin() override; + bool FlashSetFullscreen(bool fullscreen, bool delay_report) override; + bool IsRectTopmost(const gfx::Rect& rect) override; + int32_t Navigate(const ppapi::URLRequestInfoData& request, + const char* target, + bool from_user_action) override; + int MakePendingFileRefRendererHost(const base::FilePath& path) override; + void SetEmbedProperty(PP_Var key, PP_Var value) override; + void SetSelectedText(const base::string16& selected_text) override; + void SetLinkUnderCursor(const std::string& url) override; + void SetTextInputType(ui::TextInputType type) override; + void PostMessageToJavaScript(PP_Var message) override; private: GURL gurl_; diff --git a/content/renderer/pepper/host_array_buffer_var.h b/content/renderer/pepper/host_array_buffer_var.h index 3e5b5b4..9722f5f 100644 --- a/content/renderer/pepper/host_array_buffer_var.h +++ b/content/renderer/pepper/host_array_buffer_var.h @@ -22,18 +22,17 @@ class HostArrayBufferVar : public ppapi::ArrayBufferVar { base::SharedMemoryHandle handle); // ArrayBufferVar implementation. - virtual void* Map() override; - virtual void Unmap() override; - virtual uint32 ByteLength() override; - virtual bool CopyToNewShmem(PP_Instance instance, - int* host_shm_handle_id, - base::SharedMemoryHandle* plugin_shm_handle) - override; + void* Map() override; + void Unmap() override; + uint32 ByteLength() override; + bool CopyToNewShmem(PP_Instance instance, + int* host_shm_handle_id, + base::SharedMemoryHandle* plugin_shm_handle) override; blink::WebArrayBuffer& webkit_buffer() { return buffer_; } private: - virtual ~HostArrayBufferVar(); + ~HostArrayBufferVar() override; blink::WebArrayBuffer buffer_; // Tracks whether the data in the buffer is valid. diff --git a/content/renderer/pepper/host_globals.h b/content/renderer/pepper/host_globals.h index 5320234..9ce071c 100644 --- a/content/renderer/pepper/host_globals.h +++ b/content/renderer/pepper/host_globals.h @@ -20,7 +20,7 @@ class PluginModule; class HostGlobals : public ppapi::PpapiGlobals { public: HostGlobals(); - virtual ~HostGlobals(); + ~HostGlobals() override; // Getter for the global singleton. Generally, you should use // PpapiGlobals::Get() when possible. Use this only when you need some @@ -31,27 +31,26 @@ class HostGlobals : public ppapi::PpapiGlobals { } // PpapiGlobals implementation. - virtual ppapi::ResourceTracker* GetResourceTracker() override; - virtual ppapi::VarTracker* GetVarTracker() override; - virtual ppapi::CallbackTracker* GetCallbackTrackerForInstance( + ppapi::ResourceTracker* GetResourceTracker() override; + ppapi::VarTracker* GetVarTracker() override; + ppapi::CallbackTracker* GetCallbackTrackerForInstance( PP_Instance instance) override; - virtual ppapi::thunk::PPB_Instance_API* GetInstanceAPI(PP_Instance instance) - override; - virtual ppapi::thunk::ResourceCreationAPI* GetResourceCreationAPI( + ppapi::thunk::PPB_Instance_API* GetInstanceAPI(PP_Instance instance) override; + ppapi::thunk::ResourceCreationAPI* GetResourceCreationAPI( PP_Instance instance) override; - virtual PP_Module GetModuleForInstance(PP_Instance instance) override; - virtual std::string GetCmdLine() override; - virtual void PreCacheFontForFlash(const void* logfontw) override; - virtual void LogWithSource(PP_Instance instance, - PP_LogLevel level, - const std::string& source, - const std::string& value) override; - virtual void BroadcastLogWithSource(PP_Module module, - PP_LogLevel level, - const std::string& source, - const std::string& value) override; - virtual ppapi::MessageLoopShared* GetCurrentMessageLoop() override; - virtual base::TaskRunner* GetFileTaskRunner() override; + PP_Module GetModuleForInstance(PP_Instance instance) override; + std::string GetCmdLine() override; + void PreCacheFontForFlash(const void* logfontw) override; + void LogWithSource(PP_Instance instance, + PP_LogLevel level, + const std::string& source, + const std::string& value) override; + void BroadcastLogWithSource(PP_Module module, + PP_LogLevel level, + const std::string& source, + const std::string& value) override; + ppapi::MessageLoopShared* GetCurrentMessageLoop() override; + base::TaskRunner* GetFileTaskRunner() override; HostVarTracker* host_var_tracker() { return &host_var_tracker_; } @@ -88,7 +87,7 @@ class HostGlobals : public ppapi::PpapiGlobals { private: // PpapiGlobals overrides. - virtual bool IsHostGlobals() const override; + bool IsHostGlobals() const override; static HostGlobals* host_globals_; diff --git a/content/renderer/pepper/host_resource_var.h b/content/renderer/pepper/host_resource_var.h index 6a37020..152b9a9 100644 --- a/content/renderer/pepper/host_resource_var.h +++ b/content/renderer/pepper/host_resource_var.h @@ -32,16 +32,16 @@ class HostResourceVar : public ppapi::ResourceVar { const IPC::Message& creation_message); // ResourceVar override. - virtual PP_Resource GetPPResource() const override; - virtual int GetPendingRendererHostId() const override; - virtual int GetPendingBrowserHostId() const override; - virtual const IPC::Message* GetCreationMessage() const override; - virtual bool IsPending() const override; + PP_Resource GetPPResource() const override; + int GetPendingRendererHostId() const override; + int GetPendingBrowserHostId() const override; + const IPC::Message* GetCreationMessage() const override; + bool IsPending() const override; void set_pending_browser_host_id(int id) { pending_browser_host_id_ = id; } protected: - virtual ~HostResourceVar(); + ~HostResourceVar() override; private: // Real resource ID in the plugin. 0 if one has not yet been created diff --git a/content/renderer/pepper/host_var_tracker.h b/content/renderer/pepper/host_var_tracker.h index 56f4710..0be5d1d2e 100644 --- a/content/renderer/pepper/host_var_tracker.h +++ b/content/renderer/pepper/host_var_tracker.h @@ -31,7 +31,7 @@ namespace content { class HostVarTracker : public ppapi::VarTracker { public: HostVarTracker(); - virtual ~HostVarTracker(); + ~HostVarTracker() override; // Tracks all live V8ObjectVar. This is so we can map between instance + // V8Object and get the V8ObjectVar corresponding to it. This Add/Remove @@ -46,27 +46,25 @@ class HostVarTracker : public ppapi::VarTracker { CONTENT_EXPORT int GetLiveV8ObjectVarsForTest(PP_Instance instance); // VarTracker public implementation. - virtual PP_Var MakeResourcePPVarFromMessage( - PP_Instance instance, - const IPC::Message& creation_message, - int pending_renderer_id, - int pending_browser_id) override; - virtual ppapi::ResourceVar* MakeResourceVar(PP_Resource pp_resource) override; - virtual void DidDeleteInstance(PP_Instance pp_instance) override; - - virtual int TrackSharedMemoryHandle(PP_Instance instance, - base::SharedMemoryHandle file, - uint32 size_in_bytes) override; - virtual bool StopTrackingSharedMemoryHandle(int id, - PP_Instance instance, - base::SharedMemoryHandle* handle, - uint32* size_in_bytes) override; + PP_Var MakeResourcePPVarFromMessage(PP_Instance instance, + const IPC::Message& creation_message, + int pending_renderer_id, + int pending_browser_id) override; + ppapi::ResourceVar* MakeResourceVar(PP_Resource pp_resource) override; + void DidDeleteInstance(PP_Instance pp_instance) override; + + int TrackSharedMemoryHandle(PP_Instance instance, + base::SharedMemoryHandle file, + uint32 size_in_bytes) override; + bool StopTrackingSharedMemoryHandle(int id, + PP_Instance instance, + base::SharedMemoryHandle* handle, + uint32* size_in_bytes) override; private: // VarTracker private implementation. - virtual ppapi::ArrayBufferVar* CreateArrayBuffer(uint32 size_in_bytes) - override; - virtual ppapi::ArrayBufferVar* CreateShmArrayBuffer( + ppapi::ArrayBufferVar* CreateArrayBuffer(uint32 size_in_bytes) override; + ppapi::ArrayBufferVar* CreateShmArrayBuffer( uint32 size_in_bytes, base::SharedMemoryHandle handle) override; diff --git a/content/renderer/pepper/host_var_tracker_unittest.cc b/content/renderer/pepper/host_var_tracker_unittest.cc index 356d43d..3c8bff2 100644 --- a/content/renderer/pepper/host_var_tracker_unittest.cc +++ b/content/renderer/pepper/host_var_tracker_unittest.cc @@ -36,7 +36,7 @@ class MyObject : public gin::Wrappable<MyObject> { private: MyObject() { ++g_v8objects_alive; } - virtual ~MyObject() { --g_v8objects_alive; } + ~MyObject() override { --g_v8objects_alive; } DISALLOW_COPY_AND_ASSIGN(MyObject); }; @@ -51,9 +51,9 @@ class PepperTryCatchForTest : public PepperTryCatch { handle_scope_(instance->GetIsolate()), context_scope_(v8::Context::New(instance->GetIsolate())) {} - virtual void SetException(const char* message) override { NOTREACHED(); } - virtual bool HasException() override { return false; } - virtual v8::Handle<v8::Context> GetContext() override { + void SetException(const char* message) override { NOTREACHED(); } + bool HasException() override { return false; } + v8::Handle<v8::Context> GetContext() override { return instance_->GetIsolate()->GetCurrentContext(); } diff --git a/content/renderer/pepper/message_channel.h b/content/renderer/pepper/message_channel.h index 02e29e3..4889777 100644 --- a/content/renderer/pepper/message_channel.h +++ b/content/renderer/pepper/message_channel.h @@ -61,7 +61,7 @@ class MessageChannel : static MessageChannel* Create(PepperPluginInstanceImpl* instance, v8::Persistent<v8::Object>* result); - virtual ~MessageChannel(); + ~MessageChannel() override; // Called when the instance is deleted. The MessageChannel might outlive the // plugin instance because it is garbage collected. @@ -93,22 +93,21 @@ class MessageChannel : explicit MessageChannel(PepperPluginInstanceImpl* instance); // gin::NamedPropertyInterceptor - virtual v8::Local<v8::Value> GetNamedProperty( - v8::Isolate* isolate, - const std::string& property) override; - virtual bool SetNamedProperty(v8::Isolate* isolate, - const std::string& property, - v8::Local<v8::Value> value) override; - virtual std::vector<std::string> EnumerateNamedProperties( + v8::Local<v8::Value> GetNamedProperty(v8::Isolate* isolate, + const std::string& property) override; + bool SetNamedProperty(v8::Isolate* isolate, + const std::string& property, + v8::Local<v8::Value> value) override; + std::vector<std::string> EnumerateNamedProperties( v8::Isolate* isolate) override; // gin::Wrappable - virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( + gin::ObjectTemplateBuilder GetObjectTemplateBuilder( v8::Isolate* isolate) override; // ppapi::proxy::HostDispatcher::SyncMessageStatusObserver - virtual void BeginBlockOnSyncMessage() override; - virtual void EndBlockOnSyncMessage() override; + void BeginBlockOnSyncMessage() override; + void EndBlockOnSyncMessage() override; // Post a message to the plugin's HandleMessage function for this channel's // instance. diff --git a/content/renderer/pepper/mock_renderer_ppapi_host.h b/content/renderer/pepper/mock_renderer_ppapi_host.h index 42fe4d4..74cff72 100644 --- a/content/renderer/pepper/mock_renderer_ppapi_host.h +++ b/content/renderer/pepper/mock_renderer_ppapi_host.h @@ -23,7 +23,7 @@ class MockRendererPpapiHost : public RendererPpapiHost { // This function takes the RenderView and instance that the mock resource // host will be associated with. MockRendererPpapiHost(RenderView* render_view, PP_Instance instance); - virtual ~MockRendererPpapiHost(); + ~MockRendererPpapiHost() override; ppapi::proxy::ResourceMessageTestSink& sink() { return sink_; } PP_Instance pp_instance() const { return pp_instance_; } @@ -32,34 +32,30 @@ class MockRendererPpapiHost : public RendererPpapiHost { void set_has_user_gesture(bool gesture) { has_user_gesture_ = gesture; } // RendererPpapiHost. - virtual ppapi::host::PpapiHost* GetPpapiHost() override; - virtual bool IsValidInstance(PP_Instance instance) const override; - virtual PepperPluginInstance* GetPluginInstance(PP_Instance instance) const - override; - virtual RenderFrame* GetRenderFrameForInstance(PP_Instance instance) const - override; - virtual RenderView* GetRenderViewForInstance(PP_Instance instance) const - override; - virtual blink::WebPluginContainer* GetContainerForInstance( + ppapi::host::PpapiHost* GetPpapiHost() override; + bool IsValidInstance(PP_Instance instance) const override; + PepperPluginInstance* GetPluginInstance(PP_Instance instance) const override; + RenderFrame* GetRenderFrameForInstance(PP_Instance instance) const override; + RenderView* GetRenderViewForInstance(PP_Instance instance) const override; + blink::WebPluginContainer* GetContainerForInstance( PP_Instance instance) const override; - virtual base::ProcessId GetPluginPID() const override; - virtual bool HasUserGesture(PP_Instance instance) const override; - virtual int GetRoutingIDForWidget(PP_Instance instance) const override; - virtual gfx::Point PluginPointToRenderFrame(PP_Instance instance, - const gfx::Point& pt) const - override; - virtual IPC::PlatformFileForTransit ShareHandleWithRemote( + base::ProcessId GetPluginPID() const override; + bool HasUserGesture(PP_Instance instance) const override; + int GetRoutingIDForWidget(PP_Instance instance) const override; + gfx::Point PluginPointToRenderFrame(PP_Instance instance, + const gfx::Point& pt) const override; + IPC::PlatformFileForTransit ShareHandleWithRemote( base::PlatformFile handle, bool should_close_source) override; - virtual bool IsRunningInProcess() const override; - virtual std::string GetPluginName() const override; - virtual void SetToExternalPluginHost() override; - virtual void CreateBrowserResourceHosts( + bool IsRunningInProcess() const override; + std::string GetPluginName() const override; + void SetToExternalPluginHost() override; + void CreateBrowserResourceHosts( PP_Instance instance, const std::vector<IPC::Message>& nested_msgs, - const base::Callback<void(const std::vector<int>&)>& callback) const - override; - virtual GURL GetDocumentURL(PP_Instance instance) const override; + const base::Callback<void(const std::vector<int>&)>& callback) + const override; + GURL GetDocumentURL(PP_Instance instance) const override; private: ppapi::proxy::ResourceMessageTestSink sink_; diff --git a/content/renderer/pepper/mock_resource.h b/content/renderer/pepper/mock_resource.h index d7a09c3..20ce44f 100644 --- a/content/renderer/pepper/mock_resource.h +++ b/content/renderer/pepper/mock_resource.h @@ -18,7 +18,7 @@ class MockResource : public ppapi::Resource { : Resource(ppapi::OBJECT_IS_IMPL, instance) {} private: - virtual ~MockResource() {} + ~MockResource() override {} }; } // namespace content diff --git a/content/renderer/pepper/pepper_audio_input_host.h b/content/renderer/pepper/pepper_audio_input_host.h index 4e8b450..91a4b1f 100644 --- a/content/renderer/pepper/pepper_audio_input_host.h +++ b/content/renderer/pepper/pepper_audio_input_host.h @@ -27,9 +27,9 @@ class PepperAudioInputHost : public ppapi::host::ResourceHost { PepperAudioInputHost(RendererPpapiHostImpl* host, PP_Instance instance, PP_Resource resource); - virtual ~PepperAudioInputHost(); + ~PepperAudioInputHost() override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/renderer/pepper/pepper_browser_connection.h b/content/renderer/pepper/pepper_browser_connection.h index d81a90c..241d612 100644 --- a/content/renderer/pepper/pepper_browser_connection.h +++ b/content/renderer/pepper/pepper_browser_connection.h @@ -32,9 +32,9 @@ class PepperBrowserConnection typedef base::Callback<void(const std::vector<int>&)> PendingResourceIDCallback; explicit PepperBrowserConnection(RenderFrame* render_frame); - virtual ~PepperBrowserConnection(); + ~PepperBrowserConnection() override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // TODO(teravest): Instead of having separate methods per message, we should // add generic functionality similar to PluginResource::Call(). diff --git a/content/renderer/pepper/pepper_compositor_host.h b/content/renderer/pepper/pepper_compositor_host.h index f6cf87f..d0ecac0 100644 --- a/content/renderer/pepper/pepper_compositor_host.h +++ b/content/renderer/pepper/pepper_compositor_host.h @@ -42,7 +42,7 @@ class PepperCompositorHost : public ppapi::host::ResourceHost { void ViewFlushedPaint(); private: - virtual ~PepperCompositorHost(); + ~PepperCompositorHost() override; void ImageReleased(int32_t id, const scoped_ptr<base::SharedMemory>& shared_memory, @@ -58,12 +58,12 @@ class PepperCompositorHost : public ppapi::host::ResourceHost { scoped_ptr<base::SharedMemory> image_shm); // ResourceMessageHandler overrides: - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; // ppapi::host::ResourceHost overrides: - virtual bool IsCompositorHost() override; + bool IsCompositorHost() override; // Message handlers: int32_t OnHostMsgCommitLayers( diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc b/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc index d9944d4..b560849 100644 --- a/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc +++ b/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc @@ -30,18 +30,17 @@ class TestDelegate : public PepperDeviceEnumerationHostHelper::Delegate, public: TestDelegate() : last_used_id_(0) {} - virtual ~TestDelegate() { CHECK(callbacks_.empty()); } + ~TestDelegate() override { CHECK(callbacks_.empty()); } - virtual int EnumerateDevices(PP_DeviceType_Dev /* type */, - const GURL& /* document_url */, - const EnumerateDevicesCallback& callback) - override { + int EnumerateDevices(PP_DeviceType_Dev /* type */, + const GURL& /* document_url */, + const EnumerateDevicesCallback& callback) override { last_used_id_++; callbacks_[last_used_id_] = callback; return last_used_id_; } - virtual void StopEnumerateDevices(int request_id) override { + void StopEnumerateDevices(int request_id) override { std::map<int, EnumerateDevicesCallback>::iterator iter = callbacks_.find(request_id); CHECK(iter != callbacks_.end()); diff --git a/content/renderer/pepper/pepper_file_chooser_host.h b/content/renderer/pepper/pepper_file_chooser_host.h index 50ca0de..4ae861a 100644 --- a/content/renderer/pepper/pepper_file_chooser_host.h +++ b/content/renderer/pepper/pepper_file_chooser_host.h @@ -38,9 +38,9 @@ class CONTENT_EXPORT PepperFileChooserHost PepperFileChooserHost(RendererPpapiHost* host, PP_Instance instance, PP_Resource resource); - virtual ~PepperFileChooserHost(); + ~PepperFileChooserHost() override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/renderer/pepper/pepper_file_ref_renderer_host.h b/content/renderer/pepper/pepper_file_ref_renderer_host.h index 3e91485..cfa36b2 100644 --- a/content/renderer/pepper/pepper_file_ref_renderer_host.h +++ b/content/renderer/pepper/pepper_file_ref_renderer_host.h @@ -35,17 +35,17 @@ class PepperFileRefRendererHost : public ppapi::host::ResourceHost { PP_Resource resource, const base::FilePath& external_path); - virtual ~PepperFileRefRendererHost(); + ~PepperFileRefRendererHost() override; PP_FileSystemType GetFileSystemType() const; GURL GetFileSystemURL() const; base::FilePath GetExternalFilePath() const; // ppapi::host::ResourceHost override. - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; - virtual bool IsFileRefHost() override; + bool IsFileRefHost() override; private: PP_FileSystemType file_system_type_; diff --git a/content/renderer/pepper/pepper_file_system_host.h b/content/renderer/pepper/pepper_file_system_host.h index 79fcf31..23d7c49 100644 --- a/content/renderer/pepper/pepper_file_system_host.h +++ b/content/renderer/pepper/pepper_file_system_host.h @@ -39,13 +39,13 @@ class PepperFileSystemHost PP_Resource resource, const GURL& root_url, PP_FileSystemType type); - virtual ~PepperFileSystemHost(); + ~PepperFileSystemHost() override; // ppapi::host::ResourceHost override. - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; - virtual bool IsFileSystemHost() override; + bool IsFileSystemHost() override; // Supports FileRefs direct access on the host side. PP_FileSystemType GetType() const { return type_; } diff --git a/content/renderer/pepper/pepper_graphics_2d_host.h b/content/renderer/pepper/pepper_graphics_2d_host.h index d5753ccd..7347a0a 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.h +++ b/content/renderer/pepper/pepper_graphics_2d_host.h @@ -51,13 +51,13 @@ class CONTENT_EXPORT PepperGraphics2DHost PP_Bool is_always_opaque, scoped_refptr<PPB_ImageData_Impl> backing_store); - virtual ~PepperGraphics2DHost(); + ~PepperGraphics2DHost() override; // ppapi::host::ResourceHost override. - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; - virtual bool IsGraphics2DHost() override; + bool IsGraphics2DHost() override; bool ReadImageData(PP_Resource image, const PP_Point* top_left); // Assciates this device with the given plugin instance. You can pass NULL diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.h b/content/renderer/pepper/pepper_hung_plugin_filter.h index 08d4dc2..286fdfa 100644 --- a/content/renderer/pepper/pepper_hung_plugin_filter.h +++ b/content/renderer/pepper/pepper_hung_plugin_filter.h @@ -40,17 +40,17 @@ class PepperHungPluginFilter int plugin_child_id); // SyncMessageStatusReceiver implementation. - virtual void BeginBlockOnSyncMessage() override; - virtual void EndBlockOnSyncMessage() override; + void BeginBlockOnSyncMessage() override; + void EndBlockOnSyncMessage() override; // MessageFilter implementation. - virtual void OnFilterAdded(IPC::Sender* sender) override; - virtual void OnFilterRemoved() override; - virtual void OnChannelError() override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + void OnFilterAdded(IPC::Sender* sender) override; + void OnFilterRemoved() override; + void OnChannelError() override; + bool OnMessageReceived(const IPC::Message& message) override; protected: - virtual ~PepperHungPluginFilter(); + ~PepperHungPluginFilter() override; private: // Makes sure that the hung timer is scheduled. diff --git a/content/renderer/pepper/pepper_in_process_resource_creation.h b/content/renderer/pepper/pepper_in_process_resource_creation.h index 0401ae5..9f80757 100644 --- a/content/renderer/pepper/pepper_in_process_resource_creation.h +++ b/content/renderer/pepper/pepper_in_process_resource_creation.h @@ -38,31 +38,31 @@ class PepperInProcessResourceCreation : public ResourceCreationImpl { public: PepperInProcessResourceCreation(RendererPpapiHostImpl* host_impl, PepperPluginInstanceImpl* instance); - virtual ~PepperInProcessResourceCreation(); + ~PepperInProcessResourceCreation() override; // ResourceCreation_API implementation. - virtual PP_Resource CreateBrowserFont( + PP_Resource CreateBrowserFont( PP_Instance instance, const PP_BrowserFont_Trusted_Description* description) override; - virtual PP_Resource CreateFileChooser(PP_Instance instance, - PP_FileChooserMode_Dev mode, - const PP_Var& accept_types) override; - virtual PP_Resource CreateFileIO(PP_Instance instance) override; - virtual PP_Resource CreateFileRef(PP_Instance instance, - const ppapi::FileRefCreateInfo& create_info) - override; - virtual PP_Resource CreateFileSystem(PP_Instance instance, - PP_FileSystemType type) override; - virtual PP_Resource CreateGraphics2D(PP_Instance pp_instance, - const PP_Size* size, - PP_Bool is_always_opaque) override; - virtual PP_Resource CreatePrinting(PP_Instance instance) override; - virtual PP_Resource CreateTrueTypeFont( + PP_Resource CreateFileChooser(PP_Instance instance, + PP_FileChooserMode_Dev mode, + const PP_Var& accept_types) override; + PP_Resource CreateFileIO(PP_Instance instance) override; + PP_Resource CreateFileRef( + PP_Instance instance, + const ppapi::FileRefCreateInfo& create_info) override; + PP_Resource CreateFileSystem(PP_Instance instance, + PP_FileSystemType type) override; + PP_Resource CreateGraphics2D(PP_Instance pp_instance, + const PP_Size* size, + PP_Bool is_always_opaque) override; + PP_Resource CreatePrinting(PP_Instance instance) override; + PP_Resource CreateTrueTypeFont( PP_Instance instance, const struct PP_TrueTypeFontDesc_Dev* desc) override; - virtual PP_Resource CreateURLLoader(PP_Instance instance) override; - virtual PP_Resource CreateURLRequestInfo(PP_Instance instance) override; - virtual PP_Resource CreateWebSocket(PP_Instance instance) override; + PP_Resource CreateURLLoader(PP_Instance instance) override; + PP_Resource CreateURLRequestInfo(PP_Instance instance) override; + PP_Resource CreateWebSocket(PP_Instance instance) override; private: // Non-owning pointer to the host for the current plugin. diff --git a/content/renderer/pepper/pepper_in_process_router.cc b/content/renderer/pepper/pepper_in_process_router.cc index 5b0d36f..b6fd7b4 100644 --- a/content/renderer/pepper/pepper_in_process_router.cc +++ b/content/renderer/pepper/pepper_in_process_router.cc @@ -24,11 +24,9 @@ class PepperInProcessRouter::Channel : public IPC::Sender { Channel(const base::Callback<bool(IPC::Message*)>& callback) : callback_(callback) {} - virtual ~Channel() {} + ~Channel() override {} - virtual bool Send(IPC::Message* message) override { - return callback_.Run(message); - } + bool Send(IPC::Message* message) override { return callback_.Run(message); } private: base::Callback<bool(IPC::Message*)> callback_; diff --git a/content/renderer/pepper/pepper_media_device_manager.h b/content/renderer/pepper/pepper_media_device_manager.h index d141cf3..6fd8ded 100644 --- a/content/renderer/pepper/pepper_media_device_manager.h +++ b/content/renderer/pepper/pepper_media_device_manager.h @@ -25,14 +25,13 @@ class PepperMediaDeviceManager public: static base::WeakPtr<PepperMediaDeviceManager> GetForRenderFrame( RenderFrame* render_frame); - virtual ~PepperMediaDeviceManager(); + ~PepperMediaDeviceManager() override; // PepperDeviceEnumerationHostHelper::Delegate implementation: - virtual int EnumerateDevices(PP_DeviceType_Dev type, - const GURL& document_url, - const EnumerateDevicesCallback& callback) - override; - virtual void StopEnumerateDevices(int request_id) override; + int EnumerateDevices(PP_DeviceType_Dev type, + const GURL& document_url, + const EnumerateDevicesCallback& callback) override; + void StopEnumerateDevices(int request_id) override; typedef base::Callback<void(int /* request_id */, bool /* succeeded */, @@ -56,23 +55,22 @@ class PepperMediaDeviceManager int GetSessionID(PP_DeviceType_Dev type, const std::string& label); // MediaStreamDispatcherEventHandler implementation. - virtual void OnStreamGenerated( + void OnStreamGenerated( int request_id, const std::string& label, const StreamDeviceInfoArray& audio_device_array, const StreamDeviceInfoArray& video_device_array) override; - virtual void OnStreamGenerationFailed( + void OnStreamGenerationFailed( int request_id, content::MediaStreamRequestResult result) override; - virtual void OnDeviceStopped(const std::string& label, - const StreamDeviceInfo& device_info) override; - virtual void OnDevicesEnumerated(int request_id, - const StreamDeviceInfoArray& device_array) - override; - virtual void OnDeviceOpened(int request_id, - const std::string& label, - const StreamDeviceInfo& device_info) override; - virtual void OnDeviceOpenFailed(int request_id) override; + void OnDeviceStopped(const std::string& label, + const StreamDeviceInfo& device_info) override; + void OnDevicesEnumerated(int request_id, + const StreamDeviceInfoArray& device_array) override; + void OnDeviceOpened(int request_id, + const std::string& label, + const StreamDeviceInfo& device_info) override; + void OnDeviceOpenFailed(int request_id) override; // Stream type conversion. static MediaStreamType FromPepperDeviceType(PP_DeviceType_Dev type); diff --git a/content/renderer/pepper/pepper_media_stream_audio_track_host.h b/content/renderer/pepper/pepper_media_stream_audio_track_host.h index 2940c7b..1580441 100644 --- a/content/renderer/pepper/pepper_media_stream_audio_track_host.h +++ b/content/renderer/pepper/pepper_media_stream_audio_track_host.h @@ -38,7 +38,7 @@ class PepperMediaStreamAudioTrackHost : public PepperMediaStreamTrackHostBase { class AudioSink : public MediaStreamAudioSink { public: explicit AudioSink(PepperMediaStreamAudioTrackHost* host); - virtual ~AudioSink(); + ~AudioSink() override; // Enqueues a free buffer index into |buffers_| which will be used for // sending audio samples to plugin. @@ -64,11 +64,11 @@ class PepperMediaStreamAudioTrackHost : public PepperMediaStreamTrackHostBase { // MediaStreamAudioSink overrides: // These two functions should be called on the audio thread. - virtual void OnData(const int16* audio_data, - int sample_rate, - int number_of_channels, - int number_of_frames) override; - virtual void OnSetFormat(const media::AudioParameters& params) override; + void OnData(const int16* audio_data, + int sample_rate, + int number_of_channels, + int number_of_frames) override; + void OnSetFormat(const media::AudioParameters& params) override; // Unowned host which is available during the AudioSink's lifespan. // It is mainly used in the main thread. But the audio thread will use @@ -148,10 +148,10 @@ class PepperMediaStreamAudioTrackHost : public PepperMediaStreamTrackHostBase { DISALLOW_COPY_AND_ASSIGN(AudioSink); }; - virtual ~PepperMediaStreamAudioTrackHost(); + ~PepperMediaStreamAudioTrackHost() override; // ResourceMessageHandler overrides: - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; @@ -161,13 +161,13 @@ class PepperMediaStreamAudioTrackHost : public PepperMediaStreamTrackHostBase { const ppapi::MediaStreamAudioTrackShared::Attributes& attributes); // PepperMediaStreamTrackHostBase overrides: - virtual void OnClose() override; + void OnClose() override; // MediaStreamBufferManager::Delegate overrides: - virtual void OnNewBufferEnqueued() override; + void OnNewBufferEnqueued() override; // ResourceHost overrides: - virtual void DidConnectPendingHostToResource() override; + void DidConnectPendingHostToResource() override; blink::WebMediaStreamTrack track_; diff --git a/content/renderer/pepper/pepper_media_stream_track_host_base.h b/content/renderer/pepper/pepper_media_stream_track_host_base.h index 9bd6d09..ddfac9c 100644 --- a/content/renderer/pepper/pepper_media_stream_track_host_base.h +++ b/content/renderer/pepper/pepper_media_stream_track_host_base.h @@ -21,7 +21,7 @@ class PepperMediaStreamTrackHostBase PepperMediaStreamTrackHostBase(RendererPpapiHost* host, PP_Instance instance, PP_Resource resource); - virtual ~PepperMediaStreamTrackHostBase(); + ~PepperMediaStreamTrackHostBase() override; enum TrackType { kRead, @@ -46,7 +46,7 @@ class PepperMediaStreamTrackHostBase void SendEnqueueBuffersMessageToPlugin(const std::vector<int32_t>& indices); // ResourceMessageHandler overrides: - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.h b/content/renderer/pepper/pepper_media_stream_video_track_host.h index b252ff9..1ed8052 100644 --- a/content/renderer/pepper/pepper_media_stream_video_track_host.h +++ b/content/renderer/pepper/pepper_media_stream_video_track_host.h @@ -37,7 +37,7 @@ class PepperMediaStreamVideoTrackHost : public PepperMediaStreamTrackHostBase, PP_Instance instance, PP_Resource resource); - virtual bool IsMediaStreamVideoTrackHost() override; + bool IsMediaStreamVideoTrackHost() override; blink::WebMediaStreamTrack track() { return track_; } @@ -48,9 +48,9 @@ class PepperMediaStreamVideoTrackHost : public PepperMediaStreamTrackHostBase, void InitBuffers(); // PepperMediaStreamTrackHostBase overrides: - virtual void OnClose() override; - virtual int32_t OnHostMsgEnqueueBuffer( - ppapi::host::HostMessageContext* context, int32_t index) override; + void OnClose() override; + int32_t OnHostMsgEnqueueBuffer(ppapi::host::HostMessageContext* context, + int32_t index) override; // Sends frame with |index| to |track_|. int32_t SendFrameToTrack(int32_t index); @@ -60,23 +60,23 @@ class PepperMediaStreamVideoTrackHost : public PepperMediaStreamTrackHostBase, const base::TimeTicks& estimated_capture_time); // MediaStreamVideoSource overrides: - virtual void GetCurrentSupportedFormats( + void GetCurrentSupportedFormats( int max_requested_width, int max_requested_height, double max_requested_frame_rate, const VideoCaptureDeviceFormatsCB& callback) override; - virtual void StartSourceImpl( + void StartSourceImpl( const media::VideoCaptureFormat& format, const VideoCaptureDeliverFrameCB& frame_callback) override; - virtual void StopSourceImpl() override; + void StopSourceImpl() override; // ResourceHost overrides: - virtual void DidConnectPendingHostToResource() override; + void DidConnectPendingHostToResource() override; // ResourceMessageHandler overrides: - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/renderer/pepper/pepper_platform_audio_input.h b/content/renderer/pepper/pepper_platform_audio_input.h index c1848b8..a567ed4 100644 --- a/content/renderer/pepper/pepper_platform_audio_input.h +++ b/content/renderer/pepper/pepper_platform_audio_input.h @@ -58,17 +58,16 @@ class PepperPlatformAudioInput void ShutDown(); // media::AudioInputIPCDelegate. - virtual void OnStreamCreated(base::SharedMemoryHandle handle, - base::SyncSocket::Handle socket_handle, - int length, - int total_segments) override; - virtual void OnVolume(double volume) override; - virtual void OnStateChanged(media::AudioInputIPCDelegate::State state) - override; - virtual void OnIPCClosed() override; + void OnStreamCreated(base::SharedMemoryHandle handle, + base::SyncSocket::Handle socket_handle, + int length, + int total_segments) override; + void OnVolume(double volume) override; + void OnStateChanged(media::AudioInputIPCDelegate::State state) override; + void OnIPCClosed() override; protected: - virtual ~PepperPlatformAudioInput(); + ~PepperPlatformAudioInput() override; private: friend class base::RefCountedThreadSafe<PepperPlatformAudioInput>; diff --git a/content/renderer/pepper/pepper_platform_audio_output.h b/content/renderer/pepper/pepper_platform_audio_output.h index 2bb8ce6..8c1c45c 100644 --- a/content/renderer/pepper/pepper_platform_audio_output.h +++ b/content/renderer/pepper/pepper_platform_audio_output.h @@ -48,15 +48,14 @@ class PepperPlatformAudioOutput void ShutDown(); // media::AudioOutputIPCDelegate implementation. - virtual void OnStateChanged(media::AudioOutputIPCDelegate::State state) - override; - virtual void OnStreamCreated(base::SharedMemoryHandle handle, - base::SyncSocket::Handle socket_handle, - int length) override; - virtual void OnIPCClosed() override; + void OnStateChanged(media::AudioOutputIPCDelegate::State state) override; + void OnStreamCreated(base::SharedMemoryHandle handle, + base::SyncSocket::Handle socket_handle, + int length) override; + void OnIPCClosed() override; protected: - virtual ~PepperPlatformAudioOutput(); + ~PepperPlatformAudioOutput() override; private: friend class base::RefCountedThreadSafe<PepperPlatformAudioOutput>; diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc index ee9295d..97a85c9 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc @@ -356,14 +356,13 @@ class PluginInstanceLockTarget : public MouseLockDispatcher::LockTarget { PluginInstanceLockTarget(PepperPluginInstanceImpl* plugin) : plugin_(plugin) {} - virtual void OnLockMouseACK(bool succeeded) override { + void OnLockMouseACK(bool succeeded) override { plugin_->OnLockMouseACK(succeeded); } - virtual void OnMouseLockLost() override { plugin_->OnMouseLockLost(); } + void OnMouseLockLost() override { plugin_->OnMouseLockLost(); } - virtual bool HandleMouseLockedInputEvent(const blink::WebMouseEvent& event) - override { + bool HandleMouseLockedInputEvent(const blink::WebMouseEvent& event) override { plugin_->HandleMouseLockedInputEvent(event); return true; } diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h index 81aa6b9..4b14931 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.h +++ b/content/renderer/pepper/pepper_plugin_instance_impl.h @@ -357,177 +357,160 @@ class CONTENT_EXPORT PepperPluginInstanceImpl ContentDecryptorDelegate* GetContentDecryptorDelegate(); // PluginInstance implementation - virtual RenderView* GetRenderView() override; - virtual blink::WebPluginContainer* GetContainer() override; - virtual v8::Isolate* GetIsolate() const override; - virtual ppapi::VarTracker* GetVarTracker() override; - virtual const GURL& GetPluginURL() override; - virtual base::FilePath GetModulePath() override; - virtual PP_Resource CreateImage(gfx::ImageSkia* source_image, - float scale) override; - virtual PP_ExternalPluginResult SwitchToOutOfProcessProxy( + RenderView* GetRenderView() override; + blink::WebPluginContainer* GetContainer() override; + v8::Isolate* GetIsolate() const override; + ppapi::VarTracker* GetVarTracker() override; + const GURL& GetPluginURL() override; + base::FilePath GetModulePath() override; + PP_Resource CreateImage(gfx::ImageSkia* source_image, float scale) override; + PP_ExternalPluginResult SwitchToOutOfProcessProxy( const base::FilePath& file_path, ppapi::PpapiPermissions permissions, const IPC::ChannelHandle& channel_handle, base::ProcessId plugin_pid, int plugin_child_id) override; - virtual void SetAlwaysOnTop(bool on_top) override; - virtual bool IsFullPagePlugin() override; - virtual bool FlashSetFullscreen(bool fullscreen, bool delay_report) override; - virtual bool IsRectTopmost(const gfx::Rect& rect) override; - virtual int32_t Navigate(const ppapi::URLRequestInfoData& request, - const char* target, - bool from_user_action) override; - virtual int MakePendingFileRefRendererHost(const base::FilePath& path) - override; - virtual void SetEmbedProperty(PP_Var key, PP_Var value) override; - virtual void SetSelectedText(const base::string16& selected_text) override; - virtual void SetLinkUnderCursor(const std::string& url) override; - virtual void SetTextInputType(ui::TextInputType type) override; - virtual void PostMessageToJavaScript(PP_Var message) override; + void SetAlwaysOnTop(bool on_top) override; + bool IsFullPagePlugin() override; + bool FlashSetFullscreen(bool fullscreen, bool delay_report) override; + bool IsRectTopmost(const gfx::Rect& rect) override; + int32_t Navigate(const ppapi::URLRequestInfoData& request, + const char* target, + bool from_user_action) override; + int MakePendingFileRefRendererHost(const base::FilePath& path) override; + void SetEmbedProperty(PP_Var key, PP_Var value) override; + void SetSelectedText(const base::string16& selected_text) override; + void SetLinkUnderCursor(const std::string& url) override; + void SetTextInputType(ui::TextInputType type) override; + void PostMessageToJavaScript(PP_Var message) override; // PPB_Instance_API implementation. - virtual PP_Bool BindGraphics(PP_Instance instance, - PP_Resource device) override; - virtual PP_Bool IsFullFrame(PP_Instance instance) override; - virtual const ppapi::ViewData* GetViewData(PP_Instance instance) override; - virtual PP_Bool FlashIsFullscreen(PP_Instance instance) override; - virtual PP_Var GetWindowObject(PP_Instance instance) override; - virtual PP_Var GetOwnerElementObject(PP_Instance instance) override; - virtual PP_Var ExecuteScript(PP_Instance instance, - PP_Var script, - PP_Var* exception) override; - virtual uint32_t GetAudioHardwareOutputSampleRate(PP_Instance instance) - override; - virtual uint32_t GetAudioHardwareOutputBufferSize(PP_Instance instance) - override; - virtual PP_Var GetDefaultCharSet(PP_Instance instance) override; - virtual void SetPluginToHandleFindRequests(PP_Instance) override; - virtual void NumberOfFindResultsChanged(PP_Instance instance, - int32_t total, - PP_Bool final_result) override; - virtual void SelectedFindResultChanged(PP_Instance instance, - int32_t index) override; - virtual void SetTickmarks(PP_Instance instance, - const PP_Rect* tickmarks, - uint32_t count) override; - virtual PP_Bool IsFullscreen(PP_Instance instance) override; - virtual PP_Bool SetFullscreen(PP_Instance instance, - PP_Bool fullscreen) override; - virtual PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size) override; - virtual ppapi::Resource* GetSingletonResource(PP_Instance instance, - ppapi::SingletonResourceID id) - override; - virtual int32_t RequestInputEvents(PP_Instance instance, - uint32_t event_classes) override; - virtual int32_t RequestFilteringInputEvents(PP_Instance instance, - uint32_t event_classes) override; - virtual void ClearInputEventRequest(PP_Instance instance, + PP_Bool BindGraphics(PP_Instance instance, PP_Resource device) override; + PP_Bool IsFullFrame(PP_Instance instance) override; + const ppapi::ViewData* GetViewData(PP_Instance instance) override; + PP_Bool FlashIsFullscreen(PP_Instance instance) override; + PP_Var GetWindowObject(PP_Instance instance) override; + PP_Var GetOwnerElementObject(PP_Instance instance) override; + PP_Var ExecuteScript(PP_Instance instance, + PP_Var script, + PP_Var* exception) override; + uint32_t GetAudioHardwareOutputSampleRate(PP_Instance instance) override; + uint32_t GetAudioHardwareOutputBufferSize(PP_Instance instance) override; + PP_Var GetDefaultCharSet(PP_Instance instance) override; + void SetPluginToHandleFindRequests(PP_Instance) override; + void NumberOfFindResultsChanged(PP_Instance instance, + int32_t total, + PP_Bool final_result) override; + void SelectedFindResultChanged(PP_Instance instance, int32_t index) override; + void SetTickmarks(PP_Instance instance, + const PP_Rect* tickmarks, + uint32_t count) override; + PP_Bool IsFullscreen(PP_Instance instance) override; + PP_Bool SetFullscreen(PP_Instance instance, PP_Bool fullscreen) override; + PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size) override; + ppapi::Resource* GetSingletonResource(PP_Instance instance, + ppapi::SingletonResourceID id) override; + int32_t RequestInputEvents(PP_Instance instance, + uint32_t event_classes) override; + int32_t RequestFilteringInputEvents(PP_Instance instance, uint32_t event_classes) override; - virtual void StartTrackingLatency(PP_Instance instance) override; - virtual void ZoomChanged(PP_Instance instance, double factor) override; - virtual void ZoomLimitsChanged(PP_Instance instance, - double minimum_factor, - double maximum_factor) override; - virtual void PostMessage(PP_Instance instance, PP_Var message) override; - virtual int32_t RegisterMessageHandler(PP_Instance instance, - void* user_data, - const PPP_MessageHandler_0_2* handler, - PP_Resource message_loop) override; - virtual int32_t RegisterMessageHandler_1_1_Deprecated( + void ClearInputEventRequest(PP_Instance instance, + uint32_t event_classes) override; + void StartTrackingLatency(PP_Instance instance) override; + void ZoomChanged(PP_Instance instance, double factor) override; + void ZoomLimitsChanged(PP_Instance instance, + double minimum_factor, + double maximum_factor) override; + void PostMessage(PP_Instance instance, PP_Var message) override; + int32_t RegisterMessageHandler(PP_Instance instance, + void* user_data, + const PPP_MessageHandler_0_2* handler, + PP_Resource message_loop) override; + int32_t RegisterMessageHandler_1_1_Deprecated( PP_Instance instance, void* user_data, const PPP_MessageHandler_0_1_Deprecated* handler, PP_Resource message_loop) override; - virtual void UnregisterMessageHandler(PP_Instance instance) override; - virtual PP_Bool SetCursor(PP_Instance instance, - PP_MouseCursor_Type type, - PP_Resource image, - const PP_Point* hot_spot) override; - virtual int32_t LockMouse(PP_Instance instance, - scoped_refptr<ppapi::TrackedCallback> callback) - override; - virtual void UnlockMouse(PP_Instance instance) override; - virtual void SetTextInputType(PP_Instance instance, - PP_TextInput_Type type) override; - virtual void UpdateCaretPosition(PP_Instance instance, - const PP_Rect& caret, - const PP_Rect& bounding_box) override; - virtual void CancelCompositionText(PP_Instance instance) override; - virtual void SelectionChanged(PP_Instance instance) override; - virtual void UpdateSurroundingText(PP_Instance instance, - const char* text, - uint32_t caret, - uint32_t anchor) override; - virtual PP_Var ResolveRelativeToDocument(PP_Instance instance, - PP_Var relative, - PP_URLComponents_Dev* components) - override; - virtual PP_Bool DocumentCanRequest(PP_Instance instance, PP_Var url) override; - virtual PP_Bool DocumentCanAccessDocument(PP_Instance instance, - PP_Instance target) override; - virtual PP_Var GetDocumentURL(PP_Instance instance, - PP_URLComponents_Dev* components) override; - virtual PP_Var GetPluginInstanceURL(PP_Instance instance, - PP_URLComponents_Dev* components) - override; - virtual PP_Var GetPluginReferrerURL(PP_Instance instance, - PP_URLComponents_Dev* components) - override; + void UnregisterMessageHandler(PP_Instance instance) override; + PP_Bool SetCursor(PP_Instance instance, + PP_MouseCursor_Type type, + PP_Resource image, + const PP_Point* hot_spot) override; + int32_t LockMouse(PP_Instance instance, + scoped_refptr<ppapi::TrackedCallback> callback) override; + void UnlockMouse(PP_Instance instance) override; + void SetTextInputType(PP_Instance instance, PP_TextInput_Type type) override; + void UpdateCaretPosition(PP_Instance instance, + const PP_Rect& caret, + const PP_Rect& bounding_box) override; + void CancelCompositionText(PP_Instance instance) override; + void SelectionChanged(PP_Instance instance) override; + void UpdateSurroundingText(PP_Instance instance, + const char* text, + uint32_t caret, + uint32_t anchor) override; + PP_Var ResolveRelativeToDocument(PP_Instance instance, + PP_Var relative, + PP_URLComponents_Dev* components) override; + PP_Bool DocumentCanRequest(PP_Instance instance, PP_Var url) override; + PP_Bool DocumentCanAccessDocument(PP_Instance instance, + PP_Instance target) override; + PP_Var GetDocumentURL(PP_Instance instance, + PP_URLComponents_Dev* components) override; + PP_Var GetPluginInstanceURL(PP_Instance instance, + PP_URLComponents_Dev* components) override; + PP_Var GetPluginReferrerURL(PP_Instance instance, + PP_URLComponents_Dev* components) override; // PPB_ContentDecryptor_Private implementation. - virtual void PromiseResolved(PP_Instance instance, - uint32 promise_id) override; - virtual void PromiseResolvedWithSession(PP_Instance instance, - uint32 promise_id, - PP_Var web_session_id_var) override; - virtual void PromiseResolvedWithKeyIds(PP_Instance instance, - uint32 promise_id, - PP_Var key_ids_var) override; - virtual void PromiseRejected(PP_Instance instance, - uint32 promise_id, - PP_CdmExceptionCode exception_code, - uint32 system_code, - PP_Var error_description_var) override; - virtual void SessionMessage(PP_Instance instance, - PP_Var web_session_id_var, - PP_Var message_var, - PP_Var destination_url_var) override; - virtual void SessionKeysChange(PP_Instance instance, - PP_Var web_session_id_var, - PP_Bool has_additional_usable_key) override; - virtual void SessionExpirationChange(PP_Instance instance, - PP_Var web_session_id_var, - PP_Time new_expiry_time) override; - virtual void SessionReady(PP_Instance instance, - PP_Var web_session_id_var) override; - virtual void SessionClosed(PP_Instance instance, - PP_Var web_session_id_var) override; - virtual void SessionError(PP_Instance instance, - PP_Var web_session_id_var, - PP_CdmExceptionCode exception_code, - uint32 system_code, - PP_Var error_description_var) override; - virtual void DeliverBlock(PP_Instance instance, - PP_Resource decrypted_block, - const PP_DecryptedBlockInfo* block_info) override; - virtual void DecoderInitializeDone(PP_Instance instance, - PP_DecryptorStreamType decoder_type, - uint32_t request_id, - PP_Bool success) override; - virtual void DecoderDeinitializeDone(PP_Instance instance, - PP_DecryptorStreamType decoder_type, - uint32_t request_id) override; - virtual void DecoderResetDone(PP_Instance instance, - PP_DecryptorStreamType decoder_type, - uint32_t request_id) override; - virtual void DeliverFrame(PP_Instance instance, - PP_Resource decrypted_frame, - const PP_DecryptedFrameInfo* frame_info) override; - virtual void DeliverSamples(PP_Instance instance, - PP_Resource audio_frames, - const PP_DecryptedSampleInfo* sample_info) - override; + void PromiseResolved(PP_Instance instance, uint32 promise_id) override; + void PromiseResolvedWithSession(PP_Instance instance, + uint32 promise_id, + PP_Var web_session_id_var) override; + void PromiseResolvedWithKeyIds(PP_Instance instance, + uint32 promise_id, + PP_Var key_ids_var) override; + void PromiseRejected(PP_Instance instance, + uint32 promise_id, + PP_CdmExceptionCode exception_code, + uint32 system_code, + PP_Var error_description_var) override; + void SessionMessage(PP_Instance instance, + PP_Var web_session_id_var, + PP_Var message_var, + PP_Var destination_url_var) override; + void SessionKeysChange(PP_Instance instance, + PP_Var web_session_id_var, + PP_Bool has_additional_usable_key) override; + void SessionExpirationChange(PP_Instance instance, + PP_Var web_session_id_var, + PP_Time new_expiry_time) override; + void SessionReady(PP_Instance instance, PP_Var web_session_id_var) override; + void SessionClosed(PP_Instance instance, PP_Var web_session_id_var) override; + void SessionError(PP_Instance instance, + PP_Var web_session_id_var, + PP_CdmExceptionCode exception_code, + uint32 system_code, + PP_Var error_description_var) override; + void DeliverBlock(PP_Instance instance, + PP_Resource decrypted_block, + const PP_DecryptedBlockInfo* block_info) override; + void DecoderInitializeDone(PP_Instance instance, + PP_DecryptorStreamType decoder_type, + uint32_t request_id, + PP_Bool success) override; + void DecoderDeinitializeDone(PP_Instance instance, + PP_DecryptorStreamType decoder_type, + uint32_t request_id) override; + void DecoderResetDone(PP_Instance instance, + PP_DecryptorStreamType decoder_type, + uint32_t request_id) override; + void DeliverFrame(PP_Instance instance, + PP_Resource decrypted_frame, + const PP_DecryptedFrameInfo* frame_info) override; + void DeliverSamples(PP_Instance instance, + PP_Resource audio_frames, + const PP_DecryptedSampleInfo* sample_info) override; // Reset this instance as proxied. Assigns the instance a new module, resets // cached interfaces to point to the out-of-process proxy and re-sends @@ -544,13 +527,13 @@ class CONTENT_EXPORT PepperPluginInstanceImpl bool IsValidInstanceOf(PluginModule* module); // cc::TextureLayerClient implementation. - virtual bool PrepareTextureMailbox( + bool PrepareTextureMailbox( cc::TextureMailbox* mailbox, scoped_ptr<cc::SingleReleaseCallback>* release_callback, bool use_shared_memory) override; // RenderFrameObserver - virtual void OnDestruct() override; + void OnDestruct() override; void AddLatencyInfo(const std::vector<ui::LatencyInfo>& latency_info); @@ -560,7 +543,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl friend class PpapiUnittest; // Delete should be called by the WebPlugin before this destructor. - virtual ~PepperPluginInstanceImpl(); + ~PepperPluginInstanceImpl() override; // Class to record document load notifications and play them back once the // real document loader becomes available. Used only by external instances. @@ -595,12 +578,11 @@ class CONTENT_EXPORT PepperPluginInstanceImpl public: GamepadImpl(); // Resource implementation. - virtual ppapi::thunk::PPB_Gamepad_API* AsPPB_Gamepad_API() override; - virtual void Sample(PP_Instance instance, - PP_GamepadsSampleData* data) override; + ppapi::thunk::PPB_Gamepad_API* AsPPB_Gamepad_API() override; + void Sample(PP_Instance instance, PP_GamepadsSampleData* data) override; private: - virtual ~GamepadImpl(); + ~GamepadImpl() override; }; // See the static Create functions above for creating PepperPluginInstanceImpl diff --git a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.h b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.h index a7e6765..e6b9cd5 100644 --- a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.h +++ b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.h @@ -13,12 +13,12 @@ namespace content { class PepperProxyChannelDelegateImpl : public ppapi::proxy::ProxyChannel::Delegate { public: - virtual ~PepperProxyChannelDelegateImpl(); + ~PepperProxyChannelDelegateImpl() override; // ProxyChannel::Delegate implementation. - virtual base::MessageLoopProxy* GetIPCMessageLoop() override; - virtual base::WaitableEvent* GetShutdownEvent() override; - virtual IPC::PlatformFileForTransit ShareHandleWithRemote( + base::MessageLoopProxy* GetIPCMessageLoop() override; + base::WaitableEvent* GetShutdownEvent() override; + IPC::PlatformFileForTransit ShareHandleWithRemote( base::PlatformFile handle, base::ProcessId remote_pid, bool should_close_source) override; diff --git a/content/renderer/pepper/pepper_try_catch.h b/content/renderer/pepper/pepper_try_catch.h index aa5989f..72d03bf 100644 --- a/content/renderer/pepper/pepper_try_catch.h +++ b/content/renderer/pepper/pepper_try_catch.h @@ -55,16 +55,16 @@ class PepperTryCatchV8 : public PepperTryCatch { PepperTryCatchV8(PepperPluginInstanceImpl* instance, V8VarConverter* var_converter, v8::Isolate* isolate); - virtual ~PepperTryCatchV8(); + ~PepperTryCatchV8() override; bool ThrowException(); void ThrowException(const char* message); PP_Var* exception() { return &exception_; } // PepperTryCatch - virtual void SetException(const char* message) override; - virtual bool HasException() override; - virtual v8::Handle<v8::Context> GetContext() override; + void SetException(const char* message) override; + bool HasException() override; + v8::Handle<v8::Context> GetContext() override; private: PP_Var exception_; @@ -81,12 +81,12 @@ class PepperTryCatchVar : public PepperTryCatch { PepperTryCatchVar(PepperPluginInstanceImpl* instance, V8VarConverter* var_converter, PP_Var* exception); - virtual ~PepperTryCatchVar(); + ~PepperTryCatchVar() override; // PepperTryCatch - virtual void SetException(const char* message) override; - virtual bool HasException() override; - virtual v8::Handle<v8::Context> GetContext() override; + void SetException(const char* message) override; + bool HasException() override; + v8::Handle<v8::Context> GetContext() override; private: // Code which uses PepperTryCatchVar doesn't typically have a HandleScope, diff --git a/content/renderer/pepper/pepper_url_loader_host.h b/content/renderer/pepper/pepper_url_loader_host.h index 7f70239..8a784ef 100644 --- a/content/renderer/pepper/pepper_url_loader_host.h +++ b/content/renderer/pepper/pepper_url_loader_host.h @@ -37,7 +37,7 @@ class PepperURLLoaderHost : public ppapi::host::ResourceHost, virtual ~PepperURLLoaderHost(); // ResourceHost implementation. - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; @@ -65,7 +65,7 @@ class PepperURLLoaderHost : public ppapi::host::ResourceHost, private: // ResourceHost protected overrides. - virtual void DidConnectPendingHostToResource() override; + void DidConnectPendingHostToResource() override; // IPC messages int32_t OnHostMsgOpen(ppapi::host::HostMessageContext* context, diff --git a/content/renderer/pepper/pepper_video_capture_host.h b/content/renderer/pepper/pepper_video_capture_host.h index 38327af..3c5ec12 100644 --- a/content/renderer/pepper/pepper_video_capture_host.h +++ b/content/renderer/pepper/pepper_video_capture_host.h @@ -31,11 +31,11 @@ class PepperVideoCaptureHost : public ppapi::host::ResourceHost { PP_Instance instance, PP_Resource resource); - virtual ~PepperVideoCaptureHost(); + ~PepperVideoCaptureHost() override; bool Init(); - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/renderer/pepper/pepper_video_decoder_host.h b/content/renderer/pepper/pepper_video_decoder_host.h index e7f9ea0..fab65d8 100644 --- a/content/renderer/pepper/pepper_video_decoder_host.h +++ b/content/renderer/pepper/pepper_video_decoder_host.h @@ -37,7 +37,7 @@ class CONTENT_EXPORT PepperVideoDecoderHost PepperVideoDecoderHost(RendererPpapiHost* host, PP_Instance instance, PP_Resource resource); - virtual ~PepperVideoDecoderHost(); + ~PepperVideoDecoderHost() override; private: struct PendingDecode { @@ -52,20 +52,20 @@ class CONTENT_EXPORT PepperVideoDecoderHost friend class VideoDecoderShim; // ResourceHost implementation. - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; // media::VideoDecodeAccelerator::Client implementation. - virtual void ProvidePictureBuffers(uint32 requested_num_of_buffers, - const gfx::Size& dimensions, - uint32 texture_target) override; - virtual void DismissPictureBuffer(int32 picture_buffer_id) override; - virtual void PictureReady(const media::Picture& picture) override; - virtual void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) override; - virtual void NotifyFlushDone() override; - virtual void NotifyResetDone() override; - virtual void NotifyError(media::VideoDecodeAccelerator::Error error) override; + void ProvidePictureBuffers(uint32 requested_num_of_buffers, + const gfx::Size& dimensions, + uint32 texture_target) override; + void DismissPictureBuffer(int32 picture_buffer_id) override; + void PictureReady(const media::Picture& picture) override; + void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) override; + void NotifyFlushDone() override; + void NotifyResetDone() override; + void NotifyError(media::VideoDecodeAccelerator::Error error) override; int32_t OnHostMsgInitialize(ppapi::host::HostMessageContext* context, const ppapi::HostResource& graphics_context, diff --git a/content/renderer/pepper/pepper_video_destination_host.h b/content/renderer/pepper/pepper_video_destination_host.h index 3007bab..c9b5966 100644 --- a/content/renderer/pepper/pepper_video_destination_host.h +++ b/content/renderer/pepper/pepper_video_destination_host.h @@ -26,9 +26,9 @@ class CONTENT_EXPORT PepperVideoDestinationHost PP_Instance instance, PP_Resource resource); - virtual ~PepperVideoDestinationHost(); + ~PepperVideoDestinationHost() override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/renderer/pepper/pepper_video_source_host.h b/content/renderer/pepper/pepper_video_source_host.h index 8a0a9bb..13d7d13 100644 --- a/content/renderer/pepper/pepper_video_source_host.h +++ b/content/renderer/pepper/pepper_video_source_host.h @@ -28,9 +28,9 @@ class CONTENT_EXPORT PepperVideoSourceHost : public ppapi::host::ResourceHost { PP_Instance instance, PP_Resource resource); - virtual ~PepperVideoSourceHost(); + ~PepperVideoSourceHost() override; - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; @@ -43,12 +43,11 @@ class CONTENT_EXPORT PepperVideoSourceHost : public ppapi::host::ResourceHost { explicit FrameReceiver(const base::WeakPtr<PepperVideoSourceHost>& host); // FrameReaderInterface implementation. - virtual void GotFrame(const scoped_refptr<media::VideoFrame>& frame) - override; + void GotFrame(const scoped_refptr<media::VideoFrame>& frame) override; private: friend class base::RefCountedThreadSafe<FrameReceiver>; - virtual ~FrameReceiver(); + ~FrameReceiver() override; base::WeakPtr<PepperVideoSourceHost> host_; // |thread_checker_| is bound to the main render thread. diff --git a/content/renderer/pepper/pepper_websocket_host.h b/content/renderer/pepper/pepper_websocket_host.h index f5137b3..8b8c841 100644 --- a/content/renderer/pepper/pepper_websocket_host.h +++ b/content/renderer/pepper/pepper_websocket_host.h @@ -34,7 +34,7 @@ class CONTENT_EXPORT PepperWebSocketHost PP_Resource resource); virtual ~PepperWebSocketHost(); - virtual int32_t OnResourceMessageReceived( + int32_t OnResourceMessageReceived( const IPC::Message& msg, ppapi::host::HostMessageContext* context) override; diff --git a/content/renderer/pepper/plugin_object.h b/content/renderer/pepper/plugin_object.h index 32860a6..4dec620 100644 --- a/content/renderer/pepper/plugin_object.h +++ b/content/renderer/pepper/plugin_object.h @@ -32,7 +32,7 @@ class PluginObject : public gin::Wrappable<PluginObject>, public: static gin::WrapperInfo kWrapperInfo; - virtual ~PluginObject(); + ~PluginObject() override; // Returns the PluginObject which is contained in the given v8 object, or NULL // if the object isn't backed by a PluginObject. @@ -46,13 +46,12 @@ class PluginObject : public gin::Wrappable<PluginObject>, void* ppp_class_data); // gin::NamedPropertyInterceptor - virtual v8::Local<v8::Value> GetNamedProperty( - v8::Isolate* isolate, - const std::string& property) override; - virtual bool SetNamedProperty(v8::Isolate* isolate, - const std::string& property, - v8::Local<v8::Value> value) override; - virtual std::vector<std::string> EnumerateNamedProperties( + v8::Local<v8::Value> GetNamedProperty(v8::Isolate* isolate, + const std::string& property) override; + bool SetNamedProperty(v8::Isolate* isolate, + const std::string& property, + v8::Local<v8::Value> value) override; + std::vector<std::string> EnumerateNamedProperties( v8::Isolate* isolate) override; const PPP_Class_Deprecated* ppp_class() { return ppp_class_; } @@ -67,7 +66,7 @@ class PluginObject : public gin::Wrappable<PluginObject>, void* ppp_class_data); // gin::Wrappable - virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( + gin::ObjectTemplateBuilder GetObjectTemplateBuilder( v8::Isolate* isolate) override; // Helper method to get named properties. diff --git a/content/renderer/pepper/ppb_audio_impl.h b/content/renderer/pepper/ppb_audio_impl.h index 2712e23..3348527 100644 --- a/content/renderer/pepper/ppb_audio_impl.h +++ b/content/renderer/pepper/ppb_audio_impl.h @@ -33,25 +33,24 @@ class PPB_Audio_Impl : public ppapi::Resource, explicit PPB_Audio_Impl(PP_Instance instance); // Resource overrides. - virtual ppapi::thunk::PPB_Audio_API* AsPPB_Audio_API() override; + ppapi::thunk::PPB_Audio_API* AsPPB_Audio_API() override; // PPB_Audio_API implementation. - virtual PP_Resource GetCurrentConfig() override; - virtual PP_Bool StartPlayback() override; - virtual PP_Bool StopPlayback() override; - virtual int32_t Open(PP_Resource config_id, - scoped_refptr<ppapi::TrackedCallback> create_callback) - override; - virtual int32_t GetSyncSocket(int* sync_socket) override; - virtual int32_t GetSharedMemory(int* shm_handle, uint32_t* shm_size) override; + PP_Resource GetCurrentConfig() override; + PP_Bool StartPlayback() override; + PP_Bool StopPlayback() override; + int32_t Open(PP_Resource config_id, + scoped_refptr<ppapi::TrackedCallback> create_callback) override; + int32_t GetSyncSocket(int* sync_socket) override; + int32_t GetSharedMemory(int* shm_handle, uint32_t* shm_size) override; private: - virtual ~PPB_Audio_Impl(); + ~PPB_Audio_Impl() override; // AudioHelper implementation. - virtual void OnSetStreamInfo(base::SharedMemoryHandle shared_memory_handle, - size_t shared_memory_size_, - base::SyncSocket::Handle socket) override; + void OnSetStreamInfo(base::SharedMemoryHandle shared_memory_handle, + size_t shared_memory_size_, + base::SyncSocket::Handle socket) override; // AudioConfig used for creating this Audio object. We own a ref. ppapi::ScopedPPResource config_; diff --git a/content/renderer/pepper/ppb_broker_impl.h b/content/renderer/pepper/ppb_broker_impl.h index 4b5e777..0f74855 100644 --- a/content/renderer/pepper/ppb_broker_impl.h +++ b/content/renderer/pepper/ppb_broker_impl.h @@ -33,12 +33,12 @@ class PPB_Broker_Impl : public ppapi::Resource, explicit PPB_Broker_Impl(PP_Instance instance); // Resource override. - virtual ppapi::thunk::PPB_Broker_API* AsPPB_Broker_API() override; + ppapi::thunk::PPB_Broker_API* AsPPB_Broker_API() override; // PPB_BrokerTrusted implementation. - virtual int32_t Connect( + int32_t Connect( scoped_refptr<ppapi::TrackedCallback> connect_callback) override; - virtual int32_t GetHandle(int32_t* handle) override; + int32_t GetHandle(int32_t* handle) override; // Returns the URL of the document this plug-in runs in. This is necessary to // decide whether to grant access to the PPAPI broker. @@ -47,10 +47,10 @@ class PPB_Broker_Impl : public ppapi::Resource, void BrokerConnected(int32_t handle, int32_t result); private: - virtual ~PPB_Broker_Impl(); + ~PPB_Broker_Impl() override; // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; void OnPpapiBrokerChannelCreated(base::ProcessId broker_pid, const IPC::ChannelHandle& handle); diff --git a/content/renderer/pepper/ppb_buffer_impl.h b/content/renderer/pepper/ppb_buffer_impl.h index b2c316b..b206780 100644 --- a/content/renderer/pepper/ppb_buffer_impl.h +++ b/content/renderer/pepper/ppb_buffer_impl.h @@ -27,19 +27,19 @@ class PPB_Buffer_Impl : public ppapi::Resource, uint32_t size() const { return size_; } // Resource overrides. - virtual ppapi::thunk::PPB_Buffer_API* AsPPB_Buffer_API() override; + ppapi::thunk::PPB_Buffer_API* AsPPB_Buffer_API() override; // PPB_Buffer_API implementation. - virtual PP_Bool Describe(uint32_t* size_in_bytes) override; - virtual PP_Bool IsMapped() override; - virtual void* Map() override; - virtual void Unmap() override; + PP_Bool Describe(uint32_t* size_in_bytes) override; + PP_Bool IsMapped() override; + void* Map() override; + void Unmap() override; // Trusted. - virtual int32_t GetSharedMemory(int* handle) override; + int32_t GetSharedMemory(int* handle) override; private: - virtual ~PPB_Buffer_Impl(); + ~PPB_Buffer_Impl() override; explicit PPB_Buffer_Impl(PP_Instance instance); bool Init(uint32_t size); diff --git a/content/renderer/pepper/ppb_flash_message_loop_impl.h b/content/renderer/pepper/ppb_flash_message_loop_impl.h index a33f351..29c4e1b 100644 --- a/content/renderer/pepper/ppb_flash_message_loop_impl.h +++ b/content/renderer/pepper/ppb_flash_message_loop_impl.h @@ -20,20 +20,19 @@ class PPB_Flash_MessageLoop_Impl static PP_Resource Create(PP_Instance instance); // Resource. - virtual ppapi::thunk::PPB_Flash_MessageLoop_API* AsPPB_Flash_MessageLoop_API() + ppapi::thunk::PPB_Flash_MessageLoop_API* AsPPB_Flash_MessageLoop_API() override; // PPB_Flash_MessageLoop_API implementation. - virtual int32_t Run() override; - virtual void Quit() override; - virtual void RunFromHostProxy(const RunFromHostProxyCallback& callback) - override; + int32_t Run() override; + void Quit() override; + void RunFromHostProxy(const RunFromHostProxyCallback& callback) override; private: class State; explicit PPB_Flash_MessageLoop_Impl(PP_Instance instance); - virtual ~PPB_Flash_MessageLoop_Impl(); + ~PPB_Flash_MessageLoop_Impl() override; // If |callback| is valid, it will be called when the message loop is signaled // to quit, and the result passed into it will be the same value as what this diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.h b/content/renderer/pepper/ppb_graphics_3d_impl.h index 0842456..ee9b2b0 100644 --- a/content/renderer/pepper/ppb_graphics_3d_impl.h +++ b/content/renderer/pepper/ppb_graphics_3d_impl.h @@ -27,19 +27,18 @@ class PPB_Graphics3D_Impl : public ppapi::PPB_Graphics3D_Shared { base::SharedMemoryHandle* shared_state_handle); // PPB_Graphics3D_API trusted implementation. - virtual PP_Bool SetGetBuffer(int32_t transfer_buffer_id) override; - virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size, - int32* id) override; - virtual PP_Bool DestroyTransferBuffer(int32_t id) override; - virtual PP_Bool Flush(int32_t put_offset) override; - virtual gpu::CommandBuffer::State WaitForTokenInRange(int32_t start, - int32_t end) override; - virtual gpu::CommandBuffer::State WaitForGetOffsetInRange(int32_t start, - int32_t end) - override; - virtual uint32_t InsertSyncPoint() override; - virtual uint32_t InsertFutureSyncPoint() override; - virtual void RetireSyncPoint(uint32_t) override; + PP_Bool SetGetBuffer(int32_t transfer_buffer_id) override; + scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size, + int32* id) override; + PP_Bool DestroyTransferBuffer(int32_t id) override; + PP_Bool Flush(int32_t put_offset) override; + gpu::CommandBuffer::State WaitForTokenInRange(int32_t start, + int32_t end) override; + gpu::CommandBuffer::State WaitForGetOffsetInRange(int32_t start, + int32_t end) override; + uint32_t InsertSyncPoint() override; + uint32_t InsertFutureSyncPoint() override; + void RetireSyncPoint(uint32_t) override; // Binds/unbinds the graphics of this context with the associated instance. // Returns true if binding/unbinding is successful. @@ -63,11 +62,11 @@ class PPB_Graphics3D_Impl : public ppapi::PPB_Graphics3D_Shared { GpuChannelHost* channel() { return channel_.get(); } protected: - virtual ~PPB_Graphics3D_Impl(); + ~PPB_Graphics3D_Impl() override; // ppapi::PPB_Graphics3D_Shared overrides. - virtual gpu::CommandBuffer* GetCommandBuffer() override; - virtual gpu::GpuControl* GetGpuControl() override; - virtual int32 DoSwapBuffers() override; + gpu::CommandBuffer* GetCommandBuffer() override; + gpu::GpuControl* GetGpuControl() override; + int32 DoSwapBuffers() override; private: explicit PPB_Graphics3D_Impl(PP_Instance instance); diff --git a/content/renderer/pepper/ppb_image_data_impl.h b/content/renderer/pepper/ppb_image_data_impl.h index 5ea6c38..61f2b70 100644 --- a/content/renderer/pepper/ppb_image_data_impl.h +++ b/content/renderer/pepper/ppb_image_data_impl.h @@ -84,21 +84,21 @@ class CONTENT_EXPORT PPB_ImageData_Impl TransportDIB* GetTransportDIB() const; // Resource override. - virtual ppapi::thunk::PPB_ImageData_API* AsPPB_ImageData_API() override; + ppapi::thunk::PPB_ImageData_API* AsPPB_ImageData_API() override; // PPB_ImageData_API implementation. - virtual PP_Bool Describe(PP_ImageDataDesc* desc) override; - virtual void* Map() override; - virtual void Unmap() override; - virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) override; - virtual SkCanvas* GetPlatformCanvas() override; - virtual SkCanvas* GetCanvas() override; - virtual void SetIsCandidateForReuse() override; + PP_Bool Describe(PP_ImageDataDesc* desc) override; + void* Map() override; + void Unmap() override; + int32_t GetSharedMemory(int* handle, uint32_t* byte_count) override; + SkCanvas* GetPlatformCanvas() override; + SkCanvas* GetCanvas() override; + void SetIsCandidateForReuse() override; const SkBitmap* GetMappedBitmap() const; private: - virtual ~PPB_ImageData_Impl(); + ~PPB_ImageData_Impl() override; PP_ImageDataFormat format_; int width_; @@ -113,22 +113,22 @@ class ImageDataPlatformBackend : public PPB_ImageData_Impl::Backend { // |is_browser_allocated| indicates whether the backing shared memory should // be allocated by the browser process. ImageDataPlatformBackend(bool is_browser_allocated); - virtual ~ImageDataPlatformBackend(); + ~ImageDataPlatformBackend() override; // PPB_ImageData_Impl::Backend implementation. - virtual bool Init(PPB_ImageData_Impl* impl, - PP_ImageDataFormat format, - int width, - int height, - bool init_to_zero) override; - virtual bool IsMapped() const override; - virtual TransportDIB* GetTransportDIB() const override; - virtual void* Map() override; - virtual void Unmap() override; - virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) override; - virtual SkCanvas* GetPlatformCanvas() override; - virtual SkCanvas* GetCanvas() override; - virtual const SkBitmap* GetMappedBitmap() const override; + bool Init(PPB_ImageData_Impl* impl, + PP_ImageDataFormat format, + int width, + int height, + bool init_to_zero) override; + bool IsMapped() const override; + TransportDIB* GetTransportDIB() const override; + void* Map() override; + void Unmap() override; + int32_t GetSharedMemory(int* handle, uint32_t* byte_count) override; + SkCanvas* GetPlatformCanvas() override; + SkCanvas* GetCanvas() override; + const SkBitmap* GetMappedBitmap() const override; private: // This will be NULL before initialization, and if this PPB_ImageData_Impl is @@ -148,22 +148,22 @@ class ImageDataPlatformBackend : public PPB_ImageData_Impl::Backend { class ImageDataSimpleBackend : public PPB_ImageData_Impl::Backend { public: ImageDataSimpleBackend(); - virtual ~ImageDataSimpleBackend(); + ~ImageDataSimpleBackend() override; // PPB_ImageData_Impl::Backend implementation. - virtual bool Init(PPB_ImageData_Impl* impl, - PP_ImageDataFormat format, - int width, - int height, - bool init_to_zero) override; - virtual bool IsMapped() const override; - virtual TransportDIB* GetTransportDIB() const override; - virtual void* Map() override; - virtual void Unmap() override; - virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) override; - virtual SkCanvas* GetPlatformCanvas() override; - virtual SkCanvas* GetCanvas() override; - virtual const SkBitmap* GetMappedBitmap() const override; + bool Init(PPB_ImageData_Impl* impl, + PP_ImageDataFormat format, + int width, + int height, + bool init_to_zero) override; + bool IsMapped() const override; + TransportDIB* GetTransportDIB() const override; + void* Map() override; + void Unmap() override; + int32_t GetSharedMemory(int* handle, uint32_t* byte_count) override; + SkCanvas* GetPlatformCanvas() override; + SkCanvas* GetCanvas() override; + const SkBitmap* GetMappedBitmap() const override; private: scoped_ptr<base::SharedMemory> shared_memory_; diff --git a/content/renderer/pepper/ppb_scrollbar_impl.h b/content/renderer/pepper/ppb_scrollbar_impl.h index d78c586..3c94ad8 100644 --- a/content/renderer/pepper/ppb_scrollbar_impl.h +++ b/content/renderer/pepper/ppb_scrollbar_impl.h @@ -25,30 +25,29 @@ class PPB_Scrollbar_Impl : public PPB_Widget_Impl, static PP_Resource Create(PP_Instance instance, bool vertical); // Resource overrides. - virtual PPB_Scrollbar_API* AsPPB_Scrollbar_API() override; - virtual void InstanceWasDeleted() override; + PPB_Scrollbar_API* AsPPB_Scrollbar_API() override; + void InstanceWasDeleted() override; // PPB_Scrollbar_API implementation. - virtual uint32_t GetThickness() override; - virtual bool IsOverlay() override; - virtual uint32_t GetValue() override; - virtual void SetValue(uint32_t value) override; - virtual void SetDocumentSize(uint32_t size) override; - virtual void SetTickMarks(const PP_Rect* tick_marks, uint32_t count) override; - virtual void ScrollBy(PP_ScrollBy_Dev unit, int32_t multiplier) override; + uint32_t GetThickness() override; + bool IsOverlay() override; + uint32_t GetValue() override; + void SetValue(uint32_t value) override; + void SetDocumentSize(uint32_t size) override; + void SetTickMarks(const PP_Rect* tick_marks, uint32_t count) override; + void ScrollBy(PP_ScrollBy_Dev unit, int32_t multiplier) override; private: - virtual ~PPB_Scrollbar_Impl(); + ~PPB_Scrollbar_Impl() override; explicit PPB_Scrollbar_Impl(PP_Instance instance); void Init(bool vertical); // PPB_Widget private implementation. - virtual PP_Bool PaintInternal(const gfx::Rect& rect, - PPB_ImageData_Impl* image) override; - virtual PP_Bool HandleEventInternal(const ppapi::InputEventData& data) - override; - virtual void SetLocationInternal(const PP_Rect* location) override; + PP_Bool PaintInternal(const gfx::Rect& rect, + PPB_ImageData_Impl* image) override; + PP_Bool HandleEventInternal(const ppapi::InputEventData& data) override; + void SetLocationInternal(const PP_Rect* location) override; // blink::WebPluginScrollbarClient implementation. virtual void valueChanged(blink::WebPluginScrollbar* scrollbar) override; diff --git a/content/renderer/pepper/ppb_video_decoder_impl.h b/content/renderer/pepper/ppb_video_decoder_impl.h index 6fdd36a..e3037b9 100644 --- a/content/renderer/pepper/ppb_video_decoder_impl.h +++ b/content/renderer/pepper/ppb_video_decoder_impl.h @@ -32,32 +32,28 @@ class PPB_VideoDecoder_Impl : public ppapi::PPB_VideoDecoder_Shared, PP_VideoDecoder_Profile profile); // PPB_VideoDecoder_Dev_API implementation. - virtual int32_t Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer, - scoped_refptr<ppapi::TrackedCallback> callback) - override; - virtual void AssignPictureBuffers(uint32_t no_of_buffers, - const PP_PictureBuffer_Dev* buffers) - override; - virtual void ReusePictureBuffer(int32_t picture_buffer_id) override; - virtual int32_t Flush(scoped_refptr<ppapi::TrackedCallback> callback) - override; - virtual int32_t Reset(scoped_refptr<ppapi::TrackedCallback> callback) - override; - virtual void Destroy() override; + int32_t Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer, + scoped_refptr<ppapi::TrackedCallback> callback) override; + void AssignPictureBuffers(uint32_t no_of_buffers, + const PP_PictureBuffer_Dev* buffers) override; + void ReusePictureBuffer(int32_t picture_buffer_id) override; + int32_t Flush(scoped_refptr<ppapi::TrackedCallback> callback) override; + int32_t Reset(scoped_refptr<ppapi::TrackedCallback> callback) override; + void Destroy() override; // media::VideoDecodeAccelerator::Client implementation. - virtual void ProvidePictureBuffers(uint32 requested_num_of_buffers, - const gfx::Size& dimensions, - uint32 texture_target) override; - virtual void DismissPictureBuffer(int32 picture_buffer_id) override; - virtual void PictureReady(const media::Picture& picture) override; - virtual void NotifyError(media::VideoDecodeAccelerator::Error error) override; - virtual void NotifyFlushDone() override; - virtual void NotifyEndOfBitstreamBuffer(int32 buffer_id) override; - virtual void NotifyResetDone() override; + void ProvidePictureBuffers(uint32 requested_num_of_buffers, + const gfx::Size& dimensions, + uint32 texture_target) override; + void DismissPictureBuffer(int32 picture_buffer_id) override; + void PictureReady(const media::Picture& picture) override; + void NotifyError(media::VideoDecodeAccelerator::Error error) override; + void NotifyFlushDone() override; + void NotifyEndOfBitstreamBuffer(int32 buffer_id) override; + void NotifyResetDone() override; private: - virtual ~PPB_VideoDecoder_Impl(); + ~PPB_VideoDecoder_Impl() override; explicit PPB_VideoDecoder_Impl(PP_Instance instance); bool Init(PP_Resource graphics_context, diff --git a/content/renderer/pepper/ppb_widget_impl.h b/content/renderer/pepper/ppb_widget_impl.h index f8f0262..001b96f 100644 --- a/content/renderer/pepper/ppb_widget_impl.h +++ b/content/renderer/pepper/ppb_widget_impl.h @@ -28,20 +28,20 @@ class PPB_Widget_Impl : public ppapi::Resource, explicit PPB_Widget_Impl(PP_Instance instance); // Resource overrides. - virtual ppapi::thunk::PPB_Widget_API* AsPPB_Widget_API() override; + ppapi::thunk::PPB_Widget_API* AsPPB_Widget_API() override; // PPB_WidgetAPI implementation. - virtual PP_Bool Paint(const PP_Rect* rect, PP_Resource) override; - virtual PP_Bool HandleEvent(PP_Resource pp_input_event) override; - virtual PP_Bool GetLocation(PP_Rect* location) override; - virtual void SetLocation(const PP_Rect* location) override; - virtual void SetScale(float scale) override; + PP_Bool Paint(const PP_Rect* rect, PP_Resource) override; + PP_Bool HandleEvent(PP_Resource pp_input_event) override; + PP_Bool GetLocation(PP_Rect* location) override; + void SetLocation(const PP_Rect* location) override; + void SetScale(float scale) override; // Notifies the plugin instance that the given rect needs to be repainted. void Invalidate(const PP_Rect* dirty); protected: - virtual ~PPB_Widget_Impl(); + ~PPB_Widget_Impl() override; virtual PP_Bool PaintInternal(const gfx::Rect& rect, PPB_ImageData_Impl* image) = 0; diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.h b/content/renderer/pepper/renderer_ppapi_host_impl.h index dbca882..f8f7aac 100644 --- a/content/renderer/pepper/renderer_ppapi_host_impl.h +++ b/content/renderer/pepper/renderer_ppapi_host_impl.h @@ -36,7 +36,7 @@ class PluginModule; // This class is attached to a PluginModule which manages our lifetime. class RendererPpapiHostImpl : public RendererPpapiHost { public: - virtual ~RendererPpapiHostImpl(); + ~RendererPpapiHostImpl() override; // Factory functions to create in process or out-of-process host impls. The // host will be created and associated with the given module, which must not @@ -76,34 +76,30 @@ class RendererPpapiHostImpl : public RendererPpapiHost { bool IsExternalPluginHost() const; // RendererPpapiHost implementation. - virtual ppapi::host::PpapiHost* GetPpapiHost() override; - virtual bool IsValidInstance(PP_Instance instance) const override; - virtual PepperPluginInstance* GetPluginInstance(PP_Instance instance) const - override; - virtual RenderFrame* GetRenderFrameForInstance(PP_Instance instance) const - override; - virtual RenderView* GetRenderViewForInstance(PP_Instance instance) const - override; - virtual blink::WebPluginContainer* GetContainerForInstance( + ppapi::host::PpapiHost* GetPpapiHost() override; + bool IsValidInstance(PP_Instance instance) const override; + PepperPluginInstance* GetPluginInstance(PP_Instance instance) const override; + RenderFrame* GetRenderFrameForInstance(PP_Instance instance) const override; + RenderView* GetRenderViewForInstance(PP_Instance instance) const override; + blink::WebPluginContainer* GetContainerForInstance( PP_Instance instance) const override; - virtual base::ProcessId GetPluginPID() const override; - virtual bool HasUserGesture(PP_Instance instance) const override; - virtual int GetRoutingIDForWidget(PP_Instance instance) const override; - virtual gfx::Point PluginPointToRenderFrame(PP_Instance instance, - const gfx::Point& pt) const - override; - virtual IPC::PlatformFileForTransit ShareHandleWithRemote( + base::ProcessId GetPluginPID() const override; + bool HasUserGesture(PP_Instance instance) const override; + int GetRoutingIDForWidget(PP_Instance instance) const override; + gfx::Point PluginPointToRenderFrame(PP_Instance instance, + const gfx::Point& pt) const override; + IPC::PlatformFileForTransit ShareHandleWithRemote( base::PlatformFile handle, bool should_close_source) override; - virtual bool IsRunningInProcess() const override; - virtual std::string GetPluginName() const override; - virtual void SetToExternalPluginHost() override; - virtual void CreateBrowserResourceHosts( + bool IsRunningInProcess() const override; + std::string GetPluginName() const override; + void SetToExternalPluginHost() override; + void CreateBrowserResourceHosts( PP_Instance instance, const std::vector<IPC::Message>& nested_msgs, - const base::Callback<void(const std::vector<int>&)>& callback) const - override; - virtual GURL GetDocumentURL(PP_Instance instance) const override; + const base::Callback<void(const std::vector<int>&)>& callback) + const override; + GURL GetDocumentURL(PP_Instance instance) const override; private: RendererPpapiHostImpl(PluginModule* module, diff --git a/content/renderer/pepper/resource_converter.h b/content/renderer/pepper/resource_converter.h index a902cfd..d669e74 100644 --- a/content/renderer/pepper/resource_converter.h +++ b/content/renderer/pepper/resource_converter.h @@ -64,19 +64,19 @@ class CONTENT_EXPORT ResourceConverter { class ResourceConverterImpl : public ResourceConverter { public: explicit ResourceConverterImpl(PP_Instance instance); - virtual ~ResourceConverterImpl(); + ~ResourceConverterImpl() override; // ResourceConverter overrides. - virtual void Reset() override; - virtual bool NeedsFlush() override; - virtual void Flush(const base::Callback<void(bool)>& callback) override; - virtual bool FromV8Value(v8::Handle<v8::Object> val, - v8::Handle<v8::Context> context, - PP_Var* result, - bool* was_resource) override; - virtual bool ToV8Value(const PP_Var& var, - v8::Handle<v8::Context> context, - v8::Handle<v8::Value>* result) override; + void Reset() override; + bool NeedsFlush() override; + void Flush(const base::Callback<void(bool)>& callback) override; + bool FromV8Value(v8::Handle<v8::Object> val, + v8::Handle<v8::Context> context, + PP_Var* result, + bool* was_resource) override; + bool ToV8Value(const PP_Var& var, + v8::Handle<v8::Context> context, + v8::Handle<v8::Value>* result) override; private: // Creates a resource var with the given |pending_renderer_id| and diff --git a/content/renderer/pepper/resource_creation_impl.h b/content/renderer/pepper/resource_creation_impl.h index d96b136..d1884b9 100644 --- a/content/renderer/pepper/resource_creation_impl.h +++ b/content/renderer/pepper/resource_creation_impl.h @@ -20,130 +20,120 @@ class PepperPluginInstanceImpl; class ResourceCreationImpl : public ppapi::thunk::ResourceCreationAPI { public: explicit ResourceCreationImpl(PepperPluginInstanceImpl* instance); - virtual ~ResourceCreationImpl(); + ~ResourceCreationImpl() override; // ResourceCreationAPI implementation. - virtual PP_Resource CreateAudio1_0(PP_Instance instance, - PP_Resource config_id, - PPB_Audio_Callback_1_0 audio_callback, - void* user_data) override; - virtual PP_Resource CreateAudio(PP_Instance instance, - PP_Resource config_id, - PPB_Audio_Callback audio_callback, - void* user_data) override; - virtual PP_Resource CreateAudioTrusted(PP_Instance instance) override; - virtual PP_Resource CreateAudioConfig(PP_Instance instance, - PP_AudioSampleRate sample_rate, - uint32_t sample_frame_count) override; - virtual PP_Resource CreateAudioInput(PP_Instance instance) override; - virtual PP_Resource CreateCompositor(PP_Instance instance) override; - virtual PP_Resource CreateBroker(PP_Instance instance) override; - virtual PP_Resource CreateBuffer(PP_Instance instance, - uint32_t size) override; - virtual PP_Resource CreateFlashDRM(PP_Instance instance) override; - virtual PP_Resource CreateFlashFontFile( + PP_Resource CreateAudio1_0(PP_Instance instance, + PP_Resource config_id, + PPB_Audio_Callback_1_0 audio_callback, + void* user_data) override; + PP_Resource CreateAudio(PP_Instance instance, + PP_Resource config_id, + PPB_Audio_Callback audio_callback, + void* user_data) override; + PP_Resource CreateAudioTrusted(PP_Instance instance) override; + PP_Resource CreateAudioConfig(PP_Instance instance, + PP_AudioSampleRate sample_rate, + uint32_t sample_frame_count) override; + PP_Resource CreateAudioInput(PP_Instance instance) override; + PP_Resource CreateCompositor(PP_Instance instance) override; + PP_Resource CreateBroker(PP_Instance instance) override; + PP_Resource CreateBuffer(PP_Instance instance, uint32_t size) override; + PP_Resource CreateFlashDRM(PP_Instance instance) override; + PP_Resource CreateFlashFontFile( PP_Instance instance, const PP_BrowserFont_Trusted_Description* description, PP_PrivateFontCharset charset) override; - virtual PP_Resource CreateFlashMenu(PP_Instance instance, - const PP_Flash_Menu* menu_data) override; - virtual PP_Resource CreateFlashMessageLoop(PP_Instance instance) override; - virtual PP_Resource CreateGraphics3D(PP_Instance instance, - PP_Resource share_context, - const int32_t* attrib_list) override; - virtual PP_Resource CreateGraphics3DRaw( + PP_Resource CreateFlashMenu(PP_Instance instance, + const PP_Flash_Menu* menu_data) override; + PP_Resource CreateFlashMessageLoop(PP_Instance instance) override; + PP_Resource CreateGraphics3D(PP_Instance instance, + PP_Resource share_context, + const int32_t* attrib_list) override; + PP_Resource CreateGraphics3DRaw( PP_Instance instance, PP_Resource share_context, const int32_t* attrib_list, base::SharedMemoryHandle* shared_state) override; - virtual PP_Resource CreateHostResolver(PP_Instance instance) override; - virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) override; - virtual PP_Resource CreateImageData(PP_Instance instance, - PP_ImageDataFormat format, - const PP_Size* size, - PP_Bool init_to_zero) override; - virtual PP_Resource CreateImageDataSimple(PP_Instance instance, - PP_ImageDataFormat format, - const PP_Size* size, - PP_Bool init_to_zero) override; - virtual PP_Resource CreateIMEInputEvent(PP_Instance instance, - PP_InputEvent_Type type, - PP_TimeTicks time_stamp, - struct PP_Var text, - uint32_t segment_number, - const uint32_t* segment_offsets, - int32_t target_segment, - uint32_t selection_start, - uint32_t selection_end) override; - virtual PP_Resource CreateKeyboardInputEvent_1_0(PP_Instance instance, - PP_InputEvent_Type type, - PP_TimeTicks time_stamp, - uint32_t modifiers, - uint32_t key_code, - PP_Var character_text) - override; - virtual PP_Resource CreateKeyboardInputEvent_1_2(PP_Instance instance, - PP_InputEvent_Type type, - PP_TimeTicks time_stamp, - uint32_t modifiers, - uint32_t key_code, - PP_Var character_text, - PP_Var code) override; - virtual PP_Resource CreateMediaStreamVideoTrack( - PP_Instance instance) override; - virtual PP_Resource CreateMouseInputEvent( - PP_Instance instance, - PP_InputEvent_Type type, - PP_TimeTicks time_stamp, - uint32_t modifiers, - PP_InputEvent_MouseButton mouse_button, - const PP_Point* mouse_position, - int32_t click_count, - const PP_Point* mouse_movement) override; - virtual PP_Resource CreateNetAddressFromIPv4Address( + PP_Resource CreateHostResolver(PP_Instance instance) override; + PP_Resource CreateHostResolverPrivate(PP_Instance instance) override; + PP_Resource CreateImageData(PP_Instance instance, + PP_ImageDataFormat format, + const PP_Size* size, + PP_Bool init_to_zero) override; + PP_Resource CreateImageDataSimple(PP_Instance instance, + PP_ImageDataFormat format, + const PP_Size* size, + PP_Bool init_to_zero) override; + PP_Resource CreateIMEInputEvent(PP_Instance instance, + PP_InputEvent_Type type, + PP_TimeTicks time_stamp, + struct PP_Var text, + uint32_t segment_number, + const uint32_t* segment_offsets, + int32_t target_segment, + uint32_t selection_start, + uint32_t selection_end) override; + PP_Resource CreateKeyboardInputEvent_1_0(PP_Instance instance, + PP_InputEvent_Type type, + PP_TimeTicks time_stamp, + uint32_t modifiers, + uint32_t key_code, + PP_Var character_text) override; + PP_Resource CreateKeyboardInputEvent_1_2(PP_Instance instance, + PP_InputEvent_Type type, + PP_TimeTicks time_stamp, + uint32_t modifiers, + uint32_t key_code, + PP_Var character_text, + PP_Var code) override; + PP_Resource CreateMediaStreamVideoTrack(PP_Instance instance) override; + PP_Resource CreateMouseInputEvent(PP_Instance instance, + PP_InputEvent_Type type, + PP_TimeTicks time_stamp, + uint32_t modifiers, + PP_InputEvent_MouseButton mouse_button, + const PP_Point* mouse_position, + int32_t click_count, + const PP_Point* mouse_movement) override; + PP_Resource CreateNetAddressFromIPv4Address( PP_Instance instance, const PP_NetAddress_IPv4* ipv4_addr) override; - virtual PP_Resource CreateNetAddressFromIPv6Address( + PP_Resource CreateNetAddressFromIPv6Address( PP_Instance instance, const PP_NetAddress_IPv6* ipv6_addr) override; - virtual PP_Resource CreateNetAddressFromNetAddressPrivate( + PP_Resource CreateNetAddressFromNetAddressPrivate( PP_Instance instance, const PP_NetAddress_Private& private_addr) override; - virtual PP_Resource CreateNetworkMonitor(PP_Instance instance) override; - virtual PP_Resource CreatePlatformVerificationPrivate(PP_Instance instance) - override; - virtual PP_Resource CreateScrollbar(PP_Instance instance, - PP_Bool vertical) override; - virtual PP_Resource CreateOutputProtectionPrivate(PP_Instance instance) - override; - virtual PP_Resource CreateTalk(PP_Instance instance) override; - virtual PP_Resource CreateTCPServerSocketPrivate(PP_Instance instance) - override; - virtual PP_Resource CreateTCPSocket1_0(PP_Instance instance) override; - virtual PP_Resource CreateTCPSocket(PP_Instance instance) override; - virtual PP_Resource CreateTCPSocketPrivate(PP_Instance instance) override; - virtual PP_Resource CreateTouchInputEvent(PP_Instance instance, - PP_InputEvent_Type type, - PP_TimeTicks time_stamp, - uint32_t modifiers) override; - virtual PP_Resource CreateUDPSocket(PP_Instance instance) override; - virtual PP_Resource CreateUDPSocketPrivate(PP_Instance instance) override; - virtual PP_Resource CreateVideoCapture(PP_Instance instance) override; - virtual PP_Resource CreateVideoDecoder(PP_Instance instance) override; - virtual PP_Resource CreateVideoDecoderDev(PP_Instance instance, - PP_Resource graphics3d_id, - PP_VideoDecoder_Profile profile) - override; - virtual PP_Resource CreateVideoDestination(PP_Instance instance) override; - virtual PP_Resource CreateVideoSource(PP_Instance instance) override; - virtual PP_Resource CreateWheelInputEvent(PP_Instance instance, - PP_TimeTicks time_stamp, - uint32_t modifiers, - const PP_FloatPoint* wheel_delta, - const PP_FloatPoint* wheel_ticks, - PP_Bool scroll_by_page) override; - virtual PP_Resource CreateX509CertificatePrivate(PP_Instance instance) - override; + PP_Resource CreateNetworkMonitor(PP_Instance instance) override; + PP_Resource CreatePlatformVerificationPrivate(PP_Instance instance) override; + PP_Resource CreateScrollbar(PP_Instance instance, PP_Bool vertical) override; + PP_Resource CreateOutputProtectionPrivate(PP_Instance instance) override; + PP_Resource CreateTalk(PP_Instance instance) override; + PP_Resource CreateTCPServerSocketPrivate(PP_Instance instance) override; + PP_Resource CreateTCPSocket1_0(PP_Instance instance) override; + PP_Resource CreateTCPSocket(PP_Instance instance) override; + PP_Resource CreateTCPSocketPrivate(PP_Instance instance) override; + PP_Resource CreateTouchInputEvent(PP_Instance instance, + PP_InputEvent_Type type, + PP_TimeTicks time_stamp, + uint32_t modifiers) override; + PP_Resource CreateUDPSocket(PP_Instance instance) override; + PP_Resource CreateUDPSocketPrivate(PP_Instance instance) override; + PP_Resource CreateVideoCapture(PP_Instance instance) override; + PP_Resource CreateVideoDecoder(PP_Instance instance) override; + PP_Resource CreateVideoDecoderDev(PP_Instance instance, + PP_Resource graphics3d_id, + PP_VideoDecoder_Profile profile) override; + PP_Resource CreateVideoDestination(PP_Instance instance) override; + PP_Resource CreateVideoSource(PP_Instance instance) override; + PP_Resource CreateWheelInputEvent(PP_Instance instance, + PP_TimeTicks time_stamp, + uint32_t modifiers, + const PP_FloatPoint* wheel_delta, + const PP_FloatPoint* wheel_ticks, + PP_Bool scroll_by_page) override; + PP_Resource CreateX509CertificatePrivate(PP_Instance instance) override; private: DISALLOW_COPY_AND_ASSIGN(ResourceCreationImpl); diff --git a/content/renderer/pepper/v8_var_converter_unittest.cc b/content/renderer/pepper/v8_var_converter_unittest.cc index d935658..8361dd8 100644 --- a/content/renderer/pepper/v8_var_converter_unittest.cc +++ b/content/renderer/pepper/v8_var_converter_unittest.cc @@ -50,22 +50,22 @@ void FromV8ValueComplete(const ScopedPPVar& scoped_var, class MockResourceConverter : public content::ResourceConverter { public: - virtual ~MockResourceConverter() {} - virtual void Reset() override {} - virtual bool NeedsFlush() override { return false; } - virtual void Flush(const base::Callback<void(bool)>& callback) override { + ~MockResourceConverter() override {} + void Reset() override {} + bool NeedsFlush() override { return false; } + void Flush(const base::Callback<void(bool)>& callback) override { NOTREACHED(); } - virtual bool FromV8Value(v8::Handle<v8::Object> val, - v8::Handle<v8::Context> context, - PP_Var* result, - bool* was_resource) override { + bool FromV8Value(v8::Handle<v8::Object> val, + v8::Handle<v8::Context> context, + PP_Var* result, + bool* was_resource) override { *was_resource = false; return true; } - virtual bool ToV8Value(const PP_Var& var, - v8::Handle<v8::Context> context, - v8::Handle<v8::Value>* result) override { + bool ToV8Value(const PP_Var& var, + v8::Handle<v8::Context> context, + v8::Handle<v8::Value>* result) override { return false; } }; diff --git a/content/renderer/pepper/v8object_var.h b/content/renderer/pepper/v8object_var.h index f6cc206..0480fbe 100644 --- a/content/renderer/pepper/v8object_var.h +++ b/content/renderer/pepper/v8object_var.h @@ -33,8 +33,8 @@ class CONTENT_EXPORT V8ObjectVar : public Var { V8ObjectVar(PP_Instance instance, v8::Handle<v8::Object> v8_object); // Var overrides. - virtual V8ObjectVar* AsV8ObjectVar() override; - virtual PP_VarType GetType() const override; + V8ObjectVar* AsV8ObjectVar() override; + PP_VarType GetType() const override; // Returns the underlying v8 object corresponding to this V8ObjectVar. This // should only be used on the stack. @@ -52,7 +52,7 @@ class CONTENT_EXPORT V8ObjectVar : public Var { static scoped_refptr<V8ObjectVar> FromPPVar(PP_Var var); private: - virtual ~V8ObjectVar(); + ~V8ObjectVar() override; content::PepperPluginInstanceImpl* instance_; diff --git a/content/renderer/pepper/video_decoder_shim.h b/content/renderer/pepper/video_decoder_shim.h index 35a6146..42335c1 100644 --- a/content/renderer/pepper/video_decoder_shim.h +++ b/content/renderer/pepper/video_decoder_shim.h @@ -50,19 +50,18 @@ class PepperVideoDecoderHost; class VideoDecoderShim : public media::VideoDecodeAccelerator { public: explicit VideoDecoderShim(PepperVideoDecoderHost* host); - virtual ~VideoDecoderShim(); + ~VideoDecoderShim() override; // media::VideoDecodeAccelerator implementation. - virtual bool Initialize( - media::VideoCodecProfile profile, - media::VideoDecodeAccelerator::Client* client) override; - virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) override; - virtual void AssignPictureBuffers( + bool Initialize(media::VideoCodecProfile profile, + media::VideoDecodeAccelerator::Client* client) override; + void Decode(const media::BitstreamBuffer& bitstream_buffer) override; + void AssignPictureBuffers( const std::vector<media::PictureBuffer>& buffers) override; - virtual void ReusePictureBuffer(int32 picture_buffer_id) override; - virtual void Flush() override; - virtual void Reset() override; - virtual void Destroy() override; + void ReusePictureBuffer(int32 picture_buffer_id) override; + void Flush() override; + void Reset() override; + void Destroy() override; private: enum State { diff --git a/content/renderer/push_messaging_dispatcher.h b/content/renderer/push_messaging_dispatcher.h index 0d8c823..080510f 100644 --- a/content/renderer/push_messaging_dispatcher.h +++ b/content/renderer/push_messaging_dispatcher.h @@ -35,7 +35,7 @@ class PushMessagingDispatcher : public RenderFrameObserver, private: // RenderFrame::Observer implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // WebPushClient implementation. virtual void registerPushMessaging( diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h index 379ef9c..a67458c 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h @@ -250,38 +250,36 @@ class CONTENT_EXPORT RenderFrameImpl #endif // IPC::Sender - virtual bool Send(IPC::Message* msg) override; + bool Send(IPC::Message* msg) override; // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& msg) override; + bool OnMessageReceived(const IPC::Message& msg) override; // RenderFrame implementation: - virtual RenderView* GetRenderView() override; - virtual int GetRoutingID() override; - virtual blink::WebLocalFrame* GetWebFrame() override; - virtual WebPreferences& GetWebkitPreferences() override; - virtual int ShowContextMenu(ContextMenuClient* client, - const ContextMenuParams& params) override; - virtual void CancelContextMenu(int request_id) override; - virtual blink::WebNode GetContextMenuNode() const override; - virtual blink::WebPlugin* CreatePlugin( - blink::WebFrame* frame, - const WebPluginInfo& info, - const blink::WebPluginParams& params) override; - virtual void LoadURLExternally(blink::WebLocalFrame* frame, - const blink::WebURLRequest& request, - blink::WebNavigationPolicy policy) override; - virtual void ExecuteJavaScript(const base::string16& javascript) override; - virtual bool IsHidden() override; - virtual ServiceRegistry* GetServiceRegistry() override; - virtual bool IsFTPDirectoryListing() override; - virtual void AttachGuest(int element_instance_id) override; - virtual void SetSelectedText(const base::string16& selection_text, - size_t offset, - const gfx::Range& range) override; - virtual void EnsureMojoBuiltinsAreAvailable( - v8::Isolate* isolate, - v8::Handle<v8::Context> context) override; + RenderView* GetRenderView() override; + int GetRoutingID() override; + blink::WebLocalFrame* GetWebFrame() override; + WebPreferences& GetWebkitPreferences() override; + int ShowContextMenu(ContextMenuClient* client, + const ContextMenuParams& params) override; + void CancelContextMenu(int request_id) override; + blink::WebNode GetContextMenuNode() const override; + blink::WebPlugin* CreatePlugin(blink::WebFrame* frame, + const WebPluginInfo& info, + const blink::WebPluginParams& params) override; + void LoadURLExternally(blink::WebLocalFrame* frame, + const blink::WebURLRequest& request, + blink::WebNavigationPolicy policy) override; + void ExecuteJavaScript(const base::string16& javascript) override; + bool IsHidden() override; + ServiceRegistry* GetServiceRegistry() override; + bool IsFTPDirectoryListing() override; + void AttachGuest(int element_instance_id) override; + void SetSelectedText(const base::string16& selection_text, + size_t offset, + const gfx::Range& range) override; + void EnsureMojoBuiltinsAreAvailable(v8::Isolate* isolate, + v8::Handle<v8::Context> context) override; // blink::WebFrameClient implementation: virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame, @@ -467,9 +465,9 @@ class CONTENT_EXPORT RenderFrameImpl virtual void didChangeManifest(blink::WebLocalFrame*); // WebMediaPlayerDelegate implementation: - virtual void DidPlay(blink::WebMediaPlayer* player) override; - virtual void DidPause(blink::WebMediaPlayer* player) override; - virtual void PlayerGone(blink::WebMediaPlayer* player) override; + void DidPlay(blink::WebMediaPlayer* player) override; + void DidPause(blink::WebMediaPlayer* player) override; + void PlayerGone(blink::WebMediaPlayer* player) override; // TODO(nasko): Make all tests in RenderViewImplTest friends and then move // this back to private member. diff --git a/content/renderer/render_frame_proxy.h b/content/renderer/render_frame_proxy.h index 409d74e..2afd453 100644 --- a/content/renderer/render_frame_proxy.h +++ b/content/renderer/render_frame_proxy.h @@ -84,10 +84,10 @@ class CONTENT_EXPORT RenderFrameProxy // Returns the RenderFrameProxy given a WebFrame. static RenderFrameProxy* FromWebFrame(blink::WebFrame* web_frame); - virtual ~RenderFrameProxy(); + ~RenderFrameProxy() override; // IPC::Sender - virtual bool Send(IPC::Message* msg) override; + bool Send(IPC::Message* msg) override; // Out-of-process child frames receive a signal from RenderWidgetCompositor // when a compositor frame has committed. @@ -117,7 +117,7 @@ class CONTENT_EXPORT RenderFrameProxy void Init(blink::WebRemoteFrame* frame, RenderViewImpl* render_view); // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& msg) override; + bool OnMessageReceived(const IPC::Message& msg) override; // IPC handlers void OnDeleteProxy(); diff --git a/content/renderer/render_process.h b/content/renderer/render_process.h index 76b88e6..07c53e1 100644 --- a/content/renderer/render_process.h +++ b/content/renderer/render_process.h @@ -19,7 +19,7 @@ namespace content { class RenderProcess : public ChildProcess { public: RenderProcess() {} - virtual ~RenderProcess() {} + ~RenderProcess() override {} // Keep track of the cumulative set of enabled bindings for this process, // across any view. diff --git a/content/renderer/render_process_impl.h b/content/renderer/render_process_impl.h index 72555ef..7b441e2 100644 --- a/content/renderer/render_process_impl.h +++ b/content/renderer/render_process_impl.h @@ -15,11 +15,11 @@ namespace content { class RenderProcessImpl : public RenderProcess { public: RenderProcessImpl(); - virtual ~RenderProcessImpl(); + ~RenderProcessImpl() override; // RenderProcess implementation. - virtual void AddBindings(int bindings) override; - virtual int GetEnabledBindings() const override; + void AddBindings(int bindings) override; + int GetEnabledBindings() const override; private: // Bitwise-ORed set of extra bindings that have been enabled anywhere in this diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index b9fd182..9cc2e7e 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -198,7 +198,7 @@ class RenderViewZoomer : public RenderViewVisitor { zoom_level_(zoom_level) { } - virtual bool Visit(RenderView* render_view) override { + bool Visit(RenderView* render_view) override { WebView* webview = render_view->GetWebView(); WebDocument document = webview->mainFrame()->document(); @@ -284,7 +284,7 @@ class RenderFrameSetupImpl : public mojo::InterfaceImpl<RenderFrameSetup> { : routing_id_highmark_(-1) { } - virtual void GetServiceProviderForFrame( + void GetServiceProviderForFrame( int32_t frame_routing_id, mojo::InterfaceRequest<mojo::ServiceProvider> request) override { // TODO(morrita): This is for investigating http://crbug.com/415059 and @@ -335,12 +335,11 @@ blink::WebGraphicsContext3D::Attributes GetOffscreenAttribs() { class MemoryObserver : public base::MessageLoop::TaskObserver { public: MemoryObserver() {} - virtual ~MemoryObserver() {} + ~MemoryObserver() override {} - virtual void WillProcessTask(const base::PendingTask& pending_task) override { - } + void WillProcessTask(const base::PendingTask& pending_task) override {} - virtual void DidProcessTask(const base::PendingTask& pending_task) override { + void DidProcessTask(const base::PendingTask& pending_task) override { LOCAL_HISTOGRAM_MEMORY_KB("Memory.RendererUsed", GetMemoryUsageKB()); } diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index 5712c01..bc1002b 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -120,8 +120,8 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, RenderThreadImpl(); // Constructor that's used when running in single process mode. explicit RenderThreadImpl(const std::string& channel_name); - virtual ~RenderThreadImpl(); - virtual void Shutdown() override; + ~RenderThreadImpl() override; + void Shutdown() override; // When initializing WebKit, ensure that any schemes needed for the content // module are registered properly. Static to allow sharing with tests. @@ -132,42 +132,41 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, static void NotifyTimezoneChange(); // RenderThread implementation: - virtual bool Send(IPC::Message* msg) override; - virtual base::MessageLoop* GetMessageLoop() override; - virtual IPC::SyncChannel* GetChannel() override; - virtual std::string GetLocale() override; - virtual IPC::SyncMessageFilter* GetSyncMessageFilter() override; - virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() - override; - virtual void AddRoute(int32 routing_id, IPC::Listener* listener) override; - virtual void RemoveRoute(int32 routing_id) override; - virtual int GenerateRoutingID() override; - virtual void AddFilter(IPC::MessageFilter* filter) override; - virtual void RemoveFilter(IPC::MessageFilter* filter) override; - virtual void AddObserver(RenderProcessObserver* observer) override; - virtual void RemoveObserver(RenderProcessObserver* observer) override; - virtual void SetResourceDispatcherDelegate( + bool Send(IPC::Message* msg) override; + base::MessageLoop* GetMessageLoop() override; + IPC::SyncChannel* GetChannel() override; + std::string GetLocale() override; + IPC::SyncMessageFilter* GetSyncMessageFilter() override; + scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() override; + void AddRoute(int32 routing_id, IPC::Listener* listener) override; + void RemoveRoute(int32 routing_id) override; + int GenerateRoutingID() override; + void AddFilter(IPC::MessageFilter* filter) override; + void RemoveFilter(IPC::MessageFilter* filter) override; + void AddObserver(RenderProcessObserver* observer) override; + void RemoveObserver(RenderProcessObserver* observer) override; + void SetResourceDispatcherDelegate( ResourceDispatcherDelegate* delegate) override; - virtual void EnsureWebKitInitialized() override; - virtual void RecordAction(const base::UserMetricsAction& action) override; - virtual void RecordComputedAction(const std::string& action) override; - virtual scoped_ptr<base::SharedMemory> HostAllocateSharedMemoryBuffer( + void EnsureWebKitInitialized() override; + void RecordAction(const base::UserMetricsAction& action) override; + void RecordComputedAction(const std::string& action) override; + scoped_ptr<base::SharedMemory> HostAllocateSharedMemoryBuffer( size_t buffer_size) override; - virtual void RegisterExtension(v8::Extension* extension) override; - virtual void ScheduleIdleHandler(int64 initial_delay_ms) override; - virtual void IdleHandler() override; - virtual int64 GetIdleNotificationDelayInMs() const override; - virtual void SetIdleNotificationDelayInMs( + void RegisterExtension(v8::Extension* extension) override; + void ScheduleIdleHandler(int64 initial_delay_ms) override; + void IdleHandler() override; + int64 GetIdleNotificationDelayInMs() const override; + void SetIdleNotificationDelayInMs( int64 idle_notification_delay_in_ms) override; - virtual void UpdateHistograms(int sequence_number) override; - virtual int PostTaskToAllWebWorkers(const base::Closure& closure) override; - virtual bool ResolveProxy(const GURL& url, std::string* proxy_list) override; - virtual base::WaitableEvent* GetShutdownEvent() override; + void UpdateHistograms(int sequence_number) override; + int PostTaskToAllWebWorkers(const base::Closure& closure) override; + bool ResolveProxy(const GURL& url, std::string* proxy_list) override; + base::WaitableEvent* GetShutdownEvent() override; #if defined(OS_WIN) virtual void PreCacheFont(const LOGFONT& log_font) override; virtual void ReleaseCachedFonts() override; #endif - virtual ServiceRegistry* GetServiceRegistry() override; + ServiceRegistry* GetServiceRegistry() override; // Synchronously establish a channel to the GPU plugin if not previously // established or if it has been lost (for example if the GPU plugin crashed). @@ -401,15 +400,14 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, private: // ChildThread - virtual bool OnControlMessageReceived(const IPC::Message& msg) override; + bool OnControlMessageReceived(const IPC::Message& msg) override; // GpuChannelHostFactory implementation: - virtual bool IsMainThread() override; - virtual base::MessageLoop* GetMainLoop() override; - virtual scoped_refptr<base::MessageLoopProxy> GetIOLoopProxy() override; - virtual scoped_ptr<base::SharedMemory> AllocateSharedMemory( - size_t size) override; - virtual CreateCommandBufferResult CreateViewCommandBuffer( + bool IsMainThread() override; + base::MessageLoop* GetMainLoop() override; + scoped_refptr<base::MessageLoopProxy> GetIOLoopProxy() override; + scoped_ptr<base::SharedMemory> AllocateSharedMemory(size_t size) override; + CreateCommandBufferResult CreateViewCommandBuffer( int32 surface_id, const GPUCreateCommandBufferConfig& init_params, int32 route_id) override; diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc index df4f986..1afb439 100644 --- a/content/renderer/render_thread_impl_browsertest.cc +++ b/content/renderer/render_thread_impl_browsertest.cc @@ -24,9 +24,7 @@ class RenderThreadImplBrowserTest : public testing::Test { class DummyListener : public IPC::Listener { public: - virtual bool OnMessageReceived(const IPC::Message& message) override { - return true; - } + bool OnMessageReceived(const IPC::Message& message) override { return true; } }; void CheckRenderThreadInputHandlerManager(RenderThreadImpl* thread) { diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 7444fc8..a2ec07b 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -115,20 +115,20 @@ int ConvertMockKeyboardModifier(MockKeyboard::Modifiers modifiers) { class WebUITestWebUIControllerFactory : public WebUIControllerFactory { public: - virtual WebUIController* CreateWebUIControllerForURL( - WebUI* web_ui, const GURL& url) const override { + WebUIController* CreateWebUIControllerForURL(WebUI* web_ui, + const GURL& url) const override { return NULL; } - virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context, - const GURL& url) const override { + WebUI::TypeID GetWebUIType(BrowserContext* browser_context, + const GURL& url) const override { return WebUI::kNoWebUI; } - virtual bool UseWebUIForURL(BrowserContext* browser_context, - const GURL& url) const override { + bool UseWebUIForURL(BrowserContext* browser_context, + const GURL& url) const override { return HasWebUIScheme(url); } - virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context, - const GURL& url) const override { + bool UseWebUIBindingsForURL(BrowserContext* browser_context, + const GURL& url) const override { return HasWebUIScheme(url); } }; @@ -2171,7 +2171,7 @@ TEST_F(RenderViewImplTest, MessageOrderInDidChangeSelection) { class SuppressErrorPageTest : public RenderViewTest { public: - virtual ContentRendererClient* CreateContentRendererClient() override { + ContentRendererClient* CreateContentRendererClient() override { return new TestContentRendererClient; } @@ -2186,18 +2186,17 @@ class SuppressErrorPageTest : public RenderViewTest { private: class TestContentRendererClient : public ContentRendererClient { public: - virtual bool ShouldSuppressErrorPage(RenderFrame* render_frame, - const GURL& url) override { + bool ShouldSuppressErrorPage(RenderFrame* render_frame, + const GURL& url) override { return url == GURL("http://example.com/suppress"); } - virtual void GetNavigationErrorStrings( - content::RenderView* render_view, - blink::WebFrame* frame, - const blink::WebURLRequest& failed_request, - const blink::WebURLError& error, - std::string* error_html, - base::string16* error_description) override { + void GetNavigationErrorStrings(content::RenderView* render_view, + blink::WebFrame* frame, + const blink::WebURLRequest& failed_request, + const blink::WebURLError& error, + std::string* error_html, + base::string16* error_description) override { if (error_html) *error_html = "A suffusion of yellow."; } diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 04edbd0..a8698ad 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -461,19 +461,16 @@ class WebWidgetLockTarget : public MouseLockDispatcher::LockTarget { explicit WebWidgetLockTarget(blink::WebWidget* webwidget) : webwidget_(webwidget) {} - virtual void OnLockMouseACK(bool succeeded) override { + void OnLockMouseACK(bool succeeded) override { if (succeeded) webwidget_->didAcquirePointerLock(); else webwidget_->didNotAcquirePointerLock(); } - virtual void OnMouseLockLost() override { - webwidget_->didLosePointerLock(); - } + void OnMouseLockLost() override { webwidget_->didLosePointerLock(); } - virtual bool HandleMouseLockedInputEvent( - const blink::WebMouseEvent &event) override { + bool HandleMouseLockedInputEvent(const blink::WebMouseEvent& event) override { // The WebWidget handles mouse lock in WebKit's handleInputEvent(). return false; } diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index ec6d730..21d2ec5 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -330,7 +330,7 @@ class CONTENT_EXPORT RenderViewImpl // Change the device ICC color profile while running a layout test. void SetDeviceColorProfileForTesting(const std::vector<char>& color_profile); - virtual void ResetDeviceColorProfileForTesting() override; + void ResetDeviceColorProfileForTesting() override; // Used to force the size of a window when running layout tests. void ForceResizeForTesting(const gfx::Size& new_size); @@ -344,7 +344,7 @@ class CONTENT_EXPORT RenderViewImpl // IPC::Listener implementation ---------------------------------------------- - virtual bool OnMessageReceived(const IPC::Message& msg) override; + bool OnMessageReceived(const IPC::Message& msg) override; // blink::WebWidgetClient implementation ------------------------------------ @@ -453,29 +453,29 @@ class CONTENT_EXPORT RenderViewImpl // RenderView implementation ------------------------------------------------- - virtual bool Send(IPC::Message* message) override; - virtual RenderFrameImpl* GetMainRenderFrame() override; - virtual int GetRoutingID() const override; - virtual gfx::Size GetSize() const override; - virtual WebPreferences& GetWebkitPreferences() override; - virtual void SetWebkitPreferences(const WebPreferences& preferences) override; - virtual blink::WebView* GetWebView() override; - virtual blink::WebElement GetFocusedElement() const override; - virtual bool IsEditableNode(const blink::WebNode& node) const override; - virtual bool NodeContainsPoint(const blink::WebNode& node, - const gfx::Point& point) const override; - virtual bool ShouldDisplayScrollbars(int width, int height) const override; - virtual int GetEnabledBindings() const override; - virtual bool GetContentStateImmediately() const override; - virtual blink::WebPageVisibilityState GetVisibilityState() const override; - virtual void DidStartLoading() override; - virtual void DidStopLoading() override; - virtual void Repaint(const gfx::Size& size) override; - virtual void SetEditCommandForNextKeyEvent(const std::string& name, - const std::string& value) override; - virtual void ClearEditCommands() override; - virtual SSLStatus GetSSLStatusOfFrame(blink::WebFrame* frame) const override; - virtual const std::string& GetAcceptLanguages() const override; + bool Send(IPC::Message* message) override; + RenderFrameImpl* GetMainRenderFrame() override; + int GetRoutingID() const override; + gfx::Size GetSize() const override; + WebPreferences& GetWebkitPreferences() override; + void SetWebkitPreferences(const WebPreferences& preferences) override; + blink::WebView* GetWebView() override; + blink::WebElement GetFocusedElement() const override; + bool IsEditableNode(const blink::WebNode& node) const override; + bool NodeContainsPoint(const blink::WebNode& node, + const gfx::Point& point) const override; + bool ShouldDisplayScrollbars(int width, int height) const override; + int GetEnabledBindings() const override; + bool GetContentStateImmediately() const override; + blink::WebPageVisibilityState GetVisibilityState() const override; + void DidStartLoading() override; + void DidStopLoading() override; + void Repaint(const gfx::Size& size) override; + void SetEditCommandForNextKeyEvent(const std::string& name, + const std::string& value) override; + void ClearEditCommands() override; + SSLStatus GetSSLStatusOfFrame(blink::WebFrame* frame) const override; + const std::string& GetAcceptLanguages() const override; #if defined(OS_ANDROID) virtual void UpdateTopControlsState(TopControlsState constraints, TopControlsState current, @@ -494,59 +494,55 @@ class CONTENT_EXPORT RenderViewImpl protected: // RenderWidget overrides: - virtual void OnClose() override; - virtual void Close() override; - virtual void OnResize(const ViewMsg_Resize_Params& params) override; - virtual void DidInitiatePaint() override; - virtual void DidFlushPaint() override; - virtual gfx::Vector2d GetScrollOffset() override; - virtual void DidHandleKeyEvent() override; - virtual bool WillHandleMouseEvent( - const blink::WebMouseEvent& event) override; - virtual bool WillHandleGestureEvent( - const blink::WebGestureEvent& event) override; - virtual void DidHandleMouseEvent(const blink::WebMouseEvent& event) override; - virtual void DidHandleTouchEvent(const blink::WebTouchEvent& event) override; - virtual bool HasTouchEventHandlersAt(const gfx::Point& point) const override; - virtual void OnSetFocus(bool enable) override; - virtual void OnWasHidden() override; - virtual void OnWasShown(bool needs_repainting, - const ui::LatencyInfo& latency_info) override; - virtual GURL GetURLForGraphicsContext3D() override; - virtual void OnImeSetComposition( + void OnClose() override; + void Close() override; + void OnResize(const ViewMsg_Resize_Params& params) override; + void DidInitiatePaint() override; + void DidFlushPaint() override; + gfx::Vector2d GetScrollOffset() override; + void DidHandleKeyEvent() override; + bool WillHandleMouseEvent(const blink::WebMouseEvent& event) override; + bool WillHandleGestureEvent(const blink::WebGestureEvent& event) override; + void DidHandleMouseEvent(const blink::WebMouseEvent& event) override; + void DidHandleTouchEvent(const blink::WebTouchEvent& event) override; + bool HasTouchEventHandlersAt(const gfx::Point& point) const override; + void OnSetFocus(bool enable) override; + void OnWasHidden() override; + void OnWasShown(bool needs_repainting, + const ui::LatencyInfo& latency_info) override; + GURL GetURLForGraphicsContext3D() override; + void OnImeSetComposition( const base::string16& text, const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end) override; - virtual void OnImeConfirmComposition(const base::string16& text, - const gfx::Range& replacement_range, - bool keep_selection) override; - virtual void SetDeviceScaleFactor(float device_scale_factor) override; - virtual bool SetDeviceColorProfile( - const std::vector<char>& color_profile) override; - virtual void OnOrientationChange() override; - virtual ui::TextInputType GetTextInputType() override; - virtual void GetSelectionBounds(gfx::Rect* start, gfx::Rect* end) override; + void OnImeConfirmComposition(const base::string16& text, + const gfx::Range& replacement_range, + bool keep_selection) override; + void SetDeviceScaleFactor(float device_scale_factor) override; + bool SetDeviceColorProfile(const std::vector<char>& color_profile) override; + void OnOrientationChange() override; + ui::TextInputType GetTextInputType() override; + void GetSelectionBounds(gfx::Rect* start, gfx::Rect* end) override; #if defined(OS_MACOSX) || defined(USE_AURA) - virtual void GetCompositionCharacterBounds( + void GetCompositionCharacterBounds( std::vector<gfx::Rect>* character_bounds) override; - virtual void GetCompositionRange(gfx::Range* range) override; + void GetCompositionRange(gfx::Range* range) override; #endif - virtual bool CanComposeInline() override; - virtual void DidCommitCompositorFrame() override; - virtual void InstrumentWillBeginFrame(int frame_id) override; - virtual void InstrumentDidBeginFrame() override; - virtual void InstrumentDidCancelFrame() override; - virtual void InstrumentWillComposite() override; + bool CanComposeInline() override; + void DidCommitCompositorFrame() override; + void InstrumentWillBeginFrame(int frame_id) override; + void InstrumentDidBeginFrame() override; + void InstrumentDidCancelFrame() override; + void InstrumentWillComposite() override; protected: explicit RenderViewImpl(RenderViewImplParams* params); void Initialize(RenderViewImplParams* params); - virtual void SetScreenMetricsEmulationParameters( - float device_scale_factor, - const gfx::Point& root_layer_offset, - float root_layer_scale) override; + void SetScreenMetricsEmulationParameters(float device_scale_factor, + const gfx::Point& root_layer_offset, + float root_layer_scale) override; // Do not delete directly. This class is reference counted. virtual ~RenderViewImpl(); diff --git a/content/renderer/render_view_mouse_lock_dispatcher.h b/content/renderer/render_view_mouse_lock_dispatcher.h index 61c20c8..a2ee5b5 100644 --- a/content/renderer/render_view_mouse_lock_dispatcher.h +++ b/content/renderer/render_view_mouse_lock_dispatcher.h @@ -18,15 +18,15 @@ class RenderViewMouseLockDispatcher : public MouseLockDispatcher, public RenderViewObserver { public: explicit RenderViewMouseLockDispatcher(RenderViewImpl* render_view_impl); - virtual ~RenderViewMouseLockDispatcher(); + ~RenderViewMouseLockDispatcher() override; private: // MouseLockDispatcher implementation. - virtual void SendLockMouseRequest(bool unlocked_by_target) override; - virtual void SendUnlockMouseRequest() override; + void SendLockMouseRequest(bool unlocked_by_target) override; + void SendUnlockMouseRequest() override; // RenderView::Observer implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; void OnLockMouseACK(bool succeeded); diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index 37e6d17..f9e7ea0 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h @@ -135,10 +135,10 @@ class CONTENT_EXPORT RenderWidget #endif // defined(VIDEO_HOLE) // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& msg) override; + bool OnMessageReceived(const IPC::Message& msg) override; // IPC::Sender - virtual bool Send(IPC::Message* msg) override; + bool Send(IPC::Message* msg) override; // blink::WebWidgetClient virtual void willBeginCompositorFrame(); @@ -321,7 +321,7 @@ class CONTENT_EXPORT RenderWidget bool hidden, bool never_visible); - virtual ~RenderWidget(); + ~RenderWidget() override; // Initializes this view with the given opener. CompleteInit must be called // later. diff --git a/content/renderer/render_widget_fullscreen.h b/content/renderer/render_widget_fullscreen.h index 4b65b88..83ce349 100644 --- a/content/renderer/render_widget_fullscreen.h +++ b/content/renderer/render_widget_fullscreen.h @@ -18,7 +18,7 @@ class RenderWidgetFullscreen : public RenderWidget { protected: RenderWidgetFullscreen(const blink::WebScreenInfo& screen_info); - virtual ~RenderWidgetFullscreen(); + ~RenderWidgetFullscreen() override; virtual blink::WebWidget* CreateWebWidget(); diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index d78498a..f58304e 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc @@ -50,12 +50,12 @@ namespace { class FullscreenMouseLockDispatcher : public MouseLockDispatcher { public: explicit FullscreenMouseLockDispatcher(RenderWidgetFullscreenPepper* widget); - virtual ~FullscreenMouseLockDispatcher(); + ~FullscreenMouseLockDispatcher() override; private: // MouseLockDispatcher implementation. - virtual void SendLockMouseRequest(bool unlocked_by_target) override; - virtual void SendUnlockMouseRequest() override; + void SendLockMouseRequest(bool unlocked_by_target) override; + void SendUnlockMouseRequest() override; RenderWidgetFullscreenPepper* widget_; diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h index ccf68cf..24808e8 100644 --- a/content/renderer/render_widget_fullscreen_pepper.h +++ b/content/renderer/render_widget_fullscreen_pepper.h @@ -31,16 +31,16 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen, const blink::WebScreenInfo& screen_info); // pepper::FullscreenContainer API. - virtual void Invalidate() override; - virtual void InvalidateRect(const blink::WebRect& rect) override; - virtual void ScrollRect(int dx, int dy, const blink::WebRect& rect) override; - virtual void Destroy() override; - virtual void DidChangeCursor(const blink::WebCursorInfo& cursor) override; - virtual void SetLayer(blink::WebLayer* layer) override; + void Invalidate() override; + void InvalidateRect(const blink::WebRect& rect) override; + void ScrollRect(int dx, int dy, const blink::WebRect& rect) override; + void Destroy() override; + void DidChangeCursor(const blink::WebCursorInfo& cursor) override; + void SetLayer(blink::WebLayer* layer) override; // IPC::Listener implementation. This overrides the implementation // in RenderWidgetFullscreen. - virtual bool OnMessageReceived(const IPC::Message& msg) override; + bool OnMessageReceived(const IPC::Message& msg) override; // Could be NULL when this widget is closing. PepperPluginInstanceImpl* plugin() const { return plugin_; } @@ -53,20 +53,20 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen, RenderWidgetFullscreenPepper(PepperPluginInstanceImpl* plugin, const GURL& active_url, const blink::WebScreenInfo& screen_info); - virtual ~RenderWidgetFullscreenPepper(); + ~RenderWidgetFullscreenPepper() override; // RenderWidget API. - virtual void DidInitiatePaint() override; - virtual void DidFlushPaint() override; - virtual void Close() override; - virtual void OnResize(const ViewMsg_Resize_Params& params) override; + void DidInitiatePaint() override; + void DidFlushPaint() override; + void Close() override; + void OnResize(const ViewMsg_Resize_Params& params) override; // RenderWidgetFullscreen API. - virtual blink::WebWidget* CreateWebWidget() override; + blink::WebWidget* CreateWebWidget() override; // RenderWidget overrides. - virtual GURL GetURLForGraphicsContext3D() override; - virtual void SetDeviceScaleFactor(float device_scale_factor) override; + GURL GetURLForGraphicsContext3D() override; + void SetDeviceScaleFactor(float device_scale_factor) override; private: // URL that is responsible for this widget, passed to ggl::CreateViewContext. diff --git a/content/renderer/render_widget_unittest.cc b/content/renderer/render_widget_unittest.cc index e37096d..e49bffd 100644 --- a/content/renderer/render_widget_unittest.cc +++ b/content/renderer/render_widget_unittest.cc @@ -49,10 +49,10 @@ class TouchableRenderWidget : public RenderWidget { IPC::TestSink* sink() { return &sink_; } protected: - virtual ~TouchableRenderWidget() {} + ~TouchableRenderWidget() override {} // Overridden from RenderWidget: - virtual bool HasTouchEventHandlersAt(const gfx::Point& point) const override { + bool HasTouchEventHandlersAt(const gfx::Point& point) const override { for (std::vector<gfx::Rect>::const_iterator iter = rects_.begin(); iter != rects_.end(); ++iter) { if ((*iter).Contains(point)) @@ -61,7 +61,7 @@ class TouchableRenderWidget : public RenderWidget { return false; } - virtual bool Send(IPC::Message* msg) override { + bool Send(IPC::Message* msg) override { sink_.OnMessageReceived(*msg); delete msg; return true; diff --git a/content/renderer/renderer_clipboard_client.cc b/content/renderer/renderer_clipboard_client.cc index 4b36e22..1e2953e 100644 --- a/content/renderer/renderer_clipboard_client.cc +++ b/content/renderer/renderer_clipboard_client.cc @@ -23,11 +23,11 @@ namespace { class RendererClipboardWriteContext : public ClipboardClient::WriteContext { public: RendererClipboardWriteContext(); - virtual ~RendererClipboardWriteContext(); - virtual void WriteBitmapFromPixels(ui::Clipboard::ObjectMap* objects, - const void* pixels, - const gfx::Size& size) override; - virtual void Flush(const ui::Clipboard::ObjectMap& objects) override; + ~RendererClipboardWriteContext() override; + void WriteBitmapFromPixels(ui::Clipboard::ObjectMap* objects, + const void* pixels, + const gfx::Size& size) override; + void Flush(const ui::Clipboard::ObjectMap& objects) override; private: scoped_ptr<base::SharedMemory> shared_buf_; diff --git a/content/renderer/renderer_clipboard_client.h b/content/renderer/renderer_clipboard_client.h index 5920c78..de9e9c1 100644 --- a/content/renderer/renderer_clipboard_client.h +++ b/content/renderer/renderer_clipboard_client.h @@ -14,29 +14,28 @@ namespace content { class RendererClipboardClient : public ClipboardClient { public: RendererClipboardClient(); - virtual ~RendererClipboardClient(); + ~RendererClipboardClient() override; - virtual ui::Clipboard* GetClipboard() override; - virtual uint64 GetSequenceNumber(ui::ClipboardType type) override; - virtual bool IsFormatAvailable(ClipboardFormat format, - ui::ClipboardType type) override; - virtual void Clear(ui::ClipboardType type) override; - virtual void ReadAvailableTypes(ui::ClipboardType type, - std::vector<base::string16>* types, - bool* contains_filenames) override; - virtual void ReadText(ui::ClipboardType type, - base::string16* result) override; - virtual void ReadHTML(ui::ClipboardType type, - base::string16* markup, - GURL* url, - uint32* fragment_start, - uint32* fragment_end) override; - virtual void ReadRTF(ui::ClipboardType type, std::string* result) override; - virtual void ReadImage(ui::ClipboardType type, std::string* data) override; - virtual void ReadCustomData(ui::ClipboardType clipboard_type, - const base::string16& type, - base::string16* data) override; - virtual WriteContext* CreateWriteContext() override; + ui::Clipboard* GetClipboard() override; + uint64 GetSequenceNumber(ui::ClipboardType type) override; + bool IsFormatAvailable(ClipboardFormat format, + ui::ClipboardType type) override; + void Clear(ui::ClipboardType type) override; + void ReadAvailableTypes(ui::ClipboardType type, + std::vector<base::string16>* types, + bool* contains_filenames) override; + void ReadText(ui::ClipboardType type, base::string16* result) override; + void ReadHTML(ui::ClipboardType type, + base::string16* markup, + GURL* url, + uint32* fragment_start, + uint32* fragment_end) override; + void ReadRTF(ui::ClipboardType type, std::string* result) override; + void ReadImage(ui::ClipboardType type, std::string* data) override; + void ReadCustomData(ui::ClipboardType clipboard_type, + const base::string16& type, + base::string16* data) override; + WriteContext* CreateWriteContext() override; }; } // namespace content diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index 6457a9d..38d21f0 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -80,13 +80,13 @@ class RendererMessageLoopObserver : public base::MessageLoop::TaskObserver { : process_times_(base::Histogram::FactoryGet( "Chrome.ProcMsgL RenderThread", 1, 3600000, 50, base::Histogram::kUmaTargetedHistogramFlag)) {} - virtual ~RendererMessageLoopObserver() {} + ~RendererMessageLoopObserver() override {} - virtual void WillProcessTask(const base::PendingTask& pending_task) override { + void WillProcessTask(const base::PendingTask& pending_task) override { begin_process_message_ = base::TimeTicks::Now(); } - virtual void DidProcessTask(const base::PendingTask& pending_task) override { + void DidProcessTask(const base::PendingTask& pending_task) override { if (!begin_process_message_.is_null()) process_times_->AddTime(base::TimeTicks::Now() - begin_process_message_); } diff --git a/content/renderer/renderer_webapplicationcachehost_impl.h b/content/renderer/renderer_webapplicationcachehost_impl.h index 9e13a48..c8efaaf 100644 --- a/content/renderer/renderer_webapplicationcachehost_impl.h +++ b/content/renderer/renderer_webapplicationcachehost_impl.h @@ -18,10 +18,10 @@ class RendererWebApplicationCacheHostImpl : public WebApplicationCacheHostImpl { AppCacheBackend* backend); // WebApplicationCacheHostImpl: - virtual void OnLogMessage(AppCacheLogLevel log_level, - const std::string& message) override; - virtual void OnContentBlocked(const GURL& manifest_url) override; - virtual void OnCacheSelected(const AppCacheInfo& info) override; + void OnLogMessage(AppCacheLogLevel log_level, + const std::string& message) override; + void OnContentBlocked(const GURL& manifest_url) override; + void OnCacheSelected(const AppCacheInfo& info) override; private: RenderViewImpl* GetRenderView(); diff --git a/content/renderer/renderer_webcolorchooser_impl.h b/content/renderer/renderer_webcolorchooser_impl.h index 4952630..36e7fc1 100644 --- a/content/renderer/renderer_webcolorchooser_impl.h +++ b/content/renderer/renderer_webcolorchooser_impl.h @@ -41,8 +41,8 @@ class RendererWebColorChooserImpl : public blink::WebColorChooser, // Don't destroy the RendererWebColorChooserImpl when the RenderFrame goes // away. RendererWebColorChooserImpl is owned by // blink::ColorChooserUIController. - virtual void OnDestruct() override {} - virtual bool OnMessageReceived(const IPC::Message& message) override; + void OnDestruct() override {} + bool OnMessageReceived(const IPC::Message& message) override; void OnDidChooseColorResponse(int color_chooser_id, SkColor color); void OnDidEndColorChooser(int color_chooser_id); diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc index 9d67646..1695f0e 100644 --- a/content/renderer/resource_fetcher_browsertest.cc +++ b/content/renderer/resource_fetcher_browsertest.cc @@ -109,14 +109,14 @@ FetcherDelegate* FetcherDelegate::instance_ = NULL; class EvilFetcherDelegate : public FetcherDelegate { public: - virtual ~EvilFetcherDelegate() {} + ~EvilFetcherDelegate() override {} void SetFetcher(ResourceFetcher* fetcher) { fetcher_.reset(fetcher); } - virtual void OnURLFetchComplete(const WebURLResponse& response, - const std::string& data) override { + void OnURLFetchComplete(const WebURLResponse& response, + const std::string& data) override { FetcherDelegate::OnURLFetchComplete(response, data); // Destroy the ResourceFetcher here. We are testing that upon returning @@ -132,7 +132,7 @@ class EvilFetcherDelegate : public FetcherDelegate { class ResourceFetcherTests : public ContentBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) override { + void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kSingleProcess); #if defined(OS_WIN) // Don't want to try to create a GPU process. diff --git a/content/renderer/savable_resources_browsertest.cc b/content/renderer/savable_resources_browsertest.cc index 5b87943..e63a390 100644 --- a/content/renderer/savable_resources_browsertest.cc +++ b/content/renderer/savable_resources_browsertest.cc @@ -18,7 +18,7 @@ namespace content { class SavableResourcesTest : public ContentBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) override { + void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kSingleProcess); #if defined(OS_WIN) // Don't want to try to create a GPU process. diff --git a/content/renderer/screen_orientation/screen_orientation_dispatcher.h b/content/renderer/screen_orientation/screen_orientation_dispatcher.h index 21dbf51..2752349 100644 --- a/content/renderer/screen_orientation/screen_orientation_dispatcher.h +++ b/content/renderer/screen_orientation/screen_orientation_dispatcher.h @@ -33,7 +33,7 @@ class CONTENT_EXPORT ScreenOrientationDispatcher : friend class ScreenOrientationDispatcherTest; // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // blink::WebScreenOrientationClient implementation. virtual void lockOrientation( diff --git a/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc b/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc index 678ebda..fd9a73d 100644 --- a/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc +++ b/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc @@ -59,9 +59,7 @@ class ScreenOrientationDispatcherWithSink : public ScreenOrientationDispatcher { :ScreenOrientationDispatcher(NULL) , sink_(sink) { } - virtual bool Send(IPC::Message* message) override { - return sink_->Send(message); - } + bool Send(IPC::Message* message) override { return sink_->Send(message); } IPC::TestSink* sink_; }; diff --git a/content/renderer/screen_orientation/screen_orientation_observer.h b/content/renderer/screen_orientation/screen_orientation_observer.h index bb48165..48cca8c 100644 --- a/content/renderer/screen_orientation/screen_orientation_observer.h +++ b/content/renderer/screen_orientation/screen_orientation_observer.h @@ -19,14 +19,14 @@ class ScreenOrientationObserver : public PlatformEventObserver<blink::WebPlatformEventListener> { public: ScreenOrientationObserver(); - virtual ~ScreenOrientationObserver(); + ~ScreenOrientationObserver() override; // Overriding this method just to make sure |listener| is always null. - virtual void Start(blink::WebPlatformEventListener* listener) override; + void Start(blink::WebPlatformEventListener* listener) override; protected: - virtual void SendStartMessage() override; - virtual void SendStopMessage() override; + void SendStartMessage() override; + void SendStopMessage() override; }; }; // namespace content diff --git a/content/renderer/service_worker/embedded_worker_context_message_filter.h b/content/renderer/service_worker/embedded_worker_context_message_filter.h index 50489c02..366c39f 100644 --- a/content/renderer/service_worker/embedded_worker_context_message_filter.h +++ b/content/renderer/service_worker/embedded_worker_context_message_filter.h @@ -18,12 +18,12 @@ class EmbeddedWorkerContextMessageFilter : public ChildMessageFilter { EmbeddedWorkerContextMessageFilter(); protected: - virtual ~EmbeddedWorkerContextMessageFilter(); + ~EmbeddedWorkerContextMessageFilter() override; // ChildMessageFilter implementation: - virtual base::TaskRunner* OverrideTaskRunnerForMessage( + base::TaskRunner* OverrideTaskRunnerForMessage( const IPC::Message& msg) override; - virtual bool OnMessageReceived(const IPC::Message& msg) override; + bool OnMessageReceived(const IPC::Message& msg) override; private: scoped_refptr<base::MessageLoopProxy> main_thread_loop_proxy_; diff --git a/content/renderer/service_worker/embedded_worker_devtools_agent.h b/content/renderer/service_worker/embedded_worker_devtools_agent.h index b294c34..97c1582 100644 --- a/content/renderer/service_worker/embedded_worker_devtools_agent.h +++ b/content/renderer/service_worker/embedded_worker_devtools_agent.h @@ -25,9 +25,9 @@ class EmbeddedWorkerDevToolsAgent : public IPC::Listener { public: EmbeddedWorkerDevToolsAgent(blink::WebEmbeddedWorker* webworker, int route_id); - virtual ~EmbeddedWorkerDevToolsAgent(); + ~EmbeddedWorkerDevToolsAgent() override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; private: void OnAttach(const std::string& host_id); diff --git a/content/renderer/service_worker/embedded_worker_dispatcher.h b/content/renderer/service_worker/embedded_worker_dispatcher.h index 5e4eee9..170d282 100644 --- a/content/renderer/service_worker/embedded_worker_dispatcher.h +++ b/content/renderer/service_worker/embedded_worker_dispatcher.h @@ -23,10 +23,10 @@ namespace content { class EmbeddedWorkerDispatcher : public IPC::Listener { public: EmbeddedWorkerDispatcher(); - virtual ~EmbeddedWorkerDispatcher(); + ~EmbeddedWorkerDispatcher() override; // IPC::Listener overrides. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; void WorkerContextDestroyed(int embedded_worker_id); diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.h b/content/renderer/shared_worker/embedded_shared_worker_stub.h index 92fdd0b..c710efa 100644 --- a/content/renderer/shared_worker/embedded_shared_worker_stub.h +++ b/content/renderer/shared_worker/embedded_shared_worker_stub.h @@ -42,8 +42,8 @@ class EmbeddedSharedWorkerStub : public IPC::Listener, int route_id); // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void OnChannelError() override; + bool OnMessageReceived(const IPC::Message& message) override; + void OnChannelError() override; // blink::WebSharedWorkerClient implementation. virtual void workerContextClosed() override; @@ -63,7 +63,7 @@ class EmbeddedSharedWorkerStub : public IPC::Listener, virtual void saveDevToolsAgentState(const blink::WebString& state) override; private: - virtual ~EmbeddedSharedWorkerStub(); + ~EmbeddedSharedWorkerStub() override; void Shutdown(); bool Send(IPC::Message* message); diff --git a/content/renderer/shared_worker_repository.h b/content/renderer/shared_worker_repository.h index e5fcbb50..5092e0c 100644 --- a/content/renderer/shared_worker_repository.h +++ b/content/renderer/shared_worker_repository.h @@ -20,7 +20,7 @@ class SharedWorkerRepository : public RenderFrameObserver, public blink::WebSharedWorkerRepositoryClient { public: explicit SharedWorkerRepository(RenderFrameImpl* render_frame); - virtual ~SharedWorkerRepository(); + ~SharedWorkerRepository() override; // WebSharedWorkerRepositoryClient overrides. virtual blink::WebSharedWorkerConnector* createSharedWorkerConnector( diff --git a/content/renderer/skia_benchmarking_extension.h b/content/renderer/skia_benchmarking_extension.h index 716378d..2e0faf1 100644 --- a/content/renderer/skia_benchmarking_extension.h +++ b/content/renderer/skia_benchmarking_extension.h @@ -28,10 +28,10 @@ class SkiaBenchmarking : public gin::Wrappable<SkiaBenchmarking> { private: SkiaBenchmarking(); - virtual ~SkiaBenchmarking(); + ~SkiaBenchmarking() override; // gin::Wrappable. - virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( + gin::ObjectTemplateBuilder GetObjectTemplateBuilder( v8::Isolate* isolate) override; // Rasterizes a Picture JSON-encoded by cc::Picture::AsValue(). diff --git a/content/renderer/speech_recognition_dispatcher.h b/content/renderer/speech_recognition_dispatcher.h index f1fe1d8..1024195 100644 --- a/content/renderer/speech_recognition_dispatcher.h +++ b/content/renderer/speech_recognition_dispatcher.h @@ -44,7 +44,7 @@ class SpeechRecognitionDispatcher : public RenderViewObserver, private: // RenderViewObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // blink::WebSpeechRecognizer implementation. virtual void start(const blink::WebSpeechRecognitionHandle&, diff --git a/content/renderer/stats_collection_controller.h b/content/renderer/stats_collection_controller.h index d847098..c36349c 100644 --- a/content/renderer/stats_collection_controller.h +++ b/content/renderer/stats_collection_controller.h @@ -27,10 +27,10 @@ class StatsCollectionController private: StatsCollectionController(); - virtual ~StatsCollectionController(); + ~StatsCollectionController() override; // gin::WrappableBase - virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( + gin::ObjectTemplateBuilder GetObjectTemplateBuilder( v8::Isolate* isolate) override; // Retrieves a histogram and returns a JSON representation of it. diff --git a/content/renderer/stats_collection_observer.h b/content/renderer/stats_collection_observer.h index d4efbbc..9aba8dc 100644 --- a/content/renderer/stats_collection_observer.h +++ b/content/renderer/stats_collection_observer.h @@ -17,11 +17,11 @@ class RenderViewImpl; class StatsCollectionObserver : public RenderViewObserver { public: explicit StatsCollectionObserver(RenderViewImpl* render_view); - virtual ~StatsCollectionObserver(); + ~StatsCollectionObserver() override; // RenderViewObserver implementation - virtual void DidStartLoading() override; - virtual void DidStopLoading() override; + void DidStartLoading() override; + void DidStopLoading() override; // Timing for the page load start and stop. These functions may return // a null time value under various circumstances. diff --git a/content/renderer/text_input_client_observer.h b/content/renderer/text_input_client_observer.h index 6e0734e..c8d1b4a 100644 --- a/content/renderer/text_input_client_observer.h +++ b/content/renderer/text_input_client_observer.h @@ -25,10 +25,10 @@ class RenderViewImpl; class TextInputClientObserver : public RenderViewObserver { public: explicit TextInputClientObserver(RenderViewImpl* render_view); - virtual ~TextInputClientObserver(); + ~TextInputClientObserver() override; // RenderViewObserver overrides: - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; private: // Returns the WebView of the RenderView. diff --git a/content/renderer/v8_value_converter_impl.h b/content/renderer/v8_value_converter_impl.h index 7cf4da0..decc10b 100644 --- a/content/renderer/v8_value_converter_impl.h +++ b/content/renderer/v8_value_converter_impl.h @@ -26,17 +26,16 @@ class CONTENT_EXPORT V8ValueConverterImpl : public V8ValueConverter { V8ValueConverterImpl(); // V8ValueConverter implementation. - virtual void SetDateAllowed(bool val) override; - virtual void SetRegExpAllowed(bool val) override; - virtual void SetFunctionAllowed(bool val) override; - virtual void SetStripNullFromObjects(bool val) override; - virtual void SetStrategy(Strategy* strategy) override; - virtual v8::Handle<v8::Value> ToV8Value( + void SetDateAllowed(bool val) override; + void SetRegExpAllowed(bool val) override; + void SetFunctionAllowed(bool val) override; + void SetStripNullFromObjects(bool val) override; + void SetStrategy(Strategy* strategy) override; + v8::Handle<v8::Value> ToV8Value( const base::Value* value, v8::Handle<v8::Context> context) const override; - virtual base::Value* FromV8Value( - v8::Handle<v8::Value> value, - v8::Handle<v8::Context> context) const override; + base::Value* FromV8Value(v8::Handle<v8::Value> value, + v8::Handle<v8::Context> context) const override; private: friend class ScopedAvoidIdentityHashForTesting; diff --git a/content/renderer/v8_value_converter_impl_unittest.cc b/content/renderer/v8_value_converter_impl_unittest.cc index b4bcb5f..2b44b12 100644 --- a/content/renderer/v8_value_converter_impl_unittest.cc +++ b/content/renderer/v8_value_converter_impl_unittest.cc @@ -716,33 +716,32 @@ class V8ValueConverterOverridingStrategyForTesting public: V8ValueConverterOverridingStrategyForTesting() : reference_value_(NewReferenceValue()) {} - virtual bool FromV8Object( - v8::Handle<v8::Object> value, - base::Value** out, - v8::Isolate* isolate, - const FromV8ValueCallback& callback) const override { + bool FromV8Object(v8::Handle<v8::Object> value, + base::Value** out, + v8::Isolate* isolate, + const FromV8ValueCallback& callback) const override { *out = NewReferenceValue(); return true; } - virtual bool FromV8Array(v8::Handle<v8::Array> value, - base::Value** out, - v8::Isolate* isolate, - const FromV8ValueCallback& callback) const override { + bool FromV8Array(v8::Handle<v8::Array> value, + base::Value** out, + v8::Isolate* isolate, + const FromV8ValueCallback& callback) const override { *out = NewReferenceValue(); return true; } - virtual bool FromV8ArrayBuffer(v8::Handle<v8::Object> value, - base::Value** out, - v8::Isolate* isolate) const override { + bool FromV8ArrayBuffer(v8::Handle<v8::Object> value, + base::Value** out, + v8::Isolate* isolate) const override { *out = NewReferenceValue(); return true; } - virtual bool FromV8Number(v8::Handle<v8::Number> value, - base::Value** out) const override { + bool FromV8Number(v8::Handle<v8::Number> value, + base::Value** out) const override { *out = NewReferenceValue(); return true; } - virtual bool FromV8Undefined(base::Value** out) const override { + bool FromV8Undefined(base::Value** out) const override { *out = NewReferenceValue(); return true; } @@ -809,31 +808,28 @@ TEST_F(V8ValueConverterImplTest, StrategyOverrides) { class V8ValueConverterBypassStrategyForTesting : public V8ValueConverter::Strategy { public: - virtual bool FromV8Object( - v8::Handle<v8::Object> value, - base::Value** out, - v8::Isolate* isolate, - const FromV8ValueCallback& callback) const override { + bool FromV8Object(v8::Handle<v8::Object> value, + base::Value** out, + v8::Isolate* isolate, + const FromV8ValueCallback& callback) const override { return false; } - virtual bool FromV8Array(v8::Handle<v8::Array> value, - base::Value** out, - v8::Isolate* isolate, - const FromV8ValueCallback& callback) const override { + bool FromV8Array(v8::Handle<v8::Array> value, + base::Value** out, + v8::Isolate* isolate, + const FromV8ValueCallback& callback) const override { return false; } - virtual bool FromV8ArrayBuffer(v8::Handle<v8::Object> value, - base::Value** out, - v8::Isolate* isolate) const override { + bool FromV8ArrayBuffer(v8::Handle<v8::Object> value, + base::Value** out, + v8::Isolate* isolate) const override { return false; } - virtual bool FromV8Number(v8::Handle<v8::Number> value, - base::Value** out) const override { - return false; - } - virtual bool FromV8Undefined(base::Value** out) const override { + bool FromV8Number(v8::Handle<v8::Number> value, + base::Value** out) const override { return false; } + bool FromV8Undefined(base::Value** out) const override { return false; } }; // Verify that having a strategy that fallbacks to default behaviour diff --git a/content/renderer/web_ui_extension_data.h b/content/renderer/web_ui_extension_data.h index c3283b5..f45bc46 100644 --- a/content/renderer/web_ui_extension_data.h +++ b/content/renderer/web_ui_extension_data.h @@ -19,7 +19,7 @@ class WebUIExtensionData public RenderViewObserverTracker<WebUIExtensionData> { public: explicit WebUIExtensionData(RenderView* render_view); - virtual ~WebUIExtensionData(); + ~WebUIExtensionData() override; // Returns value for a given |key|. Will return an empty string if no such key // exists in the |variable_map_|. @@ -27,7 +27,7 @@ class WebUIExtensionData private: // RenderViewObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; void OnSetWebUIProperty(const std::string& name, const std::string& value); diff --git a/content/renderer/web_ui_mojo.h b/content/renderer/web_ui_mojo.h index b3d67f6..dd9e752 100644 --- a/content/renderer/web_ui_mojo.h +++ b/content/renderer/web_ui_mojo.h @@ -34,12 +34,12 @@ class WebUIMojo class MainFrameObserver : public RenderFrameObserver { public: explicit MainFrameObserver(WebUIMojo* web_ui_mojo); - virtual ~MainFrameObserver(); + ~MainFrameObserver() override; // RenderFrameObserver overrides: - virtual void WillReleaseScriptContext(v8::Handle<v8::Context> context, - int world_id) override; - virtual void DidFinishDocumentLoad() override; + void WillReleaseScriptContext(v8::Handle<v8::Context> context, + int world_id) override; + void DidFinishDocumentLoad() override; private: WebUIMojo* web_ui_mojo_; @@ -47,7 +47,7 @@ class WebUIMojo DISALLOW_COPY_AND_ASSIGN(MainFrameObserver); }; - virtual ~WebUIMojo(); + ~WebUIMojo() override; void CreateContextState(); void DestroyContextState(v8::Handle<v8::Context> context); @@ -59,8 +59,8 @@ class WebUIMojo WebUIMojoContextState* GetContextState(); // RenderViewObserver overrides: - virtual void DidCreateDocumentElement(blink::WebLocalFrame* frame) override; - virtual void DidClearWindowObject(blink::WebLocalFrame* frame) override; + void DidCreateDocumentElement(blink::WebLocalFrame* frame) override; + void DidClearWindowObject(blink::WebLocalFrame* frame) override; MainFrameObserver main_frame_observer_; diff --git a/content/renderer/web_ui_mojo_context_state.h b/content/renderer/web_ui_mojo_context_state.h index 237feb5..e8879af 100644 --- a/content/renderer/web_ui_mojo_context_state.h +++ b/content/renderer/web_ui_mojo_context_state.h @@ -35,7 +35,7 @@ class WebUIMojoContextState : public gin::ModuleRegistryObserver { public: WebUIMojoContextState(blink::WebFrame* frame, v8::Handle<v8::Context> context); - virtual ~WebUIMojoContextState(); + ~WebUIMojoContextState() override; void Run(); @@ -58,7 +58,7 @@ class WebUIMojoContextState : public gin::ModuleRegistryObserver { const std::string& data); // gin::ModuleRegistryObserver overrides: - virtual void OnDidAddPendingModule( + void OnDidAddPendingModule( const std::string& id, const std::vector<std::string>& dependencies) override; diff --git a/content/renderer/web_ui_runner.h b/content/renderer/web_ui_runner.h index c80b5c9..2f17ab5 100644 --- a/content/renderer/web_ui_runner.h +++ b/content/renderer/web_ui_runner.h @@ -18,16 +18,16 @@ class WebUIRunner : public gin::Runner { public: // Does not take ownership of ContextHolder. WebUIRunner(blink::WebFrame* frame, gin::ContextHolder* context_holder); - virtual ~WebUIRunner(); + ~WebUIRunner() override; // Runner overrides: - virtual void Run(const std::string& source, - const std::string& resource_name) override; - virtual v8::Handle<v8::Value> Call(v8::Handle<v8::Function> function, - v8::Handle<v8::Value> receiver, - int argc, - v8::Handle<v8::Value> argv[]) override; - virtual gin::ContextHolder* GetContextHolder() override; + void Run(const std::string& source, + const std::string& resource_name) override; + v8::Handle<v8::Value> Call(v8::Handle<v8::Function> function, + v8::Handle<v8::Value> receiver, + int argc, + v8::Handle<v8::Value> argv[]) override; + gin::ContextHolder* GetContextHolder() override; private: // Frame to execute script in. diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h index 426bbb4..ac02826 100644 --- a/content/renderer/websharedworker_proxy.h +++ b/content/renderer/websharedworker_proxy.h @@ -39,7 +39,7 @@ class WebSharedWorkerProxy : public blink::WebSharedWorkerConnector, private: // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; // Disconnects the worker (stops listening for incoming messages). void Disconnect(); |