summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/mac
diff options
context:
space:
mode:
authormmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-09 19:50:18 +0000
committermmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-09 19:50:18 +0000
commitc2aaad178ab0a749ff515aca6a87af9597080edf (patch)
tree57f0e6202d80a70b0165a651cd27fdc714e86c2e /webkit/tools/test_shell/mac
parent35406dbfc537f51b2e6fe97c2fb000576262f206 (diff)
downloadchromium_src-c2aaad178ab0a749ff515aca6a87af9597080edf.zip
chromium_src-c2aaad178ab0a749ff515aca6a87af9597080edf.tar.gz
chromium_src-c2aaad178ab0a749ff515aca6a87af9597080edf.tar.bz2
Apply xcconfigs to Mac TestShell, fix warnings
Review URL: http://codereview.chromium.org/1668 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/mac')
-rw-r--r--webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj1123
-rw-r--r--webkit/tools/test_shell/mac/main.mm6
-rw-r--r--webkit/tools/test_shell/mac/test_shell_webview.mm4
3 files changed, 443 insertions, 690 deletions
diff --git a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
index bd6d58d..280b834 100644
--- a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
+++ b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
@@ -3,32 +3,15 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 44;
+ objectVersion = 45;
objects = {
/* Begin PBXBuildFile section */
- 7BFDF8940E37B26400F1D7D8 /* libnet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF5840E37ADC100F1D7D8 /* libnet.a */; };
- 7BFDF8950E37B26400F1D7D8 /* libGlue_v8_chrome.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF5BB0E37ADC900F1D7D8 /* libGlue_v8_chrome.a */; };
- 7BFDF8960E37B26400F1D7D8 /* libJSBindings_v8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF5C10E37ADC900F1D7D8 /* libJSBindings_v8.a */; };
- 7BFDF8970E37B26400F1D7D8 /* libPort_v8_chrome.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF5C70E37ADC900F1D7D8 /* libPort_v8_chrome.a */; };
- 7BFDF8980E37B26400F1D7D8 /* libWebCore_v8_chrome.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF5CD0E37ADC900F1D7D8 /* libWebCore_v8_chrome.a */; };
- 7BFDF8990E37B26400F1D7D8 /* libWTF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF5CF0E37ADC900F1D7D8 /* libWTF.a */; };
- 7BFDF89C0E37B26400F1D7D8 /* libicuuc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF5F20E37ADE100F1D7D8 /* libicuuc.a */; };
- 7BFDF89D0E37B26400F1D7D8 /* libicui18n.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF5F40E37ADE100F1D7D8 /* libicui18n.a */; };
- 7BFDF89E0E37B26400F1D7D8 /* libicutu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF5F60E37ADE100F1D7D8 /* libicutu.a */; };
- 7BFDF8A00E37B26400F1D7D8 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF6130E37ADE800F1D7D8 /* libbase.a */; };
- 7BFDF8A10E37B26400F1D7D8 /* libbase_gfx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF6150E37ADE800F1D7D8 /* libbase_gfx.a */; };
- 7BFDF8A30E37B26400F1D7D8 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF6240E37ADFC00F1D7D8 /* libpng.a */; };
- 7BFDF8A40E37B26400F1D7D8 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF66A0E37AE2100F1D7D8 /* libjpeg.a */; };
- 7BFDF8A50E37B26400F1D7D8 /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF6720E37AE2F00F1D7D8 /* libzlib.a */; };
- 7BFDF9DB0E37B47B00F1D7D8 /* libskia.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFDF9BF0E37B40400F1D7D8 /* libskia.a */; };
820EB4080E3A548E009668FC /* libWebKitSystemInterfaceLeopard.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 820EB4050E3A548E009668FC /* libWebKitSystemInterfaceLeopard.a */; };
E450637E0E4100740025A81A /* test_shell_request_context.cc in Sources */ = {isa = PBXBuildFile; fileRef = E450637D0E4100740025A81A /* test_shell_request_context.cc */; };
E45628E70E26B4FE005E4685 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
E45628E80E26B4FE005E4685 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
E45628E90E26B4FE005E4685 /* test_shell in Resources */ = {isa = PBXBuildFile; fileRef = 824CB6100DAFEF14000C5DDE /* test_shell */; };
- E45628EA0E26B4FE005E4685 /* internal in Resources */ = {isa = PBXBuildFile; fileRef = ABA9CCB50DBD39C100CB1EFB /* internal */; };
- E45628EB0E26B4FE005E4685 /* public in Resources */ = {isa = PBXBuildFile; fileRef = ABA9CCBB0DBD39C100CB1EFB /* public */; };
E45628ED0E26B4FE005E4685 /* missingImage.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 820A61B80DE7623F00871E2D /* missingImage.tiff */; };
E45628EE0E26B4FE005E4685 /* aliasCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 8287BDFA0E0AA28000CC8F2F /* aliasCursor.png */; };
E45628EF0E26B4FE005E4685 /* cellCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 8287BDFB0E0AA28000CC8F2F /* cellCursor.png */; };
@@ -59,7 +42,6 @@
E45629080E26B4FE005E4685 /* zoomInCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 8287BE140E0AA28000CC8F2F /* zoomInCursor.png */; };
E45629090E26B4FE005E4685 /* zoomOutCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 8287BE150E0AA28000CC8F2F /* zoomOutCursor.png */; };
E456290C0E26B4FE005E4685 /* test_shell_switches.cc in Sources */ = {isa = PBXBuildFile; fileRef = ABCF253C0DB8436B00099567 /* test_shell_switches.cc */; };
- E456290D0E26B4FE005E4685 /* gunit.cc in Sources */ = {isa = PBXBuildFile; fileRef = ABA9CCB20DBD39C100CB1EFB /* gunit.cc */; };
E456290F0E26B4FE005E4685 /* webview_host.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB8A785E0DC553EE005C27B8 /* webview_host.mm */; };
E45629100E26B4FE005E4685 /* webwidget_host.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD16F380DC6A73B0013D3AA /* webwidget_host.mm */; };
E45629150E26B4FE005E4685 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; };
@@ -74,7 +56,6 @@
E456291E0E26B4FE005E4685 /* test_shell_webview.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA65EFE0DD50BFF003A4FC8 /* test_shell_webview.mm */; };
E456291F0E26B4FE005E4685 /* WebSystemInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 820A5E760DE35E2E00871E2D /* WebSystemInterface.m */; };
E45629270E26B4FE005E4685 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 829E33F40DBFECE200819EBF /* ApplicationServices.framework */; };
- E456292B0E26B4FE005E4685 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 829E35560DC0CD7300819EBF /* libxml2.dylib */; };
E456292C0E26B4FE005E4685 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 829E35590DC0D37B00819EBF /* Carbon.framework */; };
E456292D0E26B4FE005E4685 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 829E355C0DC0D47400819EBF /* QuartzCore.framework */; };
E456292F0E26B4FE005E4685 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; };
@@ -83,326 +64,241 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 7BFDF5830E37ADC100F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205250E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = E45629460E26B5A7005E4685 /* net.xcodeproj */;
+ containerPortal = ABD16F700DC6CBDF0013D3AA /* base.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = E4BA04540E25613300BE02C6;
- remoteInfo = netlib;
+ remoteGlobalIDString = 825402BB0D92D0FA0006B936;
+ remoteInfo = base;
};
- 7BFDF5BA0E37ADC900F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205270E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
+ containerPortal = ABD16F700DC6CBDF0013D3AA /* base.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = E45627150E268F03005E4685;
- remoteInfo = "Glue (V8-Chrome)";
+ remoteGlobalIDString = 825403B10D92D2E50006B936;
+ remoteInfo = base_gfx;
};
- 7BFDF5C00E37ADC900F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205290E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
+ containerPortal = ABD16F700DC6CBDF0013D3AA /* base.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 7BFD8E660DAFE7630084BC4B;
- remoteInfo = "JSBindings (V8)";
+ remoteGlobalIDString = E49F18BF0E4CBAC200386AEC;
+ remoteInfo = base_unittests;
};
- 7BFDF5C60E37ADC900F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B82052E0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
+ containerPortal = E456295B0E26B5F8005E4685 /* bzip2.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = E45627F40E2694B8005E4685;
- remoteInfo = "Port (V8-Chrome)";
+ remoteGlobalIDString = E4BA04540E25613300BE02C6;
+ remoteInfo = bzip2;
};
- 7BFDF5CC0E37ADC900F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205360E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
+ containerPortal = AB8665450DC78A5A002CE06A /* googleurl.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = E45626950E268E87005E4685;
- remoteInfo = "WebCore (V8-Chrome)";
+ remoteGlobalIDString = 7BA018360E5A28DB00044150;
+ remoteInfo = googleurl;
};
- 7BFDF5CE0E37ADC900F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205380E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
+ containerPortal = AB8665450DC78A5A002CE06A /* googleurl.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 7B5E85AE0D7F28CD001ECF42;
- remoteInfo = WTF;
+ remoteGlobalIDString = 7BA018E20E5A2AFF00044150;
+ remoteInfo = googleurl_unittests;
};
- 7BFDF5D20E37ADC900F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205440E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
+ containerPortal = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 7B0E5B0E0DB3DC51007D4907;
- remoteInfo = "webkit (V8)";
+ remoteGlobalIDString = 7BD540D60D6F7EFE003CD41E;
+ remoteInfo = genccode;
};
- 7BFDF5EF0E37ADE100F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205460E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 7BD5408B0D6F743F003CD41E;
- remoteInfo = icudata_stub;
+ remoteGlobalIDString = 82C262C40DCF9411005CFE91;
+ remoteInfo = icudata;
};
- 7BFDF5F10E37ADE100F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205480E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 7BD53AAB0D6F6671003CD41E;
- remoteInfo = icuuc;
+ remoteGlobalIDString = 7BD5408B0D6F743F003CD41E;
+ remoteInfo = icudata_stub;
};
- 7BFDF5F30E37ADE100F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B82054A0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 7BD53EA60D6F6FC7003CD41E;
remoteInfo = icui18n;
};
- 7BFDF5F50E37ADE100F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B82054C0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 7BD540260D6F727B003CD41E;
remoteInfo = icutu;
};
- 7BFDF5F70E37ADE100F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B82054E0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 7BD540D60D6F7EFE003CD41E;
- remoteInfo = genccode;
+ remoteGlobalIDString = 7BD53AAB0D6F6671003CD41E;
+ remoteInfo = icuuc;
};
- 7BFDF5F90E37ADE100F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205500E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 7BD5410E0D6F8457003CD41E;
remoteInfo = icupkg;
};
- 7BFDF5FB0E37ADE100F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205580E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 7BD540FB0D6F8397003CD41E;
- remoteInfo = icudata;
- };
- 7BFDF6120E37ADE800F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = ABD16F700DC6CBDF0013D3AA /* base.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 825402BB0D92D0FA0006B936;
- remoteInfo = base;
- };
- 7BFDF6140E37ADE800F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = ABD16F700DC6CBDF0013D3AA /* base.xcodeproj */;
+ containerPortal = 7BFDF6620E37AE2100F1D7D8 /* libjpeg.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 825403B10D92D2E50006B936;
- remoteInfo = base_gfx;
+ remoteGlobalIDString = D2AAC046055464E500DB518D;
+ remoteInfo = libjpeg;
};
- 7BFDF6230E37ADFC00F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B82055D0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = ABC8C3EE0DC7F72600B59C21 /* libpng.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = D2AAC046055464E500DB518D;
remoteInfo = libpng;
};
- 7BFDF6690E37AE2100F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B82056B0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 7BFDF6620E37AE2100F1D7D8 /* libjpeg.xcodeproj */;
+ containerPortal = 7B8203F10E76FED8008F45CF /* libxml.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = D2AAC046055464E500DB518D;
- remoteInfo = libjpeg;
+ remoteGlobalIDString = 7B12F2AC0D8EE24200CB6E8F;
+ remoteInfo = xml;
};
- 7BFDF6710E37AE2F00F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B82056D0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = ABC8C4180DC7F7D000B59C21 /* zlib.xcodeproj */;
+ containerPortal = 7B8203F10E76FED8008F45CF /* libxml.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = D2AAC046055464E500DB518D;
- remoteInfo = zlib;
+ remoteGlobalIDString = 7B12F54E0D8EE8E400CB6E8F;
+ remoteInfo = xmlcatalog;
};
- 7BFDF8410E37AFE600F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B82056F0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = E45627B70E2691D0005E4685;
- remoteInfo = "All (V8-Chrome)";
- };
- 7BFDF8430E37AFE900F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = E45626A20E268F03005E4685;
- remoteInfo = "Glue (V8-Chrome)";
- };
- 7BFDF8450E37AFEB00F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = E45627CF0E2694B8005E4685;
- remoteInfo = "Port (V8-Chrome)";
- };
- 7BFDF8470E37AFEE00F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = E45620380E268E87005E4685;
- remoteInfo = "WebCore (V8-Chrome)";
- };
- 7BFDF8490E37AFF200F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 7BFD8E650DAFE7630084BC4B;
- remoteInfo = "JSBindings (V8)";
- };
- 7BFDF84F0E37AFF700F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 7BD53AAA0D6F6671003CD41E;
- remoteInfo = icuuc;
- };
- 7BFDF8510E37AFFD00F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 7BD53EA50D6F6FC7003CD41E;
- remoteInfo = icui18n;
- };
- 7BFDF8530E37AFFF00F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 7BD540250D6F727B003CD41E;
- remoteInfo = icutu;
- };
- 7BFDF8550E37B00200F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 82C262C30DCF9411005CFE91;
- remoteInfo = icudatastatic;
- };
- 7BFDF8570E37B00300F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = ABD16F700DC6CBDF0013D3AA /* base.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 825404020D92D3340006B936;
- remoteInfo = All;
- };
- 7BFDF85B0E37B00800F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = ABC8C3EE0DC7F72600B59C21 /* libpng.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = D2AAC045055464E500DB518D;
- remoteInfo = libpng;
- };
- 7BFDF85D0E37B00B00F1D7D8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 7BFDF6620E37AE2100F1D7D8 /* libjpeg.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = D2AAC045055464E500DB518D;
- remoteInfo = libjpeg;
+ containerPortal = 7B8203F10E76FED8008F45CF /* libxml.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 7B12F58F0D8EEB2F00CB6E8F;
+ remoteInfo = xmllint;
};
- 7BFDF85F0E37B00D00F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205840E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = ABC8C4180DC7F7D000B59C21 /* zlib.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = D2AAC045055464E500DB518D;
- remoteInfo = zlib;
+ containerPortal = E45629460E26B5A7005E4685 /* net.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = E4BA04540E25613300BE02C6;
+ remoteInfo = net;
};
- 7BFDF8650E37B01300F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205860E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = E45629460E26B5A7005E4685 /* net.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = D2AAC045055464E500DB518D;
- remoteInfo = netlib;
+ proxyType = 2;
+ remoteGlobalIDString = E4AFA6230E523E2900201347;
+ remoteInfo = net_unittests;
};
- 7BFDF9BE0E37B40400F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B82058E0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 828CFDC30DD1073D0069AC37 /* Skia.xcodeproj */;
+ containerPortal = 828CFDC30DD1073D0069AC37 /* skia.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = E48EE4CF0E34E855009DE966;
- remoteInfo = SkiaStatic;
+ remoteInfo = skia;
};
- 7BFDF9D70E37B42B00F1D7D8 /* PBXContainerItemProxy */ = {
+ 7B8205990E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 828CFDC30DD1073D0069AC37 /* Skia.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = E48EE4CE0E34E855009DE966;
- remoteInfo = SkiaStatic;
+ containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 897FF1BF0E719CB600D62E90;
+ remoteInfo = jscre;
};
- 8228CA2B0E6731CC004AE18C /* PBXContainerItemProxy */ = {
+ 7B82059B0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = E45629460E26B5A7005E4685 /* net.xcodeproj */;
+ containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = E4AFA6230E523E2900201347;
- remoteInfo = net_unittests;
+ remoteGlobalIDString = 8970F2F00E719FB2006AE7B5;
+ remoteInfo = v8;
};
- 8228CA370E6731CC004AE18C /* PBXContainerItemProxy */ = {
+ 7B82059D0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
+ containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 7B27489D0E43815F009BCE03;
- remoteInfo = PCRE;
+ remoteGlobalIDString = 897F767A0E71B4CC007ACF34;
+ remoteInfo = v8_shell;
};
- 8228CA440E6731CD004AE18C /* PBXContainerItemProxy */ = {
+ 7B8205A90E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = ABD16F700DC6CBDF0013D3AA /* base.xcodeproj */;
+ containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = E49F18BF0E4CBAC200386AEC;
- remoteInfo = base_unittests;
+ remoteGlobalIDString = E45627150E268F03005E4685;
+ remoteInfo = glue;
};
- 829E14340E76F95600F1B0B4 /* PBXContainerItemProxy */ = {
+ 7B8205AB0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
+ containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 897FF1BF0E719CB600D62E90 /* libjscre.a */;
- remoteInfo = jscre;
+ remoteGlobalIDString = 7BFD8E660DAFE7630084BC4B;
+ remoteInfo = jsbindings;
};
- 829E14360E76F95600F1B0B4 /* PBXContainerItemProxy */ = {
+ 7B8205AD0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
+ containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 8970F2F00E719FB2006AE7B5 /* libv8.a */;
- remoteInfo = v8;
+ remoteGlobalIDString = 7B27489D0E43815F009BCE03;
+ remoteInfo = pcre;
};
- 829E14380E76F95600F1B0B4 /* PBXContainerItemProxy */ = {
+ 7B8205AF0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
+ containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 897F767A0E71B4CC007ACF34 /* v8_shell */;
- remoteInfo = v8_shell;
+ remoteGlobalIDString = E45627F40E2694B8005E4685;
+ remoteInfo = port;
};
- 82DB396C0E6F17B0007B146B /* PBXContainerItemProxy */ = {
+ 7B8205B10E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = E456295B0E26B5F8005E4685 /* bzip2.xcodeproj */;
+ containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = E4BA04540E25613300BE02C6;
- remoteInfo = bzip2;
+ remoteGlobalIDString = E45626950E268E87005E4685;
+ remoteInfo = webcore;
};
- 82DB3BB30E71881D007B146B /* PBXContainerItemProxy */ = {
+ 7B8205B30E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = AB8665450DC78A5A002CE06A /* googleurl.xcodeproj */;
+ containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 7BA018360E5A28DB00044150;
- remoteInfo = googleurl;
+ remoteGlobalIDString = 7B5E85AE0D7F28CD001ECF42;
+ remoteInfo = wtf;
};
- 82DB3BB50E71881D007B146B /* PBXContainerItemProxy */ = {
+ 7B8205B80E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = AB8665450DC78A5A002CE06A /* googleurl.xcodeproj */;
+ containerPortal = ABC8C4180DC7F7D000B59C21 /* zlib.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 7BA018E20E5A2AFF00044150;
- remoteInfo = googleurl_unittests;
+ remoteGlobalIDString = D2AAC046055464E500DB518D;
+ remoteInfo = zlib;
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
- 13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+ 13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = "<group>"; };
29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
- 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
- 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+ 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = "<group>"; };
+ 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* TestShell_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestShell_Prefix.pch; sourceTree = "<group>"; };
- 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = v8.xcodeproj; path = ../../../../build/v8.xcodeproj; sourceTree = SOURCE_ROOT; };
- 7BFDF6620E37AE2100F1D7D8 /* libjpeg.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libjpeg.xcodeproj; path = ../../../../third_party/libjpeg/libjpeg.xcodeproj; sourceTree = SOURCE_ROOT; };
+ 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = v8.xcodeproj; path = build/v8.xcodeproj; sourceTree = "<group>"; };
+ 7B8200950E76FDA1008F45CF /* common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = common.xcconfig; sourceTree = "<group>"; };
+ 7B8200960E76FDA1008F45CF /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = "<group>"; };
+ 7B8200970E76FDA1008F45CF /* executable.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = executable.xcconfig; sourceTree = "<group>"; };
+ 7B8200980E76FDA1008F45CF /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = "<group>"; };
+ 7B8200990E76FDA1008F45CF /* staticlib.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = staticlib.xcconfig; sourceTree = "<group>"; };
+ 7B8203F10E76FED8008F45CF /* libxml.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libxml.xcodeproj; path = third_party/libxml/libxml.xcodeproj; sourceTree = "<group>"; };
+ 7BFDF6620E37AE2100F1D7D8 /* libjpeg.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libjpeg.xcodeproj; path = third_party/libjpeg/libjpeg.xcodeproj; sourceTree = "<group>"; };
820A5E750DE35E2E00871E2D /* WebSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSystemInterface.h; sourceTree = "<group>"; };
820A5E760DE35E2E00871E2D /* WebSystemInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebSystemInterface.m; sourceTree = "<group>"; };
820A5E850DE35FC600871E2D /* WebKitSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitSystemInterface.h; sourceTree = "<group>"; };
@@ -437,20 +333,18 @@
8287BE130E0AA28000CC8F2F /* westResizeCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = westResizeCursor.png; sourceTree = "<group>"; };
8287BE140E0AA28000CC8F2F /* zoomInCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomInCursor.png; sourceTree = "<group>"; };
8287BE150E0AA28000CC8F2F /* zoomOutCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomOutCursor.png; sourceTree = "<group>"; };
- 828CFDC30DD1073D0069AC37 /* Skia.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Skia.xcodeproj; path = ../../../../skia/Skia.xcodeproj; sourceTree = SOURCE_ROOT; };
- 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = webkit.xcodeproj; path = ../../../webkit.xcodeproj; sourceTree = SOURCE_ROOT; };
- 829E33F40DBFECE200819EBF /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
- 829E35270DC0C95300819EBF /* icu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = icu.xcodeproj; path = ../../../../third_party/icu38/icu.xcodeproj; sourceTree = SOURCE_ROOT; };
- 829E35560DC0CD7300819EBF /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = /usr/lib/libxml2.dylib; sourceTree = "<absolute>"; };
- 829E35590DC0D37B00819EBF /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
- 829E355C0DC0D47400819EBF /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
+ 828CFDC30DD1073D0069AC37 /* skia.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia.xcodeproj; path = skia/skia.xcodeproj; sourceTree = "<group>"; };
+ 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = webkit.xcodeproj; path = webkit/webkit.xcodeproj; sourceTree = "<group>"; };
+ 829E33F40DBFECE200819EBF /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<group>"; };
+ 829E35270DC0C95300819EBF /* icu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = icu.xcodeproj; path = third_party/icu38/icu.xcodeproj; sourceTree = "<group>"; };
+ 829E35590DC0D37B00819EBF /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = "<group>"; };
+ 829E355C0DC0D47400819EBF /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- AB3193B80DC7C73E009DD125 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
AB351E2E0DC7B290002F427A /* test_navigation_controller.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_navigation_controller.cc; sourceTree = "<group>"; };
AB351E2F0DC7B290002F427A /* test_navigation_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = test_navigation_controller.h; sourceTree = "<group>"; };
AB351E5B0DC7B3A5002F427A /* navigation_controller_base.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = navigation_controller_base.cc; sourceTree = "<group>"; };
AB351E5C0DC7B3A5002F427A /* navigation_controller_base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = navigation_controller_base.h; sourceTree = "<group>"; };
- AB8665450DC78A5A002CE06A /* googleurl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = googleurl.xcodeproj; path = ../../../../build/googleurl.xcodeproj; sourceTree = SOURCE_ROOT; };
+ AB8665450DC78A5A002CE06A /* googleurl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = googleurl.xcodeproj; path = build/googleurl.xcodeproj; sourceTree = "<group>"; };
AB8A77FD0DC54DD6005C27B8 /* layout_test_controller.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = layout_test_controller.mm; sourceTree = "<group>"; };
AB8A77FE0DC54DD6005C27B8 /* layout_test_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = layout_test_controller.h; sourceTree = "<group>"; };
AB8A78510DC553A8005C27B8 /* event_sending_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = event_sending_controller.h; sourceTree = "<group>"; };
@@ -468,23 +362,18 @@
ABA65EFE0DD50BFF003A4FC8 /* test_shell_webview.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = test_shell_webview.mm; sourceTree = "<group>"; };
ABA9CAE80DBC521D00CB1EFB /* test_shell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = test_shell.h; sourceTree = "<group>"; };
ABA9CAE90DBC521D00CB1EFB /* test_shell_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = test_shell_mac.mm; sourceTree = "<group>"; };
- ABA9CCB20DBD39C100CB1EFB /* gunit.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gunit.cc; sourceTree = "<group>"; };
- ABA9CCB30DBD39C100CB1EFB /* gunit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gunit.h; sourceTree = "<group>"; };
- ABA9CCB40DBD39C100CB1EFB /* gunit_prod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gunit_prod.h; sourceTree = "<group>"; };
- ABA9CCB50DBD39C100CB1EFB /* internal */ = {isa = PBXFileReference; lastKnownFileType = folder; path = internal; sourceTree = "<group>"; };
- ABA9CCBB0DBD39C100CB1EFB /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
- ABC8C3EE0DC7F72600B59C21 /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = ../../../../third_party/libpng/libpng.xcodeproj; sourceTree = SOURCE_ROOT; };
- ABC8C4180DC7F7D000B59C21 /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = ../../../../third_party/zlib/zlib.xcodeproj; sourceTree = SOURCE_ROOT; };
+ ABC8C3EE0DC7F72600B59C21 /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = third_party/libpng/libpng.xcodeproj; sourceTree = "<group>"; };
+ ABC8C4180DC7F7D000B59C21 /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = third_party/zlib/zlib.xcodeproj; sourceTree = "<group>"; };
ABCF253B0DB8436B00099567 /* test_shell_switches.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = test_shell_switches.h; sourceTree = "<group>"; };
ABCF253C0DB8436B00099567 /* test_shell_switches.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_shell_switches.cc; sourceTree = "<group>"; };
ABD16F380DC6A73B0013D3AA /* webwidget_host.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = webwidget_host.mm; sourceTree = "<group>"; };
ABD16F390DC6A73B0013D3AA /* webwidget_host.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = webwidget_host.h; sourceTree = "<group>"; };
- ABD16F700DC6CBDF0013D3AA /* base.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = base.xcodeproj; path = ../../../../base/base.xcodeproj; sourceTree = SOURCE_ROOT; };
+ ABD16F700DC6CBDF0013D3AA /* base.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = base.xcodeproj; path = base/base.xcodeproj; sourceTree = "<group>"; };
E450637C0E4100740025A81A /* test_shell_request_context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = test_shell_request_context.h; sourceTree = "<group>"; };
E450637D0E4100740025A81A /* test_shell_request_context.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_shell_request_context.cc; sourceTree = "<group>"; };
- E456293E0E26B4FE005E4685 /* TestShell_v8_chrome.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestShell_v8_chrome.app; sourceTree = BUILT_PRODUCTS_DIR; };
- E45629460E26B5A7005E4685 /* net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = net.xcodeproj; path = ../../../../net/net.xcodeproj; sourceTree = SOURCE_ROOT; };
- E456295B0E26B5F8005E4685 /* bzip2.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = bzip2.xcodeproj; path = ../../../../third_party/bzip2/bzip2.xcodeproj; sourceTree = SOURCE_ROOT; };
+ E456293E0E26B4FE005E4685 /* TestShell.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestShell.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ E45629460E26B5A7005E4685 /* net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = net.xcodeproj; path = net/net.xcodeproj; sourceTree = "<group>"; };
+ E456295B0E26B5F8005E4685 /* bzip2.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = bzip2.xcodeproj; path = third_party/bzip2/bzip2.xcodeproj; sourceTree = "<group>"; };
E45629680E26B64D005E4685 /* simple_resource_loader_bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = simple_resource_loader_bridge.h; sourceTree = "<group>"; };
E45629690E26B64D005E4685 /* simple_resource_loader_bridge.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = simple_resource_loader_bridge.cc; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -498,54 +387,18 @@
E45629270E26B4FE005E4685 /* ApplicationServices.framework in Frameworks */,
E456292C0E26B4FE005E4685 /* Carbon.framework in Frameworks */,
E456292F0E26B4FE005E4685 /* Foundation.framework in Frameworks */,
- E456292D0E26B4FE005E4685 /* QuartzCore.framework in Frameworks */,
- E456292B0E26B4FE005E4685 /* libxml2.dylib in Frameworks */,
- 7BFDF8A00E37B26400F1D7D8 /* libbase.a in Frameworks */,
- 7BFDF8A10E37B26400F1D7D8 /* libbase_gfx.a in Frameworks */,
- 7BFDF8950E37B26400F1D7D8 /* libGlue_v8_chrome.a in Frameworks */,
- 7BFDF89D0E37B26400F1D7D8 /* libicui18n.a in Frameworks */,
- 7BFDF89E0E37B26400F1D7D8 /* libicutu.a in Frameworks */,
- 7BFDF89C0E37B26400F1D7D8 /* libicuuc.a in Frameworks */,
- 7BFDF8A40E37B26400F1D7D8 /* libjpeg.a in Frameworks */,
- 7BFDF8960E37B26400F1D7D8 /* libJSBindings_v8.a in Frameworks */,
- 7BFDF8940E37B26400F1D7D8 /* libnet.a in Frameworks */,
- 7BFDF8970E37B26400F1D7D8 /* libPort_v8_chrome.a in Frameworks */,
- 7BFDF8A30E37B26400F1D7D8 /* libpng.a in Frameworks */,
- 7BFDF9DB0E37B47B00F1D7D8 /* libskia.a in Frameworks */,
- 7BFDF8980E37B26400F1D7D8 /* libWebCore_v8_chrome.a in Frameworks */,
- 7BFDF8990E37B26400F1D7D8 /* libWTF.a in Frameworks */,
- 7BFDF8A50E37B26400F1D7D8 /* libzlib.a in Frameworks */,
820EB4080E3A548E009668FC /* libWebKitSystemInterfaceLeopard.a in Frameworks */,
+ E456292D0E26B4FE005E4685 /* QuartzCore.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
- 080E96DDFE201D6D7F000001 /* Classes */ = {
- isa = PBXGroup;
- children = (
- );
- name = Classes;
- sourceTree = "<group>";
- };
- 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
- isa = PBXGroup;
- children = (
- 829E355C0DC0D47400819EBF /* QuartzCore.framework */,
- 829E35590DC0D37B00819EBF /* Carbon.framework */,
- 829E33F40DBFECE200819EBF /* ApplicationServices.framework */,
- 29B97325FDCFA39411CA2CEA /* Foundation.framework */,
- 29B97324FDCFA39411CA2CEA /* AppKit.framework */,
- 13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
- );
- name = "Linked Frameworks";
- sourceTree = "<group>";
- };
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
- E456293E0E26B4FE005E4685 /* TestShell_v8_chrome.app */,
+ E456293E0E26B4FE005E4685 /* TestShell.app */,
);
name = Products;
sourceTree = "<group>";
@@ -553,29 +406,16 @@
29B97314FDCFA39411CA2CEA /* TestShell */ = {
isa = PBXGroup;
children = (
+ 7B8200940E76FD84008F45CF /* Configuration */,
AB1E8EFA0DB7B95C00742926 /* test_shell */,
- 080E96DDFE201D6D7F000001 /* Classes */,
- 29B97315FDCFA39411CA2CEA /* Other Sources */,
- ABA9CCB00DBD398800CB1EFB /* base */,
29B97317FDCFA39411CA2CEA /* Resources */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
+ 7B8200D20E76FE73008F45CF /* Projects */,
19C28FACFE9D520D11CA2CBB /* Products */,
);
name = TestShell;
sourceTree = "<group>";
};
- 29B97315FDCFA39411CA2CEA /* Other Sources */ = {
- isa = PBXGroup;
- children = (
- 32CA4F630368D1EE00C91783 /* TestShell_Prefix.pch */,
- 29B97316FDCFA39411CA2CEA /* main.mm */,
- 820A5E850DE35FC600871E2D /* WebKitSystemInterface.h */,
- 820A5E750DE35E2E00871E2D /* WebSystemInterface.h */,
- 820A5E760DE35E2E00871E2D /* WebSystemInterface.m */,
- );
- name = "Other Sources";
- sourceTree = "<group>";
- };
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
@@ -591,183 +431,214 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
- E456295B0E26B5F8005E4685 /* bzip2.xcodeproj */,
- E45629460E26B5A7005E4685 /* net.xcodeproj */,
- 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */,
- 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */,
- 829E35270DC0C95300819EBF /* icu.xcodeproj */,
+ 29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+ 829E33F40DBFECE200819EBF /* ApplicationServices.framework */,
+ 829E35590DC0D37B00819EBF /* Carbon.framework */,
+ 13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
+ 29B97325FDCFA39411CA2CEA /* Foundation.framework */,
+ 829E355C0DC0D47400819EBF /* QuartzCore.framework */,
+ );
+ name = Frameworks;
+ sourceTree = SDKROOT;
+ };
+ 7B8200940E76FD84008F45CF /* Configuration */ = {
+ isa = PBXGroup;
+ children = (
+ 7B8200950E76FDA1008F45CF /* common.xcconfig */,
+ 7B8200960E76FDA1008F45CF /* debug.xcconfig */,
+ 7B8200970E76FDA1008F45CF /* executable.xcconfig */,
+ 7B8200980E76FDA1008F45CF /* release.xcconfig */,
+ 7B8200990E76FDA1008F45CF /* staticlib.xcconfig */,
+ );
+ name = Configuration;
+ path = ../../../../build;
+ sourceTree = "<group>";
+ };
+ 7B8200D20E76FE73008F45CF /* Projects */ = {
+ isa = PBXGroup;
+ children = (
ABD16F700DC6CBDF0013D3AA /* base.xcodeproj */,
+ E456295B0E26B5F8005E4685 /* bzip2.xcodeproj */,
AB8665450DC78A5A002CE06A /* googleurl.xcodeproj */,
- ABC8C3EE0DC7F72600B59C21 /* libpng.xcodeproj */,
+ 829E35270DC0C95300819EBF /* icu.xcodeproj */,
7BFDF6620E37AE2100F1D7D8 /* libjpeg.xcodeproj */,
+ ABC8C3EE0DC7F72600B59C21 /* libpng.xcodeproj */,
+ 7B8203F10E76FED8008F45CF /* libxml.xcodeproj */,
+ E45629460E26B5A7005E4685 /* net.xcodeproj */,
+ 828CFDC30DD1073D0069AC37 /* skia.xcodeproj */,
+ 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */,
+ 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */,
ABC8C4180DC7F7D000B59C21 /* zlib.xcodeproj */,
- 828CFDC30DD1073D0069AC37 /* Skia.xcodeproj */,
- 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
- 829E34000DBFEDB700819EBF /* libs */,
);
- name = Frameworks;
+ name = Projects;
+ path = ../../../..;
sourceTree = "<group>";
};
- 7BFDF4FD0E37AB4200F1D7D8 /* mac */ = {
+ 7B82051E0E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- AB3193B80DC7C73E009DD125 /* config.h */,
- ABA65EFD0DD50BFF003A4FC8 /* test_shell_webview.h */,
- ABA65EFE0DD50BFF003A4FC8 /* test_shell_webview.mm */,
+ 7B8205260E770291008F45CF /* libbase.a */,
+ 7B8205280E770291008F45CF /* libbase_gfx.a */,
+ 7B82052A0E770291008F45CF /* base_unittests */,
);
- path = mac;
+ name = Products;
sourceTree = "<group>";
};
- 7BFDF5740E37AD0A00F1D7D8 /* WebCore */ = {
+ 7B82052B0E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- 820A61B80DE7623F00871E2D /* missingImage.tiff */,
- 8287BDFA0E0AA28000CC8F2F /* aliasCursor.png */,
- 8287BDFB0E0AA28000CC8F2F /* cellCursor.png */,
- 8287BDFC0E0AA28000CC8F2F /* contextMenuCursor.png */,
- 8287BDFD0E0AA28000CC8F2F /* copyCursor.png */,
- 8287BDFE0E0AA28000CC8F2F /* crossHairCursor.png */,
- 8287BDFF0E0AA28000CC8F2F /* eastResizeCursor.png */,
- 8287BE000E0AA28000CC8F2F /* eastWestResizeCursor.png */,
- 8287BE010E0AA28000CC8F2F /* helpCursor.png */,
- 8287BE020E0AA28000CC8F2F /* linkCursor.png */,
- 8287BE030E0AA28000CC8F2F /* moveCursor.png */,
- 8287BE040E0AA28000CC8F2F /* noDropCursor.png */,
- 8287BE050E0AA28000CC8F2F /* noneCursor.png */,
- 8287BE060E0AA28000CC8F2F /* northEastResizeCursor.png */,
- 8287BE070E0AA28000CC8F2F /* northEastSouthWestResizeCursor.png */,
- 8287BE080E0AA28000CC8F2F /* northResizeCursor.png */,
- 8287BE090E0AA28000CC8F2F /* northSouthResizeCursor.png */,
- 8287BE0A0E0AA28000CC8F2F /* northWestResizeCursor.png */,
- 8287BE0B0E0AA28000CC8F2F /* northWestSouthEastResizeCursor.png */,
- 8287BE0C0E0AA28000CC8F2F /* notAllowedCursor.png */,
- 8287BE0D0E0AA28000CC8F2F /* progressCursor.png */,
- 8287BE0E0E0AA28000CC8F2F /* southEastResizeCursor.png */,
- 8287BE0F0E0AA28000CC8F2F /* southResizeCursor.png */,
- 8287BE100E0AA28000CC8F2F /* southWestResizeCursor.png */,
- 8287BE110E0AA28000CC8F2F /* verticalTextCursor.png */,
- 8287BE120E0AA28000CC8F2F /* waitCursor.png */,
- 8287BE130E0AA28000CC8F2F /* westResizeCursor.png */,
- 8287BE140E0AA28000CC8F2F /* zoomInCursor.png */,
- 8287BE150E0AA28000CC8F2F /* zoomOutCursor.png */,
+ 7B82052F0E770291008F45CF /* libbzip2.a */,
);
- name = WebCore;
- path = ../../../../third_party/WebKit/WebCore/Resources;
+ name = Products;
sourceTree = "<group>";
};
- 7BFDF5800E37ADC100F1D7D8 /* Products */ = {
+ 7B8205300E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- 7BFDF5840E37ADC100F1D7D8 /* libnet.a */,
- 8228CA2C0E6731CC004AE18C /* net_unittests */,
+ 7B8205370E770291008F45CF /* libgoogleurl.a */,
+ 7B8205390E770291008F45CF /* googleurl_unittests */,
);
name = Products;
sourceTree = "<group>";
};
- 7BFDF59F0E37ADC900F1D7D8 /* Products */ = {
+ 7B82053A0E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- 7BFDF5BB0E37ADC900F1D7D8 /* libGlue_v8_chrome.a */,
- 7BFDF5C10E37ADC900F1D7D8 /* libJSBindings_v8.a */,
- 8228CA380E6731CC004AE18C /* libpcre.a */,
- 7BFDF5C70E37ADC900F1D7D8 /* libPort_v8_chrome.a */,
- 7BFDF5CD0E37ADC900F1D7D8 /* libWebCore_v8_chrome.a */,
- 7BFDF5CF0E37ADC900F1D7D8 /* libWTF.a */,
- 7BFDF5D30E37ADC900F1D7D8 /* libwebkit_v8.dylib */,
+ 7B8205450E770291008F45CF /* genccode */,
+ 7B8205470E770291008F45CF /* libicudata.a */,
+ 7B8205490E770291008F45CF /* libicudata_stub.a */,
+ 7B82054B0E770291008F45CF /* libicui18n.a */,
+ 7B82054D0E770291008F45CF /* libicutu.a */,
+ 7B82054F0E770291008F45CF /* libicuuc.a */,
+ 7B8205510E770291008F45CF /* icupkg */,
);
name = Products;
sourceTree = "<group>";
};
- 7BFDF5E50E37ADE100F1D7D8 /* Products */ = {
+ 7B8205550E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- 7BFDF5F80E37ADE100F1D7D8 /* genccode */,
- 7BFDF5FC0E37ADE100F1D7D8 /* libicudata.a */,
- 7BFDF5F00E37ADE100F1D7D8 /* libicudata_stub.a */,
- 7BFDF5F40E37ADE100F1D7D8 /* libicui18n.a */,
- 7BFDF5F60E37ADE100F1D7D8 /* libicutu.a */,
- 7BFDF5F20E37ADE100F1D7D8 /* libicuuc.a */,
- 7BFDF5FA0E37ADE100F1D7D8 /* icupkg */,
+ 7B8205590E770291008F45CF /* libjpeg.a */,
);
name = Products;
sourceTree = "<group>";
};
- 7BFDF60C0E37ADE800F1D7D8 /* Products */ = {
+ 7B82055A0E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- 7BFDF6130E37ADE800F1D7D8 /* libbase.a */,
- 7BFDF6150E37ADE800F1D7D8 /* libbase_gfx.a */,
- 8228CA450E6731CD004AE18C /* base_unittests */,
+ 7B82055E0E770291008F45CF /* libpng.a */,
);
name = Products;
sourceTree = "<group>";
};
- 7BFDF6200E37ADFC00F1D7D8 /* Products */ = {
+ 7B8205640E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- 7BFDF6240E37ADFC00F1D7D8 /* libpng.a */,
+ 7B82056C0E770291008F45CF /* libxml.a */,
+ 7B82056E0E770291008F45CF /* xmlcatalog */,
+ 7B8205700E770291008F45CF /* xmllint */,
);
name = Products;
sourceTree = "<group>";
};
- 7BFDF6630E37AE2100F1D7D8 /* Products */ = {
+ 7B82057E0E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- 7BFDF66A0E37AE2100F1D7D8 /* libjpeg.a */,
+ 7B8205850E770291008F45CF /* libnet.a */,
+ 7B8205870E770291008F45CF /* net_unittests */,
);
name = Products;
sourceTree = "<group>";
};
- 7BFDF66E0E37AE2F00F1D7D8 /* Products */ = {
+ 7B82058B0E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- 7BFDF6720E37AE2F00F1D7D8 /* libzlib.a */,
+ 7B82058F0E770291008F45CF /* libskia.a */,
);
name = Products;
sourceTree = "<group>";
};
- 7BFDF6760E37AE3900F1D7D8 /* Products */ = {
+ 7B8205930E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- 7BFDF9BF0E37B40400F1D7D8 /* libskia.a */,
+ 7B82059A0E770291008F45CF /* libjscre.a */,
+ 7B82059C0E770291008F45CF /* libv8.a */,
+ 7B82059E0E770291008F45CF /* v8_shell */,
);
name = Products;
sourceTree = "<group>";
};
- 829E142E0E76F95600F1B0B4 /* Products */ = {
+ 7B82059F0E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- 829E14350E76F95600F1B0B4 /* libjscre.a */,
- 829E14370E76F95600F1B0B4 /* libv8.a */,
- 829E14390E76F95600F1B0B4 /* v8_shell */,
+ 7B8205AA0E770291008F45CF /* libglue.a */,
+ 7B8205AC0E770291008F45CF /* libjsbindings.a */,
+ 7B8205AE0E770291008F45CF /* libpcre.a */,
+ 7B8205B00E770291008F45CF /* libport.a */,
+ 7B8205B20E770291008F45CF /* libwebcore.a */,
+ 7B8205B40E770291008F45CF /* libwtf.a */,
);
name = Products;
sourceTree = "<group>";
};
- 829E34000DBFEDB700819EBF /* libs */ = {
+ 7B8205B50E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- 820EB4050E3A548E009668FC /* libWebKitSystemInterfaceLeopard.a */,
- 829E35560DC0CD7300819EBF /* libxml2.dylib */,
+ 7B8205B90E770291008F45CF /* libzlib.a */,
);
- name = libs;
+ name = Products;
sourceTree = "<group>";
};
- 82DB39690E6F17B0007B146B /* Products */ = {
+ 7BFDF4FD0E37AB4200F1D7D8 /* mac */ = {
isa = PBXGroup;
children = (
- 82DB396D0E6F17B0007B146B /* libbzip2.a */,
+ 820EB4050E3A548E009668FC /* libWebKitSystemInterfaceLeopard.a */,
+ 29B97316FDCFA39411CA2CEA /* main.mm */,
+ ABA65EFD0DD50BFF003A4FC8 /* test_shell_webview.h */,
+ ABA65EFE0DD50BFF003A4FC8 /* test_shell_webview.mm */,
+ 32CA4F630368D1EE00C91783 /* TestShell_Prefix.pch */,
+ 820A5E850DE35FC600871E2D /* WebKitSystemInterface.h */,
+ 820A5E750DE35E2E00871E2D /* WebSystemInterface.h */,
+ 820A5E760DE35E2E00871E2D /* WebSystemInterface.m */,
);
- name = Products;
+ path = mac;
sourceTree = "<group>";
};
- 82DB3BAE0E71881D007B146B /* Products */ = {
+ 7BFDF5740E37AD0A00F1D7D8 /* WebCore */ = {
isa = PBXGroup;
children = (
- 82DB3BB40E71881D007B146B /* libgoogleurl.a */,
- 82DB3BB60E71881D007B146B /* googleurl_unittests */,
+ 8287BDFA0E0AA28000CC8F2F /* aliasCursor.png */,
+ 8287BDFB0E0AA28000CC8F2F /* cellCursor.png */,
+ 8287BDFC0E0AA28000CC8F2F /* contextMenuCursor.png */,
+ 8287BDFD0E0AA28000CC8F2F /* copyCursor.png */,
+ 8287BDFE0E0AA28000CC8F2F /* crossHairCursor.png */,
+ 8287BDFF0E0AA28000CC8F2F /* eastResizeCursor.png */,
+ 8287BE000E0AA28000CC8F2F /* eastWestResizeCursor.png */,
+ 8287BE010E0AA28000CC8F2F /* helpCursor.png */,
+ 8287BE020E0AA28000CC8F2F /* linkCursor.png */,
+ 820A61B80DE7623F00871E2D /* missingImage.tiff */,
+ 8287BE030E0AA28000CC8F2F /* moveCursor.png */,
+ 8287BE040E0AA28000CC8F2F /* noDropCursor.png */,
+ 8287BE050E0AA28000CC8F2F /* noneCursor.png */,
+ 8287BE060E0AA28000CC8F2F /* northEastResizeCursor.png */,
+ 8287BE070E0AA28000CC8F2F /* northEastSouthWestResizeCursor.png */,
+ 8287BE080E0AA28000CC8F2F /* northResizeCursor.png */,
+ 8287BE090E0AA28000CC8F2F /* northSouthResizeCursor.png */,
+ 8287BE0A0E0AA28000CC8F2F /* northWestResizeCursor.png */,
+ 8287BE0B0E0AA28000CC8F2F /* northWestSouthEastResizeCursor.png */,
+ 8287BE0C0E0AA28000CC8F2F /* notAllowedCursor.png */,
+ 8287BE0D0E0AA28000CC8F2F /* progressCursor.png */,
+ 8287BE0E0E0AA28000CC8F2F /* southEastResizeCursor.png */,
+ 8287BE0F0E0AA28000CC8F2F /* southResizeCursor.png */,
+ 8287BE100E0AA28000CC8F2F /* southWestResizeCursor.png */,
+ 8287BE110E0AA28000CC8F2F /* verticalTextCursor.png */,
+ 8287BE120E0AA28000CC8F2F /* waitCursor.png */,
+ 8287BE130E0AA28000CC8F2F /* westResizeCursor.png */,
+ 8287BE140E0AA28000CC8F2F /* zoomInCursor.png */,
+ 8287BE150E0AA28000CC8F2F /* zoomOutCursor.png */,
);
- name = Products;
+ name = WebCore;
+ path = ../../../../third_party/WebKit/WebCore/Resources;
sourceTree = "<group>";
};
AB1E8EFA0DB7B95C00742926 /* test_shell */ = {
@@ -775,31 +646,31 @@
children = (
7BFDF4FD0E37AB4200F1D7D8 /* mac */,
AB351E580DC7B399002F427A /* temp */,
- AB8A78510DC553A8005C27B8 /* event_sending_controller.h */,
AB8A78520DC553A8005C27B8 /* event_sending_controller.cc */,
- AB8A77FD0DC54DD6005C27B8 /* layout_test_controller.mm */,
+ AB8A78510DC553A8005C27B8 /* event_sending_controller.h */,
AB8A77FE0DC54DD6005C27B8 /* layout_test_controller.h */,
+ AB8A77FD0DC54DD6005C27B8 /* layout_test_controller.mm */,
AB8A78540DC553BC005C27B8 /* node_leak_test.cc */,
- E45629680E26B64D005E4685 /* simple_resource_loader_bridge.h */,
E45629690E26B64D005E4685 /* simple_resource_loader_bridge.cc */,
+ E45629680E26B64D005E4685 /* simple_resource_loader_bridge.h */,
AB351E2E0DC7B290002F427A /* test_navigation_controller.cc */,
AB351E2F0DC7B290002F427A /* test_navigation_controller.h */,
ABA9CAE80DBC521D00CB1EFB /* test_shell.h */,
ABA9CAE90DBC521D00CB1EFB /* test_shell_mac.mm */,
- E450637C0E4100740025A81A /* test_shell_request_context.h */,
E450637D0E4100740025A81A /* test_shell_request_context.cc */,
- ABCF253B0DB8436B00099567 /* test_shell_switches.h */,
+ E450637C0E4100740025A81A /* test_shell_request_context.h */,
ABCF253C0DB8436B00099567 /* test_shell_switches.cc */,
- AB8A78560DC553C7005C27B8 /* test_shell_test.mm */,
+ ABCF253B0DB8436B00099567 /* test_shell_switches.h */,
AB8A786E0DC5544D005C27B8 /* test_shell_test.h */,
+ AB8A78560DC553C7005C27B8 /* test_shell_test.mm */,
AB8A78590DC553D7005C27B8 /* test_webview_delegate.h */,
AB8A78580DC553D7005C27B8 /* test_webview_delegate.mm */,
AB8A785B0DC553E4005C27B8 /* text_input_controller.cc */,
AB8A785C0DC553E4005C27B8 /* text_input_controller.h */,
- AB8A785E0DC553EE005C27B8 /* webview_host.mm */,
AB8A78600DC553EE005C27B8 /* webview_host.h */,
- ABD16F380DC6A73B0013D3AA /* webwidget_host.mm */,
+ AB8A785E0DC553EE005C27B8 /* webview_host.mm */,
ABD16F390DC6A73B0013D3AA /* webwidget_host.h */,
+ ABD16F380DC6A73B0013D3AA /* webwidget_host.mm */,
);
name = test_shell;
path = ..;
@@ -814,19 +685,6 @@
path = temp;
sourceTree = "<group>";
};
- ABA9CCB00DBD398800CB1EFB /* base */ = {
- isa = PBXGroup;
- children = (
- ABA9CCB20DBD39C100CB1EFB /* gunit.cc */,
- ABA9CCB30DBD39C100CB1EFB /* gunit.h */,
- ABA9CCB40DBD39C100CB1EFB /* gunit_prod.h */,
- ABA9CCB50DBD39C100CB1EFB /* internal */,
- ABA9CCBB0DBD39C100CB1EFB /* public */,
- );
- name = base;
- path = ../../../../testing/base;
- sourceTree = "<group>";
- };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -841,26 +699,11 @@
buildRules = (
);
dependencies = (
- 7BFDF8420E37AFE600F1D7D8 /* PBXTargetDependency */,
- 7BFDF8440E37AFE900F1D7D8 /* PBXTargetDependency */,
- 7BFDF8460E37AFEB00F1D7D8 /* PBXTargetDependency */,
- 7BFDF8480E37AFEE00F1D7D8 /* PBXTargetDependency */,
- 7BFDF84A0E37AFF200F1D7D8 /* PBXTargetDependency */,
- 7BFDF8500E37AFF700F1D7D8 /* PBXTargetDependency */,
- 7BFDF8520E37AFFD00F1D7D8 /* PBXTargetDependency */,
- 7BFDF8540E37AFFF00F1D7D8 /* PBXTargetDependency */,
- 7BFDF8560E37B00200F1D7D8 /* PBXTargetDependency */,
- 7BFDF8580E37B00300F1D7D8 /* PBXTargetDependency */,
- 7BFDF85C0E37B00800F1D7D8 /* PBXTargetDependency */,
- 7BFDF85E0E37B00B00F1D7D8 /* PBXTargetDependency */,
- 7BFDF8600E37B00D00F1D7D8 /* PBXTargetDependency */,
- 7BFDF8660E37B01300F1D7D8 /* PBXTargetDependency */,
- 7BFDF9D80E37B42B00F1D7D8 /* PBXTargetDependency */,
);
name = TestShell;
productInstallPath = "$(HOME)/Applications";
productName = TestShell;
- productReference = E456293E0E26B4FE005E4685 /* TestShell_v8_chrome.app */;
+ productReference = E456293E0E26B4FE005E4685 /* TestShell.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@@ -869,53 +712,57 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TestShell" */;
- compatibilityVersion = "Xcode 3.0";
+ compatibilityVersion = "Xcode 3.1";
hasScannedForEncodings = 1;
mainGroup = 29B97314FDCFA39411CA2CEA /* TestShell */;
projectDirPath = "";
projectReferences = (
{
- ProductGroup = 7BFDF60C0E37ADE800F1D7D8 /* Products */;
+ ProductGroup = 7B82051E0E770291008F45CF /* Products */;
ProjectRef = ABD16F700DC6CBDF0013D3AA /* base.xcodeproj */;
},
{
- ProductGroup = 82DB39690E6F17B0007B146B /* Products */;
+ ProductGroup = 7B82052B0E770291008F45CF /* Products */;
ProjectRef = E456295B0E26B5F8005E4685 /* bzip2.xcodeproj */;
},
{
- ProductGroup = 82DB3BAE0E71881D007B146B /* Products */;
+ ProductGroup = 7B8205300E770291008F45CF /* Products */;
ProjectRef = AB8665450DC78A5A002CE06A /* googleurl.xcodeproj */;
},
{
- ProductGroup = 7BFDF5E50E37ADE100F1D7D8 /* Products */;
+ ProductGroup = 7B82053A0E770291008F45CF /* Products */;
ProjectRef = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
},
{
- ProductGroup = 7BFDF6630E37AE2100F1D7D8 /* Products */;
+ ProductGroup = 7B8205550E770291008F45CF /* Products */;
ProjectRef = 7BFDF6620E37AE2100F1D7D8 /* libjpeg.xcodeproj */;
},
{
- ProductGroup = 7BFDF6200E37ADFC00F1D7D8 /* Products */;
+ ProductGroup = 7B82055A0E770291008F45CF /* Products */;
ProjectRef = ABC8C3EE0DC7F72600B59C21 /* libpng.xcodeproj */;
},
{
- ProductGroup = 7BFDF5800E37ADC100F1D7D8 /* Products */;
+ ProductGroup = 7B8205640E770291008F45CF /* Products */;
+ ProjectRef = 7B8203F10E76FED8008F45CF /* libxml.xcodeproj */;
+ },
+ {
+ ProductGroup = 7B82057E0E770291008F45CF /* Products */;
ProjectRef = E45629460E26B5A7005E4685 /* net.xcodeproj */;
},
{
- ProductGroup = 7BFDF6760E37AE3900F1D7D8 /* Products */;
- ProjectRef = 828CFDC30DD1073D0069AC37 /* Skia.xcodeproj */;
+ ProductGroup = 7B82058B0E770291008F45CF /* Products */;
+ ProjectRef = 828CFDC30DD1073D0069AC37 /* skia.xcodeproj */;
},
{
- ProductGroup = 829E142E0E76F95600F1B0B4 /* Products */;
+ ProductGroup = 7B8205930E770291008F45CF /* Products */;
ProjectRef = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
},
{
- ProductGroup = 7BFDF59F0E37ADC900F1D7D8 /* Products */;
+ ProductGroup = 7B82059F0E770291008F45CF /* Products */;
ProjectRef = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
},
{
- ProductGroup = 7BFDF66E0E37AE2F00F1D7D8 /* Products */;
+ ProductGroup = 7B8205B50E770291008F45CF /* Products */;
ProjectRef = ABC8C4180DC7F7D000B59C21 /* zlib.xcodeproj */;
},
);
@@ -927,207 +774,221 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 7BFDF5840E37ADC100F1D7D8 /* libnet.a */ = {
+ 7B8205260E770291008F45CF /* libbase.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libnet.a;
- remoteRef = 7BFDF5830E37ADC100F1D7D8 /* PBXContainerItemProxy */;
+ path = libbase.a;
+ remoteRef = 7B8205250E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5BB0E37ADC900F1D7D8 /* libGlue_v8_chrome.a */ = {
+ 7B8205280E770291008F45CF /* libbase_gfx.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libGlue_v8_chrome.a;
- remoteRef = 7BFDF5BA0E37ADC900F1D7D8 /* PBXContainerItemProxy */;
+ path = libbase_gfx.a;
+ remoteRef = 7B8205270E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5C10E37ADC900F1D7D8 /* libJSBindings_v8.a */ = {
+ 7B82052A0E770291008F45CF /* base_unittests */ = {
isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libJSBindings_v8.a;
- remoteRef = 7BFDF5C00E37ADC900F1D7D8 /* PBXContainerItemProxy */;
+ fileType = "compiled.mach-o.executable";
+ path = base_unittests;
+ remoteRef = 7B8205290E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5C70E37ADC900F1D7D8 /* libPort_v8_chrome.a */ = {
+ 7B82052F0E770291008F45CF /* libbzip2.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libPort_v8_chrome.a;
- remoteRef = 7BFDF5C60E37ADC900F1D7D8 /* PBXContainerItemProxy */;
+ path = libbzip2.a;
+ remoteRef = 7B82052E0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5CD0E37ADC900F1D7D8 /* libWebCore_v8_chrome.a */ = {
+ 7B8205370E770291008F45CF /* libgoogleurl.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libWebCore_v8_chrome.a;
- remoteRef = 7BFDF5CC0E37ADC900F1D7D8 /* PBXContainerItemProxy */;
+ path = libgoogleurl.a;
+ remoteRef = 7B8205360E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5CF0E37ADC900F1D7D8 /* libWTF.a */ = {
+ 7B8205390E770291008F45CF /* googleurl_unittests */ = {
isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libWTF.a;
- remoteRef = 7BFDF5CE0E37ADC900F1D7D8 /* PBXContainerItemProxy */;
+ fileType = "compiled.mach-o.executable";
+ path = googleurl_unittests;
+ remoteRef = 7B8205380E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5D30E37ADC900F1D7D8 /* libwebkit_v8.dylib */ = {
+ 7B8205450E770291008F45CF /* genccode */ = {
isa = PBXReferenceProxy;
- fileType = "compiled.mach-o.dylib";
- path = libwebkit_v8.dylib;
- remoteRef = 7BFDF5D20E37ADC900F1D7D8 /* PBXContainerItemProxy */;
+ fileType = "compiled.mach-o.executable";
+ path = genccode;
+ remoteRef = 7B8205440E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5F00E37ADE100F1D7D8 /* libicudata_stub.a */ = {
+ 7B8205470E770291008F45CF /* libicudata.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libicudata_stub.a;
- remoteRef = 7BFDF5EF0E37ADE100F1D7D8 /* PBXContainerItemProxy */;
+ path = libicudata.a;
+ remoteRef = 7B8205460E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5F20E37ADE100F1D7D8 /* libicuuc.a */ = {
+ 7B8205490E770291008F45CF /* libicudata_stub.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libicuuc.a;
- remoteRef = 7BFDF5F10E37ADE100F1D7D8 /* PBXContainerItemProxy */;
+ path = libicudata_stub.a;
+ remoteRef = 7B8205480E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5F40E37ADE100F1D7D8 /* libicui18n.a */ = {
+ 7B82054B0E770291008F45CF /* libicui18n.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libicui18n.a;
- remoteRef = 7BFDF5F30E37ADE100F1D7D8 /* PBXContainerItemProxy */;
+ remoteRef = 7B82054A0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5F60E37ADE100F1D7D8 /* libicutu.a */ = {
+ 7B82054D0E770291008F45CF /* libicutu.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libicutu.a;
- remoteRef = 7BFDF5F50E37ADE100F1D7D8 /* PBXContainerItemProxy */;
+ remoteRef = 7B82054C0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5F80E37ADE100F1D7D8 /* genccode */ = {
+ 7B82054F0E770291008F45CF /* libicuuc.a */ = {
isa = PBXReferenceProxy;
- fileType = "compiled.mach-o.executable";
- path = genccode;
- remoteRef = 7BFDF5F70E37ADE100F1D7D8 /* PBXContainerItemProxy */;
+ fileType = archive.ar;
+ path = libicuuc.a;
+ remoteRef = 7B82054E0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5FA0E37ADE100F1D7D8 /* icupkg */ = {
+ 7B8205510E770291008F45CF /* icupkg */ = {
isa = PBXReferenceProxy;
fileType = "compiled.mach-o.executable";
path = icupkg;
- remoteRef = 7BFDF5F90E37ADE100F1D7D8 /* PBXContainerItemProxy */;
+ remoteRef = 7B8205500E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF5FC0E37ADE100F1D7D8 /* libicudata.a */ = {
+ 7B8205590E770291008F45CF /* libjpeg.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libicudata.a;
- remoteRef = 7BFDF5FB0E37ADE100F1D7D8 /* PBXContainerItemProxy */;
+ path = libjpeg.a;
+ remoteRef = 7B8205580E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF6130E37ADE800F1D7D8 /* libbase.a */ = {
+ 7B82055E0E770291008F45CF /* libpng.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libbase.a;
- remoteRef = 7BFDF6120E37ADE800F1D7D8 /* PBXContainerItemProxy */;
+ path = libpng.a;
+ remoteRef = 7B82055D0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF6150E37ADE800F1D7D8 /* libbase_gfx.a */ = {
+ 7B82056C0E770291008F45CF /* libxml.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libbase_gfx.a;
- remoteRef = 7BFDF6140E37ADE800F1D7D8 /* PBXContainerItemProxy */;
+ path = libxml.a;
+ remoteRef = 7B82056B0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF6240E37ADFC00F1D7D8 /* libpng.a */ = {
+ 7B82056E0E770291008F45CF /* xmlcatalog */ = {
isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libpng.a;
- remoteRef = 7BFDF6230E37ADFC00F1D7D8 /* PBXContainerItemProxy */;
+ fileType = "compiled.mach-o.executable";
+ path = xmlcatalog;
+ remoteRef = 7B82056D0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF66A0E37AE2100F1D7D8 /* libjpeg.a */ = {
+ 7B8205700E770291008F45CF /* xmllint */ = {
isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libjpeg.a;
- remoteRef = 7BFDF6690E37AE2100F1D7D8 /* PBXContainerItemProxy */;
+ fileType = "compiled.mach-o.executable";
+ path = xmllint;
+ remoteRef = 7B82056F0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF6720E37AE2F00F1D7D8 /* libzlib.a */ = {
+ 7B8205850E770291008F45CF /* libnet.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libzlib.a;
- remoteRef = 7BFDF6710E37AE2F00F1D7D8 /* PBXContainerItemProxy */;
+ path = libnet.a;
+ remoteRef = 7B8205840E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7BFDF9BF0E37B40400F1D7D8 /* libskia.a */ = {
+ 7B8205870E770291008F45CF /* net_unittests */ = {
+ isa = PBXReferenceProxy;
+ fileType = "compiled.mach-o.executable";
+ path = net_unittests;
+ remoteRef = 7B8205860E770291008F45CF /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 7B82058F0E770291008F45CF /* libskia.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libskia.a;
- remoteRef = 7BFDF9BE0E37B40400F1D7D8 /* PBXContainerItemProxy */;
+ remoteRef = 7B82058E0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 8228CA2C0E6731CC004AE18C /* net_unittests */ = {
+ 7B82059A0E770291008F45CF /* libjscre.a */ = {
isa = PBXReferenceProxy;
- fileType = "compiled.mach-o.executable";
- path = net_unittests;
- remoteRef = 8228CA2B0E6731CC004AE18C /* PBXContainerItemProxy */;
+ fileType = archive.ar;
+ path = libjscre.a;
+ remoteRef = 7B8205990E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 8228CA380E6731CC004AE18C /* libpcre.a */ = {
+ 7B82059C0E770291008F45CF /* libv8.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libpcre.a;
- remoteRef = 8228CA370E6731CC004AE18C /* PBXContainerItemProxy */;
+ path = libv8.a;
+ remoteRef = 7B82059B0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 8228CA450E6731CD004AE18C /* base_unittests */ = {
+ 7B82059E0E770291008F45CF /* v8_shell */ = {
isa = PBXReferenceProxy;
fileType = "compiled.mach-o.executable";
- path = base_unittests;
- remoteRef = 8228CA440E6731CD004AE18C /* PBXContainerItemProxy */;
+ path = v8_shell;
+ remoteRef = 7B82059D0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 829E14350E76F95600F1B0B4 /* libjscre.a */ = {
+ 7B8205AA0E770291008F45CF /* libglue.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libjscre.a;
- remoteRef = 829E14340E76F95600F1B0B4 /* PBXContainerItemProxy */;
+ path = libglue.a;
+ remoteRef = 7B8205A90E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 829E14370E76F95600F1B0B4 /* libv8.a */ = {
+ 7B8205AC0E770291008F45CF /* libjsbindings.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libv8.a;
- remoteRef = 829E14360E76F95600F1B0B4 /* PBXContainerItemProxy */;
+ path = libjsbindings.a;
+ remoteRef = 7B8205AB0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 829E14390E76F95600F1B0B4 /* v8_shell */ = {
+ 7B8205AE0E770291008F45CF /* libpcre.a */ = {
isa = PBXReferenceProxy;
- fileType = "compiled.mach-o.executable";
- path = v8_shell;
- remoteRef = 829E14380E76F95600F1B0B4 /* PBXContainerItemProxy */;
+ fileType = archive.ar;
+ path = libpcre.a;
+ remoteRef = 7B8205AD0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 82DB396D0E6F17B0007B146B /* libbzip2.a */ = {
+ 7B8205B00E770291008F45CF /* libport.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libbzip2.a;
- remoteRef = 82DB396C0E6F17B0007B146B /* PBXContainerItemProxy */;
+ path = libport.a;
+ remoteRef = 7B8205AF0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 82DB3BB40E71881D007B146B /* libgoogleurl.a */ = {
+ 7B8205B20E770291008F45CF /* libwebcore.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libgoogleurl.a;
- remoteRef = 82DB3BB30E71881D007B146B /* PBXContainerItemProxy */;
+ path = libwebcore.a;
+ remoteRef = 7B8205B10E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 82DB3BB60E71881D007B146B /* googleurl_unittests */ = {
+ 7B8205B40E770291008F45CF /* libwtf.a */ = {
isa = PBXReferenceProxy;
- fileType = "compiled.mach-o.executable";
- path = googleurl_unittests;
- remoteRef = 82DB3BB50E71881D007B146B /* PBXContainerItemProxy */;
+ fileType = archive.ar;
+ path = libwtf.a;
+ remoteRef = 7B8205B30E770291008F45CF /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 7B8205B90E770291008F45CF /* libzlib.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libzlib.a;
+ remoteRef = 7B8205B80E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@@ -1140,9 +1001,6 @@
E45628E70E26B4FE005E4685 /* MainMenu.nib in Resources */,
E45628E80E26B4FE005E4685 /* InfoPlist.strings in Resources */,
E45628E90E26B4FE005E4685 /* test_shell in Resources */,
- E45628EA0E26B4FE005E4685 /* internal in Resources */,
- E45628EB0E26B4FE005E4685 /* public in Resources */,
- E45628ED0E26B4FE005E4685 /* missingImage.tiff in Resources */,
E45628EE0E26B4FE005E4685 /* aliasCursor.png in Resources */,
E45628EF0E26B4FE005E4685 /* cellCursor.png in Resources */,
E45628F00E26B4FE005E4685 /* contextMenuCursor.png in Resources */,
@@ -1152,6 +1010,7 @@
E45628F40E26B4FE005E4685 /* eastWestResizeCursor.png in Resources */,
E45628F50E26B4FE005E4685 /* helpCursor.png in Resources */,
E45628F60E26B4FE005E4685 /* linkCursor.png in Resources */,
+ E45628ED0E26B4FE005E4685 /* missingImage.tiff in Resources */,
E45628F70E26B4FE005E4685 /* moveCursor.png in Resources */,
E45628F80E26B4FE005E4685 /* noDropCursor.png in Resources */,
E45628F90E26B4FE005E4685 /* noneCursor.png in Resources */,
@@ -1181,106 +1040,27 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- E456290C0E26B4FE005E4685 /* test_shell_switches.cc in Sources */,
- E456290D0E26B4FE005E4685 /* gunit.cc in Sources */,
- E456290F0E26B4FE005E4685 /* webview_host.mm in Sources */,
- E45629100E26B4FE005E4685 /* webwidget_host.mm in Sources */,
- E45629150E26B4FE005E4685 /* main.mm in Sources */,
E45629160E26B4FE005E4685 /* event_sending_controller.cc in Sources */,
E45629170E26B4FE005E4685 /* layout_test_controller.mm in Sources */,
+ E45629150E26B4FE005E4685 /* main.mm in Sources */,
E45629180E26B4FE005E4685 /* navigation_controller_base.cc in Sources */,
+ E456296A0E26B64D005E4685 /* simple_resource_loader_bridge.cc in Sources */,
E45629190E26B4FE005E4685 /* test_navigation_controller.cc in Sources */,
E456291A0E26B4FE005E4685 /* test_shell_mac.mm in Sources */,
+ E450637E0E4100740025A81A /* test_shell_request_context.cc in Sources */,
+ E456290C0E26B4FE005E4685 /* test_shell_switches.cc in Sources */,
E456291B0E26B4FE005E4685 /* test_shell_test.mm in Sources */,
+ E456291E0E26B4FE005E4685 /* test_shell_webview.mm in Sources */,
E456291C0E26B4FE005E4685 /* test_webview_delegate.mm in Sources */,
E456291D0E26B4FE005E4685 /* text_input_controller.cc in Sources */,
- E456291E0E26B4FE005E4685 /* test_shell_webview.mm in Sources */,
E456291F0E26B4FE005E4685 /* WebSystemInterface.m in Sources */,
- E456296A0E26B64D005E4685 /* simple_resource_loader_bridge.cc in Sources */,
- E450637E0E4100740025A81A /* test_shell_request_context.cc in Sources */,
+ E456290F0E26B4FE005E4685 /* webview_host.mm in Sources */,
+ E45629100E26B4FE005E4685 /* webwidget_host.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- 7BFDF8420E37AFE600F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "All (V8-Chrome)";
- targetProxy = 7BFDF8410E37AFE600F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF8440E37AFE900F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "Glue (V8-Chrome)";
- targetProxy = 7BFDF8430E37AFE900F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF8460E37AFEB00F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "Port (V8-Chrome)";
- targetProxy = 7BFDF8450E37AFEB00F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF8480E37AFEE00F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "WebCore (V8-Chrome)";
- targetProxy = 7BFDF8470E37AFEE00F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF84A0E37AFF200F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "JSBindings (V8)";
- targetProxy = 7BFDF8490E37AFF200F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF8500E37AFF700F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = icuuc;
- targetProxy = 7BFDF84F0E37AFF700F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF8520E37AFFD00F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = icui18n;
- targetProxy = 7BFDF8510E37AFFD00F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF8540E37AFFF00F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = icutu;
- targetProxy = 7BFDF8530E37AFFF00F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF8560E37B00200F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = icudatastatic;
- targetProxy = 7BFDF8550E37B00200F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF8580E37B00300F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = All;
- targetProxy = 7BFDF8570E37B00300F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF85C0E37B00800F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = libpng;
- targetProxy = 7BFDF85B0E37B00800F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF85E0E37B00B00F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = libjpeg;
- targetProxy = 7BFDF85D0E37B00B00F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF8600E37B00D00F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = zlib;
- targetProxy = 7BFDF85F0E37B00D00F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF8660E37B01300F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = netlib;
- targetProxy = 7BFDF8650E37B01300F1D7D8 /* PBXContainerItemProxy */;
- };
- 7BFDF9D80E37B42B00F1D7D8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = SkiaStatic;
- targetProxy = 7BFDF9D70E37B42B00F1D7D8 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin PBXVariantGroup section */
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
@@ -1303,97 +1083,70 @@
/* Begin XCBuildConfiguration section */
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 7B8200960E76FDA1008F45CF /* debug.xcconfig */;
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks";
GCC_ENABLE_OBJC_GC = supported;
- GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
- GCC_SYMBOLS_PRIVATE_EXTERN = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "$(GCC_PREPROCESSOR_DEFINITIONS)",
+ BUILDING_CHROMIUM__,
+ );
HEADER_SEARCH_PATHS = (
- "$(SRCROOT)",
- "$(SRCROOT)/../../../..",
- "$(SRCROOT)/../../../../skia/**",
- "$(SRCROOT)/../../../../testing/base/**",
- "$(SRCROOT)/../../../../third_party/icu38/public/i18n",
- "$(SRCROOT)/../../../../third_party/WebKit/WebCore",
- "$(SRCROOT)/../../../../third_party/WebKit/JavaScriptCore",
- "$(SRCROOT)/../../../../third_party/icu38/public/common",
- "$(SRCROOT)/../../../pending",
+ ../../../..,
+ ../../../../skia/include,
+ ../../../../third_party/icu38/public/common,
+ ../../../../third_party/icu38/public/i18n,
+ ../../../pending,
+ ../../../../third_party/WebKit/WebCore,
+ ../../../../third_party/WebKit/JavaScriptCore,
+ "$(SYMROOT)/webkit.build/$(CONFIGURATION)/generated/WebCore/v8",
);
- PREBINDING = NO;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
- USER_HEADER_SEARCH_PATHS = "";
- USE_HEADERMAP = NO;
+ XCODEPROJ_DEPTH = ../../../..;
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 7B8200980E76FDA1008F45CF /* release.xcconfig */;
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks";
GCC_ENABLE_OBJC_GC = supported;
- GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
- GCC_SYMBOLS_PRIVATE_EXTERN = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "$(GCC_PREPROCESSOR_DEFINITIONS)",
+ BUILDING_CHROMIUM__,
+ );
HEADER_SEARCH_PATHS = (
- "$(SRCROOT)",
- "$(SRCROOT)/../../../..",
- "$(SRCROOT)/../../../../skia/**",
- "$(SRCROOT)/../../../../testing/base/**",
- "$(SRCROOT)/../../../../third_party/icu38/public/i18n",
- "$(SRCROOT)/../../../../third_party/WebKit/WebCore",
- "$(SRCROOT)/../../../../third_party/WebKit/JavaScriptCore",
- "$(SRCROOT)/../../../../third_party/icu38/public/common",
- "$(SRCROOT)/../../../pending",
+ ../../../..,
+ ../../../../skia/include,
+ ../../../../third_party/icu38/public/common,
+ ../../../../third_party/icu38/public/i18n,
+ ../../../pending,
+ ../../../../third_party/WebKit/WebCore,
+ ../../../../third_party/WebKit/JavaScriptCore,
+ "$(SYMROOT)/webkit.build/$(CONFIGURATION)/generated/WebCore/v8",
);
- PREBINDING = NO;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
- USER_HEADER_SEARCH_PATHS = "";
- USE_HEADERMAP = NO;
+ XCODEPROJ_DEPTH = ../../../..;
};
name = Release;
};
E456293C0E26B4FE005E4685 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 7B8200970E76FDA1008F45CF /* executable.xcconfig */;
buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = TestShell_Prefix.pch;
INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)\"",
- );
- PRODUCT_NAME = TestShell_v8_chrome;
- USE_HEADERMAP = NO;
+ PRODUCT_NAME = TestShell;
WRAPPER_EXTENSION = app;
};
name = Debug;
};
E456293D0E26B4FE005E4685 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 7B8200970E76FDA1008F45CF /* executable.xcconfig */;
buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = i386;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_MODEL_TUNING = G5;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = TestShell_Prefix.pch;
INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)\"",
- );
- PRODUCT_NAME = TestShell_v8_chrome;
- USE_HEADERMAP = NO;
+ PRODUCT_NAME = TestShell;
WRAPPER_EXTENSION = app;
};
name = Release;
diff --git a/webkit/tools/test_shell/mac/main.mm b/webkit/tools/test_shell/mac/main.mm
index 7d3a0e6..85ef884 100644
--- a/webkit/tools/test_shell/mac/main.mm
+++ b/webkit/tools/test_shell/mac/main.mm
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <string>
+#import <Cocoa/Cocoa.h>
#include <sys/syslimits.h>
#include <unistd.h>
-#include "config.h"
+#include <string>
-#import <Cocoa/Cocoa.h>
+#include "config.h"
// #include "base/event_recorder.h"
#include "base/basictypes.h"
diff --git a/webkit/tools/test_shell/mac/test_shell_webview.mm b/webkit/tools/test_shell/mac/test_shell_webview.mm
index 5ed5be1..d764d66 100644
--- a/webkit/tools/test_shell/mac/test_shell_webview.mm
+++ b/webkit/tools/test_shell/mac/test_shell_webview.mm
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <Cocoa/Cocoa.h>
+#import "test_shell_webview.h"
-#include "test_shell_webview.h"
+#import <Cocoa/Cocoa.h>
#include "base/gfx/rect.h"
#include "base/scoped_ptr.h"
generated by cgit v1.1 at 2025-01-22 14:59:56 +0000