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

[darin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 38a58b29013fc276500bbceaaf97be619374dec2
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 07:54:16 2010 +0000

    2010-01-04  Darin Fisher  <darin at chromium.org>
    
            Fix Chromium build bustage.
    
            * src/WebAnimationControllerImpl.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52787 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 9ceb0a2..9e27a4e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-04  Darin Fisher  <darin at chromium.org>
+
+        Fix Chromium build bustage.
+
+        * src/WebAnimationControllerImpl.h:
+
 2010-01-04  Yaar Schnitman  <yaar at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/WebAnimationControllerImpl.h b/WebKit/chromium/src/WebAnimationControllerImpl.h
index 66dfe98..8b0676e 100644
--- a/WebKit/chromium/src/WebAnimationControllerImpl.h
+++ b/WebKit/chromium/src/WebAnimationControllerImpl.h
@@ -31,7 +31,9 @@
 #ifndef WebAnimationControllerImpl_h
 #define WebAnimationControllerImpl_h
 
-#include "WebAnimationController.h"
+// FIXME: This relative path is a temporary hack to support using this
+// header from webkit/glue.
+#include "../public/WebAnimationController.h"
 
 namespace WebCore {
 class AnimationController;

-- 
WebKit Debian packaging