[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[jparent at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit d9ada2f9ecd80f92e0acea6bee04179226919621
Author: jparent at chromium.org <jparent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 16 22:30:38 2010 +0000

    Unreviewed: Chromium build fix.
    
    https://bugs.webkit.org/show_bug.cgi?id=34998
    
    Move include of JavaScriptProfile.h behind if (USE_JSC).
    
    * inspector/InspectorController.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54831 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7fca995..b91d2de 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-16  Julie Parent  <jparent at chromium.org>
+
+        Unreviewed: Chromium build fix.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34998
+
+        Move include of JavaScriptProfile.h behind if (USE_JSC).
+
+        * inspector/InspectorController.cpp:
+
 2010-02-16  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Geoffrey Garen and Kevin Decker.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 6df204f..73433bc 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -64,7 +64,6 @@
 #include "InspectorFrontendHost.h"
 #include "InspectorResource.h"
 #include "InspectorTimelineAgent.h"
-#include "JavaScriptProfile.h"
 #include "Page.h"
 #include "ProgressTracker.h"
 #include "Range.h"
@@ -101,6 +100,7 @@
 #include "JSJavaScriptCallFrame.h"
 #include "JavaScriptCallFrame.h"
 #include "JavaScriptDebugServer.h"
+#include "JavaScriptProfile.h"
 
 #include <runtime/JSLock.h>
 #include <runtime/UString.h>

-- 
WebKit Debian packaging