Skip to content

Conversation

@westonruter
Copy link
Member

Previously #4701.

  • Run ./bin/amphtml-update.sh (lando ssh -c 'bash ./bin/amphtml-update.sh vendor/amphtml').
  • Examine diff for changelog.
  • Examine upstream diff to ensure nothing was missed.
  • Update spec generator as needed based on spec format changes.
  • Modify validating sanitizer based on changes to spec, if needed.
  • Add tests for key changes.

Changelog

  • Add autoplay and dock to amp-jwplayer.

Details

(
    PREV_VERSION=2005050322002;
    THIS_VERSION=2005150002001; 
    git checkout $THIS_VERSION;
    git diff $PREV_VERSION...$THIS_VERSION -w -- $( git ls-files | grep '.protoascii' );
    git checkout - > /dev/null
)
2005050322002...2005150002001
diff --git a/extensions/amp-jwplayer/validator-amp-jwplayer.protoascii b/extensions/amp-jwplayer/validator-amp-jwplayer.protoascii
index 600dd84eb..a87bb3739 100644
--- a/extensions/amp-jwplayer/validator-amp-jwplayer.protoascii
+++ b/extensions/amp-jwplayer/validator-amp-jwplayer.protoascii
@@ -30,6 +30,10 @@ tags: {  # <amp-jwplayer>
   html_format: AMP
   tag_name: "AMP-JWPLAYER"
   requires_extension: "amp-jwplayer"
+  attrs: {
+    name: "autoplay"
+    value: ""
+  }
   attrs: {
     name: "data-media-id"
     mandatory_oneof: "['data-media-id', 'data-playlist-id']"
@@ -45,6 +49,10 @@ tags: {  # <amp-jwplayer>
     mandatory_oneof: "['data-media-id', 'data-playlist-id']"
     value_regex_casei: "[0-9a-z]{8}"
   }
+  attrs: {
+    name: "dock"
+    requires_extension: "amp-video-docking"
+  }
   amp_layout: {
     supported_layouts: FILL
     supported_layouts: FIXED
@@ -53,4 +61,5 @@ tags: {  # <amp-jwplayer>
     supported_layouts: NODISPLAY
     supported_layouts: RESPONSIVE
   }
+  spec_url: "https://amp.dev/documentation/components/amp-jwplayer"
 }
diff --git a/validator/validator-css.protoascii b/validator/validator-css.protoascii
index 8de8067ba..4526ac62f 100644
--- a/validator/validator-css.protoascii
+++ b/validator/validator-css.protoascii
@@ -217,6 +217,7 @@ declaration_list {
   declaration: { name: "text-decoration" }
   declaration: { name: "text-decoration-color" }
   declaration: { name: "text-decoration-line" }
+  declaration: { name: "text-decoration-skip-ink" }
   declaration: { name: "text-decoration-style" }
   declaration: { name: "text-fill-color" }
   declaration: { name: "text-indent" }
diff --git a/validator/validator-main.protoascii b/validator/validator-main.protoascii
index db8f115ba..4adc1df00 100644
--- a/validator/validator-main.protoascii
+++ b/validator/validator-main.protoascii
@@ -26,7 +26,7 @@ min_validator_revision_required: 455
 # newer versions of the spec file. This is currently a Google internal
 # mechanism, validator.js does not use this facility. However, any
 # change to this file (validator-main.js) requires updating this revision id.
-spec_file_revision: 1043
+spec_file_revision: 1045
 
 styles_spec_url: "https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages"
 script_spec_url: "https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#html-tags"

@westonruter westonruter added this to the v1.6 milestone Jun 7, 2020
@westonruter westonruter requested a review from amedina June 7, 2020 03:14
@googlebot googlebot added the cla: yes Signed the Google CLA label Jun 7, 2020
Copy link
Member

@amedina amedina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ship it.

@westonruter westonruter merged commit 7d9499a into develop Jun 7, 2020
@westonruter westonruter deleted the update/amphtml-2005150002001 branch June 7, 2020 21:10
@westonruter westonruter added the Changelogged Whether the issue/PR has been added to release notes. label Jul 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changelogged Whether the issue/PR has been added to release notes. cla: yes Signed the Google CLA

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants