From 928fd900b7ea2519ffc59d32f4b80b40d876b9ce Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Wed, 13 May 2020 12:35:25 -0700
Subject: [PATCH 1/3] Update allowed tags/attributes from spec in amphtml to
 2005050322002

---
 .../class-amp-allowed-tags-generated.php      | 257 +++++++-----------
 1 file changed, 103 insertions(+), 154 deletions(-)

diff --git a/includes/sanitizers/class-amp-allowed-tags-generated.php b/includes/sanitizers/class-amp-allowed-tags-generated.php
index 118cc5c1c12..64f3d3a7118 100644
--- a/includes/sanitizers/class-amp-allowed-tags-generated.php
+++ b/includes/sanitizers/class-amp-allowed-tags-generated.php
@@ -13,8 +13,8 @@
  */
 class AMP_Allowed_Tags_Generated {
 
-	private static $spec_file_revision = 1028;
-	private static $minimum_validator_revision_required = 375;
+	private static $spec_file_revision = 1043;
+	private static $minimum_validator_revision_required = 455;
 
 	private static $descendant_tag_lists = array(
 		'amp-mega-menu-allowed-descendants' => array(
@@ -246,6 +246,7 @@ class AMP_Allowed_Tags_Generated {
 			'amp-list',
 			'amp-live-list',
 			'amp-pixel',
+			'amp-state',
 			'amp-timeago',
 			'amp-twitter',
 			'amp-video',
@@ -344,6 +345,7 @@ class AMP_Allowed_Tags_Generated {
 			'table',
 			'tbody',
 			'td',
+			'template',
 			'text',
 			'textpath',
 			'tfoot',
@@ -597,6 +599,12 @@ class AMP_Allowed_Tags_Generated {
 						'blacklisted_value_regex' => '(^|\\s)(components|dns-prefetch|import|manifest|preconnect|prefetch|preload|prerender|serviceworker|stylesheet|subresource)(\\s|$)',
 					),
 					'role' => array(),
+					'show-tooltip' => array(
+						'value' => array(
+							'auto',
+							'true',
+						),
+					),
 					'tabindex' => array(),
 					'target' => array(
 						'value' => array(
@@ -1014,6 +1022,7 @@ class AMP_Allowed_Tags_Generated {
 					),
 					'src' => array(
 						'blacklisted_value_regex' => '__amp_source_origin',
+						'mandatory' => true,
 						'value_url' => array(
 							'allow_relative' => false,
 							'protocol' => array(
@@ -5858,6 +5867,38 @@ class AMP_Allowed_Tags_Generated {
 			),
 		),
 		'amp-story-page-attachment' => array(
+			array(
+				'attr_spec_list' => array(
+					'href' => array(
+						'mandatory' => true,
+						'value_url' => array(
+							'protocol' => array(
+								'http',
+								'https',
+							),
+						),
+					),
+					'layout' => array(
+						'mandatory' => true,
+						'value' => array(
+							'nodisplay',
+						),
+					),
+					'theme' => array(
+						'value' => array(
+							'dark',
+							'light',
+						),
+					),
+				),
+				'tag_spec' => array(
+					'child_tags' => array(
+						'mandatory_num_child_tags' => 0,
+					),
+					'mandatory_ancestor' => 'amp-story-page',
+					'spec_name' => 'amp-story-page-attachment[href]',
+				),
+			),
 			array(
 				'attr_spec_list' => array(
 					'layout' => array(
@@ -5876,6 +5917,7 @@ class AMP_Allowed_Tags_Generated {
 				'tag_spec' => array(
 					'descendant_tag_list' => 'amp-story-page-attachment-allowed-descendants',
 					'mandatory_ancestor' => 'amp-story-page',
+					'spec_name' => 'amp-story-page-attachment',
 				),
 			),
 		),
@@ -5953,6 +5995,7 @@ class AMP_Allowed_Tags_Generated {
 		'amp-twitter' => array(
 			array(
 				'attr_spec_list' => array(
+					'data-amp-bind-data-tweetid' => array(),
 					'data-cards' => array(),
 					'data-conversation' => array(),
 					'data-limit' => array(),
@@ -7186,9 +7229,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -7276,9 +7317,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -7401,9 +7440,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -7446,9 +7483,7 @@ class AMP_Allowed_Tags_Generated {
 		'desc' => array(
 			array(
 				'attr_spec_list' => array(
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'xml:lang' => array(),
 					'xml:space' => array(),
 					'xmlns' => array(),
@@ -7732,9 +7767,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -7821,9 +7854,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -7913,9 +7944,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -7996,9 +8025,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -8082,9 +8109,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -8165,9 +8190,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -8194,9 +8217,7 @@ class AMP_Allowed_Tags_Generated {
 			array(
 				'attr_spec_list' => array(
 					'in' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'xml:lang' => array(),
 					'xml:space' => array(),
 					'xmlns' => array(),
@@ -8269,9 +8290,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -8379,9 +8398,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -8614,9 +8631,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -8699,9 +8714,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -8785,9 +8798,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -8954,9 +8965,7 @@ class AMP_Allowed_Tags_Generated {
 					'g1' => array(),
 					'g2' => array(),
 					'k' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'u1' => array(),
 					'u2' => array(),
 					'xml:lang' => array(),
@@ -9112,9 +9121,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -9243,6 +9250,7 @@ class AMP_Allowed_Tags_Generated {
 					'data-amp-bind-value' => array(),
 					'data-amp-bind-width' => array(),
 					'disabled' => array(),
+					'enterkeyhint' => array(),
 					'height' => array(),
 					'inputmode' => array(),
 					'list' => array(),
@@ -9309,6 +9317,7 @@ class AMP_Allowed_Tags_Generated {
 					'data-amp-bind-value' => array(),
 					'data-amp-bind-width' => array(),
 					'disabled' => array(),
+					'enterkeyhint' => array(),
 					'height' => array(),
 					'inputmode' => array(),
 					'list' => array(),
@@ -9381,6 +9390,7 @@ class AMP_Allowed_Tags_Generated {
 					'data-amp-bind-value' => array(),
 					'data-amp-bind-width' => array(),
 					'disabled' => array(),
+					'enterkeyhint' => array(),
 					'height' => array(),
 					'inputmode' => array(),
 					'list' => array(),
@@ -9467,6 +9477,7 @@ class AMP_Allowed_Tags_Generated {
 					'data-amp-bind-value' => array(),
 					'data-amp-bind-width' => array(),
 					'disabled' => array(),
+					'enterkeyhint' => array(),
 					'height' => array(),
 					'inputmode' => array(),
 					'list' => array(),
@@ -9545,6 +9556,7 @@ class AMP_Allowed_Tags_Generated {
 					'data-amp-bind-value' => array(),
 					'data-amp-bind-width' => array(),
 					'disabled' => array(),
+					'enterkeyhint' => array(),
 					'height' => array(),
 					'inputmode' => array(),
 					'list' => array(),
@@ -9622,6 +9634,7 @@ class AMP_Allowed_Tags_Generated {
 					'data-amp-bind-value' => array(),
 					'data-amp-bind-width' => array(),
 					'disabled' => array(),
+					'enterkeyhint' => array(),
 					'height' => array(),
 					'inputmode' => array(),
 					'list' => array(),
@@ -9699,6 +9712,7 @@ class AMP_Allowed_Tags_Generated {
 					'data-amp-bind-value' => array(),
 					'data-amp-bind-width' => array(),
 					'disabled' => array(),
+					'enterkeyhint' => array(),
 					'height' => array(),
 					'inputmode' => array(),
 					'list' => array(),
@@ -9776,6 +9790,7 @@ class AMP_Allowed_Tags_Generated {
 					'data-amp-bind-value' => array(),
 					'data-amp-bind-width' => array(),
 					'disabled' => array(),
+					'enterkeyhint' => array(),
 					'height' => array(),
 					'inputmode' => array(),
 					'list' => array(),
@@ -9853,6 +9868,7 @@ class AMP_Allowed_Tags_Generated {
 					'data-amp-bind-value' => array(),
 					'data-amp-bind-width' => array(),
 					'disabled' => array(),
+					'enterkeyhint' => array(),
 					'height' => array(),
 					'inputmode' => array(),
 					'list' => array(),
@@ -10010,9 +10026,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -10098,9 +10112,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -10286,7 +10298,7 @@ class AMP_Allowed_Tags_Generated {
 					'crossorigin' => array(),
 					'href' => array(
 						'mandatory' => true,
-						'value_regex' => 'https://cdn\\.materialdesignicons\\.com/([0-9]+\\.?)+/css/materialdesignicons\\.min\\.css|https://cloud\\.typography\\.com/[0-9]*/[0-9]*/css/fonts\\.css|https://fast\\.fonts\\.net/.*|https://fonts\\.googleapis\\.com/css\\?.*|https://fonts\\.googleapis\\.com/icon\\?.*|https://fonts\\.googleapis\\.com/earlyaccess/.*\\.css|https://maxcdn\\.bootstrapcdn\\.com/font-awesome/([0-9]+\\.?)+/css/font-awesome\\.min\\.css(\\?.*)?|https://(use|pro)\\.fontawesome\\.com/releases/v([0-9]+\\.?)+/css/(all|brands|solid|regular|light|fontawesome)\\.css|https://(use|pro)\\.fontawesome\\.com/[0-9a-zA-Z]+\\.css|https://use\\.typekit\\.net/[\\w\\p{L}\\p{N}_]+\\.css',
+						'value_regex' => 'https://cdn\\.materialdesignicons\\.com/([0-9]+\\.?)+/css/materialdesignicons\\.min\\.css|https://cloud\\.typography\\.com/[0-9]*/[0-9]*/css/fonts\\.css|https://fast\\.fonts\\.net/.*|https://fonts\\.googleapis\\.com/css2?\\?.*|https://fonts\\.googleapis\\.com/icon\\?.*|https://fonts\\.googleapis\\.com/earlyaccess/.*\\.css|https://maxcdn\\.bootstrapcdn\\.com/font-awesome/([0-9]+\\.?)+/css/font-awesome\\.min\\.css(\\?.*)?|https://(use|pro)\\.fontawesome\\.com/releases/v([0-9]+\\.?)+/css/[0-9a-zA-Z-]+\\.css|https://(use|pro)\\.fontawesome\\.com/[0-9a-zA-Z-]+\\.css|https://use\\.typekit\\.net/[\\w\\p{L}\\p{N}_]+\\.css',
 					),
 					'integrity' => array(),
 					'media' => array(),
@@ -10475,9 +10487,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -10561,9 +10571,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -11110,9 +11118,7 @@ class AMP_Allowed_Tags_Generated {
 		'metadata' => array(
 			array(
 				'attr_spec_list' => array(
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'xml:lang' => array(),
 					'xml:space' => array(),
 					'xmlns' => array(),
@@ -11341,9 +11347,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -11429,9 +11433,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -11544,9 +11546,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -11629,9 +11629,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -11751,9 +11749,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -11860,9 +11856,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -16401,9 +16395,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -16605,9 +16597,7 @@ class AMP_Allowed_Tags_Generated {
 					'offset' => array(),
 					'stop-color' => array(),
 					'stop-opacity' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 				),
 				'tag_spec' => array(
 					'mandatory_ancestor' => 'lineargradient',
@@ -16620,9 +16610,7 @@ class AMP_Allowed_Tags_Generated {
 					'offset' => array(),
 					'stop-color' => array(),
 					'stop-opacity' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 				),
 				'tag_spec' => array(
 					'mandatory_ancestor' => 'radialgradient',
@@ -16679,25 +16667,9 @@ class AMP_Allowed_Tags_Generated {
 							'supports',
 						),
 						'declaration' => array(),
-						'font_url_spec' => array(
-							'allow_empty' => true,
-							'protocol' => array(
-								'https',
-								'http',
-								'data',
-							),
-						),
-						'image_url_spec' => array(
-							'allow_empty' => true,
-							'protocol' => array(
-								'https',
-								'http',
-								'data',
-								'absolute',
-							),
-						),
 						'validate_keyframes' => false,
 					),
+					'doc_css_bytes' => true,
 					'max_bytes' => 75000,
 					'max_bytes_spec_url' => 'https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#maximum-size',
 				),
@@ -16721,6 +16693,7 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'cdata' => array(
 					'cdata_regex' => '\\s*body\\s*{\\s*-webkit-animation:\\s*-amp-start\\s+8s\\s+steps\\(1,\\s*end\\)\\s+0s\\s+1\\s+normal\\s+both;\\s*-moz-animation:\\s*-amp-start\\s+8s\\s+steps\\s*\\(1\\s*,\\s*end\\s*\\)\\s+0s\\s+1\\s+normal\\s+both;\\s*-ms-animation:\\s*-amp-start\\s+8s\\s+steps\\s*\\(1\\s*,\\s*end\\s*\\)\\s+0s\\s+1\\s+normal\\s+both;\\s*animation:\\s*-amp-start\\s+8s\\s+steps\\(1,\\s*end\\)\\s+0s\\s+1\\s+normal\\s+both;?\\s*}\\s*@-webkit-keyframes\\s+-amp-start\\s*{\\s*from\\s*{\\s*visibility:\\s*hidden;?\\s*}\\s*to\\s*{\\s*visibility:\\s*visible;?\\s*}\\s*}\\s*@-moz-keyframes\\s+-amp-start\\s*{\\s*from\\s*{\\s*visibility:\\s*hidden;?\\s*}\\s*to\\s*{\\s*visibility:\\s*visible;?\\s*}\\s*}\\s*@-ms-keyframes\\s+-amp-start\\s*{\\s*from\\s*{\\s*visibility:\\s*hidden;?\\s*}\\s*to\\s*{\\s*visibility:\\s*visible;?\\s*}\\s*}\\s*@-o-keyframes\\s+-amp-start\\s*{\\s*from\\s*{\\s*visibility:\\s*hidden;?\\s*}\\s*to\\s*{\\s*visibility:\\s*visible;?\\s*}\\s*}\\s*@keyframes\\s+-amp-start\\s*{\\s*from\\s*{\\s*visibility:\\s*hidden;?\\s*}\\s*to\\s*{\\s*visibility:\\s*visible;?\\s*}\\s*}\\s*',
+					'doc_css_bytes' => false,
 				),
 				'tag_spec' => array(
 					'mandatory' => true,
@@ -16743,6 +16716,7 @@ class AMP_Allowed_Tags_Generated {
 				),
 				'cdata' => array(
 					'cdata_regex' => '\\s*body\\s*{\\s*-webkit-animation:\\s*none;\\s*-moz-animation:\\s*none;\\s*-ms-animation:\\s*none;\\s*animation:\\s*none;?\\s*}\\s*',
+					'doc_css_bytes' => false,
 				),
 				'tag_spec' => array(
 					'mandatory' => true,
@@ -16777,10 +16751,9 @@ class AMP_Allowed_Tags_Generated {
 							'transform',
 							'visibility',
 						),
-						'font_url_spec' => array(),
-						'image_url_spec' => array(),
 						'validate_keyframes' => true,
 					),
+					'doc_css_bytes' => false,
 					'max_bytes' => 500000,
 					'max_bytes_spec_url' => 'https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#keyframes-stylesheet',
 				),
@@ -16874,9 +16847,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -16965,9 +16936,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -17047,9 +17016,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
 					'text-rendering' => array(),
@@ -17280,9 +17247,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -17424,9 +17389,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -17519,9 +17482,7 @@ class AMP_Allowed_Tags_Generated {
 			),
 			array(
 				'attr_spec_list' => array(
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'xml:lang' => array(),
 					'xml:space' => array(),
 					'xmlns' => array(),
@@ -17955,9 +17916,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -18059,9 +18018,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -18163,9 +18120,7 @@ class AMP_Allowed_Tags_Generated {
 					'stroke-miterlimit' => array(),
 					'stroke-opacity' => array(),
 					'stroke-width' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'systemlanguage' => array(),
 					'text-anchor' => array(),
 					'text-decoration' => array(),
@@ -18249,9 +18204,7 @@ class AMP_Allowed_Tags_Generated {
 				'attr_spec_list' => array(
 					'externalresourcesrequired' => array(),
 					'preserveaspectratio' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'viewbox' => array(),
 					'viewtarget' => array(),
 					'xml:lang' => array(),
@@ -18272,9 +18225,7 @@ class AMP_Allowed_Tags_Generated {
 					'g1' => array(),
 					'g2' => array(),
 					'k' => array(),
-					'style' => array(
-						'blacklisted_value_regex' => '!\\s*important',
-					),
+					'style' => array(),
 					'u1' => array(),
 					'u2' => array(),
 					'xml:lang' => array(),
@@ -18457,9 +18408,7 @@ class AMP_Allowed_Tags_Generated {
 		'rev' => array(),
 		'role' => array(),
 		'slot' => array(),
-		'style' => array(
-			'blacklisted_value_regex' => '(!\\s*important|<!--)',
-		),
+		'style' => array(),
 		'subscriptions-action' => array(
 			'requires_extension' => array(
 				'amp-subscriptions',

From fad7c8f34deddb2bc22261417a11be1d2a74e958 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Tue, 19 May 2020 20:32:40 -0700
Subject: [PATCH 2/3] Update tests to reflect removal of style attribute
 constraint

---
 .../php/test-tag-and-attribute-sanitizer.php  | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/php/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php
index f08f78ba76e..823d3e5dce5 100644
--- a/tests/php/test-tag-and-attribute-sanitizer.php
+++ b/tests/php/test-tag-and-attribute-sanitizer.php
@@ -1305,10 +1305,10 @@ static function() {
 			],
 
 			'disallowed_attributes'                        => [
-				'<a href="/path/to/file.jpg" style="border: 1px solid red !important;">Link</a>',
+				'<a href="/path/to/file.jpg" color="red">Link</a>',
 				'<a href="/path/to/file.jpg">Link</a>',
 				[],
-				[ AMP_Tag_And_Attribute_Sanitizer::INVALID_BLACKLISTED_VALUE_REGEX ],
+				[ AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR ],
 			],
 
 			'onclick_attribute'                            => [
@@ -1323,13 +1323,13 @@ static function() {
 			],
 
 			'multiple_disallowed_attributes'               => [
-				'<a href="/path/to/file.jpg" style="border: 1px solid red !important;" onclick="alert(e);">Link</a>',
+				'<a href="/path/to/file.jpg" color="red" onclick="alert(e);">Link</a>',
 				'<a href="/path/to/file.jpg">Link</a>',
 				[],
 				[
 					[
-						'code'      => AMP_Tag_And_Attribute_Sanitizer::INVALID_BLACKLISTED_VALUE_REGEX,
-						'node_name' => 'style',
+						'code'      => AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR,
+						'node_name' => 'color',
 					],
 					[
 						'code'      => AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR,
@@ -1339,7 +1339,7 @@ static function() {
 			],
 
 			'attribute_recursive'                          => [
-				'<div style="border: 1px solid red !important;"><a href="/path/to/file.jpg" onclick="alert(e);">Hello World</a></div>',
+				'<div color="red"><a href="/path/to/file.jpg" onclick="alert(e);">Hello World</a></div>',
 				'<div><a href="/path/to/file.jpg">Hello World</a></div>',
 				[],
 				[
@@ -1348,8 +1348,8 @@ static function() {
 						'node_name' => 'onclick',
 					],
 					[
-						'code'      => AMP_Tag_And_Attribute_Sanitizer::INVALID_BLACKLISTED_VALUE_REGEX,
-						'node_name' => 'style',
+						'code'      => AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR,
+						'node_name' => 'color',
 					],
 				],
 			],
@@ -1443,10 +1443,10 @@ static function() {
 			],
 
 			'a_empty_with_children_with_restricted_attributes' => [
-				'<a><span style="color: red !important;">Red</span>&amp;<span style="color: blue !important;">Orange</span></a>',
+				'<a><span color="red">Red</span>&amp;<span color="orange">Orange</span></a>',
 				'<a><span>Red</span>&amp;<span>Orange</span></a>',
 				[],
-				[ AMP_Tag_And_Attribute_Sanitizer::INVALID_BLACKLISTED_VALUE_REGEX, AMP_Tag_And_Attribute_Sanitizer::INVALID_BLACKLISTED_VALUE_REGEX ],
+				[ AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR, AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR ],
 			],
 
 			'spans_with_xml_namespaced_attributes'         => [
@@ -1507,10 +1507,10 @@ static function() {
 
 			// font is removed so we should check that other elements are checked as well.
 			'font_with_other_bad_elements'                 => [
-				'<font size="1">Headline</font><span style="color: blue !important">Span</span>',
+				'<font size="1">Headline</font><span color="blue">Span</span>',
 				'Headline<span>Span</span>',
 				[],
-				[ AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_TAG, AMP_Tag_And_Attribute_Sanitizer::INVALID_BLACKLISTED_VALUE_REGEX ],
+				[ AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_TAG, AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR ],
 			],
 
 			'amp_bind_attr'                                => [
@@ -1689,15 +1689,15 @@ static function() {
 			],
 
 			'non-layout-col-element-attrs'                 => [
-				'<table><col class="foo" width="123" style="background:red !important;"><col class="bar" style="background:green !important;" width="12%"><col class="baz" style="background:blue !important;" width="2*"><tr><td>1</td><td>2</td><td>3</td></tr></table>',
+				'<table><col class="foo" width="123" color="red"><col class="bar" color="green" width="12%"><col class="baz" color="blue" width="2*"><tr><td>1</td><td>2</td><td>3</td></tr></table>',
 				'<table><col class="foo"><col class="bar"><col class="baz"><tr><td>1</td><td>2</td><td>3</td></tr></table>',
 				[],
 				[
 					AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR,
-					AMP_Tag_And_Attribute_Sanitizer::INVALID_BLACKLISTED_VALUE_REGEX,
-					AMP_Tag_And_Attribute_Sanitizer::INVALID_BLACKLISTED_VALUE_REGEX,
 					AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR,
-					AMP_Tag_And_Attribute_Sanitizer::INVALID_BLACKLISTED_VALUE_REGEX,
+					AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR,
+					AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR,
+					AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR,
 					AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_ATTR,
 				],
 			],

From d2801893b95d7530290247d8b763f048ffcbb1ae Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Tue, 19 May 2020 20:43:08 -0700
Subject: [PATCH 3/3] Add tests for tweetid binding, Google Fonts v2, and
 enterkeyhint

---
 tests/php/test-amp-style-sanitizer.php         | 4 ++++
 tests/php/test-tag-and-attribute-sanitizer.php | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/php/test-amp-style-sanitizer.php b/tests/php/test-amp-style-sanitizer.php
index b9efda2da91..8c543aa906e 100644
--- a/tests/php/test-amp-style-sanitizer.php
+++ b/tests/php/test-amp-style-sanitizer.php
@@ -2147,6 +2147,10 @@ public function get_font_urls() {
 				'http://fonts.googleapis.com/css?family=Tangerine',
 				[],
 			],
+			'tangerine4'  => [
+				'https://fonts.googleapis.com/css2?family=Tangerine',
+				[],
+			],
 			'typekit'     => [
 				'https://use.typekit.net/abc.css',
 				[],
diff --git a/tests/php/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php
index 823d3e5dce5..55c3ed254b2 100644
--- a/tests/php/test-tag-and-attribute-sanitizer.php
+++ b/tests/php/test-tag-and-attribute-sanitizer.php
@@ -585,9 +585,9 @@ static function () {
 			],
 
 			'amp-twitter'                                  => [
-				'<amp-twitter width="321" height="543" layout="responsive" data-tweetid="98765"></amp-twitter>',
-				null, // No change.
-				[ 'amp-twitter' ],
+				'<amp-twitter width="321" height="543" layout="responsive" data-tweetid="98765" [data-tweetid]="somestate"></amp-twitter>',
+				'<amp-twitter width="321" height="543" layout="responsive" data-tweetid="98765" data-amp-bind-data-tweetid="somestate"></amp-twitter>',
+				[ 'amp-twitter', 'amp-bind' ],
 			],
 
 			'amp-user-notification'                        => [
@@ -730,7 +730,7 @@ static function () {
 			],
 
 			'form'                                         => [
-				'<form method="get" action="/form/search-html/get" target="_blank"><fieldset><label><span>Search for</span><input type="search" placeholder="test" name="term" required></label><input type="submit" value="Search"><input type="button" value="Open Lightbox" on="tap:lb1.open"></fieldset></form>',
+				'<form method="get" action="/form/search-html/get" target="_blank"><fieldset><label><span>Search for</span><input type="search" placeholder="test" name="term" required></label><input type="submit" value="Search" enterkeyhint="search"><input type="button" value="Open Lightbox" on="tap:lb1.open"></fieldset></form>',
 				null,
 				[ 'amp-form' ],
 			],