[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

steveblock at google.com steveblock at google.com
Thu Feb 4 21:31:35 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 4f65c5541ddd8a7e65de9904dd75d4946cb28a79
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 29 00:31:22 2010 +0000

    Add missing includes for HashMap/HashSet
    https://bugs.webkit.org/show_bug.cgi?id=34276
    
    Reviewed by David Levin.
    
    No new tests, build fix only.
    
    * platform/KURL.cpp: Modified. Include HashMap.h
    * platform/network/CredentialStorage.cpp: Modified. Include HashMap.h and HashSet.h
    * platform/network/ProtectionSpaceHash.h: Modified. Include HashTraits.h
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54028 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4e78bc7..90b1d62 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-28  Steve Block  <steveblock at google.com>
+
+        Reviewed by David Levin.
+
+        Add missing includes for HashMap/HashSet
+        https://bugs.webkit.org/show_bug.cgi?id=34276
+
+        No new tests, build fix only.
+
+        * platform/KURL.cpp: Modified. Include HashMap.h
+        * platform/network/CredentialStorage.cpp: Modified. Include HashMap.h and HashSet.h
+        * platform/network/ProtectionSpaceHash.h: Modified. Include HashTraits.h
+
 2010-01-28  Sebastian Dröge  <sebastian.droege at collabora.co.uk>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebCore/platform/KURL.cpp b/WebCore/platform/KURL.cpp
index 54fbb6c..9783bd8 100644
--- a/WebCore/platform/KURL.cpp
+++ b/WebCore/platform/KURL.cpp
@@ -32,6 +32,7 @@
 #include "CString.h"
 #include "StringHash.h"
 #include "TextEncoding.h"
+#include <wtf/HashMap.h>
 #include <wtf/StdLibExtras.h>
 
 #if USE(ICU_UNICODE)
diff --git a/WebCore/platform/network/CredentialStorage.cpp b/WebCore/platform/network/CredentialStorage.cpp
index a401751..2c78e3c 100644
--- a/WebCore/platform/network/CredentialStorage.cpp
+++ b/WebCore/platform/network/CredentialStorage.cpp
@@ -31,7 +31,8 @@
 #include "KURL.h"
 #include "ProtectionSpaceHash.h"
 #include "StringHash.h"
-
+#include <wtf/HashMap.h>
+#include <wtf/HashSet.h>
 #include <wtf/StdLibExtras.h>
 
 namespace WebCore {
diff --git a/WebCore/platform/network/ProtectionSpaceHash.h b/WebCore/platform/network/ProtectionSpaceHash.h
index f8c84e8..08716b5 100644
--- a/WebCore/platform/network/ProtectionSpaceHash.h
+++ b/WebCore/platform/network/ProtectionSpaceHash.h
@@ -27,6 +27,7 @@
 #define ProtectionSpaceHash_h
 
 #include "ProtectionSpace.h"
+#include <wtf/HashTraits.h>
 
 namespace WebCore {
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list