Diff
Modified: trunk/Source/WebCore/ChangeLog (148707 => 148708)
--- trunk/Source/WebCore/ChangeLog 2013-04-18 22:29:31 UTC (rev 148707)
+++ trunk/Source/WebCore/ChangeLog 2013-04-18 22:34:26 UTC (rev 148708)
@@ -1,3 +1,18 @@
+2013-04-18 Sam Weinig <[email protected]>
+
+ Network Process crashing trying to read in IDNScriptWhiteList.txt
+ https://bugs.webkit.org/show_bug.cgi?id=114827
+
+ Reviewed by Anders Carlsson.
+
+ Move IDNScriptWhiteList.txt from WebKit to WebCore, so that the NetworkProcess does not have to link against
+ WebKit. It was a layering violation for WebCore to be trying to access WebKit resources anyway.
+
+ * Resources/IDNScriptWhiteList.txt: Copied from Source/WebKit/mac/Resources/IDNScriptWhiteList.txt.
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/mac/WebCoreNSURLExtras.mm:
+ (WebCore::readIDNScriptWhiteList):
+
2013-04-18 Simon Fraser <[email protected]>
Remove GraphicsLayerCA::constrainedSize() now that we can manage large layer memory use ourselves in TileController
Copied: trunk/Source/WebCore/Resources/IDNScriptWhiteList.txt (from rev 148645, trunk/Source/WebKit/mac/Resources/IDNScriptWhiteList.txt) (0 => 148708)
--- trunk/Source/WebCore/Resources/IDNScriptWhiteList.txt (rev 0)
+++ trunk/Source/WebCore/Resources/IDNScriptWhiteList.txt 2013-04-18 22:34:26 UTC (rev 148708)
@@ -0,0 +1,23 @@
+# Default Web Kit International Domain Name Script White List.
+
+Common
+Inherited
+
+Arabic
+Armenian
+Bopomofo
+Canadian_Aboriginal
+Devanagari
+Deseret
+Gujarati
+Gurmukhi
+Hangul
+Han
+Hebrew
+Hiragana
+Katakana_Or_Hiragana
+Katakana
+Latin
+Tamil
+Thai
+Yi
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (148707 => 148708)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-04-18 22:29:31 UTC (rev 148707)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-04-18 22:34:26 UTC (rev 148708)
@@ -1995,6 +1995,7 @@
7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
7AFD4FF4113277B60035B883 /* ScriptDebugListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
7C522D4B15B477E8009B7C95 /* InspectorOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C522D4915B477E8009B7C95 /* InspectorOverlay.cpp */; };
+ 7CC7E3D717208C0F003C5277 /* IDNScriptWhiteList.txt in Resources */ = {isa = PBXBuildFile; fileRef = 7CC7E3D617208C0F003C5277 /* IDNScriptWhiteList.txt */; };
7CE30DA9171B63D200EC33E1 /* FrameSnapshottingMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CE30DA7171B63D200EC33E1 /* FrameSnapshottingMac.mm */; };
7CE30DAA171B63D200EC33E1 /* FrameSnapshottingMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CE30DA8171B63D200EC33E1 /* FrameSnapshottingMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
7E12E90F15FA5D3A005E4126 /* CustomFilterMeshGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E12E90D15FA5D3A005E4126 /* CustomFilterMeshGenerator.h */; };
@@ -8430,6 +8431,7 @@
7C6136F71710C35200FF4A57 /* InFilesCompiler.pm */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; name = InFilesCompiler.pm; path = scripts/InFilesCompiler.pm; sourceTree = "<group>"; };
7C6136F81710C35200FF4A57 /* InFilesParser.pm */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; name = InFilesParser.pm; path = scripts/InFilesParser.pm; sourceTree = "<group>"; };
7C6136F91710C35200FF4A57 /* StaticString.pm */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; name = StaticString.pm; path = scripts/StaticString.pm; sourceTree = "<group>"; };
+ 7CC7E3D617208C0F003C5277 /* IDNScriptWhiteList.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDNScriptWhiteList.txt; sourceTree = "<group>"; };
7CE30DA7171B63D200EC33E1 /* FrameSnapshottingMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FrameSnapshottingMac.mm; sourceTree = "<group>"; };
7CE30DA8171B63D200EC33E1 /* FrameSnapshottingMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameSnapshottingMac.h; sourceTree = "<group>"; };
7E12E90D15FA5D3A005E4126 /* CustomFilterMeshGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomFilterMeshGenerator.h; path = filters/CustomFilterMeshGenerator.h; sourceTree = "<group>"; };
@@ -13207,6 +13209,7 @@
85136C890AED665800F90A3D /* eastResizeCursor.png */,
85136C8A0AED665800F90A3D /* eastWestResizeCursor.png */,
85136C8B0AED665800F90A3D /* helpCursor.png */,
+ 7CC7E3D617208C0F003C5277 /* IDNScriptWhiteList.txt */,
93153BE314195B2900FCF5BE /* inputSpeech.png */,
2D9F0E1214FF1CBF00BA0FF7 /* linearSRGB.icc */,
85136C8C0AED665800F90A3D /* linkCursor.png */,
@@ -24186,6 +24189,7 @@
85136CA80AED665900F90A3D /* westResizeCursor.png in Resources */,
1AB1AE7A0C051FDE00139F4F /* zoomInCursor.png in Resources */,
1AB1AE7B0C051FDE00139F4F /* zoomOutCursor.png in Resources */,
+ 7CC7E3D717208C0F003C5277 /* IDNScriptWhiteList.txt in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm (148707 => 148708)
--- trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm 2013-04-18 22:29:31 UTC (rev 148707)
+++ trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm 2013-04-18 22:34:26 UTC (rev 148708)
@@ -162,7 +162,7 @@
}
// Fall back on white list inside bundle.
- NSBundle *bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
+ NSBundle *bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebCore"];
if (!readIDNScriptWhiteListFile([bundle pathForResource:@"IDNScriptWhiteList" ofType:@"txt"]))
CRASH();
Modified: trunk/Source/WebKit/ChangeLog (148707 => 148708)
--- trunk/Source/WebKit/ChangeLog 2013-04-18 22:29:31 UTC (rev 148707)
+++ trunk/Source/WebKit/ChangeLog 2013-04-18 22:34:26 UTC (rev 148708)
@@ -1,3 +1,15 @@
+2013-04-18 Sam Weinig <[email protected]>
+
+ Network Process crashing trying to read in IDNScriptWhiteList.txt
+ https://bugs.webkit.org/show_bug.cgi?id=114827
+
+ Reviewed by Anders Carlsson.
+
+ Move IDNScriptWhiteList.txt from WebKit to WebCore, so that the NetworkProcess does not have to link against
+ WebKit. It was a layering violation for WebCore to be trying to access WebKit resources anyway.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2013-04-14 Roger Fong <[email protected]>
Copy make-file-export-generator script to the the Source folders of the projects that use it.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (148707 => 148708)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2013-04-18 22:29:31 UTC (rev 148707)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2013-04-18 22:34:26 UTC (rev 148708)
@@ -244,7 +244,6 @@
939810B10824BF01008DF038 /* WebPluginContainerCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E1150307EFFEBF009B8BF7 /* WebPluginContainerCheck.h */; };
939810B50824BF01008DF038 /* WebAuthenticationPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 9345D17B0365BF35008635CE /* WebAuthenticationPanel.nib */; };
939810B70824BF01008DF038 /* url_icon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F5B67130023EDF8901C1A525 /* url_icon.tiff */; };
- 939810BA0824BF01008DF038 /* IDNScriptWhiteList.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9325FBDC07D829AE00159862 /* IDNScriptWhiteList.txt */; };
939810BC0824BF01008DF038 /* WebBackForwardList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3944607E020F50ED0ECA1767 /* WebBackForwardList.mm */; };
939810BD0824BF01008DF038 /* WebHistoryItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39446080020F50ED0ECA1767 /* WebHistoryItem.mm */; };
939810BE0824BF01008DF038 /* WebURLsWithTitles.m in Sources */ = {isa = PBXBuildFile; fileRef = F5E0A76F02B8FEE401C1A525 /* WebURLsWithTitles.m */; };
@@ -595,7 +594,6 @@
931633EA0AEDFF930062B92D /* WebFrameLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameLoaderClient.h; sourceTree = "<group>"; };
931633EE0AEDFFAE0062B92D /* WebFrameLoaderClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameLoaderClient.mm; sourceTree = "<group>"; };
93185DB506679F42005D5E7E /* WebHTMLViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebHTMLViewInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- 9325FBDC07D829AE00159862 /* IDNScriptWhiteList.txt */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = text; path = IDNScriptWhiteList.txt; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
933D659903413FF2008635CE /* WebClipView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebClipView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
933D659A03413FF2008635CE /* WebClipView.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 4; path = WebClipView.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
9345D17C0365BF35008635CE /* English */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = wrapper.nib; name = English; path = Panels/English.lproj/WebAuthenticationPanel.nib; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -829,7 +827,6 @@
isa = PBXGroup;
children = (
1C9F5EFB1651CDF700C480F8 /* Dock.pdf */,
- 9325FBDC07D829AE00159862 /* IDNScriptWhiteList.txt */,
939811320824BF01008DF038 /* Info.plist */,
F5B67130023EDF8901C1A525 /* url_icon.tiff */,
5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib */,
@@ -1685,7 +1682,6 @@
buildActionMask = 2147483647;
files = (
1C9F5EFC1651CDF700C480F8 /* Dock.pdf in Resources */,
- 939810BA0824BF01008DF038 /* IDNScriptWhiteList.txt in Resources */,
A864B3F6123ED9FA00C2A612 /* MailQuirksUserScript.js in Resources */,
29AEF960134C76FB00FE5096 /* OutlookQuirksUserScript.js in Resources */,
939810B70824BF01008DF038 /* url_icon.tiff in Resources */,
Modified: trunk/Source/WebKit/mac/ChangeLog (148707 => 148708)
--- trunk/Source/WebKit/mac/ChangeLog 2013-04-18 22:29:31 UTC (rev 148707)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-04-18 22:34:26 UTC (rev 148708)
@@ -1,3 +1,15 @@
+2013-04-18 Sam Weinig <[email protected]>
+
+ Network Process crashing trying to read in IDNScriptWhiteList.txt
+ https://bugs.webkit.org/show_bug.cgi?id=114827
+
+ Reviewed by Anders Carlsson.
+
+ Move IDNScriptWhiteList.txt from WebKit to WebCore, so that the NetworkProcess does not have to link against
+ WebKit. It was a layering violation for WebCore to be trying to access WebKit resources anyway.
+
+ * Resources/IDNScriptWhiteList.txt: Removed.
+
2013-04-17 Geoffrey Garen <[email protected]>
Renamed JSGlobalData to VM
Deleted: trunk/Source/WebKit/mac/Resources/IDNScriptWhiteList.txt (148707 => 148708)
--- trunk/Source/WebKit/mac/Resources/IDNScriptWhiteList.txt 2013-04-18 22:29:31 UTC (rev 148707)
+++ trunk/Source/WebKit/mac/Resources/IDNScriptWhiteList.txt 2013-04-18 22:34:26 UTC (rev 148708)
@@ -1,23 +0,0 @@
-# Default Web Kit International Domain Name Script White List.
-
-Common
-Inherited
-
-Arabic
-Armenian
-Bopomofo
-Canadian_Aboriginal
-Devanagari
-Deseret
-Gujarati
-Gurmukhi
-Hangul
-Han
-Hebrew
-Hiragana
-Katakana_Or_Hiragana
-Katakana
-Latin
-Tamil
-Thai
-Yi
