Attachment 341452 Details for Bug 186034 – Patch

[patch] Patch

bug-186034-20180528131743.patch (text/plain), 3.19 KB, created by Antoine Quint on 2018-05-28 04:17:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Quint

Created: 2018-05-28 04:17:44 PDT

Size: 3.19 KB

patch

obsolete

>Subversion Revision: 232186
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index da03b7154cf4264b7b596758d264fff2f2f95dd6..e20d8ce41a67272bfef6a46ef43cf34e246da89e 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-28  Antoine Quint  <graouts@apple.com>
>+
>+        [Modern Media Controls] Obtain compact mode icons through WebKitAdditions outside of build directory
>+        https://bugs.webkit.org/show_bug.cgi?id=186034
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We introduced support for obtaining compact mode icons through WebKitAdditions as part of webkit.org/b/184862
>+        but the initial patch only looked at the build products and not the SDK install which we need to look at in
>+        case there is no WebKitAdditions build available.
>+
>+        * WebCore.xcodeproj/project.pbxproj:
>+
> 2018-05-25  Antoine Quint  <graouts@apple.com>
> 
>         [Web Animations] WebAnimation objects never get destroyed
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 2fb724ccb3f2bfa566267bbbdf93fb8ab4b0907c..07b868e6791582e89190d862a26e95f84cc1126b 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -31232,7 +31232,7 @@
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 			shellPath = /bin/sh;
>-			shellScript = "WKA_DIR=\"$BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions/compact-media-controls\"\nSRC_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 [ \"${WK_PLATFORM_NAME}\" == \"macosx\" ]; then\n    IMG_OS_PREFIX=\"macOS\"\nelse\n    IMG_OS_PREFIX=\"iOS\"\nfi\n\nif [ -n \"$IMG_OS_PREFIX\" ]; then\nrsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$SRC_DIR/images/$IMG_OS_PREFIX/\" \"$DST_DIR/images\"\nfi\n\nif [ -d \"$WKA_DIR\" ]; then\nrsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$WKA_DIR/\" \"$DST_DIR/images/\"\nfi\n\ncd \"$SRC_DIR\"\ncat controls/*.css > \"$DST_DIR/modern-media-controls.css\"\n             cat `cat js-files` > \"$DST_DIR/modern-media-controls.js\"\n";
>+			shellScript = "WKA_DIR=\"$BUILT_PRODUCTS_DIR/usr/local/include/WebKitAdditions\"\nif [ ! -d \"$WKA_DIR\" ]; then\n    WKA_DIR=\"$SDKROOT/usr/local/include/WebKitAdditions\"\nfi\n\nSRC_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 [ \"${WK_PLATFORM_NAME}\" == \"macosx\" ]; then\n    IMG_OS_PREFIX=\"macOS\"\nelse\n    IMG_OS_PREFIX=\"iOS\"\nfi\n\nif [ -n \"$IMG_OS_PREFIX\" ]; then\nrsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$SRC_DIR/images/$IMG_OS_PREFIX/\" \"$DST_DIR/images\"\nfi\n\nif [ -d \"$WKA_DIR\" ]; then\nrsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$WKA_DIR/compact-media-controls\" \"$DST_DIR/images/\"\nfi\n\ncd \"$SRC_DIR\"\ncat controls/*.css > \"$DST_DIR/modern-media-controls.css\"\n             cat `cat js-files` > \"$DST_DIR/modern-media-controls.js\"\n";
> 		};
> 		A5E79CEC1E67F2CF00FB8153 /* Make Frameworks Symbolic Link */ = {
> 			isa = PBXShellScriptBuildPhase;

Flags:

dino: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 186034: 341452