From 5ddde30071f639962dd557c453f2ad01f8f0fd00 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 8 Sep 2010 12:18:00 +0100 Subject: Merge WebKit at r66666 : Initial merge by git. Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f --- WebCore/inspector/ScriptBreakpoint.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'WebCore/inspector/ScriptBreakpoint.cpp') diff --git a/WebCore/inspector/ScriptBreakpoint.cpp b/WebCore/inspector/ScriptBreakpoint.cpp index 24401f1..b7205a7 100644 --- a/WebCore/inspector/ScriptBreakpoint.cpp +++ b/WebCore/inspector/ScriptBreakpoint.cpp @@ -47,7 +47,7 @@ void ScriptBreakpoint::sourceBreakpointsFromInspectorObject(PassRefPtr enabledValue = breakpoint->get("enabled"); - if (!enabledValue || !enabledValue->asBool(&enabled)) + if (!enabledValue || !enabledValue->asBoolean(&enabled)) continue; String condition; RefPtr conditionValue = breakpoint->get("condition"); @@ -62,7 +62,7 @@ PassRefPtr ScriptBreakpoint::inspectorObjectFromSourceBreakpoin RefPtr breakpoints = InspectorObject::create(); for (SourceBreakpoints::const_iterator it = sourceBreakpoints.begin(); it != sourceBreakpoints.end(); ++it) { RefPtr breakpoint = InspectorObject::create(); - breakpoint->setBool("enabled", it->second.enabled); + breakpoint->setBoolean("enabled", it->second.enabled); breakpoint->setString("condition", it->second.condition); breakpoints->setObject(String::number(it->first), breakpoint); } -- cgit v1.1