Diff
Modified: trunk/Source/WebCore/ChangeLog (160681 => 160682)
--- trunk/Source/WebCore/ChangeLog 2013-12-17 01:35:02 UTC (rev 160681)
+++ trunk/Source/WebCore/ChangeLog 2013-12-17 01:36:50 UTC (rev 160682)
@@ -1,3 +1,38 @@
+2013-12-16 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Use JSC::SourceID and JSC::BreakpointID instead of WebCore dups
+ https://bugs.webkit.org/show_bug.cgi?id=125818
+
+ Reviewed by Mark Lam.
+
+ Remove the WebCore typedefs of JSC types. Prefer JSC namespace
+ prefixed types throughout WebCore's Inspector code.
+
+ * GNUmakefile.list.am:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/BreakpointID.h: Removed.
+ * bindings/js/ScriptDebugServer.cpp:
+ (WebCore::ScriptDebugServer::setBreakpoint):
+ (WebCore::ScriptDebugServer::removeBreakpoint):
+ (WebCore::ScriptDebugServer::dispatchDidParseSource):
+ * bindings/js/ScriptDebugServer.h:
+ * bindings/js/SourceID.h: Removed.
+ * inspector/InspectorDebuggerAgent.cpp:
+ (WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent):
+ (WebCore::parseLocation):
+ (WebCore::InspectorDebuggerAgent::setBreakpoint):
+ (WebCore::InspectorDebuggerAgent::continueToLocation):
+ (WebCore::InspectorDebuggerAgent::resolveBreakpoint):
+ (WebCore::InspectorDebuggerAgent::searchInContent):
+ (WebCore::InspectorDebuggerAgent::getScriptSource):
+ (WebCore::InspectorDebuggerAgent::didParseSource):
+ (WebCore::InspectorDebuggerAgent::didPause):
+ (WebCore::InspectorDebuggerAgent::clear):
+ * inspector/InspectorDebuggerAgent.h:
+ * inspector/ScriptDebugListener.h:
+
2013-12-16 Daniel Bates <daba...@apple.com>
[iOS] Upstream WebCore/dom changes
Modified: trunk/Source/WebCore/GNUmakefile.list.am (160681 => 160682)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-12-17 01:35:02 UTC (rev 160681)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-12-17 01:36:50 UTC (rev 160682)
@@ -2263,7 +2263,6 @@
Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h \
Source/WebCore/bindings/js/ArrayValue.cpp \
Source/WebCore/bindings/js/ArrayValue.h \
- Source/WebCore/bindings/js/BreakpointID.h \
Source/WebCore/bindings/js/CachedScriptSourceProvider.h \
Source/WebCore/bindings/js/CallbackFunction.cpp \
Source/WebCore/bindings/js/CallbackFunction.h \
@@ -2465,7 +2464,6 @@
Source/WebCore/bindings/js/ScriptWrappableInlines.h \
Source/WebCore/bindings/js/SerializedScriptValue.cpp \
Source/WebCore/bindings/js/SerializedScriptValue.h \
- Source/WebCore/bindings/js/SourceID.h \
Source/WebCore/bindings/js/WebCoreJSClientData.h \
Source/WebCore/bindings/js/WebCoreTypedArrayController.cpp \
Source/WebCore/bindings/js/WebCoreTypedArrayController.h \
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (160681 => 160682)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-12-17 01:35:02 UTC (rev 160681)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-12-17 01:36:50 UTC (rev 160682)
@@ -20590,7 +20590,6 @@
<ClInclude Include="..\bindings\generic\ActiveDOMCallback.h" />
<ClInclude Include="..\bindings\generic\RuntimeEnabledFeatures.h" />
<ClInclude Include="..\bindings\js\ArrayValue.h" />
- <ClInclude Include="..\bindings\js\BreakpointID.h" />
<ClInclude Include="..\bindings\js\CachedScriptSourceProvider.h" />
<ClInclude Include="..\bindings\js\CallbackFunction.h" />
<ClInclude Include="..\bindings\js\Dictionary.h" />
@@ -20640,7 +20639,6 @@
<ClInclude Include="..\bindings\js\ScriptState.h" />
<ClInclude Include="..\bindings\js\ScriptWrappable.h" />
<ClInclude Include="..\bindings\js\SerializedScriptValue.h" />
- <ClInclude Include="..\bindings\js\SourceID.h" />
<ClInclude Include="..\bindings\js\WebCoreJSClientData.h" />
<ClInclude Include="..\bindings\js\WorkerScriptController.h" />
<ClInclude Include="..\plugins\DOMMimeType.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (160681 => 160682)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-12-17 01:35:02 UTC (rev 160681)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-12-17 01:36:50 UTC (rev 160682)
@@ -11399,9 +11399,6 @@
<ClInclude Include="..\bindings\js\ArrayValue.h">
<Filter>bindings\js</Filter>
</ClInclude>
- <ClInclude Include="..\bindings\js\BreakpointID.h">
- <Filter>bindings\js</Filter>
- </ClInclude>
<ClInclude Include="..\bindings\js\CachedScriptSourceProvider.h">
<Filter>bindings\js</Filter>
</ClInclude>
@@ -11531,9 +11528,6 @@
<ClInclude Include="..\bindings\js\SerializedScriptValue.h">
<Filter>bindings\js</Filter>
</ClInclude>
- <ClInclude Include="..\bindings\js\SourceID.h">
- <Filter>bindings\js</Filter>
- </ClInclude>
<ClInclude Include="..\bindings\js\WebCoreJSClientData.h">
<Filter>bindings\js</Filter>
</ClInclude>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (160681 => 160682)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-12-17 01:35:02 UTC (rev 160681)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-12-17 01:36:50 UTC (rev 160682)
@@ -6297,7 +6297,6 @@
FE16CFD4169D1DED00D3A0C7 /* DatabaseBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE16CFD5169D1DED00D3A0C7 /* DatabaseBackendSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE16CFD1169D1DEC00D3A0C7 /* DatabaseBackendSync.cpp */; };
FE16CFD6169D1DED00D3A0C7 /* DatabaseBackendSync.h in Headers */ = {isa = PBXBuildFile; fileRef = FE16CFD2169D1DEC00D3A0C7 /* DatabaseBackendSync.h */; settings = {ATTRIBUTES = (Private, ); }; };
- FE213B29182BE9F800AD2D12 /* SourceID.h in Headers */ = {isa = PBXBuildFile; fileRef = FE213B28182BE9F800AD2D12 /* SourceID.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE3371A2167C11D400EDB752 /* DatabaseBasicTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE36FD1516C7826500F887C1 /* ChangeVersionData.h in Headers */ = {isa = PBXBuildFile; fileRef = FE36FD1116C7826400F887C1 /* ChangeVersionData.h */; };
FE36FD1616C7826500F887C1 /* SQLTransactionStateMachine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE36FD1216C7826400F887C1 /* SQLTransactionStateMachine.cpp */; };
@@ -6331,7 +6330,6 @@
FED13D3A0CEA934600D89466 /* EditorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED13D390CEA934600D89466 /* EditorIOS.mm */; };
FED13D520CEA949700D89466 /* RenderThemeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = FED13D500CEA949700D89466 /* RenderThemeIOS.h */; };
FED48390CED66C3255F72C59 /* MathMLSelectElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F75A059AF170D8FAA5B8CABE /* MathMLSelectElement.cpp */; };
- FEDBFF16182B7A8D0017FA64 /* BreakpointID.h in Headers */ = {isa = PBXBuildFile; fileRef = FEDBFF14182B7A8D0017FA64 /* BreakpointID.h */; settings = {ATTRIBUTES = (Private, ); }; };
FEDEF84116797108000E444A /* DatabaseStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEDEF83F16797108000E444A /* DatabaseStrategy.cpp */; };
FEDEF84216797108000E444A /* DatabaseStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = FEDEF84016797108000E444A /* DatabaseStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
FEE1811316C319E800084849 /* SQLTransactionBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE1811116C319E800084849 /* SQLTransactionBackend.cpp */; };
@@ -13527,7 +13525,6 @@
FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBackend.h; sourceTree = "<group>"; };
FE16CFD1169D1DEC00D3A0C7 /* DatabaseBackendSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseBackendSync.cpp; sourceTree = "<group>"; };
FE16CFD2169D1DEC00D3A0C7 /* DatabaseBackendSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBackendSync.h; sourceTree = "<group>"; };
- FE213B28182BE9F800AD2D12 /* SourceID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceID.h; sourceTree = "<group>"; };
FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBasicTypes.h; sourceTree = "<group>"; };
FE36FD1116C7826400F887C1 /* ChangeVersionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeVersionData.h; sourceTree = "<group>"; };
FE36FD1216C7826400F887C1 /* SQLTransactionStateMachine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLTransactionStateMachine.cpp; sourceTree = "<group>"; };
@@ -13560,7 +13557,6 @@
FEBC5F3016BD0CC300659BD3 /* DatabaseBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBase.h; sourceTree = "<group>"; };
FED13D390CEA934600D89466 /* EditorIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EditorIOS.mm; sourceTree = "<group>"; };
FED13D500CEA949700D89466 /* RenderThemeIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderThemeIOS.h; sourceTree = "<group>"; };
- FEDBFF14182B7A8D0017FA64 /* BreakpointID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BreakpointID.h; sourceTree = "<group>"; };
FEDEF83F16797108000E444A /* DatabaseStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseStrategy.cpp; sourceTree = "<group>"; };
FEDEF84016797108000E444A /* DatabaseStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseStrategy.h; sourceTree = "<group>"; };
FEE1811116C319E800084849 /* SQLTransactionBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLTransactionBackend.cpp; sourceTree = "<group>"; };
@@ -19609,7 +19605,6 @@
BC1A3793097C6FB10019F3D8 /* js */ = {
isa = PBXGroup;
children = (
- FE213B28182BE9F800AD2D12 /* SourceID.h */,
BCCE58A71061E82F008FB35A /* Callback Objects */,
BCCE58B41061E925008FB35A /* Constructors */,
BC4EDEF70C08F414007EDD49 /* Custom */,
@@ -19617,7 +19612,6 @@
93F8B3060A300FEA00F61AB8 /* CodeGeneratorJS.pm */,
49B3760A15C6C6840059131D /* ArrayValue.cpp */,
49B3760B15C6C6840059131D /* ArrayValue.h */,
- FEDBFF14182B7A8D0017FA64 /* BreakpointID.h */,
BCD533630ED6848900887468 /* CachedScriptSourceProvider.h */,
312D67B01535691F00563D0D /* Dictionary.cpp */,
316023EF1532C40C00D50FF4 /* Dictionary.h */,
@@ -22102,7 +22096,6 @@
6E0E569C183BFFE600E0E8D5 /* FloatRoundedRect.h in Headers */,
9A1142041832D135000BB8AD /* ValueToString.h in Headers */,
932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */,
- FEDBFF16182B7A8D0017FA64 /* BreakpointID.h in Headers */,
FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */,
9A528E8417D7F52F00AA9518 /* FloatingObjects.h in Headers */,
FE4AADEE16D2C37400026FFC /* AbstractSQLStatement.h in Headers */,
@@ -22143,7 +22136,6 @@
BCF7E491137CD7C7001DDAE7 /* AdjustViewSizeOrNot.h in Headers */,
84D0C4061115F1EA0018AA34 /* AffineTransform.h in Headers */,
CEDA12D7152CA1CB00D9E08D /* AlternativeTextClient.h in Headers */,
- FE213B29182BE9F800AD2D12 /* SourceID.h in Headers */,
CE08C3D2152B599A0021B8C2 /* AlternativeTextController.h in Headers */,
CE7B2DB31586ABAD0098B3FA /* AlternativeTextUIController.h in Headers */,
FD31603E12B0267600C1A359 /* AnalyserNode.h in Headers */,
Deleted: trunk/Source/WebCore/bindings/js/BreakpointID.h (160681 => 160682)
--- trunk/Source/WebCore/bindings/js/BreakpointID.h 2013-12-17 01:35:02 UTC (rev 160681)
+++ trunk/Source/WebCore/bindings/js/BreakpointID.h 2013-12-17 01:36:50 UTC (rev 160682)
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef BreakpointID_h
-#define BreakpointID_h
-
-#if ENABLE(_javascript__DEBUGGER)
-
-#include <debugger/Debugger.h>
-
-namespace WebCore {
-
-typedef JSC::BreakpointID BreakpointID;
-const BreakpointID noBreakpointID = JSC::noBreakpointID;
-
-} // namespace WebCore
-
-#endif // ENABLE(_javascript__DEBUGGER)
-
-#endif // BreakpointID_h
Modified: trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp (160681 => 160682)
--- trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp 2013-12-17 01:35:02 UTC (rev 160681)
+++ trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp 2013-12-17 01:36:50 UTC (rev 160682)
@@ -66,14 +66,14 @@
{
}
-BreakpointID ScriptDebugServer::setBreakpoint(SourceID sourceID, const ScriptBreakpoint& scriptBreakpoint, unsigned* actualLineNumber, unsigned* actualColumnNumber)
+JSC::BreakpointID ScriptDebugServer::setBreakpoint(JSC::SourceID sourceID, const ScriptBreakpoint& scriptBreakpoint, unsigned* actualLineNumber, unsigned* actualColumnNumber)
{
if (!sourceID)
- return noBreakpointID;
+ return JSC::noBreakpointID;
JSC::Breakpoint breakpoint(sourceID, scriptBreakpoint.lineNumber, scriptBreakpoint.columnNumber, scriptBreakpoint.condition, scriptBreakpoint.autoContinue);
- BreakpointID id = Debugger::setBreakpoint(breakpoint, *actualLineNumber, *actualColumnNumber);
- if (id != noBreakpointID && !scriptBreakpoint.actions.isEmpty()) {
+ JSC::BreakpointID id = Debugger::setBreakpoint(breakpoint, *actualLineNumber, *actualColumnNumber);
+ if (id != JSC::noBreakpointID && !scriptBreakpoint.actions.isEmpty()) {
#ifndef NDEBUG
BreakpointIDToActionsMap::iterator it = m_breakpointIDToActions.find(id);
ASSERT(it == m_breakpointIDToActions.end());
@@ -84,9 +84,9 @@
return id;
}
-void ScriptDebugServer::removeBreakpoint(BreakpointID id)
+void ScriptDebugServer::removeBreakpoint(JSC::BreakpointID id)
{
- ASSERT(id != noBreakpointID);
+ ASSERT(id != JSC::noBreakpointID);
BreakpointIDToActionsMap::iterator it = m_breakpointIDToActions.find(id);
if (it != m_breakpointIDToActions.end())
m_breakpointIDToActions.remove(it);
@@ -169,7 +169,7 @@
void ScriptDebugServer::dispatchDidParseSource(const ListenerSet& listeners, SourceProvider* sourceProvider, bool isContentScript)
{
- SourceID sourceID = sourceProvider->asID();
+ JSC::SourceID sourceID = sourceProvider->asID();
ScriptDebugListener::Script script;
script.url = ""
Modified: trunk/Source/WebCore/bindings/js/ScriptDebugServer.h (160681 => 160682)
--- trunk/Source/WebCore/bindings/js/ScriptDebugServer.h 2013-12-17 01:35:02 UTC (rev 160681)
+++ trunk/Source/WebCore/bindings/js/ScriptDebugServer.h 2013-12-17 01:36:50 UTC (rev 160682)
@@ -32,10 +32,8 @@
#if ENABLE(_javascript__DEBUGGER)
-#include "BreakpointID.h"
#include "ScriptBreakpoint.h"
#include "ScriptDebugListener.h"
-#include "SourceID.h"
#include "Timer.h"
#include <bindings/ScriptObject.h>
#include <debugger/Debugger.h>
@@ -57,8 +55,8 @@
class ScriptDebugServer : public JSC::Debugger {
WTF_MAKE_NONCOPYABLE(ScriptDebugServer); WTF_MAKE_FAST_ALLOCATED;
public:
- BreakpointID setBreakpoint(SourceID, const ScriptBreakpoint&, unsigned* actualLineNumber, unsigned* actualColumnNumber);
- void removeBreakpoint(BreakpointID);
+ JSC::BreakpointID setBreakpoint(JSC::SourceID, const ScriptBreakpoint&, unsigned* actualLineNumber, unsigned* actualColumnNumber);
+ void removeBreakpoint(JSC::BreakpointID);
void clearBreakpoints();
bool canSetScriptSource();
@@ -119,7 +117,7 @@
private:
typedef Vector<ScriptBreakpointAction> BreakpointActions;
- typedef HashMap<BreakpointID, BreakpointActions> BreakpointIDToActionsMap;
+ typedef HashMap<JSC::BreakpointID, BreakpointActions> BreakpointIDToActionsMap;
virtual bool needPauseHandling(JSC::JSGlobalObject*) OVERRIDE;
virtual void handleBreakpointHit(const JSC::Breakpoint&) OVERRIDE;
Deleted: trunk/Source/WebCore/bindings/js/SourceID.h (160681 => 160682)
--- trunk/Source/WebCore/bindings/js/SourceID.h 2013-12-17 01:35:02 UTC (rev 160681)
+++ trunk/Source/WebCore/bindings/js/SourceID.h 2013-12-17 01:36:50 UTC (rev 160682)
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SourceID_h
-#define SourceID_h
-
-#if ENABLE(_javascript__DEBUGGER)
-
-#include <debugger/Debugger.h>
-
-namespace WebCore {
-
-typedef JSC::SourceID SourceID;
-static const SourceID noSourceID = JSC::noSourceID;
-
-} // namespace WebCore
-
-#endif // ENABLE(_javascript__DEBUGGER)
-
-#endif // SourceID_h
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (160681 => 160682)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2013-12-17 01:35:02 UTC (rev 160681)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2013-12-17 01:36:50 UTC (rev 160682)
@@ -60,7 +60,7 @@
: InspectorAgentBase(ASCIILiteral("Debugger"), instrumentingAgents)
, m_injectedScriptManager(injectedScriptManager)
, m_pausedScriptState(0)
- , m_continueToLocationBreakpointID(noBreakpointID)
+ , m_continueToLocationBreakpointID(JSC::noBreakpointID)
, m_enabled(false)
, m_javaScriptPauseScheduled(false)
, m_listener(0)
@@ -303,12 +303,12 @@
*outBreakpointIdentifier = breakpointIdentifier;
}
-static bool parseLocation(ErrorString* errorString, InspectorObject* location, SourceID* sourceID, unsigned* lineNumber, unsigned* columnNumber)
+static bool parseLocation(ErrorString* errorString, InspectorObject* location, JSC::SourceID* sourceID, unsigned* lineNumber, unsigned* columnNumber)
{
String scriptIDStr;
if (!location->getString("scriptId", &scriptIDStr) || !location->getNumber("lineNumber", lineNumber)) {
// FIXME: replace with input validation.
- *sourceID = noSourceID;
+ *sourceID = JSC::noSourceID;
*errorString = "scriptId and lineNumber are required.";
return false;
}
@@ -320,7 +320,7 @@
void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, const RefPtr<InspectorObject>& location, const RefPtr<InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::TypeBuilder::Debugger::Location>& actualLocation)
{
- SourceID sourceID;
+ JSC::SourceID sourceID;
unsigned lineNumber;
unsigned columnNumber;
@@ -368,12 +368,12 @@
void InspectorDebuggerAgent::continueToLocation(ErrorString* errorString, const RefPtr<InspectorObject>& location)
{
- if (m_continueToLocationBreakpointID != noBreakpointID) {
+ if (m_continueToLocationBreakpointID != JSC::noBreakpointID) {
scriptDebugServer().removeBreakpoint(m_continueToLocationBreakpointID);
- m_continueToLocationBreakpointID = noBreakpointID;
+ m_continueToLocationBreakpointID = JSC::noBreakpointID;
}
- SourceID sourceID;
+ JSC::SourceID sourceID;
unsigned lineNumber;
unsigned columnNumber;
@@ -385,7 +385,7 @@
resume(errorString);
}
-PassRefPtr<Inspector::TypeBuilder::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointIdentifier, SourceID sourceID, const ScriptBreakpoint& breakpoint)
+PassRefPtr<Inspector::TypeBuilder::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID sourceID, const ScriptBreakpoint& breakpoint)
{
ScriptsMap::iterator scriptIterator = m_scripts.find(sourceID);
if (scriptIterator == m_scripts.end())
@@ -396,13 +396,13 @@
unsigned actualLineNumber;
unsigned actualColumnNumber;
- BreakpointID debugServerBreakpointID = scriptDebugServer().setBreakpoint(sourceID, breakpoint, &actualLineNumber, &actualColumnNumber);
- if (debugServerBreakpointID == noBreakpointID)
+ JSC::BreakpointID debugServerBreakpointID = scriptDebugServer().setBreakpoint(sourceID, breakpoint, &actualLineNumber, &actualColumnNumber);
+ if (debugServerBreakpointID == JSC::noBreakpointID)
return 0;
BreakpointIdentifierToDebugServerBreakpointIDsMap::iterator debugServerBreakpointIDsIterator = m_breakpointIdentifierToDebugServerBreakpointIDs.find(breakpointIdentifier);
if (debugServerBreakpointIDsIterator == m_breakpointIdentifierToDebugServerBreakpointIDs.end())
- debugServerBreakpointIDsIterator = m_breakpointIdentifierToDebugServerBreakpointIDs.set(breakpointIdentifier, Vector<BreakpointID>()).iterator;
+ debugServerBreakpointIDsIterator = m_breakpointIdentifierToDebugServerBreakpointIDs.set(breakpointIdentifier, Vector<JSC::BreakpointID>()).iterator;
debugServerBreakpointIDsIterator->value.append(debugServerBreakpointID);
RefPtr<Inspector::TypeBuilder::Debugger::Location> location = Inspector::TypeBuilder::Debugger::Location::create()
@@ -427,7 +427,7 @@
bool isRegex = optionalIsRegex ? *optionalIsRegex : false;
bool caseSensitive = optionalCaseSensitive ? *optionalCaseSensitive : false;
- SourceID sourceID = scriptIDStr.toIntPtr();
+ JSC::SourceID sourceID = scriptIDStr.toIntPtr();
ScriptsMap::iterator it = m_scripts.find(sourceID);
if (it != m_scripts.end())
results = ContentSearchUtils::searchInTextByLines(it->value.source, query, caseSensitive, isRegex);
@@ -449,7 +449,7 @@
void InspectorDebuggerAgent::getScriptSource(ErrorString* error, const String& scriptIDStr, String* scriptSource)
{
- SourceID sourceID = scriptIDStr.toIntPtr();
+ JSC::SourceID sourceID = scriptIDStr.toIntPtr();
ScriptsMap::iterator it = m_scripts.find(sourceID);
if (it != m_scripts.end())
*scriptSource = it->value.source;
@@ -677,7 +677,7 @@
// _javascript_DebugListener functions
-void InspectorDebuggerAgent::didParseSource(SourceID sourceID, const Script& inScript)
+void InspectorDebuggerAgent::didParseSource(JSC::SourceID sourceID, const Script& inScript)
{
Script script = inScript;
if (!script.startLine && !script.startColumn)
@@ -746,9 +746,9 @@
m_frontendDispatcher->paused(currentCallFrames(), m_breakReason, m_breakAuxData);
m_javaScriptPauseScheduled = false;
- if (m_continueToLocationBreakpointID != noBreakpointID) {
+ if (m_continueToLocationBreakpointID != JSC::noBreakpointID) {
scriptDebugServer().removeBreakpoint(m_continueToLocationBreakpointID);
- m_continueToLocationBreakpointID = noBreakpointID;
+ m_continueToLocationBreakpointID = JSC::noBreakpointID;
}
if (m_listener)
m_listener->didPause();
@@ -775,7 +775,7 @@
m_currentCallStack = Deprecated::ScriptValue();
m_scripts.clear();
m_breakpointIdentifierToDebugServerBreakpointIDs.clear();
- m_continueToLocationBreakpointID = noBreakpointID;
+ m_continueToLocationBreakpointID = JSC::noBreakpointID;
clearBreakDetails();
m_javaScriptPauseScheduled = false;
ErrorString error;
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h (160681 => 160682)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2013-12-17 01:35:02 UTC (rev 160681)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2013-12-17 01:36:50 UTC (rev 160682)
@@ -32,15 +32,13 @@
#if ENABLE(_javascript__DEBUGGER) && ENABLE(INSPECTOR)
-#include "BreakpointID.h"
#include "ConsoleAPITypes.h"
#include "ConsoleTypes.h"
#include "InjectedScript.h"
#include "InspectorWebAgentBase.h"
#include "ScriptBreakpoint.h"
#include "ScriptDebugListener.h"
-#include "ScriptState.h"
-#include "SourceID.h"
+#include <debugger/Debugger.h>
#include <inspector/InspectorJSBackendDispatchers.h>
#include <inspector/InspectorJSFrontendDispatchers.h>
#include <wtf/Forward.h>
@@ -158,20 +156,20 @@
PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>> currentCallFrames();
- virtual void didParseSource(SourceID, const Script&) OVERRIDE FINAL;
+ virtual void didParseSource(JSC::SourceID, const Script&) OVERRIDE FINAL;
virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) OVERRIDE FINAL;
void setPauseOnExceptionsImpl(ErrorString*, int);
- PassRefPtr<Inspector::TypeBuilder::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, SourceID, const ScriptBreakpoint&);
+ PassRefPtr<Inspector::TypeBuilder::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
void clear();
bool assertPaused(ErrorString*);
void clearBreakDetails();
String sourceMapURLForScript(const Script&);
- typedef HashMap<SourceID, Script> ScriptsMap;
- typedef HashMap<String, Vector<BreakpointID>> BreakpointIdentifierToDebugServerBreakpointIDsMap;
+ typedef HashMap<JSC::SourceID, Script> ScriptsMap;
+ typedef HashMap<String, Vector<JSC::BreakpointID>> BreakpointIdentifierToDebugServerBreakpointIDsMap;
typedef HashMap<String, RefPtr<Inspector::InspectorObject>> BreakpointIdentifierToBreakpointMap;
InjectedScriptManager* m_injectedScriptManager;
@@ -182,7 +180,7 @@
ScriptsMap m_scripts;
BreakpointIdentifierToDebugServerBreakpointIDsMap m_breakpointIdentifierToDebugServerBreakpointIDs;
BreakpointIdentifierToBreakpointMap m_javaScriptBreakpoints;
- BreakpointID m_continueToLocationBreakpointID;
+ JSC::BreakpointID m_continueToLocationBreakpointID;
Inspector::InspectorDebuggerFrontendDispatcher::Reason::Enum m_breakReason;
RefPtr<Inspector::InspectorObject> m_breakAuxData;
bool m_enabled;
Modified: trunk/Source/WebCore/inspector/ScriptDebugListener.h (160681 => 160682)
--- trunk/Source/WebCore/inspector/ScriptDebugListener.h 2013-12-17 01:35:02 UTC (rev 160681)
+++ trunk/Source/WebCore/inspector/ScriptDebugListener.h 2013-12-17 01:36:50 UTC (rev 160682)
@@ -32,8 +32,7 @@
#if ENABLE(_javascript__DEBUGGER)
-#include "ScriptState.h"
-#include "SourceID.h"
+#include <debugger/Debugger.h>
#include <wtf/Forward.h>
#include <wtf/text/WTFString.h>
@@ -69,7 +68,7 @@
virtual ~ScriptDebugListener() { }
- virtual void didParseSource(SourceID, const Script&) = 0;
+ virtual void didParseSource(JSC::SourceID, const Script&) = 0;
virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) = 0;
virtual void didPause(JSC::ExecState*, const Deprecated::ScriptValue& callFrames, const Deprecated::ScriptValue& exception) = 0;
virtual void didContinue() = 0;
