summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-11 17:46:31 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-11 17:46:31 +0000
commit697bd5e5ce0d19ca051ca5f3a5d8c7d068bcd7d9 (patch)
tree3992bc9f5de5bf9439f4b8cea0154295a5fb6ea7
parent6aa957dc3653f1b2d72a9686f6196dc2f74807a0 (diff)
downloadchromium_src-697bd5e5ce0d19ca051ca5f3a5d8c7d068bcd7d9.zip
chromium_src-697bd5e5ce0d19ca051ca5f3a5d8c7d068bcd7d9.tar.gz
chromium_src-697bd5e5ce0d19ca051ca5f3a5d8c7d068bcd7d9.tar.bz2
Use ImageSourceCG instead of ImageSourceSkia. Add "port" target to "all" as it now completely builds!
Review URL: http://codereview.chromium.org/2426 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2072 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/webkit.xcodeproj/project.pbxproj19
1 files changed, 16 insertions, 3 deletions
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 41360ca..52743c9 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -27,6 +27,7 @@
E45627B80E2691D0005E4685 /* PBXTargetDependency */,
E4E4C80A0E78209B009A687C /* PBXTargetDependency */,
7BF892040E73143E000BAF8A /* PBXTargetDependency */,
+ E4E4C9600E797883009A687C /* PBXTargetDependency */,
E45627C50E26921D005E4685 /* PBXTargetDependency */,
E45627BC0E2691D0005E4685 /* PBXTargetDependency */,
);
@@ -1131,7 +1132,6 @@
E45627160E268F26005E4685 /* resource_handle_win.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825405290D92E3DA0006B936 /* resource_handle_win.cc */; };
E45627E40E2694B8005E4685 /* V8Bridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B42A3660DE209B700659DE0 /* V8Bridge.cpp */; };
E45627E70E2694B8005E4685 /* SkPaintContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82C260450DCB9A66005CFE91 /* SkPaintContext.cpp */; };
- E45627E80E2694B8005E4685 /* ImageSourceSkia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82C2604A0DCB9AC1005CFE91 /* ImageSourceSkia.cpp */; };
E45627E90E2694B8005E4685 /* BMPImageReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82C260670DCBA013005CFE91 /* BMPImageReader.cpp */; };
E45627EA0E2694B8005E4685 /* BMPImageDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82C260690DCBA013005CFE91 /* BMPImageDecoder.cpp */; };
E45627EB0E2694B8005E4685 /* ICOImageDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82C260710DCBA02A005CFE91 /* ICOImageDecoder.cpp */; };
@@ -1151,6 +1151,7 @@
E4E4C7F90E781B5B009A687C /* webplugin_impl_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E4C7F80E781B5B009A687C /* webplugin_impl_mac.mm */; };
E4E4C8560E7832E2009A687C /* PlatformContextSkia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4E4C8530E7832DC009A687C /* PlatformContextSkia.cpp */; };
E4E4C88F0E783E49009A687C /* SkGraphicsContextMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4E4C88E0E783E49009A687C /* SkGraphicsContextMac.cpp */; };
+ E4E4C94A0E797648009A687C /* ImageSourceCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8FBD0D7F3CC1001ECF42 /* ImageSourceCG.cpp */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -1158,7 +1159,7 @@
isa = PBXContainerItemProxy;
containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
proxyType = 1;
- remoteGlobalIDString = 7B58F7A60DAFC59B006F0EB5 /* jsconfig */;
+ remoteGlobalIDString = 7B58F7A60DAFC59B006F0EB5;
remoteInfo = jsconfig;
};
7BF88B770E71F3FA000BAF8A /* PBXContainerItemProxy */ = {
@@ -1245,6 +1246,13 @@
remoteGlobalIDString = E45626A20E268F03005E4685;
remoteInfo = glue;
};
+ E4E4C95F0E797883009A687C /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = E45627CF0E2694B8005E4685 /* port */;
+ remoteInfo = port;
+ };
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
@@ -8049,7 +8057,6 @@
7B2B0A610E3143EC00D4C6B7 /* GIFImageReader.cpp in Sources */,
E4CD5A720E3E44CC00A70177 /* HistoryWin.cpp in Sources */,
E45627EB0E2694B8005E4685 /* ICOImageDecoder.cpp in Sources */,
- E45627E80E2694B8005E4685 /* ImageSourceSkia.cpp in Sources */,
7B2B0A630E3143EC00D4C6B7 /* JPEGImageDecoder.cpp in Sources */,
E48A07280E3F95A000172919 /* NativeImageSkia.cpp in Sources */,
7B2B0A650E3143EC00D4C6B7 /* PNGImageDecoder.cpp in Sources */,
@@ -8060,6 +8067,7 @@
E45627EC0E2694B8005E4685 /* XBMImageDecoder.cpp in Sources */,
E4E4C8560E7832E2009A687C /* PlatformContextSkia.cpp in Sources */,
E4E4C88F0E783E49009A687C /* SkGraphicsContextMac.cpp in Sources */,
+ E4E4C94A0E797648009A687C /* ImageSourceCG.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -8131,6 +8139,11 @@
target = E45626A20E268F03005E4685 /* glue */;
targetProxy = E4E4C8090E78209B009A687C /* PBXContainerItemProxy */;
};
+ E4E4C9600E797883009A687C /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = E45627CF0E2694B8005E4685 /* port */;
+ targetProxy = E4E4C95F0E797883009A687C /* PBXContainerItemProxy */;
+ };
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */