Merge 37506 - DevTools: fix console autocomplete against global object (while...

webkit/glue/devtools/js/devtools.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 Tools is a main class that wires all components of the
  * DevTools frontend together. It is also responsible for overriding existing
  * WebInspector functionality while it is getting upstreamed into WebCore.
  */
 goog.provide('devtools.Tools');
@@ skipping 462 matching lines @@
 // TODO(yurys): get rid of the if once WebKit change is rolled.
 var accessor;
 if (InjectedScriptAccess.getDefault)
   accessor = InjectedScriptAccess.prototype;
 else
   accessor = InjectedScriptAccess;
 
 var orig = accessor.getCompletions;
 accessor.getCompletions = function(expressionString,
     includeInspectorCommandLineAPI, callFrameId, reportCompletions) {
-  if (goog.isDef(callFrameId)) {
+  if (typeof callFrameId === "number") {
     devtools.tools.getDebuggerAgent().resolveCompletionsOnFrame(
         expressionString, callFrameId, reportCompletions);
   } else {
     return orig.apply(this, arguments);
   }
 };
 })();
 
 
 (function() {
@@ skipping 30 matching lines @@
     return;
   }
   originalAddToFrame.call(this, identifier, resource.mimeType, element);
 };
 })();
 
 WebInspector.pausedScript = function(callFrames)
 {
     this.panels.scripts.debuggerPaused(callFrames);
 };