Merge WebKit at r63173 : @62542 added inspector stuff, but the non-inspector case doesn't seem to compile

Change-Id: I16ee514aa06762fe8c4df50d6739d394d03b6d1b

4 files changed, 17 insertions, 0 deletions

diff --git a/WebCore/bindings/v8/ScriptCallStack.cpp b/WebCore/bindings/v8/ScriptCallStack.cpp
index cdc9662..d62175a 100644
--- a/WebCore/bindings/v8/ScriptCallStack.cpp
+++ b/WebCore/bindings/v8/ScriptCallStack.cpp
@@ -96,6 +96,7 @@ const ScriptCallFrame& ScriptCallStack::at(unsigned index) const
 
 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();
@@ -119,6 +120,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 1f416a0..9bb6c7d 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -414,20 +414,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 c00c133..33c5f64 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 InspectorFrontend2;
     class MatchJob;
     class NameNodeMap;
     class Node;
     class Page;
 
+#if ENABLE(INSPECTOR)
+
     struct EventListenerInfo {
         EventListenerInfo(Node* node, const AtomicString& eventType, const EventListenerVector& eventListenerVector)
             : node(node)
@@ -207,6 +210,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 3d1199d..2effba7 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 {