Merge 33197 - Support context data in form of a string...

webkit/glue/devtools/js/debugger_agent.js

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Provides communication interface to remote v8 debugger. See
  * protocol decription at http://code.google.com/p/v8/wiki/DebuggerProtocol
  */
 goog.provide('devtools.DebuggerAgent');
 
@@ skipping 953 matching lines @@
     return false;
   }
   var context = msg.lookup(script.context.ref);
   var scriptContextId = context.data;
   if (!goog.isDef(scriptContextId)) {
     return false; // Always ignore scripts from the utility context.
   }
   if (this.contextId_ === null) {
     return true;
   }
-  return (scriptContextId.value == this.contextId_);
+  if (goog.isString(context.data)) {
+    // Find the id from context data. The context data has the format "type,id".
+    var comma = context.data.indexOf(',');
+    if (comma < 0) {
+      return false;
+    }
+    return (parseInt(context.data.substring(comma + 1)) == this.contextId_);
+  } else {
+    // TODO(sgjesse) remove this when patch for
+    // https://bugs.webkit.org/show_bug.cgi?id=31873 has landed in Chromium.
+    return (scriptContextId.value == this.contextId_);
+  }
 };
 
 
 /**
  * @param {devtools.DebuggerMessage} msg
  */
 devtools.DebuggerAgent.prototype.handleSetBreakpointResponse_ = function(msg) {
   var requestSeq = msg.getRequestSeq();
   var breakpointInfo = this.requestNumberToBreakpointInfo_[requestSeq];
   if (!breakpointInfo) {
@@ skipping 74 matching lines @@
 
 /**
  * Adds the script info to the local cache. This method assumes that the script
  * is not in the cache yet.
  * @param {Object} script Script json object from the debugger message.
  * @param {devtools.DebuggerMessage} msg Debugger message containing the script
  *     data.
  */
 devtools.DebuggerAgent.prototype.addScriptInfo_ = function(script, msg) {
   var context = msg.lookup(script.context.ref);
-  var contextType = context.data.type;
+  var contextType;
+  if (goog.isString(context.data)) {
+    // Find the type from context data. The context data has the format
+    // "type,id".
+    var comma = context.data.indexOf(',');
+    if (comma < 0) {
+      return
+    }
+    contextType = context.data.substring(0, comma);
+  } else {
+    // TODO(sgjesse) remove this when patch for
+    // https://bugs.webkit.org/show_bug.cgi?id=31873 has landed in Chromium.
+    contextType = context.data.type;
+  }
   this.parsedScripts_[script.id] = new devtools.ScriptInfo(
       script.id, script.name, script.lineOffset, contextType);
   if (this.scriptsPanelInitialized_) {
     // Only report script as parsed after scripts panel has been shown.
     WebInspector.parsedScriptSource(
         script.id, script.name, script.source, script.lineOffset);
   }
 };
 
 
@@ skipping 536 matching lines @@
 
 
 /**
  * @param {number} handle Object handle.
  * @return {?Object} Returns the object with the handle if it was sent in this
  *    message(some objects referenced by handles may be missing in the message).
  */
 devtools.DebuggerMessage.prototype.lookup = function(handle) {
   return this.refs_[handle];
 };