Merge 76680 - 2011-01-26 Pavel Feldman <pfeldman@chromium.org>...

Source/WebCore/inspector/Inspector.idl

 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 53 matching lines @@
 
         [domain=Inspector] void setExtraHeaders(in Object headers);
 
         [domain=Inspector] void getCookies(out Array cookies, out String cookiesString);
         [domain=Inspector] void deleteCookie(in String cookieName, in String domain);
 
         ///////////////////////////////////////////////////////////////////////
         // Runtime
         ///////////////////////////////////////////////////////////////////////
 
-        [domain=Runtime] void evaluate(in String expression, in String objectGroup, out Value result);
-        [domain=Runtime] void getCompletions(in String expression, in boolean includeInspectorCommandLineAPI, out Value result);
+        [domain=Runtime] void evaluate(in String expression, in String objectGroup, in boolean includeCommandLineAPI, out Value result);
+        [domain=Runtime] void getCompletions(in String expression, in boolean includeCommandLineAPI, out Value result);
         [domain=Runtime] void getProperties(in Object objectId, in boolean ignoreHasOwnProperty, in boolean abbreviate, out Value result);
         [domain=Runtime] void setPropertyValue(in Object objectId, in String propertyName, in String expression, out Value result);
         [domain=Runtime] void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
 
         ///////////////////////////////////////////////////////////////////////
         // Injected Script
         ///////////////////////////////////////////////////////////////////////
 
         [domain=InjectedScript] void evaluateOnSelf(in String functionBody, in Array argumentsArray, out Value result);
 
@@ skipping 183 matching lines @@
         [domain=Debugger] void pause();
         [notify, domain=Debugger] void pausedScript(out Object details);
         [domain=Debugger] void resume();
         [notify, domain=Debugger] void resumedScript(); // FIXME: Make this out parameter of resume if possible.
 
         [domain=Debugger] void editScriptSource(in String sourceID, in String newContent, out boolean success, out String result, out Value newCallFrames);
         [domain=Debugger] void getScriptSource(in String sourceID, out String scriptSource);
 
         [domain=Debugger] void setPauseOnExceptionsState(in long pauseOnExceptionsState, out long newState);
 
-        [domain=Debugger] void evaluateOnCallFrame(in Object callFrameId, in String expression, in String objectGroup, out Value result);
-        [domain=Debugger] void getCompletionsOnCallFrame(in Object callFrameId, in String expression, in boolean includeInspectorCommandLineAPI, out Value result);
+        [domain=Debugger] void evaluateOnCallFrame(in Object callFrameId, in String expression, in String objectGroup, in boolean includeCommandLineAPI, out Value result);
+        [domain=Debugger] void getCompletionsOnCallFrame(in Object callFrameId, in String expression, in boolean includeCommandLineAPI, out Value result);
 
         [notify, domain=Debugger] void breakpointResolved(out String breakpointId, out String sourceID, out unsigned int lineNumber, out String condition, out boolean enabled, out unsigned int originalLineNumber);
 
 #if defined(ENABLE_WORKERS) && ENABLE_WORKERS
         [notify, domain=Debugger] void didCreateWorker(out long id, out String url, out boolean isShared);
         [notify, domain=Debugger] void didDestroyWorker(out long id);
 #endif // ENABLE_WORKERS
 
         ///////////////////////////////////////////////////////////////////////
         // Profiler API
@@ skipping 16 matching lines @@
         [domain=Profiler] void takeHeapSnapshot();
         [notify, domain=Profiler] void addProfileHeader(out Object header);
         [notify, domain=Profiler] void addHeapSnapshotChunk(out unsigned long uid, out String chunk);
         [notify, domain=Profiler] void finishHeapSnapshot(out unsigned long uid);
         [notify, domain=Profiler] void setRecordingProfile(out boolean isProfiling);
         [notify, domain=Profiler] void resetProfiles();
 
 #endif // ENABLE_JAVASCRIPT_DEBUGGER
     };
 }