Title: [161698] trunk/Source/WebCore
- Revision
- 161698
- Author
- [email protected]
- Date
- 2014-01-10 16:44:31 -0800 (Fri, 10 Jan 2014)
Log Message
Fix CharsetData.cpp build for iOS
https://bugs.webkit.org/show_bug.cgi?id=126792
Reviewed by Mark Rowe.
CharsetData.cpp should have an empty CharsetTable list for iOS.
Achieve this with an iOS-specific encodings.txt file.
* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
* platform/text/mac/ios-encodings.txt: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161697 => 161698)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 00:38:16 UTC (rev 161697)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 00:44:31 UTC (rev 161698)
@@ -1,3 +1,17 @@
+2014-01-10 Simon Fraser <[email protected]>
+
+ Fix CharsetData.cpp build for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=126792
+
+ Reviewed by Mark Rowe.
+
+ CharsetData.cpp should have an empty CharsetTable list for iOS.
+ Achieve this with an iOS-specific encodings.txt file.
+
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/text/mac/ios-encodings.txt: Added.
+
2014-01-10 Anders Carlsson <[email protected]>
CTTE in NavigationScheduler
Modified: trunk/Source/WebCore/DerivedSources.make (161697 => 161698)
--- trunk/Source/WebCore/DerivedSources.make 2014-01-11 00:38:16 UTC (rev 161697)
+++ trunk/Source/WebCore/DerivedSources.make 2014-01-11 00:44:31 UTC (rev 161698)
@@ -1181,7 +1181,13 @@
# character set name table
-CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/character-sets.txt platform/text/mac/mac-encodings.txt
+ifeq ($(WTF_PLATFORM_IOS),1)
+ENCODINGS_FILENAME := ios-encodings.txt
+else
+ENCODINGS_FILENAME := mac-encodings.txt
+endif # WTF_PLATFORM_IOS
+
+CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/character-sets.txt platform/text/mac/$(ENCODINGS_FILENAME)
perl $^ kTextEncoding > $@
# --------
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161697 => 161698)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-11 00:38:16 UTC (rev 161697)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-11 00:44:31 UTC (rev 161698)
@@ -7217,6 +7217,7 @@
0F3F0E57157030C3006DA57F /* RenderGeometryMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderGeometryMap.cpp; sourceTree = "<group>"; };
0F3F0E58157030C3006DA57F /* RenderGeometryMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderGeometryMap.h; sourceTree = "<group>"; };
0F4E57161313276200CF85AF /* RenderSVGAllInOne.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGAllInOne.cpp; sourceTree = "<group>"; };
+ 0F54DCCC1880C6AB003EEDBB /* ios-encodings.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "ios-encodings.txt"; sourceTree = "<group>"; };
0F56028D0E4B76580065B038 /* RenderMarquee.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMarquee.h; sourceTree = "<group>"; };
0F56028E0E4B76580065B038 /* RenderMarquee.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMarquee.cpp; sourceTree = "<group>"; };
0F580B090F12A2690051D689 /* GraphicsLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsLayer.cpp; sourceTree = "<group>"; };
@@ -20046,6 +20047,7 @@
B2C3D9FA0D006C1D00EF6F26 /* CharsetData.h */,
F5973DDE15CFB2030027F804 /* LocaleMac.h */,
F5973DDF15CFB2030027F804 /* LocaleMac.mm */,
+ 0F54DCCC1880C6AB003EEDBB /* ios-encodings.txt */,
B2AFFC860D00A5DF0030074D /* mac-encodings.txt */,
B2AFFC870D00A5DF0030074D /* make-charset-table.pl */,
B2AFFC8C0D00A5DF0030074D /* TextBoundaries.mm */,
Added: trunk/Source/WebCore/platform/text/mac/ios-encodings.txt (0 => 161698)
--- trunk/Source/WebCore/platform/text/mac/ios-encodings.txt (rev 0)
+++ trunk/Source/WebCore/platform/text/mac/ios-encodings.txt 2014-01-11 00:44:31 UTC (rev 161698)
@@ -0,0 +1,11 @@
+# We'd like to eliminate this file.
+# It would be nice to get rid of dependence on the TextEncodingConvert entirely.
+# Perhaps we can prove these are not used on the web and remove them.
+# Or perhaps we can get them added to ICU.
+
+# The items on the left are names of TEC TextEncoding values (without the leading kTextEncoding).
+# The items on the right are IANA character set names. Names listed in character-sets.txt are not
+# repeated here; mentioning any one character set from a group in there pulls in all the aliases in
+# that group.
+
+# No encodings for iOS
Property changes on: trunk/Source/WebCore/platform/text/mac/ios-encodings.txt
___________________________________________________________________
Added: svn:mime-type
Added: svn:keywords
Added: svn:eol-style
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
