Title: [215245] trunk/Source/WebCore
- Revision
- 215245
- Author
- [email protected]
- Date
- 2017-04-11 11:41:39 -0700 (Tue, 11 Apr 2017)
Log Message
[Modern Media Controls] Allow modern-media-controls to be provided through WebKitAdditions
https://bugs.webkit.org/show_bug.cgi?id=170722
<rdar://problem/31553089>
Patch by Antoine Quint <[email protected]> on 2017-04-11
Reviewed by Dean Jackson.
If modern media controls source files are provided through WebKitAdditions, use these instead
of the sources found in the WebCore module.
* WebCore.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (215244 => 215245)
--- trunk/Source/WebCore/ChangeLog 2017-04-11 18:39:09 UTC (rev 215244)
+++ trunk/Source/WebCore/ChangeLog 2017-04-11 18:41:39 UTC (rev 215245)
@@ -1,3 +1,16 @@
+2017-04-11 Antoine Quint <[email protected]>
+
+ [Modern Media Controls] Allow modern-media-controls to be provided through WebKitAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=170722
+ <rdar://problem/31553089>
+
+ Reviewed by Dean Jackson.
+
+ If modern media controls source files are provided through WebKitAdditions, use these instead
+ of the sources found in the WebCore module.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
2017-04-10 Matt Rajca <[email protected]>
Change autoplay state to "prevented" when media is paused due to restrictions.
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (215244 => 215245)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-04-11 18:39:09 UTC (rev 215244)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-04-11 18:41:39 UTC (rev 215245)
@@ -30261,7 +30261,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "SRC_DIR=\"$SRCROOT/Modules/modern-media-controls\"\nDST_DIR=\"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls\"\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 mkdir -p \"$DST_DIR/images\"\n rsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$SRC_DIR/images/$IMG_OS_PREFIX\" \"$DST_DIR/images\"\nfi\n\ncd \"$SRC_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\necho $WKA_DIR;\n\nif [ -d \"$WKA_DIR\" ]; then\n MMC_DIR=$WKA_DIR;\nelse\n MMC_DIR=$SRC_DIR\nfi\n\necho $MMC_DIR;\n\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 mkdir -p \"$DST_DIR/images\"\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\"";
};
A5E79CEC1E67F2CF00FB8153 /* Make Frameworks Symbolic Link */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
