Merge 139416

Source/WebCore/inspector/PageDebuggerAgent.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 41 matching lines @@
     : InspectorDebuggerAgent(instrumentingAgents, inspectorState, injectedScriptManager)
     , m_pageAgent(pageAgent)
     , m_overlay(overlay)
 {
 }
 
 PageDebuggerAgent::~PageDebuggerAgent()
 {
 }
 
-void PageDebuggerAgent::enable(ErrorString* errorString)
+void PageDebuggerAgent::enable()
 {
-    InspectorDebuggerAgent::enable(errorString);
+    InspectorDebuggerAgent::enable();
     m_instrumentingAgents->setPageDebuggerAgent(this);
 }
 
-void PageDebuggerAgent::disable(ErrorString* errorString)
+void PageDebuggerAgent::disable()
 {
-    InspectorDebuggerAgent::disable(errorString);
+    InspectorDebuggerAgent::disable();
     m_instrumentingAgents->setPageDebuggerAgent(0);
 }
 
 void PageDebuggerAgent::startListeningScriptDebugServer()
 {
     scriptDebugServer().addListener(this, m_pageAgent->page());
 }
 
 void PageDebuggerAgent::stopListeningScriptDebugServer()
 {
@@ skipping 34 matching lines @@
 
 void PageDebuggerAgent::didClearMainFrameWindowObject()
 {
     reset();
     scriptDebugServer().setScriptPreprocessor(m_pageAgent->scriptPreprocessor());
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)