Diff
Modified: trunk/Source/WebCore/ChangeLog (158420 => 158421)
--- trunk/Source/WebCore/ChangeLog 2013-11-01 01:45:39 UTC (rev 158420)
+++ trunk/Source/WebCore/ChangeLog 2013-11-01 02:05:06 UTC (rev 158421)
@@ -1,3 +1,26 @@
+2013-10-31 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Clean up a few Inspector interfaces
+ https://bugs.webkit.org/show_bug.cgi?id=123594
+
+ Reviewed by Timothy Hatcher.
+
+ * WebCore.exp.in:
+ * inspector/InjectedScriptHost.cpp:
+ * inspector/InspectorBaseAgent.h:
+ (WebCore::InspectorBaseAgentInterface::name):
+ * inspector/InspectorConsoleAgent.cpp:
+ * inspector/InspectorConsoleAgent.h:
+ (WebCore::InspectorConsoleAgent::enabled):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::profilerEnabled):
+ * inspector/InspectorController.h:
+ * inspector/InspectorDebuggerAgent.cpp:
+ * inspector/InspectorDebuggerAgent.h:
+ (WebCore::InspectorDebuggerAgent::enabled):
+ * inspector/InspectorRuntimeAgent.h:
+ (WebCore::InspectorRuntimeAgent::enabled):
+
2013-10-31 Tim Horton <[email protected]>
Remote Layer Tree: Vend layer contents via IOSurfaces
Modified: trunk/Source/WebCore/WebCore.exp.in (158420 => 158421)
--- trunk/Source/WebCore/WebCore.exp.in 2013-11-01 01:45:39 UTC (rev 158420)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-11-01 02:05:06 UTC (rev 158421)
@@ -2637,7 +2637,6 @@
#if ENABLE(INSPECTOR)
__ZN7WebCore15InspectorClient31doDispatchMessageOnFrontendPageEPNS_4PageERKN3WTF6StringE
__ZN7WebCore17InspectorCounters12counterValueENS0_11CounterTypeE
-__ZN7WebCore19InspectorController15profilerEnabledEv
__ZN7WebCore19InspectorController15connectFrontendEPNS_24InspectorFrontendChannelE
__ZN7WebCore19InspectorController18disconnectFrontendEv
__ZN7WebCore19InspectorController18setProfilerEnabledEb
@@ -2683,6 +2682,7 @@
__ZN7WebCore19InspectorController13didBeginFrameEv
__ZN7WebCore19InspectorController14didCancelFrameEv
__ZNK7WebCore19InspectorController13drawHighlightERNS_15GraphicsContextE
+__ZNK7WebCore19InspectorController15profilerEnabledEv
__ZNK7WebCore9DOMWindow8documentEv
__ZN7WebCore14SchemeRegistry27shouldTreatURLSchemeAsLocalERKN3WTF6StringE
#endif
Modified: trunk/Source/WebCore/inspector/InjectedScriptHost.cpp (158420 => 158421)
--- trunk/Source/WebCore/inspector/InjectedScriptHost.cpp 2013-11-01 01:45:39 UTC (rev 158420)
+++ trunk/Source/WebCore/inspector/InjectedScriptHost.cpp 2013-11-01 02:05:06 UTC (rev 158421)
@@ -168,7 +168,6 @@
}
#endif
-
} // namespace WebCore
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/inspector/InspectorBaseAgent.h (158420 => 158421)
--- trunk/Source/WebCore/inspector/InspectorBaseAgent.h 2013-11-01 01:45:39 UTC (rev 158420)
+++ trunk/Source/WebCore/inspector/InspectorBaseAgent.h 2013-11-01 02:05:06 UTC (rev 158421)
@@ -52,7 +52,7 @@
virtual void registerInDispatcher(InspectorBackendDispatcher*) = 0;
virtual void discardAgent() { }
- String name() { return m_name; }
+ String name() const { return m_name; }
protected:
InstrumentingAgents* m_instrumentingAgents;
Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp (158420 => 158421)
--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2013-11-01 01:45:39 UTC (rev 158420)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2013-11-01 02:05:06 UTC (rev 158421)
@@ -26,15 +26,16 @@
#include "config.h"
#if ENABLE(INSPECTOR)
+
#include "InspectorConsoleAgent.h"
-#include "InstrumentingAgents.h"
#include "Console.h"
#include "ConsoleMessage.h"
#include "DOMWindow.h"
#include "InjectedScriptHost.h"
#include "InjectedScriptManager.h"
#include "InspectorFrontend.h"
+#include "InstrumentingAgents.h"
#include "ResourceError.h"
#include "ResourceResponse.h"
#include "ScriptArguments.h"
Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.h (158420 => 158421)
--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2013-11-01 01:45:39 UTC (rev 158420)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2013-11-01 02:05:06 UTC (rev 158421)
@@ -62,7 +62,7 @@
virtual void enable(ErrorString*);
virtual void disable(ErrorString*);
virtual void clearMessages(ErrorString*);
- bool enabled() { return m_enabled; }
+ bool enabled() const { return m_enabled; }
void reset();
virtual void setFrontend(InspectorFrontend*);
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (158420 => 158421)
--- trunk/Source/WebCore/inspector/InspectorController.cpp 2013-11-01 01:45:39 UTC (rev 158420)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2013-11-01 02:05:06 UTC (rev 158421)
@@ -355,7 +355,7 @@
}
#if ENABLE(_javascript__DEBUGGER)
-bool InspectorController::profilerEnabled()
+bool InspectorController::profilerEnabled() const
{
return m_profilerAgent->enabled();
}
Modified: trunk/Source/WebCore/inspector/InspectorController.h (158420 => 158421)
--- trunk/Source/WebCore/inspector/InspectorController.h 2013-11-01 01:45:39 UTC (rev 158420)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2013-11-01 02:05:06 UTC (rev 158421)
@@ -110,7 +110,7 @@
void evaluateForTestInFrontend(long callId, const String& script);
#if ENABLE(_javascript__DEBUGGER)
- bool profilerEnabled();
+ bool profilerEnabled() const;
void setProfilerEnabled(bool);
void resume();
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (158420 => 158421)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2013-11-01 01:45:39 UTC (rev 158420)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2013-11-01 02:05:06 UTC (rev 158421)
@@ -103,11 +103,6 @@
m_enabled = false;
}
-bool InspectorDebuggerAgent::enabled()
-{
- return m_enabled;
-}
-
void InspectorDebuggerAgent::causesRecompilation(ErrorString*, bool* result)
{
*result = scriptDebugServer().causesRecompilation();
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h (158420 => 158421)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2013-11-01 01:45:39 UTC (rev 158420)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2013-11-01 02:05:06 UTC (rev 158421)
@@ -145,7 +145,7 @@
void reset();
private:
- bool enabled();
+ bool enabled() const { return m_enabled; };
PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>> currentCallFrames();
Modified: trunk/Source/WebCore/inspector/InspectorRuntimeAgent.h (158420 => 158421)
--- trunk/Source/WebCore/inspector/InspectorRuntimeAgent.h 2013-11-01 01:45:39 UTC (rev 158420)
+++ trunk/Source/WebCore/inspector/InspectorRuntimeAgent.h 2013-11-01 02:05:06 UTC (rev 158421)
@@ -57,7 +57,7 @@
public:
virtual ~InspectorRuntimeAgent();
- bool enabled() { return m_enabled; }
+ bool enabled() const { return m_enabled; }
// Part of the protocol.
virtual void enable(ErrorString*) { m_enabled = true; }
virtual void disable(ErrorString*) { m_enabled = false; }
