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

Side by Side Diff: Source/devtools/front_end/sdk/RuntimeModel.js

Issue 1659003002: Fix devtools js merge errors. (Closed) Base URL: svn://svn.chromium.org/blink/branches/dart/2454_1
Patch Set: Created 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/devtools/front_end/console/ConsoleView.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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 /** 76 /**
77 * @param {!RuntimeAgent.ExecutionContextDescription} context 77 * @param {!RuntimeAgent.ExecutionContextDescription} context
78 */ 78 */
79 _executionContextCreated: function(context) 79 _executionContextCreated: function(context)
80 { 80 {
81 // The private script context should be hidden behind an experiment. 81 // The private script context should be hidden behind an experiment.
82 if (context.name == WebInspector.RuntimeModel._privateScript && !context .origin && !Runtime.experiments.isEnabled("privateScriptInspection")) { 82 if (context.name == WebInspector.RuntimeModel._privateScript && !context .origin && !Runtime.experiments.isEnabled("privateScriptInspection")) {
83 return; 83 return;
84 } 84 }
85 var executionContext = new WebInspector.ExecutionContext(this.target(), context.id, context.name, context.origin, !context.type, context.frameId, contex 85 var executionContext = new WebInspector.ExecutionContext(this.target(), context.id, context.name, context.origin, !context.type, context.frameId, contex t.language, context.libraryId);
86 t.language, context.libraryId);
87 this._executionContextById[executionContext.id] = executionContext; 86 this._executionContextById[executionContext.id] = executionContext;
88 this.dispatchEventToListeners(WebInspector.RuntimeModel.Events.Execution ContextCreated, executionContext); 87 this.dispatchEventToListeners(WebInspector.RuntimeModel.Events.Execution ContextCreated, executionContext);
89 }, 88 },
90 89
91 /** 90 /**
92 * @param {number} executionContextId 91 * @param {number} executionContextId
93 */ 92 */
94 _executionContextDestroyed: function(executionContextId) 93 _executionContextDestroyed: function(executionContextId)
95 { 94 {
96 var executionContext = this._executionContextById[executionContextId]; 95 var executionContext = this._executionContextById[executionContextId];
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 /** 659 /**
661 * @return {!RuntimeAgent.RemoteObjectId} 660 * @return {!RuntimeAgent.RemoteObjectId}
662 */ 661 */
663 objectId: function() 662 objectId: function()
664 { 663 {
665 return this._objectId; 664 return this._objectId;
666 }, 665 },
667 666
668 __proto__: WebInspector.SDKObject.prototype 667 __proto__: WebInspector.SDKObject.prototype
669 } 668 }
OLDNEW
« no previous file with comments | « Source/devtools/front_end/console/ConsoleView.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698