changes to get webCore building and some more changes for glue.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1530 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 8 deletions

diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 2483f68..3f2c585 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -855,7 +855,6 @@
 		7B42A3330DE2052F00659DE0 /* ICOImageDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 82C260700DCBA02A005CFE91 /* ICOImageDecoder.h */; };
 		7B42A3340DE2052F00659DE0 /* XBMImageDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 82C260760DCBA03E005CFE91 /* XBMImageDecoder.h */; };
 		7B42A3370DE2052F00659DE0 /* PlatformContextSkia.mm in Sources */ = {isa = PBXBuildFile; fileRef = 822B1BED0DC7793F005C9A96 /* PlatformContextSkia.mm */; };
-		7B42A3380DE2052F00659DE0 /* SkGraphicsContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 822B1BFC0DC77A08005C9A96 /* SkGraphicsContext.mm */; };
 		7B42A3390DE2052F00659DE0 /* SkPaintContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82C260450DCB9A66005CFE91 /* SkPaintContext.cpp */; };
 		7B42A33A0DE2052F00659DE0 /* ImageSourceSkia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82C2604A0DCB9AC1005CFE91 /* ImageSourceSkia.cpp */; };
 		7B42A33B0DE2052F00659DE0 /* BMPImageReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82C260670DCBA013005CFE91 /* BMPImageReader.cpp */; };
@@ -5874,7 +5873,6 @@
 		AB7934480DC66C9B00BC58F3 /* webtextinput_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825405530D92E3DB0006B936 /* webtextinput_impl.cc */; };
 		AB86655F0DC78AAC002CE06A /* cpp_variant.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825404FD0D92E3DA0006B936 /* cpp_variant.cc */; };
 		AB8665610DC78AB9002CE06A /* cpp_bound_class.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825404FA0D92E3DA0006B936 /* cpp_bound_class.cc */; };
-		ABC8C2E90DC7E45A00B59C21 /* SkGraphicsContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 822B1BFC0DC77A08005C9A96 /* SkGraphicsContext.mm */; };
 		ABC8C2EA0DC7E45B00B59C21 /* SkGraphicsContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 822B1BFD0DC77A08005C9A96 /* SkGraphicsContext.h */; };
 		ABD16FA80DC6D4CF0013D3AA /* webinputevent_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 825405440D92E3DA0006B936 /* webinputevent_mac.mm */; };
 		ABD16FA90DC6D4D70013D3AA /* webinputevent.h in Headers */ = {isa = PBXBuildFile; fileRef = 825405450D92E3DA0006B936 /* webinputevent.h */; };
@@ -5885,6 +5883,9 @@
 		E45062E50E40B5420025A81A /* SkiaUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45062DF0E40B5420025A81A /* SkiaUtils.cpp */; };
 		E45062E60E40B5420025A81A /* SkiaUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = E45062E00E40B5420025A81A /* SkiaUtils.h */; };
 		E45063BA0E4104700025A81A /* localized_strings.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8254051A0D92E3DA0006B936 /* localized_strings.cc */; };
+		E450F0460E66EE6900107F73 /* RenderThemeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B5E95A30D7F3E95001ECF42 /* RenderThemeMac.h */; };
+		E450F0470E66EE6A00107F73 /* RenderThemeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B5E95A30D7F3E95001ECF42 /* RenderThemeMac.h */; };
+		E450F0480E66EE6A00107F73 /* RenderThemeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B5E95A30D7F3E95001ECF42 /* RenderThemeMac.h */; };
 		E45620410E268E87005E4685 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BBFD2130DB7D09D00C447C7 /* config.h */; };
 		E45620420E268E87005E4685 /* npruntime_priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B0095DA0DAFF0DC00F72082 /* npruntime_priv.h */; };
 		E45620430E268E87005E4685 /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B2FB8860D81A9C90050E907 /* WebCorePrefix.h */; };
@@ -7590,7 +7591,6 @@
 		E45627E20E2694B8005E4685 /* BackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B5E8BCB0D7F3B39001ECF42 /* BackForwardList.h */; };
 		E45627E40E2694B8005E4685 /* V8Bridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B42A3660DE209B700659DE0 /* V8Bridge.cpp */; };
 		E45627E50E2694B8005E4685 /* PlatformContextSkia.mm in Sources */ = {isa = PBXBuildFile; fileRef = 822B1BED0DC7793F005C9A96 /* PlatformContextSkia.mm */; };
-		E45627E60E2694B8005E4685 /* SkGraphicsContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 822B1BFC0DC77A08005C9A96 /* SkGraphicsContext.mm */; };
 		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 */; };
@@ -13006,7 +13006,7 @@
 		E48A07220E3F95A000172919 /* NativeImageSkia.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NativeImageSkia.cpp; sourceTree = "<group>"; };
 		E48A07230E3F95A000172919 /* NativeImageSkia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeImageSkia.h; sourceTree = "<group>"; };
 		E49E507C0E65D36300AD47F7 /* ScrollViewMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScrollViewMac.mm; path = port/platform/mac/ScrollViewMac.mm; sourceTree = SOURCE_ROOT; };
-		E49E50DE0E65E33200AD47F7 /* RenderThemeMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RenderThemeMac.mm; path = port/rendering/RenderThemeMac.mm; sourceTree = SOURCE_ROOT; };
+		E49E50DE0E65E33200AD47F7 /* RenderThemeMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RenderThemeMac.mm; path = rendering/RenderThemeMac.mm; sourceTree = "<group>"; };
 		E4A238C50E3FA19C002BDE14 /* image_decoder.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = image_decoder.cc; path = glue/image_decoder.cc; sourceTree = "<group>"; };
 		E4A238C60E3FA19C002BDE14 /* image_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = image_decoder.h; path = glue/image_decoder.h; sourceTree = "<group>"; };
 		E4A970720E36128B00E8EF3B /* FrameWin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FrameWin.h; path = port/bridge/FrameWin.h; sourceTree = SOURCE_ROOT; };
@@ -16514,7 +16514,6 @@
 				7B5E95A10D7F3E95001ECF42 /* RenderTheme.cpp */,
 				7B5E95A20D7F3E95001ECF42 /* RenderTheme.h */,
 				7B5E95A30D7F3E95001ECF42 /* RenderThemeMac.h */,
-				E49E50DE0E65E33200AD47F7 /* RenderThemeMac.mm */,
 				7B5E95AA0D7F3E95001ECF42 /* RenderTreeAsText.cpp */,
 				7B5E95AB0D7F3E95001ECF42 /* RenderTreeAsText.h */,
 				7B5E95AC0D7F3E95001ECF42 /* RenderVideo.cpp */,
@@ -17054,6 +17053,7 @@
 				7B14AA440DE323A000F4E646 /* history */,
 				E4A970880E3614F200E8EF3B /* page */,
 				822B1BE60DC778FF005C9A96 /* platform */,
+				E450EF7B0E65F4E700107F73 /* rendering */,
 			);
 			path = port;
 			sourceTree = "<group>";
@@ -18725,6 +18725,14 @@
 			path = xbm;
 			sourceTree = "<group>";
 		};
+		E450EF7B0E65F4E700107F73 /* rendering */ = {
+			isa = PBXGroup;
+			children = (
+				E49E50DE0E65E33200AD47F7 /* RenderThemeMac.mm */,
+			);
+			name = rendering;
+			sourceTree = "<group>";
+		};
 		E45628270E269688005E4685 /* network */ = {
 			isa = PBXGroup;
 			children = (
@@ -18852,6 +18860,7 @@
 				E48A06DD0E3F840F00172919 /* image_resource_fetcher.h in Headers */,
 				E4A238CA0E3FA19C002BDE14 /* image_decoder.h in Headers */,
 				7B9634C50E42194A0031E809 /* ResourceRequest.h in Headers */,
+				E450F0470E66EE6A00107F73 /* RenderThemeMac.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -21984,6 +21993,7 @@
 				E4A9708D0E36150500E8EF3B /* ChromeClientWin.h in Headers */,
 				E48A06DB0E3F840F00172919 /* image_resource_fetcher.h in Headers */,
 				E4A238CC0E3FA19C002BDE14 /* image_decoder.h in Headers */,
+				E450F0480E66EE6A00107F73 /* RenderThemeMac.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -22893,6 +22903,7 @@
 				E4A9708C0E36150500E8EF3B /* ChromeClientWin.h in Headers */,
 				E48A06DF0E3F840F00172919 /* image_resource_fetcher.h in Headers */,
 				E4A238C80E3FA19C002BDE14 /* image_decoder.h in Headers */,
+				E450F0460E66EE6900107F73 /* RenderThemeMac.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -23634,7 +23645,6 @@
 			files = (
 				7B42A3680DE209B700659DE0 /* V8Bridge.cpp in Sources */,
 				7B42A3370DE2052F00659DE0 /* PlatformContextSkia.mm in Sources */,
-				7B42A3380DE2052F00659DE0 /* SkGraphicsContext.mm in Sources */,
 				7B42A3390DE2052F00659DE0 /* SkPaintContext.cpp in Sources */,
 				7B42A33A0DE2052F00659DE0 /* ImageSourceSkia.cpp in Sources */,
 				7B42A33B0DE2052F00659DE0 /* BMPImageReader.cpp in Sources */,
@@ -25342,7 +25352,6 @@
 			files = (
 				7B9375A60D91902F008B9587 /* KJSBridge.cpp in Sources */,
 				822B1BEF0DC7793F005C9A96 /* PlatformContextSkia.mm in Sources */,
-				ABC8C2E90DC7E45A00B59C21 /* SkGraphicsContext.mm in Sources */,
 				82C260470DCB9A66005CFE91 /* SkPaintContext.cpp in Sources */,
 				82C2604C0DCB9AC1005CFE91 /* ImageSourceSkia.cpp in Sources */,
 				82C2606B0DCBA013005CFE91 /* BMPImageReader.cpp in Sources */,
@@ -27115,7 +27124,6 @@
 			files = (
 				E45627E40E2694B8005E4685 /* V8Bridge.cpp in Sources */,
 				E45627E50E2694B8005E4685 /* PlatformContextSkia.mm in Sources */,
-				E45627E60E2694B8005E4685 /* SkGraphicsContext.mm in Sources */,
 				E45627E70E2694B8005E4685 /* SkPaintContext.cpp in Sources */,
 				E45627E80E2694B8005E4685 /* ImageSourceSkia.cpp in Sources */,
 				E45627E90E2694B8005E4685 /* BMPImageReader.cpp in Sources */,