Diff
Modified: trunk/Source/WebCore/ChangeLog (108082 => 108083)
--- trunk/Source/WebCore/ChangeLog 2012-02-17 16:50:13 UTC (rev 108082)
+++ trunk/Source/WebCore/ChangeLog 2012-02-17 16:55:06 UTC (rev 108083)
@@ -1,3 +1,29 @@
+2012-02-17 Ilya Tikhonovsky <[email protected]>
+
+ Unreviewed, rolling out r108077.
+ http://trac.webkit.org/changeset/108077
+ https://bugs.webkit.org/show_bug.cgi?id=78390
+
+ it broke compilation.
+
+ * inspector/CodeGeneratorInspector.py:
+ * inspector/InjectedScript.cpp:
+ (WebCore::InjectedScript::evaluateOnCallFrame):
+ (WebCore::InjectedScript::getFunctionDetails):
+ (WebCore::InjectedScript::getProperties):
+ (WebCore::InjectedScript::wrapCallFrames):
+ * inspector/InjectedScript.h:
+ (InjectedScript):
+ * inspector/InspectorDebuggerAgent.cpp:
+ (WebCore::InspectorDebuggerAgent::setBreakpointByUrl):
+ (WebCore::InspectorDebuggerAgent::resolveBreakpoint):
+ (WebCore::InspectorDebuggerAgent::getFunctionDetails):
+ (WebCore::InspectorDebuggerAgent::evaluateOnCallFrame):
+ (WebCore::InspectorDebuggerAgent::currentCallFrames):
+ (WebCore::InspectorDebuggerAgent::didParseSource):
+ * inspector/InspectorDebuggerAgent.h:
+ (InspectorDebuggerAgent):
+
2012-02-17 Florin Malita <[email protected]>
chrome.dll!WebCore::SVGTRefElement::updateReferencedText ReadAV@NULL (e85cb8e140071fa7790cad215b0109dc)
Modified: trunk/Source/WebCore/inspector/CodeGeneratorInspector.py (108082 => 108083)
--- trunk/Source/WebCore/inspector/CodeGeneratorInspector.py 2012-02-17 16:50:13 UTC (rev 108082)
+++ trunk/Source/WebCore/inspector/CodeGeneratorInspector.py 2012-02-17 16:55:06 UTC (rev 108083)
@@ -56,8 +56,7 @@
}
-TYPES_WITH_RUNTIME_CAST_SET = frozenset(["Runtime.RemoteObject", "Runtime.PropertyDescriptor",
- "Debugger.FunctionDetails", "Debugger.CallFrame"])
+TYPES_WITH_RUNTIME_CAST_SET = frozenset([])
cmdline_parser = optparse.OptionParser()
Modified: trunk/Source/WebCore/inspector/InjectedScript.cpp (108082 => 108083)
--- trunk/Source/WebCore/inspector/InjectedScript.cpp 2012-02-17 16:50:13 UTC (rev 108082)
+++ trunk/Source/WebCore/inspector/InjectedScript.cpp 2012-02-17 16:55:06 UTC (rev 108083)
@@ -43,12 +43,6 @@
#include "PlatformString.h"
#include "ScriptFunctionCall.h"
-using WebCore::TypeBuilder::Array;
-using WebCore::TypeBuilder::Debugger::CallFrame;
-using WebCore::TypeBuilder::Runtime::PropertyDescriptor;
-using WebCore::TypeBuilder::Debugger::FunctionDetails;
-using WebCore::TypeBuilder::Runtime::RemoteObject;
-
namespace WebCore {
InjectedScript::InjectedScript()
@@ -82,7 +76,7 @@
makeEvalCall(errorString, function, result, wasThrown);
}
-void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const ScriptValue& callFrames, const String& callFrameId, const String& _expression_, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, RefPtr<RemoteObject>* result, bool* wasThrown)
+void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const ScriptValue& callFrames, const String& callFrameId, const String& _expression_, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, RefPtr<InspectorObject>* result, bool* wasThrown)
{
ScriptFunctionCall function(m_injectedScriptObject, "evaluateOnCallFrame");
function.appendArgument(callFrames);
@@ -91,12 +85,10 @@
function.appendArgument(objectGroup);
function.appendArgument(includeCommandLineAPI);
function.appendArgument(returnByValue);
- RefPtr<InspectorObject> resultRaw;
- makeEvalCall(errorString, function, &resultRaw, wasThrown);
- *result = RemoteObject::runtimeCast(resultRaw);
+ makeEvalCall(errorString, function, result, wasThrown);
}
-void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<FunctionDetails>* result)
+void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<InspectorObject>* result)
{
ScriptFunctionCall function(m_injectedScriptObject, "getFunctionDetails");
function.appendArgument(functionId);
@@ -107,7 +99,7 @@
*errorString = "Internal error";
return;
}
- *result = FunctionDetails::runtimeCast(resultValue);
+ *result = resultValue->asObject();
}
void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<InspectorArray>* properties)
@@ -122,7 +114,7 @@
*errorString = "Internal error";
return;
}
- *properties = Array<PropertyDescriptor>::runtimeCast(result);
+ *properties = result->asArray();
}
Node* InjectedScript::nodeForObjectId(const String& objectId)
@@ -149,7 +141,7 @@
}
#if ENABLE(_javascript__DEBUGGER)
-PassRefPtr<Array<CallFrame> > InjectedScript::wrapCallFrames(const ScriptValue& callFrames)
+PassRefPtr<InspectorArray> InjectedScript::wrapCallFrames(const ScriptValue& callFrames)
{
ASSERT(!hasNoValue());
ScriptFunctionCall function(m_injectedScriptObject, "wrapCallFrames");
@@ -159,8 +151,8 @@
ASSERT(!hadException);
RefPtr<InspectorValue> result = callFramesValue.toInspectorValue(m_injectedScriptObject.scriptState());
if (result->type() == InspectorValue::TypeArray)
- return Array<CallFrame>::runtimeCast(result);
- return Array<CallFrame>::create();
+ return result->asArray();
+ return InspectorArray::create();
}
#endif
Modified: trunk/Source/WebCore/inspector/InjectedScript.h (108082 => 108083)
--- trunk/Source/WebCore/inspector/InjectedScript.h 2012-02-17 16:50:13 UTC (rev 108082)
+++ trunk/Source/WebCore/inspector/InjectedScript.h 2012-02-17 16:55:06 UTC (rev 108083)
@@ -32,7 +32,6 @@
#define InjectedScript_h
#include "InjectedScriptManager.h"
-#include "InspectorTypeBuilder.h"
#include "ScriptObject.h"
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
@@ -79,15 +78,15 @@
const String& objectGroup,
bool includeCommandLineAPI,
bool returnByValue,
- RefPtr<TypeBuilder::Runtime::RemoteObject>* result,
+ RefPtr<InspectorObject>* result,
bool* wasThrown);
- void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<TypeBuilder::Debugger::FunctionDetails>* result);
+ void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<InspectorObject>* result);
void getProperties(ErrorString*, const String& objectId, bool ownProperties, RefPtr<InspectorArray>* result);
Node* nodeForObjectId(const String& objectId);
void releaseObject(const String& objectId);
#if ENABLE(_javascript__DEBUGGER)
- PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> > wrapCallFrames(const ScriptValue&);
+ PassRefPtr<InspectorArray> wrapCallFrames(const ScriptValue&);
#endif
PassRefPtr<InspectorObject> wrapObject(ScriptValue, const String& groupName) const;
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (108082 => 108083)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2012-02-17 16:50:13 UTC (rev 108082)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2012-02-17 16:55:06 UTC (rev 108083)
@@ -44,11 +44,6 @@
#include "ScriptObject.h"
#include <wtf/text/WTFString.h>
-using WebCore::TypeBuilder::Array;
-using WebCore::TypeBuilder::Debugger::FunctionDetails;
-using WebCore::TypeBuilder::Runtime::RemoteObject;
-using WebCore::TypeBuilder::Debugger::CallFrame;
-
namespace WebCore {
namespace DebuggerAgentState {
@@ -215,10 +210,8 @@
return url == pattern;
}
-void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, int lineNumber, const String* const optionalURL, const String* const optionalURLRegex, const int* const optionalColumnNumber, const String* const optionalCondition, String* outBreakpointId, RefPtr<InspectorArray>& locationsRaw)
+void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, int lineNumber, const String* const optionalURL, const String* const optionalURLRegex, const int* const optionalColumnNumber, const String* const optionalCondition, String* outBreakpointId, RefPtr<InspectorArray>& locations)
{
- RefPtr<Array<TypeBuilder::Debugger::Location> > locations = Array<TypeBuilder::Debugger::Location>::create();
- locationsRaw = locations;
if (!optionalURL == !optionalURLRegex) {
*errorString = "Either url or urlRegex must be specified.";
return;
@@ -317,7 +310,7 @@
resume(errorString);
}
-PassRefPtr<TypeBuilder::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointId, const String& scriptId, const ScriptBreakpoint& breakpoint)
+PassRefPtr<InspectorObject> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointId, const String& scriptId, const ScriptBreakpoint& breakpoint)
{
ScriptsMap::iterator scriptIterator = m_scripts.find(scriptId);
if (scriptIterator == m_scripts.end())
@@ -387,16 +380,14 @@
*error = "No script for id: " + scriptId;
}
-void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<InspectorObject>& detailsRaw)
+void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<InspectorObject>& details)
{
InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(functionId);
if (injectedScript.hasNoValue()) {
*errorString = "Inspected frame has gone";
return;
}
- RefPtr<FunctionDetails> details;
injectedScript.getFunctionDetails(errorString, functionId, &details);
- detailsRaw = details;
}
void InspectorDebuggerAgent::schedulePauseOnNextStatement(const String& breakReason, PassRefPtr<InspectorObject> data)
@@ -479,26 +470,24 @@
m_state->setLong(DebuggerAgentState::pauseOnExceptionsState, pauseState);
}
-void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString* errorString, const String& callFrameId, const String& _expression_, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const returnByValue, RefPtr<InspectorObject>& resultRaw, bool* wasThrown)
+void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString* errorString, const String& callFrameId, const String& _expression_, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const returnByValue, RefPtr<InspectorObject>& result, bool* wasThrown)
{
InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(callFrameId);
if (injectedScript.hasNoValue()) {
*errorString = "Inspected frame has gone";
return;
}
- RefPtr<RemoteObject> result;
injectedScript.evaluateOnCallFrame(errorString, m_currentCallStack, callFrameId, _expression_, objectGroup ? *objectGroup : "", includeCommandLineAPI ? *includeCommandLineAPI : false, returnByValue ? *returnByValue : false, &result, wasThrown);
- resultRaw = result;
}
-PassRefPtr<Array<CallFrame> > InspectorDebuggerAgent::currentCallFrames()
+PassRefPtr<InspectorArray> InspectorDebuggerAgent::currentCallFrames()
{
if (!m_pausedScriptState)
- return Array<CallFrame>::create();
+ return InspectorArray::create();
InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(m_pausedScriptState);
if (injectedScript.hasNoValue()) {
ASSERT_NOT_REACHED();
- return Array<CallFrame>::create();
+ return InspectorArray::create();
}
return injectedScript.wrapCallFrames(m_currentCallStack);
}
@@ -551,7 +540,7 @@
breakpointObject->getNumber("lineNumber", &breakpoint.lineNumber);
breakpointObject->getNumber("columnNumber", &breakpoint.columnNumber);
breakpointObject->getString("condition", &breakpoint.condition);
- RefPtr<TypeBuilder::Debugger::Location> location = resolveBreakpoint(it->first, scriptId, breakpoint);
+ RefPtr<InspectorObject> location = resolveBreakpoint(it->first, scriptId, breakpoint);
if (location)
m_frontend->breakpointResolved(it->first, location);
}
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h (108082 => 108083)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2012-02-17 16:50:13 UTC (rev 108082)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2012-02-17 16:55:06 UTC (rev 108083)
@@ -130,7 +130,7 @@
void disable();
bool enabled();
- PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> > currentCallFrames();
+ PassRefPtr<InspectorArray> currentCallFrames();
virtual void didParseSource(const String& scriptId, const Script&);
virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage);
@@ -139,7 +139,7 @@
void setPauseOnExceptionsImpl(ErrorString*, int);
- PassRefPtr<TypeBuilder::Debugger::Location> resolveBreakpoint(const String& breakpointId, const String& scriptId, const ScriptBreakpoint&);
+ PassRefPtr<InspectorObject> resolveBreakpoint(const String& breakpointId, const String& scriptId, const ScriptBreakpoint&);
void clear();
bool assertPaused(ErrorString*);
void clearBreakDetails();
