[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 7c99ec859d3030c5d8532ea70935c933971066c7
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 17:35:30 2010 +0000

    2010-07-20  Leon Clarke  <leonclarke at google.com>
    
            Reviewed by Pavel Feldman.
    
            Make things compile again when the inspector is disabled, following
            recent inspector improvements.
            https://bugs.webkit.org/show_bug.cgi?id=42632
    
            No new tests. Fixing a build break.
    
            * bindings/v8/ScriptCallStack.cpp:
            (WebCore::ScriptCallStack::stackTrace):
            * inspector/InspectorController.h:
            (WebCore::InspectorController::didInsertDOMNode):
            (WebCore::InspectorController::didRemoveDOMNode):
            (WebCore::InspectorController::didModifyDOMAttr):
            * inspector/InspectorDOMAgent.h:
            * loader/appcache/ApplicationCacheGroup.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63753 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8571d09..c85d801 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-07-20  Leon Clarke  <leonclarke at google.com>
+
+        Reviewed by Pavel Feldman.
+
+        Make things compile again when the inspector is disabled, following
+        recent inspector improvements.
+        https://bugs.webkit.org/show_bug.cgi?id=42632
+
+        No new tests. Fixing a build break.
+
+
+        * bindings/v8/ScriptCallStack.cpp:
+        (WebCore::ScriptCallStack::stackTrace):
+        * inspector/InspectorController.h:
+        (WebCore::InspectorController::didInsertDOMNode):
+        (WebCore::InspectorController::didRemoveDOMNode):
+        (WebCore::InspectorController::didModifyDOMAttr):
+        * inspector/InspectorDOMAgent.h:
+        * loader/appcache/ApplicationCacheGroup.cpp:
+
 2010-07-20  Anton Muhin  <antonm at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/bindings/v8/ScriptCallStack.cpp b/WebCore/bindings/v8/ScriptCallStack.cpp
index 7bcab1c..48168ba 100644
--- a/WebCore/bindings/v8/ScriptCallStack.cpp
+++ b/WebCore/bindings/v8/ScriptCallStack.cpp
@@ -129,6 +129,7 @@ unsigned ScriptCallStack::size()
 
 bool ScriptCallStack::stackTrace(int frameLimit, const RefPtr<InspectorArray>& stackTrace)
 {
+#if ENABLE(INSPECTOR)
     if (!v8::Context::InContext())
         return false;
     v8::Handle<v8::Context> context = v8::Context::GetCurrent();
@@ -152,6 +153,9 @@ bool ScriptCallStack::stackTrace(int frameLimit, const RefPtr<InspectorArray>& s
         stackTrace->push(frameObject);
     }
     return true;
+#else
+    return false;
+#endif
 }
 
 } // namespace WebCore
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 7e35d16..76b88f1 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -428,20 +428,26 @@ private:
 
 inline void InspectorController::didInsertDOMNode(Node* node)
 {
+#if ENABLE(INSPECTOR)
     if (m_domAgent)
         m_domAgent->didInsertDOMNode(node);
+#endif
 }
 
 inline void InspectorController::didRemoveDOMNode(Node* node)
 {
+#if ENABLE(INSPECTOR)
     if (m_domAgent)
         m_domAgent->didRemoveDOMNode(node);
+#endif
 }
 
 inline void InspectorController::didModifyDOMAttr(Element* element)
 {
+#if ENABLE(INSPECTOR)
     if (m_domAgent)
         m_domAgent->didModifyDOMAttr(element);
+#endif
 }
 
 } // namespace WebCore
diff --git a/WebCore/inspector/InspectorDOMAgent.h b/WebCore/inspector/InspectorDOMAgent.h
index 6f9c5fb..5db837b 100644
--- a/WebCore/inspector/InspectorDOMAgent.h
+++ b/WebCore/inspector/InspectorDOMAgent.h
@@ -56,12 +56,15 @@ namespace WebCore {
     class CSSStyleSheet;
     class Element;
     class Event;
+    class InspectorDOMAgent;
     class RemoteInspectorFrontend;
     class MatchJob;
     class NameNodeMap;
     class Node;
     class Page;
 
+#if ENABLE(INSPECTOR)
+
     struct EventListenerInfo {
         EventListenerInfo(Node* node, const AtomicString& eventType, const EventListenerVector& eventListenerVector)
             : node(node)
@@ -208,6 +211,8 @@ namespace WebCore {
         Vector<long> m_inspectedNodes;
     };
 
+#endif
+
 } // namespace WebCore
 
 #endif // !defined(InspectorDOMAgent_h)
diff --git a/WebCore/loader/appcache/ApplicationCacheGroup.cpp b/WebCore/loader/appcache/ApplicationCacheGroup.cpp
index 693d9a7..9b05e0d 100644
--- a/WebCore/loader/appcache/ApplicationCacheGroup.cpp
+++ b/WebCore/loader/appcache/ApplicationCacheGroup.cpp
@@ -49,6 +49,8 @@
 #include "InspectorApplicationCacheAgent.h"
 #include "InspectorController.h"
 #include "ProgressTracker.h"
+#else
+#include <wtf/UnusedParam.h>
 #endif
 
 namespace WebCore {

-- 
WebKit Debian packaging