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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 291882e55216a9f9049dca8f0a0d0e277a9118c5
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 14 07:56:52 2010 +0000

    2010-11-13  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Yury Semikhatsky.
    
            Buildfix for !ENABLE(INSPECTOR)
            https://bugs.webkit.org/show_bug.cgi?id=49500
    
            Also unify the position of the condition in the cpp files.
    
            * inspector/ConsoleMessage.cpp:
            * inspector/InspectorResourceAgent.cpp:
            * inspector/InspectorState.cpp:
            * inspector/ScriptCallFrame.cpp:
            * inspector/ScriptCallStack.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71981 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 173b4cc..52edc33 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-13  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Buildfix for !ENABLE(INSPECTOR)
+        https://bugs.webkit.org/show_bug.cgi?id=49500
+
+        Also unify the position of the condition in the cpp files.
+
+        * inspector/ConsoleMessage.cpp:
+        * inspector/InspectorResourceAgent.cpp:
+        * inspector/InspectorState.cpp:
+        * inspector/ScriptCallFrame.cpp:
+        * inspector/ScriptCallStack.cpp:
+
 2010-11-13  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebCore/inspector/ConsoleMessage.cpp b/WebCore/inspector/ConsoleMessage.cpp
index 03283bf..a5e9ec6 100644
--- a/WebCore/inspector/ConsoleMessage.cpp
+++ b/WebCore/inspector/ConsoleMessage.cpp
@@ -31,6 +31,8 @@
 #include "config.h"
 #include "ConsoleMessage.h"
 
+#if ENABLE(INSPECTOR)
+
 #include "InjectedScript.h"
 #include "InjectedScriptHost.h"
 #include "InspectorFrontend.h"
@@ -134,3 +136,5 @@ bool ConsoleMessage::isEqual(ConsoleMessage* msg) const
 }
 
 } // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
diff --git a/WebCore/inspector/InspectorResourceAgent.cpp b/WebCore/inspector/InspectorResourceAgent.cpp
index 0ed6cba..fcdebbc 100644
--- a/WebCore/inspector/InspectorResourceAgent.cpp
+++ b/WebCore/inspector/InspectorResourceAgent.cpp
@@ -31,6 +31,8 @@
 #include "config.h"
 #include "InspectorResourceAgent.h"
 
+#if ENABLE(INSPECTOR)
+
 #include "Base64.h"
 #include "MemoryCache.h"
 #include "CachedResource.h"
@@ -60,8 +62,6 @@
 #include <wtf/RefPtr.h>
 #include <wtf/text/StringBuffer.h>
 
-#if ENABLE(INSPECTOR)
-
 namespace WebCore {
 
 bool InspectorResourceAgent::resourceContent(Frame* frame, const KURL& url, String* result)
diff --git a/WebCore/inspector/InspectorState.cpp b/WebCore/inspector/InspectorState.cpp
index df939ba..ab900e7 100644
--- a/WebCore/inspector/InspectorState.cpp
+++ b/WebCore/inspector/InspectorState.cpp
@@ -29,11 +29,11 @@
 #include "config.h"
 #include "InspectorState.h"
 
+#if ENABLE(INSPECTOR)
+
 #include "InspectorClient.h"
 #include "InspectorController.h"
 
-#if ENABLE(INSPECTOR)
-
 namespace WebCore {
 
 InspectorState::InspectorState(InspectorClient* client)
diff --git a/WebCore/inspector/ScriptCallFrame.cpp b/WebCore/inspector/ScriptCallFrame.cpp
index 5455d25..c4dab3c 100644
--- a/WebCore/inspector/ScriptCallFrame.cpp
+++ b/WebCore/inspector/ScriptCallFrame.cpp
@@ -54,6 +54,7 @@ bool ScriptCallFrame::isEqual(const ScriptCallFrame& o) const
         && m_lineNumber == o.m_lineNumber;
 }
 
+#if ENABLE(INSPECTOR)
 PassRefPtr<InspectorObject> ScriptCallFrame::buildInspectorObject() const
 {
     RefPtr<InspectorObject> frame = InspectorObject::create();
@@ -62,5 +63,6 @@ PassRefPtr<InspectorObject> ScriptCallFrame::buildInspectorObject() const
     frame->setNumber("lineNumber", m_lineNumber);
     return frame;
 }
+#endif
 
 } // namespace WebCore
diff --git a/WebCore/inspector/ScriptCallStack.cpp b/WebCore/inspector/ScriptCallStack.cpp
index 8d010bb..31ec1c1 100644
--- a/WebCore/inspector/ScriptCallStack.cpp
+++ b/WebCore/inspector/ScriptCallStack.cpp
@@ -72,6 +72,7 @@ bool ScriptCallStack::isEqual(ScriptCallStack* o) const
     return true;
 }
 
+#if ENABLE(INSPECTOR)
 PassRefPtr<InspectorArray> ScriptCallStack::buildInspectorObject() const
 {
     RefPtr<InspectorArray> frames = InspectorArray::create();
@@ -79,5 +80,6 @@ PassRefPtr<InspectorArray> ScriptCallStack::buildInspectorObject() const
         frames->pushObject(m_frames.at(i).buildInspectorObject());
     return frames;
 }
+#endif
 
 } // namespace WebCore

-- 
WebKit Debian packaging