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

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

Issue 6282016: Merge 76683 - 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
« no previous file with comments | « Source/WebCore/inspector/front-end/ExtensionPanel.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 var resultObject = WebInspector.RemoteObject.fromPayload(resultPaylo ad); 265 var resultObject = WebInspector.RemoteObject.fromPayload(resultPaylo ad);
266 var result = {}; 266 var result = {};
267 if (resultObject.isError()) 267 if (resultObject.isError())
268 result.isException = true; 268 result.isException = true;
269 result.value = resultObject.description; 269 result.value = resultObject.description;
270 this._dispatchCallback(message.requestId, port, result); 270 this._dispatchCallback(message.requestId, port, result);
271 } 271 }
272 var evalExpression = "JSON.stringify(eval('" + 272 var evalExpression = "JSON.stringify(eval('" +
273 "with (window.console._commandLineAPI) with (window) {' + unescape(' " + escape(message.expression) + 273 "with (window.console._commandLineAPI) with (window) {' + unescape(' " + escape(message.expression) +
274 "') + '}'));"; 274 "') + '}'));";
275 InspectorBackend.evaluate(evalExpression, "none", callback.bind(this)); 275 InspectorBackend.evaluate(evalExpression, "none", false, callback.bind(t his));
276 }, 276 },
277 277
278 _onRevealAndSelect: function(message) 278 _onRevealAndSelect: function(message)
279 { 279 {
280 if (message.panelId === "resources" && type === "resource") 280 if (message.panelId === "resources" && type === "resource")
281 return this._onRevealAndSelectResource(message); 281 return this._onRevealAndSelectResource(message);
282 else 282 else
283 return this._status.E_NOTSUPPORTED(message.panelId, message.type); 283 return this._status.E_NOTSUPPORTED(message.panelId, message.type);
284 }, 284 },
285 285
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 for (status in WebInspector.ExtensionServer._statuses) 455 for (status in WebInspector.ExtensionServer._statuses)
456 this[status] = makeStatus.bind(null, status); 456 this[status] = makeStatus.bind(null, status);
457 } 457 }
458 458
459 WebInspector.addExtensions = function(extensions) 459 WebInspector.addExtensions = function(extensions)
460 { 460 {
461 WebInspector.extensionServer._addExtensions(extensions); 461 WebInspector.extensionServer._addExtensions(extensions);
462 } 462 }
463 463
464 WebInspector.extensionServer = new WebInspector.ExtensionServer(); 464 WebInspector.extensionServer = new WebInspector.ExtensionServer();
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/front-end/ExtensionPanel.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698