[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[barraclough at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 31099db54b0f3b3645f29815e9510ead99e85643
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 4 04:25:42 2010 +0000

    Build fix following r64624.
    
    JavaScriptCore:
    
    * JavaScriptCore.xcodeproj/project.pbxproj:
    * wtf/PageAllocation.h:
    
    JavaScriptGlue:
    
    * ForwardingHeaders/wtf/BitMap.h: Added.
    
    WebCore:
    
    * ForwardingHeaders/wtf/BitMap.h: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64626 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8267676..9d62fcc 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-03  Gavin Barraclough  <barraclough at apple.com>
+
+        Build fix following r64624.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * wtf/PageAllocation.h:
+
 2010-08-03  Nathan Lawrence  <nlawrence at apple.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 24202a2..086d8e3 100644
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -510,7 +510,7 @@
 		C0A272630E50A06300E96E15 /* NotFound.h in Headers */ = {isa = PBXBuildFile; fileRef = C0A2723F0E509F1E00E96E15 /* NotFound.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DD2724681208D1FF00F9ABE7 /* AlignedMemoryAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = DD2724671208D1FF00F9ABE7 /* AlignedMemoryAllocator.h */; };
 		DD2724691208D1FF00F9ABE7 /* AlignedMemoryAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = DD2724671208D1FF00F9ABE7 /* AlignedMemoryAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		DD377CBC12072C18006A2517 /* Bitmap.h in Headers */ = {isa = PBXBuildFile; fileRef = DD377CBB12072C18006A2517 /* Bitmap.h */; };
+		DD377CBC12072C18006A2517 /* Bitmap.h in Headers */ = {isa = PBXBuildFile; fileRef = DD377CBB12072C18006A2517 /* Bitmap.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DDF7ABD411F60ED200108E36 /* GCActivityCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF7ABD211F60ED200108E36 /* GCActivityCallback.h */; };
 		DDF7ABD511F60ED200108E36 /* GCActivityCallbackCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDF7ABD311F60ED200108E36 /* GCActivityCallbackCF.cpp */; };
 		E124A8F70E555775003091F1 /* OpaqueJSString.h in Headers */ = {isa = PBXBuildFile; fileRef = E124A8F50E555775003091F1 /* OpaqueJSString.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1937,6 +1937,7 @@
 				868BFA0A117CEFD100B908B1 /* AtomicStringImpl.h in Headers */,
 				BC18C3EB0E16F5CD00B34460 /* AVLTree.h in Headers */,
 				147B83AC0E6DB8C9004775A4 /* BatchedTransitionOptimizer.h in Headers */,
+				DD377CBC12072C18006A2517 /* Bitmap.h in Headers */,
 				BC18C3EC0E16F5CD00B34460 /* BooleanObject.h in Headers */,
 				86676D5211FED9BC004B6863 /* BumpPointerAllocator.h in Headers */,
 				A7A1F7AD0F252B3C00E184E2 /* ByteArray.h in Headers */,
@@ -2207,7 +2208,6 @@
 				868BFA18117CF19900B908B1 /* WTFString.h in Headers */,
 				86D08D5411793613006E5ED0 /* WTFThreadData.h in Headers */,
 				9688CB160ED12B4E001D649F /* X86Assembler.h in Headers */,
-				DD377CBC12072C18006A2517 /* Bitmap.h in Headers */,
 				DDF7ABD411F60ED200108E36 /* GCActivityCallback.h in Headers */,
 				DD2724691208D1FF00F9ABE7 /* AlignedMemoryAllocator.h in Headers */,
 			);
@@ -2303,6 +2303,7 @@
 			isa = PBXProject;
 			buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "JavaScriptCore" */;
 			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
diff --git a/JavaScriptCore/wtf/PageAllocation.h b/JavaScriptCore/wtf/PageAllocation.h
index fab9051..76e96f9 100644
--- a/JavaScriptCore/wtf/PageAllocation.h
+++ b/JavaScriptCore/wtf/PageAllocation.h
@@ -26,6 +26,7 @@
 #ifndef PageAllocation_h
 #define PageAllocation_h
 
+#include <wtf/Assertions.h>
 #include <wtf/UnusedParam.h>
 #include <wtf/VMTags.h>
 
diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog
index 17aaffe..7e71c7f 100644
--- a/JavaScriptGlue/ChangeLog
+++ b/JavaScriptGlue/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-03  Gavin Barraclough  <barraclough at apple.com>
+
+        Build fix following r64624.
+
+        * ForwardingHeaders/wtf/BitMap.h: Added.
+
 2010-07-27  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/JavaScriptGlue/ForwardingHeaders/wtf/BitMap.h b/JavaScriptGlue/ForwardingHeaders/wtf/BitMap.h
new file mode 100644
index 0000000..0507840
--- /dev/null
+++ b/JavaScriptGlue/ForwardingHeaders/wtf/BitMap.h
@@ -0,0 +1 @@
+#include <JavaScriptCore/BitMap.h>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 07bd0b0..d738d6a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-03  Gavin Barraclough  <barraclough at apple.com>
+
+        Build fix following r64624.
+
+        * ForwardingHeaders/wtf/BitMap.h: Added.
+
 2010-08-03  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Ojan Vafai.
diff --git a/WebCore/ForwardingHeaders/wtf/BitMap.h b/WebCore/ForwardingHeaders/wtf/BitMap.h
new file mode 100644
index 0000000..bac64b9
--- /dev/null
+++ b/WebCore/ForwardingHeaders/wtf/BitMap.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_BitMap_h
+#define WebCore_FWD_BitMap_h
+#include <JavaScriptCore/BitMap.h>
+#endif

-- 
WebKit Debian packaging