Title: [160780] trunk/Source/WebCore
- Revision
- 160780
- Author
- [email protected]
- Date
- 2013-12-18 11:26:13 -0800 (Wed, 18 Dec 2013)
Log Message
Web Inspector: Some basic DebuggerAgent cleanup
https://bugs.webkit.org/show_bug.cgi?id=125901
Patch by Joseph Pecoraro <[email protected]> on 2013-12-18
Reviewed by Timothy Hatcher.
* inspector/InspectorDebuggerAgent.h:
Remove virtual from not really virtual method.
* inspector/InspectorDebuggerAgent.cpp:
(WebCore::InspectorDebuggerAgent::enable):
(WebCore::InspectorDebuggerAgent::disable):
Use member variable instead of private function.
(WebCore::InspectorDebuggerAgent::setPauseOnExceptions):
Inline the three lines from the private function.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160779 => 160780)
--- trunk/Source/WebCore/ChangeLog 2013-12-18 18:59:06 UTC (rev 160779)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 19:26:13 UTC (rev 160780)
@@ -1,3 +1,21 @@
+2013-12-18 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Some basic DebuggerAgent cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=125901
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorDebuggerAgent.h:
+ Remove virtual from not really virtual method.
+
+ * inspector/InspectorDebuggerAgent.cpp:
+ (WebCore::InspectorDebuggerAgent::enable):
+ (WebCore::InspectorDebuggerAgent::disable):
+ Use member variable instead of private function.
+
+ (WebCore::InspectorDebuggerAgent::setPauseOnExceptions):
+ Inline the three lines from the private function.
+
2013-12-18 Martin Hodovan <[email protected]>
REGRESSION (r155536): Broken error recovery in @media at-rule
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (160779 => 160780)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2013-12-18 18:59:06 UTC (rev 160779)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2013-12-18 19:26:13 UTC (rev 160780)
@@ -122,7 +122,7 @@
void InspectorDebuggerAgent::enable(ErrorString*)
{
- if (enabled())
+ if (m_enabled)
return;
enable();
@@ -132,7 +132,7 @@
void InspectorDebuggerAgent::disable(ErrorString*)
{
- if (!enabled())
+ if (!m_enabled)
return;
disable();
@@ -539,11 +539,7 @@
*errorString = "Unknown pause on exceptions mode: " + stringPauseState;
return;
}
- setPauseOnExceptionsImpl(errorString, pauseState);
-}
-void InspectorDebuggerAgent::setPauseOnExceptionsImpl(ErrorString* errorString, int pauseState)
-{
scriptDebugServer().setPauseOnExceptionsState(static_cast<ScriptDebugServer::PauseOnExceptionsState>(pauseState));
if (scriptDebugServer().pauseOnExceptionsState() != pauseState)
*errorString = "Internal error. Could not change pause on exceptions state";
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h (160779 => 160780)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2013-12-18 18:59:06 UTC (rev 160779)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2013-12-18 19:26:13 UTC (rev 160780)
@@ -121,7 +121,7 @@
void schedulePauseOnNextStatement(Inspector::InspectorDebuggerFrontendDispatcher::Reason::Enum breakReason, PassRefPtr<Inspector::InspectorObject> data);
void cancelPauseOnNextStatement();
void breakProgram(Inspector::InspectorDebuggerFrontendDispatcher::Reason::Enum breakReason, PassRefPtr<Inspector::InspectorObject> data);
- virtual void scriptExecutionBlockedByCSP(const String& directiveText);
+ void scriptExecutionBlockedByCSP(const String& directiveText);
class Listener {
public:
@@ -152,15 +152,11 @@
void reset();
private:
- bool enabled() const { return m_enabled; };
-
PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>> currentCallFrames();
virtual void didParseSource(JSC::SourceID, const Script&) OVERRIDE FINAL;
virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) OVERRIDE FINAL;
- void setPauseOnExceptionsImpl(ErrorString*, int);
-
PassRefPtr<Inspector::TypeBuilder::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
void clear();
bool assertPaused(ErrorString*);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
