diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 10:44:07 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 10:44:07 +0000 |
| commit | ec2bc65f627293863a35ce2cf4f4c34f981dbe5d (patch) | |
| tree | 8b2f11198d59eaf8267db48d143f6ede173c7414 /webkit | |
| parent | e2d1cbf8db3557eeb046059dad7114dac3687dc5 (diff) | |
| download | chromium_src-ec2bc65f627293863a35ce2cf4f4c34f981dbe5d.zip chromium_src-ec2bc65f627293863a35ce2cf4f4c34f981dbe5d.tar.gz chromium_src-ec2bc65f627293863a35ce2cf4f4c34f981dbe5d.tar.bz2 | |
DevTools: Provisional support for serialized InjectedScript interaction.
Review URL: http://codereview.chromium.org/199022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/devtools/js/devtools.html | 1 | ||||
| -rw-r--r-- | webkit/glue/devtools/js/inspector_controller_impl.js | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/webkit/glue/devtools/js/devtools.html b/webkit/glue/devtools/js/devtools.html index 82bcaf5..f11402d 100644 --- a/webkit/glue/devtools/js/devtools.html +++ b/webkit/glue/devtools/js/devtools.html @@ -73,6 +73,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <script type="text/javascript" src="Callback.js"></script> <script type="text/javascript" src="DOMAgent.js"></script> <script type="text/javascript" src="TimelineAgent.js"></script> + <script type="text/javascript" src="InjectedScriptAccess.js"></script> <script type="text/javascript" src="inspector_controller_impl.js"></script> <script type="text/javascript" src="DOMStorage.js"></script> <script type="text/javascript" src="DOMStorageItemsView.js"></script> diff --git a/webkit/glue/devtools/js/inspector_controller_impl.js b/webkit/glue/devtools/js/inspector_controller_impl.js index 0f12035..50b6f48 100644 --- a/webkit/glue/devtools/js/inspector_controller_impl.js +++ b/webkit/glue/devtools/js/inspector_controller_impl.js @@ -26,6 +26,7 @@ devtools.InspectorControllerImpl = function() { this.installInspectorControllerDelegate_('enableTimeline'); this.installInspectorControllerDelegate_('disableTimeline'); + //TODO: nuke with the next WebKit roll. this.installInjectedScriptDelegate_('getStyles'); this.installInjectedScriptDelegate_('getComputedStyle'); this.installInjectedScriptDelegate_('getInlineStyle'); @@ -269,6 +270,24 @@ devtools.InspectorControllerImpl.prototype.getProperties = function( /** + * @override + */ +devtools.InspectorControllerImpl.prototype.dispatchOnInjectedScript = function( + callId, methodName, argsString) { + var callback = function(result, isException) { + WebInspector.didDispatchOnInjectedScript(callId, + isException ? result : JSON.parse(result), + isException); + }; + RemoteToolsAgent.ExecuteUtilityFunction( + devtools.Callback.wrap(callback), + 'InjectedScript', + JSON.stringify(['dispatch', methodName, argsString])); +}; + + +/** + * TODO: nuke with the next WebKit roll. * Installs delegating handler into the inspector controller. * @param {string} methodName Method to install delegating handler for. */ @@ -280,6 +299,7 @@ devtools.InspectorControllerImpl.prototype.installInjectedScriptDelegate_ = /** + * TODO: nuke with the next WebKit roll. * Bound function with the installInjectedScriptDelegate_ actual * implementation. */ |