Run clang-modernize and let it add a bunch of missing overrides in WebCore/inspector
authorjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Jan 2014 21:15:39 +0000 (21:15 +0000)
committerjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Jan 2014 21:15:39 +0000 (21:15 +0000)
https://bugs.webkit.org/show_bug.cgi?id=127206

Reviewed by Anders Carlsson.

Let clang-modernize add overrides.

* inspector/DOMEditor.cpp:
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorCSSAgent.h:
* inspector/InspectorCanvasAgent.h:
* inspector/InspectorConsoleAgent.h:
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDOMDebuggerAgent.h:
* inspector/InspectorDOMStorageAgent.h:
* inspector/InspectorDatabaseAgent.cpp:
* inspector/InspectorDatabaseAgent.h:
* inspector/InspectorDebuggerAgent.h:
* inspector/InspectorFrontendHost.cpp:
* inspector/InspectorHeapProfilerAgent.cpp:
(WebCore::InspectorHeapProfilerAgent::getHeapSnapshot):
(WebCore::InspectorHeapProfilerAgent::takeHeapSnapshot):
* inspector/InspectorHeapProfilerAgent.h:
* inspector/InspectorHistory.cpp:
* inspector/InspectorIndexedDBAgent.cpp:
* inspector/InspectorIndexedDBAgent.h:
* inspector/InspectorInputAgent.h:
* inspector/InspectorLayerTreeAgent.h:
* inspector/InspectorMemoryAgent.h:
* inspector/InspectorPageAgent.h:
* inspector/InspectorProfilerAgent.cpp:
* inspector/InspectorProfilerAgent.h:
* inspector/InspectorResourceAgent.h:
* inspector/InspectorRuntimeAgent.h:
* inspector/InspectorStyleSheet.h:
* inspector/InspectorTimelineAgent.h:
* inspector/InspectorWorkerAgent.cpp:
* inspector/InspectorWorkerAgent.h:
* inspector/PageConsoleAgent.h:
* inspector/PageDebuggerAgent.h:
* inspector/PageRuntimeAgent.h:
* inspector/WorkerConsoleAgent.h:
* inspector/WorkerDebuggerAgent.cpp:
* inspector/WorkerInspectorController.cpp:
* inspector/WorkerRuntimeAgent.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@162369 268f45cc-cd09-0410-ab3c-d52691b4dbfc

37 files changed:
Source/WebCore/ChangeLog
Source/WebCore/inspector/DOMEditor.cpp
Source/WebCore/inspector/InspectorApplicationCacheAgent.h
Source/WebCore/inspector/InspectorCSSAgent.h
Source/WebCore/inspector/InspectorCanvasAgent.h
Source/WebCore/inspector/InspectorConsoleAgent.h
Source/WebCore/inspector/InspectorDOMAgent.h
Source/WebCore/inspector/InspectorDOMDebuggerAgent.h
Source/WebCore/inspector/InspectorDOMStorageAgent.h
Source/WebCore/inspector/InspectorDatabaseAgent.cpp
Source/WebCore/inspector/InspectorDatabaseAgent.h
Source/WebCore/inspector/InspectorDebuggerAgent.h
Source/WebCore/inspector/InspectorFrontendHost.cpp
Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp
Source/WebCore/inspector/InspectorHeapProfilerAgent.h
Source/WebCore/inspector/InspectorHistory.cpp
Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
Source/WebCore/inspector/InspectorIndexedDBAgent.h
Source/WebCore/inspector/InspectorInputAgent.h
Source/WebCore/inspector/InspectorLayerTreeAgent.h
Source/WebCore/inspector/InspectorMemoryAgent.h
Source/WebCore/inspector/InspectorPageAgent.h
Source/WebCore/inspector/InspectorProfilerAgent.cpp
Source/WebCore/inspector/InspectorProfilerAgent.h
Source/WebCore/inspector/InspectorResourceAgent.h
Source/WebCore/inspector/InspectorRuntimeAgent.h
Source/WebCore/inspector/InspectorStyleSheet.h
Source/WebCore/inspector/InspectorTimelineAgent.h
Source/WebCore/inspector/InspectorWorkerAgent.cpp
Source/WebCore/inspector/InspectorWorkerAgent.h
Source/WebCore/inspector/PageConsoleAgent.h
Source/WebCore/inspector/PageDebuggerAgent.h
Source/WebCore/inspector/PageRuntimeAgent.h
Source/WebCore/inspector/WorkerConsoleAgent.h
Source/WebCore/inspector/WorkerDebuggerAgent.cpp
Source/WebCore/inspector/WorkerInspectorController.cpp
Source/WebCore/inspector/WorkerRuntimeAgent.h

index 10cd1cd..bb21126 100644 (file)
@@ -1,3 +1,51 @@
+2014-01-20  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Run clang-modernize and let it add a bunch of missing overrides in WebCore/inspector
+        https://bugs.webkit.org/show_bug.cgi?id=127206
+
+        Reviewed by Anders Carlsson.
+
+        Let clang-modernize add overrides.
+
+        * inspector/DOMEditor.cpp:
+        * inspector/InspectorApplicationCacheAgent.h:
+        * inspector/InspectorCSSAgent.h:
+        * inspector/InspectorCanvasAgent.h:
+        * inspector/InspectorConsoleAgent.h:
+        * inspector/InspectorDOMAgent.h:
+        * inspector/InspectorDOMDebuggerAgent.h:
+        * inspector/InspectorDOMStorageAgent.h:
+        * inspector/InspectorDatabaseAgent.cpp:
+        * inspector/InspectorDatabaseAgent.h:
+        * inspector/InspectorDebuggerAgent.h:
+        * inspector/InspectorFrontendHost.cpp:
+        * inspector/InspectorHeapProfilerAgent.cpp:
+        (WebCore::InspectorHeapProfilerAgent::getHeapSnapshot):
+        (WebCore::InspectorHeapProfilerAgent::takeHeapSnapshot):
+        * inspector/InspectorHeapProfilerAgent.h:
+        * inspector/InspectorHistory.cpp:
+        * inspector/InspectorIndexedDBAgent.cpp:
+        * inspector/InspectorIndexedDBAgent.h:
+        * inspector/InspectorInputAgent.h:
+        * inspector/InspectorLayerTreeAgent.h:
+        * inspector/InspectorMemoryAgent.h:
+        * inspector/InspectorPageAgent.h:
+        * inspector/InspectorProfilerAgent.cpp:
+        * inspector/InspectorProfilerAgent.h:
+        * inspector/InspectorResourceAgent.h:
+        * inspector/InspectorRuntimeAgent.h:
+        * inspector/InspectorStyleSheet.h:
+        * inspector/InspectorTimelineAgent.h:
+        * inspector/InspectorWorkerAgent.cpp:
+        * inspector/InspectorWorkerAgent.h:
+        * inspector/PageConsoleAgent.h:
+        * inspector/PageDebuggerAgent.h:
+        * inspector/PageRuntimeAgent.h:
+        * inspector/WorkerConsoleAgent.h:
+        * inspector/WorkerDebuggerAgent.cpp:
+        * inspector/WorkerInspectorController.cpp:
+        * inspector/WorkerRuntimeAgent.h:
+
 2014-01-20  Zan Dobersek  <zdobersek@igalia.com>
 
         Move WebAudio source code to std::unique_ptr
 2014-01-20  Zan Dobersek  <zdobersek@igalia.com>
 
         Move WebAudio source code to std::unique_ptr
index 45b289f..2ab0dd1 100644 (file)
@@ -56,18 +56,18 @@ public:
     {
     }
 
     {
     }
 
-    virtual bool perform(ExceptionCode& ec)
+    virtual bool perform(ExceptionCode& ec) override
     {
         m_anchorNode = m_node->nextSibling();
         return redo(ec);
     }
 
     {
         m_anchorNode = m_node->nextSibling();
         return redo(ec);
     }
 
-    virtual bool undo(ExceptionCode& ec)
+    virtual bool undo(ExceptionCode& ec) override
     {
         return m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), ec);
     }
 
     {
         return m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), ec);
     }
 
-    virtual bool redo(ExceptionCode& ec)
+    virtual bool redo(ExceptionCode& ec) override
     {
         return m_parentNode->removeChild(m_node.get(), ec);
     }
     {
         return m_parentNode->removeChild(m_node.get(), ec);
     }
@@ -89,7 +89,7 @@ public:
     {
     }
 
     {
     }
 
-    virtual bool perform(ExceptionCode& ec)
+    virtual bool perform(ExceptionCode& ec) override
     {
         if (m_node->parentNode()) {
             m_removeChildAction = adoptPtr(new RemoveChildAction(m_node->parentNode(), m_node.get()));
     {
         if (m_node->parentNode()) {
             m_removeChildAction = adoptPtr(new RemoveChildAction(m_node->parentNode(), m_node.get()));
@@ -99,7 +99,7 @@ public:
         return m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), ec);
     }
 
         return m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), ec);
     }
 
-    virtual bool undo(ExceptionCode& ec)
+    virtual bool undo(ExceptionCode& ec) override
     {
         if (!m_parentNode->removeChild(m_node.get(), ec))
             return false;
     {
         if (!m_parentNode->removeChild(m_node.get(), ec))
             return false;
@@ -108,7 +108,7 @@ public:
         return true;
     }
 
         return true;
     }
 
-    virtual bool redo(ExceptionCode& ec)
+    virtual bool redo(ExceptionCode& ec) override
     {
         if (m_removeChildAction && !m_removeChildAction->redo(ec))
             return false;
     {
         if (m_removeChildAction && !m_removeChildAction->redo(ec))
             return false;
@@ -132,19 +132,19 @@ public:
     {
     }
 
     {
     }
 
-    virtual bool perform(ExceptionCode& ec)
+    virtual bool perform(ExceptionCode& ec) override
     {
         m_value = m_element->getAttribute(m_name);
         return redo(ec);
     }
 
     {
         m_value = m_element->getAttribute(m_name);
         return redo(ec);
     }
 
-    virtual bool undo(ExceptionCode& ec)
+    virtual bool undo(ExceptionCode& ec) override
     {
         m_element->setAttribute(m_name, m_value, ec);
         return true;
     }
 
     {
         m_element->setAttribute(m_name, m_value, ec);
         return true;
     }
 
-    virtual bool redo(ExceptionCode&)
+    virtual bool redo(ExceptionCode&) override
     {
         m_element->removeAttribute(m_name);
         return true;
     {
         m_element->removeAttribute(m_name);
         return true;
@@ -168,7 +168,7 @@ public:
     {
     }
 
     {
     }
 
-    virtual bool perform(ExceptionCode& ec)
+    virtual bool perform(ExceptionCode& ec) override
     {
         m_hadAttribute = m_element->hasAttribute(m_name);
         if (m_hadAttribute)
     {
         m_hadAttribute = m_element->hasAttribute(m_name);
         if (m_hadAttribute)
@@ -176,7 +176,7 @@ public:
         return redo(ec);
     }
 
         return redo(ec);
     }
 
-    virtual bool undo(ExceptionCode& ec)
+    virtual bool undo(ExceptionCode& ec) override
     {
         if (m_hadAttribute)
             m_element->setAttribute(m_name, m_oldValue, ec);
     {
         if (m_hadAttribute)
             m_element->setAttribute(m_name, m_oldValue, ec);
@@ -185,7 +185,7 @@ public:
         return true;
     }
 
         return true;
     }
 
-    virtual bool redo(ExceptionCode& ec)
+    virtual bool redo(ExceptionCode& ec) override
     {
         m_element->setAttribute(m_name, m_value, ec);
         return true;
     {
         m_element->setAttribute(m_name, m_value, ec);
         return true;
@@ -213,7 +213,7 @@ public:
     {
     }
 
     {
     }
 
-    virtual bool perform(ExceptionCode& ec)
+    virtual bool perform(ExceptionCode& ec) override
     {
         m_oldHTML = createMarkup(m_node.get());
         DOMPatchSupport domPatchSupport(m_domEditor.get(), &m_node->document());
     {
         m_oldHTML = createMarkup(m_node.get());
         DOMPatchSupport domPatchSupport(m_domEditor.get(), &m_node->document());
@@ -221,12 +221,12 @@ public:
         return !ec;
     }
 
         return !ec;
     }
 
-    virtual bool undo(ExceptionCode& ec)
+    virtual bool undo(ExceptionCode& ec) override
     {
         return m_history->undo(ec);
     }
 
     {
         return m_history->undo(ec);
     }
 
-    virtual bool redo(ExceptionCode& ec)
+    virtual bool redo(ExceptionCode& ec) override
     {
         return m_history->redo(ec);
     }
     {
         return m_history->redo(ec);
     }
@@ -256,19 +256,19 @@ public:
     {
     }
 
     {
     }
 
-    virtual bool perform(ExceptionCode& ec)
+    virtual bool perform(ExceptionCode& ec) override
     {
         m_oldText = m_textNode->wholeText();
         return redo(ec);
     }
 
     {
         m_oldText = m_textNode->wholeText();
         return redo(ec);
     }
 
-    virtual bool undo(ExceptionCode& ec)
+    virtual bool undo(ExceptionCode& ec) override
     {
         m_textNode->replaceWholeText(m_oldText, ec);
         return true;
     }
 
     {
         m_textNode->replaceWholeText(m_oldText, ec);
         return true;
     }
 
-    virtual bool redo(ExceptionCode& ec)
+    virtual bool redo(ExceptionCode& ec) override
     {
         m_textNode->replaceWholeText(m_text, ec);
         return true;
     {
         m_textNode->replaceWholeText(m_text, ec);
         return true;
@@ -291,17 +291,17 @@ public:
     {
     }
 
     {
     }
 
-    virtual bool perform(ExceptionCode& ec)
+    virtual bool perform(ExceptionCode& ec) override
     {
         return redo(ec);
     }
 
     {
         return redo(ec);
     }
 
-    virtual bool undo(ExceptionCode& ec)
+    virtual bool undo(ExceptionCode& ec) override
     {
         return m_parentNode->replaceChild(m_oldNode, m_newNode.get(), ec);
     }
 
     {
         return m_parentNode->replaceChild(m_oldNode, m_newNode.get(), ec);
     }
 
-    virtual bool redo(ExceptionCode& ec)
+    virtual bool redo(ExceptionCode& ec) override
     {
         return m_parentNode->replaceChild(m_newNode, m_oldNode.get(), ec);
     }
     {
         return m_parentNode->replaceChild(m_newNode, m_oldNode.get(), ec);
     }
@@ -322,19 +322,19 @@ public:
     {
     }
 
     {
     }
 
-    virtual bool perform(ExceptionCode& ec)
+    virtual bool perform(ExceptionCode& ec) override
     {
         m_oldValue = m_node->nodeValue();
         return redo(ec);
     }
 
     {
         m_oldValue = m_node->nodeValue();
         return redo(ec);
     }
 
-    virtual bool undo(ExceptionCode& ec)
+    virtual bool undo(ExceptionCode& ec) override
     {
         m_node->setNodeValue(m_oldValue, ec);
         return !ec;
     }
 
     {
         m_node->setNodeValue(m_oldValue, ec);
         return !ec;
     }
 
-    virtual bool redo(ExceptionCode& ec)
+    virtual bool redo(ExceptionCode& ec) override
     {
         m_node->setNodeValue(m_value, ec);
         return !ec;
     {
         m_node->setNodeValue(m_value, ec);
         return !ec;
index e4acaa1..4b862aa 100644 (file)
@@ -62,10 +62,10 @@ public:
     void updateApplicationCacheStatus(Frame*);
     void networkStateChanged();
 
     void updateApplicationCacheStatus(Frame*);
     void networkStateChanged();
 
-    virtual void enable(ErrorString*);
-    virtual void getFramesWithManifests(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::FrameWithManifest>>& result);
-    virtual void getManifestForFrame(ErrorString*, const String& frameId, String* manifestURL);
-    virtual void getApplicationCacheForFrame(ErrorString*, const String& frameId, RefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCache>&);
+    virtual void enable(ErrorString*) override;
+    virtual void getFramesWithManifests(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::FrameWithManifest>>& result) override;
+    virtual void getManifestForFrame(ErrorString*, const String& frameId, String* manifestURL) override;
+    virtual void getApplicationCacheForFrame(ErrorString*, const String& frameId, RefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCache>&) override;
 
 private:
     PassRefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCache> buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList&, const ApplicationCacheHost::CacheInfo&);
 
 private:
     PassRefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCache> buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList&, const ApplicationCacheHost::CacheInfo&);
index 3ea9535..dcba91a 100644 (file)
@@ -97,9 +97,9 @@ public:
     bool forcePseudoState(Element*, CSSSelector::PseudoType);
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
     bool forcePseudoState(Element*, CSSSelector::PseudoType);
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
-    virtual void discardAgent();
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
+    virtual void discardAgent() override;
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
     void reset();
     void mediaQueryResultChanged();
     void didCreateNamedFlow(Document*, WebKitNamedFlow*);
     void reset();
     void mediaQueryResultChanged();
     void didCreateNamedFlow(Document*, WebKitNamedFlow*);
@@ -111,21 +111,21 @@ public:
     void didRegisterNamedFlowContentElement(Document*, WebKitNamedFlow*, Node* contentElement, Node* nextContentElement = nullptr);
     void didUnregisterNamedFlowContentElement(Document*, WebKitNamedFlow*, Node* contentElement);
 
     void didRegisterNamedFlowContentElement(Document*, WebKitNamedFlow*, Node* contentElement, Node* nextContentElement = nullptr);
     void didUnregisterNamedFlowContentElement(Document*, WebKitNamedFlow*, Node* contentElement);
 
-    virtual void getComputedStyleForNode(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSComputedStyleProperty>>&);
-    virtual void getInlineStylesForNode(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& attributes);
-    virtual void getMatchedStylesForNode(ErrorString*, int nodeId, const bool* includePseudo, const bool* includeInherited, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>>& matchedCSSRules, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::PseudoIdMatches>>& pseudoIdMatches, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::InheritedStyleEntry>>& inheritedEntries);
-    virtual void getAllStyleSheets(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader>>& styleSheetInfos);
-    virtual void getStyleSheet(ErrorString*, const String& styleSheetId, RefPtr<Inspector::TypeBuilder::CSS::CSSStyleSheetBody>& result);
-    virtual void getStyleSheetText(ErrorString*, const String& styleSheetId, String* result);
-    virtual void setStyleSheetText(ErrorString*, const String& styleSheetId, const String& text);
-    virtual void setStyleText(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, const String& text, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result);
-    virtual void setPropertyText(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result);
-    virtual void toggleProperty(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, bool disable, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result);
-    virtual void setRuleSelector(ErrorString*, const RefPtr<Inspector::InspectorObject>& ruleId, const String& selector, RefPtr<Inspector::TypeBuilder::CSS::CSSRule>& result);
-    virtual void addRule(ErrorString*, int contextNodeId, const String& selector, RefPtr<Inspector::TypeBuilder::CSS::CSSRule>& result);
-    virtual void getSupportedCSSProperties(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSPropertyInfo>>& result);
-    virtual void forcePseudoState(ErrorString*, int nodeId, const RefPtr<Inspector::InspectorArray>& forcedPseudoClasses);
-    virtual void getNamedFlowCollection(ErrorString*, int documentNodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::NamedFlow>>& result);
+    virtual void getComputedStyleForNode(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSComputedStyleProperty>>&) override;
+    virtual void getInlineStylesForNode(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& attributes) override;
+    virtual void getMatchedStylesForNode(ErrorString*, int nodeId, const bool* includePseudo, const bool* includeInherited, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>>& matchedCSSRules, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::PseudoIdMatches>>& pseudoIdMatches, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::InheritedStyleEntry>>& inheritedEntries) override;
+    virtual void getAllStyleSheets(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader>>& styleSheetInfos) override;
+    virtual void getStyleSheet(ErrorString*, const String& styleSheetId, RefPtr<Inspector::TypeBuilder::CSS::CSSStyleSheetBody>& result) override;
+    virtual void getStyleSheetText(ErrorString*, const String& styleSheetId, String* result) override;
+    virtual void setStyleSheetText(ErrorString*, const String& styleSheetId, const String& text) override;
+    virtual void setStyleText(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, const String& text, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result) override;
+    virtual void setPropertyText(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result) override;
+    virtual void toggleProperty(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, bool disable, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result) override;
+    virtual void setRuleSelector(ErrorString*, const RefPtr<Inspector::InspectorObject>& ruleId, const String& selector, RefPtr<Inspector::TypeBuilder::CSS::CSSRule>& result) override;
+    virtual void addRule(ErrorString*, int contextNodeId, const String& selector, RefPtr<Inspector::TypeBuilder::CSS::CSSRule>& result) override;
+    virtual void getSupportedCSSProperties(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSPropertyInfo>>& result) override;
+    virtual void forcePseudoState(ErrorString*, int nodeId, const RefPtr<Inspector::InspectorArray>& forcedPseudoClasses) override;
+    virtual void getNamedFlowCollection(ErrorString*, int documentNodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::NamedFlow>>& result) override;
 
 private:
     class StyleSheetAction;
 
 private:
     class StyleSheetAction;
@@ -162,12 +162,12 @@ private:
     PassRefPtr<Inspector::TypeBuilder::CSS::NamedFlow> buildObjectForNamedFlow(ErrorString*, WebKitNamedFlow*, int documentNodeId);
 
     // InspectorDOMAgent::DOMListener implementation
     PassRefPtr<Inspector::TypeBuilder::CSS::NamedFlow> buildObjectForNamedFlow(ErrorString*, WebKitNamedFlow*, int documentNodeId);
 
     // InspectorDOMAgent::DOMListener implementation
-    virtual void didRemoveDocument(Document*);
-    virtual void didRemoveDOMNode(Node*);
-    virtual void didModifyDOMAttr(Element*);
+    virtual void didRemoveDocument(Document*) override;
+    virtual void didRemoveDOMNode(Node*) override;
+    virtual void didModifyDOMAttr(Element*) override;
 
     // InspectorCSSAgent::Listener implementation
 
     // InspectorCSSAgent::Listener implementation
-    virtual void styleSheetChanged(InspectorStyleSheet*);
+    virtual void styleSheetChanged(InspectorStyleSheet*) override;
 
     void resetPseudoStates();
 
 
     void resetPseudoStates();
 
index 1839cfd..3bc7b11 100644 (file)
@@ -79,17 +79,17 @@ public:
 #endif
 
     // Called from the front-end.
 #endif
 
     // Called from the front-end.
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
-    virtual void dropTraceLog(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&);
-    virtual void hasUninstrumentedCanvases(ErrorString*, bool*);
-    virtual void captureFrame(ErrorString*, const Inspector::TypeBuilder::Network::FrameId*, Inspector::TypeBuilder::Canvas::TraceLogId*);
-    virtual void startCapturing(ErrorString*, const Inspector::TypeBuilder::Network::FrameId*, Inspector::TypeBuilder::Canvas::TraceLogId*);
-    virtual void stopCapturing(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&);
-    virtual void getTraceLog(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&, const int*, const int*, RefPtr<Inspector::TypeBuilder::Canvas::TraceLog>&);
-    virtual void replayTraceLog(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&, int, RefPtr<Inspector::TypeBuilder::Canvas::ResourceState>&);
-    virtual void getResourceInfo(ErrorString*, const Inspector::TypeBuilder::Canvas::ResourceId&, RefPtr<Inspector::TypeBuilder::Canvas::ResourceInfo>&);
-    virtual void getResourceState(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&, const Inspector::TypeBuilder::Canvas::ResourceId&, RefPtr<Inspector::TypeBuilder::Canvas::ResourceState>&);
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
+    virtual void dropTraceLog(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&) override;
+    virtual void hasUninstrumentedCanvases(ErrorString*, bool*) override;
+    virtual void captureFrame(ErrorString*, const Inspector::TypeBuilder::Network::FrameId*, Inspector::TypeBuilder::Canvas::TraceLogId*) override;
+    virtual void startCapturing(ErrorString*, const Inspector::TypeBuilder::Network::FrameId*, Inspector::TypeBuilder::Canvas::TraceLogId*) override;
+    virtual void stopCapturing(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&) override;
+    virtual void getTraceLog(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&, const int*, const int*, RefPtr<Inspector::TypeBuilder::Canvas::TraceLog>&) override;
+    virtual void replayTraceLog(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&, int, RefPtr<Inspector::TypeBuilder::Canvas::ResourceState>&) override;
+    virtual void getResourceInfo(ErrorString*, const Inspector::TypeBuilder::Canvas::ResourceId&, RefPtr<Inspector::TypeBuilder::Canvas::ResourceInfo>&) override;
+    virtual void getResourceState(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&, const Inspector::TypeBuilder::Canvas::ResourceId&, RefPtr<Inspector::TypeBuilder::Canvas::ResourceState>&) override;
 
 private:
     InjectedScriptCanvasModule injectedScriptCanvasModule(ErrorString*, JSC::ExecState*);
 
 private:
     InjectedScriptCanvasModule injectedScriptCanvasModule(ErrorString*, JSC::ExecState*);
index 4b43449..3a98f0b 100644 (file)
@@ -59,9 +59,9 @@ public:
     InspectorConsoleAgent(InstrumentingAgents*, PageInjectedScriptManager*);
     virtual ~InspectorConsoleAgent();
 
     InspectorConsoleAgent(InstrumentingAgents*, PageInjectedScriptManager*);
     virtual ~InspectorConsoleAgent();
 
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
-    virtual void clearMessages(ErrorString*);
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
+    virtual void clearMessages(ErrorString*) override;
     bool enabled() const { return m_enabled; }
     void reset();
 
     bool enabled() const { return m_enabled; }
     void reset();
 
@@ -89,9 +89,9 @@ public:
     void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
     void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
 #endif
     void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
     void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
 #endif
-    virtual void setMonitoringXHREnabled(ErrorString*, bool enabled);
+    virtual void setMonitoringXHREnabled(ErrorString*, bool enabled) override;
     virtual void addInspectedNode(ErrorString*, int nodeId) = 0;
     virtual void addInspectedNode(ErrorString*, int nodeId) = 0;
-    virtual void addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId);
+    virtual void addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId) override;
 
     virtual bool isWorkerAgent() = 0;
 
 
     virtual bool isWorkerAgent() = 0;
 
index 9a7ca92..ab29990 100644 (file)
@@ -118,40 +118,40 @@ public:
     void reset();
 
     // Methods called from the frontend for DOM nodes inspection.
     void reset();
 
     // Methods called from the frontend for DOM nodes inspection.
-    virtual void querySelector(ErrorString*, int nodeId, const String& selectors, int* elementId);
-    virtual void querySelectorAll(ErrorString*, int nodeId, const String& selectors, RefPtr<Inspector::TypeBuilder::Array<int>>& result);
-    virtual void getDocument(ErrorString*, RefPtr<Inspector::TypeBuilder::DOM::Node>& root);
-    virtual void requestChildNodes(ErrorString*, int nodeId, const int* depth);
-    virtual void setAttributeValue(ErrorString*, int elementId, const String& name, const String& value);
-    virtual void setAttributesAsText(ErrorString*, int elementId, const String& text, const String* name);
-    virtual void removeAttribute(ErrorString*, int elementId, const String& name);
-    virtual void removeNode(ErrorString*, int nodeId);
-    virtual void setNodeName(ErrorString*, int nodeId, const String& name, int* newId);
-    virtual void getOuterHTML(ErrorString*, int nodeId, WTF::String* outerHTML);
-    virtual void setOuterHTML(ErrorString*, int nodeId, const String& outerHTML);
-    virtual void setNodeValue(ErrorString*, int nodeId, const String& value);
-    virtual void getEventListenersForNode(ErrorString*, int nodeId, const WTF::String* objectGroup, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::EventListener>>& listenersArray);
-    virtual void performSearch(ErrorString*, const String& whitespaceTrimmedQuery, const RefPtr<Inspector::InspectorArray>* nodeIds, String* searchId, int* resultCount);
-    virtual void getSearchResults(ErrorString*, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::TypeBuilder::Array<int>>&);
-    virtual void discardSearchResults(ErrorString*, const String& searchId);
-    virtual void resolveNode(ErrorString*, int nodeId, const String* objectGroup, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result);
-    virtual void getAttributes(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::Array<String>>& result);
-    virtual void setInspectModeEnabled(ErrorString*, bool enabled, const RefPtr<Inspector::InspectorObject>* highlightConfig);
-    virtual void requestNode(ErrorString*, const String& objectId, int* nodeId);
-    virtual void pushNodeByPathToFrontend(ErrorString*, const String& path, int* nodeId);
-    virtual void pushNodeByBackendIdToFrontend(ErrorString*, BackendNodeId, int* nodeId);
-    virtual void releaseBackendNodeIds(ErrorString*, const String& nodeGroup);
-    virtual void hideHighlight(ErrorString*);
-    virtual void highlightRect(ErrorString*, int x, int y, int width, int height, const RefPtr<Inspector::InspectorObject>* color, const RefPtr<Inspector::InspectorObject>* outlineColor, const bool* usePageCoordinates);
-    virtual void highlightQuad(ErrorString*, const RefPtr<Inspector::InspectorArray>& quad, const RefPtr<Inspector::InspectorObject>* color, const RefPtr<Inspector::InspectorObject>* outlineColor, const bool* usePageCoordinates);
-    virtual void highlightNode(ErrorString*, const RefPtr<Inspector::InspectorObject>& highlightConfig, const int* nodeId, const String* objectId);
-    virtual void highlightFrame(ErrorString*, const String& frameId, const RefPtr<Inspector::InspectorObject>* color, const RefPtr<Inspector::InspectorObject>* outlineColor);
-
-    virtual void moveTo(ErrorString*, int nodeId, int targetNodeId, const int* anchorNodeId, int* newNodeId);
-    virtual void undo(ErrorString*);
-    virtual void redo(ErrorString*);
-    virtual void markUndoableState(ErrorString*);
-    virtual void focus(ErrorString*, int nodeId);
+    virtual void querySelector(ErrorString*, int nodeId, const String& selectors, int* elementId) override;
+    virtual void querySelectorAll(ErrorString*, int nodeId, const String& selectors, RefPtr<Inspector::TypeBuilder::Array<int>>& result) override;
+    virtual void getDocument(ErrorString*, RefPtr<Inspector::TypeBuilder::DOM::Node>& root) override;
+    virtual void requestChildNodes(ErrorString*, int nodeId, const int* depth) override;
+    virtual void setAttributeValue(ErrorString*, int elementId, const String& name, const String& value) override;
+    virtual void setAttributesAsText(ErrorString*, int elementId, const String& text, const String* name) override;
+    virtual void removeAttribute(ErrorString*, int elementId, const String& name) override;
+    virtual void removeNode(ErrorString*, int nodeId) override;
+    virtual void setNodeName(ErrorString*, int nodeId, const String& name, int* newId) override;
+    virtual void getOuterHTML(ErrorString*, int nodeId, WTF::String* outerHTML) override;
+    virtual void setOuterHTML(ErrorString*, int nodeId, const String& outerHTML) override;
+    virtual void setNodeValue(ErrorString*, int nodeId, const String& value) override;
+    virtual void getEventListenersForNode(ErrorString*, int nodeId, const WTF::String* objectGroup, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::EventListener>>& listenersArray) override;
+    virtual void performSearch(ErrorString*, const String& whitespaceTrimmedQuery, const RefPtr<Inspector::InspectorArray>* nodeIds, String* searchId, int* resultCount) override;
+    virtual void getSearchResults(ErrorString*, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::TypeBuilder::Array<int>>&) override;
+    virtual void discardSearchResults(ErrorString*, const String& searchId) override;
+    virtual void resolveNode(ErrorString*, int nodeId, const String* objectGroup, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result) override;
+    virtual void getAttributes(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::Array<String>>& result) override;
+    virtual void setInspectModeEnabled(ErrorString*, bool enabled, const RefPtr<Inspector::InspectorObject>* highlightConfig) override;
+    virtual void requestNode(ErrorString*, const String& objectId, int* nodeId) override;
+    virtual void pushNodeByPathToFrontend(ErrorString*, const String& path, int* nodeId) override;
+    virtual void pushNodeByBackendIdToFrontend(ErrorString*, BackendNodeId, int* nodeId) override;
+    virtual void releaseBackendNodeIds(ErrorString*, const String& nodeGroup) override;
+    virtual void hideHighlight(ErrorString*) override;
+    virtual void highlightRect(ErrorString*, int x, int y, int width, int height, const RefPtr<Inspector::InspectorObject>* color, const RefPtr<Inspector::InspectorObject>* outlineColor, const bool* usePageCoordinates) override;
+    virtual void highlightQuad(ErrorString*, const RefPtr<Inspector::InspectorArray>& quad, const RefPtr<Inspector::InspectorObject>* color, const RefPtr<Inspector::InspectorObject>* outlineColor, const bool* usePageCoordinates) override;
+    virtual void highlightNode(ErrorString*, const RefPtr<Inspector::InspectorObject>& highlightConfig, const int* nodeId, const String* objectId) override;
+    virtual void highlightFrame(ErrorString*, const String& frameId, const RefPtr<Inspector::InspectorObject>* color, const RefPtr<Inspector::InspectorObject>* outlineColor) override;
+
+    virtual void moveTo(ErrorString*, int nodeId, int targetNodeId, const int* anchorNodeId, int* newNodeId) override;
+    virtual void undo(ErrorString*) override;
+    virtual void redo(ErrorString*) override;
+    virtual void markUndoableState(ErrorString*) override;
+    virtual void focus(ErrorString*, int nodeId) override;
 
     void getEventListeners(Node*, Vector<EventListenerInfo>& listenersArray, bool includeAncestors);
 
 
     void getEventListeners(Node*, Vector<EventListenerInfo>& listenersArray, bool includeAncestors);
 
index 7e7aca5..a58f48d 100644 (file)
@@ -62,14 +62,14 @@ public:
     virtual ~InspectorDOMDebuggerAgent();
 
     // DOMDebugger API
     virtual ~InspectorDOMDebuggerAgent();
 
     // DOMDebugger API
-    virtual void setXHRBreakpoint(ErrorString*, const String& url);
-    virtual void removeXHRBreakpoint(ErrorString*, const String& url);
-    virtual void setEventListenerBreakpoint(ErrorString*, const String& eventName);
-    virtual void removeEventListenerBreakpoint(ErrorString*, const String& eventName);
-    virtual void setInstrumentationBreakpoint(ErrorString*, const String& eventName);
-    virtual void removeInstrumentationBreakpoint(ErrorString*, const String& eventName);
-    virtual void setDOMBreakpoint(ErrorString*, int nodeId, const String& type);
-    virtual void removeDOMBreakpoint(ErrorString*, int nodeId, const String& type);
+    virtual void setXHRBreakpoint(ErrorString*, const String& url) override;
+    virtual void removeXHRBreakpoint(ErrorString*, const String& url) override;
+    virtual void setEventListenerBreakpoint(ErrorString*, const String& eventName) override;
+    virtual void removeEventListenerBreakpoint(ErrorString*, const String& eventName) override;
+    virtual void setInstrumentationBreakpoint(ErrorString*, const String& eventName) override;
+    virtual void removeInstrumentationBreakpoint(ErrorString*, const String& eventName) override;
+    virtual void setDOMBreakpoint(ErrorString*, int nodeId, const String& type) override;
+    virtual void removeDOMBreakpoint(ErrorString*, int nodeId, const String& type) override;
 
     // InspectorInstrumentation API
     void willInsertDOMNode(Node* parent);
 
     // InspectorInstrumentation API
     void willInsertDOMNode(Node* parent);
@@ -83,14 +83,14 @@ public:
 
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
 
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
-    virtual void discardAgent();
+    virtual void discardAgent() override;
 
 private:
     // InspectorDebuggerAgent::Listener implementation.
 
 private:
     // InspectorDebuggerAgent::Listener implementation.
-    virtual void debuggerWasEnabled();
-    virtual void debuggerWasDisabled();
-    virtual void stepInto();
-    virtual void didPause();
+    virtual void debuggerWasEnabled() override;
+    virtual void debuggerWasDisabled() override;
+    virtual void stepInto() override;
+    virtual void didPause() override;
     void disable();
 
     void descriptionForDOMEvent(Node* target, int breakpointType, bool insertion, Inspector::InspectorObject* description);
     void disable();
 
     void descriptionForDOMEvent(Node* target, int breakpointType, bool insertion, Inspector::InspectorObject* description);
index f47cbbe..c62aa71 100644 (file)
@@ -61,11 +61,11 @@ public:
     virtual void willDestroyFrontendAndBackend() override;
 
     // Called from the front-end.
     virtual void willDestroyFrontendAndBackend() override;
 
     // Called from the front-end.
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
-    virtual void getDOMStorageItems(ErrorString*, const RefPtr<Inspector::InspectorObject>& storageId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Array<String>>>& items);
-    virtual void setDOMStorageItem(ErrorString*, const RefPtr<Inspector::InspectorObject>& storageId, const String& key, const String& value);
-    virtual void removeDOMStorageItem(ErrorString*, const RefPtr<Inspector::InspectorObject>& storageId, const String& key);
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
+    virtual void getDOMStorageItems(ErrorString*, const RefPtr<Inspector::InspectorObject>& storageId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Array<String>>>& items) override;
+    virtual void setDOMStorageItem(ErrorString*, const RefPtr<Inspector::InspectorObject>& storageId, const String& key, const String& value) override;
+    virtual void removeDOMStorageItem(ErrorString*, const RefPtr<Inspector::InspectorObject>& storageId, const String& key) override;
 
     // Called from the injected script.
     String storageId(Storage*);
 
     // Called from the injected script.
     String storageId(Storage*);
index 491c849..42b36f7 100644 (file)
@@ -76,7 +76,7 @@ public:
 
     virtual ~StatementCallback() { }
 
 
     virtual ~StatementCallback() { }
 
-    virtual bool handleEvent(SQLTransaction*, SQLResultSet* resultSet)
+    virtual bool handleEvent(SQLTransaction*, SQLResultSet* resultSet) override
     {
         SQLResultSetRowList* rowList = resultSet->rows();
 
     {
         SQLResultSetRowList* rowList = resultSet->rows();
 
@@ -114,7 +114,7 @@ public:
 
     virtual ~StatementErrorCallback() { }
 
 
     virtual ~StatementErrorCallback() { }
 
-    virtual bool handleEvent(SQLTransaction*, SQLError* error)
+    virtual bool handleEvent(SQLTransaction*, SQLError* error) override
     {
         reportTransactionFailed(m_requestCallback.get(), error);
         return true;  
     {
         reportTransactionFailed(m_requestCallback.get(), error);
         return true;  
@@ -135,7 +135,7 @@ public:
 
     virtual ~TransactionCallback() { }
 
 
     virtual ~TransactionCallback() { }
 
-    virtual bool handleEvent(SQLTransaction* transaction)
+    virtual bool handleEvent(SQLTransaction* transaction) override
     {
         if (!m_requestCallback->isActive())
             return true;
     {
         if (!m_requestCallback->isActive())
             return true;
@@ -163,7 +163,7 @@ public:
 
     virtual ~TransactionErrorCallback() { }
 
 
     virtual ~TransactionErrorCallback() { }
 
-    virtual bool handleEvent(SQLError* error)
+    virtual bool handleEvent(SQLError* error) override
     {
         reportTransactionFailed(m_requestCallback.get(), error);
         return true;
     {
         reportTransactionFailed(m_requestCallback.get(), error);
         return true;
@@ -183,7 +183,7 @@ public:
 
     virtual ~TransactionSuccessCallback() { }
 
 
     virtual ~TransactionSuccessCallback() { }
 
-    virtual bool handleEvent() { return false; }
+    virtual bool handleEvent() override { return false; }
 
 private:
     TransactionSuccessCallback() { }
 
 private:
     TransactionSuccessCallback() { }
index 978f804..6fb7108 100644 (file)
@@ -61,10 +61,10 @@ public:
     void clearResources();
 
     // Called from the front-end.
     void clearResources();
 
     // Called from the front-end.
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
-    virtual void getDatabaseTableNames(ErrorString*, const String& databaseId, RefPtr<Inspector::TypeBuilder::Array<String>>& names);
-    virtual void executeSQL(ErrorString*, const String& databaseId, const String& query, PassRefPtr<ExecuteSQLCallback>);
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
+    virtual void getDatabaseTableNames(ErrorString*, const String& databaseId, RefPtr<Inspector::TypeBuilder::Array<String>>& names) override;
+    virtual void executeSQL(ErrorString*, const String& databaseId, const String& query, PassRefPtr<ExecuteSQLCallback>) override;
 
     // Called from the injected script.
     String databaseId(Database*);
 
     // Called from the injected script.
     String databaseId(Database*);
index d1c5e30..f99aa38 100644 (file)
@@ -77,24 +77,24 @@ public:
     void addMessageToConsole(MessageSource, MessageType);
 
     // Part of the protocol.
     void addMessageToConsole(MessageSource, MessageType);
 
     // Part of the protocol.
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
-    virtual void setBreakpointsActive(ErrorString*, bool active);
-
-    virtual void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const RefPtr<Inspector::InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::Location>>& locations, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::BreakpointActionIdentifier>>& breakpointActionIdentifiers);
-    virtual void setBreakpoint(ErrorString*, const RefPtr<Inspector::InspectorObject>& location, const RefPtr<Inspector::InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId*, RefPtr<Inspector::TypeBuilder::Debugger::Location>& actualLocation, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::BreakpointActionIdentifier>>& breakpointActionIdentifiers);
-    virtual void removeBreakpoint(ErrorString*, const String& breakpointIdentifier);
-    virtual void continueToLocation(ErrorString*, const RefPtr<Inspector::InspectorObject>& location);
-
-    virtual void searchInContent(ErrorString*, const String& scriptID, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>>&);
-    virtual void getScriptSource(ErrorString*, const String& scriptID, String* scriptSource);
-    virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Inspector::TypeBuilder::Debugger::FunctionDetails>&);
-    virtual void pause(ErrorString*);
-    virtual void resume(ErrorString*);
-    virtual void stepOver(ErrorString*);
-    virtual void stepInto(ErrorString*);
-    virtual void stepOut(ErrorString*);
-    virtual void setPauseOnExceptions(ErrorString*, const String& pauseState);
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
+    virtual void setBreakpointsActive(ErrorString*, bool active) override;
+
+    virtual void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const RefPtr<Inspector::InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::Location>>& locations, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::BreakpointActionIdentifier>>& breakpointActionIdentifiers) override;
+    virtual void setBreakpoint(ErrorString*, const RefPtr<Inspector::InspectorObject>& location, const RefPtr<Inspector::InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId*, RefPtr<Inspector::TypeBuilder::Debugger::Location>& actualLocation, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::BreakpointActionIdentifier>>& breakpointActionIdentifiers) override;
+    virtual void removeBreakpoint(ErrorString*, const String& breakpointIdentifier) override;
+    virtual void continueToLocation(ErrorString*, const RefPtr<Inspector::InspectorObject>& location) override;
+
+    virtual void searchInContent(ErrorString*, const String& scriptID, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>>&) override;
+    virtual void getScriptSource(ErrorString*, const String& scriptID, String* scriptSource) override;
+    virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Inspector::TypeBuilder::Debugger::FunctionDetails>&) override;
+    virtual void pause(ErrorString*) override;
+    virtual void resume(ErrorString*) override;
+    virtual void stepOver(ErrorString*) override;
+    virtual void stepInto(ErrorString*) override;
+    virtual void stepOut(ErrorString*) override;
+    virtual void setPauseOnExceptions(ErrorString*, const String& pauseState) override;
     virtual void evaluateOnCallFrame(ErrorString*,
                              const String& callFrameId,
                              const String& expression,
     virtual void evaluateOnCallFrame(ErrorString*,
                              const String& callFrameId,
                              const String& expression,
@@ -104,8 +104,8 @@ public:
                              const bool* returnByValue,
                              const bool* generatePreview,
                              RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result,
                              const bool* returnByValue,
                              const bool* generatePreview,
                              RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result,
-                             Inspector::TypeBuilder::OptOutput<bool>* wasThrown);
-    virtual void setOverlayMessage(ErrorString*, const String*);
+                             Inspector::TypeBuilder::OptOutput<bool>* wasThrown) override;
+    virtual void setOverlayMessage(ErrorString*, const String*) override;
 
     void schedulePauseOnNextStatement(Inspector::InspectorDebuggerFrontendDispatcher::Reason::Enum breakReason, PassRefPtr<Inspector::InspectorObject> data);
     void cancelPauseOnNextStatement();
 
     void schedulePauseOnNextStatement(Inspector::InspectorDebuggerFrontendDispatcher::Reason::Enum breakReason, PassRefPtr<Inspector::InspectorObject> data);
     void cancelPauseOnNextStatement();
@@ -136,8 +136,8 @@ protected:
 
     virtual void enable();
     virtual void disable();
 
     virtual void enable();
     virtual void disable();
-    virtual void didPause(JSC::ExecState*, const Deprecated::ScriptValue& callFrames, const Deprecated::ScriptValue& exception);
-    virtual void didContinue();
+    virtual void didPause(JSC::ExecState*, const Deprecated::ScriptValue& callFrames, const Deprecated::ScriptValue& exception) override;
+    virtual void didContinue() override;
     void didClearGlobalObject();
 
 private:
     void didClearGlobalObject();
 
 private:
index 7d7b1b1..3c74ac8 100644 (file)
@@ -90,13 +90,13 @@ private:
         contextMenuCleared();
     }
     
         contextMenuCleared();
     }
     
-    virtual void populateContextMenu(ContextMenu* menu)
+    virtual void populateContextMenu(ContextMenu* menu) override
     {
         for (size_t i = 0; i < m_items.size(); ++i)
             menu->appendItem(m_items[i]);
     }
     
     {
         for (size_t i = 0; i < m_items.size(); ++i)
             menu->appendItem(m_items[i]);
     }
     
-    virtual void contextMenuItemSelected(ContextMenuItem* item)
+    virtual void contextMenuItemSelected(ContextMenuItem* item) override
     {
         if (m_frontendHost) {
             UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
     {
         if (m_frontendHost) {
             UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
@@ -108,7 +108,7 @@ private:
         }
     }
     
         }
     }
     
-    virtual void contextMenuCleared()
+    virtual void contextMenuCleared() override
     {
         if (m_frontendHost) {
             Deprecated::ScriptFunctionCall function(m_frontendApiObject, "contextMenuCleared", WebCore::functionCallHandlerFromAnyThread);
     {
         if (m_frontendHost) {
             Deprecated::ScriptFunctionCall function(m_frontendApiObject, "contextMenuCleared", WebCore::functionCallHandlerFromAnyThread);
index e220669..a1809f4 100644 (file)
@@ -128,8 +128,8 @@ void InspectorHeapProfilerAgent::getHeapSnapshot(ErrorString* errorString, int r
     public:
         OutputStream(InspectorHeapProfilerFrontendDispatcher* frontend, unsigned uid)
             : m_frontendDispatcher(frontend), m_uid(uid) { }
     public:
         OutputStream(InspectorHeapProfilerFrontendDispatcher* frontend, unsigned uid)
             : m_frontendDispatcher(frontend), m_uid(uid) { }
-        void Write(const String& chunk) { m_frontendDispatcher->addHeapSnapshotChunk(m_uid, chunk); }
-        void Close() { m_frontendDispatcher->finishHeapSnapshot(m_uid); }
+        void Write(const String& chunk) override { m_frontendDispatcher->addHeapSnapshotChunk(m_uid, chunk); }
+        void Close() override { m_frontendDispatcher->finishHeapSnapshot(m_uid); }
     private:
         InspectorHeapProfilerFrontendDispatcher* m_frontendDispatcher;
         int m_uid;
     private:
         InspectorHeapProfilerFrontendDispatcher* m_frontendDispatcher;
         int m_uid;
@@ -161,16 +161,16 @@ void InspectorHeapProfilerAgent::takeHeapSnapshot(ErrorString*, const bool* repo
     public:
         explicit HeapSnapshotProgress(InspectorHeapProfilerFrontendDispatcher* frontend)
             : m_frontendDispatcher(frontend) { }
     public:
         explicit HeapSnapshotProgress(InspectorHeapProfilerFrontendDispatcher* frontend)
             : m_frontendDispatcher(frontend) { }
-        void Start(int totalWork)
+        void Start(int totalWork) override
         {
             m_totalWork = totalWork;
         }
         {
             m_totalWork = totalWork;
         }
-        void Worked(int workDone)
+        void Worked(int workDone) override
         {
             if (m_frontendDispatcher)
                 m_frontendDispatcher->reportHeapSnapshotProgress(workDone, m_totalWork);
         }
         {
             if (m_frontendDispatcher)
                 m_frontendDispatcher->reportHeapSnapshotProgress(workDone, m_totalWork);
         }
-        void Done() { }
+        void Done() override { }
         bool isCanceled() { return false; }
     private:
         InspectorHeapProfilerFrontendDispatcher* m_frontendDispatcher;
         bool isCanceled() { return false; }
     private:
         InspectorHeapProfilerFrontendDispatcher* m_frontendDispatcher;
index c4f4dfe..9804fe4 100644 (file)
@@ -56,23 +56,23 @@ public:
     InspectorHeapProfilerAgent(InstrumentingAgents*, PageInjectedScriptManager*);
     virtual ~InspectorHeapProfilerAgent();
 
     InspectorHeapProfilerAgent(InstrumentingAgents*, PageInjectedScriptManager*);
     virtual ~InspectorHeapProfilerAgent();
 
-    virtual void collectGarbage(ErrorString*);
-    virtual void clearProfiles(ErrorString*) { resetState(); }
+    virtual void collectGarbage(ErrorString*) override;
+    virtual void clearProfiles(ErrorString*) override { resetState(); }
     void resetState();
 
     void resetState();
 
-    virtual void hasHeapProfiler(ErrorString*, bool*);
+    virtual void hasHeapProfiler(ErrorString*, bool*) override;
 
 
-    virtual void getProfileHeaders(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::HeapProfiler::ProfileHeader>>&);
-    virtual void getHeapSnapshot(ErrorString*, int uid);
-    virtual void removeProfile(ErrorString*, int uid);
+    virtual void getProfileHeaders(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::HeapProfiler::ProfileHeader>>&) override;
+    virtual void getHeapSnapshot(ErrorString*, int uid) override;
+    virtual void removeProfile(ErrorString*, int uid) override;
 
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
 
 
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
 
-    virtual void takeHeapSnapshot(ErrorString*, const bool* reportProgress);
+    virtual void takeHeapSnapshot(ErrorString*, const bool* reportProgress) override;
 
 
-    virtual void getObjectByHeapObjectId(ErrorString*, const String& heapSnapshotObjectId, const String* objectGroup, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result);
-    virtual void getHeapObjectId(ErrorString*, const String& objectId, String* heapSnapshotObjectId);
+    virtual void getObjectByHeapObjectId(ErrorString*, const String& heapSnapshotObjectId, const String* objectGroup, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result) override;
+    virtual void getHeapObjectId(ErrorString*, const String& objectId, String* heapSnapshotObjectId) override;
 
 private:
     typedef HashMap<unsigned, RefPtr<ScriptHeapSnapshot>> IdToHeapSnapshotMap;
 
 private:
     typedef HashMap<unsigned, RefPtr<ScriptHeapSnapshot>> IdToHeapSnapshotMap;
index 07d6189..bcfef4a 100644 (file)
@@ -45,13 +45,13 @@ class UndoableStateMark : public InspectorHistory::Action {
 public:
     UndoableStateMark() : InspectorHistory::Action("[UndoableState]") { }
 
 public:
     UndoableStateMark() : InspectorHistory::Action("[UndoableState]") { }
 
-    virtual bool perform(ExceptionCode&) { return true; }
+    virtual bool perform(ExceptionCode&) override { return true; }
 
 
-    virtual bool undo(ExceptionCode&) { return true; }
+    virtual bool undo(ExceptionCode&) override { return true; }
 
 
-    virtual bool redo(ExceptionCode&) { return true; }
+    virtual bool redo(ExceptionCode&) override { return true; }
 
 
-    virtual bool isUndoableStateMark() { return true; }
+    virtual bool isUndoableStateMark() override { return true; }
 };
 
 }
 };
 
 }
index b98d625..47f4257 100644 (file)
@@ -276,7 +276,7 @@ public:
 
     virtual ~DatabaseLoader() { }
 
 
     virtual ~DatabaseLoader() { }
 
-    virtual void execute(PassRefPtr<IDBDatabase> prpDatabase)
+    virtual void execute(PassRefPtr<IDBDatabase> prpDatabase) override
     {
 #if PLATFORM(MAC)
         ASSERT_UNUSED(prpDatabase, prpDatabase);
     {
 #if PLATFORM(MAC)
         ASSERT_UNUSED(prpDatabase, prpDatabase);
@@ -322,7 +322,7 @@ public:
 #endif // PLATFORM(MAC)
     }
 
 #endif // PLATFORM(MAC)
     }
 
-    virtual RequestCallback* requestCallback() { return m_requestCallback.get(); }
+    virtual RequestCallback* requestCallback() override { return m_requestCallback.get(); }
 private:
     DatabaseLoader(ScriptExecutionContext* context, PassRefPtr<RequestDatabaseCallback> requestCallback)
         : ExecutableWithDatabase(context)
 private:
     DatabaseLoader(ScriptExecutionContext* context, PassRefPtr<RequestDatabaseCallback> requestCallback)
         : ExecutableWithDatabase(context)
@@ -504,7 +504,7 @@ public:
 
     virtual ~DataLoader() { }
 
 
     virtual ~DataLoader() { }
 
-    virtual void execute(PassRefPtr<IDBDatabase> prpDatabase)
+    virtual void execute(PassRefPtr<IDBDatabase> prpDatabase) override
     {
         RefPtr<IDBDatabase> idbDatabase = prpDatabase;
         if (!requestCallback()->isActive())
     {
         RefPtr<IDBDatabase> idbDatabase = prpDatabase;
         if (!requestCallback()->isActive())
@@ -537,7 +537,7 @@ public:
         idbRequest->addEventListener(eventNames().successEvent, openCursorCallback, false);
     }
 
         idbRequest->addEventListener(eventNames().successEvent, openCursorCallback, false);
     }
 
-    virtual RequestCallback* requestCallback() { return m_requestCallback.get(); }
+    virtual RequestCallback* requestCallback() override { return m_requestCallback.get(); }
     DataLoader(ScriptExecutionContext* scriptExecutionContext, PassRefPtr<RequestDataCallback> requestCallback, const InjectedScript& injectedScript, const String& objectStoreName, const String& indexName, PassRefPtr<IDBKeyRange> idbKeyRange, int skipCount, unsigned pageSize)
         : ExecutableWithDatabase(scriptExecutionContext)
         , m_requestCallback(requestCallback)
     DataLoader(ScriptExecutionContext* scriptExecutionContext, PassRefPtr<RequestDataCallback> requestCallback, const InjectedScript& injectedScript, const String& objectStoreName, const String& indexName, PassRefPtr<IDBKeyRange> idbKeyRange, int skipCount, unsigned pageSize)
         : ExecutableWithDatabase(scriptExecutionContext)
         , m_requestCallback(requestCallback)
@@ -720,7 +720,7 @@ public:
     {
     }
 
     {
     }
 
-    virtual void execute(PassRefPtr<IDBDatabase> prpDatabase)
+    virtual void execute(PassRefPtr<IDBDatabase> prpDatabase) override
     {
         RefPtr<IDBDatabase> idbDatabase = prpDatabase;
         if (!requestCallback()->isActive())
     {
         RefPtr<IDBDatabase> idbDatabase = prpDatabase;
         if (!requestCallback()->isActive())
@@ -746,7 +746,7 @@ public:
         idbTransaction->addEventListener(eventNames().completeEvent, ClearObjectStoreListener::create(m_requestCallback), false);
     }
 
         idbTransaction->addEventListener(eventNames().completeEvent, ClearObjectStoreListener::create(m_requestCallback), false);
     }
 
-    virtual RequestCallback* requestCallback() { return m_requestCallback.get(); }
+    virtual RequestCallback* requestCallback() override { return m_requestCallback.get(); }
 private:
     const String m_objectStoreName;
     RefPtr<ClearObjectStoreCallback> m_requestCallback;
 private:
     const String m_objectStoreName;
     RefPtr<ClearObjectStoreCallback> m_requestCallback;
index 8c50e29..ae61988 100644 (file)
@@ -57,12 +57,12 @@ public:
     virtual void willDestroyFrontendAndBackend() override;
 
     // Called from the front-end.
     virtual void willDestroyFrontendAndBackend() override;
 
     // Called from the front-end.
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
-    virtual void requestDatabaseNames(ErrorString*, const String& securityOrigin, PassRefPtr<RequestDatabaseNamesCallback>);
-    virtual void requestDatabase(ErrorString*, const String& securityOrigin, const String& databaseName, PassRefPtr<RequestDatabaseCallback>);
-    virtual void requestData(ErrorString*, const String& securityOrigin, const String& databaseName, const String& objectStoreName, const String& indexName, int skipCount, int pageSize, const RefPtr<Inspector::InspectorObject>* keyRange, PassRefPtr<RequestDataCallback>);
-    virtual void clearObjectStore(ErrorString*, const String& in_securityOrigin, const String& in_databaseName, const String& in_objectStoreName, PassRefPtr<ClearObjectStoreCallback>);
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
+    virtual void requestDatabaseNames(ErrorString*, const String& securityOrigin, PassRefPtr<RequestDatabaseNamesCallback>) override;
+    virtual void requestDatabase(ErrorString*, const String& securityOrigin, const String& databaseName, PassRefPtr<RequestDatabaseCallback>) override;
+    virtual void requestData(ErrorString*, const String& securityOrigin, const String& databaseName, const String& objectStoreName, const String& indexName, int skipCount, int pageSize, const RefPtr<Inspector::InspectorObject>* keyRange, PassRefPtr<RequestDataCallback>) override;
+    virtual void clearObjectStore(ErrorString*, const String& in_securityOrigin, const String& in_databaseName, const String& in_objectStoreName, PassRefPtr<ClearObjectStoreCallback>) override;
 
 private:
     Inspector::InjectedScriptManager* m_injectedScriptManager;
 
 private:
     Inspector::InjectedScriptManager* m_injectedScriptManager;
index 81a66c6..88eb933 100644 (file)
@@ -54,8 +54,8 @@ public:
     virtual void willDestroyFrontendAndBackend() override;
 
     // Methods called from the frontend for simulating input.
     virtual void willDestroyFrontendAndBackend() override;
 
     // Methods called from the frontend for simulating input.
-    virtual void dispatchKeyEvent(ErrorString*, const String& type, const int* modifiers, const double* timestamp, const String* text, const String* unmodifiedText, const String* keyIdentifier, const int* windowsVirtualKeyCode, const int* nativeVirtualKeyCode, const int* macCharCode, const bool* autoRepeat, const bool* isKeypad, const bool* isSystemKey);
-    virtual void dispatchMouseEvent(ErrorString*, const String& type, int x, int y, const int* modifiers, const double* timestamp, const String* button, const int* clickCount);
+    virtual void dispatchKeyEvent(ErrorString*, const String& type, const int* modifiers, const double* timestamp, const String* text, const String* unmodifiedText, const String* keyIdentifier, const int* windowsVirtualKeyCode, const int* nativeVirtualKeyCode, const int* macCharCode, const bool* autoRepeat, const bool* isKeypad, const bool* isSystemKey) override;
+    virtual void dispatchMouseEvent(ErrorString*, const String& type, int x, int y, const int* modifiers, const double* timestamp, const String* button, const int* clickCount) override;
 
 private:
     Page* m_page;
 
 private:
     Page* m_page;
index afb151f..721b310 100644 (file)
@@ -61,10 +61,10 @@ public:
     void pseudoElementDestroyed(PseudoElement*);
 
     // Called from the front-end.
     void pseudoElementDestroyed(PseudoElement*);
 
     // Called from the front-end.
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
-    virtual void layersForNode(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::LayerTree::Layer>>&);
-    virtual void reasonsForCompositingLayer(ErrorString*, const String& layerId, RefPtr<Inspector::TypeBuilder::LayerTree::CompositingReasons>&);
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
+    virtual void layersForNode(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::LayerTree::Layer>>&) override;
+    virtual void reasonsForCompositingLayer(ErrorString*, const String& layerId, RefPtr<Inspector::TypeBuilder::LayerTree::CompositingReasons>&) override;
 
 private:
     // RenderLayer-related methods.
 
 private:
     // RenderLayer-related methods.
index 0e66b52..c5c10af 100644 (file)
@@ -54,7 +54,7 @@ public:
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
 
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
 
-    virtual void getDOMCounters(ErrorString*, int* documents, int* nodes, int* jsEventListeners);
+    virtual void getDOMCounters(ErrorString*, int* documents, int* nodes, int* jsEventListeners) override;
 
 private:
     RefPtr<Inspector::InspectorMemoryBackendDispatcher> m_backendDispatcher;
 
 private:
     RefPtr<Inspector::InspectorMemoryBackendDispatcher> m_backendDispatcher;
index 4820ed6..774153a 100644 (file)
@@ -95,36 +95,36 @@ public:
     static Inspector::TypeBuilder::Page::ResourceType::Enum cachedResourceTypeJson(const CachedResource&);
 
     // Page API for InspectorFrontend
     static Inspector::TypeBuilder::Page::ResourceType::Enum cachedResourceTypeJson(const CachedResource&);
 
     // Page API for InspectorFrontend
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
-    virtual void addScriptToEvaluateOnLoad(ErrorString*, const String& source, String* result);
-    virtual void removeScriptToEvaluateOnLoad(ErrorString*, const String& identifier);
-    virtual void reload(ErrorString*, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad);
-    virtual void navigate(ErrorString*, const String& url);
-    virtual void getCookies(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::Cookie>>& cookies);
-    virtual void deleteCookie(ErrorString*, const String& cookieName, const String& url);
-    virtual void getResourceTree(ErrorString*, RefPtr<Inspector::TypeBuilder::Page::FrameResourceTree>&);
-    virtual void getResourceContent(ErrorString*, const String& frameId, const String& url, String* content, bool* base64Encoded);
-    virtual void searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>>&);
-    virtual void searchInResources(ErrorString*, const String&, const bool* caseSensitive, const bool* isRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::SearchResult>>&);
-    virtual void setDocumentContent(ErrorString*, const String& frameId, const String& html);
-    virtual void setShowPaintRects(ErrorString*, bool show);
-    virtual void canShowDebugBorders(ErrorString*, bool*);
-    virtual void setShowDebugBorders(ErrorString*, bool show);
-    virtual void canShowFPSCounter(ErrorString*, bool*);
-    virtual void setShowFPSCounter(ErrorString*, bool show);
-    virtual void canContinuouslyPaint(ErrorString*, bool*);
-    virtual void setContinuousPaintingEnabled(ErrorString*, bool enabled);
-    virtual void getScriptExecutionStatus(ErrorString*, Inspector::InspectorPageBackendDispatcherHandler::Result::Enum*);
-    virtual void setScriptExecutionDisabled(ErrorString*, bool);
-    virtual void setTouchEmulationEnabled(ErrorString*, bool);
-    virtual void setEmulatedMedia(ErrorString*, const String&);
-    virtual void getCompositingBordersVisible(ErrorString*, bool* out_param);
-    virtual void setCompositingBordersVisible(ErrorString*, bool);
-    virtual void snapshotNode(ErrorString*, int nodeId, String* outDataURL);
-    virtual void snapshotRect(ErrorString*, int x, int y, int width, int height, const String& coordinateSystem, String* outDataURL);
-    virtual void handleJavaScriptDialog(ErrorString*, bool accept, const String* promptText);
-    virtual void archive(ErrorString*, String* data);
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
+    virtual void addScriptToEvaluateOnLoad(ErrorString*, const String& source, String* result) override;
+    virtual void removeScriptToEvaluateOnLoad(ErrorString*, const String& identifier) override;
+    virtual void reload(ErrorString*, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad) override;
+    virtual void navigate(ErrorString*, const String& url) override;
+    virtual void getCookies(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::Cookie>>& cookies) override;
+    virtual void deleteCookie(ErrorString*, const String& cookieName, const String& url) override;
+    virtual void getResourceTree(ErrorString*, RefPtr<Inspector::TypeBuilder::Page::FrameResourceTree>&) override;
+    virtual void getResourceContent(ErrorString*, const String& frameId, const String& url, String* content, bool* base64Encoded) override;
+    virtual void searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>>&) override;
+    virtual void searchInResources(ErrorString*, const String&, const bool* caseSensitive, const bool* isRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::SearchResult>>&) override;
+    virtual void setDocumentContent(ErrorString*, const String& frameId, const String& html) override;
+    virtual void setShowPaintRects(ErrorString*, bool show) override;
+    virtual void canShowDebugBorders(ErrorString*, bool*) override;
+    virtual void setShowDebugBorders(ErrorString*, bool show) override;
+    virtual void canShowFPSCounter(ErrorString*, bool*) override;
+    virtual void setShowFPSCounter(ErrorString*, bool show) override;
+    virtual void canContinuouslyPaint(ErrorString*, bool*) override;
+    virtual void setContinuousPaintingEnabled(ErrorString*, bool enabled) override;
+    virtual void getScriptExecutionStatus(ErrorString*, Inspector::InspectorPageBackendDispatcherHandler::Result::Enum*) override;
+    virtual void setScriptExecutionDisabled(ErrorString*, bool) override;
+    virtual void setTouchEmulationEnabled(ErrorString*, bool) override;
+    virtual void setEmulatedMedia(ErrorString*, const String&) override;
+    virtual void getCompositingBordersVisible(ErrorString*, bool* out_param) override;
+    virtual void setCompositingBordersVisible(ErrorString*, bool) override;
+    virtual void snapshotNode(ErrorString*, int nodeId, String* outDataURL) override;
+    virtual void snapshotRect(ErrorString*, int x, int y, int width, int height, const String& coordinateSystem, String* outDataURL) override;
+    virtual void handleJavaScriptDialog(ErrorString*, bool accept, const String* promptText) override;
+    virtual void archive(ErrorString*, String* data) override;
 
     // InspectorInstrumentation API
     void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld&);
 
     // InspectorInstrumentation API
     void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld&);
index b96bfdc..36932e1 100644 (file)
@@ -71,17 +71,17 @@ public:
     virtual ~PageProfilerAgent() { }
 
 private:
     virtual ~PageProfilerAgent() { }
 
 private:
-    virtual void recompileScript()
+    virtual void recompileScript() override
     {
         PageScriptDebugServer::shared().recompileAllJSFunctionsSoon();
     }
 
     {
         PageScriptDebugServer::shared().recompileAllJSFunctionsSoon();
     }
 
-    virtual void startProfiling(const String& title)
+    virtual void startProfiling(const String& title) override
     {
         ScriptProfiler::startForPage(m_inspectedPage, title);
     }
 
     {
         ScriptProfiler::startForPage(m_inspectedPage, title);
     }
 
-    virtual PassRefPtr<ScriptProfile> stopProfiling(const String& title)
+    virtual PassRefPtr<ScriptProfile> stopProfiling(const String& title) override
     {
         return ScriptProfiler::stopForPage(m_inspectedPage, title);
     }
     {
         return ScriptProfiler::stopForPage(m_inspectedPage, title);
     }
@@ -101,14 +101,14 @@ public:
     virtual ~WorkerProfilerAgent() { }
 
 private:
     virtual ~WorkerProfilerAgent() { }
 
 private:
-    virtual void recompileScript() { }
+    virtual void recompileScript() override { }
 
 
-    virtual void startProfiling(const String& title)
+    virtual void startProfiling(const String& title) override
     {
         ScriptProfiler::startForWorkerGlobalScope(m_workerGlobalScope, title);
     }
 
     {
         ScriptProfiler::startForWorkerGlobalScope(m_workerGlobalScope, title);
     }
 
-    virtual PassRefPtr<ScriptProfile> stopProfiling(const String& title)
+    virtual PassRefPtr<ScriptProfile> stopProfiling(const String& title) override
     {
         return ScriptProfiler::stopForWorkerGlobalScope(m_workerGlobalScope, title);
     }
     {
         return ScriptProfiler::stopForWorkerGlobalScope(m_workerGlobalScope, title);
     }
@@ -257,8 +257,8 @@ class OutputStream : public ScriptHeapSnapshot::OutputStream {
 public:
     OutputStream(InspectorProfilerFrontendDispatcher* frontend, unsigned uid)
         : m_frontendDispatcher(frontend), m_uid(uid) { }
 public:
     OutputStream(InspectorProfilerFrontendDispatcher* frontend, unsigned uid)
         : m_frontendDispatcher(frontend), m_uid(uid) { }
-    void Write(const String& chunk) { m_frontendDispatcher->addHeapSnapshotChunk(m_uid, chunk); }
-    void Close() { m_frontendDispatcher->finishHeapSnapshot(m_uid); }
+    void Write(const String& chunk) override { m_frontendDispatcher->addHeapSnapshotChunk(m_uid, chunk); }
+    void Close() override { m_frontendDispatcher->finishHeapSnapshot(m_uid); }
 private:
     InspectorProfilerFrontendDispatcher* m_frontendDispatcher;
     int m_uid;
 private:
     InspectorProfilerFrontendDispatcher* m_frontendDispatcher;
     int m_uid;
@@ -376,16 +376,16 @@ class HeapSnapshotProgress: public ScriptProfiler::HeapSnapshotProgress {
 public:
     explicit HeapSnapshotProgress(InspectorProfilerFrontendDispatcher* frontend)
         : m_frontendDispatcher(frontend) { }
 public:
     explicit HeapSnapshotProgress(InspectorProfilerFrontendDispatcher* frontend)
         : m_frontendDispatcher(frontend) { }
-    void Start(int totalWork)
+    void Start(int totalWork) override
     {
         m_totalWork = totalWork;
     }
     {
         m_totalWork = totalWork;
     }
-    void Worked(int workDone)
+    void Worked(int workDone) override
     {
         if (m_frontendDispatcher)
             m_frontendDispatcher->reportHeapSnapshotProgress(workDone, m_totalWork);
     }
     {
         if (m_frontendDispatcher)
             m_frontendDispatcher->reportHeapSnapshotProgress(workDone, m_totalWork);
     }
-    void Done() { }
+    void Done() override { }
     bool isCanceled() { return false; }
 private:
     InspectorProfilerFrontendDispatcher* m_frontendDispatcher;
     bool isCanceled() { return false; }
 private:
     InspectorProfilerFrontendDispatcher* m_frontendDispatcher;
index 0d8f34b..b8c0ddf 100644 (file)
@@ -69,36 +69,36 @@ public:
     void addProfile(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
     void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
     void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
     void addProfile(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
     void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
     void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
-    virtual void collectGarbage(ErrorString*);
-    virtual void clearProfiles(ErrorString*) { resetState(); }
+    virtual void collectGarbage(ErrorString*) override;
+    virtual void clearProfiles(ErrorString*) override { resetState(); }
     void resetState();
 
     virtual void recompileScript() = 0;
     void resetState();
 
     virtual void recompileScript() = 0;
-    virtual void isSampling(ErrorString*, bool*);
-    virtual void hasHeapProfiler(ErrorString*, bool*);
+    virtual void isSampling(ErrorString*, bool*) override;
+    virtual void hasHeapProfiler(ErrorString*, bool*) override;
 
 
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
-    virtual void start(ErrorString* = 0);
-    virtual void stop(ErrorString* = 0);
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
+    virtual void start(ErrorString* = 0) override;
+    virtual void stop(ErrorString* = 0) override;
 
     void disable();
     void enable(bool skipRecompile);
     bool enabled() const { return m_enabled; }
     String getCurrentUserInitiatedProfileName(bool incrementProfileNumber = false);
 
     void disable();
     void enable(bool skipRecompile);
     bool enabled() const { return m_enabled; }
     String getCurrentUserInitiatedProfileName(bool incrementProfileNumber = false);
-    virtual void getProfileHeaders(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Profiler::ProfileHeader>>&);
-    virtual void getCPUProfile(ErrorString*, int uid, RefPtr<Inspector::TypeBuilder::Profiler::CPUProfile>&);
-    virtual void getHeapSnapshot(ErrorString*, int uid);
-    virtual void removeProfile(ErrorString*, const String& type, int uid);
+    virtual void getProfileHeaders(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Profiler::ProfileHeader>>&) override;
+    virtual void getCPUProfile(ErrorString*, int uid, RefPtr<Inspector::TypeBuilder::Profiler::CPUProfile>&) override;
+    virtual void getHeapSnapshot(ErrorString*, int uid) override;
+    virtual void removeProfile(ErrorString*, const String& type, int uid) override;
 
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
 
 
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
 
-    virtual void takeHeapSnapshot(ErrorString*, const bool* reportProgress);
+    virtual void takeHeapSnapshot(ErrorString*, const bool* reportProgress) override;
     void toggleRecordButton(bool isProfiling);
 
     void toggleRecordButton(bool isProfiling);
 
-    virtual void getObjectByHeapObjectId(ErrorString*, const String& heapSnapshotObjectId, const String* objectGroup, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result);
-    virtual void getHeapObjectId(ErrorString*, const String& objectId, String* heapSnapshotObjectId);
+    virtual void getObjectByHeapObjectId(ErrorString*, const String& heapSnapshotObjectId, const String* objectGroup, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result) override;
+    virtual void getHeapObjectId(ErrorString*, const String& objectId, String* heapSnapshotObjectId) override;
 
 protected:
     InspectorProfilerAgent(InstrumentingAgents*, InspectorConsoleAgent*, PageInjectedScriptManager*);
 
 protected:
     InspectorProfilerAgent(InstrumentingAgents*, InspectorConsoleAgent*, PageInjectedScriptManager*);
index 1e2e7e8..c950b71 100644 (file)
@@ -125,18 +125,18 @@ public:
     void setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize);
 
     // Called from frontend
     void setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize);
 
     // Called from frontend
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
-    virtual void setExtraHTTPHeaders(ErrorString*, const RefPtr<Inspector::InspectorObject>&);
-    virtual void getResponseBody(ErrorString*, const String& requestId, String* content, bool* base64Encoded);
-
-    virtual void replayXHR(ErrorString*, const String& requestId);
-
-    virtual void canClearBrowserCache(ErrorString*, bool*);
-    virtual void clearBrowserCache(ErrorString*);
-    virtual void canClearBrowserCookies(ErrorString*, bool*);
-    virtual void clearBrowserCookies(ErrorString*);
-    virtual void setCacheDisabled(ErrorString*, bool cacheDisabled);
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
+    virtual void setExtraHTTPHeaders(ErrorString*, const RefPtr<Inspector::InspectorObject>&) override;
+    virtual void getResponseBody(ErrorString*, const String& requestId, String* content, bool* base64Encoded) override;
+
+    virtual void replayXHR(ErrorString*, const String& requestId) override;
+
+    virtual void canClearBrowserCache(ErrorString*, bool*) override;
+    virtual void clearBrowserCache(ErrorString*) override;
+    virtual void canClearBrowserCookies(ErrorString*, bool*) override;
+    virtual void clearBrowserCookies(ErrorString*) override;
+    virtual void setCacheDisabled(ErrorString*, bool cacheDisabled) override;
 
 private:
     void enable();
 
 private:
     void enable();
index ca8745e..c840e31 100644 (file)
@@ -62,9 +62,9 @@ public:
     virtual ~InspectorRuntimeAgent();
 
     // Part of the protocol.
     virtual ~InspectorRuntimeAgent();
 
     // Part of the protocol.
-    virtual void enable(ErrorString*) { m_enabled = true; }
-    virtual void disable(ErrorString*) { m_enabled = false; }
-    virtual void parse(ErrorString*, const String& expression, Inspector::TypeBuilder::Runtime::SyntaxErrorType::Enum* result, Inspector::TypeBuilder::OptOutput<String>* message, RefPtr<Inspector::TypeBuilder::Runtime::ErrorRange>&);
+    virtual void enable(ErrorString*) override { m_enabled = true; }
+    virtual void disable(ErrorString*) override { m_enabled = false; }
+    virtual void parse(ErrorString*, const String& expression, Inspector::TypeBuilder::Runtime::SyntaxErrorType::Enum* result, Inspector::TypeBuilder::OptOutput<String>* message, RefPtr<Inspector::TypeBuilder::Runtime::ErrorRange>&) override;
     virtual void evaluate(ErrorString*,
                   const String& expression,
                   const String* objectGroup,
     virtual void evaluate(ErrorString*,
                   const String& expression,
                   const String* objectGroup,
@@ -74,7 +74,7 @@ public:
                   const bool* returnByValue,
                   const bool* generatePreview,
                   RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result,
                   const bool* returnByValue,
                   const bool* generatePreview,
                   RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result,
-                  Inspector::TypeBuilder::OptOutput<bool>* wasThrown);
+                  Inspector::TypeBuilder::OptOutput<bool>* wasThrown) override;
     virtual void callFunctionOn(ErrorString*,
                         const String& objectId,
                         const String& expression,
     virtual void callFunctionOn(ErrorString*,
                         const String& objectId,
                         const String& expression,
@@ -83,11 +83,11 @@ public:
                         const bool* returnByValue,
                         const bool* generatePreview,
                         RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result,
                         const bool* returnByValue,
                         const bool* generatePreview,
                         RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result,
-                        Inspector::TypeBuilder::OptOutput<bool>* wasThrown);
-    virtual void releaseObject(ErrorString*, const String& objectId);
-    virtual void getProperties(ErrorString*, const String& objectId, const bool* ownProperties, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::InternalPropertyDescriptor>>& internalProperties);
-    virtual void releaseObjectGroup(ErrorString*, const String& objectGroup);
-    virtual void run(ErrorString*);
+                        Inspector::TypeBuilder::OptOutput<bool>* wasThrown) override;
+    virtual void releaseObject(ErrorString*, const String& objectId) override;
+    virtual void getProperties(ErrorString*, const String& objectId, const bool* ownProperties, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::InternalPropertyDescriptor>>& internalProperties) override;
+    virtual void releaseObjectGroup(ErrorString*, const String& objectGroup) override;
+    virtual void run(ErrorString*) override;
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     void setScriptDebugServer(ScriptDebugServer*);
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     void setScriptDebugServer(ScriptDebugServer*);
index 2b316c3..0acd11f 100644 (file)
@@ -262,23 +262,23 @@ public:
     static PassRefPtr<InspectorStyleSheetForInlineStyle> create(InspectorPageAgent*, const String& id, PassRefPtr<Element>, Inspector::TypeBuilder::CSS::StyleSheetOrigin::Enum, Listener*);
 
     void didModifyElementAttribute();
     static PassRefPtr<InspectorStyleSheetForInlineStyle> create(InspectorPageAgent*, const String& id, PassRefPtr<Element>, Inspector::TypeBuilder::CSS::StyleSheetOrigin::Enum, Listener*);
 
     void didModifyElementAttribute();
-    virtual bool getText(String* result) const;
-    virtual CSSStyleDeclaration* styleForId(const InspectorCSSId& id) const { ASSERT_UNUSED(id, !id.ordinal()); return inlineStyle(); }
+    virtual bool getText(String* result) const override;
+    virtual CSSStyleDeclaration* styleForId(const InspectorCSSId& id) const override { ASSERT_UNUSED(id, !id.ordinal()); return inlineStyle(); }
 
 protected:
     InspectorStyleSheetForInlineStyle(InspectorPageAgent*, const String& id, PassRefPtr<Element>, Inspector::TypeBuilder::CSS::StyleSheetOrigin::Enum, Listener*);
 
 
 protected:
     InspectorStyleSheetForInlineStyle(InspectorPageAgent*, const String& id, PassRefPtr<Element>, Inspector::TypeBuilder::CSS::StyleSheetOrigin::Enum, Listener*);
 
-    virtual Document* ownerDocument() const;
-    virtual RefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration* style) const { ASSERT_UNUSED(style, style == inlineStyle()); return m_ruleSourceData; }
-    virtual unsigned ruleIndexByStyle(CSSStyleDeclaration*) const { return 0; }
-    virtual bool ensureParsedDataReady();
-    virtual PassRefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&);
-    virtual void rememberInspectorStyle(RefPtr<InspectorStyle>) { }
-    virtual void forgetInspectorStyle(CSSStyleDeclaration*) { }
+    virtual Document* ownerDocument() const override;
+    virtual RefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration* style) const override { ASSERT_UNUSED(style, style == inlineStyle()); return m_ruleSourceData; }
+    virtual unsigned ruleIndexByStyle(CSSStyleDeclaration*) const override { return 0; }
+    virtual bool ensureParsedDataReady() override;
+    virtual PassRefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) override;
+    virtual void rememberInspectorStyle(RefPtr<InspectorStyle>) override { }
+    virtual void forgetInspectorStyle(CSSStyleDeclaration*) override { }
 
     // Also accessed by friend class InspectorStyle.
 
     // Also accessed by friend class InspectorStyle.
-    virtual bool setStyleText(CSSStyleDeclaration*, const String&, ExceptionCode&);
-    virtual PassOwnPtr<Vector<size_t>> lineEndings() const;
+    virtual bool setStyleText(CSSStyleDeclaration*, const String&, ExceptionCode&) override;
+    virtual PassOwnPtr<Vector<size_t>> lineEndings() const override;
 
 private:
     CSSStyleDeclaration* inlineStyle() const;
 
 private:
     CSSStyleDeclaration* inlineStyle() const;
index e399993..2f4f7de 100644 (file)
@@ -134,10 +134,10 @@ public:
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
 
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
 
-    virtual void start(ErrorString*, const int* maxCallStackDepth, const bool* includeDomCounters);
-    virtual void stop(ErrorString*);
-    virtual void canMonitorMainThread(ErrorString*, bool*);
-    virtual void supportsFrameInstrumentation(ErrorString*, bool*);
+    virtual void start(ErrorString*, const int* maxCallStackDepth, const bool* includeDomCounters) override;
+    virtual void stop(ErrorString*) override;
+    virtual void canMonitorMainThread(ErrorString*, bool*) override;
+    virtual void supportsFrameInstrumentation(ErrorString*, bool*) override;
 
     int id() const { return m_id; }
 
 
     int id() const { return m_id; }
 
index af9e86c..de9d8d2 100644 (file)
@@ -83,7 +83,7 @@ public:
 
 private:
     // WorkerGlobalScopeProxy::PageInspector implementation
 
 private:
     // WorkerGlobalScopeProxy::PageInspector implementation
-    virtual void dispatchMessageFromWorker(const String& message)
+    virtual void dispatchMessageFromWorker(const String& message) override
     {
         RefPtr<InspectorValue> value = InspectorValue::parseJSON(message);
         if (!value)
     {
         RefPtr<InspectorValue> value = InspectorValue::parseJSON(message);
         if (!value)
index 1f09df1..3a95144 100644 (file)
@@ -62,13 +62,13 @@ public:
     void workerGlobalScopeTerminated(WorkerGlobalScopeProxy*);
 
     // Called from InspectorBackendDispatcher
     void workerGlobalScopeTerminated(WorkerGlobalScopeProxy*);
 
     // Called from InspectorBackendDispatcher
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
-    virtual void canInspectWorkers(ErrorString*, bool*);
-    virtual void connectToWorker(ErrorString*, int workerId);
-    virtual void disconnectFromWorker(ErrorString*, int workerId);
-    virtual void sendMessageToWorker(ErrorString*, int workerId, const RefPtr<Inspector::InspectorObject>& message);
-    virtual void setAutoconnectToWorkers(ErrorString*, bool value);
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
+    virtual void canInspectWorkers(ErrorString*, bool*) override;
+    virtual void connectToWorker(ErrorString*, int workerId) override;
+    virtual void disconnectFromWorker(ErrorString*, int workerId) override;
+    virtual void sendMessageToWorker(ErrorString*, int workerId, const RefPtr<Inspector::InspectorObject>& message) override;
+    virtual void setAutoconnectToWorkers(ErrorString*, bool value) override;
 
 private:
     void createWorkerFrontendChannelsForExistingWorkers();
 
 private:
     void createWorkerFrontendChannelsForExistingWorkers();
index e1c76cf..d557f1a 100644 (file)
@@ -49,8 +49,8 @@ public:
     virtual bool isWorkerAgent() override { return false; }
 
 private:
     virtual bool isWorkerAgent() override { return false; }
 
 private:
-    virtual void clearMessages(ErrorString*);
-    virtual void addInspectedNode(ErrorString*, int nodeId);
+    virtual void clearMessages(ErrorString*) override;
+    virtual void addInspectedNode(ErrorString*, int nodeId) override;
 
     InspectorDOMAgent* m_inspectorDOMAgent;
 };
 
     InspectorDOMAgent* m_inspectorDOMAgent;
 };
index a44e652..0a579ac 100644 (file)
@@ -53,18 +53,18 @@ public:
     void didClearMainFrameWindowObject();
 
 protected:
     void didClearMainFrameWindowObject();
 
 protected:
-    virtual void enable();
-    virtual void disable();
+    virtual void enable() override;
+    virtual void disable() override;
 
 private:
 
 private:
-    virtual void startListeningScriptDebugServer();
-    virtual void stopListeningScriptDebugServer();
-    virtual PageScriptDebugServer& scriptDebugServer();
-    virtual void muteConsole();
-    virtual void unmuteConsole();
+    virtual void startListeningScriptDebugServer() override;
+    virtual void stopListeningScriptDebugServer() override;
+    virtual PageScriptDebugServer& scriptDebugServer() override;
+    virtual void muteConsole() override;
+    virtual void unmuteConsole() override;
 
 
-    virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId);
-    virtual void setOverlayMessage(ErrorString*, const String*);
+    virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
+    virtual void setOverlayMessage(ErrorString*, const String*) override;
 
     InspectorPageAgent* m_pageAgent;
     InspectorOverlay* m_overlay;
 
     InspectorPageAgent* m_pageAgent;
     InspectorOverlay* m_overlay;
index 98858c8..f0cba44 100644 (file)
@@ -55,16 +55,16 @@ public:
     
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
     
     virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
     virtual void willDestroyFrontendAndBackend() override;
-    virtual void enable(ErrorString*);
-    virtual void disable(ErrorString*);
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
 
     void didCreateMainWorldContext(Frame*);
     void didCreateIsolatedContext(Frame*, JSC::ExecState*, SecurityOrigin*);
 
 private:
 
     void didCreateMainWorldContext(Frame*);
     void didCreateIsolatedContext(Frame*, JSC::ExecState*, SecurityOrigin*);
 
 private:
-    virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId);
-    virtual void muteConsole();
-    virtual void unmuteConsole();
+    virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
+    virtual void muteConsole() override;
+    virtual void unmuteConsole() override;
     void reportExecutionContextCreation();
     void notifyContextCreated(const String& frameId, JSC::ExecState*, SecurityOrigin*, bool isPageContext);
 
     void reportExecutionContextCreation();
     void notifyContextCreated(const String& frameId, JSC::ExecState*, SecurityOrigin*, bool isPageContext);
 
index f66d025..99ad562 100644 (file)
@@ -47,7 +47,7 @@ public:
     virtual bool isWorkerAgent() override { return true; }
 
 private:
     virtual bool isWorkerAgent() override { return true; }
 
 private:
-    virtual void addInspectedNode(ErrorString*, int nodeId);
+    virtual void addInspectedNode(ErrorString*, int nodeId) override;
 };
 
 } // namespace WebCore
 };
 
 } // namespace WebCore
index 6679770..558f9ca 100644 (file)
@@ -75,7 +75,7 @@ public:
         : m_thread(thread)
         , m_workerGlobalScope(workerGlobalScope) { }
     virtual ~RunInspectorCommandsTask() { }
         : m_thread(thread)
         , m_workerGlobalScope(workerGlobalScope) { }
     virtual ~RunInspectorCommandsTask() { }
-    virtual void run()
+    virtual void run() override
     {
         // Process all queued debugger commands. It is safe to use m_workerGlobalScope here
         // because it is alive if RunWorkerLoop is not terminated, otherwise it will
     {
         // Process all queued debugger commands. It is safe to use m_workerGlobalScope here
         // because it is alive if RunWorkerLoop is not terminated, otherwise it will
index bfdfbc8..cd69854 100644 (file)
@@ -69,7 +69,7 @@ public:
         : m_workerGlobalScope(workerGlobalScope) { }
     virtual ~PageInspectorProxy() { }
 private:
         : m_workerGlobalScope(workerGlobalScope) { }
     virtual ~PageInspectorProxy() { }
 private:
-    virtual bool sendMessageToFrontend(const String& message)
+    virtual bool sendMessageToFrontend(const String& message) override
     {
         m_workerGlobalScope.thread()->workerReportingProxy().postMessageToPageInspector(message);
         return true;
     {
         m_workerGlobalScope.thread()->workerReportingProxy().postMessageToPageInspector(message);
         return true;
index adcede3..e9022b2 100644 (file)
@@ -49,16 +49,16 @@ public:
     virtual void willDestroyFrontendAndBackend() override;
 
     // Protocol commands.
     virtual void willDestroyFrontendAndBackend() override;
 
     // Protocol commands.
-    virtual void run(ErrorString*);
+    virtual void run(ErrorString*) override;
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     void pauseWorkerGlobalScope(WorkerGlobalScope*);
 #endif // ENABLE(JAVASCRIPT_DEBUGGER)
 
 private:
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     void pauseWorkerGlobalScope(WorkerGlobalScope*);
 #endif // ENABLE(JAVASCRIPT_DEBUGGER)
 
 private:
-    virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId);
-    virtual void muteConsole();
-    virtual void unmuteConsole();
+    virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
+    virtual void muteConsole() override;
+    virtual void unmuteConsole() override;
     WorkerGlobalScope* m_workerGlobalScope;
     RefPtr<Inspector::InspectorRuntimeBackendDispatcher> m_backendDispatcher;
     bool m_paused;
     WorkerGlobalScope* m_workerGlobalScope;
     RefPtr<Inspector::InspectorRuntimeBackendDispatcher> m_backendDispatcher;
     bool m_paused;