Skip to content

W
webkit
Commit 6b3fa793 authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files
Options

Web Inspector: Remove unimplemented or static ScriptDebugServer features 

https://bugs.webkit.org/show_bug.cgi?id=126784

Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-01-10
Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

* inspector/protocol/Debugger.json:

Source/WebCore:

These features are unimplemented in the backend, and unused by the
current frontend. Most deal with features that were supported by v8
and are as yet unimplemented by JSC. If we decide to add such features
we can reimplement without conforming to an old implementation.

* bindings/js/ScriptDebugServer.cpp:
* bindings/js/ScriptDebugServer.h:
* bindings/js/ScriptProfiler.h:
* inspector/InspectorDebuggerAgent.cpp:
(WebCore::InspectorDebuggerAgent::disable):
* inspector/InspectorDebuggerAgent.h:
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::reload):
(WebCore::InspectorPageAgent::frameNavigated):
* inspector/InspectorPageAgent.h:
* inspector/InspectorProfilerAgent.cpp:
* inspector/InspectorProfilerAgent.h:
* inspector/PageDebuggerAgent.cpp:
(WebCore::PageDebuggerAgent::didClearMainFrameWindowObject):
* inspector/protocol/Page.json:
* inspector/protocol/Profiler.json:

Source/WebInspectorUI:

* UserInterface/InspectorJSBackendCommands.js:
* UserInterface/InspectorWebBackendCommands.js:
* UserInterface/Legacy/6.0/InspectorWebBackendCommands.js:
* UserInterface/Legacy/7.0/InspectorWebBackendCommands.js:
* Versions/Inspector-iOS-6.0.json:
* Versions/Inspector-iOS-7.0.json:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@161691 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a0bc7da0
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 351 deletions
Source/JavaScriptCore/ChangeLog
View file @ 6b3fa793
2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
Web Inspector: Remove unimplemented or static ScriptDebugServer features
https://bugs.webkit.org/show_bug.cgi?id=126784
Reviewed by Timothy Hatcher.
* inspector/protocol/Debugger.json:
2014-01-10 Michael Saboff <msaboff@apple.com>
REGRESSION(C stack work): stack traces no longer work in CrashTracer, lldb, and other tools
......
Source/JavaScriptCore/inspector/protocol/Debugger.json
View file @ 6b3fa793
......@@ -81,20 +81,6 @@
}
],
"commands": [
{
"name": "causesRecompilation",
"returns": [
{ "name": "result", "type": "boolean", "description": "True if enabling debugger causes scripts recompilation." }
],
"description": "Tells whether enabling debugger causes scripts recompilation."
},
{
"name": "supportsSeparateScriptCompilationAndExecution",
"returns": [
{ "name": "result", "type": "boolean", "description": "True if debugger supports separate script compilation and execution." }
],
"description": "Tells whether debugger supports separate script compilation and execution."
},
{
"name": "enable",
"description": "Enables debugger for the given page. Clients should not assume that the debugging has been enabled until the result for this command is received."
......@@ -184,26 +170,6 @@
],
"description": "Searches for given string in script content."
},
{
"name": "canSetScriptSource",
"returns": [
{ "name": "result", "type": "boolean", "description": "True if <code>setScriptSource</code> is supported." }
],
"description": "Tells whether <code>setScriptSource</code> is supported."
},
{
"name": "setScriptSource",
"parameters": [
{ "name": "scriptId", "$ref": "ScriptId", "description": "Id of the script to edit." },
{ "name": "scriptSource", "type": "string", "description": "New content of the script." },
{ "name": "preview", "type": "boolean", "optional": true, "description": " If true the change will not actually be applied. Preview mode may be used to get result description without actually modifying the code." }
],
"returns": [
{ "name": "callFrames", "type": "array", "optional": true, "items": { "$ref": "CallFrame"}, "description": "New stack trace in case editing has happened while VM was stopped." },
{ "name": "result", "type": "object", "optional": true, "description": "VM-specific description of the changes applied." }
],
"description": "Edits JavaScript source live."
},
{
"name": "getScriptSource",
"parameters": [
......@@ -248,32 +214,6 @@
],
"description": "Evaluates expression on a given call frame."
},
{
"name": "compileScript",
"parameters": [
{ "name": "expression", "type": "string", "description": "Expression to compile." },
{ "name": "sourceURL", "type": "string", "description": "Source url to be set for the script." }
],
"returns": [
{ "name": "scriptId", "$ref": "ScriptId", "optional": true, "description": "Id of the script." },
{ "name": "syntaxErrorMessage", "type": "string", "optional": true, "description": "Syntax error message if compilation failed." }
],
"description": "Compiles expression."
},
{
"name": "runScript",
"parameters": [
{ "name": "scriptId", "$ref": "ScriptId", "description": "Id of the script to run." },
{ "name": "contextId", "$ref": "Runtime.ExecutionContextId", "optional": true, "description": "Specifies in which isolated context to perform script run. Each content script lives in an isolated context and this parameter may be used to specify one of those contexts. If the parameter is omitted or 0 the evaluation will be performed in the context of the inspected page." },
{ "name": "objectGroup", "type": "string", "optional": true, "description": "Symbolic group name that can be used to release multiple objects." },
{ "name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true, "description": "Specifies whether script run should stop on exceptions and mute console. Overrides setPauseOnException state." }
],
"returns": [
{ "name": "result", "$ref": "Runtime.RemoteObject", "description": "Run result." },
{ "name": "wasThrown", "type": "boolean", "optional": true, "description": "True if the result was thrown during the script run." }
],
"description": "Runs script with given id in a given context."
},
{
"name": "setOverlayMessage",
"parameters": [
......
Source/WebCore/ChangeLog
View file @ 6b3fa793
2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
Web Inspector: Remove unimplemented or static ScriptDebugServer features
https://bugs.webkit.org/show_bug.cgi?id=126784
Reviewed by Timothy Hatcher.
These features are unimplemented in the backend, and unused by the
current frontend. Most deal with features that were supported by v8
and are as yet unimplemented by JSC. If we decide to add such features
we can reimplement without conforming to an old implementation.
* bindings/js/ScriptDebugServer.cpp:
* bindings/js/ScriptDebugServer.h:
* bindings/js/ScriptProfiler.h:
* inspector/InspectorDebuggerAgent.cpp:
(WebCore::InspectorDebuggerAgent::disable):
* inspector/InspectorDebuggerAgent.h:
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::reload):
(WebCore::InspectorPageAgent::frameNavigated):
* inspector/InspectorPageAgent.h:
* inspector/InspectorProfilerAgent.cpp:
* inspector/InspectorProfilerAgent.h:
* inspector/PageDebuggerAgent.cpp:
(WebCore::PageDebuggerAgent::didClearMainFrameWindowObject):
* inspector/protocol/Page.json:
* inspector/protocol/Profiler.json:
2014-01-10 David Kilzer <ddkilzer@apple.com>
[iOS] Remove unused variable from TileGrid::dropTilesBetweenRects()
Source/WebCore/bindings/js/ScriptDebugServer.cpp
View file @ 6b3fa793
......@@ -131,24 +131,6 @@ void ScriptDebugServer::clearBreakpoints()
m_breakpointIDToActions.clear();
}
bool ScriptDebugServer::canSetScriptSource()
{
return false;
}
bool ScriptDebugServer::setScriptSource(const String&, const String&, bool, String*, Deprecated::ScriptValue*, Deprecated::ScriptObject*)
{
// FIXME(40300): implement this.
return false;
}
void ScriptDebugServer::updateCallStack(Deprecated::ScriptValue*)
{
// This method is used for restart frame feature that is not implemented yet.
// FIXME(40300): implement this.
}
void ScriptDebugServer::dispatchDidPause(ScriptDebugListener* listener)
{
ASSERT(isPaused());
......@@ -331,21 +313,6 @@ void ScriptDebugServer::recompileAllJSFunctionsSoon()
m_recompileTimer.startOneShot(0);
}
void ScriptDebugServer::compileScript(JSC::ExecState*, const String&, const String&, String*, String*)
{
// FIXME(89652): implement this.
}
void ScriptDebugServer::clearCompiledScripts()
{
// FIXME(89652): implement this.
}
void ScriptDebugServer::runScript(JSC::ExecState*, const String&, Deprecated::ScriptValue*, bool*, String*)
{
// FIXME(89652): implement this.
}
} // namespace WebCore
#endif // ENABLE(JAVASCRIPT_DEBUGGER)
Source/WebCore/bindings/js/ScriptDebugServer.h
View file @ 6b3fa793
......@@ -59,27 +59,11 @@ public:
void removeBreakpoint(JSC::BreakpointID);
void clearBreakpoints();
bool canSetScriptSource();
bool setScriptSource(const String& sourceID, const String& newContent, bool preview, String* error, Deprecated::ScriptValue* newCallFrames, Deprecated::ScriptObject* result);
void updateCallStack(Deprecated::ScriptValue* callFrame);
bool causesRecompilation() { return true; }
bool supportsSeparateScriptCompilationAndExecution() { return false; }
void recompileAllJSFunctionsSoon();
virtual void recompileAllJSFunctions(Timer<ScriptDebugServer>* = 0) = 0;
void setScriptPreprocessor(const String&)
{
// FIXME(webkit.org/b/82203): Implement preprocessor.
}
bool runningNestedMessageLoop() { return m_runningNestedMessageLoop; }
void compileScript(JSC::ExecState*, const String& expression, const String& sourceURL, String* scriptID, String* exceptionMessage);
void clearCompiledScripts();
void runScript(JSC::ExecState*, const String& scriptID, Deprecated::ScriptValue* result, bool* wasThrown, String* exceptionMessage);
class Task {
WTF_MAKE_FAST_ALLOCATED;
public:
......
Source/WebCore/bindings/js/ScriptProfiler.h
View file @ 6b3fa793
......@@ -67,7 +67,6 @@ public:
static PassRefPtr<ScriptProfile> stopForPage(Page*, const String& title);
static PassRefPtr<ScriptProfile> stopForWorkerGlobalScope(WorkerGlobalScope*, const String& title);
static PassRefPtr<ScriptHeapSnapshot> takeHeapSnapshot(const String&, HeapSnapshotProgress*) { return 0; }
static bool causesRecompilation() { return true; }
static bool isSampling() { return false; }
static bool hasHeapProfiler() { return false; }
static HashMap<String, double>* currentProfileNameIdleTimeMap() { return 0; }
......
Source/WebCore/inspector/InspectorDebuggerAgent.cpp
View file @ 6b3fa793
......@@ -95,7 +95,6 @@ void InspectorDebuggerAgent::disable()
stopListeningScriptDebugServer();
scriptDebugServer().clearBreakpoints();
scriptDebugServer().clearCompiledScripts();
scriptDebugServer().continueProgram();
clear();
......@@ -105,21 +104,6 @@ void InspectorDebuggerAgent::disable()
m_enabled = false;
}
void InspectorDebuggerAgent::causesRecompilation(ErrorString*, bool* result)
{
*result = scriptDebugServer().causesRecompilation();
}
void InspectorDebuggerAgent::canSetScriptSource(ErrorString*, bool* result)
{
*result = scriptDebugServer().canSetScriptSource();
}
void InspectorDebuggerAgent::supportsSeparateScriptCompilationAndExecution(ErrorString*, bool* result)
{
*result = scriptDebugServer().supportsSeparateScriptCompilationAndExecution();
}
void InspectorDebuggerAgent::enable(ErrorString*)
{
if (m_enabled)
......@@ -412,16 +396,6 @@ PassRefPtr<Inspector::TypeBuilder::Debugger::Location> InspectorDebuggerAgent::r
return location;
}
static PassRefPtr<InspectorObject> scriptToInspectorObject(Deprecated::ScriptObject scriptObject)
{
if (scriptObject.hasNoValue())
return 0;
RefPtr<InspectorValue> value = scriptObject.toInspectorValue(scriptObject.scriptState());
if (!value)
return 0;
return value->asObject();
}
void InspectorDebuggerAgent::searchInContent(ErrorString* error, const String& scriptIDStr, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>>& results)
{
bool isRegex = optionalIsRegex ? *optionalIsRegex : false;
......@@ -435,18 +409,6 @@ void InspectorDebuggerAgent::searchInContent(ErrorString* error, const String& s
*error = "No script for id: " + scriptIDStr;
}
void InspectorDebuggerAgent::setScriptSource(ErrorString* error, const String& scriptID, const String& newContent, const bool* const preview, RefPtr<Array<Inspector::TypeBuilder::Debugger::CallFrame>>& newCallFrames, RefPtr<InspectorObject>& result)
{
bool previewOnly = preview && *preview;
Deprecated::ScriptObject resultObject;
if (!scriptDebugServer().setScriptSource(scriptID, newContent, previewOnly, error, &m_currentCallStack, &resultObject))
return;
newCallFrames = currentCallFrames();
RefPtr<InspectorObject> object = scriptToInspectorObject(resultObject);
if (object)
result = object;
}
void InspectorDebuggerAgent::getScriptSource(ErrorString* error, const String& scriptIDStr, String* scriptSource)
{
JSC::SourceID sourceID = scriptIDStr.toIntPtr();
......@@ -569,60 +531,6 @@ void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString* errorString, const
}
}
void InspectorDebuggerAgent::compileScript(ErrorString* errorString, const String& expression, const String& sourceURL, Inspector::TypeBuilder::OptOutput<ScriptId>* scriptID, Inspector::TypeBuilder::OptOutput<String>* syntaxErrorMessage)
{
InjectedScript injectedScript = injectedScriptForEval(errorString, 0);
if (injectedScript.hasNoValue()) {
*errorString = "Inspected frame has gone";
return;
}
String scriptIDValue;
String exceptionMessage;
scriptDebugServer().compileScript(injectedScript.scriptState(), expression, sourceURL, &scriptIDValue, &exceptionMessage);
if (!scriptIDValue && !exceptionMessage) {
*errorString = "Script compilation failed";
return;
}
*syntaxErrorMessage = exceptionMessage;
*scriptID = scriptIDValue;
}
void InspectorDebuggerAgent::runScript(ErrorString* errorString, const ScriptId& scriptID, const int* executionContextId, const String* const objectGroup, const bool* const doNotPauseOnExceptionsAndMuteConsole, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result, Inspector::TypeBuilder::OptOutput<bool>* wasThrown)
{
InjectedScript injectedScript = injectedScriptForEval(errorString, executionContextId);
if (injectedScript.hasNoValue()) {
*errorString = "Inspected frame has gone";
return;
}
ScriptDebugServer::PauseOnExceptionsState previousPauseOnExceptionsState = scriptDebugServer().pauseOnExceptionsState();
if (doNotPauseOnExceptionsAndMuteConsole && *doNotPauseOnExceptionsAndMuteConsole) {
if (previousPauseOnExceptionsState != ScriptDebugServer::DontPauseOnExceptions)
scriptDebugServer().setPauseOnExceptionsState(ScriptDebugServer::DontPauseOnExceptions);
muteConsole();
}
Deprecated::ScriptValue value;
bool wasThrownValue;
String exceptionMessage;
scriptDebugServer().runScript(injectedScript.scriptState(), scriptID, &value, &wasThrownValue, &exceptionMessage);
*wasThrown = wasThrownValue;
if (value.hasNoValue()) {
*errorString = "Script execution failed";
return;
}
result = injectedScript.wrapObject(value, objectGroup ? *objectGroup : "");
if (wasThrownValue)
result->setDescription(exceptionMessage);
if (doNotPauseOnExceptionsAndMuteConsole && *doNotPauseOnExceptionsAndMuteConsole) {
unmuteConsole();
if (scriptDebugServer().pauseOnExceptionsState() != previousPauseOnExceptionsState)
scriptDebugServer().setPauseOnExceptionsState(previousPauseOnExceptionsState);
}
}
void InspectorDebuggerAgent::setOverlayMessage(ErrorString*, const String*)
{
}
......
Source/WebCore/inspector/InspectorDebuggerAgent.h
View file @ 6b3fa793
......@@ -70,10 +70,6 @@ public:
virtual ~InspectorDebuggerAgent();
virtual void causesRecompilation(ErrorString*, bool*);
virtual void canSetScriptSource(ErrorString*, bool*);
virtual void supportsSeparateScriptCompilationAndExecution(ErrorString*, bool*);
virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) OVERRIDE;
virtual void willDestroyFrontendAndBackend() OVERRIDE;
......@@ -92,7 +88,6 @@ public:
virtual void continueToLocation(ErrorString*, const RefPtr<Inspector::InspectorObject>& location);
virtual void searchInContent(ErrorString*, const String& scriptID, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>>&);
virtual void setScriptSource(ErrorString*, const String& scriptID, const String& newContent, const bool* preview, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>>& newCallFrames, RefPtr<Inspector::InspectorObject>& result);
virtual void getScriptSource(ErrorString*, const String& scriptID, String* scriptSource);
virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Inspector::TypeBuilder::Debugger::FunctionDetails>&);
virtual void pause(ErrorString*);
......@@ -111,8 +106,6 @@ public:
const bool* generatePreview,
RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result,
Inspector::TypeBuilder::OptOutput<bool>* wasThrown);
void compileScript(ErrorString*, const String& expression, const String& sourceURL, Inspector::TypeBuilder::OptOutput<Inspector::TypeBuilder::Debugger::ScriptId>*, Inspector::TypeBuilder::OptOutput<String>* syntaxErrorMessage);
void runScript(ErrorString*, const Inspector::TypeBuilder::Debugger::ScriptId&, const int* executionContextId, const String* objectGroup, const bool* doNotPauseOnExceptionsAndMuteConsole, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result, Inspector::TypeBuilder::OptOutput<bool>* wasThrown);
virtual void setOverlayMessage(ErrorString*, const String*);
void schedulePauseOnNextStatement(Inspector::InspectorDebuggerFrontendDispatcher::Reason::Enum breakReason, PassRefPtr<Inspector::InspectorObject> data);
......
Source/WebCore/inspector/InspectorPageAgent.cpp
View file @ 6b3fa793
......@@ -426,10 +426,9 @@ void InspectorPageAgent::removeScriptToEvaluateOnLoad(ErrorString* error, const
m_scriptsToEvaluateOnLoad->remove(identifier);
}
void InspectorPageAgent::reload(ErrorString*, const bool* const optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad, const String* optionalScriptPreprocessor)
void InspectorPageAgent::reload(ErrorString*, const bool* const optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad)
{
m_pendingScriptToEvaluateOnLoadOnce = optionalScriptToEvaluateOnLoad ? *optionalScriptToEvaluateOnLoad : "";
m_pendingScriptPreprocessor = optionalScriptPreprocessor ? *optionalScriptPreprocessor : "";
m_page->mainFrame().loader().reload(optionalIgnoreCache ? *optionalIgnoreCache : false);
}
......@@ -784,9 +783,7 @@ void InspectorPageAgent::frameNavigated(DocumentLoader* loader)
{
if (loader->frame()->isMainFrame()) {
m_scriptToEvaluateOnLoadOnce = m_pendingScriptToEvaluateOnLoadOnce;
m_scriptPreprocessor = m_pendingScriptPreprocessor;
m_pendingScriptToEvaluateOnLoadOnce = String();
m_pendingScriptPreprocessor = String();
}
m_frontendDispatcher->frameNavigated(buildObjectForFrame(loader->frame()));
}
......
Source/WebCore/inspector/InspectorPageAgent.h
View file @ 6b3fa793
......@@ -99,7 +99,7 @@ public:
virtual void disable(ErrorString*);
virtual void addScriptToEvaluateOnLoad(ErrorString*, const String& source, String* result);
virtual void removeScriptToEvaluateOnLoad(ErrorString*, const String& identifier);
virtual void reload(ErrorString*, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad, const String* optionalScriptPreprocessor);
virtual void reload(ErrorString*, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad);
virtual void navigate(ErrorString*, const String& url);
virtual void getCookies(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::Cookie>>& cookies);
virtual void deleteCookie(ErrorString*, const String& cookieName, const String& url);
......@@ -160,7 +160,6 @@ public:
String loaderId(DocumentLoader*);
Frame* findFrameWithSecurityOrigin(const String& originRawString);
Frame* assertFrame(ErrorString*, const String& frameId);
String scriptPreprocessor() { return m_scriptPreprocessor; }
static DocumentLoader* assertDocumentLoader(ErrorString*, Frame*);
private:
......@@ -182,8 +181,6 @@ private:
long m_lastScriptIdentifier;
String m_pendingScriptToEvaluateOnLoadOnce;
String m_scriptToEvaluateOnLoadOnce;
String m_pendingScriptPreprocessor;
String m_scriptPreprocessor;
HashMap<Frame*, String> m_frameToIdentifier;
HashMap<String, Frame*> m_identifierToFrame;
HashMap<DocumentLoader*, String> m_loaderToIdentifier;
......
Source/WebCore/inspector/InspectorProfilerAgent.cpp
View file @ 6b3fa793
......@@ -190,11 +190,6 @@ PassRefPtr<Inspector::TypeBuilder::Profiler::ProfileHeader> InspectorProfilerAge
return header.release();
}
void InspectorProfilerAgent::causesRecompilation(ErrorString*, bool* result)
{
*result = ScriptProfiler::causesRecompilation();
}
void InspectorProfilerAgent::isSampling(ErrorString*, bool* result)
{
*result = ScriptProfiler::isSampling();
......
Source/WebCore/inspector/InspectorProfilerAgent.h
View file @ 6b3fa793
......@@ -73,7 +73,6 @@ public:
virtual void clearProfiles(ErrorString*) { resetState(); }
void resetState();
virtual void causesRecompilation(ErrorString*, bool*);
virtual void recompileScript() = 0;
virtual void isSampling(ErrorString*, bool*);
virtual void hasHeapProfiler(ErrorString*, bool*);
......
Source/WebCore/inspector/PageDebuggerAgent.cpp
View file @ 6b3fa793
......@@ -121,7 +121,6 @@ void PageDebuggerAgent::setOverlayMessage(ErrorString*, const String* message)
void PageDebuggerAgent::didClearMainFrameWindowObject()
{
reset();
scriptDebugServer().setScriptPreprocessor(m_pageAgent->scriptPreprocessor());
}
} // namespace WebCore
......
Source/WebCore/inspector/protocol/Page.json
View file @ 6b3fa793
......@@ -111,8 +111,7 @@
"name": "reload",
"parameters": [
{ "name": "ignoreCache", "type": "boolean", "optional": true, "description": "If true, browser cache is ignored (as if the user pressed Shift+refresh)." },
{ "name": "scriptToEvaluateOnLoad", "type": "string", "optional": true, "description": "If set, the script will be injected into all frames of the inspected page after reload." },
{ "name": "scriptPreprocessor", "type": "string", "optional": true, "description": "Script body that should evaluate to function that will preprocess all the scripts before their compilation." }
{ "name": "scriptToEvaluateOnLoad", "type": "string", "optional": true, "description": "If set, the script will be injected into all frames of the inspected page after reload." }
],
"description": "Reloads given page optionally ignoring the cache."
},
......
Source/WebCore/inspector/protocol/Profiler.json
View file @ 6b3fa793
......@@ -46,12 +46,6 @@
}
],
"commands": [
{
"name": "causesRecompilation",
"returns": [
{ "name": "result", "type": "boolean" }
]
},
{
"name": "isSampling",
"returns": [
......
Source/WebInspectorUI/ChangeLog
View file @ 6b3fa793
2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
Web Inspector: Remove unimplemented or static ScriptDebugServer features
https://bugs.webkit.org/show_bug.cgi?id=126784
Reviewed by Timothy Hatcher.
* UserInterface/InspectorJSBackendCommands.js:
* UserInterface/InspectorWebBackendCommands.js:
* UserInterface/Legacy/6.0/InspectorWebBackendCommands.js:
* UserInterface/Legacy/7.0/InspectorWebBackendCommands.js:
* Versions/Inspector-iOS-6.0.json:
* Versions/Inspector-iOS-7.0.json:
2014-01-10 Timothy Hatcher <timothy@apple.com>
Web Inspector: support negative numbers in secondsToString and bytesToString.
......
Source/WebInspectorUI/UserInterface/InspectorJSBackendCommands.js
View file @ 6b3fa793
......@@ -16,8 +16,6 @@ InspectorBackend.registerEvent("Debugger.scriptFailedToParse", ["url", "scriptSo
InspectorBackend.registerEvent("Debugger.breakpointResolved", ["breakpointId", "location"]);
InspectorBackend.registerEvent("Debugger.paused", ["callFrames", "reason", "data"]);
InspectorBackend.registerEvent("Debugger.resumed", []);
InspectorBackend.registerCommand("Debugger.causesRecompilation", [], ["result"]);
InspectorBackend.registerCommand("Debugger.supportsSeparateScriptCompilationAndExecution", [], ["result"]);
InspectorBackend.registerCommand("Debugger.enable", [], []);
InspectorBackend.registerCommand("Debugger.disable", [], []);
InspectorBackend.registerCommand("Debugger.setBreakpointsActive", [{"name": "active", "type": "boolean", "optional": false}], []);
......@@ -31,14 +29,10 @@ InspectorBackend.registerCommand("Debugger.stepOut", [], []);
InspectorBackend.registerCommand("Debugger.pause", [], []);
InspectorBackend.registerCommand("Debugger.resume", [], []);
InspectorBackend.registerCommand("Debugger.searchInContent", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "query", "type": "string", "optional": false}, {"name": "caseSensitive", "type": "boolean", "optional": true}, {"name": "isRegex", "type": "boolean", "optional": true}], ["result"]);
InspectorBackend.registerCommand("Debugger.canSetScriptSource", [], ["result"]);
InspectorBackend.registerCommand("Debugger.setScriptSource", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "scriptSource", "type": "string", "optional": false}, {"name": "preview", "type": "boolean", "optional": true}], ["callFrames", "result"]);
InspectorBackend.registerCommand("Debugger.getScriptSource", [{"name": "scriptId", "type": "string", "optional": false}], ["scriptSource"]);
InspectorBackend.registerCommand("Debugger.getFunctionDetails", [{"name": "functionId", "type": "string", "optional": false}], ["details"]);
InspectorBackend.registerCommand("Debugger.setPauseOnExceptions", [{"name": "state", "type": "string", "optional": false}], []);
InspectorBackend.registerCommand("Debugger.evaluateOnCallFrame", [{"name": "callFrameId", "type": "string", "optional": false}, {"name": "expression", "type": "string", "optional": false}, {"name": "objectGroup", "type": "string", "optional": true}, {"name": "includeCommandLineAPI", "type": "boolean", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}, {"name": "returnByValue", "type": "boolean", "optional": true}, {"name": "generatePreview", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
InspectorBackend.registerCommand("Debugger.compileScript", [{"name": "expression", "type": "string", "optional": false}, {"name": "sourceURL", "type": "string", "optional": false}], ["scriptId", "syntaxErrorMessage"]);
InspectorBackend.registerCommand("Debugger.runScript", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "contextId", "type": "number", "optional": true}, {"name": "objectGroup", "type": "string", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
InspectorBackend.registerCommand("Debugger.setOverlayMessage", [{"name": "message", "type": "string", "optional": true}], []);
// Inspector.
......
Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js
View file @ 6b3fa793
......@@ -250,7 +250,7 @@ InspectorBackend.registerCommand("Page.enable", [], []);
InspectorBackend.registerCommand("Page.disable", [], []);
InspectorBackend.registerCommand("Page.addScriptToEvaluateOnLoad", [{"name": "scriptSource", "type": "string", "optional": false}], ["identifier"]);
InspectorBackend.registerCommand("Page.removeScriptToEvaluateOnLoad", [{"name": "identifier", "type": "string", "optional": false}], []);
InspectorBackend.registerCommand("Page.reload", [{"name": "ignoreCache", "type": "boolean", "optional": true}, {"name": "scriptToEvaluateOnLoad", "type": "string", "optional": true}, {"name": "scriptPreprocessor", "type": "string", "optional": true}], []);
InspectorBackend.registerCommand("Page.reload", [{"name": "ignoreCache", "type": "boolean", "optional": true}, {"name": "scriptToEvaluateOnLoad", "type": "string", "optional": true}], []);
InspectorBackend.registerCommand("Page.navigate", [{"name": "url", "type": "string", "optional": false}], []);
InspectorBackend.registerCommand("Page.getCookies", [], ["cookies"]);
InspectorBackend.registerCommand("Page.deleteCookie", [{"name": "cookieName", "type": "string", "optional": false}, {"name": "url", "type": "string", "optional": false}], []);
......@@ -286,7 +286,6 @@ InspectorBackend.registerEvent("Profiler.finishHeapSnapshot", ["uid"]);
InspectorBackend.registerEvent("Profiler.setRecordingProfile", ["isProfiling"]);
InspectorBackend.registerEvent("Profiler.resetProfiles", []);
InspectorBackend.registerEvent("Profiler.reportHeapSnapshotProgress", ["done", "total"]);
InspectorBackend.registerCommand("Profiler.causesRecompilation", [], ["result"]);
InspectorBackend.registerCommand("Profiler.isSampling", [], ["result"]);
InspectorBackend.registerCommand("Profiler.hasHeapProfiler", [], ["result"]);
InspectorBackend.registerCommand("Profiler.enable", [], []);
......
Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorWebBackendCommands.js
View file @ 6b3fa793
......@@ -223,7 +223,6 @@ InspectorBackend.registerEvent("Debugger.scriptFailedToParse", ["url", "scriptSo
InspectorBackend.registerEvent("Debugger.breakpointResolved", ["breakpointId", "location"]);
InspectorBackend.registerEvent("Debugger.paused", ["callFrames", "reason", "data"]);
InspectorBackend.registerEvent("Debugger.resumed", []);
InspectorBackend.registerCommand("Debugger.causesRecompilation", [], ["result"]);
InspectorBackend.registerCommand("Debugger.supportsNativeBreakpoints", [], ["result"]);
InspectorBackend.registerCommand("Debugger.enable", [], []);
InspectorBackend.registerCommand("Debugger.disable", [], []);
......@@ -238,8 +237,6 @@ InspectorBackend.registerCommand("Debugger.stepOut", [], []);
InspectorBackend.registerCommand("Debugger.pause", [], []);
InspectorBackend.registerCommand("Debugger.resume", [], []);
InspectorBackend.registerCommand("Debugger.searchInContent", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "query", "type": "string", "optional": false}, {"name": "caseSensitive", "type": "boolean", "optional": true}, {"name": "isRegex", "type": "boolean", "optional": true}], ["result"]);
InspectorBackend.registerCommand("Debugger.canSetScriptSource", [], ["result"]);
InspectorBackend.registerCommand("Debugger.setScriptSource", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "scriptSource", "type": "string", "optional": false}, {"name": "preview", "type": "boolean", "optional": true}], ["callFrames", "result"]);
InspectorBackend.registerCommand("Debugger.getScriptSource", [{"name": "scriptId", "type": "string", "optional": false}], ["scriptSource"]);
InspectorBackend.registerCommand("Debugger.getFunctionDetails", [{"name": "functionId", "type": "string", "optional": false}], ["details"]);
InspectorBackend.registerCommand("Debugger.setPauseOnExceptions", [{"name": "state", "type": "string", "optional": false}], []);
......@@ -265,7 +262,6 @@ InspectorBackend.registerEvent("Profiler.finishHeapSnapshot", ["uid"]);
InspectorBackend.registerEvent("Profiler.setRecordingProfile", ["isProfiling"]);
InspectorBackend.registerEvent("Profiler.resetProfiles", []);
InspectorBackend.registerEvent("Profiler.reportHeapSnapshotProgress", ["done", "total"]);
InspectorBackend.registerCommand("Profiler.causesRecompilation", [], ["result"]);
InspectorBackend.registerCommand("Profiler.isSampling", [], ["result"]);
InspectorBackend.registerCommand("Profiler.hasHeapProfiler", [], ["result"]);
InspectorBackend.registerCommand("Profiler.enable", [], []);
......
Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorWebBackendCommands.js
View file @ 6b3fa793
......@@ -259,8 +259,6 @@ InspectorBackend.registerEvent("Debugger.scriptFailedToParse", ["url", "scriptSo
InspectorBackend.registerEvent("Debugger.breakpointResolved", ["breakpointId", "location"]);
InspectorBackend.registerEvent("Debugger.paused", ["callFrames", "reason", "data"]);
InspectorBackend.registerEvent("Debugger.resumed", []);
InspectorBackend.registerCommand("Debugger.causesRecompilation", [], ["result"]);
InspectorBackend.registerCommand("Debugger.supportsSeparateScriptCompilationAndExecution", [], ["result"]);
InspectorBackend.registerCommand("Debugger.enable", [], []);
InspectorBackend.registerCommand("Debugger.disable", [], []);
InspectorBackend.registerCommand("Debugger.setBreakpointsActive", [{"name": "active", "type": "boolean", "optional": false}], []);
......@@ -274,15 +272,11 @@ InspectorBackend.registerCommand("Debugger.stepOut", [], []);
InspectorBackend.registerCommand("Debugger.pause", [], []);
InspectorBackend.registerCommand("Debugger.resume", [], []);
InspectorBackend.registerCommand("Debugger.searchInContent", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "query", "type": "string", "optional": false}, {"name": "caseSensitive", "type": "boolean", "optional": true}, {"name": "isRegex", "type": "boolean", "optional": true}], ["result"]);
InspectorBackend.registerCommand("Debugger.canSetScriptSource", [], ["result"]);
InspectorBackend.registerCommand("Debugger.setScriptSource", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "scriptSource", "type": "string", "optional": false}, {"name": "preview", "type": "boolean", "optional": true}], ["callFrames", "result"]);
InspectorBackend.registerCommand("Debugger.restartFrame", [{"name": "callFrameId", "type": "string", "optional": false}], ["callFrames", "result"]);
InspectorBackend.registerCommand("Debugger.getScriptSource", [{"name": "scriptId", "type": "string", "optional": false}], ["scriptSource"]);
InspectorBackend.registerCommand("Debugger.getFunctionDetails", [{"name": "functionId", "type": "string", "optional": false}], ["details"]);
InspectorBackend.registerCommand("Debugger.setPauseOnExceptions", [{"name": "state", "type": "string", "optional": false}], []);
InspectorBackend.registerCommand("Debugger.evaluateOnCallFrame", [{"name": "callFrameId", "type": "string", "optional": false}, {"name": "expression", "type": "string", "optional": false}, {"name": "objectGroup", "type": "string", "optional": true}, {"name": "includeCommandLineAPI", "type": "boolean", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}, {"name": "returnByValue", "type": "boolean", "optional": true}, {"name": "generatePreview", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
InspectorBackend.registerCommand("Debugger.compileScript", [{"name": "expression", "type": "string", "optional": false}, {"name": "sourceURL", "type": "string", "optional": false}], ["scriptId", "syntaxErrorMessage"]);
InspectorBackend.registerCommand("Debugger.runScript", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "contextId", "type": "number", "optional": true}, {"name": "objectGroup", "type": "string", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
InspectorBackend.registerCommand("Debugger.setOverlayMessage", [{"name": "message", "type": "string", "optional": true}], []);
InspectorBackend.registerCommand("Debugger.setVariableValue", [{"name": "scopeNumber", "type": "number", "optional": false}, {"name": "variableName", "type": "string", "optional": false}, {"name": "newValue", "type": "object", "optional": false}, {"name": "callFrameId", "type": "string", "optional": true}, {"name": "functionObjectId", "type": "string", "optional": true}], []);
......@@ -306,7 +300,6 @@ InspectorBackend.registerEvent("Profiler.finishHeapSnapshot", ["uid"]);
InspectorBackend.registerEvent("Profiler.setRecordingProfile", ["isProfiling"]);
InspectorBackend.registerEvent("Profiler.resetProfiles", []);
InspectorBackend.registerEvent("Profiler.reportHeapSnapshotProgress", ["done", "total"]);
InspectorBackend.registerCommand("Profiler.causesRecompilation", [], ["result"]);
InspectorBackend.registerCommand("Profiler.isSampling", [], ["result"]);
InspectorBackend.registerCommand("Profiler.hasHeapProfiler", [], ["result"]);
InspectorBackend.registerCommand("Profiler.enable", [], []);
......
Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json
View file @ 6b3fa793
......@@ -2195,14 +2195,6 @@
}
],
"commands": [
{
"name": "causesRecompilation",
"returns": [
{ "name": "result", "type": "boolean", "description": "True if enabling debugger causes scripts recompilation." }
],
"hidden": true,
"description": "Tells whether enabling debugger causes scripts recompilation."
},
{
"name": "supportsNativeBreakpoints",
"returns": [
......@@ -2300,26 +2292,6 @@
],
"description": "Searches for given string in script content."
},
{
"name": "canSetScriptSource",
"returns": [
{ "name": "result", "type": "boolean", "description": "True if <code>setScriptSource</code> is supported." }
],
"description": "Tells whether <code>setScriptSource</code> is supported."
},
{
"name": "setScriptSource",
"parameters": [
{ "name": "scriptId", "$ref": "ScriptId", "description": "Id of the script to edit." },
{ "name": "scriptSource", "type": "string", "description": "New content of the script." },
{ "name": "preview", "type": "boolean", "optional": true, "description": " If true the change will not actually be applied. Preview mode may be used to get result description without actually modifying the code.", "hidden": true }
],
"returns": [
{ "name": "callFrames", "type": "array", "optional": true, "items": { "$ref": "CallFrame"}, "description": "New stack trace in case editing has happened while VM was stopped." },
{ "name": "result", "type": "object", "optional": true, "description": "VM-specific description of the changes applied.", "hidden": true }
],
"description": "Edits JavaScript source live."
},
{
"name": "getScriptSource",
"parameters": [
......@@ -2518,12 +2490,6 @@
}
],
"commands": [
{