Fix devtools bugs Fix a spurious layout test failure

Source/bindings/core/dart/DartInspectorDebuggerAgent.cpp

 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2014 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 89 matching lines @@
     return String();
 }
 
 static String generateBreakpointIdDart(const String& scriptId, int lineNumber, int columnNumber, DartInspectorDebuggerAgent::BreakpointSource source)
 {
     return scriptId + ':' + String::number(lineNumber) + ':' + String::number(columnNumber) + breakpointIdSuffixDart(source);
 }
 
 DartInspectorDebuggerAgent::DartInspectorDebuggerAgent(DartInjectedScriptManager* injectedScriptManager, InspectorDebuggerAgent* inspectorDebuggerAgent, InspectorPageAgent* pageAgent)
     : m_injectedScriptManager(injectedScriptManager)
-    , m_frontend(0)
     , m_pausedScriptState(nullptr)
     , m_currentCallStack(0)
     , m_javaScriptPauseScheduled(false)
     , m_debuggerStepScheduled(false)
     , m_steppingFromFramework(false)
     , m_pausingOnNativeEvent(false)
     , m_listener(nullptr)
     , m_skippedStepInCount(0)
     , m_skipAllPauses(false)
     , m_inspectorDebuggerAgent(inspectorDebuggerAgent)
@@ skipping 50 matching lines @@
 }
 
 void DartInspectorDebuggerAgent::enable(ErrorString*)
 {
     if (enabled())
         return;
 
     enable();
     state()->setBoolean(DartDebuggerAgentState::debuggerEnabled, true);
 
-    ASSERT(m_frontend);
+    ASSERT(frontend());
 }
 
 void DartInspectorDebuggerAgent::disable(ErrorString*)
 {
     if (!enabled())
         return;
 
     disable();
     state()->setBoolean(DartDebuggerAgentState::debuggerEnabled, false);
 }
 
 static PassOwnPtr<ScriptRegexp> compileSkipCallFramePattern(String patternText)
 {
     if (patternText.isEmpty())
         return nullptr;
     OwnPtr<ScriptRegexp> result = adoptPtr(new ScriptRegexp(patternText, TextCaseSensitive));
     if (!result->isValid())
         result.clear();
     return result.release();
 }
 
 void DartInspectorDebuggerAgent::restore()
 {
     if (enabled()) {
-        m_frontend->globalObjectCleared();
+        frontend()->globalObjectCleared();
         enable();
         long pauseState = state()->getLong(DartDebuggerAgentState::pauseOnExceptionsState);
         String error;
         setPauseOnExceptionsImpl(&error, pauseState);
         m_cachedSkipStackRegExp = compileSkipCallFramePattern(state()->getString(DartDebuggerAgentState::skipStackPattern));
         m_skipAllPauses = state()->getBoolean(DartDebuggerAgentState::skipAllPauses);
         if (m_skipAllPauses && state()->getBoolean(DartDebuggerAgentState::skipAllPausesExpiresOnReload)) {
             m_skipAllPauses = false;
             state()->setBoolean(DartDebuggerAgentState::skipAllPauses, false);
         }
     }
 }
 
-void DartInspectorDebuggerAgent::setFrontend(InspectorFrontend* frontend)
+InspectorFrontend::Debugger* DartInspectorDebuggerAgent::frontend()
 {
-    m_frontend = InspectorFrontend::Debugger::from(frontend);
+    return m_inspectorDebuggerAgent->frontend();
 }
 
+
 void DartInspectorDebuggerAgent::clearFrontend()
 {
-    m_frontend = 0;
-
     if (!enabled())
         return;
 
     disable();
 
     // FIXME: due to state()->mute() hack in InspectorController, debuggerEnabled is actually set to false only
     // in InspectorState, but not in cookie. That's why after navigation debuggerEnabled will be true,
     // but after front-end re-open it will still be false.
     state()->setBoolean(DartDebuggerAgentState::debuggerEnabled, false);
 }
@@ skipping 626 matching lines @@
     }
 
     const bool* isInternalScript = script.isInternalScript ? &script.isInternalScript : 0;
     bool hasSourceURL = !script.sourceURL.isEmpty();
     String scriptURL = hasSourceURL ? script.sourceURL : script.url;
 
     String sourceMapURL = sourceMapURLForScript(script, compileResult);
     String* sourceMapURLParam = sourceMapURL.isNull() ? 0 : &sourceMapURL;
 
     bool* hasSourceURLParam = hasSourceURL ? &hasSourceURL : 0;
+    ASSERT(frontend());
     if (!hasSyntaxError)
-        m_frontend->scriptParsed(scriptId, scriptURL, script.startLine, script.startColumn, script.endLine, script.endColumn, isContentScript, isInternalScript, sourceMapURLParam, hasSourceURLParam, languageParam, libraryIdParam);
+        frontend()->scriptParsed(scriptId, scriptURL, script.startLine, script.startColumn, script.endLine, script.endColumn, isContentScript, isInternalScript, sourceMapURLParam, hasSourceURLParam, languageParam, libraryIdParam);
     else
-        m_frontend->scriptFailedToParse(scriptId, scriptURL, script.startLine, script.startColumn, script.endLine, script.endColumn, isContentScript, isInternalScript, sourceMapURLParam, hasSourceURLParam, languageParam, libraryIdParam);
+        frontend()->scriptFailedToParse(scriptId, scriptURL, script.startLine, script.startColumn, script.endLine, script.endColumn, isContentScript, isInternalScript, sourceMapURLParam, hasSourceURLParam, languageParam, libraryIdParam);
 
     m_scripts.set(scriptId, script);
 
     if (scriptURL.isEmpty() || hasSyntaxError)
         return;
 
     RefPtr<JSONObject> breakpointsCookie = state()->getObject(DartDebuggerAgentState::dartBreakpoints);
     for (JSONObject::iterator it = breakpointsCookie->begin(); it != breakpointsCookie->end(); ++it) {
         RefPtr<JSONObject> breakpointObject = it->value->asObject();
         bool isAntibreakpoint;
         breakpointObject->getBoolean(DartDebuggerAgentState::isAnti, &isAntibreakpoint);
         if (isAntibreakpoint)
             continue;
         bool isRegex;
         breakpointObject->getBoolean(DartDebuggerAgentState::isRegex, &isRegex);
         String url;
         breakpointObject->getString(DartDebuggerAgentState::url, &url);
         if (!matches(scriptURL, url, isRegex))
             continue;
         ScriptBreakpoint breakpoint;
         breakpointObject->getNumber(DartDebuggerAgentState::lineNumber, &breakpoint.lineNumber);
         breakpointObject->getNumber(DartDebuggerAgentState::columnNumber, &breakpoint.columnNumber);
         breakpointObject->getString(DartDebuggerAgentState::condition, &breakpoint.condition);
         RefPtr<TypeBuilder::Debugger::Location> location = resolveBreakpoint(it->key, scriptId, breakpoint, UserBreakpointSource);
         if (location)
-            m_frontend->breakpointResolved(it->key, location);
+            frontend()->breakpointResolved(it->key, location);
     }
 }
 
 DartScriptDebugListener::SkipPauseRequest DartInspectorDebuggerAgent::didPause(DartScriptState* scriptState, Dart_StackTrace callFrames, Dart_Handle exception, const Vector<String>& hitBreakpoints)
 {
     DartScriptDebugListener::SkipPauseRequest result;
     if (!callFrames)
         result = DartScriptDebugListener::Continue; // Skip pauses inside V8 internal scripts and on syntax errors.
     else if (m_javaScriptPauseScheduled)
         result = DartScriptDebugListener::NoSkip; // Don't skip explicit pause requests from front-end.
@@ skipping 31 matching lines @@
         if (breakpointIterator != m_serverBreakpoints.end()) {
             const String& localId = breakpointIterator->value.first;
             hitBreakpointIds->addItem(localId);
 
             BreakpointSource source = breakpointIterator->value.second;
             if (m_breakReason == InspectorFrontend::Debugger::Reason::Other && source == DebugCommandBreakpointSource)
                 m_breakReason = InspectorFrontend::Debugger::Reason::DebugCommand;
         }
     }
 
-    m_frontend->paused(currentCallFrames(), m_breakReason, m_breakAuxData, hitBreakpointIds, nullptr);
+    frontend()->paused(currentCallFrames(), m_breakReason, m_breakAuxData, hitBreakpointIds, nullptr);
     m_javaScriptPauseScheduled = false;
     m_debuggerStepScheduled = false;
     m_steppingFromFramework = false;
     m_pausingOnNativeEvent = false;
     m_skippedStepInCount = 0;
 
     if (!m_continueToLocationBreakpointId.isEmpty()) {
         scriptDebugServer().removeBreakpoint(m_continueToLocationBreakpointId);
         m_continueToLocationBreakpointId = "";
     }
     if (m_listener)
         m_listener->didPause();
     return result;
 }
 
 void DartInspectorDebuggerAgent::didContinue()
 {
     m_pausedScriptState = nullptr;
     m_currentCallStack = 0;
     clearBreakDetails();
     // Already called by InspectorDebuggerAgent?
-    m_frontend->resumed();
+    frontend()->resumed();
 }
 
 bool DartInspectorDebuggerAgent::canBreakProgram()
 {
     return scriptDebugServer().canBreakProgram();
 }
 
 void DartInspectorDebuggerAgent::breakProgram(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data)
 {
     if (m_skipAllPauses)
@@ skipping 55 matching lines @@
     m_breakpointIdToDebugServerBreakpointIds.clear();
 }
 
 DartScriptDebugServer& DartInspectorDebuggerAgent::scriptDebugServer()
 {
     return DartScriptDebugServer::shared();
 }
 
 } // namespace blink