From 3380451bc89ca732379a8dbe0b622ebfab27c27a Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Wed, 4 Sep 2019 16:49:42 -0700
Subject: [PATCH 01/22] Revert "Suppress admin bar from being shown during
 validation requests"

This reverts commit d83bb25761f5990039ae669438731e5ced59c2df from #2500.
---
 includes/validation/class-amp-validation-manager.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index 844b3c97972..822f6f83867 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -227,15 +227,6 @@ function( $query_vars ) {
 		}
 
 		if ( self::$should_locate_sources ) {
-			/*
-			 * Always suppress the admin bar from being shown when performing a validation request. This ensures that
-			 * user-initiated validation requests perform the same as validation requests initiated by the WP-CLI
-			 * command `wp amp validate-site`, which does so as an unauthenticated user. Unauthenticated users should
-			 * not be shown the admin bar, and normal site visitors who read AMP content (such as via an AMP Cache) are
-			 * not authenticated, so it doesn't make sense to include the admin bar when doing validation.
-			 */
-			add_filter( 'show_admin_bar', '__return_false', PHP_INT_MAX );
-
 			self::add_validation_error_sourcing();
 		}
 	}

From e3d4f574b1651c800a31491ce7e9c8c86f7b63c9 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Wed, 4 Sep 2019 17:39:52 -0700
Subject: [PATCH 02/22] Skip sanitizing admin bar (and removing it) in favor of
 ignoring (in dev mode)

* Eliminate need for keeping forked version of admin-bar.css in plugin.
* Automatically add data-ampdevmode attributes to scripts and styles that depend on the admin bar, excluding them from being sanitized out of the document.
* Skip processing stylesheets that have data-ampdevmode attributes.
---
 .stylelintignore                              |    1 -
 assets/css/src/admin-bar.css                  | 1181 -----------------
 includes/class-amp-theme-support.php          |  135 +-
 .../sanitizers/class-amp-base-sanitizer.php   |    2 +
 .../sanitizers/class-amp-style-sanitizer.php  |  114 +-
 tests/php/test-amp-style-sanitizer.php        |   10 +-
 tests/php/test-class-amp-theme-support.php    |    9 +-
 7 files changed, 127 insertions(+), 1325 deletions(-)
 delete mode 100644 assets/css/src/admin-bar.css

diff --git a/.stylelintignore b/.stylelintignore
index cf59a35757b..f9fee8e99b0 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -1,5 +1,4 @@
 /assets/css/*.css
-/assets/css/src/admin-bar.css
 /bin
 /build
 /tests
diff --git a/assets/css/src/admin-bar.css b/assets/css/src/admin-bar.css
deleted file mode 100644
index 383b7e8c207..00000000000
--- a/assets/css/src/admin-bar.css
+++ /dev/null
@@ -1,1181 +0,0 @@
-/*
-This is forked from core's admin-bar.css from WP 5.3-alpha at 160fc055da156248277513dd5256fbcc66faa5a7.
-
-https://github.com/WordPress/wordpress-develop/blob/160fc055da156248277513dd5256fbcc66faa5a7/src/wp-includes/css/admin-bar.css
-
-- References to .hover have been replaced with :focus-within (which is not supported in IE11).
-- Universal selector properties have been removed which interferes with AMP shadow elements.
-*/
-
-#wpadminbar * {
-	height: auto;
-	width: auto;
-	margin: 0;
-	padding: 0;
-	/* Removed because interferes with amp-img>img: position: static; */
-	text-shadow: none;
-	text-transform: none;
-	letter-spacing: normal;
-	font-size: 13px;
-	font-weight: 400;
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-	line-height: 2.46153846;
-	border-radius: 0;
-	box-sizing: content-box;
-	transition: none;
-	-webkit-font-smoothing: subpixel-antialiased; /* Prevent Safari from switching to standard antialiasing on hover */
-	-moz-osx-font-smoothing: auto; /* Prevent Firefox from inheriting from themes that use other values */
-}
-
-.rtl #wpadminbar * {
-	font-family: Tahoma, sans-serif;
-}
-
-html:lang(he-il) .rtl #wpadminbar * {
-	font-family: Arial, sans-serif;
-}
-
-#wpadminbar .ab-empty-item {
-	cursor: default;
-}
-
-#wpadminbar .ab-empty-item,
-#wpadminbar a.ab-item,
-#wpadminbar > #wp-toolbar span.ab-label,
-#wpadminbar > #wp-toolbar span.noticon {
-	color: #eee;
-}
-
-#wpadminbar #wp-admin-bar-site-name a.ab-item,
-#wpadminbar #wp-admin-bar-my-sites a.ab-item {
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-#wpadminbar ul li:before,
-#wpadminbar ul li:after {
-	content: normal;
-}
-
-#wpadminbar a,
-#wpadminbar a:hover,
-#wpadminbar a img,
-#wpadminbar a img:hover {
-	border: none;
-	text-decoration: none;
-	background: none;
-}
-
-#wpadminbar a:focus,
-#wpadminbar a:active,
-#wpadminbar input[type="text"],
-#wpadminbar input[type="password"],
-#wpadminbar input[type="number"],
-#wpadminbar input[type="search"],
-#wpadminbar input[type="email"],
-#wpadminbar input[type="url"],
-#wpadminbar select,
-#wpadminbar textarea,
-#wpadminbar div {
-	box-shadow: none;
-}
-
-#wpadminbar a:focus {
-	/* Inherits transparent outline only visible in Windows High Contrast mode */
-	outline-offset: -1px;
-}
-
-#wpadminbar {
-	direction: ltr;
-	color: #ccc;
-	font-size: 13px;
-	font-weight: 400;
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-	line-height: 2.46153846;
-	height: 32px;
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	min-width: 600px; /* match the min-width of the body in wp-admin/css/common.css */
-	z-index: 99999;
-	background: #23282d;
-}
-
-#wpadminbar .ab-sub-wrapper,
-#wpadminbar ul,
-#wpadminbar ul li {
-	background: none;
-	clear: none;
-	list-style: none;
-	margin: 0;
-	padding: 0;
-	position: relative;
-	text-indent: 0;
-	z-index: 99999;
-}
-
-#wpadminbar ul#wp-admin-bar-root-default>li {
-	margin-right: 0;
-}
-
-#wpadminbar .quicklinks ul {
-	text-align: left;
-}
-
-#wpadminbar li {
-	float: left;
-}
-
-#wpadminbar .ab-empty-item {
-	outline: none;
-}
-
-#wpadminbar .quicklinks .ab-top-secondary > li {
-	float: right;
-}
-
-#wpadminbar .quicklinks a,
-#wpadminbar .quicklinks .ab-empty-item,
-#wpadminbar .shortlink-input {
-	height: 32px;
-	display: block;
-	padding: 0 10px;
-	margin: 0;
-}
-
-#wpadminbar .quicklinks > ul > li > a {
-	padding: 0 8px 0 7px;
-}
-
-#wpadminbar .menupop .ab-sub-wrapper,
-#wpadminbar .shortlink-input {
-	margin: 0;
-	padding: 0;
-	box-shadow: 0 3px 5px rgba(0, 0, 0, 0.2);
-	background: #32373c;
-	display: none;
-	position: absolute;
-	float: none;
-}
-
-#wpadminbar.ie7 .menupop .ab-sub-wrapper,
-#wpadminbar.ie7 .shortlink-input {
-	top: 32px;
-	left: 0;
-}
-
-#wpadminbar .ab-top-menu > .menupop > .ab-sub-wrapper {
-	min-width: 100%;
-}
-
-#wpadminbar .ab-top-secondary .menupop .ab-sub-wrapper {
-	right: 0;
-	left: auto;
-}
-
-#wpadminbar .ab-submenu {
-	padding: 6px 0;
-}
-
-#wpadminbar .selected .shortlink-input {
-	display: block;
-}
-
-#wpadminbar .quicklinks .menupop ul li {
-	float: none;
-}
-
-#wpadminbar .quicklinks .menupop ul li a strong {
-	font-weight: 600;
-}
-
-#wpadminbar .quicklinks .menupop ul li .ab-item,
-#wpadminbar .quicklinks .menupop ul li a strong,
-#wpadminbar .quicklinks .menupop:focus-within ul li .ab-item,
-#wpadminbar.nojs .quicklinks .menupop:hover ul li .ab-item,
-#wpadminbar .shortlink-input {
-	line-height: 2;
-	height: 26px;
-	white-space: nowrap;
-	min-width: 140px;
-}
-
-#wpadminbar .shortlink-input {
-	width: 200px;
-}
-
-#wpadminbar.nojs li:hover > .ab-sub-wrapper,
-#wpadminbar li:focus-within > .ab-sub-wrapper {
-	display: block;
-}
-
-#wpadminbar .menupop li:hover > .ab-sub-wrapper,
-#wpadminbar .menupop li:focus-within > .ab-sub-wrapper {
-	margin-left: 100%;
-	margin-top: -32px;
-}
-
-#wpadminbar .ab-top-secondary .menupop li:hover > .ab-sub-wrapper,
-#wpadminbar .ab-top-secondary .menupop li:focus-within > .ab-sub-wrapper {
-	margin-left: 0;
-	left: inherit;
-	right: 100%;
-}
-
-#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus,
-#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item,
-#wpadminbar .ab-top-menu > li:focus-within > .ab-item {
-	background: #32373c;
-	color: #00b9eb;
-}
-#wpadminbar .ab-top-menu > li:focus-within > .ab-item {
-	background: #32373c;
-	color: #00b9eb;
-}
-
-#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label,
-#wpadminbar > #wp-toolbar li:focus-within span.ab-label,
-#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label {
-	color: #00b9eb;
-}
-
-#wpadminbar > #wp-toolbar > #wp-admin-bar-root-default .ab-icon,
-#wpadminbar .ab-icon,
-#wpadminbar .ab-item:before,
-.wp-admin-bar-arrow {
-	position: relative;
-	float: left;
-	font: normal 20px/1 dashicons;
-	speak: none;
-	padding: 4px 0;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	background-image: none !important;
-	margin-right: 6px;
-}
-
-#wpadminbar .ab-icon:before,
-#wpadminbar .ab-item:before,
-#wpadminbar #adminbarsearch:before {
-	color: #a0a5aa;
-	color: rgba(240, 245, 250, 0.6);
-}
-
-#wpadminbar .ab-icon:before,
-#wpadminbar .ab-item:before,
-#wpadminbar #adminbarsearch:before {
-	position: relative;
-	transition: all .1s ease-in-out;
-}
-
-#wpadminbar .ab-label {
-	display: inline-block;
-	height: 32px;
-}
-
-#wpadminbar .ab-submenu .ab-item {
-	color: #b4b9be;
-	color: rgba(240, 245, 250, 0.7);
-}
-
-#wpadminbar .quicklinks .menupop ul li a,
-#wpadminbar .quicklinks .menupop ul li a strong,
-#wpadminbar .quicklinks .menupop:focus-within ul li a,
-#wpadminbar.nojs .quicklinks .menupop:hover ul li a {
-	color: #b4b9be;
-	color: rgba(240, 245, 250, 0.7);
-}
-
-#wpadminbar .quicklinks .menupop ul li a:hover,
-#wpadminbar .quicklinks .menupop ul li a:focus,
-#wpadminbar .quicklinks .menupop ul li a:hover strong,
-#wpadminbar .quicklinks .menupop ul li a:focus strong,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop:focus-within > a,
-#wpadminbar .quicklinks .menupop:focus-within ul li a:hover,
-#wpadminbar .quicklinks .menupop:focus-within ul li a:focus,
-#wpadminbar .quicklinks .menupop:focus-within ul li div[tabindex]:hover,
-#wpadminbar .quicklinks .menupop:focus-within ul li div[tabindex]:focus,
-#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
-#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,
-#wpadminbar li:hover .ab-icon:before,
-#wpadminbar li:hover .ab-item:before,
-#wpadminbar li a:focus .ab-icon:before,
-#wpadminbar li .ab-item:focus:before,
-#wpadminbar li .ab-item:focus .ab-icon:before,
-#wpadminbar li:focus-within .ab-icon:before,
-#wpadminbar li:focus-within .ab-item:before,
-#wpadminbar li:hover #adminbarsearch:before,
-#wpadminbar li #adminbarsearch.adminbar-focused:before {
-	color: #00b9eb;
-}
-
-#wpadminbar.mobile .quicklinks .ab-icon:before,
-#wpadminbar.mobile .quicklinks .ab-item:before {
-	color: #b4b9be;
-}
-
-#wpadminbar.mobile .quicklinks :focus-within .ab-icon:before,
-#wpadminbar.mobile .quicklinks :focus-within .ab-item:before {
-	color: #00b9eb;
-}
-
-#wpadminbar .menupop .menupop > .ab-item .wp-admin-bar-arrow:before,
-#wpadminbar .ab-top-secondary .menupop .menupop > .ab-item:before {
-	position: absolute;
-	font: normal 17px/1 dashicons;
-	speak: none;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-#wpadminbar .menupop .menupop > .ab-item {
-	display: block;
-	padding-right: 2em;
-}
-
-#wpadminbar .menupop .menupop > .ab-item .wp-admin-bar-arrow:before {
-	top: 1px;
-	right: 10px;
-	padding: 4px 0;
-	content: "\f139";
-	color: inherit;
-}
-
-#wpadminbar .ab-top-secondary .menupop .menupop > .ab-item {
-	padding-left: 2em;
-	padding-right: 1em;
-}
-
-#wpadminbar .ab-top-secondary .menupop .menupop > .ab-item .wp-admin-bar-arrow:before {
-	top: 1px;
-	left: 6px;
-	content: "\f141";
-}
-
-#wpadminbar .quicklinks .menupop ul.ab-sub-secondary {
-	display: block;
-	position: relative;
-	right: auto;
-	margin: 0;
-	box-shadow: none;
-}
-
-#wpadminbar .quicklinks .menupop ul.ab-sub-secondary,
-#wpadminbar .quicklinks .menupop ul.ab-sub-secondary .ab-submenu {
-	background: #464b50;
-}
-
-#wpadminbar .quicklinks .menupop .ab-sub-secondary > li > a:hover,
-#wpadminbar .quicklinks .menupop .ab-sub-secondary > li .ab-item:focus a {
-	color: #00b9eb;
-}
-
-#wpadminbar .quicklinks a span#ab-updates {
-	background: #eee;
-	color: #32373c;
-	display: inline;
-	padding: 2px 5px;
-	font-size: 10px;
-	font-weight: 600;
-	border-radius: 10px;
-}
-
-#wpadminbar .quicklinks a:hover span#ab-updates {
-	background: #fff;
-	color: #000;
-}
-
-#wpadminbar .ab-top-secondary {
-	float: right;
-}
-
-#wpadminbar ul li:last-child,
-#wpadminbar ul li:last-child .ab-item {
-	box-shadow: none;
-}
-
-/**
- * Recovery Mode
- */
-#wpadminbar #wp-admin-bar-recovery-mode {
-	color: #fff;
-	background-color: #ca4a1f;
-}
-
-#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode:focus-within >.ab-item,
-#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
-#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
-	color: #fff;
-	background-color: #c0461e;
-}
-
-/**
- * My Account
- */
-#wp-admin-bar-my-account > ul {
-	min-width: 198px;
-}
-
-#wp-admin-bar-my-account > .ab-item:before {
-	content: "\f110";
-	top: 2px;
-	float: right;
-	margin-left: 6px;
-	margin-right: 0;
-}
-
-#wp-admin-bar-my-account.with-avatar > .ab-item:before {
-	display: none;
-	content: none;
-}
-
-#wp-admin-bar-my-account.with-avatar > ul {
-	min-width: 270px;
-}
-
-#wpadminbar.ie8 #wp-admin-bar-my-account.with-avatar .ab-item {
-	white-space: nowrap;
-}
-
-#wpadminbar #wp-admin-bar-user-actions > li {
-	margin-left: 16px;
-	margin-right: 16px;
-}
-
-#wpadminbar #wp-admin-bar-user-actions.ab-submenu {
-	padding: 6px 0 12px;
-}
-
-#wpadminbar #wp-admin-bar-my-account.with-avatar #wp-admin-bar-user-actions > li {
-	margin-left: 88px;
-}
-
-#wpadminbar #wp-admin-bar-user-info {
-	margin-top: 6px;
-	margin-bottom: 15px;
-	height: auto;
-	background: none;
-}
-
-#wp-admin-bar-user-info .avatar {
-	position: absolute;
-	left: -72px;
-	top: 4px;
-	width: 64px;
-	height: 64px;
-}
-
-#wpadminbar #wp-admin-bar-user-info a {
-	background: none;
-	height: auto;
-}
-
-#wpadminbar #wp-admin-bar-user-info span {
-	background: none;
-	padding: 0;
-	height: 18px;
-}
-
-#wpadminbar #wp-admin-bar-user-info .display-name,
-#wpadminbar #wp-admin-bar-user-info .username {
-	display: block;
-}
-
-#wpadminbar #wp-admin-bar-user-info .username {
-	color: #a0a5aa;
-	font-size: 11px;
-}
-
-#wpadminbar #wp-admin-bar-my-account.with-avatar > .ab-empty-item img,
-#wpadminbar #wp-admin-bar-my-account.with-avatar > a img {
-	width: 16px; /* Was auto. */
-	height: 16px;
-	padding: 0;
-	border: 1px solid #82878c;
-	background: #eee;
-	line-height: 1.84615384;
-	vertical-align: middle;
-	margin: -4px 0 0 6px;
-	float: none;
-	display: inline-block; /* Was inline. */
-}
-
-#wpadminbar.ie8 #wp-admin-bar-my-account.with-avatar > .ab-empty-item img,
-#wpadminbar.ie8 #wp-admin-bar-my-account.with-avatar > a img {
-	width: 16px; /* Was auto. */
-}
-
-/**
- * WP Logo
- */
-#wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon {
-	width: 15px;
-	height: 20px;
-	margin-right: 0;
-	padding: 6px 0 5px;
-}
-
-#wpadminbar #wp-admin-bar-wp-logo > .ab-item {
-	padding: 0 7px;
-}
-
-#wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon:before {
-	content: "\f120";
-	top: 2px;
-}
-
-/*
- * My Sites & Site Title
- */
-#wpadminbar .quicklinks li .blavatar {
-	float: left;
-	font: normal 16px/1 dashicons !important;
-	speak: none;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	color: #eee;
-}
-
-#wpadminbar .quicklinks li a:hover .blavatar,
-#wpadminbar .quicklinks li a:focus .blavatar,
-#wpadminbar .quicklinks .ab-sub-wrapper .menupop:focus-within > a .blavatar {
-	color: #00b9eb;
-}
-
-#wpadminbar .quicklinks li .blavatar:before {
-	content: "\f120";
-	height: 16px;
-	width: 16px;
-	display: inline-block;
-	margin: 6px 8px 0 -2px;
-}
-
-#wpadminbar #wp-admin-bar-appearance {
-	margin-top: -12px;
-}
-
-#wpadminbar #wp-admin-bar-my-sites > .ab-item:before,
-#wpadminbar #wp-admin-bar-site-name > .ab-item:before {
-	content: "\f541";
-	top: 2px;
-}
-
-#wpadminbar #wp-admin-bar-customize > .ab-item:before {
-	content: "\f540";
-	top: 2px;
-}
-
-
-#wpadminbar #wp-admin-bar-edit > .ab-item:before {
-	content: "\f464";
-	top: 2px;
-}
-
-#wpadminbar #wp-admin-bar-site-name > .ab-item:before {
-	content: "\f226";
-}
-
-.wp-admin #wpadminbar #wp-admin-bar-site-name > .ab-item:before {
-	content: "\f102";
-}
-
-
-
-/**
- * Comments
- */
-#wpadminbar #wp-admin-bar-comments .ab-icon {
-	margin-right: 6px;
-}
-
-#wpadminbar #wp-admin-bar-comments .ab-icon:before {
-	content: "\f101";
-	top: 3px;
-}
-
-#wpadminbar #wp-admin-bar-comments .count-0 {
-	opacity: .5;
-}
-
-/**
- * New Content
- */
-#wpadminbar #wp-admin-bar-new-content .ab-icon:before {
-	content: "\f132";
-	top: 4px;
-}
-
-/**
- * Updates
- */
-#wpadminbar #wp-admin-bar-updates .ab-icon:before {
-	content: "\f463";
-	top: 2px;
-}
-
-/**
- * Search
- */
-#wpadminbar.ie8 #wp-admin-bar-search {
-	display: block;
-	min-width: 32px;
-}
-#wpadminbar #wp-admin-bar-search .ab-item {
-	padding: 0;
-	background: transparent;
-}
-
-#wpadminbar #adminbarsearch {
-	position: relative;
-	height: 32px;
-	padding: 0 2px;
-	z-index: 1;
-}
-
-#wpadminbar #adminbarsearch:before {
-	position: absolute;
-	top: 6px;
-	left: 5px;
-	z-index: 20;
-	font: normal 20px/1 dashicons !important;
-	content: "\f179";
-	speak: none;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-/* The admin bar search field needs to reset many styles that might be inherited from the active Theme CSS. See ticket #40313. */
-#wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input {
-	display: inline-block;
-	float: none;
-	position: relative;
-	z-index: 30;
-	font-size: 13px;
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-	line-height: 1.84615384;
-	text-indent: 0;
-	height: 24px;
-	width: 24px;
-	max-width: none;
-	padding: 0 3px 0 24px;
-	margin: 0;
-	color: #ccc;
-	background-color: rgba(255, 255, 255, 0);
-	border: none;
-	outline: none;
-	cursor: pointer;
-	box-shadow: none;
-	box-sizing: border-box;
-	transition-duration: 400ms;
-	transition-property: width, background;
-	transition-timing-function: ease;
-}
-
-#wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
-	z-index: 10;
-	color: #000;
-	width: 200px;
-	background-color: rgba(255, 255, 255, 0.9);
-	cursor: text;
-	border: 0;
-}
-
-#wpadminbar.ie7 > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input {
-	margin-top: 3px;
-	width: 120px;
-}
-
-#wpadminbar.ie8 > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input {
-	/* IE8 z-index bug with transparent / empty elements - fill in with an encoded transparent GIF */
-	background: transparent 0 0 repeat scroll url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
-}
-
-/* IE8 doesn't redraw the pseudo elements unless you make a change to the content */
-#wpadminbar.ie8 #adminbarsearch.adminbar-focused:before {
-	content: "\f179 "; /* extra space */
-}
-
-#wpadminbar.ie8 > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
-	background: #fff;
-	z-index: -1;
-}
-
-#wpadminbar #adminbarsearch .adminbar-button {
-	display: none;
-}
-
-/**
- * Customize support classes
- */
-.no-customize-support .hide-if-no-customize,
-.customize-support .hide-if-customize,
-.no-customize-support #wpadminbar .hide-if-no-customize,
-.no-customize-support.wp-core-ui .hide-if-no-customize,
-.no-customize-support .wp-core-ui .hide-if-no-customize,
-.customize-support #wpadminbar .hide-if-customize,
-.customize-support.wp-core-ui .hide-if-customize,
-.customize-support .wp-core-ui .hide-if-customize {
-	display: none;
-}
-
-/* Skip link */
-#wpadminbar .screen-reader-text,
-#wpadminbar .screen-reader-text span {
-	border: 0;
-	clip: rect(1px, 1px, 1px, 1px);
-	-webkit-clip-path: inset(50%);
-	clip-path: inset(50%);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-	word-wrap: normal !important;
-}
-
-#wpadminbar .screen-reader-shortcut {
-	position: absolute;
-	top: -1000em;
-}
-
-#wpadminbar .screen-reader-shortcut:focus {
-	left: 6px;
-	top: 7px;
-	height: auto;
-	width: auto;
-	display: block;
-	font-size: 14px;
-	font-weight: 600;
-	padding: 15px 23px 14px;
-	background: #f1f1f1;
-	color: #0073aa;
-	z-index: 100000;
-	line-height: normal;
-	text-decoration: none;
-	box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6);
-}
-
-/**
- * IE 6-targeted rules
- */
-* html #wpadminbar {
-	overflow: hidden;
-	position: absolute;
-}
-
-* html #wpadminbar .quicklinks ul li a {
-	float: left;
-}
-
-* html #wpadminbar .menupop a span {
-	background-image: none;
-}
-
-/* No @font-face support */
-.no-font-face #wpadminbar ul.ab-top-menu > li > a.ab-item {
-	display: block;
-	width: 45px;
-	text-align: center;
-	overflow: hidden;
-	margin: 0 3px;
-}
-
-.no-font-face #wpadminbar #wp-admin-bar-my-sites > .ab-item,
-.no-font-face #wpadminbar #wp-admin-bar-site-name > .ab-item,
-.no-font-face #wpadminbar #wp-admin-bar-edit > .ab-item {
-	text-indent: 0;
-}
-
-.no-font-face #wpadminbar .ab-icon,
-.no-font-face #wpadminbar .ab-icon:before,
-.no-font-face #wpadminbar a.ab-item:before,
-.no-font-face #wpadminbar #wp-admin-bar-wp-logo > .ab-item {
-	display: none !important;
-}
-
-.no-font-face #wpadminbar ul.ab-top-menu > li > a > span.ab-label {
-	display: inline;
-}
-
-.no-font-face #wpadminbar #wp-admin-bar-menu-toggle span.ab-icon {
-	display: inline !important;
-}
-
-.no-font-face #wpadminbar #wp-admin-bar-menu-toggle span.ab-icon:before {
-	content: "Menu";
-	font: 14px/45px sans-serif !important;
-	display: inline-block !important;
-	color: #fff;
-}
-
-.no-font-face #wpadminbar #wp-admin-bar-site-name a.ab-item {
-	color: #fff;
-}
-/* End no @font-face */
-
-@media screen and (max-width: 782px) {
-	/* Toolbar Touchification*/
-	html #wpadminbar {
-		height: 46px;
-		min-width: 240px; /* match the min-width of the body in wp-admin/css/common.css */
-	}
-
-	#wpadminbar * {
-		font-size: 14px;
-		font-weight: 400;
-		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-		line-height: 2.28571428;
-	}
-
-	#wpadminbar .quicklinks > ul > li > a,
-	#wpadminbar .quicklinks .ab-empty-item {
-		padding: 0;
-		height: 46px;
-		line-height: 3.28571428;
-		width: auto;
-	}
-
-	#wpadminbar .ab-icon {
-		font: 40px/1 dashicons !important;
-		margin: 0;
-		padding: 0;
-		width: 52px;
-		height: 46px;
-		text-align: center;
-	}
-
-	#wpadminbar .ab-icon:before {
-		text-align: center;
-	}
-
-	#wpadminbar .ab-submenu {
-		padding: 0;
-	}
-
-	#wpadminbar #wp-admin-bar-site-name a.ab-item,
-	#wpadminbar #wp-admin-bar-my-sites a.ab-item,
-	#wpadminbar #wp-admin-bar-my-account a.ab-item {
-		text-overflow: clip;
-	}
-
-	#wpadminbar .quicklinks .menupop ul li .ab-item,
-	#wpadminbar .quicklinks .menupop ul li a strong,
-	#wpadminbar .quicklinks .menupop:focus-within ul li .ab-item,
-	#wpadminbar.nojs .quicklinks .menupop:hover ul li .ab-item,
-	#wpadminbar .shortlink-input {
-		line-height: 1.6;
-	}
-
-	#wpadminbar .ab-label {
-		display: none;
-	}
-
-	#wpadminbar .menupop li:hover > .ab-sub-wrapper,
-	#wpadminbar .menupop li:focus-within > .ab-sub-wrapper {
-		margin-top: -46px;
-	}
-
-	#wpadminbar .ab-top-menu .menupop .ab-sub-wrapper .menupop > .ab-item {
-		padding-right: 30px;
-	}
-
-	#wpadminbar .menupop .menupop > .ab-item:before {
-		top: 10px;
-		right: 6px;
-	}
-
-	#wpadminbar .ab-top-menu > .menupop > .ab-sub-wrapper .ab-item {
-		font-size: 16px;
-		padding: 8px 16px;
-	}
-
-	#wpadminbar .ab-top-menu > .menupop > .ab-sub-wrapper a:empty {
-		display: none;
-	}
-
-	/* WP logo */
-	#wpadminbar #wp-admin-bar-wp-logo > .ab-item {
-		padding: 0;
-	}
-
-	#wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon {
-		padding: 0;
-		width: 52px;
-		height: 46px;
-		text-align: center;
-		vertical-align: top;
-	}
-
-	#wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon:before {
-		font: 28px/1 dashicons !important;
-		top: -3px;
-	}
-
-	#wpadminbar .ab-icon,
-	#wpadminbar .ab-item:before {
-		padding: 0;
-	}
-
-	/* My Sites and "Site Title" menu */
-	#wpadminbar #wp-admin-bar-my-sites > .ab-item,
-	#wpadminbar #wp-admin-bar-site-name > .ab-item,
-	#wpadminbar #wp-admin-bar-customize > .ab-item,
-	#wpadminbar #wp-admin-bar-edit > .ab-item,
-	#wpadminbar #wp-admin-bar-my-account > .ab-item {
-		text-indent: 100%;
-		white-space: nowrap;
-		overflow: hidden;
-		width: 52px;
-		padding: 0;
-		color: #a0a5aa; /* @todo not needed? this text is hidden */
-		position: relative;
-	}
-
-	#wpadminbar > #wp-toolbar > #wp-admin-bar-root-default .ab-icon,
-	#wpadminbar .ab-icon,
-	#wpadminbar .ab-item:before {
-		padding: 0;
-		margin-right: 0;
-	}
-
-	#wpadminbar #wp-admin-bar-edit > .ab-item:before,
-	#wpadminbar #wp-admin-bar-my-sites > .ab-item:before,
-	#wpadminbar #wp-admin-bar-site-name > .ab-item:before,
-	#wpadminbar #wp-admin-bar-customize > .ab-item:before,
-	#wpadminbar #wp-admin-bar-my-account > .ab-item:before {
-		display: block;
-		text-indent: 0;
-		font: normal 32px/1 dashicons;
-		speak: none;
-		top: 7px;
-		width: 52px;
-		text-align: center;
-		-webkit-font-smoothing: antialiased;
-		-moz-osx-font-smoothing: grayscale;
-	}
-
-	#wpadminbar #wp-admin-bar-appearance {
-		margin-top: 0;
-	}
-
-	#wpadminbar .quicklinks li .blavatar:before {
-		display: none;
-	}
-
-	/* Search */
-	#wpadminbar #wp-admin-bar-search {
-		display: none;
-	}
-
-	/* New Content */
-	#wpadminbar #wp-admin-bar-new-content .ab-icon:before {
-		top: 0;
-		line-height: 1.33333333;
-		height: 46px !important;
-		text-align: center;
-		width: 52px;
-		display: block;
-	}
-
-	/* Updates */
-	#wpadminbar #wp-admin-bar-updates {
-		text-align: center;
-	}
-
-	#wpadminbar #wp-admin-bar-updates .ab-icon:before {
-		top: 3px;
-	}
-
-	/* Comments */
-	#wpadminbar #wp-admin-bar-comments .ab-icon {
-		margin: 0;
-	}
-
-	#wpadminbar #wp-admin-bar-comments .ab-icon:before {
-		display: block;
-		font-size: 34px;
-		height: 46px;
-		line-height: 1.38235294;
-		top: 0;
-	}
-
-	/* My Account */
-	#wpadminbar #wp-admin-bar-my-account > a {
-		position: relative;
-		white-space: nowrap;
-		text-indent: 150%; /* More than 100% indention is needed since this element has padding */
-		width: 28px;
-		padding: 0 10px;
-		overflow: hidden; /* Prevent link text from forcing horizontal scrolling on mobile */
-	}
-
-	#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
-		position: absolute;
-		top: 13px;
-		right: 10px;
-		width: 26px;
-		height: 26px;
-	}
-
-	#wpadminbar #wp-admin-bar-user-actions.ab-submenu {
-		padding: 0;
-	}
-
-	#wpadminbar #wp-admin-bar-user-actions.ab-submenu img.avatar {
-		display: none;
-	}
-
-	#wpadminbar #wp-admin-bar-my-account.with-avatar #wp-admin-bar-user-actions > li {
-		margin: 0;
-	}
-
-	#wpadminbar #wp-admin-bar-user-info .display-name {
-		height: auto;
-		font-size: 16px;
-		line-height: 1.5;
-		color: #eee;
-	}
-
-	#wpadminbar #wp-admin-bar-user-info a {
-		padding-top: 4px;
-	}
-
-	#wpadminbar #wp-admin-bar-user-info .username {
-		line-height: 0.8 !important;
-		margin-bottom: -2px;
-	}
-
-	/* Show only default top level items */
-	#wp-toolbar > ul > li {
-		display: none;
-	}
-
-	#wpadminbar li#wp-admin-bar-menu-toggle,
-	#wpadminbar li#wp-admin-bar-wp-logo,
-	#wpadminbar li#wp-admin-bar-my-sites,
-	#wpadminbar li#wp-admin-bar-updates,
-	#wpadminbar li#wp-admin-bar-site-name,
-	#wpadminbar li#wp-admin-bar-customize,
-	#wpadminbar li#wp-admin-bar-new-content,
-	#wpadminbar li#wp-admin-bar-edit,
-	#wpadminbar li#wp-admin-bar-comments,
-	#wpadminbar li#wp-admin-bar-my-account {
-		display: block;
-	}
-
-	/* Allow dropdown list items to appear normally */
-	#wpadminbar li:hover ul li,
-	#wpadminbar li:focus-within ul li,
-	#wpadminbar li:hover ul li:hover ul li {
-		display: list-item;
-	}
-
-	/* Override default min-width so dropdown lists aren't stretched
-		to 100% viewport width at responsive sizes. */
-	#wpadminbar .ab-top-menu > .menupop > .ab-sub-wrapper {
-		min-width: -webkit-fit-content;
-		min-width: -moz-fit-content;
-		min-width: fit-content;
-	}
-
-	#wpadminbar ul#wp-admin-bar-root-default > li {
-		margin-right: 0;
-	}
-
-	/* Experimental fix for touch toolbar dropdown positioning */
-	#wpadminbar .ab-top-menu,
-	#wpadminbar .ab-top-secondary,
-	#wpadminbar #wp-admin-bar-wp-logo,
-	#wpadminbar #wp-admin-bar-my-sites,
-	#wpadminbar #wp-admin-bar-site-name,
-	#wpadminbar #wp-admin-bar-updates,
-	#wpadminbar #wp-admin-bar-comments,
-	#wpadminbar #wp-admin-bar-new-content,
-	#wpadminbar #wp-admin-bar-edit,
-	#wpadminbar #wp-admin-bar-my-account {
-		position: static;
-	}
-
-	#wpadminbar #wp-admin-bar-my-account {
-		float: right;
-	}
-
-	.network-admin #wpadminbar ul#wp-admin-bar-top-secondary > li#wp-admin-bar-my-account {
-		margin-right: 0;
-	}
-
-	/* Realign arrows on taller responsive submenus */
-
-	#wpadminbar .ab-top-secondary .menupop .menupop > .ab-item:before {
-		top: 10px;
-		left: 0;
-	}
-}
-
-/* Smartphone */
-@media screen and (max-width: 600px) {
-	/* Removed: #wpadminbar { position: absolute; } */
-
-	#wp-responsive-overlay {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 400;
-	}
-
-	#wpadminbar .ab-top-menu > .menupop > .ab-sub-wrapper {
-		width: 100%;
-		left: 0;
-	}
-
-	#wpadminbar .menupop .menupop > .ab-item:before {
-		display: none;
-	}
-
-	#wpadminbar #wp-admin-bar-wp-logo.menupop .ab-sub-wrapper {
-		margin-left: 0;
-	}
-
-	#wpadminbar .ab-top-menu > .menupop li > .ab-sub-wrapper {
-		margin: 0;
-		width: 100%;
-		top: auto;
-		left: auto;
-		position: relative;
-	}
-
-	#wpadminbar .ab-top-menu > .menupop li > .ab-sub-wrapper .ab-item {
-		font-size: 16px;
-		padding: 6px 15px 19px 30px;
-	}
-
-	#wpadminbar li:hover ul li ul li {
-		display: list-item;
-	}
-
-	#wpadminbar li#wp-admin-bar-wp-logo,
-	#wpadminbar li#wp-admin-bar-updates {
-		display: none;
-	}
-
-	/* Make submenus full-width at this size */
-
-	#wpadminbar .ab-top-menu > .menupop li > .ab-sub-wrapper {
-		position: static;
-		box-shadow: none;
-	}
-}
-
-/* Very narrow screens */
-@media screen and (max-width: 400px) {
-	#wpadminbar li#wp-admin-bar-comments {
-		display: none;
-	}
-}
diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 799a6ec4354..98c074cfe55 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1346,43 +1346,39 @@ public static function filter_cancel_comment_reply_link( $formatted_link, $link,
 	 * @since 1.0
 	 */
 	public static function init_admin_bar() {
+		add_filter( 'script_loader_tag', [ __CLASS__, 'filter_admin_bar_style_loader_tag' ], 10, 2 );
+		add_filter( 'style_loader_tag', [ __CLASS__, 'filter_admin_bar_script_loader_tag' ], 10, 2 );
 
-		// Replace admin-bar.css in core with forked version which makes use of :focus-within among other change for AMP-compat.
-		wp_styles()->registered['admin-bar']->src = amp_get_asset_url( 'css/admin-bar.css' );
-		wp_styles()->registered['admin-bar']->ver = AMP__VERSION;
-
-		// Remove any possible '.min' to avoid RTL failing to generate the href for admin-bar-rtl.css, which does not currently have a minified version in the AMP plugin.
-		wp_styles()->registered['admin-bar']->extra['suffix'] = '';
-
-		// Remove script which is almost entirely made obsolete by :focus-inside in the forked admin-bar.css.
-		wp_dequeue_script( 'admin-bar' );
-
-		// Remove customize support script since not valid AMP.
-		add_action(
-			'admin_bar_menu',
-			static function() {
-				remove_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
-			},
-			41
-		);
-
-		// Convert admin bar bump callback into an inline style for admin-bar. See \WP_Admin_Bar::initialize().
+		// Inject the data-ampdevmode attribute into the admin bar bump style. See \WP_Admin_Bar::initialize().
 		if ( current_theme_supports( 'admin-bar' ) ) {
 			$admin_bar_args  = get_theme_support( 'admin-bar' );
 			$header_callback = $admin_bar_args[0]['callback'];
 		} else {
 			$header_callback = '_admin_bar_bump_cb';
 		}
-		remove_action( 'wp_head', $header_callback );
+		$header_callback_priority = has_filter( 'wp_head', $header_callback );
 		if ( '__return_false' !== $header_callback ) {
-			ob_start();
-			$header_callback();
-			$style = ob_get_clean();
-			$data  = trim( preg_replace( '#<style[^>]*>(.*)</style>#is', '$1', $style ) ); // See wp_add_inline_style().
-			wp_add_inline_style( 'admin-bar', $data );
+			remove_action( 'wp_head', $header_callback, $header_callback_priority );
+			add_action(
+				'wp_head',
+				function () use ( $header_callback ) {
+					ob_start();
+					$header_callback();
+					$style = ob_get_clean();
+					echo preg_replace( '/<[a-z0-9\-]+(?=\s|>)/i', '$0 data-ampdevmode ', $style ); // phpcs:ignore
+				},
+				$header_callback_priority
+			);
 		}
 
 		// Emulate customize support script in PHP, to assume Customizer.
+		add_action(
+			'admin_bar_menu',
+			static function() {
+				remove_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
+			},
+			41
+		);
 		add_filter(
 			'body_class',
 			static function( $body_classes ) {
@@ -1397,6 +1393,57 @@ static function( $body_classes ) {
 		);
 	}
 
+	/**
+	 * Recursively determine if a given dependency depends on another.
+	 *
+	 * @param WP_Dependencies $dependencies      Dependencies.
+	 * @param string          $current_handle    Current handle.
+	 * @param string          $dependency_handle Dependency handle.
+	 * @return bool Whether the current handle is a dependency of the dependency handle.
+	 */
+	protected static function has_dependency( WP_Dependencies $dependencies, $current_handle, $dependency_handle ) {
+		if ( $current_handle === $dependency_handle ) {
+			return true;
+		}
+		if ( ! isset( $dependencies->registered[ $current_handle ] ) ) {
+			return false;
+		}
+		foreach ( $dependencies->registered[ $current_handle ]->deps as $handle ) {
+			if ( self::has_dependency( $dependencies, $handle, $dependency_handle ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Add data-ampdevmode attribute to any enqueued style that depends on the admin-bar.
+	 *
+	 * @param string $tag    The link tag for the enqueued style.
+	 * @param string $handle The style's registered handle.
+	 * @return string Tag.
+	 */
+	public static function filter_admin_bar_style_loader_tag( $tag, $handle ) {
+		if ( self::has_dependency( wp_styles(), $handle, 'admin-bar' ) ) {
+			$tag = preg_replace( '/<[a-z0-9\-]+(?=\s|>)/i', '$0 data-ampdevmode ', $tag );
+		}
+		return $tag;
+	}
+
+	/**
+	 * Add data-ampdevmode attribute to any enqueued script that depends on the admin-bar.
+	 *
+	 * @param string $tag    The `<script>` tag for the enqueued script.
+	 * @param string $handle The script's registered handle.
+	 * @return string Tag.
+	 */
+	public static function filter_admin_bar_script_loader_tag( $tag, $handle ) {
+		if ( self::has_dependency( wp_scripts(), $handle, 'admin-bar' ) ) {
+			$tag = preg_replace( '/<[a-z0-9\-]+(?=\s|>)/i', '$0 data-ampdevmode ', $tag );
+		}
+		return $tag;
+	}
+
 	/**
 	 * Ensure the markup exists as required by AMP and elements are in the optimal loading order.
 	 *
@@ -2103,10 +2150,46 @@ public static function prepare_response( $response, $args = [] ) {
 			$dom->documentElement->setAttribute( 'amp', '' );
 		}
 
+		// Enable AMP dev mode when admin bar is showing or in Customizer preview.
+		if ( is_admin_bar_showing() || is_customize_preview() ) { // @todo Allow this to be filtered.
+			$dom->documentElement->setAttribute( 'data-ampdevmode', '' );
+		}
+
+		// Replace admin bar with placeholder prior to sanitizing to prevent conversion of its elements.
+		$original_admin_bar_element    = null;
+		$placeholder_admin_bar_element = null;
+		if ( is_admin_bar_showing() ) {
+			$original_admin_bar_element = $dom->getElementById( 'wpadminbar' );
+			if ( $original_admin_bar_element ) {
+				$placeholder_admin_bar_element = $dom->createElement( 'div' );
+				foreach ( [ 'id', 'class' ] as $attribute_name ) {
+					$placeholder_admin_bar_element->setAttribute(
+						$attribute_name,
+						$original_admin_bar_element->getAttribute( $attribute_name )
+					);
+				}
+				$original_admin_bar_element->parentNode->replaceChild( $placeholder_admin_bar_element, $original_admin_bar_element );
+			}
+		}
+
 		AMP_HTTP::send_server_timing( 'amp_dom_parse', -$dom_parse_start, 'AMP DOM Parse' );
 
 		$assets = AMP_Content_Sanitizer::sanitize_document( $dom, self::$sanitizer_classes, $args );
 
+		// Replace the original admin bar.
+		if ( $original_admin_bar_element && $placeholder_admin_bar_element ) {
+			$placeholder_admin_bar_element->parentNode->replaceChild( $original_admin_bar_element, $placeholder_admin_bar_element );
+			$original_admin_bar_element->setAttribute( 'data-ampdevmode', '' );
+			/**
+			 * Element.
+			 *
+			 * @var DOMElement $admin_bar_element
+			 */
+			foreach ( $original_admin_bar_element->getElementsByTagName( '*' ) as $admin_bar_element ) {
+				$admin_bar_element->setAttribute( 'data-ampdevmode', '' );
+			}
+		}
+
 		// Determine what the validation errors are.
 		$blocking_error_count = 0;
 		$validation_results   = [];
diff --git a/includes/sanitizers/class-amp-base-sanitizer.php b/includes/sanitizers/class-amp-base-sanitizer.php
index 8efcc47e31b..783476f40eb 100644
--- a/includes/sanitizers/class-amp-base-sanitizer.php
+++ b/includes/sanitizers/class-amp-base-sanitizer.php
@@ -341,6 +341,8 @@ public function maybe_enforce_https_src( $src, $force_https = false ) {
 	/**
 	 * Check whether the document of a given node is in dev mode.
 	 *
+	 * @todo There is only ever one document: $this->dom. Eliminate the argument.
+	 *
 	 * @param DOMNode $node Node to check the document of.
 	 * @return bool Whether the document is in dev mode.
 	 */
diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php
index 988c49424c4..97d43b6e172 100644
--- a/includes/sanitizers/class-amp-style-sanitizer.php
+++ b/includes/sanitizers/class-amp-style-sanitizer.php
@@ -731,10 +731,15 @@ public function sanitize() {
 		 */
 		$xpath = $this->xpath;
 
+		$dev_mode_predicate = '';
+		if ( $this->is_document_in_dev_mode( $this->dom ) ) {
+			$dev_mode_predicate = ' and not ( @data-ampdevmode )';
+		}
+
 		$lower_case = 'translate( %s, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz" )'; // In XPath 2.0 this is lower-case().
 		$predicates = [
-			sprintf( '( self::style and not( @amp-boilerplate ) and ( not( @type ) or %s = "text/css" ) )', sprintf( $lower_case, '@type' ) ),
-			sprintf( '( self::link and @href and %s = "stylesheet" )', sprintf( $lower_case, '@rel' ) ),
+			sprintf( '( self::style and not( @amp-boilerplate ) and ( not( @type ) or %s = "text/css" ) %s )', sprintf( $lower_case, '@type' ), $dev_mode_predicate ),
+			sprintf( '( self::link and @href and %s = "stylesheet" %s )', sprintf( $lower_case, '@rel' ), $dev_mode_predicate ),
 		];
 
 		foreach ( $xpath->query( '//*[ ' . implode( ' or ', $predicates ) . ' ]' ) as $element ) {
@@ -814,7 +819,6 @@ public function sanitize() {
 	 */
 	private function get_stylesheet_priority( DOMNode $node ) {
 		$print_priority_base = 100;
-		$admin_bar_priority  = 200;
 
 		$remove_url_scheme = static function( $url ) {
 			return preg_replace( '/^https?:/', '', $url );
@@ -846,9 +850,6 @@ private function get_stylesheet_priority( DOMNode $node ) {
 			if ( in_array( $style_handle, $non_amp_handles, true ) ) {
 				// Styles are for non-AMP JS only so not be used in AMP at all.
 				$priority = 1000;
-			} elseif ( 'admin-bar' === $style_handle ) {
-				// Admin bar has lowest priority. If it gets excluded, then the entire admin bar should be removed.
-				$priority = $admin_bar_priority;
 			} elseif ( 'dashicons' === $style_handle ) {
 				// Dashicons could be used by the theme, but low priority compared to other styles.
 				$priority = 90;
@@ -877,9 +878,7 @@ private function get_stylesheet_priority( DOMNode $node ) {
 			}
 		} elseif ( $node instanceof DOMElement && 'style' === $node->nodeName ) {
 			$element_id = (string) $node->getAttribute( 'id' );
-			if ( 'admin-bar-inline-css' === $element_id ) {
-				$priority = $admin_bar_priority;
-			} elseif ( 'wp-custom-css' === $element_id ) {
+			if ( 'wp-custom-css' === $element_id ) {
 				// Additional CSS from Customizer.
 				$priority = 60;
 			} else {
@@ -2662,65 +2661,6 @@ static function( $pending_stylesheet ) {
 				$body->appendChild( $style_element );
 			}
 		}
-
-		$this->remove_admin_bar_if_css_excluded();
-	}
-
-	/**
-	 * Remove admin bar if its CSS was excluded.
-	 *
-	 * @since 1.2
-	 */
-	private function remove_admin_bar_if_css_excluded() {
-		if ( ! is_admin_bar_showing() ) {
-			return;
-		}
-
-		$admin_bar_id = 'wpadminbar';
-		$admin_bar    = $this->dom->getElementById( $admin_bar_id );
-		if ( ! $admin_bar ) {
-			return;
-		}
-
-		$included = true;
-		foreach ( $this->pending_stylesheets as &$pending_stylesheet ) {
-			$is_admin_bar_css = (
-				'custom' === $pending_stylesheet['group']
-				&&
-				$pending_stylesheet['node'] instanceof DOMElement
-				&&
-				'admin-bar-css' === $pending_stylesheet['node']->getAttribute( 'id' )
-			);
-			if ( $is_admin_bar_css ) {
-				$included = $pending_stylesheet['included'];
-				break;
-			}
-		}
-
-		unset( $pending_stylesheet );
-
-		if ( ! $included ) {
-			// Remove admin-bar class from body element.
-			// @todo It would be nice if any style rules which refer to .admin-bar could also be removed, but this would mean retroactively going back over the CSS again and re-shaking it.
-			$body = $this->dom->getElementsByTagName( 'body' )->item( 0 );
-			if ( $body instanceof DOMElement && $body->hasAttribute( 'class' ) ) {
-				$body->setAttribute(
-					'class',
-					preg_replace( '/(^|\s)admin-bar(\s|$)/', ' ', $body->getAttribute( 'class' ) )
-				);
-			}
-
-			// Remove admin bar element.
-			$comment_text = sprintf(
-				/* translators: %s: CSS selector for admin bar element  */
-				__( 'Admin bar (%s) was removed to preserve AMP validity due to excessive CSS.', 'amp' ),
-				'#' . $admin_bar_id
-			);
-			$admin_bar->parentNode->replaceChild(
-				$this->dom->createComment( ' ' . $comment_text . ' ' ),
-				$admin_bar
-			);
-		}
 	}
 
 	/**
@@ -3041,44 +2981,6 @@ function( $a, $b ) {
 			}
 		}
 
-		$included_count -= $this->exclude_all_admin_bar_css_if_excessive( $indices_by_stylesheet_element_id );
-
 		return $included_count;
 	}
-
-	/**
-	 * If the admin-bar CSS was excluded, make sure the admin-bar inline CSS is also excluded, and vice-versa.
-	 *
-	 * @param int[] $indices_by_stylesheet_element_id Lookup of stylesheet indices by stylesheet element ID.
-	 * @return int Number of excluded styles.
-	 */
-	private function exclude_all_admin_bar_css_if_excessive( $indices_by_stylesheet_element_id ) {
-		$excluded_count = 0;
-
-		$admin_bar_style_element_ids         = [ 'admin-bar-css', 'admin-bar-inline-css' ];
-		$should_exclude_admin_bar_inline_css = false;
-		foreach ( $admin_bar_style_element_ids as $admin_bar_style_element_id ) {
-			if ( ! isset( $indices_by_stylesheet_element_id[ $admin_bar_style_element_id ] ) ) {
-				continue;
-			}
-			if ( false === $this->pending_stylesheets[ $indices_by_stylesheet_element_id[ $admin_bar_style_element_id ] ]['included'] ) {
-				$should_exclude_admin_bar_inline_css = true;
-				break;
-			}
-		}
-		if ( $should_exclude_admin_bar_inline_css ) {
-			foreach ( $admin_bar_style_element_ids as $admin_bar_style_element_id ) {
-				$needs_exclusion = (
-					isset( $indices_by_stylesheet_element_id[ $admin_bar_style_element_id ] )
-					&&
-					true === $this->pending_stylesheets[ $indices_by_stylesheet_element_id[ $admin_bar_style_element_id ] ]['included']
-				);
-				if ( $needs_exclusion ) {
-					$this->pending_stylesheets[ $indices_by_stylesheet_element_id[ $admin_bar_style_element_id ] ]['included'] = false;
-					$excluded_count++;
-				}
-			}
-		}
-		return $excluded_count;
-	}
 }
diff --git a/tests/php/test-amp-style-sanitizer.php b/tests/php/test-amp-style-sanitizer.php
index cc73e6df098..7aaecbeac73 100644
--- a/tests/php/test-amp-style-sanitizer.php
+++ b/tests/php/test-amp-style-sanitizer.php
@@ -2309,11 +2309,11 @@ function( $original_dom, $original_source, $amphtml_dom, $amphtml_source ) {
 					$this->assertContains( '.is-style-outline .wp-block-button__link', $amphtml_source, 'Expected block-library/style.css' );
 					$this->assertContains( '[class^="wp-block-"]:not(.wp-block-gallery) figcaption', $amphtml_source, 'Expected twentyten/blocks.css' );
 					$this->assertContains( 'amp-img.amp-wp-enforced-sizes', $amphtml_source, 'Expected amp-default.css' );
-					$this->assertNotContains( 'ab-empty-item', $amphtml_source, 'Expected admin-bar.css to not be present.' );
+					$this->assertContains( 'ab-empty-item', $amphtml_source, 'Expected admin-bar.css to still be present.' );
 					$this->assertNotContains( 'earlyprintstyle', $amphtml_source, 'Expected early print style to not be present.' );
-					$this->assertNotContains( 'admin-bar-inline-style', $amphtml_source, 'Expected admin-bar.css inline style to not be present.' );
-					$this->assertNotContains( 'admin-bar', $amphtml_dom->getElementsByTagName( 'body' )->item( 0 )->getAttribute( 'class' ) );
-					$this->assertEmpty( $amphtml_dom->getElementById( 'wpadminbar' ) );
+					$this->assertContains( 'admin-bar', $amphtml_dom->getElementsByTagName( 'body' )->item( 0 )->getAttribute( 'class' ) );
+					$this->assertInstanceOf( 'DOMElement', $amphtml_dom->getElementById( 'wpadminbar' ) );
+					$this->assertTrue( $amphtml_dom->getElementById( 'wpadminbar' )->hasAttribute( 'data-ampdevmode' ) );
 				},
 			],
 			// @todo Add other scenarios in the future.
@@ -2331,6 +2331,8 @@ function( $original_dom, $original_source, $amphtml_dom, $amphtml_source ) {
 	 * @param callable $assert         Function which runs assertions.
 	 */
 	public function test_prioritized_stylesheets( $html_generator, $assert ) {
+		$this->markTestIncomplete( 'This needs to actually use AMP_Theme_Support::prepare_response.' );
+
 		if ( version_compare( get_bloginfo( 'version' ), '5.0', '<' ) ) {
 			$this->markTestSkipped( 'Requires WordPress 5.0.' );
 		}
diff --git a/tests/php/test-class-amp-theme-support.php b/tests/php/test-class-amp-theme-support.php
index 72eaa076241..f507f1084b8 100644
--- a/tests/php/test-class-amp-theme-support.php
+++ b/tests/php/test-class-amp-theme-support.php
@@ -1154,17 +1154,12 @@ public function test_filter_cancel_comment_reply_link() {
 	 * @covers \AMP_Theme_Support::init_admin_bar()
 	 */
 	public function test_init_admin_bar() {
-		global $wp_styles, $wp_scripts;
-		$wp_styles  = null;
-		$wp_scripts = null;
-		$this->assertNotEquals( AMP__VERSION, wp_styles()->registered['admin-bar']->ver );
-
 		AMP_Theme_Support::init_admin_bar();
-		$this->assertEquals( AMP__VERSION, wp_styles()->registered['admin-bar']->ver );
-		$this->assertFalse( wp_scripts()->query( 'admin-bar', 'enqueued' ) );
 		$body_classes = get_body_class();
 		$this->assertContains( 'customize-support', $body_classes );
 		$this->assertNotContains( 'no-customize-support', $body_classes );
+
+		$this->markTestIncomplete( 'More work needed.' );
 	}
 
 	/**

From 8640d1ad4707ac8e0b0ff9c155453c06506966ef Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Thu, 5 Sep 2019 17:32:13 -0700
Subject: [PATCH 03/22] Prevent tree-shaking under #wpadminbar when admin bar
 is showing

Also add missing dynamic_element_selectors arg to stylesheet cache key.
---
 includes/amp-helper-functions.php                 | 1 +
 includes/sanitizers/class-amp-style-sanitizer.php | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index d5f53c694f4..4a1fbd55a06 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -875,6 +875,7 @@ function amp_get_content_sanitizers( $post = null ) {
 		'AMP_Script_Sanitizer'            => [],
 		'AMP_Style_Sanitizer'             => [
 			'include_manifest_comment' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ) ? 'always' : 'when_excessive',
+			'admin_bar_showing'        => is_admin_bar_showing(),
 		],
 		'AMP_Tag_And_Attribute_Sanitizer' => [], // Note: This whitelist sanitizer must come at the end to clean up any remaining issues the other sanitizers didn't catch.
 	];
diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php
index 97d43b6e172..0e567cd20d3 100644
--- a/includes/sanitizers/class-amp-style-sanitizer.php
+++ b/includes/sanitizers/class-amp-style-sanitizer.php
@@ -88,6 +88,7 @@ class AMP_Style_Sanitizer extends AMP_Base_Sanitizer {
 	 *      @type bool     $should_locate_sources      Whether to locate the sources when reporting validation errors.
 	 *      @type string   $parsed_cache_variant       Additional value by which to vary parsed cache.
 	 *      @type string   $include_manifest_comment   Whether to show the manifest HTML comment in the response before the style[amp-custom] element. Can be 'always', 'never', or 'when_excessive'.
+	 *      @type bool     $admin_bar_showing          Whether the admin bar is showing. When true, the #wpadminbar is added to dynamic_element_selectors.
 	 * }
 	 */
 	protected $args;
@@ -368,6 +369,11 @@ public static function has_required_php_css_parser() {
 	public function __construct( DOMDocument $dom, array $args = [] ) {
 		parent::__construct( $dom, $args );
 
+		// Prevent tree shaking theme-specific admin bar styles when admin bar is showing.
+		if ( ! empty( $this->args['admin_bar_showing'] ) ) {
+			$this->args['dynamic_element_selectors'][] = '#wpadminbar';
+		}
+
 		foreach ( AMP_Allowed_Tags_Generated::get_allowed_tag( 'style' ) as $spec_rule ) {
 			if ( ! isset( $spec_rule[ AMP_Rule_Spec::TAG_SPEC ]['spec_name'] ) ) {
 				continue;
@@ -1322,7 +1328,7 @@ private function process_stylesheet( $stylesheet, $options = [] ) {
 			),
 			wp_array_slice_assoc(
 				$this->args,
-				[ 'should_locate_sources', 'parsed_cache_variant' ]
+				[ 'should_locate_sources', 'parsed_cache_variant', 'dynamic_element_selectors' ]
 			),
 			[
 				'language' => get_bloginfo( 'language' ), // Used to tree-shake html[lang] selectors.

From f75586f0b1cf80e660624bb50f17f55fd912bba3 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Fri, 6 Sep 2019 10:29:23 -0700
Subject: [PATCH 04/22] Prevent admin bar from even attempting to be displayed
 on story template

---
 includes/class-amp-story-post-type.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php
index 7ba0a60ca54..609c6a029fc 100644
--- a/includes/class-amp-story-post-type.php
+++ b/includes/class-amp-story-post-type.php
@@ -233,6 +233,17 @@ function() {
 		add_action( 'amp_story_head', 'wp_site_icon', 99 );
 		add_action( 'amp_story_head', 'wp_oembed_add_discovery_links' );
 
+		// Disable admin bar from even trying to be output, since wp_head and wp_footer hooks are not on the template.
+		add_filter(
+			'show_admin_bar',
+			function( $show ) {
+				if ( is_singular( self::POST_TYPE_SLUG ) ) {
+					$show = false;
+				}
+				return $show;
+			}
+		);
+
 		// Remove unnecessary settings.
 		add_filter( 'block_editor_settings', [ __CLASS__, 'filter_block_editor_settings' ], 10, 2 );
 

From a81fb7355b9efa513553a1d2cf45afc381e0d7ce Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Fri, 6 Sep 2019 15:39:45 -0700
Subject: [PATCH 05/22] Remove redundant document argument from
 is_document_in_dev_mode()

---
 includes/sanitizers/class-amp-base-sanitizer.php  | 13 ++++++-------
 includes/sanitizers/class-amp-style-sanitizer.php |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/includes/sanitizers/class-amp-base-sanitizer.php b/includes/sanitizers/class-amp-base-sanitizer.php
index 783476f40eb..35b9beb189b 100644
--- a/includes/sanitizers/class-amp-base-sanitizer.php
+++ b/includes/sanitizers/class-amp-base-sanitizer.php
@@ -341,15 +341,12 @@ public function maybe_enforce_https_src( $src, $force_https = false ) {
 	/**
 	 * Check whether the document of a given node is in dev mode.
 	 *
-	 * @todo There is only ever one document: $this->dom. Eliminate the argument.
+	 * @since 1.3
 	 *
-	 * @param DOMNode $node Node to check the document of.
 	 * @return bool Whether the document is in dev mode.
 	 */
-	protected function is_document_in_dev_mode( DOMNode $node ) {
-		$document = $node instanceof DOMDocument ? $node : $node->ownerDocument;
-
-		return $document->documentElement->hasAttribute(
+	protected function is_document_in_dev_mode() {
+		return $this->dom->documentElement->hasAttribute(
 			AMP_Rule_Spec::DEV_MODE_ATTRIBUTE
 		);
 	}
@@ -357,6 +354,8 @@ protected function is_document_in_dev_mode( DOMNode $node ) {
 	/**
 	 * Check whether a node is exempt from validation during dev mode.
 	 *
+	 * @since 1.3
+	 *
 	 * @param DOMNode $node Node to check.
 	 * @return bool Whether the node should be exempt during dev mode.
 	 */
@@ -375,7 +374,7 @@ protected function has_dev_mode_exemption( DOMNode $node ) {
 	 * @return bool Whether the node should be exempt from validation.
 	 */
 	protected function is_exempt_from_validation( DOMNode $node ) {
-		return $this->is_document_in_dev_mode( $node ) && $this->has_dev_mode_exemption( $node );
+		return $this->is_document_in_dev_mode() && $this->has_dev_mode_exemption( $node );
 	}
 
 	/**
diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php
index 0e567cd20d3..67298988528 100644
--- a/includes/sanitizers/class-amp-style-sanitizer.php
+++ b/includes/sanitizers/class-amp-style-sanitizer.php
@@ -738,7 +738,7 @@ public function sanitize() {
 		$xpath = $this->xpath;
 
 		$dev_mode_predicate = '';
-		if ( $this->is_document_in_dev_mode( $this->dom ) ) {
+		if ( $this->is_document_in_dev_mode() ) {
 			$dev_mode_predicate = ' and not ( @data-ampdevmode )';
 		}
 

From bfad786a5b9ef5d6090d4c9239630a286f5429a6 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Fri, 6 Sep 2019 15:49:40 -0700
Subject: [PATCH 06/22] Skip converting elements in dev mode; skip processing
 style attributes for dev mode elements

---
 includes/sanitizers/class-amp-audio-sanitizer.php  |  4 ++--
 includes/sanitizers/class-amp-form-sanitizer.php   |  2 +-
 includes/sanitizers/class-amp-iframe-sanitizer.php |  4 ++--
 includes/sanitizers/class-amp-img-sanitizer.php    |  2 +-
 includes/sanitizers/class-amp-script-sanitizer.php |  7 +++++--
 includes/sanitizers/class-amp-style-sanitizer.php  |  4 ++--
 includes/sanitizers/class-amp-video-sanitizer.php  |  4 ++--
 tests/php/test-amp-audio-converter.php             | 14 +++++++++++++-
 tests/php/test-amp-form-sanitizer.php              | 14 +++++++++++++-
 tests/php/test-amp-iframe-sanitizer.php            | 14 +++++++++++++-
 tests/php/test-amp-img-sanitizer.php               | 14 ++++++++++++--
 tests/php/test-amp-script-sanitizer.php            |  7 +++++++
 tests/php/test-amp-style-sanitizer.php             |  9 ++++++++-
 tests/php/test-amp-video-sanitizer.php             | 11 +++++++++++
 14 files changed, 92 insertions(+), 18 deletions(-)

diff --git a/includes/sanitizers/class-amp-audio-sanitizer.php b/includes/sanitizers/class-amp-audio-sanitizer.php
index 2a369a94159..48d1a9da1c8 100644
--- a/includes/sanitizers/class-amp-audio-sanitizer.php
+++ b/includes/sanitizers/class-amp-audio-sanitizer.php
@@ -60,8 +60,8 @@ public function sanitize() {
 		for ( $i = $num_nodes - 1; $i >= 0; $i-- ) {
 			$node = $nodes->item( $i );
 
-			// Skip element if already inside of an AMP element as a noscript fallback.
-			if ( $this->is_inside_amp_noscript( $node ) ) {
+			// Skip element if already inside of an AMP element as a noscript fallback, or it has a dev mode exemption.
+			if ( $this->is_inside_amp_noscript( $node ) || $this->has_dev_mode_exemption( $node ) ) {
 				continue;
 			}
 
diff --git a/includes/sanitizers/class-amp-form-sanitizer.php b/includes/sanitizers/class-amp-form-sanitizer.php
index 099aa56c5a4..e9957ae1304 100644
--- a/includes/sanitizers/class-amp-form-sanitizer.php
+++ b/includes/sanitizers/class-amp-form-sanitizer.php
@@ -46,7 +46,7 @@ public function sanitize() {
 
 		for ( $i = $num_nodes - 1; $i >= 0; $i-- ) {
 			$node = $nodes->item( $i );
-			if ( ! $node instanceof DOMElement ) {
+			if ( ! $node instanceof DOMElement || $this->has_dev_mode_exemption( $node ) ) {
 				continue;
 			}
 
diff --git a/includes/sanitizers/class-amp-iframe-sanitizer.php b/includes/sanitizers/class-amp-iframe-sanitizer.php
index 7b6c6ada5d6..4345b94c991 100644
--- a/includes/sanitizers/class-amp-iframe-sanitizer.php
+++ b/includes/sanitizers/class-amp-iframe-sanitizer.php
@@ -93,8 +93,8 @@ public function sanitize() {
 			 */
 			$node = $nodes->item( $i );
 
-			// Skip element if already inside of an AMP element as a noscript fallback.
-			if ( $this->is_inside_amp_noscript( $node ) ) {
+			// Skip element if already inside of an AMP element as a noscript fallback, or if it has a dev mode exemption.
+			if ( $this->is_inside_amp_noscript( $node ) || $this->has_dev_mode_exemption( $node ) ) {
 				continue;
 			}
 
diff --git a/includes/sanitizers/class-amp-img-sanitizer.php b/includes/sanitizers/class-amp-img-sanitizer.php
index 988d7f06ab1..284c1db04e7 100644
--- a/includes/sanitizers/class-amp-img-sanitizer.php
+++ b/includes/sanitizers/class-amp-img-sanitizer.php
@@ -97,7 +97,7 @@ public function sanitize() {
 
 		for ( $i = $num_nodes - 1; $i >= 0; $i-- ) {
 			$node = $nodes->item( $i );
-			if ( ! $node instanceof DOMElement ) {
+			if ( ! $node instanceof DOMElement || $this->has_dev_mode_exemption( $node ) ) {
 				continue;
 			}
 
diff --git a/includes/sanitizers/class-amp-script-sanitizer.php b/includes/sanitizers/class-amp-script-sanitizer.php
index 54596652ce4..a737ee38b1a 100644
--- a/includes/sanitizers/class-amp-script-sanitizer.php
+++ b/includes/sanitizers/class-amp-script-sanitizer.php
@@ -35,8 +35,11 @@ public function sanitize() {
 				continue;
 			}
 
-			// Skip noscript elements inside of amp-img or other AMP components for fallbacks. See \AMP_Img_Sanitizer::adjust_and_replace_node().
-			if ( 'amp-' === substr( $noscript->parentNode->nodeName, 0, 4 ) ) {
+			/*
+			 * Skip noscript elements inside of amp-img or other AMP components for fallbacks.
+			 * See \AMP_Img_Sanitizer::adjust_and_replace_node(). Also skip if the element has dev mode.
+			 */
+			if ( 'amp-' === substr( $noscript->parentNode->nodeName, 0, 4 ) || $this->has_dev_mode_exemption( $noscript ) ) {
 				continue;
 			}
 
diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php
index 67298988528..8c50c214937 100644
--- a/includes/sanitizers/class-amp-style-sanitizer.php
+++ b/includes/sanitizers/class-amp-style-sanitizer.php
@@ -739,7 +739,7 @@ public function sanitize() {
 
 		$dev_mode_predicate = '';
 		if ( $this->is_document_in_dev_mode() ) {
-			$dev_mode_predicate = ' and not ( @data-ampdevmode )';
+			$dev_mode_predicate = sprintf( ' and not ( @%s )', AMP_Rule_Spec::DEV_MODE_ATTRIBUTE );
 		}
 
 		$lower_case = 'translate( %s, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz" )'; // In XPath 2.0 this is lower-case().
@@ -794,7 +794,7 @@ public function sanitize() {
 		}
 
 		$elements = [];
-		foreach ( $xpath->query( '//*[ @style ]' ) as $element ) {
+		foreach ( $xpath->query( "//*[ @style $dev_mode_predicate ]" ) as $element ) {
 			$elements[] = $element;
 		}
 		foreach ( $elements as $element ) {
diff --git a/includes/sanitizers/class-amp-video-sanitizer.php b/includes/sanitizers/class-amp-video-sanitizer.php
index 6e334885596..2719486ee5b 100644
--- a/includes/sanitizers/class-amp-video-sanitizer.php
+++ b/includes/sanitizers/class-amp-video-sanitizer.php
@@ -69,8 +69,8 @@ public function sanitize() {
 			 */
 			$node = $nodes->item( $i );
 
-			// Skip element if already inside of an AMP element as a noscript fallback.
-			if ( $this->is_inside_amp_noscript( $node ) ) {
+			// Skip element if already inside of an AMP element as a noscript fallback, or if the element is in dev mode.
+			if ( $this->is_inside_amp_noscript( $node ) || $this->has_dev_mode_exemption( $node ) ) {
 				continue;
 			}
 
diff --git a/tests/php/test-amp-audio-converter.php b/tests/php/test-amp-audio-converter.php
index eaac86782ce..d3506f3742f 100644
--- a/tests/php/test-amp-audio-converter.php
+++ b/tests/php/test-amp-audio-converter.php
@@ -209,6 +209,14 @@ public function get_data() {
 					'add_noscript_fallback' => true,
 				],
 			],
+
+			'test_with_dev_mode' => [
+				'<audio data-ampdevmode="" src="https://example.com/audio/file.ogg" onclick="foo()" data-foo="bar"></audio>',
+				null, // No change.
+				[
+					'add_dev_mode' => true,
+				],
+			],
 		];
 	}
 
@@ -225,7 +233,11 @@ public function test_converter( $source, $expected = null, $args = [] ) {
 		if ( null === $expected ) {
 			$expected = $source;
 		}
-		$dom       = AMP_DOM_Utils::get_dom_from_content( $source );
+		$dom = AMP_DOM_Utils::get_dom_from_content( $source );
+		if ( ! empty( $args['add_dev_mode'] ) ) {
+			$dom->documentElement->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
+		}
+
 		$sanitizer = new AMP_Audio_Sanitizer( $dom, $args );
 		$sanitizer->sanitize();
 
diff --git a/tests/php/test-amp-form-sanitizer.php b/tests/php/test-amp-form-sanitizer.php
index 9ab1dc36a6e..904ff3b1f97 100644
--- a/tests/php/test-amp-form-sanitizer.php
+++ b/tests/php/test-amp-form-sanitizer.php
@@ -84,6 +84,14 @@ public function get_data() {
 				'<form method="post" action="/login/"></form>',
 				'#' . preg_quote( '<form method="post" action-xhr="//example.org/login/?_wp_amp_action_xhr_converted=1" target="_top">', '#' ) . $form_template_pattern . '</form>#s',
 			],
+
+			'test_with_dev_mode' => [
+				'<form data-ampdevmode="" action="javascript:"></form>',
+				null, // No change.
+				[
+					'add_dev_mode' => true,
+				],
+			],
 		];
 	}
 
@@ -92,9 +100,10 @@ public function get_data() {
 	 *
 	 * @param string      $source   The source HTML.
 	 * @param string|null $expected The expected HTML after conversion. Null means same as $source.
+	 * @param array       $args     Args.
 	 * @dataProvider get_data
 	 */
-	public function test_converter( $source, $expected = null ) {
+	public function test_converter( $source, $expected = null, $args = [] ) {
 		if ( is_null( $expected ) ) {
 			$expected = $source;
 		}
@@ -102,6 +111,9 @@ public function test_converter( $source, $expected = null ) {
 			$expected = '#' . preg_quote( $expected, '#' ) . '#s';
 		}
 		$dom = AMP_DOM_Utils::get_dom_from_content( $source );
+		if ( ! empty( $args['add_dev_mode'] ) ) {
+			$dom->documentElement->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
+		}
 
 		$sanitizer = new AMP_Form_Sanitizer( $dom );
 		$sanitizer->sanitize();
diff --git a/tests/php/test-amp-iframe-sanitizer.php b/tests/php/test-amp-iframe-sanitizer.php
index 3b9b1b4853a..ace7c91f14f 100644
--- a/tests/php/test-amp-iframe-sanitizer.php
+++ b/tests/php/test-amp-iframe-sanitizer.php
@@ -374,6 +374,14 @@ public function get_data() {
 					'add_placeholder'       => true,
 				],
 			],
+
+			'test_with_dev_mode' => [
+				'<iframe data-ampdevmode="" src="about:blank" onload="alert(\'Hey.\')"></iframe>',
+				null, // No change.
+				[
+					'add_dev_mode' => true,
+				],
+			],
 		];
 	}
 
@@ -390,7 +398,11 @@ public function test_converter( $source, $expected = null, $args = [] ) {
 		if ( ! $expected ) {
 			$expected = $source;
 		}
-		$dom       = AMP_DOM_Utils::get_dom_from_content( $source );
+		$dom = AMP_DOM_Utils::get_dom_from_content( $source );
+		if ( ! empty( $args['add_dev_mode'] ) ) {
+			$dom->documentElement->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
+		}
+
 		$sanitizer = new AMP_Iframe_Sanitizer( $dom, $args );
 		$sanitizer->sanitize();
 
diff --git a/tests/php/test-amp-img-sanitizer.php b/tests/php/test-amp-img-sanitizer.php
index ea19cae97a8..73b4fee4b00 100644
--- a/tests/php/test-amp-img-sanitizer.php
+++ b/tests/php/test-amp-img-sanitizer.php
@@ -343,6 +343,14 @@ public function get_data() {
 				'<div data-amp-lightbox="true" class="wp-block-image"><figure class="alignleft is-resized"><img src="https://placehold.it/100x100" width="100" height="100" data-foo="bar" role="button" tabindex="0" /></figure></div>',
 				'<div data-amp-lightbox="true" class="wp-block-image"><figure class="alignleft is-resized"><amp-img src="https://placehold.it/100x100" width="100" height="100" data-foo="bar" role="button" tabindex="0" data-amp-lightbox="" on="tap:amp-image-lightbox" class="amp-wp-enforced-sizes" layout="intrinsic"><noscript><img src="https://placehold.it/100x100" width="100" height="100" role="button" tabindex="0"></noscript></amp-img></figure></div><amp-image-lightbox id="amp-image-lightbox" layout="nodisplay" data-close-button-aria-label="Close"></amp-image-lightbox>',
 			],
+
+			'test_with_dev_mode'                       => [
+				'<img data-ampdevmode src="http://example.com/foo.png">',
+				null, // No change.
+				[
+					'add_dev_mode' => true,
+				],
+			],
 		];
 	}
 
@@ -372,8 +380,10 @@ public function test_converter( $source, $expected = null, $args = [], $expected
 			$args
 		);
 
-		$dom       = AMP_DOM_Utils::get_dom_from_content( $source );
-		$img_count = $dom->getElementsByTagName( 'img' )->length;
+		$dom = AMP_DOM_Utils::get_dom_from_content( $source );
+		if ( ! empty( $args['add_dev_mode'] ) ) {
+			$dom->documentElement->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
+		}
 
 		$sanitizer = new AMP_Img_Sanitizer( $dom, $args );
 		$sanitizer->sanitize();
diff --git a/tests/php/test-amp-script-sanitizer.php b/tests/php/test-amp-script-sanitizer.php
index 4ef9def551b..5b1ad397faf 100644
--- a/tests/php/test-amp-script-sanitizer.php
+++ b/tests/php/test-amp-script-sanitizer.php
@@ -35,6 +35,10 @@ public function get_noscript_data() {
 				'<html><head><noscript><span>No script</span></noscript></head><body></body></html>',
 				'<html><head></head><body><!--noscript--><span>No script</span><!--/noscript--></body></html>',
 			],
+			'test_with_dev_mode'  => [
+				'<html data-ampdevmode=""><head></head><body><noscript data-ampdevmode="">hey</noscript></body></html>',
+				null,
+			],
 		];
 	}
 
@@ -47,6 +51,9 @@ public function get_noscript_data() {
 	 * @covers AMP_Script_Sanitizer::sanitize()
 	 */
 	public function test_noscript_promotion( $source, $expected = null ) {
+		if ( null === $expected ) {
+			$expected = $source;
+		}
 		$dom = AMP_DOM_Utils::get_dom( $source );
 		$this->assertSame( 1, $dom->getElementsByTagName( 'noscript' )->length );
 		$sanitizer = new AMP_Script_Sanitizer( $dom );
diff --git a/tests/php/test-amp-style-sanitizer.php b/tests/php/test-amp-style-sanitizer.php
index 7aaecbeac73..6074e783037 100644
--- a/tests/php/test-amp-style-sanitizer.php
+++ b/tests/php/test-amp-style-sanitizer.php
@@ -520,6 +520,11 @@ public function get_link_and_style_test_data() {
 				],
 				[],
 			],
+			'test_with_dev_mode' => [
+				'<html amp data-ampdevmode=""><body data-ampdevmode="" style="background:red !important"><link rel="stylesheet" href="https://example.com/foo.css" data-ampdevmode=""><style data-ampdevmode="">body{color:red !important}</style></body></html>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+				[],
+				[],
+			],
 		];
 	}
 
@@ -589,7 +594,9 @@ static function( $preempt, $request, $url ) {
 			$this->assertContains( $expected_stylesheet, $sanitized_html );
 		}
 
-		$this->assertContains( "\n\n/*# sourceURL=amp-custom.css */", $sanitized_html );
+		if ( $actual_stylesheets ) {
+			$this->assertContains( "\n\n/*# sourceURL=amp-custom.css */", $sanitized_html );
+		}
 	}
 
 	/**
diff --git a/tests/php/test-amp-video-sanitizer.php b/tests/php/test-amp-video-sanitizer.php
index 03a00f7d47e..f2e64b4fe1b 100644
--- a/tests/php/test-amp-video-sanitizer.php
+++ b/tests/php/test-amp-video-sanitizer.php
@@ -182,6 +182,14 @@ public function get_data() {
 				'<div id="player"><noscript><video width="300" height="300" src="https://example.com/video.mp4"></video></noscript></div>',
 				'<div id="player"><!--noscript--><amp-video width="300" height="300" src="https://example.com/video.mp4" layout="responsive"><a href="https://example.com/video.mp4" fallback="">https://example.com/video.mp4</a><noscript><video width="300" height="300" src="https://example.com/video.mp4"></video></noscript></amp-video><!--/noscript--></div>',
 			],
+
+			'test_with_dev_mode' => [
+				'<video data-ampdevmode="" width="300" height="300" src="https://example.com/video.mp4"></video>',
+				null, // No change.
+				[
+					'add_dev_mode' => true,
+				],
+			],
 		];
 	}
 
@@ -200,6 +208,9 @@ public function test_converter( $source, $expected = null, $args = [] ) {
 		}
 
 		$dom = AMP_DOM_Utils::get_dom_from_content( $source );
+		if ( ! empty( $args['add_dev_mode'] ) ) {
+			$dom->documentElement->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
+		}
 
 		$sanitizer = new AMP_Video_Sanitizer( $dom, $args );
 		$sanitizer->sanitize();

From 5bb746614ab5c0dcfe22a5c4f0b6822bff2e5b1a Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Fri, 6 Sep 2019 16:57:47 -0700
Subject: [PATCH 07/22] Add filters for whether dev mode is enabled and what
 elements get it

---
 includes/class-amp-theme-support.php       | 63 ++++++++++++++++++----
 tests/php/test-class-amp-theme-support.php |  1 +
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 98c074cfe55..b60d11a55b2 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1950,6 +1950,40 @@ public static function prepare_response( $response, $args = [] ) {
 			! is_customize_preview()
 		);
 
+		/**
+		 * Filters the XPath queries for elements that should be enabled for dev mode.
+		 *
+		 * By supplying XPath queries to this filter, the data-ampdevmode attribute will automatically be added to the
+		 * root HTML element as well as to any elements that match the expressions. The attribute is added to the
+		 * elements prior to running any of the sanitizers.
+		 *
+		 * @since 1.3
+		 * @param string[] XPath element queries. Context is the root element.
+		 */
+		$dev_mode_xpath_queries = apply_filters( 'amp_dev_mode_element_xpaths', [] );
+
+		/**
+		 * Filters whether AMP mode is enabled.
+		 *
+		 * By supplying XPath queries to this filter, the data-ampdevmode attribute will automatically be added to the
+		 * root HTML element as well as to any elements that match the expressions.
+		 *
+		 * @todo Should this be applied in add_hooks()? Ideally the admin-bar script would be skipped from being enqueued if dev mode is not going to be enabled.
+		 *
+		 * @since 1.3
+		 * @param bool[] XPath element queries.
+		 */
+		$dev_mode_enabled = apply_filters(
+			'amp_dev_mode_enabled',
+			(
+				! empty( $dev_mode_xpath_queries )
+				||
+				is_admin_bar_showing() // @todo Limit to if is_user_logged_in()?
+				||
+				is_customize_preview()
+			)
+		);
+
 		// When response caching is enabled, determine if it should be turned off for cache misses.
 		$caches_for_url = null;
 		if ( $enable_response_caching ) {
@@ -1961,12 +1995,12 @@ public static function prepare_response( $response, $args = [] ) {
 			[
 				'content_max_width'    => ! empty( $content_width ) ? $content_width : AMP_Post_Template::CONTENT_MAX_WIDTH, // Back-compat.
 				'use_document_element' => true,
-				'allow_dirty_styles'   => self::is_customize_preview_iframe(), // Dirty styles only needed when editing (e.g. for edit shortcodes).
+				'allow_dirty_styles'   => self::is_customize_preview_iframe(), // Dirty styles only needed when editing (e.g. for edit shortcuts).
 				'allow_dirty_scripts'  => is_customize_preview(), // Scripts are always needed to inject changeset UUID.
 				'user_can_validate'    => AMP_Validation_Manager::has_cap(),
 			],
 			$args,
-			compact( 'enable_response_caching' )
+			compact( 'enable_response_caching', 'dev_mode_enabled', 'dev_mode_xpath_queries' )
 		);
 
 		$current_url = amp_get_current_url();
@@ -2118,8 +2152,9 @@ public static function prepare_response( $response, $args = [] ) {
 			);
 		}
 
-		$dom  = AMP_DOM_Utils::get_dom( $response );
-		$head = $dom->getElementsByTagName( 'head' )->item( 0 );
+		$dom   = AMP_DOM_Utils::get_dom( $response );
+		$xpath = new DOMXPath( $dom );
+		$head  = $dom->getElementsByTagName( 'head' )->item( 0 );
 
 		// Move anything after </html>, such as Query Monitor output added at shutdown, to be moved before </body>.
 		$body = $dom->getElementsByTagName( 'body' )->item( 0 );
@@ -2139,7 +2174,6 @@ public static function prepare_response( $response, $args = [] ) {
 
 		// Make sure scripts from the body get moved to the head.
 		if ( isset( $head ) ) {
-			$xpath = new DOMXPath( $dom );
 			foreach ( $xpath->query( '//body//script[ @custom-element or @custom-template ]' ) as $script ) {
 				$head->appendChild( $script->parentNode->removeChild( $script ) );
 			}
@@ -2151,14 +2185,21 @@ public static function prepare_response( $response, $args = [] ) {
 		}
 
 		// Enable AMP dev mode when admin bar is showing or in Customizer preview.
-		if ( is_admin_bar_showing() || is_customize_preview() ) { // @todo Allow this to be filtered.
-			$dom->documentElement->setAttribute( 'data-ampdevmode', '' );
+		if ( $dev_mode_enabled ) {
+			$dom->documentElement->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
+			foreach ( $dev_mode_xpath_queries as $dev_mode_xpath_query ) {
+				foreach ( $xpath->query( $dev_mode_xpath_query ) as $node ) {
+					if ( $node instanceof DOMElement ) {
+						$node->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
+					}
+				}
+			}
 		}
 
 		// Replace admin bar with placeholder prior to sanitizing to prevent conversion of its elements.
 		$original_admin_bar_element    = null;
 		$placeholder_admin_bar_element = null;
-		if ( is_admin_bar_showing() ) {
+		if ( $dev_mode_enabled && is_admin_bar_showing() ) {
 			$original_admin_bar_element = $dom->getElementById( 'wpadminbar' );
 			if ( $original_admin_bar_element ) {
 				$placeholder_admin_bar_element = $dom->createElement( 'div' );
@@ -2177,16 +2218,16 @@ public static function prepare_response( $response, $args = [] ) {
 		$assets = AMP_Content_Sanitizer::sanitize_document( $dom, self::$sanitizer_classes, $args );
 
 		// Replace the original admin bar.
-		if ( $original_admin_bar_element && $placeholder_admin_bar_element ) {
+		if ( $dev_mode_enabled && $original_admin_bar_element && $placeholder_admin_bar_element ) {
 			$placeholder_admin_bar_element->parentNode->replaceChild( $original_admin_bar_element, $placeholder_admin_bar_element );
-			$original_admin_bar_element->setAttribute( 'data-ampdevmode', '' );
+			$original_admin_bar_element->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
 			/**
 			 * Element.
 			 *
 			 * @var DOMElement $admin_bar_element
 			 */
 			foreach ( $original_admin_bar_element->getElementsByTagName( '*' ) as $admin_bar_element ) {
-				$admin_bar_element->setAttribute( 'data-ampdevmode', '' );
+				$admin_bar_element->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
 			}
 		}
 
diff --git a/tests/php/test-class-amp-theme-support.php b/tests/php/test-class-amp-theme-support.php
index f507f1084b8..e98c801ce14 100644
--- a/tests/php/test-class-amp-theme-support.php
+++ b/tests/php/test-class-amp-theme-support.php
@@ -49,6 +49,7 @@ public function tearDown() {
 		global $wp_scripts;
 		$wp_scripts = null;
 		parent::tearDown();
+		unset( $GLOBALS['show_admin_bar'] );
 		AMP_Validation_Manager::reset_validation_results();
 		remove_theme_support( AMP_Theme_Support::SLUG );
 		remove_theme_support( 'custom-header' );

From d615d39d980a1593005870629f1e5552e5382561 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Fri, 6 Sep 2019 17:44:04 -0700
Subject: [PATCH 08/22] Bring back remove_admin_bar_if_css_excluded and
 admin-bar CSS priority for unauthenticated admin bars

---
 includes/class-amp-theme-support.php          | 30 ++++++---
 .../sanitizers/class-amp-style-sanitizer.php  | 67 ++++++++++++++++++-
 tests/php/test-amp-style-sanitizer.php        |  4 --
 3 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index b60d11a55b2..355b34a9461 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1356,18 +1356,20 @@ public static function init_admin_bar() {
 		} else {
 			$header_callback = '_admin_bar_bump_cb';
 		}
-		$header_callback_priority = has_filter( 'wp_head', $header_callback );
+		remove_action( 'wp_head', $header_callback );
 		if ( '__return_false' !== $header_callback ) {
-			remove_action( 'wp_head', $header_callback, $header_callback_priority );
-			add_action(
-				'wp_head',
-				function () use ( $header_callback ) {
-					ob_start();
-					$header_callback();
-					$style = ob_get_clean();
-					echo preg_replace( '/<[a-z0-9\-]+(?=\s|>)/i', '$0 data-ampdevmode ', $style ); // phpcs:ignore
-				},
-				$header_callback_priority
+			ob_start();
+			$header_callback();
+			$style = ob_get_clean();
+			$data  = trim( preg_replace( '#<style[^>]*>(.*)</style>#is', '$1', $style ) ); // See wp_add_inline_style().
+			wp_add_inline_style( 'admin-bar', $data );
+
+			add_filter(
+				'amp_dev_mode_element_xpaths',
+				function ( $queries ) {
+					$queries[] = '//style[ @id = "admin-bar-inline-css" ]';
+					return $queries;
+				}
 			);
 		}
 
@@ -1396,6 +1398,8 @@ static function( $body_classes ) {
 	/**
 	 * Recursively determine if a given dependency depends on another.
 	 *
+	 * @since 1.3
+	 *
 	 * @param WP_Dependencies $dependencies      Dependencies.
 	 * @param string          $current_handle    Current handle.
 	 * @param string          $dependency_handle Dependency handle.
@@ -1419,6 +1423,8 @@ protected static function has_dependency( WP_Dependencies $dependencies, $curren
 	/**
 	 * Add data-ampdevmode attribute to any enqueued style that depends on the admin-bar.
 	 *
+	 * @since 1.3
+	 *
 	 * @param string $tag    The link tag for the enqueued style.
 	 * @param string $handle The style's registered handle.
 	 * @return string Tag.
@@ -1433,6 +1439,8 @@ public static function filter_admin_bar_style_loader_tag( $tag, $handle ) {
 	/**
 	 * Add data-ampdevmode attribute to any enqueued script that depends on the admin-bar.
 	 *
+	 * @since 1.3
+	 *
 	 * @param string $tag    The `<script>` tag for the enqueued script.
 	 * @param string $handle The script's registered handle.
 	 * @return string Tag.
diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php
index 8c50c214937..17f62dba7de 100644
--- a/includes/sanitizers/class-amp-style-sanitizer.php
+++ b/includes/sanitizers/class-amp-style-sanitizer.php
@@ -825,6 +825,7 @@ public function sanitize() {
 	 */
 	private function get_stylesheet_priority( DOMNode $node ) {
 		$print_priority_base = 100;
+		$admin_bar_priority  = 200;
 
 		$remove_url_scheme = static function( $url ) {
 			return preg_replace( '/^https?:/', '', $url );
@@ -856,6 +857,9 @@ private function get_stylesheet_priority( DOMNode $node ) {
 			if ( in_array( $style_handle, $non_amp_handles, true ) ) {
 				// Styles are for non-AMP JS only so not be used in AMP at all.
 				$priority = 1000;
+			} elseif ( 'admin-bar' === $style_handle ) {
+				// Admin bar has lowest priority. If it gets excluded, then the entire admin bar should be removed.
+				$priority = $admin_bar_priority;
 			} elseif ( 'dashicons' === $style_handle ) {
 				// Dashicons could be used by the theme, but low priority compared to other styles.
 				$priority = 90;
@@ -884,7 +888,9 @@ private function get_stylesheet_priority( DOMNode $node ) {
 			}
 		} elseif ( $node instanceof DOMElement && 'style' === $node->nodeName ) {
 			$element_id = (string) $node->getAttribute( 'id' );
-			if ( 'wp-custom-css' === $element_id ) {
+			if ( 'admin-bar-inline-css' === $element_id ) {
+				$priority = $admin_bar_priority;
+			} elseif ( 'wp-custom-css' === $element_id ) {
 				// Additional CSS from Customizer.
 				$priority = 60;
 			} else {
@@ -2667,6 +2673,65 @@ static function( $pending_stylesheet ) {
 				$body->appendChild( $style_element );
 			}
 		}
+
+		$this->remove_admin_bar_if_css_excluded();
+	}
+
+	/**
+	 * Remove admin bar if its CSS was excluded.
+	 *
+	 * @since 1.2
+	 */
+	private function remove_admin_bar_if_css_excluded() {
+		if ( ! is_admin_bar_showing() ) {
+			return;
+		}
+
+		$admin_bar_id = 'wpadminbar';
+		$admin_bar    = $this->dom->getElementById( $admin_bar_id );
+		if ( ! $admin_bar ) {
+			return;
+		}
+
+		$included = true;
+		foreach ( $this->pending_stylesheets as &$pending_stylesheet ) {
+			$is_admin_bar_css = (
+				'custom' === $pending_stylesheet['group']
+				&&
+				$pending_stylesheet['node'] instanceof DOMElement
+				&&
+				'admin-bar-css' === $pending_stylesheet['node']->getAttribute( 'id' )
+			);
+			if ( $is_admin_bar_css ) {
+				$included = $pending_stylesheet['included'];
+				break;
+			}
+		}
+
+		unset( $pending_stylesheet );
+
+		if ( ! $included ) {
+			// Remove admin-bar class from body element.
+			// @todo It would be nice if any style rules which refer to .admin-bar could also be removed, but this would mean retroactively going back over the CSS again and re-shaking it.
+			$body = $this->dom->getElementsByTagName( 'body' )->item( 0 );
+			if ( $body instanceof DOMElement && $body->hasAttribute( 'class' ) ) {
+				$body->setAttribute(
+					'class',
+					preg_replace( '/(^|\s)admin-bar(\s|$)/', ' ', $body->getAttribute( 'class' ) )
+				);
+			}
+
+			// Remove admin bar element.
+			$comment_text = sprintf(
+				/* translators: %s: CSS selector for admin bar element  */
+				__( 'Admin bar (%s) was removed to preserve AMP validity due to excessive CSS.', 'amp' ),
+				'#' . $admin_bar_id
+			);
+			$admin_bar->parentNode->replaceChild(
+				$this->dom->createComment( ' ' . $comment_text . ' ' ),
+				$admin_bar
+			);
+		}
 	}
 
 	/**
diff --git a/tests/php/test-amp-style-sanitizer.php b/tests/php/test-amp-style-sanitizer.php
index 6074e783037..298a436f4a3 100644
--- a/tests/php/test-amp-style-sanitizer.php
+++ b/tests/php/test-amp-style-sanitizer.php
@@ -2284,7 +2284,6 @@ static function() {
 					add_action( 'wp_enqueue_scripts', 'twentyten_scripts_styles' );
 					AMP_Theme_Support::add_hooks();
 					wp_add_inline_style( 'admin-bar', '.admin-bar-inline-style{ color:red }' );
-					wp_set_current_user( self::factory()->user->create( [ 'role' => 'administrator' ] ) );
 
 					add_action(
 						'wp_footer',
@@ -2320,7 +2319,6 @@ function( $original_dom, $original_source, $amphtml_dom, $amphtml_source ) {
 					$this->assertNotContains( 'earlyprintstyle', $amphtml_source, 'Expected early print style to not be present.' );
 					$this->assertContains( 'admin-bar', $amphtml_dom->getElementsByTagName( 'body' )->item( 0 )->getAttribute( 'class' ) );
 					$this->assertInstanceOf( 'DOMElement', $amphtml_dom->getElementById( 'wpadminbar' ) );
-					$this->assertTrue( $amphtml_dom->getElementById( 'wpadminbar' )->hasAttribute( 'data-ampdevmode' ) );
 				},
 			],
 			// @todo Add other scenarios in the future.
@@ -2338,8 +2336,6 @@ function( $original_dom, $original_source, $amphtml_dom, $amphtml_source ) {
 	 * @param callable $assert         Function which runs assertions.
 	 */
 	public function test_prioritized_stylesheets( $html_generator, $assert ) {
-		$this->markTestIncomplete( 'This needs to actually use AMP_Theme_Support::prepare_response.' );
-
 		if ( version_compare( get_bloginfo( 'version' ), '5.0', '<' ) ) {
 			$this->markTestSkipped( 'Requires WordPress 5.0.' );
 		}

From 277131f15c5cad4d07744e60a2bb5477ab39073f Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Sat, 7 Sep 2019 11:01:52 -0700
Subject: [PATCH 09/22] Prevent dev mode when admin bar shown for
 unauthenticated users

Refactor methods to improve readability and organization
---
 includes/class-amp-theme-support.php          | 176 ++++++++++--------
 .../sanitizers/class-amp-style-sanitizer.php  |   2 +-
 2 files changed, 100 insertions(+), 78 deletions(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 355b34a9461..c7a912c4e5c 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1346,8 +1346,8 @@ public static function filter_cancel_comment_reply_link( $formatted_link, $link,
 	 * @since 1.0
 	 */
 	public static function init_admin_bar() {
-		add_filter( 'script_loader_tag', [ __CLASS__, 'filter_admin_bar_style_loader_tag' ], 10, 2 );
-		add_filter( 'style_loader_tag', [ __CLASS__, 'filter_admin_bar_script_loader_tag' ], 10, 2 );
+		add_filter( 'style_loader_tag', [ __CLASS__, 'filter_admin_bar_style_loader_tag' ], 10, 2 );
+		add_filter( 'script_loader_tag', [ __CLASS__, 'filter_admin_bar_script_loader_tag' ], 10, 2 );
 
 		// Inject the data-ampdevmode attribute into the admin bar bump style. See \WP_Admin_Bar::initialize().
 		if ( current_theme_supports( 'admin-bar' ) ) {
@@ -1431,7 +1431,7 @@ protected static function has_dependency( WP_Dependencies $dependencies, $curren
 	 */
 	public static function filter_admin_bar_style_loader_tag( $tag, $handle ) {
 		if ( self::has_dependency( wp_styles(), $handle, 'admin-bar' ) ) {
-			$tag = preg_replace( '/<[a-z0-9\-]+(?=\s|>)/i', '$0 data-ampdevmode ', $tag );
+			$tag = preg_replace( '/(?<=<link)(?=\s|>)/i', ' ' . AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, $tag );
 		}
 		return $tag;
 	}
@@ -1447,7 +1447,7 @@ public static function filter_admin_bar_style_loader_tag( $tag, $handle ) {
 	 */
 	public static function filter_admin_bar_script_loader_tag( $tag, $handle ) {
 		if ( self::has_dependency( wp_scripts(), $handle, 'admin-bar' ) ) {
-			$tag = preg_replace( '/<[a-z0-9\-]+(?=\s|>)/i', '$0 data-ampdevmode ', $tag );
+			$tag = preg_replace( '/(?<=<script)(?=\s|>)/i', ' ' . AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, $tag );
 		}
 		return $tag;
 	}
@@ -1877,6 +1877,94 @@ public static function filter_customize_partial_render( $partial ) {
 		return $partial;
 	}
 
+	/**
+	 * Determine whether AMP dev mode is enabled.
+	 *
+	 * When enabled, the <html> element will get the data-ampdevmode attribute, and
+	 *
+	 * @since 1.3
+	 *
+	 * @return bool Whether AMP dev mode is enabled.
+	 */
+	public static function is_dev_mode_enabled() {
+
+		/**
+		 * Filters whether AMP mode is enabled.
+		 *
+		 * When enabled, the data-ampdevmode attribute will be added to the document element and it will allow the
+		 * attributes to be added to admin bar. It will also add the attribute to all elements which match the
+		 * queries for the expressions returned by the 'amp_dev_mode_element_xpaths' filter.
+		 *
+		 * @todo Should this be applied in add_hooks()? Ideally the admin-bar script would be skipped from being enqueued if dev mode is not going to be enabled.
+		 *
+		 * @since 1.3
+		 * @param bool[] Whether AMP dev mode is enabled.
+		 */
+		return apply_filters(
+			'amp_dev_mode_enabled',
+			(
+				// For the few sites that forcible show the admin bar even when the user is logged-out, only enable dev
+				// mode if the user is actually logged-in. This prevents the dev mode from being served to crawlers
+				// when they index the AMP version.
+				( is_admin_bar_showing() && is_user_logged_in() )
+				||
+				is_customize_preview()
+			)
+		);
+	}
+
+	/**
+	 * Apply dev mode mutations.
+	 *
+	 * @since 1.3
+	 *
+	 * @param DOMDocument $dom Document.
+	 * @return array The original admin bar element and the placeholder admin bar element, if the admin bar is shown.
+	 */
+	private static function apply_dev_mode_mutations( DOMDocument $dom ) {
+		$dom->documentElement->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
+		$xpath = new DOMXPath( $dom );
+
+		/**
+		 * Filters the XPath queries for elements that should be enabled for dev mode.
+		 *
+		 * By supplying XPath queries to this filter, the data-ampdevmode attribute will automatically be added to the
+		 * root HTML element as well as to any elements that match the expressions. The attribute is added to the
+		 * elements prior to running any of the sanitizers.
+		 *
+		 * @since 1.3
+		 * @param string[] XPath element queries. Context is the root element.
+		 */
+		$dev_mode_xpath_queries = apply_filters( 'amp_dev_mode_element_xpaths', [] );
+		if ( is_admin_bar_showing() ) {
+			$dev_mode_xpath_queries[] = '//*[ @id = "wpadminbar" ]';
+			$dev_mode_xpath_queries[] = '//*[ @id = "wpadminbar" ]//*';
+		}
+		foreach ( $dev_mode_xpath_queries as $dev_mode_xpath_query ) {
+			foreach ( $xpath->query( $dev_mode_xpath_query ) as $node ) {
+				if ( $node instanceof DOMElement ) {
+					$node->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
+				}
+			}
+		}
+
+		// Replace admin bar with placeholder prior to sanitizing to prevent conversion of its elements.
+		$original_admin_bar_element    = $dom->getElementById( 'wpadminbar' );
+		$placeholder_admin_bar_element = null;
+		if ( is_admin_bar_showing() && $original_admin_bar_element ) {
+			$placeholder_admin_bar_element = $dom->createElement( 'div' );
+			foreach ( [ 'id', 'class' ] as $attribute_name ) {
+				$placeholder_admin_bar_element->setAttribute(
+					$attribute_name,
+					$original_admin_bar_element->getAttribute( $attribute_name )
+				);
+			}
+			$original_admin_bar_element->parentNode->replaceChild( $placeholder_admin_bar_element, $original_admin_bar_element );
+		}
+
+		return [ $original_admin_bar_element, $placeholder_admin_bar_element ];
+	}
+
 	/**
 	 * Process response to ensure AMP validity.
 	 *
@@ -1958,40 +2046,6 @@ public static function prepare_response( $response, $args = [] ) {
 			! is_customize_preview()
 		);
 
-		/**
-		 * Filters the XPath queries for elements that should be enabled for dev mode.
-		 *
-		 * By supplying XPath queries to this filter, the data-ampdevmode attribute will automatically be added to the
-		 * root HTML element as well as to any elements that match the expressions. The attribute is added to the
-		 * elements prior to running any of the sanitizers.
-		 *
-		 * @since 1.3
-		 * @param string[] XPath element queries. Context is the root element.
-		 */
-		$dev_mode_xpath_queries = apply_filters( 'amp_dev_mode_element_xpaths', [] );
-
-		/**
-		 * Filters whether AMP mode is enabled.
-		 *
-		 * By supplying XPath queries to this filter, the data-ampdevmode attribute will automatically be added to the
-		 * root HTML element as well as to any elements that match the expressions.
-		 *
-		 * @todo Should this be applied in add_hooks()? Ideally the admin-bar script would be skipped from being enqueued if dev mode is not going to be enabled.
-		 *
-		 * @since 1.3
-		 * @param bool[] XPath element queries.
-		 */
-		$dev_mode_enabled = apply_filters(
-			'amp_dev_mode_enabled',
-			(
-				! empty( $dev_mode_xpath_queries )
-				||
-				is_admin_bar_showing() // @todo Limit to if is_user_logged_in()?
-				||
-				is_customize_preview()
-			)
-		);
-
 		// When response caching is enabled, determine if it should be turned off for cache misses.
 		$caches_for_url = null;
 		if ( $enable_response_caching ) {
@@ -2180,6 +2234,8 @@ public static function prepare_response( $response, $args = [] ) {
 			}
 		}
 
+		AMP_HTTP::send_server_timing( 'amp_dom_parse', -$dom_parse_start, 'AMP DOM Parse' );
+
 		// Make sure scripts from the body get moved to the head.
 		if ( isset( $head ) ) {
 			foreach ( $xpath->query( '//body//script[ @custom-element or @custom-template ]' ) as $script ) {
@@ -2192,51 +2248,17 @@ public static function prepare_response( $response, $args = [] ) {
 			$dom->documentElement->setAttribute( 'amp', '' );
 		}
 
-		// Enable AMP dev mode when admin bar is showing or in Customizer preview.
+		// Apply dev mode mutations when in dev mode.
+		$dev_mode_enabled = self::is_dev_mode_enabled();
 		if ( $dev_mode_enabled ) {
-			$dom->documentElement->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
-			foreach ( $dev_mode_xpath_queries as $dev_mode_xpath_query ) {
-				foreach ( $xpath->query( $dev_mode_xpath_query ) as $node ) {
-					if ( $node instanceof DOMElement ) {
-						$node->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
-					}
-				}
-			}
+			list( $original_admin_bar_element, $placeholder_admin_bar_element ) = self::apply_dev_mode_mutations( $dom );
 		}
 
-		// Replace admin bar with placeholder prior to sanitizing to prevent conversion of its elements.
-		$original_admin_bar_element    = null;
-		$placeholder_admin_bar_element = null;
-		if ( $dev_mode_enabled && is_admin_bar_showing() ) {
-			$original_admin_bar_element = $dom->getElementById( 'wpadminbar' );
-			if ( $original_admin_bar_element ) {
-				$placeholder_admin_bar_element = $dom->createElement( 'div' );
-				foreach ( [ 'id', 'class' ] as $attribute_name ) {
-					$placeholder_admin_bar_element->setAttribute(
-						$attribute_name,
-						$original_admin_bar_element->getAttribute( $attribute_name )
-					);
-				}
-				$original_admin_bar_element->parentNode->replaceChild( $placeholder_admin_bar_element, $original_admin_bar_element );
-			}
-		}
-
-		AMP_HTTP::send_server_timing( 'amp_dom_parse', -$dom_parse_start, 'AMP DOM Parse' );
-
 		$assets = AMP_Content_Sanitizer::sanitize_document( $dom, self::$sanitizer_classes, $args );
 
-		// Replace the original admin bar.
-		if ( $dev_mode_enabled && $original_admin_bar_element && $placeholder_admin_bar_element ) {
+		// Replace the original admin bar after sanitizers have all run.
+		if ( $dev_mode_enabled && isset( $original_admin_bar_element ) && isset( $placeholder_admin_bar_element ) ) {
 			$placeholder_admin_bar_element->parentNode->replaceChild( $original_admin_bar_element, $placeholder_admin_bar_element );
-			$original_admin_bar_element->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
-			/**
-			 * Element.
-			 *
-			 * @var DOMElement $admin_bar_element
-			 */
-			foreach ( $original_admin_bar_element->getElementsByTagName( '*' ) as $admin_bar_element ) {
-				$admin_bar_element->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
-			}
 		}
 
 		// Determine what the validation errors are.
diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php
index 17f62dba7de..a166a80d64d 100644
--- a/includes/sanitizers/class-amp-style-sanitizer.php
+++ b/includes/sanitizers/class-amp-style-sanitizer.php
@@ -2689,7 +2689,7 @@ private function remove_admin_bar_if_css_excluded() {
 
 		$admin_bar_id = 'wpadminbar';
 		$admin_bar    = $this->dom->getElementById( $admin_bar_id );
-		if ( ! $admin_bar ) {
+		if ( ! $admin_bar || ! $admin_bar->parentNode ) {
 			return;
 		}
 

From 4b533d2c484c9d8696829c34181669449506381d Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Sat, 7 Sep 2019 11:17:35 -0700
Subject: [PATCH 10/22] Fix placement of dev_mode_enabled variable definition

Add todo comments for where dev mode should be used instead of allow_dirty_*.
Make closures static.
---
 includes/class-amp-story-post-type.php                      | 2 +-
 includes/class-amp-theme-support.php                        | 6 ++++--
 includes/sanitizers/class-amp-style-sanitizer.php           | 2 +-
 .../sanitizers/class-amp-tag-and-attribute-sanitizer.php    | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php
index 609c6a029fc..7a10c9b99ff 100644
--- a/includes/class-amp-story-post-type.php
+++ b/includes/class-amp-story-post-type.php
@@ -236,7 +236,7 @@ function() {
 		// Disable admin bar from even trying to be output, since wp_head and wp_footer hooks are not on the template.
 		add_filter(
 			'show_admin_bar',
-			function( $show ) {
+			static function( $show ) {
 				if ( is_singular( self::POST_TYPE_SLUG ) ) {
 					$show = false;
 				}
diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index c7a912c4e5c..c1a96b8a502 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1366,7 +1366,7 @@ public static function init_admin_bar() {
 
 			add_filter(
 				'amp_dev_mode_element_xpaths',
-				function ( $queries ) {
+				static function ( $queries ) {
 					$queries[] = '//style[ @id = "admin-bar-inline-css" ]';
 					return $queries;
 				}
@@ -2046,6 +2046,8 @@ public static function prepare_response( $response, $args = [] ) {
 			! is_customize_preview()
 		);
 
+		$dev_mode_enabled = self::is_dev_mode_enabled();
+
 		// When response caching is enabled, determine if it should be turned off for cache misses.
 		$caches_for_url = null;
 		if ( $enable_response_caching ) {
@@ -2053,6 +2055,7 @@ public static function prepare_response( $response, $args = [] ) {
 			$enable_response_caching                           = ! $disable_response_caching;
 		}
 
+		// @todo Both allow_dirty_styles and allow_dirty_scripts should eventually use AMP dev mode instead.
 		$args = array_merge(
 			[
 				'content_max_width'    => ! empty( $content_width ) ? $content_width : AMP_Post_Template::CONTENT_MAX_WIDTH, // Back-compat.
@@ -2249,7 +2252,6 @@ public static function prepare_response( $response, $args = [] ) {
 		}
 
 		// Apply dev mode mutations when in dev mode.
-		$dev_mode_enabled = self::is_dev_mode_enabled();
 		if ( $dev_mode_enabled ) {
 			list( $original_admin_bar_element, $placeholder_admin_bar_element ) = self::apply_dev_mode_mutations( $dom );
 		}
diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php
index a166a80d64d..38cb2cbbb79 100644
--- a/includes/sanitizers/class-amp-style-sanitizer.php
+++ b/includes/sanitizers/class-amp-style-sanitizer.php
@@ -718,7 +718,7 @@ public function init( $sanitizers ) {
 	public function sanitize() {
 		$elements = [];
 
-		// Do nothing if inline styles are allowed.
+		// Do nothing if inline styles are allowed. Note, a better alternative to this is AMP dev mode.
 		if ( ! empty( $this->args['allow_dirty_styles'] ) ) {
 			return;
 		}
diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index 40d3eada287..460c15f695d 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -116,6 +116,7 @@ public function __construct( $dom, $args = [] ) {
 
 		parent::__construct( $dom, $args );
 
+		// @todo AMP dev mode should eventually be used instead of allow_dirty_styles.
 		if ( ! empty( $this->args['allow_dirty_styles'] ) ) {
 
 			// Allow style attribute on all elements.
@@ -159,6 +160,7 @@ public function __construct( $dom, $args = [] ) {
 			];
 		}
 
+		// @todo AMP dev mode should eventually be used instead of allow_dirty_scripts.
 		// Allow scripts if requested.
 		if ( ! empty( $this->args['allow_dirty_scripts'] ) ) {
 			$this->args['amp_allowed_tags']['script'][] = [

From e3025cdee6035f8c611065cd6e8127425f647574 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Sat, 7 Sep 2019 17:55:06 -0700
Subject: [PATCH 11/22] Fix undefined dev_mode_xpaths being used in cache key

---
 includes/class-amp-theme-support.php | 41 ++++++++++++++++++----------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index c1a96b8a502..0b0b7b65ca4 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1914,17 +1914,13 @@ public static function is_dev_mode_enabled() {
 	}
 
 	/**
-	 * Apply dev mode mutations.
+	 * Get the XPath expressions to query for elements to add data-ampdevmode attributes.
 	 *
 	 * @since 1.3
 	 *
-	 * @param DOMDocument $dom Document.
-	 * @return array The original admin bar element and the placeholder admin bar element, if the admin bar is shown.
+	 * @return string[] XPath queries for elements to add data-ampdevmode attributes.
 	 */
-	private static function apply_dev_mode_mutations( DOMDocument $dom ) {
-		$dom->documentElement->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
-		$xpath = new DOMXPath( $dom );
-
+	private static function get_dev_mode_xpaths() {
 		/**
 		 * Filters the XPath queries for elements that should be enabled for dev mode.
 		 *
@@ -1935,13 +1931,29 @@ private static function apply_dev_mode_mutations( DOMDocument $dom ) {
 		 * @since 1.3
 		 * @param string[] XPath element queries. Context is the root element.
 		 */
-		$dev_mode_xpath_queries = apply_filters( 'amp_dev_mode_element_xpaths', [] );
+		$dev_mode_xpaths = apply_filters( 'amp_dev_mode_element_xpaths', [] );
 		if ( is_admin_bar_showing() ) {
-			$dev_mode_xpath_queries[] = '//*[ @id = "wpadminbar" ]';
-			$dev_mode_xpath_queries[] = '//*[ @id = "wpadminbar" ]//*';
+			$dev_mode_xpaths[] = '//*[ @id = "wpadminbar" ]';
+			$dev_mode_xpaths[] = '//*[ @id = "wpadminbar" ]//*';
 		}
-		foreach ( $dev_mode_xpath_queries as $dev_mode_xpath_query ) {
-			foreach ( $xpath->query( $dev_mode_xpath_query ) as $node ) {
+		return $dev_mode_xpaths;
+	}
+
+	/**
+	 * Apply dev mode mutations.
+	 *
+	 * @since 1.3
+	 *
+	 * @param DOMDocument $dom             Document.
+	 * @param string[]    $dev_mode_xpaths Dev mode XPath expressions.
+	 * @return array The original admin bar element and the placeholder admin bar element, if the admin bar is shown.
+	 */
+	private static function apply_dev_mode_mutations( DOMDocument $dom, array $dev_mode_xpaths ) {
+		$dom->documentElement->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
+		$xpath = new DOMXPath( $dom );
+
+		foreach ( $dev_mode_xpaths as $dev_mode_xpath ) {
+			foreach ( $xpath->query( $dev_mode_xpath ) as $node ) {
 				if ( $node instanceof DOMElement ) {
 					$node->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
 				}
@@ -2047,6 +2059,7 @@ public static function prepare_response( $response, $args = [] ) {
 		);
 
 		$dev_mode_enabled = self::is_dev_mode_enabled();
+		$dev_mode_xpaths  = $dev_mode_enabled ? self::get_dev_mode_xpaths() : [];
 
 		// When response caching is enabled, determine if it should be turned off for cache misses.
 		$caches_for_url = null;
@@ -2065,7 +2078,7 @@ public static function prepare_response( $response, $args = [] ) {
 				'user_can_validate'    => AMP_Validation_Manager::has_cap(),
 			],
 			$args,
-			compact( 'enable_response_caching', 'dev_mode_enabled', 'dev_mode_xpath_queries' )
+			compact( 'enable_response_caching', 'dev_mode_enabled', 'dev_mode_xpaths' )
 		);
 
 		$current_url = amp_get_current_url();
@@ -2253,7 +2266,7 @@ public static function prepare_response( $response, $args = [] ) {
 
 		// Apply dev mode mutations when in dev mode.
 		if ( $dev_mode_enabled ) {
-			list( $original_admin_bar_element, $placeholder_admin_bar_element ) = self::apply_dev_mode_mutations( $dom );
+			list( $original_admin_bar_element, $placeholder_admin_bar_element ) = self::apply_dev_mode_mutations( $dom, $dev_mode_xpaths );
 		}
 
 		$assets = AMP_Content_Sanitizer::sanitize_document( $dom, self::$sanitizer_classes, $args );

From a726d419c6c07d87a8c36d7bd525bfadff57eb3b Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Mon, 9 Sep 2019 10:00:43 -0700
Subject: [PATCH 12/22] Fix typos in comments and add array casting

Co-Authored-By: Alain Schlesser <alain.schlesser@gmail.com>
---
 includes/class-amp-theme-support.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 0b0b7b65ca4..a350861f80b 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1892,7 +1892,7 @@ public static function is_dev_mode_enabled() {
 		 * Filters whether AMP mode is enabled.
 		 *
 		 * When enabled, the data-ampdevmode attribute will be added to the document element and it will allow the
-		 * attributes to be added to admin bar. It will also add the attribute to all elements which match the
+		 * attributes to be added to the admin bar. It will also add the attribute to all elements which match the
 		 * queries for the expressions returned by the 'amp_dev_mode_element_xpaths' filter.
 		 *
 		 * @todo Should this be applied in add_hooks()? Ideally the admin-bar script would be skipped from being enqueued if dev mode is not going to be enabled.
@@ -1903,8 +1903,8 @@ public static function is_dev_mode_enabled() {
 		return apply_filters(
 			'amp_dev_mode_enabled',
 			(
-				// For the few sites that forcible show the admin bar even when the user is logged-out, only enable dev
-				// mode if the user is actually logged-in. This prevents the dev mode from being served to crawlers
+				// For the few sites that forcibly show the admin bar even when the user is logged out, only enable dev
+				// mode if the user is actually logged in. This prevents the dev mode from being served to crawlers
 				// when they index the AMP version.
 				( is_admin_bar_showing() && is_user_logged_in() )
 				||
@@ -1931,7 +1931,7 @@ private static function get_dev_mode_xpaths() {
 		 * @since 1.3
 		 * @param string[] XPath element queries. Context is the root element.
 		 */
-		$dev_mode_xpaths = apply_filters( 'amp_dev_mode_element_xpaths', [] );
+		$dev_mode_xpaths = (array) apply_filters( 'amp_dev_mode_element_xpaths', [] );
 		if ( is_admin_bar_showing() ) {
 			$dev_mode_xpaths[] = '//*[ @id = "wpadminbar" ]';
 			$dev_mode_xpaths[] = '//*[ @id = "wpadminbar" ]//*';

From d1ac1642707faf4ca28157bf974c7c8aaaf2458f Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Mon, 9 Sep 2019 17:36:53 -0700
Subject: [PATCH 13/22] Move dev mode mutations into new sanitizer

---
 includes/amp-helper-functions.php             |  63 +++++++++
 includes/class-amp-autoloader.php             |   1 +
 includes/class-amp-theme-support.php          | 123 +-----------------
 .../class-amp-dev-mode-sanitizer.php          |  45 +++++++
 4 files changed, 110 insertions(+), 122 deletions(-)
 create mode 100644 includes/sanitizers/class-amp-dev-mode-sanitizer.php

diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 4a1fbd55a06..04a7c4da335 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -815,6 +815,42 @@ function amp_get_content_embed_handlers( $post = null ) {
 	);
 }
 
+/**
+ * Determine whether AMP dev mode is enabled.
+ *
+ * When enabled, the <html> element will get the data-ampdevmode attribute and the plugin will add the same attribute
+ * to elements associated with the admin bar and other elements that are provided by the `amp_dev_mode_element_xpaths`
+ * filter.
+ *
+ * @since 1.3
+ *
+ * @return bool Whether AMP dev mode is enabled.
+ */
+function amp_is_dev_mode() {
+
+	/**
+	 * Filters whether AMP mode is enabled.
+	 *
+	 * When enabled, the data-ampdevmode attribute will be added to the document element and it will allow the
+	 * attributes to be added to the admin bar. It will also add the attribute to all elements which match the
+	 * queries for the expressions returned by the 'amp_dev_mode_element_xpaths' filter.
+	 *
+	 * @since 1.3
+	 * @param bool Whether AMP dev mode is enabled.
+	 */
+	return apply_filters(
+		'amp_dev_mode_enabled',
+		(
+			// For the few sites that forcibly show the admin bar even when the user is logged out, only enable dev
+			// mode if the user is actually logged in. This prevents the dev mode from being served to crawlers
+			// when they index the AMP version.
+			( is_admin_bar_showing() && is_user_logged_in() )
+			||
+			is_customize_preview()
+		)
+	);
+}
+
 /**
  * Get content sanitizers.
  *
@@ -899,6 +935,33 @@ function amp_get_content_sanitizers( $post = null ) {
 	 */
 	$sanitizers = apply_filters( 'amp_content_sanitizers', $sanitizers, $post );
 
+	if ( amp_is_dev_mode() ) {
+		/**
+		 * Filters the XPath queries for elements that should be enabled for dev mode.
+		 *
+		 * By supplying XPath queries to this filter, the data-ampdevmode attribute will automatically be added to the
+		 * root HTML element as well as to any elements that match the expressions. The attribute is added to the
+		 * elements prior to running any of the sanitizers.
+		 *
+		 * @since 1.3
+		 * @param string[] XPath element queries. Context is the root element.
+		 */
+		$dev_mode_xpaths = (array) apply_filters( 'amp_dev_mode_element_xpaths', [] );
+		if ( is_admin_bar_showing() ) {
+			$dev_mode_xpaths[] = '//*[ @id = "wpadminbar" ]';
+			$dev_mode_xpaths[] = '//*[ @id = "wpadminbar" ]//*';
+			$dev_mode_xpaths[] = '//style[ @id = "admin-bar-inline-css" ]';
+		}
+		$sanitizers = array_merge(
+			[
+				'AMP_Dev_Mode_Sanitizer' => [
+					'element_xpaths' => $dev_mode_xpaths,
+				],
+			],
+			$sanitizers
+		);
+	}
+
 	// Force style sanitizer and whitelist sanitizer to be at end.
 	foreach ( [ 'AMP_Style_Sanitizer', 'AMP_Tag_And_Attribute_Sanitizer' ] as $class_name ) {
 		if ( isset( $sanitizers[ $class_name ] ) ) {
diff --git a/includes/class-amp-autoloader.php b/includes/class-amp-autoloader.php
index 912d6ee61d2..8dc0fa22c30 100644
--- a/includes/class-amp-autoloader.php
+++ b/includes/class-amp-autoloader.php
@@ -71,6 +71,7 @@ class AMP_Autoloader {
 		'AMP_Base_Sanitizer'                 => 'includes/sanitizers/class-amp-base-sanitizer',
 		'AMP_Blacklist_Sanitizer'            => 'includes/sanitizers/class-amp-blacklist-sanitizer',
 		'AMP_Block_Sanitizer'                => 'includes/sanitizers/class-amp-block-sanitizer',
+		'AMP_Dev_Mode_Sanitizer'             => 'includes/sanitizers/class-amp-dev-mode-sanitizer',
 		'AMP_Gallery_Block_Sanitizer'        => 'includes/sanitizers/class-amp-gallery-block-sanitizer',
 		'AMP_Iframe_Sanitizer'               => 'includes/sanitizers/class-amp-iframe-sanitizer',
 		'AMP_Img_Sanitizer'                  => 'includes/sanitizers/class-amp-img-sanitizer',
diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index a350861f80b..1441a205b08 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1363,14 +1363,6 @@ public static function init_admin_bar() {
 			$style = ob_get_clean();
 			$data  = trim( preg_replace( '#<style[^>]*>(.*)</style>#is', '$1', $style ) ); // See wp_add_inline_style().
 			wp_add_inline_style( 'admin-bar', $data );
-
-			add_filter(
-				'amp_dev_mode_element_xpaths',
-				static function ( $queries ) {
-					$queries[] = '//style[ @id = "admin-bar-inline-css" ]';
-					return $queries;
-				}
-			);
 		}
 
 		// Emulate customize support script in PHP, to assume Customizer.
@@ -1877,106 +1869,6 @@ public static function filter_customize_partial_render( $partial ) {
 		return $partial;
 	}
 
-	/**
-	 * Determine whether AMP dev mode is enabled.
-	 *
-	 * When enabled, the <html> element will get the data-ampdevmode attribute, and
-	 *
-	 * @since 1.3
-	 *
-	 * @return bool Whether AMP dev mode is enabled.
-	 */
-	public static function is_dev_mode_enabled() {
-
-		/**
-		 * Filters whether AMP mode is enabled.
-		 *
-		 * When enabled, the data-ampdevmode attribute will be added to the document element and it will allow the
-		 * attributes to be added to the admin bar. It will also add the attribute to all elements which match the
-		 * queries for the expressions returned by the 'amp_dev_mode_element_xpaths' filter.
-		 *
-		 * @todo Should this be applied in add_hooks()? Ideally the admin-bar script would be skipped from being enqueued if dev mode is not going to be enabled.
-		 *
-		 * @since 1.3
-		 * @param bool[] Whether AMP dev mode is enabled.
-		 */
-		return apply_filters(
-			'amp_dev_mode_enabled',
-			(
-				// For the few sites that forcibly show the admin bar even when the user is logged out, only enable dev
-				// mode if the user is actually logged in. This prevents the dev mode from being served to crawlers
-				// when they index the AMP version.
-				( is_admin_bar_showing() && is_user_logged_in() )
-				||
-				is_customize_preview()
-			)
-		);
-	}
-
-	/**
-	 * Get the XPath expressions to query for elements to add data-ampdevmode attributes.
-	 *
-	 * @since 1.3
-	 *
-	 * @return string[] XPath queries for elements to add data-ampdevmode attributes.
-	 */
-	private static function get_dev_mode_xpaths() {
-		/**
-		 * Filters the XPath queries for elements that should be enabled for dev mode.
-		 *
-		 * By supplying XPath queries to this filter, the data-ampdevmode attribute will automatically be added to the
-		 * root HTML element as well as to any elements that match the expressions. The attribute is added to the
-		 * elements prior to running any of the sanitizers.
-		 *
-		 * @since 1.3
-		 * @param string[] XPath element queries. Context is the root element.
-		 */
-		$dev_mode_xpaths = (array) apply_filters( 'amp_dev_mode_element_xpaths', [] );
-		if ( is_admin_bar_showing() ) {
-			$dev_mode_xpaths[] = '//*[ @id = "wpadminbar" ]';
-			$dev_mode_xpaths[] = '//*[ @id = "wpadminbar" ]//*';
-		}
-		return $dev_mode_xpaths;
-	}
-
-	/**
-	 * Apply dev mode mutations.
-	 *
-	 * @since 1.3
-	 *
-	 * @param DOMDocument $dom             Document.
-	 * @param string[]    $dev_mode_xpaths Dev mode XPath expressions.
-	 * @return array The original admin bar element and the placeholder admin bar element, if the admin bar is shown.
-	 */
-	private static function apply_dev_mode_mutations( DOMDocument $dom, array $dev_mode_xpaths ) {
-		$dom->documentElement->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
-		$xpath = new DOMXPath( $dom );
-
-		foreach ( $dev_mode_xpaths as $dev_mode_xpath ) {
-			foreach ( $xpath->query( $dev_mode_xpath ) as $node ) {
-				if ( $node instanceof DOMElement ) {
-					$node->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
-				}
-			}
-		}
-
-		// Replace admin bar with placeholder prior to sanitizing to prevent conversion of its elements.
-		$original_admin_bar_element    = $dom->getElementById( 'wpadminbar' );
-		$placeholder_admin_bar_element = null;
-		if ( is_admin_bar_showing() && $original_admin_bar_element ) {
-			$placeholder_admin_bar_element = $dom->createElement( 'div' );
-			foreach ( [ 'id', 'class' ] as $attribute_name ) {
-				$placeholder_admin_bar_element->setAttribute(
-					$attribute_name,
-					$original_admin_bar_element->getAttribute( $attribute_name )
-				);
-			}
-			$original_admin_bar_element->parentNode->replaceChild( $placeholder_admin_bar_element, $original_admin_bar_element );
-		}
-
-		return [ $original_admin_bar_element, $placeholder_admin_bar_element ];
-	}
-
 	/**
 	 * Process response to ensure AMP validity.
 	 *
@@ -2058,9 +1950,6 @@ public static function prepare_response( $response, $args = [] ) {
 			! is_customize_preview()
 		);
 
-		$dev_mode_enabled = self::is_dev_mode_enabled();
-		$dev_mode_xpaths  = $dev_mode_enabled ? self::get_dev_mode_xpaths() : [];
-
 		// When response caching is enabled, determine if it should be turned off for cache misses.
 		$caches_for_url = null;
 		if ( $enable_response_caching ) {
@@ -2078,7 +1967,7 @@ public static function prepare_response( $response, $args = [] ) {
 				'user_can_validate'    => AMP_Validation_Manager::has_cap(),
 			],
 			$args,
-			compact( 'enable_response_caching', 'dev_mode_enabled', 'dev_mode_xpaths' )
+			compact( 'enable_response_caching' )
 		);
 
 		$current_url = amp_get_current_url();
@@ -2264,18 +2153,8 @@ public static function prepare_response( $response, $args = [] ) {
 			$dom->documentElement->setAttribute( 'amp', '' );
 		}
 
-		// Apply dev mode mutations when in dev mode.
-		if ( $dev_mode_enabled ) {
-			list( $original_admin_bar_element, $placeholder_admin_bar_element ) = self::apply_dev_mode_mutations( $dom, $dev_mode_xpaths );
-		}
-
 		$assets = AMP_Content_Sanitizer::sanitize_document( $dom, self::$sanitizer_classes, $args );
 
-		// Replace the original admin bar after sanitizers have all run.
-		if ( $dev_mode_enabled && isset( $original_admin_bar_element ) && isset( $placeholder_admin_bar_element ) ) {
-			$placeholder_admin_bar_element->parentNode->replaceChild( $original_admin_bar_element, $placeholder_admin_bar_element );
-		}
-
 		// Determine what the validation errors are.
 		$blocking_error_count = 0;
 		$validation_results   = [];
diff --git a/includes/sanitizers/class-amp-dev-mode-sanitizer.php b/includes/sanitizers/class-amp-dev-mode-sanitizer.php
new file mode 100644
index 00000000000..6dae710f724
--- /dev/null
+++ b/includes/sanitizers/class-amp-dev-mode-sanitizer.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Class AMP_Dev_Mode_Sanitizer
+ *
+ * Add the data-ampdevmode to the document element and to the elements specified by the supplied args.
+ *
+ * @since 1.3
+ * @package AMP
+ */
+
+/**
+ * Class AMP_Dev_Mode_Sanitizer
+ *
+ * @since 1.3
+ */
+final class AMP_Dev_Mode_Sanitizer extends AMP_Base_Sanitizer {
+
+	/**
+	 * Array of flags used to control sanitization.
+	 *
+	 * @var array {
+	 *      @type string[] $element_xpaths XPath expressions for elements to add the data-ampdevmode attribute to.
+	 * }
+	 */
+	protected $args;
+
+	/**
+	 * Sanitize document for dev mode.
+	 *
+	 * @since 1.3
+	 */
+	public function sanitize() {
+		$this->dom->documentElement->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
+
+		$xpath          = new DOMXPath( $this->dom );
+		$element_xpaths = ! empty( $this->args['element_xpaths'] ) ? $this->args['element_xpaths'] : [];
+		foreach ( $element_xpaths as $element_xpath ) {
+			foreach ( $xpath->query( $element_xpath ) as $node ) {
+				if ( $node instanceof DOMElement ) {
+					$node->setAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, '' );
+				}
+			}
+		}
+	}
+}

From 5ba10b42ad15e757effcf1dcb759be483ac5e7bb Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Mon, 9 Sep 2019 17:46:23 -0700
Subject: [PATCH 14/22] Remove now-unnecessary admin_bar_showing arg for style
 sanitizer

---
 includes/amp-helper-functions.php                 | 1 -
 includes/sanitizers/class-amp-style-sanitizer.php | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 04a7c4da335..a8e0eec54aa 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -911,7 +911,6 @@ function amp_get_content_sanitizers( $post = null ) {
 		'AMP_Script_Sanitizer'            => [],
 		'AMP_Style_Sanitizer'             => [
 			'include_manifest_comment' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ) ? 'always' : 'when_excessive',
-			'admin_bar_showing'        => is_admin_bar_showing(),
 		],
 		'AMP_Tag_And_Attribute_Sanitizer' => [], // Note: This whitelist sanitizer must come at the end to clean up any remaining issues the other sanitizers didn't catch.
 	];
diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php
index 38cb2cbbb79..95c34237c35 100644
--- a/includes/sanitizers/class-amp-style-sanitizer.php
+++ b/includes/sanitizers/class-amp-style-sanitizer.php
@@ -88,7 +88,6 @@ class AMP_Style_Sanitizer extends AMP_Base_Sanitizer {
 	 *      @type bool     $should_locate_sources      Whether to locate the sources when reporting validation errors.
 	 *      @type string   $parsed_cache_variant       Additional value by which to vary parsed cache.
 	 *      @type string   $include_manifest_comment   Whether to show the manifest HTML comment in the response before the style[amp-custom] element. Can be 'always', 'never', or 'when_excessive'.
-	 *      @type bool     $admin_bar_showing          Whether the admin bar is showing. When true, the #wpadminbar is added to dynamic_element_selectors.
 	 * }
 	 */
 	protected $args;
@@ -369,11 +368,6 @@ public static function has_required_php_css_parser() {
 	public function __construct( DOMDocument $dom, array $args = [] ) {
 		parent::__construct( $dom, $args );
 
-		// Prevent tree shaking theme-specific admin bar styles when admin bar is showing.
-		if ( ! empty( $this->args['admin_bar_showing'] ) ) {
-			$this->args['dynamic_element_selectors'][] = '#wpadminbar';
-		}
-
 		foreach ( AMP_Allowed_Tags_Generated::get_allowed_tag( 'style' ) as $spec_rule ) {
 			if ( ! isset( $spec_rule[ AMP_Rule_Spec::TAG_SPEC ]['spec_name'] ) ) {
 				continue;

From 38fa7badad55a6bf5a82f2388fd26cb281920cf2 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Mon, 9 Sep 2019 21:50:33 -0700
Subject: [PATCH 15/22] Add tests for init_admin_bar

---
 tests/php/test-class-amp-theme-support.php | 51 ++++++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/tests/php/test-class-amp-theme-support.php b/tests/php/test-class-amp-theme-support.php
index e98c801ce14..493f2a7555d 100644
--- a/tests/php/test-class-amp-theme-support.php
+++ b/tests/php/test-class-amp-theme-support.php
@@ -46,8 +46,11 @@ public function setUp() {
 	 * @global WP_Scripts $wp_scripts
 	 */
 	public function tearDown() {
-		global $wp_scripts;
-		$wp_scripts = null;
+		global $wp_scripts, $wp_styles, $wp_admin_bar;
+		$wp_scripts   = null;
+		$wp_styles    = null;
+		$wp_admin_bar = null;
+
 		parent::tearDown();
 		unset( $GLOBALS['show_admin_bar'] );
 		AMP_Validation_Manager::reset_validation_results();
@@ -1153,14 +1156,56 @@ public function test_filter_cancel_comment_reply_link() {
 	 * Test init_admin_bar.
 	 *
 	 * @covers \AMP_Theme_Support::init_admin_bar()
+	 * @covers \AMP_Theme_Support::filter_admin_bar_style_loader_tag()
+	 * @covers \AMP_Theme_Support::filter_admin_bar_script_loader_tag()
 	 */
 	public function test_init_admin_bar() {
+		require_once ABSPATH . WPINC . '/class-wp-admin-bar.php';
+
+		add_action(
+			'admin_bar_init',
+			function() {
+				wp_enqueue_style( 'example-admin-bar', 'https://example.com/example-admin-bar.css', [ 'admin-bar' ], '0.1' );
+				wp_enqueue_script( 'example-admin-bar', 'https://example.com/example-admin-bar.js', [ 'admin-bar' ], '0.1', false );
+			}
+		);
+
+		$callback = function() {
+			?>
+			<style type="text/css" media="screen">
+				html { margin-top: 64px !important; }
+				@media screen and ( max-width: 782px ) {
+					html { margin-top: 92px !important; }
+				}
+			</style>
+			<?php
+		};
+		add_theme_support( 'admin-bar', compact( 'callback' ) );
+
+		global $wp_admin_bar;
+		$wp_admin_bar = new WP_Admin_Bar();
+		$wp_admin_bar->initialize();
+		$this->assertEquals( 10, has_action( 'wp_head', $callback ) );
+
 		AMP_Theme_Support::init_admin_bar();
+		$this->assertFalse( has_action( 'wp_head', $callback ) );
+		ob_start();
+		wp_print_styles();
+		wp_print_scripts();
+		$output = ob_get_clean();
+		$this->assertContains( '<style id=\'admin-bar-inline-css\' type=\'text/css\'>', $output ); // Note: data-ampdevmode attribute will be added by AMP_Dev_Mode_Sanitizer.
+		$this->assertContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'admin-bar-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+		$this->assertContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'example-admin-bar-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+		$this->assertContains( 'html { margin-top: 64px !important; }', $output );
+		$this->assertRegExp( '/' . implode( '', [ '<script ', 'data-ampdevmode [^>]+admin-bar\.js' ] ) . '/', $output );
+		$this->assertRegExp( '/' . implode( '', [ '<script ', 'data-ampdevmode [^>]+example-admin-bar\.js' ] ) . '/', $output );
+
 		$body_classes = get_body_class();
 		$this->assertContains( 'customize-support', $body_classes );
 		$this->assertNotContains( 'no-customize-support', $body_classes );
 
-		$this->markTestIncomplete( 'More work needed.' );
+		$this->assertEquals( 10, has_filter( 'style_loader_tag', [ 'AMP_Theme_Support', 'filter_admin_bar_style_loader_tag' ] ) );
+		$this->assertEquals( 10, has_filter( 'script_loader_tag', [ 'AMP_Theme_Support', 'filter_admin_bar_script_loader_tag' ] ) );
 	}
 
 	/**

From 71c195cf8bc0fe88e5ee49675806012499a67a23 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Mon, 9 Sep 2019 21:59:59 -0700
Subject: [PATCH 16/22] Add test for amp_is_dev_mode()

---
 tests/php/test-amp-helper-functions.php | 34 ++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/tests/php/test-amp-helper-functions.php b/tests/php/test-amp-helper-functions.php
index 89e4e236625..e4edbcb942f 100644
--- a/tests/php/test-amp-helper-functions.php
+++ b/tests/php/test-amp-helper-functions.php
@@ -22,9 +22,10 @@ class Test_AMP_Helper_Functions extends WP_UnitTestCase {
 	 */
 	public function tearDown() {
 		remove_theme_support( AMP_Theme_Support::SLUG );
-		global $wp_scripts, $pagenow;
-		$wp_scripts = null;
-		$pagenow    = 'index.php'; // Since clean_up_global_scope() doesn't.
+		global $wp_scripts, $pagenow, $show_admin_bar;
+		$wp_scripts     = null;
+		$show_admin_bar = null;
+		$pagenow        = 'index.php'; // Since clean_up_global_scope() doesn't.
 
 		if ( class_exists( 'WP_Block_Type_Registry' ) ) {
 			foreach ( WP_Block_Type_Registry::get_instance()->get_all_registered() as $block ) {
@@ -628,6 +629,33 @@ public function test_amp_get_content_embed_handlers() {
 		$this->assertEquals( $post, $this->last_filter_call['args'][1] );
 	}
 
+	/**
+	 * Test amp_is_dev_mode().
+	 *
+	 * @covers ::amp_is_dev_mode()
+	 */
+	public function test_amp_is_dev_mode() {
+		$this->assertFalse( amp_is_dev_mode() );
+		add_filter( 'amp_dev_mode_enabled', '__return_true' );
+		$this->assertTrue( amp_is_dev_mode() );
+		remove_filter( 'amp_dev_mode_enabled', '__return_true' );
+		$this->assertFalse( amp_is_dev_mode() );
+
+		// Test authenticated user with admin bar showing.
+		add_filter( 'show_admin_bar', '__return_true' );
+		wp_set_current_user( self::factory()->user->create( [ 'role' => 'administrator' ] ) );
+		$this->assertTrue( is_admin_bar_showing() );
+		$this->assertTrue( is_user_logged_in() );
+		$this->assertTrue( amp_is_dev_mode() );
+
+		// Test unauthenticated user with admin bar forced.
+		add_filter( 'show_admin_bar', '__return_true' );
+		wp_set_current_user( 0 );
+		$this->assertFalse( is_user_logged_in() );
+		$this->assertTrue( is_admin_bar_showing() );
+		$this->assertFalse( amp_is_dev_mode() );
+	}
+
 	/**
 	 * Test deprecated $post param for amp_get_content_embed_handlers().
 	 *

From 24710361b8969d5180f5461086ababa15a8c3115 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Mon, 9 Sep 2019 22:14:39 -0700
Subject: [PATCH 17/22] Add test for amp_get_content_sanitizers()

---
 tests/php/test-amp-helper-functions.php | 59 +++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 4 deletions(-)

diff --git a/tests/php/test-amp-helper-functions.php b/tests/php/test-amp-helper-functions.php
index e4edbcb942f..5471b215617 100644
--- a/tests/php/test-amp-helper-functions.php
+++ b/tests/php/test-amp-helper-functions.php
@@ -703,10 +703,61 @@ static function( $classes ) {
 				return $classes;
 			}
 		);
-		$orderd_sanitizers = array_keys( amp_get_content_sanitizers() );
-		$this->assertEquals( 'Even_After_Whitelist_Sanitizer', $orderd_sanitizers[ count( $orderd_sanitizers ) - 3 ] );
-		$this->assertEquals( 'AMP_Style_Sanitizer', $orderd_sanitizers[ count( $orderd_sanitizers ) - 2 ] );
-		$this->assertEquals( 'AMP_Tag_And_Attribute_Sanitizer', $orderd_sanitizers[ count( $orderd_sanitizers ) - 1 ] );
+		$ordered_sanitizers = array_keys( amp_get_content_sanitizers() );
+		$this->assertEquals( 'Even_After_Whitelist_Sanitizer', $ordered_sanitizers[ count( $ordered_sanitizers ) - 3 ] );
+		$this->assertEquals( 'AMP_Style_Sanitizer', $ordered_sanitizers[ count( $ordered_sanitizers ) - 2 ] );
+		$this->assertEquals( 'AMP_Tag_And_Attribute_Sanitizer', $ordered_sanitizers[ count( $ordered_sanitizers ) - 1 ] );
+	}
+
+	/**
+	 * Test amp_get_content_sanitizers().
+	 *
+	 * @covers ::amp_get_content_sanitizers()
+	 */
+	public function test_amp_get_content_sanitizers_with_dev_mode() {
+		$element_xpaths = [ '//script[ @id = "hello-world" ]' ];
+		add_filter(
+			'amp_dev_mode_element_xpaths',
+			function ( $xpaths ) use ( $element_xpaths ) {
+				return array_merge( $xpaths, $element_xpaths );
+			}
+		);
+
+		// Check that AMP_Dev_Mode_Sanitizer is not registered if not in dev mode.
+		$sanitizers = amp_get_content_sanitizers();
+		$this->assertFalse( amp_is_dev_mode() );
+		$this->assertArrayNotHasKey( 'AMP_Dev_Mode_Sanitizer', $sanitizers );
+
+		// Check that AMP_Dev_Mode_Sanitizer is registered once in dev mode, but not with admin bar showing yet.
+		add_filter( 'amp_dev_mode_enabled', '__return_true' );
+		$sanitizers = amp_get_content_sanitizers();
+		$this->assertFalse( is_admin_bar_showing() );
+		$this->assertTrue( amp_is_dev_mode() );
+		$this->assertArrayHasKey( 'AMP_Dev_Mode_Sanitizer', $sanitizers );
+		$this->assertEquals( 'AMP_Dev_Mode_Sanitizer', current( array_keys( $sanitizers ) ) );
+		$this->assertEquals(
+			compact( 'element_xpaths' ),
+			$sanitizers['AMP_Dev_Mode_Sanitizer']
+		);
+
+		// Check that AMP_Dev_Mode_Sanitizer is registered once in dev mode, and now also with admin bar showing.
+		add_filter( 'amp_dev_mode_enabled', '__return_true' );
+		add_filter( 'show_admin_bar', '__return_true' );
+		$sanitizers = amp_get_content_sanitizers();
+		$this->assertTrue( is_admin_bar_showing() );
+		$this->assertTrue( amp_is_dev_mode() );
+		$this->assertArrayHasKey( 'AMP_Dev_Mode_Sanitizer', $sanitizers );
+		$this->assertEqualSets(
+			array_merge(
+				$element_xpaths,
+				[
+					'//*[ @id = "wpadminbar" ]',
+					'//*[ @id = "wpadminbar" ]//*',
+					'//style[ @id = "admin-bar-inline-css" ]',
+				]
+			),
+			$sanitizers['AMP_Dev_Mode_Sanitizer']['element_xpaths']
+		);
 	}
 
 	/**

From 7c57708987e61c9f4d099b1e6fe3a2ac477b9092 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Mon, 9 Sep 2019 22:28:58 -0700
Subject: [PATCH 18/22] Add tests for AMP_Dev_Mode_Sanitizer

---
 tests/php/test-amp-dev-mode-sanitizer.php | 51 +++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 tests/php/test-amp-dev-mode-sanitizer.php

diff --git a/tests/php/test-amp-dev-mode-sanitizer.php b/tests/php/test-amp-dev-mode-sanitizer.php
new file mode 100644
index 00000000000..017128edf38
--- /dev/null
+++ b/tests/php/test-amp-dev-mode-sanitizer.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Test AMP_Dev_Mode_Sanitizer.
+ *
+ * @package AMP
+ */
+
+/**
+ * Test AMP_Dev_Mode_Sanitizer.
+ *
+ * @covers AMP_Dev_Mode_Sanitizer
+ */
+class AMP_Dev_Mode_Sanitizer_Test extends WP_UnitTestCase {
+
+	/**
+	 * Test sanitize method.
+	 *
+	 * @covers \AMP_Dev_Mode_Sanitizer::sanitize()
+	 */
+	public function test_sanitize() {
+		$dom = AMP_DOM_Utils::get_dom_from_content(
+			'
+			<p id="no-dev-mode-needed">All good.</p>
+			<button id="greet" onclick="alert(\'Hi!\')">Greet</button>
+			<div id="wpadminbar">
+				<li id="wp-admin-bar-img"><img src="about:blank" alt="Blank!"></li>
+			</div>
+			<style id="admin-bar-inline-css">body { color:red !important; }</style>
+			'
+		);
+
+		$sanitizer = new AMP_Dev_Mode_Sanitizer(
+			$dom,
+			[
+				'element_xpaths' => [
+					'//*[ @id = "greet" ]',
+					'//*[ @id = "wpadminbar" ]',
+					'//*[ @id = "wpadminbar" ]//*',
+					'//style[ @id = "admin-bar-inline-css" ]',
+				],
+			]
+		);
+		$sanitizer->sanitize();
+		$this->assertTrue( $dom->documentElement->hasAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE ) );
+		$this->assertTrue( $dom->getElementById( 'greet' )->hasAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE ) );
+		$this->assertTrue( $dom->getElementById( 'wpadminbar' )->hasAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE ) );
+		$this->assertTrue( $dom->getElementById( 'wp-admin-bar-img' )->hasAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE ) );
+		$this->assertTrue( $dom->getElementById( 'admin-bar-inline-css' )->hasAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE ) );
+		$this->assertFalse( $dom->getElementById( 'no-dev-mode-needed' )->hasAttribute( AMP_Rule_Spec::DEV_MODE_ATTRIBUTE ) );
+	}
+}

From e15bbe330b31adea9b3915ea93e7f2945688a949 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Tue, 10 Sep 2019 13:24:01 -0700
Subject: [PATCH 19/22] Include dashicons in dev mode but only if exclusively
 connected to admin bar

---
 includes/class-amp-theme-support.php       | 26 ++++++++++-
 tests/php/test-class-amp-theme-support.php | 54 +++++++++++++++++++++-
 2 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 1441a205b08..78da633d35d 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1422,7 +1422,31 @@ protected static function has_dependency( WP_Dependencies $dependencies, $curren
 	 * @return string Tag.
 	 */
 	public static function filter_admin_bar_style_loader_tag( $tag, $handle ) {
-		if ( self::has_dependency( wp_styles(), $handle, 'admin-bar' ) ) {
+		if ( 'dashicons' === $handle ) {
+			// Conditionally include Dashicons in dev mode only if was included because it is a dependency of admin-bar.
+			$needs_dev_mode = true;
+			foreach ( wp_styles()->queue as $queued_handle ) {
+				$is_dashicons_without_admin_bar = (
+					// If a theme or plugin directly enqueued dashicons, then it is not added via admin-bar dependency and it is not part of dev mode.
+					'dashicons' === $queued_handle
+					||
+					// If a stylesheet has dashicons as a dependency without also having admin-bar as a dependency, then no dev mode.
+					(
+						self::has_dependency( wp_styles(), $queued_handle, 'dashicons' )
+						&&
+						! self::has_dependency( wp_styles(), $queued_handle, 'admin-bar' )
+					)
+				);
+				if ( $is_dashicons_without_admin_bar ) {
+					$needs_dev_mode = false;
+					break;
+				}
+			}
+		} else {
+			$needs_dev_mode = self::has_dependency( wp_styles(), $handle, 'admin-bar' );
+		}
+
+		if ( $needs_dev_mode ) {
 			$tag = preg_replace( '/(?<=<link)(?=\s|>)/i', ' ' . AMP_Rule_Spec::DEV_MODE_ATTRIBUTE, $tag );
 		}
 		return $tag;
diff --git a/tests/php/test-class-amp-theme-support.php b/tests/php/test-class-amp-theme-support.php
index 493f2a7555d..43d0117322d 100644
--- a/tests/php/test-class-amp-theme-support.php
+++ b/tests/php/test-class-amp-theme-support.php
@@ -1188,12 +1188,15 @@ function() {
 		$this->assertEquals( 10, has_action( 'wp_head', $callback ) );
 
 		AMP_Theme_Support::init_admin_bar();
+		$this->assertEquals( 10, has_filter( 'style_loader_tag', [ 'AMP_Theme_Support', 'filter_admin_bar_style_loader_tag' ] ) );
+		$this->assertEquals( 10, has_filter( 'script_loader_tag', [ 'AMP_Theme_Support', 'filter_admin_bar_script_loader_tag' ] ) );
 		$this->assertFalse( has_action( 'wp_head', $callback ) );
 		ob_start();
 		wp_print_styles();
 		wp_print_scripts();
 		$output = ob_get_clean();
 		$this->assertContains( '<style id=\'admin-bar-inline-css\' type=\'text/css\'>', $output ); // Note: data-ampdevmode attribute will be added by AMP_Dev_Mode_Sanitizer.
+		$this->assertContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'dashicons-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 		$this->assertContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'admin-bar-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 		$this->assertContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'example-admin-bar-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 		$this->assertContains( 'html { margin-top: 64px !important; }', $output );
@@ -1203,9 +1206,56 @@ function() {
 		$body_classes = get_body_class();
 		$this->assertContains( 'customize-support', $body_classes );
 		$this->assertNotContains( 'no-customize-support', $body_classes );
+	}
 
-		$this->assertEquals( 10, has_filter( 'style_loader_tag', [ 'AMP_Theme_Support', 'filter_admin_bar_style_loader_tag' ] ) );
-		$this->assertEquals( 10, has_filter( 'script_loader_tag', [ 'AMP_Theme_Support', 'filter_admin_bar_script_loader_tag' ] ) );
+	/**
+	 * Test init_admin_bar to ensure dashicons are not added to dev mode when directly enqueued.
+	 *
+	 * @covers \AMP_Theme_Support::init_admin_bar()
+	 * @covers \AMP_Theme_Support::filter_admin_bar_style_loader_tag()
+	 */
+	public function test_init_admin_bar_for_directly_enqueued_dashicons() {
+		require_once ABSPATH . WPINC . '/class-wp-admin-bar.php';
+
+		global $wp_admin_bar;
+		$wp_admin_bar = new WP_Admin_Bar();
+		$wp_admin_bar->initialize();
+		AMP_Theme_Support::init_admin_bar();
+
+		// Enqueued directly.
+		wp_enqueue_style( 'dashicons' );
+
+		ob_start();
+		wp_print_styles();
+		$output = ob_get_clean();
+
+		$this->assertContains( '<link rel=\'stylesheet\' id=\'dashicons-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+		$this->assertContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'admin-bar-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+	}
+
+	/**
+	 * Test init_admin_bar to ensure dashicons are not added to dev mode when indirectly enqueued.
+	 *
+	 * @covers \AMP_Theme_Support::init_admin_bar()
+	 * @covers \AMP_Theme_Support::filter_admin_bar_style_loader_tag()
+	 */
+	public function test_init_admin_bar_for_indirectly_enqueued_dashicons() {
+		require_once ABSPATH . WPINC . '/class-wp-admin-bar.php';
+
+		global $wp_admin_bar;
+		$wp_admin_bar = new WP_Admin_Bar();
+		$wp_admin_bar->initialize();
+		AMP_Theme_Support::init_admin_bar();
+
+		// Enqueued indirectly.
+		wp_enqueue_style( 'my-font-pack', 'https://example.com/fonts', [ 'dashicons' ], '0.1' );
+
+		ob_start();
+		wp_print_styles();
+		$output = ob_get_clean();
+
+		$this->assertContains( '<link rel=\'stylesheet\' id=\'dashicons-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+		$this->assertContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'admin-bar-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 	}
 
 	/**

From d79be8df5c0c09c74534037ec982dfcede1e4987 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Tue, 10 Sep 2019 14:22:34 -0700
Subject: [PATCH 20/22] Remove amp_dev_mode_enabled filter in test

---
 tests/php/test-amp-helper-functions.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/php/test-amp-helper-functions.php b/tests/php/test-amp-helper-functions.php
index 5471b215617..873af10b55e 100644
--- a/tests/php/test-amp-helper-functions.php
+++ b/tests/php/test-amp-helper-functions.php
@@ -739,6 +739,7 @@ function ( $xpaths ) use ( $element_xpaths ) {
 			compact( 'element_xpaths' ),
 			$sanitizers['AMP_Dev_Mode_Sanitizer']
 		);
+		remove_filter( 'amp_dev_mode_enabled', '__return_true' );
 
 		// Check that AMP_Dev_Mode_Sanitizer is registered once in dev mode, and now also with admin bar showing.
 		add_filter( 'amp_dev_mode_enabled', '__return_true' );

From 5de22ffafdbb65ea87b5aeb97635472447a6a194 Mon Sep 17 00:00:00 2001
From: Alain Schlesser <alain.schlesser@gmail.com>
Date: Wed, 11 Sep 2019 17:28:36 +0200
Subject: [PATCH 21/22] Remove useless variable

---
 includes/class-amp-theme-support.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 78da633d35d..8a22c420d2c 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1426,7 +1426,7 @@ public static function filter_admin_bar_style_loader_tag( $tag, $handle ) {
 			// Conditionally include Dashicons in dev mode only if was included because it is a dependency of admin-bar.
 			$needs_dev_mode = true;
 			foreach ( wp_styles()->queue as $queued_handle ) {
-				$is_dashicons_without_admin_bar = (
+				if (
 					// If a theme or plugin directly enqueued dashicons, then it is not added via admin-bar dependency and it is not part of dev mode.
 					'dashicons' === $queued_handle
 					||
@@ -1436,8 +1436,7 @@ public static function filter_admin_bar_style_loader_tag( $tag, $handle ) {
 						&&
 						! self::has_dependency( wp_styles(), $queued_handle, 'admin-bar' )
 					)
-				);
-				if ( $is_dashicons_without_admin_bar ) {
+				) {
 					$needs_dev_mode = false;
 					break;
 				}

From 290adf71350fb758be61c03bef9c94c208ee6761 Mon Sep 17 00:00:00 2001
From: Alain Schlesser <alain.schlesser@gmail.com>
Date: Wed, 11 Sep 2019 17:33:03 +0200
Subject: [PATCH 22/22] Add asserts to make sure we are not enqueueing both
 versions of dashicons

---
 tests/php/test-class-amp-theme-support.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/php/test-class-amp-theme-support.php b/tests/php/test-class-amp-theme-support.php
index 43d0117322d..d2274bca4c6 100644
--- a/tests/php/test-class-amp-theme-support.php
+++ b/tests/php/test-class-amp-theme-support.php
@@ -1196,6 +1196,7 @@ function() {
 		wp_print_scripts();
 		$output = ob_get_clean();
 		$this->assertContains( '<style id=\'admin-bar-inline-css\' type=\'text/css\'>', $output ); // Note: data-ampdevmode attribute will be added by AMP_Dev_Mode_Sanitizer.
+		$this->assertNotContains( '<link rel=\'stylesheet\' id=\'dashicons-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 		$this->assertContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'dashicons-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 		$this->assertContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'admin-bar-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 		$this->assertContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'example-admin-bar-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
@@ -1230,6 +1231,7 @@ public function test_init_admin_bar_for_directly_enqueued_dashicons() {
 		$output = ob_get_clean();
 
 		$this->assertContains( '<link rel=\'stylesheet\' id=\'dashicons-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+		$this->assertNotContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'dashicons-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 		$this->assertContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'admin-bar-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 	}
 
@@ -1255,6 +1257,7 @@ public function test_init_admin_bar_for_indirectly_enqueued_dashicons() {
 		$output = ob_get_clean();
 
 		$this->assertContains( '<link rel=\'stylesheet\' id=\'dashicons-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+		$this->assertNotContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'dashicons-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 		$this->assertContains( '<link data-ampdevmode rel=\'stylesheet\' id=\'admin-bar-css\'', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 	}