[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 2f7102ad7f61c6c10c73cc5f6896dc0962ede6a6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 18 22:25:39 2009 +0000

    2009-11-18  Nicolas Roard   <nicolas at roard.com>
    
            Reviewed by Dimitri Glazkov.
    
            InspectorTimelineAgent.h should be guarded by ENABLE(INSPECTOR)
            https://bugs.webkit.org/show_bug.cgi?id=31504
    
            * inspector/InspectorTimelineAgent.h:Added the guard.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51136 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5c874fc..9177f00 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-18  Nicolas Roard   <nicolas at roard.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        InspectorTimelineAgent.h should be guarded by ENABLE(INSPECTOR)
+        https://bugs.webkit.org/show_bug.cgi?id=31504
+
+        * inspector/InspectorTimelineAgent.h:Added the guard.
+
 2009-11-18  Jens Alfke  <snej at chromium.org>
 
         Build fix to my previous checkin, for Windows Chromium
diff --git a/WebCore/inspector/InspectorTimelineAgent.h b/WebCore/inspector/InspectorTimelineAgent.h
index c3f5139..1929286 100644
--- a/WebCore/inspector/InspectorTimelineAgent.h
+++ b/WebCore/inspector/InspectorTimelineAgent.h
@@ -31,6 +31,8 @@
 #ifndef InspectorTimelineAgent_h
 #define InspectorTimelineAgent_h
 
+#if ENABLE(INSPECTOR)
+
 #include "Document.h"
 #include "ScriptExecutionContext.h"
 #include "ScriptObject.h"
@@ -137,4 +139,5 @@ inline InspectorTimelineAgent* InspectorTimelineAgent::retrieve(ScriptExecutionC
 
 } // namespace WebCore
 
+#endif // !ENABLE(INSPECTOR)
 #endif // !defined(InspectorTimelineAgent_h)

-- 
WebKit Debian packaging