Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: Source/WebCore/inspector/InspectorDebuggerAgent.cpp

Issue 9375012: Merge 106662 - inspector/debugger/pause-in-inline-script.html asserts in chromium debug (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010-2011 Google Inc. All rights reserved. 3 * Copyright (C) 2010-2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 } 172 }
173 173
174 void InspectorDebuggerAgent::didClearMainFrameWindowObject() 174 void InspectorDebuggerAgent::didClearMainFrameWindowObject()
175 { 175 {
176 m_scripts.clear(); 176 m_scripts.clear();
177 m_breakpointIdToDebugServerBreakpointIds.clear(); 177 m_breakpointIdToDebugServerBreakpointIds.clear();
178 if (m_frontend) 178 if (m_frontend)
179 m_frontend->globalObjectCleared(); 179 m_frontend->globalObjectCleared();
180 } 180 }
181 181
182 bool InspectorDebuggerAgent::isPaused()
183 {
184 return scriptDebugServer().isPaused();
185 }
186
182 static PassRefPtr<InspectorObject> buildObjectForBreakpointCookie(const String& url, int lineNumber, int columnNumber, const String& condition, bool isRegex) 187 static PassRefPtr<InspectorObject> buildObjectForBreakpointCookie(const String& url, int lineNumber, int columnNumber, const String& condition, bool isRegex)
183 { 188 {
184 RefPtr<InspectorObject> breakpointObject = InspectorObject::create(); 189 RefPtr<InspectorObject> breakpointObject = InspectorObject::create();
185 breakpointObject->setString("url", url); 190 breakpointObject->setString("url", url);
186 breakpointObject->setNumber("lineNumber", lineNumber); 191 breakpointObject->setNumber("lineNumber", lineNumber);
187 breakpointObject->setNumber("columnNumber", columnNumber); 192 breakpointObject->setNumber("columnNumber", columnNumber);
188 breakpointObject->setString("condition", condition); 193 breakpointObject->setString("condition", condition);
189 breakpointObject->setBoolean("isRegex", isRegex); 194 breakpointObject->setBoolean("isRegex", isRegex);
190 return breakpointObject; 195 return breakpointObject;
191 } 196 }
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 598
594 void InspectorDebuggerAgent::clearBreakDetails() 599 void InspectorDebuggerAgent::clearBreakDetails()
595 { 600 {
596 m_breakReason = "other"; 601 m_breakReason = "other";
597 m_breakAuxData = 0; 602 m_breakAuxData = 0;
598 } 603 }
599 604
600 } // namespace WebCore 605 } // namespace WebCore
601 606
602 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR) 607 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/InspectorDebuggerAgent.h ('k') | Source/WebCore/inspector/InspectorInstrumentation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698