summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-27 10:40:58 +0000
committerdimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-27 10:40:58 +0000
commit211b6bd4da4de7d10614511a907c3c9071d1732c (patch)
tree46a9b31a4d606ba65e10fbbbfae39dd8f8d97130
parenta52029a4acbdbb906fd669527b21fc7ce78535ed (diff)
downloadchromium_src-211b6bd4da4de7d10614511a907c3c9071d1732c.zip
chromium_src-211b6bd4da4de7d10614511a907c3c9071d1732c.tar.gz
chromium_src-211b6bd4da4de7d10614511a907c3c9071d1732c.tar.bz2
Fix Mac build - update project files after merge and jscre library removal.
Review URL: http://codereview.chromium.org/27270 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10601 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome.xcodeproj/project.pbxproj60
-rw-r--r--net/net.xcodeproj/project.pbxproj32
-rw-r--r--webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj35
-rw-r--r--webkit/webkit.xcodeproj/project.pbxproj12
4 files changed, 9 insertions, 130 deletions
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index 0d2f911..6ddba28 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -580,7 +580,6 @@
E477F6B50F4095660044ABEB /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4DCDB9C0F4091BF0084059A /* ApplicationServices.framework */; };
E477F6B60F4095660044ABEB /* libglue.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 826850180F2FC82E009F6555 /* libglue.a */; };
E477F6B70F4095660044ABEB /* libjsbindings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268501A0F2FC82E009F6555 /* libjsbindings.a */; };
- E477F6B80F4095660044ABEB /* libjscre.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268504B0F2FCB56009F6555 /* libjscre.a */; };
E477F6B90F4095660044ABEB /* libpcre.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268501C0F2FC82E009F6555 /* libpcre.a */; };
E477F6BA0F4095660044ABEB /* libport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268501E0F2FC82E009F6555 /* libport.a */; };
E477F6BB0F4095660044ABEB /* libv8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268504D0F2FCB56009F6555 /* libv8.a */; };
@@ -630,7 +629,6 @@
E4DCDC940F40929C0084059A /* libwebcore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 826850200F2FC82E009F6555 /* libwebcore.a */; };
E4DCDC950F40929C0084059A /* libwebcoresysteminterface.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 826850220F2FC82E009F6555 /* libwebcoresysteminterface.a */; };
E4DCDC960F40929C0084059A /* libwtf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 826850240F2FC82E009F6555 /* libwtf.a */; };
- E4DCDC970F4092C10084059A /* libjscre.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268504B0F2FCB56009F6555 /* libjscre.a */; };
E4DCDC980F4092C10084059A /* libv8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268504D0F2FCB56009F6555 /* libv8.a */; };
E4DCDC990F4092EF0084059A /* libxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7BFB230E9D4BBF009A6919 /* libxml.a */; };
E4DCDC9A0F4092F90084059A /* libxslt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268506A0F2FCC27009F6555 /* libxslt.a */; };
@@ -638,7 +636,6 @@
E4DCDC9D0F40938D0084059A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45065DF0EEEC709003BE099 /* Foundation.framework */; };
E4DCDC9E0F40938D0084059A /* libglue.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 826850180F2FC82E009F6555 /* libglue.a */; };
E4DCDC9F0F40938D0084059A /* libjsbindings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268501A0F2FC82E009F6555 /* libjsbindings.a */; };
- E4DCDCA00F40938D0084059A /* libjscre.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268504B0F2FCB56009F6555 /* libjscre.a */; };
E4DCDCA10F40938D0084059A /* libpcre.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268501C0F2FC82E009F6555 /* libpcre.a */; };
E4DCDCA20F40938D0084059A /* libport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268501E0F2FC82E009F6555 /* libport.a */; };
E4DCDCA30F40938D0084059A /* libv8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8268504D0F2FCB56009F6555 /* libv8.a */; };
@@ -696,13 +693,6 @@
remoteGlobalIDString = 7BD540250D6F727B003CD41E;
remoteInfo = icutu;
};
- 33121EE00F3CF45B006CB2B0 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 8268503E0F2FCB56009F6555 /* v8.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 897FF1BE0E719CB600D62E90;
- remoteInfo = jscre;
- };
33121EE20F3CF45B006CB2B0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8268503E0F2FCB56009F6555 /* v8.xcodeproj */;
@@ -815,13 +805,6 @@
remoteGlobalIDString = D2AAC045055464E500DB518D;
remoteInfo = net;
};
- 33121F020F3CF47F006CB2B0 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 8268503E0F2FCB56009F6555 /* v8.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 897FF1BE0E719CB600D62E90;
- remoteInfo = jscre;
- };
33121F040F3CF47F006CB2B0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8268503E0F2FCB56009F6555 /* v8.xcodeproj */;
@@ -955,13 +938,6 @@
remoteGlobalIDString = 7BD540250D6F727B003CD41E;
remoteInfo = icutu;
};
- 33121F2A0F3CF49C006CB2B0 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 8268503E0F2FCB56009F6555 /* v8.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 897FF1BE0E719CB600D62E90;
- remoteInfo = jscre;
- };
33121F2C0F3CF49C006CB2B0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8268503E0F2FCB56009F6555 /* v8.xcodeproj */;
@@ -1648,13 +1624,6 @@
remoteGlobalIDString = 7B5E85AE0D7F28CD001ECF42;
remoteInfo = wtf;
};
- 8268504A0F2FCB56009F6555 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 8268503E0F2FCB56009F6555 /* v8.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 897FF1BF0E719CB600D62E90;
- remoteInfo = jscre;
- };
8268504C0F2FCB56009F6555 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8268503E0F2FCB56009F6555 /* v8.xcodeproj */;
@@ -3014,7 +2983,6 @@
4D7BFE760E9D52E4009A6919 /* libicuuc.a in Frameworks */,
4D7BFF3A0E9D5378009A6919 /* libjpeg.a in Frameworks */,
E477F6B70F4095660044ABEB /* libjsbindings.a in Frameworks */,
- E477F6B80F4095660044ABEB /* libjscre.a in Frameworks */,
ABFA34C80F425677008FCF5D /* libmedia.a in Frameworks */,
4D7B005E0E9D54BB009A6919 /* libmodp_b64.a in Frameworks */,
4D7B00510E9D5473009A6919 /* libnet.a in Frameworks */,
@@ -3070,7 +3038,6 @@
4D7FA6600F13CBDD004F1B19 /* libicuuc.a in Frameworks */,
331218460F3C024A006CB2B0 /* libjpeg.a in Frameworks */,
E4DCDC9F0F40938D0084059A /* libjsbindings.a in Frameworks */,
- E4DCDCA00F40938D0084059A /* libjscre.a in Frameworks */,
ABFA34C70F425637008FCF5D /* libmedia.a in Frameworks */,
33121A470F3C037E006CB2B0 /* libmodp_b64.a in Frameworks */,
331218410F3C0208006CB2B0 /* libnet.a in Frameworks */,
@@ -3173,7 +3140,6 @@
E45062AC0EE89154003BE099 /* libicuuc.a in Frameworks */,
E43D07310F433A8D003F39CA /* libjpeg.a in Frameworks */,
E4DCDC910F40929C0084059A /* libjsbindings.a in Frameworks */,
- E4DCDC970F4092C10084059A /* libjscre.a in Frameworks */,
ABFA34C50F4255CC008FCF5D /* libmedia.a in Frameworks */,
E48B67CB0F262607002E47EC /* libmodp_b64.a in Frameworks */,
E48B66A80F26257E002E47EC /* libnet.a in Frameworks */,
@@ -4212,7 +4178,6 @@
8268503F0F2FCB56009F6555 /* Products */ = {
isa = PBXGroup;
children = (
- 8268504B0F2FCB56009F6555 /* libjscre.a */,
8268504D0F2FCB56009F6555 /* libv8.a */,
8268504F0F2FCB56009F6555 /* v8_shell */,
826850510F2FCB56009F6555 /* libv8-arm.a */,
@@ -4858,7 +4823,6 @@
826852150F2FD152009F6555 /* PBXTargetDependency */,
8268521B0F2FD197009F6555 /* PBXTargetDependency */,
33121F290F3CF49C006CB2B0 /* PBXTargetDependency */,
- 33121F2B0F3CF49C006CB2B0 /* PBXTargetDependency */,
33121F2D0F3CF49C006CB2B0 /* PBXTargetDependency */,
33121F2F0F3CF49C006CB2B0 /* PBXTargetDependency */,
33121F310F3CF49C006CB2B0 /* PBXTargetDependency */,
@@ -4916,7 +4880,6 @@
33121EFD0F3CF47F006CB2B0 /* PBXTargetDependency */,
33121EFF0F3CF47F006CB2B0 /* PBXTargetDependency */,
33121F010F3CF47F006CB2B0 /* PBXTargetDependency */,
- 33121F030F3CF47F006CB2B0 /* PBXTargetDependency */,
33121F050F3CF47F006CB2B0 /* PBXTargetDependency */,
33121F070F3CF47F006CB2B0 /* PBXTargetDependency */,
33121F090F3CF47F006CB2B0 /* PBXTargetDependency */,
@@ -5007,7 +4970,6 @@
82684CE50F2FAEF4009F6555 /* PBXTargetDependency */,
82684D0D0F2FB10F009F6555 /* PBXTargetDependency */,
33121EDF0F3CF45B006CB2B0 /* PBXTargetDependency */,
- 33121EE10F3CF45B006CB2B0 /* PBXTargetDependency */,
33121EE30F3CF45B006CB2B0 /* PBXTargetDependency */,
33121EE50F3CF45B006CB2B0 /* PBXTargetDependency */,
33121EE70F3CF45B006CB2B0 /* PBXTargetDependency */,
@@ -5377,13 +5339,6 @@
remoteRef = 826850230F2FC82E009F6555 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 8268504B0F2FCB56009F6555 /* libjscre.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libjscre.a;
- remoteRef = 8268504A0F2FCB56009F6555 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
8268504D0F2FCB56009F6555 /* libv8.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -6101,11 +6056,6 @@
name = icutu;
targetProxy = 33121EDE0F3CF45B006CB2B0 /* PBXContainerItemProxy */;
};
- 33121EE10F3CF45B006CB2B0 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = jscre;
- targetProxy = 33121EE00F3CF45B006CB2B0 /* PBXContainerItemProxy */;
- };
33121EE30F3CF45B006CB2B0 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = v8;
@@ -6186,11 +6136,6 @@
name = net;
targetProxy = 33121F000F3CF47F006CB2B0 /* PBXContainerItemProxy */;
};
- 33121F030F3CF47F006CB2B0 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = jscre;
- targetProxy = 33121F020F3CF47F006CB2B0 /* PBXContainerItemProxy */;
- };
33121F050F3CF47F006CB2B0 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = v8;
@@ -6286,11 +6231,6 @@
name = icutu;
targetProxy = 33121F280F3CF49C006CB2B0 /* PBXContainerItemProxy */;
};
- 33121F2B0F3CF49C006CB2B0 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = jscre;
- targetProxy = 33121F2A0F3CF49C006CB2B0 /* PBXContainerItemProxy */;
- };
33121F2D0F3CF49C006CB2B0 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = v8;
diff --git a/net/net.xcodeproj/project.pbxproj b/net/net.xcodeproj/project.pbxproj
index f5e6edb..34567c3 100644
--- a/net/net.xcodeproj/project.pbxproj
+++ b/net/net.xcodeproj/project.pbxproj
@@ -43,7 +43,6 @@
0435A48F0E8DD74B00E4DF08 /* http_auth_handler_digest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0435A48E0E8DD74B00E4DF08 /* http_auth_handler_digest.cc */; };
044605E80F5350FD0058B8B1 /* proxy_resolver_v8.cc in Sources */ = {isa = PBXBuildFile; fileRef = 044605E70F5350FD0058B8B1 /* proxy_resolver_v8.cc */; };
044605EB0F53510A0058B8B1 /* proxy_resolver_v8_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 044605EA0F53510A0058B8B1 /* proxy_resolver_v8_unittest.cc */; };
- 044605FE0F5351DD0058B8B1 /* libjscre.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 044605CA0F5350B00058B8B1 /* libjscre.a */; };
044605FF0F5351DD0058B8B1 /* libv8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 044605CC0F5350B00058B8B1 /* libv8.a */; };
048133550ED27FEF005C5BBC /* url_request_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED33AB0E5A198600A747DB /* url_request_unittest.cc */; };
048268070E5B3B1000A30786 /* mime_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32AA0E5A181C00A747DB /* mime_util.cc */; };
@@ -199,13 +198,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 044605C90F5350B00058B8B1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 044605C00F5350B00058B8B1 /* v8.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 897FF1BF0E719CB600D62E90;
- remoteInfo = jscre;
- };
044605CB0F5350B00058B8B1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 044605C00F5350B00058B8B1 /* v8.xcodeproj */;
@@ -465,18 +457,11 @@
remoteGlobalIDString = E4AFA6220E523E2900201347;
remoteInfo = net_unittests;
};
- F4A0D0230F56DB9900F75F8A /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 044605C00F5350B00058B8B1 /* v8.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 897FF1BE0E719CB600D62E90 /* jscre */;
- remoteInfo = jscre;
- };
F4A0D0250F56DB9900F75F8A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 044605C00F5350B00058B8B1 /* v8.xcodeproj */;
proxyType = 1;
- remoteGlobalIDString = 8970F2EF0E719FB2006AE7B5 /* v8 */;
+ remoteGlobalIDString = 8970F2EF0E719FB2006AE7B5;
remoteInfo = v8;
};
/* End PBXContainerItemProxy section */
@@ -786,7 +771,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 044605FE0F5351DD0058B8B1 /* libjscre.a in Frameworks */,
044605FF0F5351DD0058B8B1 /* libv8.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -821,7 +805,6 @@
044605C10F5350B00058B8B1 /* Products */ = {
isa = PBXGroup;
children = (
- 044605CA0F5350B00058B8B1 /* libjscre.a */,
044605CC0F5350B00058B8B1 /* libv8.a */,
044605CE0F5350B00058B8B1 /* v8_shell */,
044605D00F5350B00058B8B1 /* libv8-arm.a */,
@@ -1310,7 +1293,6 @@
buildRules = (
);
dependencies = (
- F4A0D0240F56DB9900F75F8A /* PBXTargetDependency */,
F4A0D0260F56DB9900F75F8A /* PBXTargetDependency */,
);
name = net;
@@ -1410,13 +1392,6 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 044605CA0F5350B00058B8B1 /* libjscre.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libjscre.a;
- remoteRef = 044605C90F5350B00058B8B1 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
044605CC0F5350B00058B8B1 /* libv8.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -1840,11 +1815,6 @@
target = E4AFA6220E523E2900201347 /* net_unittests */;
targetProxy = E4AFA65B0E52424400201347 /* PBXContainerItemProxy */;
};
- F4A0D0240F56DB9900F75F8A /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = jscre;
- targetProxy = F4A0D0230F56DB9900F75F8A /* PBXContainerItemProxy */;
- };
F4A0D0260F56DB9900F75F8A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = v8;
diff --git a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
index 10ce2f9..c0d9fb4 100644
--- a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
+++ b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
@@ -80,7 +80,6 @@
82F39D130E7EFA5D00785E15 /* libjsbindings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8205AC0E770291008F45CF /* libjsbindings.a */; };
82F39D2B0E7EFC2600785E15 /* libskia.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B82058F0E770291008F45CF /* libskia.a */; };
82F39D400E7EFD9300785E15 /* libxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B82056C0E770291008F45CF /* libxml.a */; };
- 82F39D490E7EFDAA00785E15 /* libjscre.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B82059A0E770291008F45CF /* libjscre.a */; };
82F39D4A0E7EFDAA00785E15 /* libv8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B82059C0E770291008F45CF /* libv8.a */; };
93336F0B0F55FBE50062E3BA /* libwebkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 937DE8840F5347B400D0D638 /* libwebkit.a */; };
93AF4F340EFAFE2C0073C62D /* BMPImageDecoder_unittest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4F300EFAFE2C0073C62D /* BMPImageDecoder_unittest.cpp */; };
@@ -124,7 +123,6 @@
E45069D00EF016C6003BE099 /* libicui18n.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B82054B0E770291008F45CF /* libicui18n.a */; };
E45069D10EF016C6003BE099 /* libicuuc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B82054F0E770291008F45CF /* libicuuc.a */; };
E45069D20EF016C6003BE099 /* libjsbindings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8205AC0E770291008F45CF /* libjsbindings.a */; };
- E45069D30EF016C6003BE099 /* libjscre.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B82059A0E770291008F45CF /* libjscre.a */; };
E45069D40EF016C6003BE099 /* libmodp_b64.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 82F39D040E7EF95A00785E15 /* libmodp_b64.a */; };
E45069D50EF016C6003BE099 /* libnet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8205850E770291008F45CF /* libnet.a */; };
E45069D60EF016C6003BE099 /* libpcre.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8205AE0E770291008F45CF /* libpcre.a */; };
@@ -456,13 +454,6 @@
remoteGlobalIDString = E48EE4CF0E34E855009DE966;
remoteInfo = skia;
};
- 7B8205990E770291008F45CF /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 897FF1BF0E719CB600D62E90;
- remoteInfo = jscre;
- };
7B82059B0E770291008F45CF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
@@ -694,13 +685,6 @@
remoteGlobalIDString = 7B12F2AB0D8EE24200CB6E8F;
remoteInfo = xml;
};
- 82F39D4B0E7EFDB500785E15 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 897FF1BE0E719CB600D62E90;
- remoteInfo = jscre;
- };
82F39D4D0E7EFDB500785E15 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
@@ -719,7 +703,7 @@
isa = PBXContainerItemProxy;
containerPortal = 829E2E250DBE7DE200819EBF /* webkit.xcodeproj */;
proxyType = 1;
- remoteGlobalIDString = 937A15B60F53326C003E8D2D /* webkit */;
+ remoteGlobalIDString = 937A15B60F53326C003E8D2D;
remoteInfo = webkit;
};
E4506A370EF020EE003BE099 /* PBXContainerItemProxy */ = {
@@ -900,7 +884,6 @@
E45069D00EF016C6003BE099 /* libicui18n.a in Frameworks */,
E45069D10EF016C6003BE099 /* libicuuc.a in Frameworks */,
E45069D20EF016C6003BE099 /* libjsbindings.a in Frameworks */,
- E45069D30EF016C6003BE099 /* libjscre.a in Frameworks */,
E45069D40EF016C6003BE099 /* libmodp_b64.a in Frameworks */,
E45069D50EF016C6003BE099 /* libnet.a in Frameworks */,
E45069D60EF016C6003BE099 /* libpcre.a in Frameworks */,
@@ -943,7 +926,6 @@
82F39A010E7EF7F000785E15 /* libicui18n.a in Frameworks */,
82F39A020E7EF7F000785E15 /* libicuuc.a in Frameworks */,
82F39D130E7EFA5D00785E15 /* libjsbindings.a in Frameworks */,
- 82F39D490E7EFDAA00785E15 /* libjscre.a in Frameworks */,
82F39D050E7EF95D00785E15 /* libmodp_b64.a in Frameworks */,
82F39A180E7EF82400785E15 /* libnet.a in Frameworks */,
82F39D120E7EFA5D00785E15 /* libpcre.a in Frameworks */,
@@ -1172,7 +1154,6 @@
7B8205930E770291008F45CF /* Products */ = {
isa = PBXGroup;
children = (
- 7B82059A0E770291008F45CF /* libjscre.a */,
7B82059C0E770291008F45CF /* libv8.a */,
7B82059E0E770291008F45CF /* v8_shell */,
7B779D3C0E82FF2200C2971E /* libv8-arm.a */,
@@ -1432,7 +1413,6 @@
82F39D1D0E7EFA6800785E15 /* PBXTargetDependency */,
4DB7FEA30E9BF90A00C66CE0 /* PBXTargetDependency */,
82F39D1F0E7EFA6800785E15 /* PBXTargetDependency */,
- 82F39D4C0E7EFDB500785E15 /* PBXTargetDependency */,
82F39D4E0E7EFDB500785E15 /* PBXTargetDependency */,
82F39CF70E7EF91900785E15 /* PBXTargetDependency */,
938D0FF40F573E28009F1128 /* PBXTargetDependency */,
@@ -1728,13 +1708,6 @@
remoteRef = 7B82058E0E770291008F45CF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 7B82059A0E770291008F45CF /* libjscre.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libjscre.a;
- remoteRef = 7B8205990E770291008F45CF /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
7B82059C0E770291008F45CF /* libv8.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -2154,11 +2127,6 @@
name = xml;
targetProxy = 82F39D410E7EFD9C00785E15 /* PBXContainerItemProxy */;
};
- 82F39D4C0E7EFDB500785E15 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = jscre;
- targetProxy = 82F39D4B0E7EFDB500785E15 /* PBXContainerItemProxy */;
- };
82F39D4E0E7EFDB500785E15 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = v8;
@@ -2427,6 +2395,7 @@
../../../port/bindings/v8,
../../../../v8/include,
../../../../third_party/WebKit/WebCore/platform/chromium,
+ ../../../../third_party/WebKit/WebCore/platform/graphics,
../../../../third_party/WebKit/WebCore/platform/text,
../../../../third_party/WebKit/WebCore/platform,
../../../../third_party/WebKit/JavaScriptCore/wtf,
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 94990b5..aca31ff 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -38,6 +38,7 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
+ 181A25BD0F57EFCE00939C89 /* V8WebKitPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 181A25BB0F57EFCE00939C89 /* V8WebKitPoint.cpp */; };
25B9F25199984DFE5E4A59AE /* V8WebKitCSSMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 688FFA9B9CEFE9B1B66F8671 /* V8WebKitCSSMatrix.cpp */; };
3C9197C6A7DABB989CBDBF81 /* Playback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C1174C9D4E12AB30D653019A /* Playback.cpp */; };
3CF1E7470F09B352009BC1A7 /* Threading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CF1E7460F09B352009BC1A7 /* Threading.cpp */; };
@@ -1322,7 +1323,6 @@
938D0F760F573770009F1128 /* webkitclient_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 938D0F730F573770009F1128 /* webkitclient_impl.cc */; };
93AF52490F001CAB0073C62D /* media_player_private_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93AF52480F001CAB0073C62D /* media_player_private_impl.cc */; };
93AF57990F0198CD0073C62D /* webkit_glue_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93AF57980F0198CD0073C62D /* webkit_glue_mac.mm */; };
- 97EE9A8C2D6020F99D3D200E /* V8WebKitPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2904951B751F48ED9C632DD6 /* V8WebKitPoint.cpp */; };
A5779DD6BC0DA17AB7DE63D4 /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715E874BCC05E0A3DD5E5D8F /* GCController.cpp */; };
A743B3FB0F45E9CB0035EFA9 /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A743B3F80F45E9CB0035EFA9 /* HTMLElementFactory.cpp */; };
A7CBB2A60F327C8D00360BF5 /* debugger_bridge.cc in Sources */ = {isa = PBXBuildFile; fileRef = A7CBB2A40F327C8D00360BF5 /* debugger_bridge.cc */; };
@@ -1537,10 +1537,10 @@
04C3AFC70EF1E4650046D578 /* WorkerNavigator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerNavigator.h; sourceTree = "<group>"; };
0F9CD02EE3AE2D8974EDFE58 /* RenderBoxModelObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderBoxModelObject.h; sourceTree = "<group>"; };
1459AC310DEBF6A597167F45 /* webplugin_delegate.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = webplugin_delegate.cc; sourceTree = "<group>"; };
+ 181A25BB0F57EFCE00939C89 /* V8WebKitPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8WebKitPoint.cpp; sourceTree = "<group>"; };
+ 181A25BC0F57EFCE00939C89 /* V8WebKitPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8WebKitPoint.h; sourceTree = "<group>"; };
1DF458E80DD265C670E05B03 /* RenderSelectionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSelectionInfo.h; sourceTree = "<group>"; };
20EF92D9CD4E55999674A63E /* CurrentTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurrentTime.h; sourceTree = "<group>"; };
- 2904951B751F48ED9C632DD6 /* V8WebKitPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = V8WebKitPoint.cpp; path = ../chrome/Debug/obj/V8Bindings/DerivedSources/V8WebKitPoint.cpp; sourceTree = SOURCE_ROOT; };
- 2BCE85178EC4DBF2E1135560 /* V8WebKitPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = V8WebKitPoint.h; path = ../chrome/Debug/obj/V8Bindings/DerivedSources/V8WebKitPoint.h; sourceTree = SOURCE_ROOT; };
31493A4FA536C112F8C2FB03 /* PNGImageEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PNGImageEncoder.cpp; path = "../third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp"; sourceTree = SOURCE_ROOT; };
31C1FF1C3BB820B928CFE9BD /* V8DOMWindowCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8DOMWindowCustom.cpp; sourceTree = "<group>"; };
35DEC96C125DC674B5C9FA27 /* Interval.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Interval.cpp; path = port/bindings/v8/extensions/Interval.cpp; sourceTree = SOURCE_ROOT; };
@@ -4858,8 +4858,6 @@
4CDA86D8A0B62BD0EBF07D78 /* AnimationControllerPrivate.h */,
7FF1567A8464BD6DC36B47CD /* MainThreadChromium.cpp */,
31493A4FA536C112F8C2FB03 /* PNGImageEncoder.cpp */,
- 2BCE85178EC4DBF2E1135560 /* V8WebKitPoint.h */,
- 2904951B751F48ED9C632DD6 /* V8WebKitPoint.cpp */,
);
sourceTree = "<group>";
};
@@ -7014,6 +7012,8 @@
7BF88A0E0E71D012000BAF8A /* bindings */ = {
isa = PBXGroup;
children = (
+ 181A25BB0F57EFCE00939C89 /* V8WebKitPoint.cpp */,
+ 181A25BC0F57EFCE00939C89 /* V8WebKitPoint.h */,
7B14AAA80DE3340400F4E646 /* CharsetData.cpp */,
7B00912B0DAFEFBE00F72082 /* CSSGrammar.cpp */,
7B00912C0DAFEFBE00F72082 /* CSSGrammar.h */,
@@ -8778,7 +8778,6 @@
9384489F0F16B06E0075F4C5 /* V8WebKitCSSKeyframesRule.cpp in Sources */,
25B9F25199984DFE5E4A59AE /* V8WebKitCSSMatrix.cpp in Sources */,
938448A00F16B06E0075F4C5 /* V8WebKitCSSTransformValue.cpp in Sources */,
- 97EE9A8C2D6020F99D3D200E /* V8WebKitPoint.cpp in Sources */,
938448A10F16B06E0075F4C5 /* V8WebKitTransitionEvent.cpp in Sources */,
938448A20F16B06E0075F4C5 /* V8WheelEvent.cpp in Sources */,
938448A30F16B06E0075F4C5 /* V8XMLHttpRequest.cpp in Sources */,
@@ -8799,6 +8798,7 @@
938448AF0F16B06E0075F4C5 /* XLinkNames.cpp in Sources */,
938448B00F16B06E0075F4C5 /* XMLNames.cpp in Sources */,
938448B10F16B06E0075F4C5 /* XPathGrammar.cpp in Sources */,
+ 181A25BD0F57EFCE00939C89 /* V8WebKitPoint.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};