[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the webkit-1.1 branch:
commit 0ced8243601142903c315e1ead280750ffcf7ab9
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 25 16:05:19 2010 +0000

    Add missing include guards
    
    Reviewed by Tor Arne Vestbø.
    
    * loader/CrossOriginPreflightResultCache.h:
    * loader/MainResourceLoader.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55237 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3eee8a8..08ae7eb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-23  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Add missing include guards
+
+        * loader/CrossOriginPreflightResultCache.h:
+        * loader/MainResourceLoader.h:
+
 2010-02-25  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebCore/loader/CrossOriginPreflightResultCache.h b/WebCore/loader/CrossOriginPreflightResultCache.h
index faf55e5..f8a7c55 100644
--- a/WebCore/loader/CrossOriginPreflightResultCache.h
+++ b/WebCore/loader/CrossOriginPreflightResultCache.h
@@ -24,6 +24,9 @@
  *
  */
 
+#ifndef CrossOriginPreflightResultCacheItem_h
+#define CrossOriginPreflightResultCacheItem_h
+
 #include "KURLHash.h"
 #include "StringHash.h"
 #include <wtf/HashMap.h>
@@ -77,3 +80,5 @@ namespace WebCore {
     };
 
 } // namespace WebCore
+
+#endif
diff --git a/WebCore/loader/MainResourceLoader.h b/WebCore/loader/MainResourceLoader.h
index eaaf2e8..5ed0cc8 100644
--- a/WebCore/loader/MainResourceLoader.h
+++ b/WebCore/loader/MainResourceLoader.h
@@ -26,6 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef MainResourceLoader_h
+#define MainResourceLoader_h
+
 #include "FrameLoaderTypes.h"
 #include "ResourceLoader.h"
 #include "SubstituteData.h"
@@ -107,3 +110,5 @@ namespace WebCore {
     };
 
 }
+
+#endif

-- 
WebKit Debian packaging