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

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

Issue 6320021: Merge 76680 - 2011-01-26 Pavel Feldman <pfeldman@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 11 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 } 706 }
707 707
708 function evaluateCallback(result) 708 function evaluateCallback(result)
709 { 709 {
710 if (result.isError()) 710 if (result.isError())
711 return; 711 return;
712 if (!WebInspector.panels.scripts.paused) 712 if (!WebInspector.panels.scripts.paused)
713 return; 713 return;
714 showObjectPopup.call(this, result); 714 showObjectPopup.call(this, result);
715 } 715 }
716 WebInspector.panels.scripts.evaluateInSelectedCallFrame(element.textCont ent, false, this._popoverObjectGroup, evaluateCallback.bind(this)); 716 WebInspector.panels.scripts.evaluateInSelectedCallFrame(element.textCont ent, false, this._popoverObjectGroup, false, evaluateCallback.bind(this));
717 }, 717 },
718 718
719 _editBreakpointCondition: function(lineNumber, condition, callback) 719 _editBreakpointCondition: function(lineNumber, condition, callback)
720 { 720 {
721 this._conditionElement = this._createConditionElement(lineNumber); 721 this._conditionElement = this._createConditionElement(lineNumber);
722 this._textViewer.addDecoration(lineNumber, this._conditionElement); 722 this._textViewer.addDecoration(lineNumber, this._conditionElement);
723 723
724 function finishEditing(committed, element, newText) 724 function finishEditing(committed, element, newText)
725 { 725 {
726 this._textViewer.removeDecoration(lineNumber, this._conditionElement ); 726 this._textViewer.removeDecoration(lineNumber, this._conditionElement );
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
892 requestContent: function(callback) 892 requestContent: function(callback)
893 { 893 {
894 // Should be implemented by subclasses. 894 // Should be implemented by subclasses.
895 }, 895 },
896 896
897 scripts: function() 897 scripts: function()
898 { 898 {
899 // Should be implemented by subclasses. 899 // Should be implemented by subclasses.
900 } 900 }
901 } 901 }
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/front-end/ScriptsPanel.js ('k') | Source/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698