[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

cblu cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:46:11 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 035864816a400d97a8730188fbc9d24b3efaf641
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 3 22:04:20 2003 +0000

    	Fixed: <rdar://problem/3291566>: Aborting standalone image load makes image directory page unusable
    
            Reviewed by john.
    
            * WebKit.pbproj/project.pbxproj: Xcode-ified WebKit.pbproj
            * WebView.subproj/WebImageView.h:
            * WebView.subproj/WebImageView.m:
            (-[WebImageView drawRect:]): layout if we need to, fill with white if we don't have an image yet
            (-[WebImageView setNeedsLayout:]): set the bit
            (-[WebImageView layout]): if we don't have an image, the frame size is the visible area so we draw white over the previous web page
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4588 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index aea7807..67becdf 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-07-03  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3291566>: Aborting standalone image load makes image directory page unusable
+
+        Reviewed by john.
+
+        * WebKit.pbproj/project.pbxproj: Xcode-ified WebKit.pbproj
+        * WebView.subproj/WebImageView.h:
+        * WebView.subproj/WebImageView.m:
+        (-[WebImageView drawRect:]): layout if we need to, fill with white if we don't have an image yet
+        (-[WebImageView setNeedsLayout:]): set the bit
+        (-[WebImageView layout]): if we don't have an image, the frame size is the visible area so we draw white over the previous web page
+
 2003-07-02  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Ken.
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 0960bcb..10dabff 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 38;
+	objectVersion = 39;
 	objects = {
 		014CEA440018CDF011CA2923 = {
 			buildRules = (
@@ -11,9 +11,14 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
 				DEBUG_CFLAGS = "";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
+				ZERO_LINK = YES;
 			};
 			isa = PBXBuildStyle;
 			name = Development;
@@ -24,8 +29,10 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
 				DEBUGGING_SYMBOLS = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
+				ZERO_LINK = NO;
 			};
 			isa = PBXBuildStyle;
 			name = Deployment;
@@ -47,11 +54,15 @@
 			isa = PBXGroup;
 			name = Products;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		034768E0FF38A50411DB9C8B = {
+			expectedFileType = wrapper.framework;
+			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
 			path = WebKit.framework;
 			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 //030
 //031
@@ -106,6 +117,7 @@
 			isa = PBXGroup;
 			name = WebKit;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		0867D69AFE84028FC02AAC07 = {
 			children = (
@@ -119,6 +131,7 @@
 			isa = PBXGroup;
 			name = "Frameworks and Libraries";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		0867D69CFE84028FC02AAC07 = {
 			buildPhases = (
@@ -449,6 +462,7 @@
 			name = Resources;
 			path = "";
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		089C1666FE841158C02AAC07 = {
 			children = (
@@ -457,13 +471,16 @@
 			isa = PBXVariantGroup;
 			name = InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		089C1667FE841158C02AAC07 = {
+			expectedFileType = text.plist.strings;
 			fileEncoding = 10;
 			isa = PBXFileReference;
 			name = English;
 			path = English.lproj/InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		089C1668FE841158C02AAC07 = {
 			fileRef = 089C1666FE841158C02AAC07;
@@ -531,6 +548,7 @@
 			name = Misc;
 			path = Misc.subproj;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		255AF6590250FC030ECA149E = {
 			buildActionMask = 2147483647;
@@ -546,10 +564,12 @@
 			shellScript = "if [ -f ../Tools/Scripts/embed-into-alex ]; then sh ../Tools/Scripts/embed-into-alex; fi";
 		};
 		2568C72C0174912D0ECA149E = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebKit.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		2568C72D0174912D0ECA149E = {
 			fileRef = 2568C72C0174912D0ECA149E;
@@ -578,6 +598,7 @@
 			name = History;
 			path = History.subproj;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //250
 //251
@@ -590,10 +611,12 @@
 //2D3
 //2D4
 		2D36FD5E03F78F9E00A80166 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebFormDelegatePrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		2D36FD5F03F78F9E00A80166 = {
 			fileRef = 2D36FD5E03F78F9E00A80166;
@@ -602,16 +625,20 @@
 			};
 		};
 		2D81DAB203EB0B2D00A80166 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebFormDelegate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		2D81DAB303EB0B2D00A80166 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebFormDelegate.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		2D81DAB403EB0B2D00A80166 = {
 			fileRef = 2D81DAB203EB0B2D00A80166;
@@ -639,64 +666,84 @@
 //353
 //354
 		35081D9202B6D4D80ACA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebHTMLRepresentation.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081D9302B6D4D80ACA2ACA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebHTMLRepresentation.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081D9402B6D4D80ACA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebHTMLView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081D9502B6D4D80ACA2ACA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebHTMLView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081D9602B6D4D80ACA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebHTMLViewPrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081D9702B6D4D80ACA2ACA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebHTMLViewPrivate.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081D9802B6D4D80ACA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebImageRepresentation.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081D9902B6D4D80ACA2ACA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebImageRepresentation.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081D9A02B6D4D80ACA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebImageView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081D9B02B6D4D80ACA2ACA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebImageView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081D9C02B6D4D80ACA2ACA = {
 			fileRef = 35081D9202B6D4D80ACA2ACA;
@@ -768,28 +815,36 @@
 			};
 		};
 		35081DA602B6D4E40ACA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebTextRepresentation.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081DA702B6D4E40ACA2ACA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebTextRepresentation.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081DA802B6D4E40ACA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebTextView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081DA902B6D4E40ACA2ACA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebTextView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081DAA02B6D4E40ACA2ACA = {
 			fileRef = 35081DA602B6D4E40ACA2ACA;
@@ -818,10 +873,12 @@
 			};
 		};
 		35081DAE02B6D4F50ACA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebDocument.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35081DAF02B6D4F50ACA2ACA = {
 			fileRef = 35081DAE02B6D4F50ACA2ACA;
@@ -840,13 +897,16 @@
 			name = Localizable.strings;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35F3577F0198AAB80ACA1520 = {
+			expectedFileType = text.plist.strings;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = English;
 			path = English.lproj/Localizable.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		35F357800198AAB80ACA1520 = {
 			fileRef = 35F3577E0198AAB80ACA1520;
@@ -865,88 +925,116 @@
 //393
 //394
 		3944606B020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebDynamicScrollBarsView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		3944606C020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebDynamicScrollBarsView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		3944606E020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebPreferences.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		39446070020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebDataSource.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		39446071020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebDataSource.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		39446072020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebDataSourcePrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		39446073020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebDataSourcePrivate.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		39446074020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebFrame.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		3944607A020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebException.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		3944607B020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebException.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		3944607D020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebBackForwardList.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		3944607E020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebBackForwardList.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		3944607F020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebHistoryItem.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		39446080020F50ED0ECA1767 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebHistoryItem.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		3944608B020F50ED0ECA1767 = {
 			fileRef = 3944606B020F50ED0ECA1767;
@@ -1061,10 +1149,12 @@
 //513
 //514
 		5128F1F904719A4200CA2D3A = {
+			expectedFileType = image.tiff;
 			isa = PBXFileReference;
 			name = missing_image.tiff;
 			path = Resources/missing_image.tiff;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		5128F1FA04719A4200CA2D3A = {
 			fileRef = 5128F1F904719A4200CA2D3A;
@@ -1073,29 +1163,37 @@
 			};
 		};
 		513D422E034CF55A00CA2ACD = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = WebResourceLoadDelegate.h;
 			path = WebView.subproj/WebResourceLoadDelegate.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		51443F9A0429392B00CA2D3A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebPolicyDelegate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		51443F9B0429392B00CA2D3A = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebPolicyDelegate.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		51443F9C0429392B00CA2D3A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebPolicyDelegatePrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		51443F9D0429392B00CA2D3A = {
 			fileRef = 51443F9A0429392B00CA2D3A;
@@ -1122,32 +1220,40 @@
 			};
 		};
 		5152FADD033FC50400CA2ACD = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDefaultContextMenuDelegate.h;
 			path = WebView.subproj/WebDefaultContextMenuDelegate.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		5152FADE033FC50400CA2ACD = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDefaultContextMenuDelegate.m;
 			path = WebView.subproj/WebDefaultContextMenuDelegate.m;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		5152FADF033FC50400CA2ACD = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDefaultPolicyDelegate.h;
 			path = WebView.subproj/WebDefaultPolicyDelegate.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		5152FAE0033FC50400CA2ACD = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDefaultPolicyDelegate.m;
 			path = WebView.subproj/WebDefaultPolicyDelegate.m;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		5152FAE1033FC50400CA2ACD = {
 			fileRef = 5152FADD033FC50400CA2ACD;
@@ -1179,11 +1285,13 @@
 			};
 		};
 		5152FAE5033FC52200CA2ACD = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebFrameLoadDelegate.h;
 			path = WebView.subproj/WebFrameLoadDelegate.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		5152FAE7033FC52200CA2ACD = {
 			fileRef = 5152FAE5033FC52200CA2ACD;
@@ -1195,10 +1303,12 @@
 			};
 		};
 		515E27CC0458C86500CA2D3A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebUIDelegate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		515E27CD0458C86500CA2D3A = {
 			fileRef = 515E27CC0458C86500CA2D3A;
@@ -1210,16 +1320,20 @@
 			};
 		};
 		515E27CF0458CA4B00CA2D3A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebDefaultUIDelegate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		515E27D00458CA4B00CA2D3A = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebDefaultUIDelegate.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		515E27D10458CA4B00CA2D3A = {
 			fileRef = 515E27CF0458CA4B00CA2D3A;
@@ -1234,10 +1348,12 @@
 			};
 		};
 		516F296F03A6C45A00CA2D3A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebHistoryItemPrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		516F297003A6C45A00CA2D3A = {
 			fileRef = 516F296F03A6C45A00CA2D3A;
@@ -1249,22 +1365,28 @@
 			};
 		};
 		517FA6A903709FCE00CA2D3A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebUnicode.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		517FA6AA03709FCE00CA2D3A = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebUnicode.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		517FA6AB03709FCE00CA2D3A = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebUnicodeTables.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		517FA6AC03709FCE00CA2D3A = {
 			fileRef = 517FA6A903709FCE00CA2D3A;
@@ -1285,16 +1407,20 @@
 			};
 		};
 		51A8B52E04282B5900CA2D3A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebFrameView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		51A8B52F04282B5900CA2D3A = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebFrameView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		51A8B53004282B5900CA2D3A = {
 			fileRef = 51A8B52E04282B5900CA2D3A;
@@ -1312,16 +1438,20 @@
 			};
 		};
 		51A8B53204282BD200CA2D3A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebFrameViewPrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		51A8B53304282BD200CA2D3A = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebFrameViewPrivate.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		51A8B53404282BD200CA2D3A = {
 			fileRef = 51A8B53204282BD200CA2D3A;
@@ -1336,16 +1466,20 @@
 			};
 		};
 		51A8B579042834F700CA2D3A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		51A8B57A042834F700CA2D3A = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		51A8B57B042834F700CA2D3A = {
 			fileRef = 51A8B579042834F700CA2D3A;
@@ -1363,16 +1497,20 @@
 			};
 		};
 		51A8B57D0428353A00CA2D3A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebViewPrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		51A8B57E0428353A00CA2D3A = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebViewPrivate.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		51A8B57F0428353A00CA2D3A = {
 			fileRef = 51A8B57D0428353A00CA2D3A;
@@ -1390,18 +1528,22 @@
 			};
 		};
 		51F6866C0366057300CA2D3A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = WebBaseResourceHandleDelegate.h;
 			path = WebView.subproj/WebBaseResourceHandleDelegate.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		51F6866D0366057300CA2D3A = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = WebBaseResourceHandleDelegate.m;
 			path = WebView.subproj/WebBaseResourceHandleDelegate.m;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		51F6866F0366057300CA2D3A = {
 			fileRef = 51F6866D0366057300CA2D3A;
@@ -1420,16 +1562,20 @@
 //653
 //654
 		6523FACF032DA06B005EFCFF = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebControllerSets.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6523FAD0032DA06B005EFCFF = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebControllerSets.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6523FAD1032DA06B005EFCFF = {
 			fileRef = 6523FACF032DA06B005EFCFF;
@@ -1521,16 +1667,20 @@
 			};
 		};
 		6578F5DE045F817400000128 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebDownload.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6578F5DF045F817400000128 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebDownload.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		6578F5E0045F817400000128 = {
 			fileRef = 6578F5DE045F817400000128;
@@ -1624,16 +1774,20 @@
 //703
 //704
 		700BC50B04144DA100A80182 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebDefaultResourceLoadDelegate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		700BC50C04144DA100A80182 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebDefaultResourceLoadDelegate.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		700BC50D04144DA100A80182 = {
 			fileRef = 700BC50B04144DA100A80182;
@@ -1648,16 +1802,20 @@
 			};
 		};
 		7082F56F038EADAA00A80180 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebKitNSStringExtras.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		7082F570038EADAA00A80180 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebKitNSStringExtras.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		7082F571038EADAA00A80180 = {
 			fileRef = 7082F56F038EADAA00A80180;
@@ -1675,10 +1833,12 @@
 			};
 		};
 		70BC9ED604144F3200A80182 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebDefaultFrameLoadDelegate.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		70BC9ED704144F3200A80182 = {
 			fileRef = 70BC9ED604144F3200A80182;
@@ -1687,10 +1847,12 @@
 			};
 		};
 		70BC9ED804144FC500A80182 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebDefaultFrameLoadDelegate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		70BC9ED904144FC500A80182 = {
 			fileRef = 70BC9ED804144FC500A80182;
@@ -1699,18 +1861,22 @@
 			};
 		};
 		70ECD6CC043B727400A80181 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = WebDataProtocol.h;
 			path = WebView.subproj/WebDataProtocol.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		70ECD6CD043B727400A80181 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			name = WebDataProtocol.m;
 			path = WebView.subproj/WebDataProtocol.m;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		70ECD6CE043B727400A80181 = {
 			fileRef = 70ECD6CC043B727400A80181;
@@ -1735,16 +1901,20 @@
 //833
 //834
 		83402EF6035A588900BE770A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNetscapePluginRepresentation.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		83402EF7035A588900BE770A = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNetscapePluginRepresentation.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		83402EF9035A588900BE770A = {
 			fileRef = 83402EF7035A588900BE770A;
@@ -1753,16 +1923,20 @@
 			};
 		};
 		83402EFA035A58D100BE770A = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNetscapePluginStream.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		83402EFB035A58D100BE770A = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNetscapePluginStream.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		83402EFD035A58D100BE770A = {
 			fileRef = 83402EFB035A58D100BE770A;
@@ -1771,22 +1945,28 @@
 			};
 		};
 		83730F9803FB1E660004736E = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebKitErrors.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		8398847A03426FB000BC5F5E = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNSImageExtras.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		8398847B03426FB000BC5F5E = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNSImageExtras.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		8398847D03426FB000BC5F5E = {
 			fileRef = 8398847B03426FB000BC5F5E;
@@ -1795,16 +1975,20 @@
 			};
 		};
 		83E4AF46036652150000E506 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebBasePluginPackage.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		83E4AF47036652150000E506 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebBasePluginPackage.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		83E4AF49036652150000E506 = {
 			fileRef = 83E4AF47036652150000E506;
@@ -1813,16 +1997,20 @@
 			};
 		};
 		83E4AF4B036659440000E506 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebPluginPackage.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		83E4AF4C036659440000E506 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebPluginPackage.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		83E4AF4E036659440000E506 = {
 			fileRef = 83E4AF4C036659440000E506;
@@ -1841,16 +2029,20 @@
 //843
 //844
 		8467275C0367158500CA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebPluginController.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		8467275D0367158500CA2ACA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebPluginController.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		8467275E0367158500CA2ACA = {
 			fileRef = 8467275C0367158500CA2ACA;
@@ -1890,6 +2082,7 @@
 			isa = PBXGroup;
 			name = "Netscape Plug-ins";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		848DFF430365F71500CA2ACA = {
 			children = (
@@ -1904,30 +2097,39 @@
 			isa = PBXGroup;
 			name = "WebKit Plug-ins";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		848DFF840365FE6A00CA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebPlugin.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		848DFF850365FE6A00CA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebPluginContainer.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		848DFF860365FE6A00CA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebPluginViewFactory.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		84CA5F7E042685E800CA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebKitErrorsPrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		84CA5F7F042685E800CA2ACA = {
 			fileRef = 84CA5F7E042685E800CA2ACA;
@@ -1939,16 +2141,20 @@
 			};
 		};
 		84D4BFF70348EF7600CA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNetscapePluginEmbeddedView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		84D4BFF80348EF7600CA2ACA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNetscapePluginEmbeddedView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		84D4BFFA0348EF7600CA2ACA = {
 			fileRef = 84D4BFF80348EF7600CA2ACA;
@@ -1957,16 +2163,20 @@
 			};
 		};
 		84D4BFFB0348EF9D00CA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNetscapePluginDocumentView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		84D4BFFC0348EF9D00CA2ACA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNetscapePluginDocumentView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		84D4BFFE0348EF9D00CA2ACA = {
 			fileRef = 84D4BFFC0348EF9D00CA2ACA;
@@ -1985,16 +2195,20 @@
 //933
 //934
 		9311022803667CF1008635CE = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebFileButton.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9311022903667CF1008635CE = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebFileButton.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9311022A03667CF1008635CE = {
 			fileRef = 9311022803667CF1008635CE;
@@ -2009,16 +2223,20 @@
 			};
 		};
 		93154EF103A41270008635CE = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebPanelAuthenticationHandler.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		93154EF203A41270008635CE = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebPanelAuthenticationHandler.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		93154EF303A41270008635CE = {
 			fileRef = 93154EF103A41270008635CE;
@@ -2039,10 +2257,12 @@
 			};
 		};
 		931A72D203265920008635CE = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebBaseNetscapePluginViewPrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		931A72D303265920008635CE = {
 			fileRef = 931A72D203265920008635CE;
@@ -2058,25 +2278,32 @@
 			name = StringsNotToBeLocalized.txt;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		932399D8034CF7F6008635CE = {
+			expectedFileType = text;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = English;
 			path = English.lproj/StringsNotToBeLocalized.txt;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		933D659903413FF2008635CE = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebClipView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		933D659A03413FF2008635CE = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebClipView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		933D659C03413FF2008635CE = {
 			fileRef = 933D659A03413FF2008635CE;
@@ -2092,12 +2319,15 @@
 			name = WebAuthenticationPanel.nib;
 			path = ..;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9345D17C0365BF35008635CE = {
+			expectedFileType = wrapper.nib;
 			isa = PBXFileReference;
 			name = English;
 			path = Panels.subproj/English.lproj/WebAuthenticationPanel.nib;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9345D17D0365BF35008635CE = {
 			fileRef = 9345D17B0365BF35008635CE;
@@ -2113,12 +2343,15 @@
 			name = WebJavaScriptTextInputPanel.nib;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9345D4E80365C58D008635CE = {
+			expectedFileType = wrapper.nib;
 			isa = PBXFileReference;
 			name = English;
 			path = English.lproj/WebJavaScriptTextInputPanel.nib;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9345D4E90365C58D008635CE = {
 			fileRef = 9345D4E70365C58D008635CE;
@@ -2127,16 +2360,20 @@
 			};
 		};
 		9345D4EA0365C5B2008635CE = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebJavaScriptTextInputPanel.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9345D4EB0365C5B2008635CE = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebJavaScriptTextInputPanel.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9345D4ED0365C5B2008635CE = {
 			fileRef = 9345D4EB0365C5B2008635CE;
@@ -2145,16 +2382,20 @@
 			};
 		};
 		9345DDAE0365FB27008635CE = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNSWindowExtras.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9345DDAF0365FB27008635CE = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNSWindowExtras.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9345DDB10365FB27008635CE = {
 			fileRef = 9345DDAF0365FB27008635CE;
@@ -2163,16 +2404,20 @@
 			};
 		};
 		9345DDB20365FFD0008635CE = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNSControlExtras.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9345DDB30365FFD0008635CE = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNSControlExtras.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9345DDB50365FFD0008635CE = {
 			fileRef = 9345DDB30365FFD0008635CE;
@@ -2181,16 +2426,20 @@
 			};
 		};
 		93AEB17D032C1735008635CE = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebKitLogging.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		93AEB17E032C1735008635CE = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebKitLogging.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		93AEB17F032C1735008635CE = {
 			fileRef = 93AEB17D032C1735008635CE;
@@ -2217,10 +2466,12 @@
 //993
 //994
 		99FFFB9C047B036600CA283D = {
+			expectedFileType = text;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebKit.order;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		99FFFB9D047B036600CA283D = {
 			fileRef = 99FFFB9C047B036600CA283D;
@@ -2299,12 +2550,15 @@
 			name = WebView;
 			path = WebView.subproj;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9CAE9D070252A4130ECA16EA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebPreferencesPrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9CAE9D080252A4130ECA16EA = {
 			fileRef = 9CAE9D070252A4130ECA16EA;
@@ -2316,28 +2570,36 @@
 			};
 		};
 		9CE1F8A002A5C6F30ECA2ACD = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebImageRenderer.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9CE1F8A102A5C6F30ECA2ACD = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebImageRenderer.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9CE1F8A202A5C6F30ECA2ACD = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebImageRendererFactory.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9CE1F8A302A5C6F30ECA2ACD = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebImageRendererFactory.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9CE1F8A402A5C6F30ECA2ACD = {
 			fileRef = 9CE1F8A002A5C6F30ECA2ACD;
@@ -2364,16 +2626,20 @@
 			};
 		};
 		9CF0E249021361B00ECA16EA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebFramePrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9CF0E24A021361B00ECA16EA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebFramePrivate.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		9CF0E24B021361B10ECA16EA = {
 			fileRef = 9CF0E249021361B00ECA16EA;
@@ -2401,40 +2667,52 @@
 //BE3
 //BE4
 		BE07CEA7047538F000CA289C = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebDatabase.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		BE07CEA8047538F000CA289C = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebDatabase.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		BE07CEA9047538F000CA289C = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebFileDatabase.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		BE07CEAA047538F000CA289C = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebFileDatabase.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		BE07CEAB047538F000CA289C = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebLRUFileList.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		BE07CEAC047538F000CA289C = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebLRUFileList.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		BE07CEAD047538F000CA289C = {
 			fileRef = BE07CEA7047538F000CA289C;
@@ -2473,9 +2751,12 @@
 			};
 		};
 		BE1B2F5504755C7700CA289C = {
+			expectedFileType = wrapper.framework;
+			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
 			path = Foundation.framework;
 			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		BE1B2F5604755C7700CA289C = {
 			fileRef = BE1B2F5504755C7700CA289C;
@@ -2484,16 +2765,20 @@
 			};
 		};
 		BEE18F920472A0CF00CA289C = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebAssertions.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		BEE18F930472A0CF00CA289C = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebAssertions.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		BEE18F940472A0CF00CA289C = {
 			fileRef = BEE18F920472A0CF00CA289C;
@@ -2511,16 +2796,20 @@
 			};
 		};
 		BEE18F990472B73200CA289C = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebLocalizableStrings.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		BEE18F9A0472B73200CA289C = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebLocalizableStrings.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		BEE18F9B0472B73200CA289C = {
 			fileRef = BEE18F990472B73200CA289C;
@@ -2538,16 +2827,20 @@
 			};
 		};
 		BEE52D4A0473032500CA289C = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebKitSystemBits.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		BEE52D4B0473032500CA289C = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebKitSystemBits.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		BEE52D4C0473032500CA289C = {
 			fileRef = BEE52D4A0473032500CA289C;
@@ -2572,16 +2865,20 @@
 //ED3
 //ED4
 		ED2B2474033A2DA800C1A526 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNSPasteboardExtras.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		ED2B2475033A2DA800C1A526 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNSPasteboardExtras.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		ED2B2476033A2DA800C1A526 = {
 			fileRef = ED2B2474033A2DA800C1A526;
@@ -2609,16 +2906,20 @@
 //F53
 //F54
 		F508946902B71D59018A9CD4 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNSViewExtras.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F508946A02B71D59018A9CD4 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNSViewExtras.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F508946B02B71D59018A9CD4 = {
 			fileRef = F508946902B71D59018A9CD4;
@@ -2636,10 +2937,12 @@
 			};
 		};
 		F5143A370221DCCE01A80181 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebFrame.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5143A380221DCCE01A80181 = {
 			fileRef = F5143A370221DCCE01A80181;
@@ -2648,16 +2951,20 @@
 			};
 		};
 		F520FB190221DEFD01C1A525 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebHistory.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F520FB1A0221DEFD01C1A525 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebHistory.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F520FB1B0221DEFD01C1A525 = {
 			fileRef = F520FB190221DEFD01C1A525;
@@ -2675,22 +2982,28 @@
 			};
 		};
 		F528E3E9031E91AD01CA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebIconDatabase.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F528E3EA031E91AD01CA2ACA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebIconDatabase.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F528E3EB031E91AD01CA2ACA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebIconDatabasePrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F528E3EC031E91AD01CA2ACA = {
 			fileRef = F528E3E9031E91AD01CA2ACA;
@@ -2730,6 +3043,7 @@
 			name = HTML;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F52CA6BE02DF9D49018635CA = {
 			children = (
@@ -2741,6 +3055,7 @@
 			isa = PBXGroup;
 			name = Image;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F52CA6BF02DF9D4D018635CA = {
 			children = (
@@ -2752,6 +3067,7 @@
 			isa = PBXGroup;
 			name = Text;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F52CA6C002DF9D78018635CA = {
 			children = (
@@ -2773,18 +3089,23 @@
 			name = Debug;
 			path = Misc.subproj;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53444CE02E87CBA018635CA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebKitStatistics.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F53444CF02E87CBA018635CA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebKitStatistics.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F53444D002E87CBA018635CA = {
 			fileRef = F53444CE02E87CBA018635CA;
@@ -2802,10 +3123,12 @@
 			};
 		};
 		F53444D202E87D4B018635CA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebKitStatisticsPrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F53444D302E87D4B018635CA = {
 			fileRef = F53444D202E87D4B018635CA;
@@ -2814,16 +3137,20 @@
 			};
 		};
 		F5488CF402CB04EE01FF6274 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebCookieAdapter.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5488CF502CB04EE01FF6274 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebCookieAdapter.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5488CF602CB04EE01FF6274 = {
 			fileRef = F5488CF402CB04EE01FF6274;
@@ -2838,16 +3165,20 @@
 			};
 		};
 		F560BEBC030DAF4401C1A526 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebSearchableTextView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F560BEBD030DAF4401C1A526 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebSearchableTextView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F560BEBE030DAF4401C1A526 = {
 			fileRef = F560BEBC030DAF4401C1A526;
@@ -2876,48 +3207,61 @@
 			isa = PBXGroup;
 			name = DOM;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F57D194B034E734901A80180 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMDocument.h;
 			path = DOM.subproj/WebDOMDocument.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F57D194C034E734901A80180 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMDocument.m;
 			path = DOM.subproj/WebDOMDocument.m;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F57D194D034E734901A80180 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMElement.h;
 			path = DOM.subproj/WebDOMElement.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F57D194E034E734901A80180 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMElement.m;
 			path = DOM.subproj/WebDOMElement.m;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F57D1951034E734901A80180 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMNode.h;
 			path = DOM.subproj/WebDOMNode.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F57D1952034E734901A80180 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMNode.m;
 			path = DOM.subproj/WebDOMNode.m;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F57D1954034E734901A80180 = {
 			fileRef = F57D194C034E734901A80180;
@@ -2938,18 +3282,22 @@
 			};
 		};
 		F57FB8C4034E180101A80180 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDebugDOMNode.h;
 			path = WebView.subproj/WebDebugDOMNode.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F57FB8C5034E180101A80180 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDebugDOMNode.m;
 			path = WebView.subproj/WebDebugDOMNode.m;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F57FB8C7034E180101A80180 = {
 			fileRef = F57FB8C5034E180101A80180;
@@ -2958,10 +3306,12 @@
 			};
 		};
 		F5883BDE025E5C6A01000102 = {
+			expectedFileType = image.tiff;
 			isa = PBXFileReference;
 			name = nullplugin.tiff;
 			path = Resources/nullplugin.tiff;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5883BDF025E5C6A01000102 = {
 			fileRef = F5883BDE025E5C6A01000102;
@@ -2970,16 +3320,20 @@
 			};
 		};
 		F5883BE0025E5E9D01000102 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNullPluginView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5883BE1025E5E9D01000102 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNullPluginView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5883BE2025E5E9D01000102 = {
 			fileRef = F5883BE0025E5E9D01000102;
@@ -3006,10 +3360,12 @@
 			name = Mixed;
 		};
 		F5927D4E02D26C5E01CA2DBB = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebKitErrors.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5927D4F02D26C5E01CA2DBB = {
 			fileRef = F5927D4E02D26C5E01CA2DBB;
@@ -3021,16 +3377,20 @@
 			};
 		};
 		F5934C8802E894F50197FBCF = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebIconLoader.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5934C8902E894F50197FBCF = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebIconLoader.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5934C8A02E894F50197FBCF = {
 			fileRef = F5934C8802E894F50197FBCF;
@@ -3048,16 +3408,20 @@
 			};
 		};
 		F59668C802AD2923018635CA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebStringTruncator.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F59668C902AD2923018635CA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebStringTruncator.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F59668CA02AD2923018635CA = {
 			fileRef = F59668C802AD2923018635CA;
@@ -3075,10 +3439,12 @@
 			};
 		};
 		F59EAE3E0253C7EE018635CA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebCoreStatistics.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F59EAE400253C7EE018635CA = {
 			fileRef = F59EAE3E0253C7EE018635CA;
@@ -3090,10 +3456,12 @@
 			};
 		};
 		F59EAE410253C8DE018635CA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebCoreStatistics.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F59EAE420253C8DE018635CA = {
 			fileRef = F59EAE410253C8DE018635CA;
@@ -3102,10 +3470,12 @@
 			};
 		};
 		F5A55DC702BAA2E8018635CC = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebHTMLRepresentationPrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5A55DC802BAA2E8018635CC = {
 			fileRef = F5A55DC702BAA2E8018635CC;
@@ -3114,16 +3484,20 @@
 			};
 		};
 		F5A672B90263866E01000102 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebBaseNetscapePluginStream.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5A672BA0263866E01000102 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebBaseNetscapePluginStream.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5A672BD0263866E01000102 = {
 			fileRef = F5A672B90263866E01000102;
@@ -3138,10 +3512,12 @@
 			};
 		};
 		F5AEBB3D024A527601C1A526 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebPreferences.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5AEBB3E024A527601C1A526 = {
 			fileRef = F5AEBB3D024A527601C1A526;
@@ -3150,16 +3526,20 @@
 			};
 		};
 		F5AFB45E02B94DC8018635CA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebBridge.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5AFB45F02B94DC8018635CA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebBridge.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5AFB46002B94DC8018635CA = {
 			fileRef = F5AFB45E02B94DC8018635CA;
@@ -3202,18 +3582,23 @@
 			name = "WebCore Support";
 			path = WebCoreSupport.subproj;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5B36B410281DF55018635CB = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebTextRenderer.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5B36B420281DF55018635CB = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebTextRenderer.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5B36B430281DF55018635CB = {
 			fileRef = F5B36B410281DF55018635CB;
@@ -3230,16 +3615,20 @@
 			};
 		};
 		F5B36B450281DF9C018635CB = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebTextRendererFactory.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5B36B460281DF9C018635CB = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebTextRendererFactory.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5B36B480281DF9C018635CB = {
 			fileRef = F5B36B460281DF9C018635CB;
@@ -3248,10 +3637,12 @@
 			};
 		};
 		F5B67130023EDF8901C1A525 = {
+			expectedFileType = image.tiff;
 			isa = PBXFileReference;
 			name = url_icon.tiff;
 			path = Resources/url_icon.tiff;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5B67131023EDF8901C1A525 = {
 			fileRef = F5B67130023EDF8901C1A525;
@@ -3260,16 +3651,20 @@
 			};
 		};
 		F5B92B820223191D01C1A525 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebHistoryPrivate.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5B92B830223191D01C1A525 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebHistoryPrivate.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5B92B840223191D01C1A525 = {
 			fileRef = F5B92B820223191D01C1A525;
@@ -3287,11 +3682,13 @@
 			};
 		};
 		F5C283730284676D018635CA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebKitPrefix.h;
 			path = ../WebKitPrefix.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5C283740284676D018635CA = {
 			fileRef = F5C283730284676D018635CA;
@@ -3300,22 +3697,31 @@
 			};
 		};
 		F5C2869302846DCD018635CA = {
+			expectedFileType = wrapper.framework;
+			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
 			name = ApplicationServices.framework;
 			path = /System/Library/Frameworks/ApplicationServices.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		F5C2869402846DCD018635CA = {
+			expectedFileType = wrapper.framework;
+			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
 			name = Carbon.framework;
 			path = /System/Library/Frameworks/Carbon.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		F5C2869502846DCD018635CA = {
+			expectedFileType = wrapper.framework;
+			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
 			name = Cocoa.framework;
 			path = /System/Library/Frameworks/Cocoa.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		F5C287BB02846DCD018635CA = {
 			fileRef = F5C2869302846DCD018635CA;
@@ -3336,10 +3742,12 @@
 			};
 		};
 		F5D538E802441F2601A80181 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebMainResourceClient.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5D538EA02441F2601A80181 = {
 			fileRef = F5D538E802441F2601A80181;
@@ -3348,10 +3756,12 @@
 			};
 		};
 		F5D538EC02441FDD01A80181 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebMainResourceClient.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5D538ED02441FDD01A80181 = {
 			fileRef = F5D538EC02441FDD01A80181;
@@ -3360,16 +3770,20 @@
 			};
 		};
 		F5E0A76E02B8FEE401C1A525 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebURLsWithTitles.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5E0A76F02B8FEE401C1A525 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebURLsWithTitles.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5E0A77002B8FEE401C1A525 = {
 			fileRef = F5E0A76E02B8FEE401C1A525;
@@ -3387,16 +3801,20 @@
 			};
 		};
 		F5E0E10802BC45F8018635CA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebSubresourceClient.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5E0E10902BC45F8018635CA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebSubresourceClient.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5E0E10A02BC45F8018635CA = {
 			fileRef = F5E0E10802BC45F8018635CA;
@@ -3411,18 +3829,22 @@
 			};
 		};
 		F5E7B24503025CE801A80180 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebGlyphBuffer.h;
 			path = WebCoreSupport.subproj/WebGlyphBuffer.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5E7B24603025CE801A80180 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebGlyphBuffer.m;
 			path = WebCoreSupport.subproj/WebGlyphBuffer.m;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5E7B24703025CE801A80180 = {
 			fileRef = F5E7B24503025CE801A80180;
@@ -3451,18 +3873,23 @@
 			name = Plugins;
 			path = Plugins.subproj;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5EBC45502134BC301CA1520 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebBaseNetscapePluginView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5EBC45602134BC301CA1520 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebBaseNetscapePluginView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5EBC45802134BC301CA1520 = {
 			fileRef = F5EBC45502134BC301CA1520;
@@ -3477,40 +3904,52 @@
 			};
 		};
 		F5F7171E0288493C018635CA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNetscapePluginPackage.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5F7171F0288493C018635CA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebNetscapePluginPackage.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5F717200288493C018635CA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebPluginDatabase.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5F717210288493C018635CA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebPluginDatabase.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5F717220288493C018635CA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = npapi.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5F717230288493C018635CA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = npapi.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5F717240288493C018635CA = {
 			fileRef = F5F7171E0288493C018635CA;
@@ -3558,16 +3997,20 @@
 			};
 		};
 		F5F7174C02885C5B018635CA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebViewFactory.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5F7174D02885C5B018635CA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebViewFactory.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5F7174E02885C5B018635CA = {
 			fileRef = F5F7174C02885C5B018635CA;
@@ -3584,10 +4027,12 @@
 			};
 		};
 		F5F732D202FF4D4F01A80180 = {
+			expectedFileType = sourcecode.exports;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebKit.exp;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5F732D302FF4D4F01A80180 = {
 			fileRef = F5F732D202FF4D4F01A80180;
@@ -3596,18 +4041,22 @@
 			};
 		};
 		F5F81C3902B67C26018635CA = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebRenderNode.h;
 			path = ../WebView.subproj/WebRenderNode.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5F81C3A02B67C26018635CA = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebRenderNode.m;
 			path = ../WebView.subproj/WebRenderNode.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5F81C3B02B67C26018635CA = {
 			fileRef = F5F81C3902B67C26018635CA;
@@ -3635,16 +4084,22 @@
 //F73
 //F74
 		F738C9E903FAD3DF0321FBE0 = {
+			expectedFileType = file;
+			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
 			name = JavaScriptCore.framework;
 			path = build/JavaScriptCore.framework;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F738C9EA03FAD3DF0321FBE0 = {
+			expectedFileType = file;
+			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
 			name = WebCore.framework;
 			path = build/WebCore.framework;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F738CA5703FAD3DF0321FBE0 = {
 			fileRef = F738C9E903FAD3DF0321FBE0;
@@ -3659,16 +4114,20 @@
 			};
 		};
 		F79B974804019934036909D2 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = CarbonUtils.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F79B974904019934036909D2 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = CarbonUtils.m;
 			refType = 4;
+			sourceTree = "<group>";
 			usesTabs = 0;
 		};
 		F79B974A04019934036909D2 = {
@@ -3690,66 +4149,87 @@
 			name = "Carbon Support";
 			path = Carbon.subproj;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F7EBEE9003F9DBA103CA0DE6 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = CarbonWindowAdapter.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F7EBEE9103F9DBA103CA0DE6 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = CarbonWindowAdapter.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F7EBEE9203F9DBA103CA0DE6 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = CarbonWindowContentView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F7EBEE9303F9DBA103CA0DE6 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = CarbonWindowContentView.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F7EBEE9403F9DBA103CA0DE6 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = CarbonWindowFrame.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F7EBEE9503F9DBA103CA0DE6 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = CarbonWindowFrame.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F7EBEE9A03F9DBA103CA0DE6 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = HIViewAdapter.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F7EBEE9B03F9DBA103CA0DE6 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = HIViewAdapter.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F7EBEEAA03F9DBA103CA0DE6 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = HIWebView.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F7EBEEAB03F9DBA103CA0DE6 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = HIWebView.m;
 			refType = 4;
+			sourceTree = "<group>";
 			usesTabs = 0;
 		};
 		F7EBEEAF03F9DBA103CA0DE6 = {
@@ -3799,6 +4279,7 @@
 			isa = PBXGroup;
 			name = "AppKit Overrides";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F7EBEED103F9DBEB03CA0DE6 = {
 			children = (
@@ -3808,6 +4289,7 @@
 			isa = PBXGroup;
 			name = "C API";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F7EBEED203F9DBFE03CA0DE6 = {
 			children = (
@@ -3817,6 +4299,7 @@
 			isa = PBXGroup;
 			name = Glue;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F7FE6303040C27B003CA0DE6 = {
 			fileRef = F7EBEE9103F9DBA103CA0DE6;
@@ -3882,18 +4365,23 @@
 			name = Panels;
 			path = Panels.subproj;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F8CA15B5029A39D901000122 = {
+			expectedFileType = sourcecode.c.h;
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			path = WebAuthenticationPanel.h;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F8CA15B6029A39D901000122 = {
+			expectedFileType = sourcecode.c.objc;
 			fileEncoding = 4;
 			isa = PBXFileReference;
 			path = WebAuthenticationPanel.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F8CA15B9029A39D901000122 = {
 			fileRef = F8CA15B5029A39D901000122;
diff --git a/WebKit/WebView.subproj/WebImageView.h b/WebKit/WebView.subproj/WebImageView.h
index 92a54d5..fefd1a1 100644
--- a/WebKit/WebView.subproj/WebImageView.h
+++ b/WebKit/WebView.subproj/WebImageView.h
@@ -12,7 +12,7 @@
 @interface WebImageView : NSView <WebDocumentView>
 {
     WebImageRepresentation *representation;
-    BOOL didSetFrame;
+    BOOL needsLayout;
 }
 
 + (NSArray *)supportedImageMIMETypes;
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index 8192e85..80b8c46 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -51,7 +51,17 @@
 
 - (void)drawRect:(NSRect)rect
 {
-    [[representation image] beginAnimationInRect:[self frame] fromRect:[self frame]];
+    if (needsLayout) {
+        [self layout];
+    }
+    
+    NSImage *image = [representation image];
+    if (image) {
+        [[representation image] beginAnimationInRect:[self frame] fromRect:[self frame]];
+    } else {
+        [[NSColor whiteColor] set];
+        NSRectFill(rect);
+    }
 }
 
 - (void)setDataSource:(WebDataSource *)dataSource
@@ -65,6 +75,7 @@
 
 - (void)setNeedsLayout: (BOOL)flag
 {
+    needsLayout = flag;
 }
 
 - (void)layout
@@ -73,8 +84,11 @@
     if (image) {
         [self setFrameSize:[image size]];
     } else {
-        [self setFrameSize:NSMakeSize(0, 0)];
+        NSRect superFrame = [[self _web_superviewOfClass:[WebFrameView class]] frame];
+        [self setFrame:NSMakeRect(0, 0, NSWidth(superFrame), NSHeight(superFrame))];
     }
+    
+    needsLayout = NO;
 }
 
 - (void)viewWillMoveToHostWindow:(NSWindow *)hostWindow

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list