diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-08 12:18:00 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:58 +0100 |
| commit | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch) | |
| tree | 775803c4ab35af50aa5f5472cd1fb95fe9d5152d /WebCore/inspector/ScriptBreakpoint.cpp | |
| parent | 3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff) | |
| download | external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2 | |
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Diffstat (limited to 'WebCore/inspector/ScriptBreakpoint.cpp')
| -rw-r--r-- | WebCore/inspector/ScriptBreakpoint.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<Inspector continue; bool enabled; RefPtr<InspectorValue> enabledValue = breakpoint->get("enabled"); - if (!enabledValue || !enabledValue->asBool(&enabled)) + if (!enabledValue || !enabledValue->asBoolean(&enabled)) continue; String condition; RefPtr<InspectorValue> conditionValue = breakpoint->get("condition"); @@ -62,7 +62,7 @@ PassRefPtr<InspectorObject> ScriptBreakpoint::inspectorObjectFromSourceBreakpoin RefPtr<InspectorObject> breakpoints = InspectorObject::create(); for (SourceBreakpoints::const_iterator it = sourceBreakpoints.begin(); it != sourceBreakpoints.end(); ++it) { RefPtr<InspectorObject> 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); } |