Modified: trunk/Source/WebCore/ChangeLog (271187 => 271188)
--- trunk/Source/WebCore/ChangeLog 2021-01-06 03:03:44 UTC (rev 271187)
+++ trunk/Source/WebCore/ChangeLog 2021-01-06 03:11:17 UTC (rev 271188)
@@ -1,3 +1,18 @@
+2021-01-05 Megan Gardner <[email protected]>
+
+ Copy Localizable.strings file into the correct directory
+ https://bugs.webkit.org/show_bug.cgi?id=220029
+
+ Reviewed by Tim Horton.
+
+ After the changes in r269865, r269873, r269915, r269932, r269937 the localizable.strings
+ was not showing up in the right place in the production build to allow it to be correctly
+ localized. This skips the step of putting it in DerivedSources and just puts the
+ concatenated file in the final correct directory so we do not have to relay on Xcode build
+ doing the correct thing for us.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
2021-01-05 Peng Liu <[email protected]>
[Media in GPU Process][MSE] SourceBuffer fires update and updateend events before the coded frames are removed
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (271187 => 271188)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-01-06 03:03:44 UTC (rev 271187)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-01-06 03:11:17 UTC (rev 271188)
@@ -1209,7 +1209,6 @@
43B85ED418CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43B85ED218CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.cpp */; };
43C092BC12D9E4EE00A989C3 /* RenderSVGForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C092BA12D9E4EE00A989C3 /* RenderSVGForeignObject.h */; };
43EDD67F1B485DBF00640E75 /* CombinedFiltersAlphabet.h in Headers */ = {isa = PBXBuildFile; fileRef = 43EDD67D1B485DBF00640E75 /* CombinedFiltersAlphabet.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 440EDBD1255E116C00300BA7 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 446EE4E8255E0D9200454463 /* Localizable.strings */; };
4415292E0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
4425070925829A2700C09368 /* AppHighlightStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4425070725829A1400C09368 /* AppHighlightStorage.h */; };
4430D00B2575A83E0046D401 /* Highlight.h in Headers */ = {isa = PBXBuildFile; fileRef = 44E88E51236A5C8D009B4847 /* Highlight.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -6048,8 +6047,8 @@
0F4CDEAA23D91A8A00251B02 /* ScrollTypes.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollTypes.cpp; sourceTree = "<group>"; };
0F53FB81213B1BB800C40D34 /* CSSFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFilter.cpp; sourceTree = "<group>"; };
0F53FB83213B1BB800C40D34 /* CSSFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFilter.h; sourceTree = "<group>"; };
+ 0F53FB83213B786400C40D34 /* RenderLayerScrollableArea.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayerScrollableArea.cpp; sourceTree = "<group>"; };
0F53FB84213B786400C40D34 /* RenderLayerScrollableArea.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RenderLayerScrollableArea.h; sourceTree = "<group>"; };
- 0F53FB83213B786400C40D34 /* RenderLayerScrollableArea.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayerScrollableArea.cpp; sourceTree = "<group>"; };
0F53FB89213B768400C40D34 /* RenderLayerFilters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RenderLayerFilters.h; sourceTree = "<group>"; };
0F53FB8B213B768400C40D34 /* RenderLayerFilters.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayerFilters.cpp; sourceTree = "<group>"; };
0F54DCE31881051D003EEDBB /* TextAutoSizing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextAutoSizing.cpp; sourceTree = "<group>"; };
@@ -8089,7 +8088,7 @@
445775E420472F73008DCE5D /* LocalDefaultSystemAppearance.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocalDefaultSystemAppearance.h; sourceTree = "<group>"; };
445775E92047303B008DCE5D /* LocalDefaultSystemAppearance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalDefaultSystemAppearance.mm; sourceTree = "<group>"; };
446DC64624A29D9B0061F390 /* PlaybackTargetClientContextIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlaybackTargetClientContextIdentifier.h; sourceTree = "<group>"; };
- 446EE4E8255E0D9200454463 /* Localizable.strings */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 4; name = Localizable.strings; path = DerivedSources/WebCore/Localizable.strings; sourceTree = BUILT_PRODUCTS_DIR; };
+ 446EE4E8255E0D9200454463 /* Localizable.strings */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 4; name = Localizable.strings; path = DerivedSources/WebCore/en.lproj/Localizable.strings; sourceTree = BUILT_PRODUCTS_DIR; };
4471710B205AF945000A116E /* MediaQueryParserContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaQueryParserContext.cpp; sourceTree = "<group>"; };
4471710C205AF945000A116E /* MediaQueryParserContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaQueryParserContext.h; sourceTree = "<group>"; };
447958021643B47B001E0A7F /* ParsedContentType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParsedContentType.cpp; sourceTree = "<group>"; };
@@ -19754,6 +19753,13 @@
path = ios;
sourceTree = "<group>";
};
+ 44406BC6258D492E0070B065 /* en.lproj */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ name = en.lproj;
+ sourceTree = "<group>";
+ };
4497D58C0EBA854F00A10552 /* ios */ = {
isa = PBXGroup;
children = (
@@ -21639,6 +21645,7 @@
6565814809D13043000E61D7 /* CSSValueKeywords.h */,
E334825E1DC93AA0009C9544 /* DOMJITAbstractHeapRepository.h */,
E1C6CFC21746D293007B87A1 /* DOMWindowConstructors.idl */,
+ 44406BC6258D492E0070B065 /* en.lproj */,
9BCCCA5320E7095D0068FB03 /* EventFactory.cpp */,
970B72A5145008EB00F00A37 /* EventHeaders.h */,
970B7289144FFAC600F00A37 /* EventInterfaces.h */,
@@ -31433,6 +31440,7 @@
7CAC6AE9247F082F00E61D59 /* ColorMatrix.h in Headers */,
7CD1E69324ABF6240089C419 /* ColorSerialization.h in Headers */,
9382DF5810A8D5C900925652 /* ColorSpace.h in Headers */,
+ BCAFEDB425968D0B0030E6AA /* ColorSpaceCG.h in Headers */,
7C029C6E2493C8F800268204 /* ColorTypes.h in Headers */,
0FEAF66B23BFC39E004030DA /* ColorUtilities.h in Headers */,
BCDD454E1236C95C009A7985 /* ColumnInfo.h in Headers */,
@@ -34814,7 +34822,6 @@
B22279F20D00BF220071B782 /* SVGFELightElement.h in Headers */,
B22279F40D00BF220071B782 /* SVGFEMergeElement.h in Headers */,
B22279F70D00BF220071B782 /* SVGFEMergeNodeElement.h in Headers */,
- BCAFEDB425968D0B0030E6AA /* ColorSpaceCG.h in Headers */,
84224194107E78A700766A87 /* SVGFEMorphologyElement.h in Headers */,
B22279FA0D00BF220071B782 /* SVGFEOffsetElement.h in Headers */,
B22279FD0D00BF220071B782 /* SVGFEPointLightElement.h in Headers */,
@@ -35531,7 +35538,7 @@
93F198A608245E59001E9ABC /* Headers */,
1C11CCB40AA6093700DADB20 /* Copy Generated Headers */,
3717D7E717ECC573003C276D /* Copy Scripts */,
- 446EE4E7255DF00D00454463 /* Concatenate Localizable.strings */,
+ 446EE4E7255DF00D00454463 /* Concatenate and Copy Localizable.strings */,
93F199FD08245E59001E9ABC /* Resources */,
CD0DBF001422765700280263 /* Copy Audio Resources */,
93F19A0C08245E59001E9ABC /* Sources */,
@@ -35647,7 +35654,6 @@
2D9F0E1314FF1CBF00BA0FF7 /* linearSRGB.icc in Resources */,
E59DD4B821098287003C8B47 /* ListButtonArrow.png in Resources */,
E516699120FF9918009D2C27 /* [email protected] in Resources */,
- 440EDBD1255E116C00300BA7 /* Localizable.strings in Resources */,
837A80131E1E127300026B9F /* Localizable.stringsdict in Resources */,
311C08BD18EB7CAF00B65615 /* mediaControlsApple.css in Resources */,
311C08BE18EB7CAF00B65615 /* mediaControlsApple.js in Resources */,
@@ -35686,7 +35692,7 @@
shellPath = /bin/sh;
shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n ../../Tools/Scripts/check-for-inappropriate-objc-class-names Web || exit $?\nfi\n";
};
- 446EE4E7255DF00D00454463 /* Concatenate Localizable.strings */ = {
+ 446EE4E7255DF00D00454463 /* Concatenate and Copy Localizable.strings */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -35698,15 +35704,15 @@
$SDKROOT/usr/local/include/WebKitAdditions/LocalizableAdditions.strings,
$SRCROOT/en.lproj/Localizable.strings,
);
- name = "Concatenate Localizable.strings";
+ name = "Concatenate and Copy Localizable.strings";
outputFileListPaths = (
);
outputPaths = (
- $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings,
+ $BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/Localizable.strings,
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ -e $BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt ] ; then\n cat $SRCROOT/en.lproj/Localizable.strings $BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt > $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings\nelif [ -e $SDKROOT/usr/local/include/WebKitAdditions/LocalizableAdditions.strings..txt ] ; then\n cat $SRCROOT/en.lproj/Localizable.strings $SDKROOT/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt > $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings\nelse\n cp $SRCROOT/en.lproj/Localizable.strings $BUILT_PRODUCTS_DIR/DerivedSources/WebCore/Localizable.strings\nfi\n";
+ shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nDST_DIR=\"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/en.lproj\"\nmkdir -p \"$DST_DIR\"\n\nif [ -e $BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt ] ; then\n cat $SRCROOT/en.lproj/Localizable.strings $BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt > $DST_DIR/Localizable.strings\nelif [ -e $SDKROOT/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt ] ; then\n cat $SRCROOT/en.lproj/Localizable.strings $SDKROOT/usr/local/include/WebKitAdditions/LocalizableAdditions.strings.txt > $DST_DIR/Localizable.strings\nelse\n cp $SRCROOT/en.lproj/Localizable.strings $DST_DIR/Localizable.strings\nfi\n";
};
5325BDCC21DFF33E00A0DEE1 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
