Merge 67623 - 2010-09-16 Yury Semikhatsky <yurys@chromium.org>...

WebCore/inspector/InspectorController.h

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 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
@@ skipping 118 matching lines @@
     void hideDOMNodeHighlight() { hideHighlight(); }
 
     void show();
     void showPanel(const String&);
     void close();
 
     // We are in transition from JS transport via webInspector to native
     // transport via InspectorClient. After migration, webInspector parameter should
     // be removed.
     void connectFrontend();
+    void reuseFrontend();
     void disconnectFrontend();
 
     void addMessageToConsole(MessageSource, MessageType, MessageLevel, ScriptCallStack*, const String& message);
     void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID);
     void clearConsoleMessages();
     const Vector<OwnPtr<ConsoleMessage> >& consoleMessages() const { return m_consoleMessages; }
 
     bool searchingForNodeInPage() const { return m_searchingForNode; }
     void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
     void handleMousePress();
@@ skipping 109 matching lines @@
     static const String& inspectorStartsAttachedSettingName();
 
 private:
     static const String& frontendSettingsSettingName();
 
     friend class InspectorBackend;
     friend class InspectorBackendDispatcher;
     friend class InjectedScriptHost;
 
     void populateScriptObjects();
+    void restoreDebugger();
+    void restoreProfiler();
     void unbindAllResources();
 
     // Following are used from InspectorBackend and internally.
     void setSearchingForNode(bool enabled);
     void enableSearchingForNode() { setSearchingForNode(true); }
     void disableSearchingForNode() { setSearchingForNode(false); }
 
     void setMonitoringXHR(bool enabled);
     void enableMonitoringXHR() { setMonitoringXHR(true); }
     void disableMonitoringXHR() { setMonitoringXHR(false); }
@@ skipping 160 matching lines @@
             if (inspectorController->hasFrontend())
                 return inspectorController;
         }
     }
     return 0;
 }
 
 } // namespace WebCore
 
 #endif // !defined(InspectorController_h)