summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj35
-rw-r--r--webkit/webkit.xcodeproj/project.pbxproj12
2 files changed, 8 insertions, 39 deletions
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;
};