[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 00355ae711bbdb7fc4f6fa093945bce4b9e57b45
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 20 12:57:32 2011 +0000

    2011-01-20  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed: build fix.
    
            * inspector/InspectorState.h:
            (WebCore::InspectorState::setBoolean):
            (WebCore::InspectorState::setString):
            (WebCore::InspectorState::setLong):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76231 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/inspector/Inspector.idl b/Source/WebCore/inspector/Inspector.idl
index fbca9eb..86ed5c4 100644
--- a/Source/WebCore/inspector/Inspector.idl
+++ b/Source/WebCore/inspector/Inspector.idl
@@ -38,7 +38,6 @@ module core {
 
         [domain=Inspector] void addScriptToEvaluateOnLoad(in String scriptSource);
         [domain=Inspector] void removeAllScriptsToEvaluateOnLoad();
-        [domain=Inspector] void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
         [domain=Inspector] void reloadPage();
         [domain=Inspector] void populateScriptObjects();
 
@@ -76,6 +75,7 @@ module core {
         [domain=Runtime] void getCompletions(in String expression, in boolean includeInspectorCommandLineAPI, out Value result);
         [domain=Runtime] void getProperties(in Object objectId, in boolean ignoreHasOwnProperty, in boolean abbreviate, out Value result);
         [domain=Runtime] void setPropertyValue(in Object objectId, in String propertyName, in String expression, out Value result);
+        [domain=Runtime] void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
 
         ///////////////////////////////////////////////////////////////////////
         // Injected Script
@@ -268,7 +268,7 @@ module core {
         [domain=Debugger] void pause();
         [notify, domain=Debugger] void pausedScript(out Object details);
         [domain=Debugger] void resume();
-        [notify, domain=Debugger] void resumedScript(); // FIXME: Make this out parameter fo resume if possible.
+        [notify, domain=Debugger] void resumedScript(); // FIXME: Make this out parameter of resume if possible.
 
         [domain=Debugger] void editScriptSource(in String sourceID, in String newContent, out boolean success, out String result, out Value newCallFrames);
         [domain=Debugger] void getScriptSource(in String sourceID, out String scriptSource);
@@ -289,7 +289,7 @@ module core {
         // Profiler API
         ///////////////////////////////////////////////////////////////////////
 
-        [domain=Inspector] void enableProfiler(in boolean always); // FIXME: preferrable with Inspector domain, dispatched on backend.
+        [domain=Inspector] void enableProfiler(in boolean always);
         [domain=Inspector] void disableProfiler(in boolean always);
         [notify, domain=Profiler] void profilerWasEnabled();
         [notify, domain=Profiler] void profilerWasDisabled();
diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
index 9f09469..776bdd8 100644
--- a/Source/WebCore/inspector/InspectorController.cpp
+++ b/Source/WebCore/inspector/InspectorController.cpp
@@ -1149,11 +1149,6 @@ void InspectorController::restoreStickyBreakpoint(PassRefPtr<InspectorObject> br
 }
 #endif
 
-void InspectorController::releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup)
-{
-    injectedScriptHost()->releaseWrapperObjectGroup(injectedScriptId, objectGroup);
-}
-
 void InspectorController::evaluateForTestInFrontend(long callId, const String& script)
 {
     if (m_frontend)
diff --git a/Source/WebCore/inspector/InspectorController.h b/Source/WebCore/inspector/InspectorController.h
index cf31e63..adee1be 100644
--- a/Source/WebCore/inspector/InspectorController.h
+++ b/Source/WebCore/inspector/InspectorController.h
@@ -245,8 +245,6 @@ public:
 #endif
 
     // Generic code called from custom implementations.
-    void releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup);
-
     void evaluateForTestInFrontend(long testCallId, const String& script);
 
     void addScriptToEvaluateOnLoad(const String& source);
diff --git a/Source/WebCore/inspector/InspectorRuntimeAgent.cpp b/Source/WebCore/inspector/InspectorRuntimeAgent.cpp
index 61eb659..0502437 100644
--- a/Source/WebCore/inspector/InspectorRuntimeAgent.cpp
+++ b/Source/WebCore/inspector/InspectorRuntimeAgent.cpp
@@ -73,6 +73,11 @@ void InspectorRuntimeAgent::setPropertyValue(PassRefPtr<InspectorObject> objectI
         injectedScript.setPropertyValue(objectId, propertyName, expression, result);
 }
 
+void InspectorRuntimeAgent::releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup)
+{
+    m_injectedScriptHost->releaseWrapperObjectGroup(injectedScriptId, objectGroup);
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)
diff --git a/Source/WebCore/inspector/InspectorRuntimeAgent.h b/Source/WebCore/inspector/InspectorRuntimeAgent.h
index a13eb59..3f1be42 100644
--- a/Source/WebCore/inspector/InspectorRuntimeAgent.h
+++ b/Source/WebCore/inspector/InspectorRuntimeAgent.h
@@ -60,6 +60,7 @@ public:
     void getCompletions(const String& expression, bool includeInspectorCommandLineAPI, RefPtr<InspectorValue>* result);
     void getProperties(PassRefPtr<InspectorObject> objectId, bool ignoreHasOwnProperty, bool abbreviate, RefPtr<InspectorValue>* result);
     void setPropertyValue(PassRefPtr<InspectorObject> objectId, const String& propertyName, const String& expression, RefPtr<InspectorValue>* result);
+    void releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup);
 
 private:
     InspectorRuntimeAgent(InjectedScriptHost*);

-- 
WebKit Debian packaging