Skip to content
Permalink
Browse files
2010-07-20 Leon Clarke <leonclarke@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:

Canonical link: https://commits.webkit.org/54591@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63753 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue committed Jul 20, 2010
1 parent 0149971 commit 6ce4e0368191c1cc3c61b06ed55feb7a231196e0
@@ -1,3 +1,23 @@
2010-07-20 Leon Clarke <leonclarke@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@chromium.org>

Reviewed by Adam Barth.
@@ -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
@@ -428,20 +428,26 @@ class InspectorController

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
@@ -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)
@@ -49,6 +49,8 @@
#include "InspectorApplicationCacheAgent.h"
#include "InspectorController.h"
#include "ProgressTracker.h"
#else
#include <wtf/UnusedParam.h>
#endif

namespace WebCore {

0 comments on commit 6ce4e03

Please sign in to comment.