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

Side by Side Diff: Source/WebCore/inspector/front-end/BreakpointManager.js

Issue 8382007: Merge 97975 - Web Inspector: Advanced search results should keep working after pretty print toggled. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
Patch Set: Created 9 years, 2 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 * @param {WebInspector.Breakpoint} breakpoint 120 * @param {WebInspector.Breakpoint} breakpoint
121 * @param {WebInspector.RawSourceCode.SourceMapping} sourceMapping 121 * @param {WebInspector.RawSourceCode.SourceMapping} sourceMapping
122 * @param {WebInspector.UISourceCode} uiSourceCode 122 * @param {WebInspector.UISourceCode} uiSourceCode
123 */ 123 */
124 _materializeBreakpoint: function(breakpoint, sourceMapping, uiSourceCode) 124 _materializeBreakpoint: function(breakpoint, sourceMapping, uiSourceCode)
125 { 125 {
126 if (!breakpoint.enabled || breakpoint._materialized) 126 if (!breakpoint.enabled || breakpoint._materialized)
127 return; 127 return;
128 128
129 breakpoint._materialized = true; 129 breakpoint._materialized = true;
130 var rawLocation = sourceMapping.uiLocationToRawLocation(uiSourceCode, br eakpoint.lineNumber); 130 var rawLocation = sourceMapping.uiLocationToRawLocation(uiSourceCode, br eakpoint.lineNumber, 0);
131 this._setBreakpointInDebugger(breakpoint, rawLocation); 131 this._setBreakpointInDebugger(breakpoint, rawLocation);
132 }, 132 },
133 133
134 /** 134 /**
135 * @param {WebInspector.Breakpoint} breakpoint 135 * @param {WebInspector.Breakpoint} breakpoint
136 */ 136 */
137 _breakpointDebuggerLocationChanged: function(breakpoint) 137 _breakpointDebuggerLocationChanged: function(breakpoint)
138 { 138 {
139 if (!breakpoint.uiSourceCode) 139 if (!breakpoint.uiSourceCode)
140 return; 140 return;
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 */ 367 */
368 WebInspector.Breakpoint.deserialize = function(serializedBreakpoint) 368 WebInspector.Breakpoint.deserialize = function(serializedBreakpoint)
369 { 369 {
370 return new WebInspector.Breakpoint( 370 return new WebInspector.Breakpoint(
371 serializedBreakpoint.sourceFileId, 371 serializedBreakpoint.sourceFileId,
372 serializedBreakpoint.lineNumber, 372 serializedBreakpoint.lineNumber,
373 serializedBreakpoint.condition, 373 serializedBreakpoint.condition,
374 serializedBreakpoint.enabled, 374 serializedBreakpoint.enabled,
375 true); 375 true);
376 } 376 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698