[DevTools] Move Script and enums from ScriptDebugListener to V8Debugger.

Source/core/inspector/InspectorDebuggerAgent.cpp

 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 508 matching lines @@
     String scriptURL = it->value.sourceURL();
     if (m_cachedSkipStackRegExp && !scriptURL.isEmpty()) {
         if (!it->value.getBlackboxedState(m_cachedSkipStackGeneration, &isBlackboxed)) {
             isBlackboxed = m_cachedSkipStackRegExp->match(scriptURL) != -1;
             it->value.setBlackboxedState(m_cachedSkipStackGeneration, isBlackboxed);
         }
     }
     return isBlackboxed;
 }
 
-ScriptDebugListener::SkipPauseRequest InspectorDebuggerAgent::shouldSkipExceptionPause()
+V8Debugger::SkipPauseRequest InspectorDebuggerAgent::shouldSkipExceptionPause()
 {
     if (m_steppingFromFramework)
-        return ScriptDebugListener::NoSkip;
+        return V8Debugger::NoSkip;
     if (isTopCallFrameBlackboxed())
-        return ScriptDebugListener::Continue;
-    return ScriptDebugListener::NoSkip;
+        return V8Debugger::Continue;
+    return V8Debugger::NoSkip;
 }
 
-ScriptDebugListener::SkipPauseRequest InspectorDebuggerAgent::shouldSkipStepPause()
+V8Debugger::SkipPauseRequest InspectorDebuggerAgent::shouldSkipStepPause()
 {
     if (m_steppingFromFramework)
-        return ScriptDebugListener::NoSkip;
+        return V8Debugger::NoSkip;
 
     if (m_skipNextDebuggerStepOut) {
         m_skipNextDebuggerStepOut = false;
         if (m_scheduledDebuggerStep == StepOut)
-            return ScriptDebugListener::StepOut;
+            return V8Debugger::StepOut;
     }
 
     if (!isTopCallFrameBlackboxed())
-        return ScriptDebugListener::NoSkip;
+        return V8Debugger::NoSkip;
 
     if (m_skippedStepFrameCount >= maxSkipStepFrameCount)
-        return ScriptDebugListener::StepOut;
+        return V8Debugger::StepOut;
 
     if (!m_skippedStepFrameCount)
         m_recursionLevelForStepFrame = 1;
 
     ++m_skippedStepFrameCount;
-    return ScriptDebugListener::StepFrame;
+    return V8Debugger::StepFrame;
 }
 
 PassRefPtr<TypeBuilder::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointId, const String& scriptId, const ScriptBreakpoint& breakpoint, BreakpointSource source)
 {
     ASSERT(enabled());
     if (breakpointId.isEmpty()) {
         ASSERT_NOT_REACHED();
         return nullptr;
     }
     ScriptsMap::iterator scriptIterator = m_scripts.find(scriptId);
     if (scriptIterator == m_scripts.end())
         return nullptr;
-    Script& script = scriptIterator->value;
+    V8Debugger::Script& script = scriptIterator->value;
     if (breakpoint.lineNumber < script.startLine() || script.endLine() < breakpoint.lineNumber)
         return nullptr;
 
     int actualLineNumber;
     int actualColumnNumber;
     String debuggerBreakpointId = debugger().setBreakpoint(scriptId, breakpoint, &actualLineNumber, &actualColumnNumber, false);
     if (debuggerBreakpointId.isEmpty())
         return nullptr;
 
     m_serverBreakpoints.set(debuggerBreakpointId, std::make_pair(breakpointId, source));
@@ skipping 874 matching lines @@
     RefPtrWillBeRawPtr<ScriptAsyncCallStack> result = nullptr;
     for (AsyncCallStackVector::const_reverse_iterator it = callStacks.rbegin(); it != callStacks.rend(); ++it) {
         RefPtr<JavaScriptCallFrame> callFrame = V8Debugger::toJavaScriptCallFrameUnsafe((*it)->callFrames());
         if (!callFrame)
             break;
         result = ScriptAsyncCallStack::create((*it)->description(), toScriptCallStack(callFrame.get()), result.release());
     }
     return result.release();
 }
 
-String InspectorDebuggerAgent::sourceMapURLForScript(const Script& script, CompileResult compileResult)
+String InspectorDebuggerAgent::sourceMapURLForScript(const V8Debugger::Script& script, V8Debugger::CompileResult compileResult)
 {
-    bool hasSyntaxError = compileResult != CompileSuccess;
+    bool hasSyntaxError = compileResult != V8Debugger::CompileSuccess;
     if (!hasSyntaxError)
         return script.sourceMappingURL();
     return ContentSearchUtils::findSourceMapURL(script.source(), ContentSearchUtils::JavaScriptMagicComment);
 }
 
 // ScriptDebugListener functions
 
-void InspectorDebuggerAgent::didParseSource(const ParsedScript& parsedScript)
+void InspectorDebuggerAgent::didParseSource(const V8Debugger::ParsedScript& parsedScript)
 {
-    Script script = parsedScript.script;
+    V8Debugger::Script script = parsedScript.script;
 
-    bool hasSyntaxError = parsedScript.compileResult != CompileSuccess;
+    bool hasSyntaxError = parsedScript.compileResult != V8Debugger::CompileSuccess;
     if (hasSyntaxError)
         script.setSourceURL(ContentSearchUtils::findSourceURL(script.source(), ContentSearchUtils::JavaScriptMagicComment));
 
     bool isContentScript = script.isContentScript();
     bool isInternalScript = script.isInternalScript();
     bool hasSourceURL = script.hasSourceURL();
     String scriptURL = script.sourceURL();
     String sourceMapURL = sourceMapURLForScript(script, parsedScript.compileResult);
 
     const String* sourceMapURLParam = sourceMapURL.isNull() ? nullptr : &sourceMapURL;
@@ skipping 22 matching lines @@
         ScriptBreakpoint breakpoint;
         breakpointObject->getNumber(DebuggerAgentState::lineNumber, &breakpoint.lineNumber);
         breakpointObject->getNumber(DebuggerAgentState::columnNumber, &breakpoint.columnNumber);
         breakpointObject->getString(DebuggerAgentState::condition, &breakpoint.condition);
         RefPtr<TypeBuilder::Debugger::Location> location = resolveBreakpoint(cookie.key, parsedScript.scriptId, breakpoint, UserBreakpointSource);
         if (location)
             frontend()->breakpointResolved(cookie.key, location);
     }
 }
 
-ScriptDebugListener::SkipPauseRequest InspectorDebuggerAgent::didPause(ScriptState* scriptState, const ScriptValue& callFrames, const ScriptValue& exception, const Vector<String>& hitBreakpoints, bool isPromiseRejection)
+V8Debugger::SkipPauseRequest InspectorDebuggerAgent::didPause(ScriptState* scriptState, const ScriptValue& callFrames, const ScriptValue& exception, const Vector<String>& hitBreakpoints, bool isPromiseRejection)
 {
-    ScriptDebugListener::SkipPauseRequest result;
+    V8Debugger::SkipPauseRequest result;
     if (m_skipAllPauses)
-        result = ScriptDebugListener::Continue;
+        result = V8Debugger::Continue;
     else if (!hitBreakpoints.isEmpty())
-        result = ScriptDebugListener::NoSkip; // Don't skip explicit breakpoints even if set in frameworks.
+        result = V8Debugger::NoSkip; // Don't skip explicit breakpoints even if set in frameworks.
     else if (!exception.isEmpty())
         result = shouldSkipExceptionPause();
     else if (m_scheduledDebuggerStep != NoStep || m_javaScriptPauseScheduled || m_pausingOnNativeEvent)
         result = shouldSkipStepPause();
     else
-        result = ScriptDebugListener::NoSkip;
+        result = V8Debugger::NoSkip;
 
     m_skipNextDebuggerStepOut = false;
-    if (result != ScriptDebugListener::NoSkip)
+    if (result != V8Debugger::NoSkip)
         return result;
 
     // Skip pauses inside V8 internal scripts and on syntax errors.
     if (callFrames.isEmpty())
-        return ScriptDebugListener::Continue;
+        return V8Debugger::Continue;
 
     ASSERT(scriptState);
     ASSERT(!m_pausedScriptState);
     m_pausedScriptState = scriptState;
     m_currentCallStack = callFrames;
 
     if (!exception.isEmpty()) {
         InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
         if (!injectedScript.isEmpty()) {
             m_breakReason = isPromiseRejection ? InspectorFrontend::Debugger::Reason::PromiseRejection : InspectorFrontend::Debugger::Reason::Exception;
@@ skipping 157 matching lines @@
     RefPtr<ExceptionDetails> exceptionDetails = ExceptionDetails::create().setText(toCoreStringWithUndefinedOrNullCheck(message->Get()));
     exceptionDetails->setLine(message->GetLineNumber());
     exceptionDetails->setColumn(message->GetStartColumn());
     v8::Local<v8::StackTrace> messageStackTrace = message->GetStackTrace();
     if (!messageStackTrace.IsEmpty() && messageStackTrace->GetFrameCount() > 0)
         exceptionDetails->setStackTrace(createScriptCallStack(isolate, messageStackTrace, messageStackTrace->GetFrameCount())->buildInspectorArray());
     return exceptionDetails.release();
 }
 
 } // namespace blink