Modified: trunk/Source/WebCore/ChangeLog (114635 => 114636)
--- trunk/Source/WebCore/ChangeLog 2012-04-19 15:57:26 UTC (rev 114635)
+++ trunk/Source/WebCore/ChangeLog 2012-04-19 16:16:45 UTC (rev 114636)
@@ -1,3 +1,11 @@
+2012-04-19 Vsevolod Vlasov <[email protected]>
+
+ Follow up to r114632: build fix.
+
+ * inspector/InspectorDebuggerAgent.cpp:
+ (WebCore):
+ (WebCore::InspectorDebuggerAgent::evaluateOnCallFrame):
+
2012-04-19 Mark Pilgrim <[email protected]>
[Chromium] Call sampleGamepads directly
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (114635 => 114636)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2012-04-19 15:57:26 UTC (rev 114635)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2012-04-19 16:16:45 UTC (rev 114636)
@@ -59,11 +59,6 @@
const char* InspectorDebuggerAgent::backtraceObjectGroup = "backtrace-object-group";
-static bool asBool(const bool* const b)
-{
- return b ? *b : false;
-}
-
InspectorDebuggerAgent::InspectorDebuggerAgent(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, InjectedScriptManager* injectedScriptManager)
: InspectorBaseAgent<InspectorDebuggerAgent>("Debugger", instrumentingAgents, inspectorState)
, m_injectedScriptManager(injectedScriptManager)
@@ -490,15 +485,15 @@
}
ScriptDebugServer::PauseOnExceptionsState previousPauseOnExceptionsState = scriptDebugServer().pauseOnExceptionsState();
- if (asBool(doNotPauseOnExceptionsAndMuteConsole)) {
+ if (doNotPauseOnExceptionsAndMuteConsole ? *doNotPauseOnExceptionsAndMuteConsole : false) {
if (previousPauseOnExceptionsState != ScriptDebugServer::DontPauseOnExceptions)
scriptDebugServer().setPauseOnExceptionsState(ScriptDebugServer::DontPauseOnExceptions);
muteConsole();
}
- injectedScript.evaluateOnCallFrame(errorString, m_currentCallStack, callFrameId, _expression_, objectGroup ? *objectGroup : "", asBool(includeCommandLineAPI), asBool(returnByValue), &result, wasThrown);
+ injectedScript.evaluateOnCallFrame(errorString, m_currentCallStack, callFrameId, _expression_, objectGroup ? *objectGroup : "", includeCommandLineAPI ? *includeCommandLineAPI : false, returnByValue ? *returnByValue : false, &result, wasThrown);
- if (asBool(doNotPauseOnExceptionsAndMuteConsole)) {
+ if (doNotPauseOnExceptionsAndMuteConsole ? *doNotPauseOnExceptionsAndMuteConsole : false) {
unmuteConsole();
if (scriptDebugServer().pauseOnExceptionsState() != previousPauseOnExceptionsState)
scriptDebugServer().setPauseOnExceptionsState(previousPauseOnExceptionsState);
