webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 3 insertions, 4 deletions

diff --git a/Source/JavaScriptCore/inspector/InjectedScriptManager.h b/Source/JavaScriptCore/inspector/InjectedScriptManager.h
index e18d7cd46..bcc64e2a4 100644
--- a/Source/JavaScriptCore/inspector/InjectedScriptManager.h
+++ b/Source/JavaScriptCore/inspector/InjectedScriptManager.h
@@ -11,7 +11,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
@@ -54,7 +54,6 @@ public:
     virtual ~InjectedScriptManager();
 
     virtual void disconnect();
-    virtual void discardInjectedScripts();
 
     InjectedScriptHost* injectedScriptHost();
     InspectorEnvironment& inspectorEnvironment() const { return m_environment; }
@@ -63,11 +62,11 @@ public:
     InjectedScript injectedScriptForId(int);
     int injectedScriptIdFor(JSC::ExecState*);
     InjectedScript injectedScriptForObjectId(const String& objectId);
+    void discardInjectedScripts();
     void releaseObjectGroup(const String& objectGroup);
-    void clearExceptionValue();
 
 protected:
-    virtual void didCreateInjectedScript(const InjectedScript&);
+    virtual void didCreateInjectedScript(InjectedScript);
 
     HashMap<int, InjectedScript> m_idToInjectedScript;
     HashMap<JSC::ExecState*, int> m_scriptStateToId;