From 5588f52eb0a27a4117b08c41dd735c43d4992bcf Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 13 Jun 2021 04:05:10 +0000 Subject: [PATCH] Remove deprecated DISALLOW_ macros from /third_party/blink/renderer/core/inspector Macros such as DISALLOW_COPY_AND_ASSIGN() are deprecated since r711900 per style arbitration [1]. This commit replaces the macros with deleted constructors and methods, which is preferred by the Google C++ Style Guide [2][3]. Also remove unneeded "base/macros.h" #includes when possible. [1]: https://groups.google.com/a/chromium.org/g/cxx/c/qwH2hxaEjac/m/TUKq6eqfCwAJ [2]: https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/c++-dos-and-donts.md#explicitly-declare-class-copyability_movability [3]: https://google.github.io/styleguide/cppguide.html#Copyable_Movable_Types This CL was uploaded by git cl split. R=dgozman@chromium.org Bug: 1010217 Change-Id: I984f14eb4f025f2467d3151e2d0bdf461d05fb4f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2957412 Auto-Submit: Timothy Gu Reviewed-by: Dmitry Gozman Commit-Queue: Dmitry Gozman Cr-Commit-Position: refs/heads/master@{#891931} --- .../core/inspector/console_message_storage.h | 5 ++- .../renderer/core/inspector/devtools_agent.cc | 5 +-- .../core/inspector/devtools_session.cc | 5 +-- .../core/inspector/devtools_session.h | 5 ++- .../renderer/core/inspector/dom_editor.cc | 25 +++++++++------ .../renderer/core/inspector/dom_editor.h | 5 ++- .../core/inspector/dom_patch_support.h | 5 ++- .../renderer/core/inspector/inspect_tools.h | 32 ++++++++++++------- .../core/inspector/inspected_frames.h | 4 +-- .../inspector/inspector_animation_agent.h | 4 +-- .../inspector_application_cache_agent.h | 6 ++-- .../core/inspector/inspector_audits_agent.h | 5 ++- .../core/inspector/inspector_css_agent.cc | 18 ++++++----- .../core/inspector/inspector_css_agent.h | 4 +-- .../core/inspector/inspector_dom_agent.h | 4 +-- .../inspector/inspector_dom_debugger_agent.h | 5 +-- .../inspector/inspector_dom_snapshot_agent.h | 6 ++-- .../inspector/inspector_emulation_agent.h | 4 +-- .../core/inspector/inspector_highlight.cc | 4 +-- .../core/inspector/inspector_history.h | 5 ++- .../core/inspector/inspector_io_agent.h | 4 +-- .../core/inspector/inspector_issue_storage.h | 5 ++- .../inspector/inspector_layer_tree_agent.h | 4 +-- .../core/inspector/inspector_log_agent.h | 4 +-- .../core/inspector/inspector_media_agent.h | 3 +- .../core/inspector/inspector_memory_agent.h | 4 +-- .../core/inspector/inspector_network_agent.cc | 11 +++++-- .../core/inspector/inspector_overlay_agent.h | 8 ++--- .../core/inspector/inspector_page_agent.h | 4 +-- .../inspector/inspector_performance_agent.h | 5 +-- .../inspector_performance_timeline_agent.h | 6 ++-- .../inspector/inspector_resource_container.h | 5 +-- .../inspector_resource_content_loader.h | 6 ++-- .../core/inspector/inspector_task_runner.h | 5 +-- .../core/inspector/inspector_trace_events.h | 6 ++-- .../inspector/legacy_dom_snapshot_agent.h | 4 +-- .../core/inspector/locale_controller.h | 4 ++- .../core/inspector/main_thread_debugger.h | 4 +-- .../renderer/core/inspector/thread_debugger.h | 4 +-- .../inspector/worker_inspector_controller.h | 6 ++-- .../core/inspector/worker_thread_debugger.h | 5 ++- 41 files changed, 146 insertions(+), 117 deletions(-) diff --git a/third_party/blink/renderer/core/inspector/console_message_storage.h b/third_party/blink/renderer/core/inspector/console_message_storage.h index 1ea2efe53a435f..e011f65d05a5d9 100644 --- a/third_party/blink/renderer/core/inspector/console_message_storage.h +++ b/third_party/blink/renderer/core/inspector/console_message_storage.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_CONSOLE_MESSAGE_STORAGE_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_CONSOLE_MESSAGE_STORAGE_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/platform/heap/handle.h" #include "third_party/blink/renderer/platform/wtf/forward.h" @@ -19,6 +18,8 @@ class CORE_EXPORT ConsoleMessageStorage : public GarbageCollected { public: ConsoleMessageStorage(); + ConsoleMessageStorage(const ConsoleMessageStorage&) = delete; + ConsoleMessageStorage& operator=(const ConsoleMessageStorage&) = delete; // If |discard_duplicates| is set, the message will only be added if no // console message with the same text has exists in |messages_|. Returns @@ -36,8 +37,6 @@ class CORE_EXPORT ConsoleMessageStorage private: int expired_count_; HeapDeque> messages_; - - DISALLOW_COPY_AND_ASSIGN(ConsoleMessageStorage); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/devtools_agent.cc b/third_party/blink/renderer/core/inspector/devtools_agent.cc index 1cd6ee12ff78f7..2b6fdfaf9c0e21 100644 --- a/third_party/blink/renderer/core/inspector/devtools_agent.cc +++ b/third_party/blink/renderer/core/inspector/devtools_agent.cc @@ -86,6 +86,9 @@ class DevToolsAgent::IOAgent : public mojom::blink::DevToolsAgent { CrossThreadUnretained(this), std::move(receiver))); } + IOAgent(const IOAgent&) = delete; + IOAgent& operator=(const IOAgent&) = delete; + void BindInterface( mojo::PendingReceiver receiver) { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); @@ -154,8 +157,6 @@ class DevToolsAgent::IOAgent : public mojom::blink::DevToolsAgent { scoped_refptr inspector_task_runner_; CrossThreadWeakPersistent<::blink::DevToolsAgent> agent_; mojo::Receiver receiver_{this}; - - DISALLOW_COPY_AND_ASSIGN(IOAgent); }; DevToolsAgent::DevToolsAgent( diff --git a/third_party/blink/renderer/core/inspector/devtools_session.cc b/third_party/blink/renderer/core/inspector/devtools_session.cc index 242653b4e72375..881b5a62345862 100644 --- a/third_party/blink/renderer/core/inspector/devtools_session.cc +++ b/third_party/blink/renderer/core/inspector/devtools_session.cc @@ -64,6 +64,9 @@ class DevToolsSession::IOSession : public mojom::blink::DevToolsSession { CrossThreadUnretained(this), std::move(receiver))); } + IOSession(const IOSession&) = delete; + IOSession& operator=(const IOSession&) = delete; + ~IOSession() override = default; void BindInterface( @@ -104,8 +107,6 @@ class DevToolsSession::IOSession : public mojom::blink::DevToolsSession { scoped_refptr inspector_task_runner_; CrossThreadWeakPersistent<::blink::DevToolsSession> session_; mojo::Receiver receiver_{this}; - - DISALLOW_COPY_AND_ASSIGN(IOSession); }; DevToolsSession::DevToolsSession( diff --git a/third_party/blink/renderer/core/inspector/devtools_session.h b/third_party/blink/renderer/core/inspector/devtools_session.h index 1fb9aa9ea75384..6410f3af7be664 100644 --- a/third_party/blink/renderer/core/inspector/devtools_session.h +++ b/third_party/blink/renderer/core/inspector/devtools_session.h @@ -7,7 +7,6 @@ #include #include "base/callback.h" -#include "base/macros.h" #include "mojo/public/cpp/bindings/pending_associated_receiver.h" #include "mojo/public/cpp/bindings/pending_associated_remote.h" #include "mojo/public/cpp/bindings/pending_receiver.h" @@ -48,6 +47,8 @@ class CORE_EXPORT DevToolsSession : public GarbageCollected, bool client_expects_binary_responses, const String& session_id, scoped_refptr mojo_task_runner); + DevToolsSession(const DevToolsSession&) = delete; + DevToolsSession& operator=(const DevToolsSession&) = delete; ~DevToolsSession() override; void ConnectToV8(v8_inspector::V8Inspector*, int context_group_id); @@ -123,8 +124,6 @@ class CORE_EXPORT DevToolsSession : public GarbageCollected, InspectorAgentState v8_session_state_; InspectorAgentState::Bytes v8_session_state_cbor_; const String session_id_; - - DISALLOW_COPY_AND_ASSIGN(DevToolsSession); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/dom_editor.cc b/third_party/blink/renderer/core/inspector/dom_editor.cc index c75fe54d5d823c..de08cccaf937da 100644 --- a/third_party/blink/renderer/core/inspector/dom_editor.cc +++ b/third_party/blink/renderer/core/inspector/dom_editor.cc @@ -30,7 +30,6 @@ #include "third_party/blink/renderer/core/inspector/dom_editor.h" -#include "base/macros.h" #include "base/memory/scoped_refptr.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/dom/dom_exception.h" @@ -53,6 +52,8 @@ class DOMEditor::RemoveChildAction final : public InspectorHistory::Action { : InspectorHistory::Action("RemoveChild"), parent_node_(parent_node), node_(node) {} + RemoveChildAction(const RemoveChildAction&) = delete; + RemoveChildAction& operator=(const RemoveChildAction&) = delete; bool Perform(ExceptionState& exception_state) override { anchor_node_ = node_->nextSibling(); @@ -81,7 +82,6 @@ class DOMEditor::RemoveChildAction final : public InspectorHistory::Action { Member parent_node_; Member node_; Member anchor_node_; - DISALLOW_COPY_AND_ASSIGN(RemoveChildAction); }; class DOMEditor::InsertBeforeAction final : public InspectorHistory::Action { @@ -91,6 +91,8 @@ class DOMEditor::InsertBeforeAction final : public InspectorHistory::Action { parent_node_(parent_node), node_(node), anchor_node_(anchor_node) {} + InsertBeforeAction(const InsertBeforeAction&) = delete; + InsertBeforeAction& operator=(const InsertBeforeAction&) = delete; bool Perform(ExceptionState& exception_state) override { if (node_->parentNode()) { @@ -134,7 +136,6 @@ class DOMEditor::InsertBeforeAction final : public InspectorHistory::Action { Member node_; Member anchor_node_; Member remove_child_action_; - DISALLOW_COPY_AND_ASSIGN(InsertBeforeAction); }; class DOMEditor::RemoveAttributeAction final : public InspectorHistory::Action { @@ -143,6 +144,8 @@ class DOMEditor::RemoveAttributeAction final : public InspectorHistory::Action { : InspectorHistory::Action("RemoveAttribute"), element_(element), name_(name) {} + RemoveAttributeAction(const RemoveAttributeAction&) = delete; + RemoveAttributeAction& operator=(const RemoveAttributeAction&) = delete; bool Perform(ExceptionState& exception_state) override { value_ = element_->getAttribute(name_); @@ -168,7 +171,6 @@ class DOMEditor::RemoveAttributeAction final : public InspectorHistory::Action { Member element_; AtomicString name_; AtomicString value_; - DISALLOW_COPY_AND_ASSIGN(RemoveAttributeAction); }; class DOMEditor::SetAttributeAction final : public InspectorHistory::Action { @@ -181,6 +183,8 @@ class DOMEditor::SetAttributeAction final : public InspectorHistory::Action { name_(name), value_(value), had_attribute_(false) {} + SetAttributeAction(const SetAttributeAction&) = delete; + SetAttributeAction& operator=(const SetAttributeAction&) = delete; bool Perform(ExceptionState& exception_state) override { const AtomicString& value = element_->getAttribute(name_); @@ -214,7 +218,6 @@ class DOMEditor::SetAttributeAction final : public InspectorHistory::Action { AtomicString value_; bool had_attribute_; AtomicString old_value_; - DISALLOW_COPY_AND_ASSIGN(SetAttributeAction); }; class DOMEditor::SetOuterHTMLAction final : public InspectorHistory::Action { @@ -227,6 +230,8 @@ class DOMEditor::SetOuterHTMLAction final : public InspectorHistory::Action { new_node_(nullptr), history_(MakeGarbageCollected()), dom_editor_(MakeGarbageCollected(history_.Get())) {} + SetOuterHTMLAction(const SetOuterHTMLAction&) = delete; + SetOuterHTMLAction& operator=(const SetOuterHTMLAction&) = delete; bool Perform(ExceptionState& exception_state) override { old_html_ = CreateMarkup(node_.Get()); @@ -268,7 +273,6 @@ class DOMEditor::SetOuterHTMLAction final : public InspectorHistory::Action { Member new_node_; Member history_; Member dom_editor_; - DISALLOW_COPY_AND_ASSIGN(SetOuterHTMLAction); }; class DOMEditor::ReplaceWholeTextAction final @@ -278,6 +282,8 @@ class DOMEditor::ReplaceWholeTextAction final : InspectorHistory::Action("ReplaceWholeText"), text_node_(text_node), text_(text) {} + ReplaceWholeTextAction(const ReplaceWholeTextAction&) = delete; + ReplaceWholeTextAction& operator=(const ReplaceWholeTextAction&) = delete; bool Perform(ExceptionState& exception_state) override { old_text_ = text_node_->wholeText(); @@ -303,7 +309,6 @@ class DOMEditor::ReplaceWholeTextAction final Member text_node_; String text_; String old_text_; - DISALLOW_COPY_AND_ASSIGN(ReplaceWholeTextAction); }; class DOMEditor::ReplaceChildNodeAction final @@ -316,6 +321,8 @@ class DOMEditor::ReplaceChildNodeAction final parent_node_(parent_node), new_node_(new_node), old_node_(old_node) {} + ReplaceChildNodeAction(const ReplaceChildNodeAction&) = delete; + ReplaceChildNodeAction& operator=(const ReplaceChildNodeAction&) = delete; bool Perform(ExceptionState& exception_state) override { return Redo(exception_state); @@ -342,13 +349,14 @@ class DOMEditor::ReplaceChildNodeAction final Member parent_node_; Member new_node_; Member old_node_; - DISALLOW_COPY_AND_ASSIGN(ReplaceChildNodeAction); }; class DOMEditor::SetNodeValueAction final : public InspectorHistory::Action { public: SetNodeValueAction(Node* node, const String& value) : InspectorHistory::Action("SetNodeValue"), node_(node), value_(value) {} + SetNodeValueAction(const SetNodeValueAction&) = delete; + SetNodeValueAction& operator=(const SetNodeValueAction&) = delete; bool Perform(ExceptionState&) override { old_value_ = node_->nodeValue(); @@ -374,7 +382,6 @@ class DOMEditor::SetNodeValueAction final : public InspectorHistory::Action { Member node_; String value_; String old_value_; - DISALLOW_COPY_AND_ASSIGN(SetNodeValueAction); }; DOMEditor::DOMEditor(InspectorHistory* history) : history_(history) {} diff --git a/third_party/blink/renderer/core/inspector/dom_editor.h b/third_party/blink/renderer/core/inspector/dom_editor.h index 76de15b60dc7ec..43ba5e4ba0f971 100644 --- a/third_party/blink/renderer/core/inspector/dom_editor.h +++ b/third_party/blink/renderer/core/inspector/dom_editor.h @@ -31,7 +31,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_DOM_EDITOR_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_DOM_EDITOR_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/inspector/protocol/Forward.h" #include "third_party/blink/renderer/platform/heap/handle.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" @@ -48,6 +47,8 @@ class Text; class DOMEditor final : public GarbageCollected { public: explicit DOMEditor(InspectorHistory*); + DOMEditor(const DOMEditor&) = delete; + DOMEditor& operator=(const DOMEditor&) = delete; void Trace(Visitor*) const; @@ -95,8 +96,6 @@ class DOMEditor final : public GarbageCollected { class SetNodeValueAction; Member history_; - - DISALLOW_COPY_AND_ASSIGN(DOMEditor); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/dom_patch_support.h b/third_party/blink/renderer/core/inspector/dom_patch_support.h index 5160f97c4d4e50..3c5f6c745300c6 100644 --- a/third_party/blink/renderer/core/inspector/dom_patch_support.h +++ b/third_party/blink/renderer/core/inspector/dom_patch_support.h @@ -31,7 +31,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_DOM_PATCH_SUPPORT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_DOM_PATCH_SUPPORT_H_ -#include "base/macros.h" #include "third_party/blink/renderer/platform/heap/handle.h" #include "third_party/blink/renderer/platform/wtf/hash_map.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" @@ -50,6 +49,8 @@ class DOMPatchSupport final { public: DOMPatchSupport(DOMEditor*, Document&); + DOMPatchSupport(const DOMPatchSupport&) = delete; + DOMPatchSupport& operator=(const DOMPatchSupport&) = delete; void PatchDocument(const String& markup); Node* PatchNode(Node*, const String& markup, ExceptionState&); @@ -90,8 +91,6 @@ class DOMPatchSupport final { Document* document_; UnusedNodesMap unused_nodes_map_; - - DISALLOW_COPY_AND_ASSIGN(DOMPatchSupport); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspect_tools.h b/third_party/blink/renderer/core/inspector/inspect_tools.h index dbe9c78e4fb751..066a2a3fc5db2f 100644 --- a/third_party/blink/renderer/core/inspector/inspect_tools.h +++ b/third_party/blink/renderer/core/inspector/inspect_tools.h @@ -8,7 +8,6 @@ #include #include -#include "base/macros.h" #include "third_party/blink/renderer/core/inspector/inspector_overlay_agent.h" #include "third_party/blink/renderer/core/inspector/node_content_visibility_state.h" @@ -26,6 +25,8 @@ class SearchingForNodeTool : public InspectTool { InspectorDOMAgent* dom_agent, bool ua_shadow, const std::vector& highlight_config); + SearchingForNodeTool(const SearchingForNodeTool&) = delete; + SearchingForNodeTool& operator=(const SearchingForNodeTool&) = delete; void Trace(Visitor* visitor) const override; @@ -54,7 +55,6 @@ class SearchingForNodeTool : public InspectTool { std::unique_ptr highlight_config_; InspectorHighlightContrastInfo contrast_info_; bool omit_tooltip_ = false; - DISALLOW_COPY_AND_ASSIGN(SearchingForNodeTool); }; // ----------------------------------------------------------------------------- @@ -66,6 +66,8 @@ class QuadHighlightTool : public InspectTool { std::unique_ptr quad, Color color, Color outline_color); + QuadHighlightTool(const QuadHighlightTool&) = delete; + QuadHighlightTool& operator=(const QuadHighlightTool&) = delete; private: bool ForwardEventsToOverlay() override; @@ -75,7 +77,6 @@ class QuadHighlightTool : public InspectTool { std::unique_ptr quad_; Color color_; Color outline_color_; - DISALLOW_COPY_AND_ASSIGN(QuadHighlightTool); }; // ----------------------------------------------------------------------------- @@ -87,6 +88,8 @@ class NodeHighlightTool : public InspectTool { Member node, String selector_list, std::unique_ptr highlight_config); + NodeHighlightTool(const NodeHighlightTool&) = delete; + NodeHighlightTool& operator=(const NodeHighlightTool&) = delete; std::unique_ptr GetNodeInspectorHighlightAsJson( bool append_element_info, @@ -110,7 +113,6 @@ class NodeHighlightTool : public InspectTool { String selector_list_; std::unique_ptr highlight_config_; InspectorHighlightContrastInfo contrast_info_; - DISALLOW_COPY_AND_ASSIGN(NodeHighlightTool); }; // ----------------------------------------------------------------------------- @@ -122,6 +124,8 @@ class SourceOrderTool : public InspectTool { OverlayFrontend* frontend, Node* node, std::unique_ptr source_order_config); + SourceOrderTool(const SourceOrderTool&) = delete; + SourceOrderTool& operator=(const SourceOrderTool&) = delete; std::unique_ptr GetNodeInspectorSourceOrderHighlightAsJson() const; @@ -137,7 +141,6 @@ class SourceOrderTool : public InspectTool { Member node_; std::unique_ptr source_order_config_; - DISALLOW_COPY_AND_ASSIGN(SourceOrderTool); }; // ----------------------------------------------------------------------------- @@ -155,6 +158,9 @@ class PersistentTool : public InspectTool { using InspectTool::InspectTool; public: + PersistentTool(const PersistentTool&) = delete; + PersistentTool& operator=(const PersistentTool&) = delete; + void Draw(float scale) override; bool IsEmpty(); void SetGridConfigs(GridConfigs); @@ -173,13 +179,14 @@ class PersistentTool : public InspectTool { GridConfigs grid_node_highlights_; FlexContainerConfigs flex_container_configs_; ScrollSnapConfigs scroll_snap_configs_; - DISALLOW_COPY_AND_ASSIGN(PersistentTool); }; // ----------------------------------------------------------------------------- class NearbyDistanceTool : public InspectTool { public: + NearbyDistanceTool(const NearbyDistanceTool&) = delete; + NearbyDistanceTool& operator=(const NearbyDistanceTool&) = delete; void Trace(Visitor* visitor) const override; private: @@ -193,7 +200,6 @@ class NearbyDistanceTool : public InspectTool { String GetOverlayName() override; Member hovered_node_; - DISALLOW_COPY_AND_ASSIGN(NearbyDistanceTool); }; // ----------------------------------------------------------------------------- @@ -201,11 +207,14 @@ class NearbyDistanceTool : public InspectTool { class ShowViewSizeTool : public InspectTool { using InspectTool::InspectTool; + public: + ShowViewSizeTool(const ShowViewSizeTool&) = delete; + ShowViewSizeTool& operator=(const ShowViewSizeTool&) = delete; + private: bool ForwardEventsToOverlay() override; void Draw(float scale) override; String GetOverlayName() override; - DISALLOW_COPY_AND_ASSIGN(ShowViewSizeTool); }; // ----------------------------------------------------------------------------- @@ -213,12 +222,12 @@ class ShowViewSizeTool : public InspectTool { class ScreenshotTool : public InspectTool { public: ScreenshotTool(InspectorOverlayAgent* overlay, OverlayFrontend* frontend); + ScreenshotTool(const ScreenshotTool&) = delete; + ScreenshotTool& operator=(const ScreenshotTool&) = delete; private: void Dispatch(const String& message) override; String GetOverlayName() override; - - DISALLOW_COPY_AND_ASSIGN(ScreenshotTool); }; // ----------------------------------------------------------------------------- @@ -232,6 +241,8 @@ class PausedInDebuggerTool : public InspectTool { : InspectTool(overlay, frontend), v8_session_(v8_session), message_(message) {} + PausedInDebuggerTool(const PausedInDebuggerTool&) = delete; + PausedInDebuggerTool& operator=(const PausedInDebuggerTool&) = delete; private: void Draw(float scale) override; @@ -239,7 +250,6 @@ class PausedInDebuggerTool : public InspectTool { String GetOverlayName() override; v8_inspector::V8InspectorSession* v8_session_; String message_; - DISALLOW_COPY_AND_ASSIGN(PausedInDebuggerTool); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspected_frames.h b/third_party/blink/renderer/core/inspector/inspected_frames.h index 763bc91531bc02..71c2e619e7aa9b 100644 --- a/third_party/blink/renderer/core/inspector/inspected_frames.h +++ b/third_party/blink/renderer/core/inspector/inspected_frames.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTED_FRAMES_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTED_FRAMES_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/platform/heap/handle.h" #include "third_party/blink/renderer/platform/wtf/forward.h" @@ -37,6 +36,8 @@ class CORE_EXPORT InspectedFrames final }; explicit InspectedFrames(LocalFrame*); + InspectedFrames(const InspectedFrames&) = delete; + InspectedFrames& operator=(const InspectedFrames&) = delete; LocalFrame* Root() { return root_; } bool Contains(LocalFrame*) const; @@ -48,7 +49,6 @@ class CORE_EXPORT InspectedFrames final private: Member root_; - DISALLOW_COPY_AND_ASSIGN(InspectedFrames); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_animation_agent.h b/third_party/blink/renderer/core/inspector/inspector_animation_agent.h index 4cf66c2b5d0c58..ede0395b5e63d9 100644 --- a/third_party/blink/renderer/core/inspector/inspector_animation_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_animation_agent.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_ANIMATION_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_ANIMATION_AGENT_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/animation/animation.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/css/css_keyframes_rule.h" @@ -26,6 +25,8 @@ class CORE_EXPORT InspectorAnimationAgent final InspectorAnimationAgent(InspectedFrames*, InspectorCSSAgent*, v8_inspector::V8InspectorSession*); + InspectorAnimationAgent(const InspectorAnimationAgent&) = delete; + InspectorAnimationAgent& operator=(const InspectorAnimationAgent&) = delete; // Base agent methods. void Restore() override; @@ -91,7 +92,6 @@ class CORE_EXPORT InspectorAnimationAgent final HashSet cleared_animations_; InspectorAgentState::Boolean enabled_; InspectorAgentState::Double playback_rate_; - DISALLOW_COPY_AND_ASSIGN(InspectorAnimationAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_application_cache_agent.h b/third_party/blink/renderer/core/inspector/inspector_application_cache_agent.h index 73e63e2dc1ef38..799dd6aac80764 100644 --- a/third_party/blink/renderer/core/inspector/inspector_application_cache_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_application_cache_agent.h @@ -26,7 +26,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_APPLICATION_CACHE_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_APPLICATION_CACHE_AGENT_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h" #include "third_party/blink/renderer/core/inspector/protocol/ApplicationCache.h" @@ -41,6 +40,10 @@ class CORE_EXPORT InspectorApplicationCacheAgent final : public InspectorBaseAgent { public: explicit InspectorApplicationCacheAgent(InspectedFrames*); + InspectorApplicationCacheAgent(const InspectorApplicationCacheAgent&) = + delete; + InspectorApplicationCacheAgent& operator=( + const InspectorApplicationCacheAgent&) = delete; ~InspectorApplicationCacheAgent() override = default; void Trace(Visitor*) const override; @@ -86,7 +89,6 @@ class CORE_EXPORT InspectorApplicationCacheAgent final Member inspected_frames_; InspectorAgentState::Boolean enabled_; - DISALLOW_COPY_AND_ASSIGN(InspectorApplicationCacheAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_audits_agent.h b/third_party/blink/renderer/core/inspector/inspector_audits_agent.h index 5c5f4e890449d1..ed8b22090981a9 100644 --- a/third_party/blink/renderer/core/inspector/inspector_audits_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_audits_agent.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_AUDITS_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_AUDITS_AGENT_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/inspector/inspected_frames.h" @@ -24,6 +23,8 @@ class CORE_EXPORT InspectorAuditsAgent final explicit InspectorAuditsAgent(InspectorNetworkAgent*, InspectorIssueStorage*, InspectedFrames*); + InspectorAuditsAgent(const InspectorAuditsAgent&) = delete; + InspectorAuditsAgent& operator=(const InspectorAuditsAgent&) = delete; ~InspectorAuditsAgent() override; void Trace(Visitor*) const override; @@ -54,8 +55,6 @@ class CORE_EXPORT InspectorAuditsAgent final InspectorAgentState::Boolean enabled_; Member network_agent_; Member inspected_frames_; - - DISALLOW_COPY_AND_ASSIGN(InspectorAuditsAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_css_agent.cc b/third_party/blink/renderer/core/inspector/inspector_css_agent.cc index 05c9c63a760e79..a84bdfc301ac9c 100644 --- a/third_party/blink/renderer/core/inspector/inspector_css_agent.cc +++ b/third_party/blink/renderer/core/inspector/inspector_css_agent.cc @@ -27,7 +27,6 @@ #include -#include "base/macros.h" #include "third_party/blink/renderer/core/animation/css/css_animation_data.h" #include "third_party/blink/renderer/core/css/css_color.h" #include "third_party/blink/renderer/core/css/css_computed_style_declaration.h" @@ -231,13 +230,12 @@ static unsigned ComputePseudoClassMask( class InspectorCSSAgent::StyleSheetAction : public InspectorHistory::Action { public: StyleSheetAction(const String& name) : InspectorHistory::Action(name) {} + StyleSheetAction(const StyleSheetAction&) = delete; + StyleSheetAction& operator=(const StyleSheetAction&) = delete; virtual std::unique_ptr TakeSerializedStyle() { return nullptr; } - - private: - DISALLOW_COPY_AND_ASSIGN(StyleSheetAction); }; class InspectorCSSAgent::SetStyleSheetTextAction final @@ -248,6 +246,8 @@ class InspectorCSSAgent::SetStyleSheetTextAction final : InspectorCSSAgent::StyleSheetAction("SetStyleSheetText"), style_sheet_(style_sheet), text_(text) {} + SetStyleSheetTextAction(const SetStyleSheetTextAction&) = delete; + SetStyleSheetTextAction& operator=(const SetStyleSheetTextAction&) = delete; bool Perform(ExceptionState& exception_state) override { if (!style_sheet_->GetText(&old_text_)) @@ -285,7 +285,6 @@ class InspectorCSSAgent::SetStyleSheetTextAction final Member style_sheet_; String text_; String old_text_; - DISALLOW_COPY_AND_ASSIGN(SetStyleSheetTextAction); }; class InspectorCSSAgent::ModifyRuleAction final @@ -309,6 +308,8 @@ class InspectorCSSAgent::ModifyRuleAction final new_text_(text), old_range_(range), css_rule_(nullptr) {} + ModifyRuleAction(const ModifyRuleAction&) = delete; + ModifyRuleAction& operator=(const ModifyRuleAction&) = delete; bool Perform(ExceptionState& exception_state) override { return Redo(exception_state); @@ -411,7 +412,6 @@ class InspectorCSSAgent::ModifyRuleAction final SourceRange old_range_; SourceRange new_range_; Member css_rule_; - DISALLOW_COPY_AND_ASSIGN(ModifyRuleAction); }; class InspectorCSSAgent::SetElementStyleAction final @@ -422,6 +422,8 @@ class InspectorCSSAgent::SetElementStyleAction final : InspectorCSSAgent::StyleSheetAction("SetElementStyleAction"), style_sheet_(style_sheet), text_(text) {} + SetElementStyleAction(const SetElementStyleAction&) = delete; + SetElementStyleAction& operator=(const SetElementStyleAction&) = delete; bool Perform(ExceptionState& exception_state) override { return Redo(exception_state); @@ -462,7 +464,6 @@ class InspectorCSSAgent::SetElementStyleAction final Member style_sheet_; String text_; String old_text_; - DISALLOW_COPY_AND_ASSIGN(SetElementStyleAction); }; class InspectorCSSAgent::AddRuleAction final @@ -475,6 +476,8 @@ class InspectorCSSAgent::AddRuleAction final style_sheet_(style_sheet), rule_text_(rule_text), location_(location) {} + AddRuleAction(const AddRuleAction&) = delete; + AddRuleAction& operator=(const AddRuleAction&) = delete; bool Perform(ExceptionState& exception_state) override { return Redo(exception_state); @@ -513,7 +516,6 @@ class InspectorCSSAgent::AddRuleAction final String old_text_; SourceRange location_; SourceRange added_range_; - DISALLOW_COPY_AND_ASSIGN(AddRuleAction); }; // static diff --git a/third_party/blink/renderer/core/inspector/inspector_css_agent.h b/third_party/blink/renderer/core/inspector/inspector_css_agent.h index 949677f9b4b8e3..43dc23201f7615 100644 --- a/third_party/blink/renderer/core/inspector/inspector_css_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_css_agent.h @@ -26,7 +26,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_CSS_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_CSS_AGENT_H_ -#include "base/macros.h" #include "base/memory/scoped_refptr.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/css/css_rule_list.h" @@ -114,6 +113,8 @@ class CORE_EXPORT InspectorCSSAgent final InspectorNetworkAgent*, InspectorResourceContentLoader*, InspectorResourceContainer*); + InspectorCSSAgent(const InspectorCSSAgent&) = delete; + InspectorCSSAgent& operator=(const InspectorCSSAgent&) = delete; ~InspectorCSSAgent() override; void Trace(Visitor*) const override; @@ -391,7 +392,6 @@ class CORE_EXPORT InspectorCSSAgent final friend class InspectorResourceContentLoaderCallback; friend class StyleSheetBinder; - DISALLOW_COPY_AND_ASSIGN(InspectorCSSAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_dom_agent.h b/third_party/blink/renderer/core/inspector/inspector_dom_agent.h index 826fa8bc62095d..cf906953e55d4c 100644 --- a/third_party/blink/renderer/core/inspector/inspector_dom_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_dom_agent.h @@ -32,7 +32,6 @@ #include #include "base/callback.h" -#include "base/macros.h" #include "base/memory/scoped_refptr.h" #include "third_party/blink/renderer/bindings/core/v8/source_location.h" #include "third_party/blink/renderer/core/core_export.h" @@ -102,6 +101,8 @@ class CORE_EXPORT InspectorDOMAgent final InspectorDOMAgent(v8::Isolate*, InspectedFrames*, v8_inspector::V8InspectorSession*); + InspectorDOMAgent(const InspectorDOMAgent&) = delete; + InspectorDOMAgent& operator=(const InspectorDOMAgent&) = delete; ~InspectorDOMAgent() override; void Trace(Visitor*) const override; @@ -397,7 +398,6 @@ class CORE_EXPORT InspectorDOMAgent final bool suppress_attribute_modified_event_; InspectorAgentState::Boolean enabled_; InspectorAgentState::Boolean capture_node_stack_traces_; - DISALLOW_COPY_AND_ASSIGN(InspectorDOMAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_dom_debugger_agent.h b/third_party/blink/renderer/core/inspector/inspector_dom_debugger_agent.h index c822806948ad1d..4496c0a8cd6d8a 100644 --- a/third_party/blink/renderer/core/inspector/inspector_dom_debugger_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_dom_debugger_agent.h @@ -31,7 +31,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_DOM_DEBUGGER_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_DOM_DEBUGGER_AGENT_H_ -#include "base/macros.h" #include "third_party/blink/renderer/bindings/core/v8/v8_event_listener_info.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/frame/csp/content_security_policy.h" @@ -67,6 +66,9 @@ class CORE_EXPORT InspectorDOMDebuggerAgent final InspectorDOMDebuggerAgent(v8::Isolate*, InspectorDOMAgent*, v8_inspector::V8InspectorSession*); + InspectorDOMDebuggerAgent(const InspectorDOMDebuggerAgent&) = delete; + InspectorDOMDebuggerAgent& operator=(const InspectorDOMDebuggerAgent&) = + delete; ~InspectorDOMDebuggerAgent() override; void Trace(Visitor*) const override; @@ -183,7 +185,6 @@ class CORE_EXPORT InspectorDOMDebuggerAgent final InspectorAgentState::BooleanMap xhr_breakpoints_; InspectorAgentState::BooleanMap event_listener_breakpoints_; InspectorAgentState::BooleanMap csp_violation_breakpoints_; - DISALLOW_COPY_AND_ASSIGN(InspectorDOMDebuggerAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.h b/third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.h index 6bc2083c6da5ac..258ed898557554 100644 --- a/third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_DOM_SNAPSHOT_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_DOM_SNAPSHOT_AGENT_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/css/css_property_names.h" #include "third_party/blink/renderer/core/dom/dom_node_ids.h" #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h" @@ -29,6 +28,9 @@ class CORE_EXPORT InspectorDOMSnapshotAgent final : public InspectorBaseAgent { public: InspectorDOMSnapshotAgent(InspectedFrames*, InspectorDOMDebuggerAgent*); + InspectorDOMSnapshotAgent(const InspectorDOMSnapshotAgent&) = delete; + InspectorDOMSnapshotAgent& operator=(const InspectorDOMSnapshotAgent&) = + delete; ~InspectorDOMSnapshotAgent() override; void Trace(Visitor*) const override; @@ -135,8 +137,6 @@ class CORE_EXPORT InspectorDOMSnapshotAgent final Member inspected_frames_; Member dom_debugger_agent_; InspectorAgentState::Boolean enabled_; - - DISALLOW_COPY_AND_ASSIGN(InspectorDOMSnapshotAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.h b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.h index 6faa428b6f7d98..c2cd8f28e3d2b1 100644 --- a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_EMULATION_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_EMULATION_AGENT_H_ -#include "base/macros.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" #include "third_party/blink/renderer/core/core_export.h" @@ -34,6 +33,8 @@ class CORE_EXPORT InspectorEmulationAgent final : public InspectorBaseAgent { public: explicit InspectorEmulationAgent(WebLocalFrameImpl*); + InspectorEmulationAgent(const InspectorEmulationAgent&) = delete; + InspectorEmulationAgent& operator=(const InspectorEmulationAgent&) = delete; ~InspectorEmulationAgent() override; // protocol::Dispatcher::EmulationCommandHandler implementation. @@ -159,7 +160,6 @@ class CORE_EXPORT InspectorEmulationAgent final InspectorAgentState::Boolean emulate_focus_; InspectorAgentState::String timezone_id_override_; InspectorAgentState::BooleanMap disabled_image_types_; - DISALLOW_COPY_AND_ASSIGN(InspectorEmulationAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_highlight.cc b/third_party/blink/renderer/core/inspector/inspector_highlight.cc index 1d9b2d9ac9111b..f6650100b62651 100644 --- a/third_party/blink/renderer/core/inspector/inspector_highlight.cc +++ b/third_party/blink/renderer/core/inspector/inspector_highlight.cc @@ -6,7 +6,6 @@ #include -#include "base/macros.h" #include "third_party/blink/renderer/core/css/css_color.h" #include "third_party/blink/renderer/core/css/css_computed_style_declaration.h" #include "third_party/blink/renderer/core/css/css_grid_auto_repeat_value.h" @@ -57,6 +56,8 @@ class PathBuilder { public: PathBuilder() : path_(protocol::ListValue::create()) {} + PathBuilder(const PathBuilder&) = delete; + PathBuilder& operator=(const PathBuilder&) = delete; virtual ~PathBuilder() = default; std::unique_ptr Release() { return std::move(path_); } @@ -82,7 +83,6 @@ class PathBuilder { size_t length); std::unique_ptr path_; - DISALLOW_COPY_AND_ASSIGN(PathBuilder); }; void PathBuilder::AppendPathCommandAndPoints(const char* command, diff --git a/third_party/blink/renderer/core/inspector/inspector_history.h b/third_party/blink/renderer/core/inspector/inspector_history.h index 05ae27cec4f8c6..11dcb0822cbfa6 100644 --- a/third_party/blink/renderer/core/inspector/inspector_history.h +++ b/third_party/blink/renderer/core/inspector/inspector_history.h @@ -31,7 +31,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_HISTORY_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_HISTORY_H_ -#include "base/macros.h" #include "base/memory/scoped_refptr.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/platform/heap/handle.h" @@ -69,6 +68,8 @@ class CORE_EXPORT InspectorHistory final }; InspectorHistory(); + InspectorHistory(const InspectorHistory&) = delete; + InspectorHistory& operator=(const InspectorHistory&) = delete; void Trace(Visitor*) const; bool Perform(Action*, ExceptionState&); @@ -82,8 +83,6 @@ class CORE_EXPORT InspectorHistory final private: HeapVector> history_; wtf_size_t after_last_action_index_; - - DISALLOW_COPY_AND_ASSIGN(InspectorHistory); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_io_agent.h b/third_party/blink/renderer/core/inspector/inspector_io_agent.h index 61a5a96117d4a7..f0613edbb0f294 100644 --- a/third_party/blink/renderer/core/inspector/inspector_io_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_io_agent.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_IO_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_IO_AGENT_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h" #include "third_party/blink/renderer/core/inspector/protocol/IO.h" @@ -25,6 +24,8 @@ class CORE_EXPORT InspectorIOAgent final : public InspectorBaseAgent { public: InspectorIOAgent(v8::Isolate*, v8_inspector::V8InspectorSession*); + InspectorIOAgent(const InspectorIOAgent&) = delete; + InspectorIOAgent& operator=(const InspectorIOAgent&) = delete; ~InspectorIOAgent() override; private: @@ -36,7 +37,6 @@ class CORE_EXPORT InspectorIOAgent final v8::Isolate* isolate_; v8_inspector::V8InspectorSession* v8_session_; - DISALLOW_COPY_AND_ASSIGN(InspectorIOAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_issue_storage.h b/third_party/blink/renderer/core/inspector/inspector_issue_storage.h index c8ea667e0f50c9..1db2c3b05db6b6 100644 --- a/third_party/blink/renderer/core/inspector/inspector_issue_storage.h +++ b/third_party/blink/renderer/core/inspector/inspector_issue_storage.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_ISSUE_STORAGE_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_ISSUE_STORAGE_H_ -#include "base/macros.h" #include "third_party/blink/public/mojom/devtools/inspector_issue.mojom-blink-forward.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/platform/heap/handle.h" @@ -27,6 +26,8 @@ class InspectorIssue; class CORE_EXPORT InspectorIssueStorage { public: InspectorIssueStorage(); + InspectorIssueStorage(const InspectorIssueStorage&) = delete; + InspectorIssueStorage& operator=(const InspectorIssueStorage&) = delete; void AddInspectorIssue(CoreProbeSink*, InspectorIssue*); void AddInspectorIssue(CoreProbeSink*, mojom::blink::InspectorIssueInfoPtr); @@ -45,8 +46,6 @@ class CORE_EXPORT InspectorIssueStorage { void AddInspectorIssue(CoreProbeSink*, std::unique_ptr); Deque> issues_; - - DISALLOW_COPY_AND_ASSIGN(InspectorIssueStorage); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_layer_tree_agent.h b/third_party/blink/renderer/core/inspector/inspector_layer_tree_agent.h index 6dd56908ea4200..93681c339db2f7 100644 --- a/third_party/blink/renderer/core/inspector/inspector_layer_tree_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_layer_tree_agent.h @@ -30,7 +30,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_LAYER_TREE_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_LAYER_TREE_AGENT_H_ -#include "base/macros.h" #include "base/memory/scoped_refptr.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h" @@ -58,6 +57,8 @@ class CORE_EXPORT InspectorLayerTreeAgent final }; InspectorLayerTreeAgent(InspectedFrames*, Client*); + InspectorLayerTreeAgent(const InspectorLayerTreeAgent&) = delete; + InspectorLayerTreeAgent& operator=(const InspectorLayerTreeAgent&) = delete; ~InspectorLayerTreeAgent() override; void Trace(Visitor*) const override; @@ -121,7 +122,6 @@ class CORE_EXPORT InspectorLayerTreeAgent final typedef HashMap> SnapshotById; SnapshotById snapshot_by_id_; bool suppress_layer_paint_events_; - DISALLOW_COPY_AND_ASSIGN(InspectorLayerTreeAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_log_agent.h b/third_party/blink/renderer/core/inspector/inspector_log_agent.h index 70f4b344e0acb7..6e0f99d317362f 100644 --- a/third_party/blink/renderer/core/inspector/inspector_log_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_log_agent.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_LOG_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_LOG_AGENT_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/frame/performance_monitor.h" #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h" @@ -27,6 +26,8 @@ class CORE_EXPORT InspectorLogAgent InspectorLogAgent(ConsoleMessageStorage*, PerformanceMonitor*, v8_inspector::V8InspectorSession*); + InspectorLogAgent(const InspectorLogAgent&) = delete; + InspectorLogAgent& operator=(const InspectorLogAgent&) = delete; ~InspectorLogAgent() override; void Trace(Visitor*) const override; @@ -58,7 +59,6 @@ class CORE_EXPORT InspectorLogAgent v8_inspector::V8InspectorSession* v8_session_; InspectorAgentState::Boolean enabled_; InspectorAgentState::DoubleMap violation_thresholds_; - DISALLOW_COPY_AND_ASSIGN(InspectorLogAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_media_agent.h b/third_party/blink/renderer/core/inspector/inspector_media_agent.h index bf109432ada7ef..5d4c59d6f2caec 100644 --- a/third_party/blink/renderer/core/inspector/inspector_media_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_media_agent.h @@ -20,6 +20,8 @@ class CORE_EXPORT InspectorMediaAgent final : public InspectorBaseAgent { public: explicit InspectorMediaAgent(InspectedFrames*, WorkerGlobalScope*); + InspectorMediaAgent(const InspectorMediaAgent&) = delete; + InspectorMediaAgent& operator=(const InspectorMediaAgent&) = delete; ~InspectorMediaAgent() override; ExecutionContext* GetTargetExecutionContext() const; @@ -53,7 +55,6 @@ class CORE_EXPORT InspectorMediaAgent final Member worker_global_scope_; InspectorAgentState::Boolean enabled_; - DISALLOW_COPY_AND_ASSIGN(InspectorMediaAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_memory_agent.h b/third_party/blink/renderer/core/inspector/inspector_memory_agent.h index 451a5cf7876621..00a28033500552 100644 --- a/third_party/blink/renderer/core/inspector/inspector_memory_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_memory_agent.h @@ -31,7 +31,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_MEMORY_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_MEMORY_AGENT_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h" #include "third_party/blink/renderer/core/inspector/protocol/Memory.h" @@ -44,6 +43,8 @@ class CORE_EXPORT InspectorMemoryAgent final : public InspectorBaseAgent { public: explicit InspectorMemoryAgent(InspectedFrames*); + InspectorMemoryAgent(const InspectorMemoryAgent&) = delete; + InspectorMemoryAgent& operator=(const InspectorMemoryAgent&) = delete; ~InspectorMemoryAgent() override; void Trace(Visitor*) const override; @@ -75,7 +76,6 @@ class CORE_EXPORT InspectorMemoryAgent final HashMap symbols_cache_; InspectorAgentState::Integer sampling_profile_interval_; - DISALLOW_COPY_AND_ASSIGN(InspectorMemoryAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc index 76695faa11d288..6f0acd880e463f 100644 --- a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc +++ b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc @@ -34,7 +34,6 @@ #include #include "base/containers/span.h" -#include "base/macros.h" #include "base/memory/scoped_refptr.h" #include "build/build_config.h" #include "net/base/ip_address.h" @@ -190,6 +189,11 @@ class InspectorFileReaderLoaderClient final : public FileReaderLoaderClient { FileReaderLoader::kReadByClient, this, std::move(task_runner)); } + InspectorFileReaderLoaderClient(const InspectorFileReaderLoaderClient&) = + delete; + InspectorFileReaderLoaderClient& operator=( + const InspectorFileReaderLoaderClient&) = delete; + ~InspectorFileReaderLoaderClient() override = default; void Start() { @@ -222,7 +226,6 @@ class InspectorFileReaderLoaderClient final : public FileReaderLoaderClient { base::OnceCallback)> callback_; std::unique_ptr loader_; scoped_refptr raw_data_; - DISALLOW_COPY_AND_ASSIGN(InspectorFileReaderLoaderClient); }; static void ResponseBodyFileReaderLoaderDone( @@ -254,6 +257,9 @@ class InspectorPostBodyParser task_runner_(std::move(task_runner)), error_(false) {} + InspectorPostBodyParser(const InspectorPostBodyParser&) = delete; + InspectorPostBodyParser& operator=(const InspectorPostBodyParser&) = delete; + void Parse(EncodedFormData* request_body) { if (!request_body || request_body->IsEmpty()) return; @@ -314,7 +320,6 @@ class InspectorPostBodyParser const scoped_refptr task_runner_; bool error_; Vector parts_; - DISALLOW_COPY_AND_ASSIGN(InspectorPostBodyParser); }; KURL UrlWithoutFragment(const KURL& url) { diff --git a/third_party/blink/renderer/core/inspector/inspector_overlay_agent.h b/third_party/blink/renderer/core/inspector/inspector_overlay_agent.h index 8bc6701c0adbb8..356589c31bfb5b 100644 --- a/third_party/blink/renderer/core/inspector/inspector_overlay_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_overlay_agent.h @@ -31,7 +31,6 @@ #include #include -#include "base/macros.h" #include "base/memory/scoped_refptr.h" #include "third_party/blink/public/common/input/web_input_event.h" #include "third_party/blink/public/platform/web_input_event_result.h" @@ -127,6 +126,8 @@ class CORE_EXPORT Hinge final : public GarbageCollected { Color color, Color outline_color, InspectorOverlayAgent* overlay); + Hinge(const Hinge&) = delete; + Hinge& operator=(const Hinge&) = delete; ~Hinge() = default; String GetOverlayName(); void Draw(float scale); @@ -137,7 +138,6 @@ class CORE_EXPORT Hinge final : public GarbageCollected { Color content_color_; Color outline_color_; Member overlay_; - DISALLOW_COPY_AND_ASSIGN(Hinge); }; class CORE_EXPORT InspectorOverlayAgent final @@ -162,6 +162,8 @@ class CORE_EXPORT InspectorOverlayAgent final InspectedFrames*, v8_inspector::V8InspectorSession*, InspectorDOMAgent*); + InspectorOverlayAgent(const InspectorOverlayAgent&) = delete; + InspectorOverlayAgent& operator=(const InspectorOverlayAgent&) = delete; ~InspectorOverlayAgent() override; void Trace(Visitor*) const override; @@ -332,8 +334,6 @@ class CORE_EXPORT InspectorOverlayAgent final InspectorAgentState::String paused_in_debugger_message_; InspectorAgentState::String inspect_mode_; InspectorAgentState::Bytes inspect_mode_protocol_config_; - - DISALLOW_COPY_AND_ASSIGN(InspectorOverlayAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_page_agent.h b/third_party/blink/renderer/core/inspector/inspector_page_agent.h index 271ac0804c3542..6332f7f8554112 100644 --- a/third_party/blink/renderer/core/inspector/inspector_page_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_page_agent.h @@ -31,7 +31,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_PAGE_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_PAGE_AGENT_H_ -#include "base/macros.h" #include "third_party/blink/public/mojom/v8_cache_options.mojom-blink.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h" @@ -105,6 +104,8 @@ class CORE_EXPORT InspectorPageAgent final Client*, InspectorResourceContentLoader*, v8_inspector::V8InspectorSession*); + InspectorPageAgent(const InspectorPageAgent&) = delete; + InspectorPageAgent& operator=(const InspectorPageAgent&) = delete; // Page API for frontend protocol::Response enable() override; @@ -294,7 +295,6 @@ class CORE_EXPORT InspectorPageAgent final InspectorAgentState::Integer standard_font_size_; InspectorAgentState::Integer fixed_font_size_; InspectorAgentState::Boolean produce_compilation_cache_; - DISALLOW_COPY_AND_ASSIGN(InspectorPageAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_performance_agent.h b/third_party/blink/renderer/core/inspector/inspector_performance_agent.h index 0fa45182c9ec61..37abe1fbe9831a 100644 --- a/third_party/blink/renderer/core/inspector/inspector_performance_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_performance_agent.h @@ -7,7 +7,6 @@ #include -#include "base/macros.h" #include "base/task/sequence_manager/task_time_observer.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h" @@ -34,6 +33,9 @@ class CORE_EXPORT InspectorPerformanceAgent final void Trace(Visitor*) const override; explicit InspectorPerformanceAgent(InspectedFrames*); + InspectorPerformanceAgent(const InspectorPerformanceAgent&) = delete; + InspectorPerformanceAgent& operator=(const InspectorPerformanceAgent&) = + delete; ~InspectorPerformanceAgent() override; void Restore() override; @@ -95,7 +97,6 @@ class CORE_EXPORT InspectorPerformanceAgent final int layout_depth_ = 0; InspectorAgentState::Boolean enabled_; InspectorAgentState::Boolean use_thread_ticks_; - DISALLOW_COPY_AND_ASSIGN(InspectorPerformanceAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_performance_timeline_agent.h b/third_party/blink/renderer/core/inspector/inspector_performance_timeline_agent.h index 94c106d2b30b8d..9f480eaa0f757e 100644 --- a/third_party/blink/renderer/core/inspector/inspector_performance_timeline_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_performance_timeline_agent.h @@ -7,7 +7,6 @@ #include -#include "base/macros.h" #include "base/task/sequence_manager/task_time_observer.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h" @@ -24,6 +23,10 @@ class CORE_EXPORT InspectorPerformanceTimelineAgent final : public InspectorBaseAgent { public: explicit InspectorPerformanceTimelineAgent(InspectedFrames*); + InspectorPerformanceTimelineAgent(const InspectorPerformanceTimelineAgent&) = + delete; + InspectorPerformanceTimelineAgent& operator=( + const InspectorPerformanceTimelineAgent&) = delete; ~InspectorPerformanceTimelineAgent() override; // PerformanceTimeline probes implementation. @@ -47,7 +50,6 @@ class CORE_EXPORT InspectorPerformanceTimelineAgent final Member inspected_frames_; InspectorAgentState::Integer enabled_types_; - DISALLOW_COPY_AND_ASSIGN(InspectorPerformanceTimelineAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_resource_container.h b/third_party/blink/renderer/core/inspector/inspector_resource_container.h index 235bd6a86a2831..450fac78f9d234 100644 --- a/third_party/blink/renderer/core/inspector/inspector_resource_container.h +++ b/third_party/blink/renderer/core/inspector/inspector_resource_container.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_RESOURCE_CONTAINER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_RESOURCE_CONTAINER_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/dom/dom_node_ids.h" #include "third_party/blink/renderer/platform/heap/handle.h" @@ -23,6 +22,9 @@ class CORE_EXPORT InspectorResourceContainer final : public GarbageCollected { public: explicit InspectorResourceContainer(InspectedFrames*); + InspectorResourceContainer(const InspectorResourceContainer&) = delete; + InspectorResourceContainer& operator=(const InspectorResourceContainer&) = + delete; ~InspectorResourceContainer(); void Trace(Visitor*) const; @@ -40,7 +42,6 @@ class CORE_EXPORT InspectorResourceContainer final Member inspected_frames_; HashMap style_sheet_contents_; HashMap style_element_contents_; - DISALLOW_COPY_AND_ASSIGN(InspectorResourceContainer); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_resource_content_loader.h b/third_party/blink/renderer/core/inspector/inspector_resource_content_loader.h index eee476bba99543..d5a0ced0b19e18 100644 --- a/third_party/blink/renderer/core/inspector/inspector_resource_content_loader.h +++ b/third_party/blink/renderer/core/inspector/inspector_resource_content_loader.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_RESOURCE_CONTENT_LOADER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_RESOURCE_CONTENT_LOADER_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/platform/loader/fetch/resource.h" #include "third_party/blink/renderer/platform/wtf/functional.h" @@ -23,6 +22,10 @@ class CORE_EXPORT InspectorResourceContentLoader final : public GarbageCollected { public: explicit InspectorResourceContentLoader(LocalFrame*); + InspectorResourceContentLoader(const InspectorResourceContentLoader&) = + delete; + InspectorResourceContentLoader& operator=( + const InspectorResourceContentLoader&) = delete; ~InspectorResourceContentLoader(); void Dispose(); void Trace(Visitor*) const; @@ -53,7 +56,6 @@ class CORE_EXPORT InspectorResourceContentLoader final int last_client_id_; friend class ResourceClient; - DISALLOW_COPY_AND_ASSIGN(InspectorResourceContentLoader); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_task_runner.h b/third_party/blink/renderer/core/inspector/inspector_task_runner.h index 7fe34311479ecf..37ea5249e13f56 100644 --- a/third_party/blink/renderer/core/inspector/inspector_task_runner.h +++ b/third_party/blink/renderer/core/inspector/inspector_task_runner.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_TASK_RUNNER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_TASK_RUNNER_H_ -#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/thread_annotations.h" #include "third_party/blink/renderer/core/core_export.h" @@ -35,6 +34,9 @@ class CORE_EXPORT InspectorTaskRunner final return base::AdoptRef(new InspectorTaskRunner(isolate_task_runner)); } + InspectorTaskRunner(const InspectorTaskRunner&) = delete; + InspectorTaskRunner& operator=(const InspectorTaskRunner&) = delete; + // Must be called on the isolate's thread. void InitIsolate(v8::Isolate*) LOCKS_EXCLUDED(mutex_); // Can be disposed from any thread. @@ -78,7 +80,6 @@ class CORE_EXPORT InspectorTaskRunner final v8::Isolate* isolate_ GUARDED_BY(mutex_) = nullptr; Deque interrupting_task_queue_; bool disposed_ GUARDED_BY(mutex_) = false; - DISALLOW_COPY_AND_ASSIGN(InspectorTaskRunner); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/inspector_trace_events.h b/third_party/blink/renderer/core/inspector/inspector_trace_events.h index 1976e6cc7ab2bd..f397c84cf9a308 100644 --- a/third_party/blink/renderer/core/inspector/inspector_trace_events.h +++ b/third_party/blink/renderer/core/inspector/inspector_trace_events.h @@ -7,7 +7,6 @@ #include -#include "base/macros.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/bindings/core/v8/script_streamer.h" #include "third_party/blink/renderer/core/animation/compositor_animations.h" @@ -86,6 +85,8 @@ class CORE_EXPORT InspectorTraceEvents : public GarbageCollected { public: InspectorTraceEvents() = default; + InspectorTraceEvents(const InspectorTraceEvents&) = delete; + InspectorTraceEvents& operator=(const InspectorTraceEvents&) = delete; void WillSendRequest(DocumentLoader*, const KURL& fetch_context_url, @@ -136,9 +137,6 @@ class CORE_EXPORT InspectorTraceEvents void FrameStartedLoading(LocalFrame*); void Trace(Visitor*) const {} - - private: - DISALLOW_COPY_AND_ASSIGN(InspectorTraceEvents); }; // Helper macros for emitting devtools.timeline events, taking the name of the diff --git a/third_party/blink/renderer/core/inspector/legacy_dom_snapshot_agent.h b/third_party/blink/renderer/core/inspector/legacy_dom_snapshot_agent.h index 245b7845ce0d4d..f0f94754d6b3a7 100644 --- a/third_party/blink/renderer/core/inspector/legacy_dom_snapshot_agent.h +++ b/third_party/blink/renderer/core/inspector/legacy_dom_snapshot_agent.h @@ -5,7 +5,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_LEGACY_DOM_SNAPSHOT_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_LEGACY_DOM_SNAPSHOT_AGENT_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/css/css_property_names.h" #include "third_party/blink/renderer/core/dom/dom_node_ids.h" #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h" @@ -26,6 +25,8 @@ class CORE_EXPORT LegacyDOMSnapshotAgent { public: using OriginUrlMap = WTF::HashMap; LegacyDOMSnapshotAgent(InspectorDOMDebuggerAgent*, OriginUrlMap*); + LegacyDOMSnapshotAgent(const LegacyDOMSnapshotAgent&) = delete; + LegacyDOMSnapshotAgent& operator=(const LegacyDOMSnapshotAgent&) = delete; ~LegacyDOMSnapshotAgent(); void Restore(); @@ -99,7 +100,6 @@ class CORE_EXPORT LegacyDOMSnapshotAgent { OriginUrlMap* origin_url_map_; using DocumentOrderMap = HeapHashMap, int>; InspectorDOMDebuggerAgent* dom_debugger_agent_; - DISALLOW_COPY_AND_ASSIGN(LegacyDOMSnapshotAgent); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/locale_controller.h b/third_party/blink/renderer/core/inspector/locale_controller.h index a432c7feb7826a..5b5ecdf9e1aa48 100644 --- a/third_party/blink/renderer/core/inspector/locale_controller.h +++ b/third_party/blink/renderer/core/inspector/locale_controller.h @@ -13,6 +13,9 @@ class LocaleController { public: static LocaleController& instance(); + LocaleController(const LocaleController&) = delete; + LocaleController& operator=(const LocaleController&) = delete; + String SetLocaleOverride(const String& locale); bool has_locale_override() const; @@ -22,7 +25,6 @@ class LocaleController { String embedder_locale_; String locale_override_; - DISALLOW_COPY_AND_ASSIGN(LocaleController); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/main_thread_debugger.h b/third_party/blink/renderer/core/inspector/main_thread_debugger.h index 747c18668f4dba..dd48c12f8aa419 100644 --- a/third_party/blink/renderer/core/inspector/main_thread_debugger.h +++ b/third_party/blink/renderer/core/inspector/main_thread_debugger.h @@ -32,7 +32,6 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_MAIN_THREAD_DEBUGGER_H_ #include -#include "base/macros.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/dom/document_lifecycle.h" #include "third_party/blink/renderer/core/inspector/thread_debugger.h" @@ -61,6 +60,8 @@ class CORE_EXPORT MainThreadDebugger final : public ThreadDebugger { }; explicit MainThreadDebugger(v8::Isolate*); + MainThreadDebugger(const MainThreadDebugger&) = delete; + MainThreadDebugger& operator=(const MainThreadDebugger&) = delete; ~MainThreadDebugger() override; static MainThreadDebugger* Instance(); @@ -120,7 +121,6 @@ class CORE_EXPORT MainThreadDebugger final : public ThreadDebugger { static MainThreadDebugger* instance_; std::unique_ptr postponed_transition_scope_; - DISALLOW_COPY_AND_ASSIGN(MainThreadDebugger); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/thread_debugger.h b/third_party/blink/renderer/core/inspector/thread_debugger.h index b9014a6744067e..e643c1769b3c17 100644 --- a/third_party/blink/renderer/core/inspector/thread_debugger.h +++ b/third_party/blink/renderer/core/inspector/thread_debugger.h @@ -6,7 +6,6 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_THREAD_DEBUGGER_H_ #include -#include "base/macros.h" #include "third_party/blink/public/mojom/devtools/console_message.mojom-blink-forward.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/platform/bindings/v8_per_isolate_data.h" @@ -26,6 +25,8 @@ class CORE_EXPORT ThreadDebugger : public v8_inspector::V8InspectorClient, public V8PerIsolateData::Data { public: explicit ThreadDebugger(v8::Isolate*); + ThreadDebugger(const ThreadDebugger&) = delete; + ThreadDebugger& operator=(const ThreadDebugger&) = delete; ~ThreadDebugger() override; static ThreadDebugger* From(v8::Isolate*); @@ -120,7 +121,6 @@ class CORE_EXPORT ThreadDebugger : public v8_inspector::V8InspectorClient, Vector>> timers_; Vector timer_callbacks_; Vector timer_data_; - DISALLOW_COPY_AND_ASSIGN(ThreadDebugger); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/worker_inspector_controller.h b/third_party/blink/renderer/core/inspector/worker_inspector_controller.h index 4473f86f3b76ba..ce1ff5ced4d7c4 100644 --- a/third_party/blink/renderer/core/inspector/worker_inspector_controller.h +++ b/third_party/blink/renderer/core/inspector/worker_inspector_controller.h @@ -32,7 +32,6 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_WORKER_INSPECTOR_CONTROLLER_H_ #include "base/callback.h" -#include "base/macros.h" #include "base/memory/scoped_refptr.h" #include "base/unguessable_token.h" #include "third_party/blink/renderer/core/inspector/devtools_agent.h" @@ -69,6 +68,9 @@ class WorkerInspectorController final WorkerThreadDebugger*, scoped_refptr, std::unique_ptr); + WorkerInspectorController(const WorkerInspectorController&) = delete; + WorkerInspectorController& operator=(const WorkerInspectorController&) = + delete; ~WorkerInspectorController() override; void Trace(Visitor*) const; @@ -110,8 +112,6 @@ class WorkerInspectorController final base::UnguessableToken parent_devtools_token_; KURL url_; const PlatformThreadId worker_thread_id_; - - DISALLOW_COPY_AND_ASSIGN(WorkerInspectorController); }; } // namespace blink diff --git a/third_party/blink/renderer/core/inspector/worker_thread_debugger.h b/third_party/blink/renderer/core/inspector/worker_thread_debugger.h index 0730ec7119d18c..2a132e01c195d5 100644 --- a/third_party/blink/renderer/core/inspector/worker_thread_debugger.h +++ b/third_party/blink/renderer/core/inspector/worker_thread_debugger.h @@ -31,7 +31,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_WORKER_THREAD_DEBUGGER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_WORKER_THREAD_DEBUGGER_H_ -#include "base/macros.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/inspector/thread_debugger.h" @@ -45,6 +44,8 @@ class WorkerThread; class CORE_EXPORT WorkerThreadDebugger final : public ThreadDebugger { public: explicit WorkerThreadDebugger(v8::Isolate*); + WorkerThreadDebugger(const WorkerThreadDebugger&) = delete; + WorkerThreadDebugger& operator=(const WorkerThreadDebugger&) = delete; ~WorkerThreadDebugger() override; static WorkerThreadDebugger* From(v8::Isolate*); @@ -92,8 +93,6 @@ class CORE_EXPORT WorkerThreadDebugger final : public ThreadDebugger { int paused_context_group_id_; WTF::HashMap worker_threads_; - - DISALLOW_COPY_AND_ASSIGN(WorkerThreadDebugger); }; } // namespace blink