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

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 8ba5eb058d579c630cd775a0414298af30c839e6
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 17 14:15:57 2010 +0000

    2010-12-17  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            The inspector does not compile without JAVASCRIPT_DEBUGGER
            https://bugs.webkit.org/show_bug.cgi?id=51246
    
            Fix the build, m_extraHeaders does not depend on JAVASCRIPT_DEBUGGER.
    
            * inspector/InspectorController.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74257 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a47552d..5b2bbbe 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-17  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        The inspector does not compile without JAVASCRIPT_DEBUGGER
+        https://bugs.webkit.org/show_bug.cgi?id=51246
+
+        Fix the build, m_extraHeaders does not depend on JAVASCRIPT_DEBUGGER.
+
+        * inspector/InspectorController.h:
+
 2010-12-17  Andrey Kosyakov  <caseq at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index aaaf53c..f55090c 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -398,8 +398,8 @@ private:
     bool m_stickyBreakpointsRestored;
 
     OwnPtr<InspectorProfilerAgent> m_profilerAgent;
-    OwnPtr<HTTPHeaderMap> m_extraHeaders;
 #endif
+    OwnPtr<HTTPHeaderMap> m_extraHeaders;
 #if ENABLE(WORKERS)
     typedef HashMap<intptr_t, RefPtr<InspectorWorkerResource> > WorkersMap;
 

-- 
WebKit Debian packaging