Title: [215774] trunk/Source/WebCore
- Revision
- 215774
- Author
- d...@apple.com
- Date
- 2017-04-25 17:38:11 -0700 (Tue, 25 Apr 2017)
Log Message
Skip WebKitAdditions for Safari Technology Preview media controls
https://bugs.webkit.org/show_bug.cgi?id=171302
<rdar://problem/31823256>
Reviewed by Simon Fraser.
Safari Technology Preview should use the same controls
as OpenSource.
* WebCore.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (215773 => 215774)
--- trunk/Source/WebCore/ChangeLog 2017-04-26 00:16:21 UTC (rev 215773)
+++ trunk/Source/WebCore/ChangeLog 2017-04-26 00:38:11 UTC (rev 215774)
@@ -1,3 +1,16 @@
+2017-04-25 Dean Jackson <d...@apple.com>
+
+ Skip WebKitAdditions for Safari Technology Preview media controls
+ https://bugs.webkit.org/show_bug.cgi?id=171302
+ <rdar://problem/31823256>
+
+ Reviewed by Simon Fraser.
+
+ Safari Technology Preview should use the same controls
+ as OpenSource.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
2017-04-25 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, rolling out r215730.
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (215773 => 215774)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-04-26 00:16:21 UTC (rev 215773)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-04-26 00:38:11 UTC (rev 215774)
@@ -30337,7 +30337,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "WKA_DIR=\"$BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/modern-media-controls\"\nSRC_DIR=\"$SRCROOT/Modules/modern-media-controls\"\nDST_DIR=\"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls\"\n\nif [ -d \"$WKA_DIR\" ]; then\n MMC_DIR=$WKA_DIR;\nelse\n MMC_DIR=$SRC_DIR\nfi\n\nmkdir -p \"$DST_DIR\"\n\nif [ \"${PLATFORM_NAME}\" == \"macosx\" ]; then\n IMG_OS_PREFIX=\"macOS\"\nfi\n\nif [ \"${PLATFORM_NAME}\" == \"iphoneos\" ] || [ \"${PLATFORM_NAME}\" == \"iphonesimulator\" ]; then\n IMG_OS_PREFIX=\"iOS\"\nfi\n\nif [ -n \"$IMG_OS_PREFIX\" ]; then\n rsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$MMC_DIR/images/$IMG_OS_PREFIX/\" \"$DST_DIR/images\"\nfi\n\ncd \"$MMC_DIR\"\ncat controls/*.css > \"$DST
_DIR/modern-media-controls.css\"\ncat `cat js-files` > \"$DST_DIR/modern-media-controls.js\"";
+ shellScript = "WKA_DIR=\"$BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/modern-media-controls\"\nSRC_DIR=\"$SRCROOT/Modules/modern-media-controls\"\nDST_DIR=\"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls\"\n\nif [[ -d \"$WKA_DIR\" && $SAFARI_TECHNOLOGY_PREVIEW_TYPE != \"TECHNOLOGY_PREVIEW\" ]]; then\n MMC_DIR=$WKA_DIR;\nelse\n MMC_DIR=$SRC_DIR\nfi\n\nmkdir -p \"$DST_DIR\"\n\nif [ \"${PLATFORM_NAME}\" == \"macosx\" ]; then\n IMG_OS_PREFIX=\"macOS\"\nfi\n\nif [ \"${PLATFORM_NAME}\" == \"iphoneos\" ] || [ \"${PLATFORM_NAME}\" == \"iphonesimulator\" ]; then\n IMG_OS_PREFIX=\"iOS\"\nfi\n\nif [ -n \"$IMG_OS_PREFIX\" ]; then\n rsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$MMC_DIR/images/$IMG_OS_PREFIX/\" \"$DST_DIR/ima
ges\"\nfi\n\ncd \"$MMC_DIR\"\ncat controls/*.css > \"$DST_DIR/modern-media-controls.css\"\ncat `cat js-files` > \"$DST_DIR/modern-media-controls.js\"\n";
};
A5E79CEC1E67F2CF00FB8153 /* Make Frameworks Symbolic Link */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes