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

[mitz at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 2e9689c0c4a5cc5b31a7ed97034903778341517f
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 8 17:31:32 2009 +0000

    Build fix
    
    * loader/loader.cpp:
    (WebCore::cachedResourceTypeToTargetType):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51861 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c489c2b..0126c1b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-08  Dan Bernstein  <mitz at apple.com>
+
+        Build fix
+
+        * loader/loader.cpp:
+        (WebCore::cachedResourceTypeToTargetType):
+
 2009-12-08  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Not reviewed. Touch svgtags.in to eventually fix the win debug build.
diff --git a/WebCore/loader/loader.cpp b/WebCore/loader/loader.cpp
index b33b9a0..c98a2f0 100644
--- a/WebCore/loader/loader.cpp
+++ b/WebCore/loader/loader.cpp
@@ -71,7 +71,7 @@ Loader::~Loader()
     ASSERT_NOT_REACHED();
 }
     
-ResourceRequest::TargetType cachedResourceTypeToTargetType(CachedResource::Type type)
+static ResourceRequest::TargetType cachedResourceTypeToTargetType(CachedResource::Type type)
 {
     switch (type) {
     case CachedResource::CSSStyleSheet:

-- 
WebKit Debian packaging