Merge DevTools Refactor CL to Blink36

Source/bindings/v8/PageScriptDebugServer.cpp

 /*
  * Copyright (c) 2011 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * 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.
  */
 
 #include "config.h"
 #include "bindings/v8/PageScriptDebugServer.h"
 
 #include "V8Window.h"
-#include "bindings/dart/DartDebugServer.h"
+#include "bindings/dart/DartScriptDebugServer.h"

[vsm, 2014/06/03 14:24:49]

I think you just deleted the only reference to this.  Do you need to include?

 #include "bindings/v8/DOMWrapperWorld.h"
 #include "bindings/v8/ScriptController.h"
 #include "bindings/v8/ScriptSourceCode.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8ScriptRunner.h"
 #include "bindings/v8/V8WindowShell.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
@@ skipping 99 matching lines @@
     if (!m_listenersMap.contains(page))
         return;
 
     if (m_pausedPage == page)
         continueProgram();
 
     m_listenersMap.remove(page);
 
     if (m_listenersMap.isEmpty()) {
         v8::Debug::SetDebugEventListener2(0);
-        // FIXMEDART: find a way to unfork this.
-        DartDebugServer::shared().disable();
     }
     // FIXME: Remove all breakpoints set by the agent.
 }
 
 void PageScriptDebugServer::interruptAndRun(PassOwnPtr<Task> task)
 {
     ScriptDebugServer::interruptAndRun(task, s_mainThreadIsolate);
 }
 
 void PageScriptDebugServer::setClientMessageLoop(PassOwnPtr<ClientMessageLoop> clientMessageLoop)
@@ skipping 147 matching lines @@
     UseCounter::muteForInspector();
 }
 
 void PageScriptDebugServer::unmuteWarningsAndDeprecations()
 {
     FrameConsole::unmute();
     UseCounter::unmuteForInspector();
 }
 
 } // namespace WebCore