Index: wp-includes/js/tinymce/wp-tinymce-schema.js
===================================================================
--- wp-includes/js/tinymce/wp-tinymce-schema.js	(revision 23147)
+++ wp-includes/js/tinymce/wp-tinymce-schema.js	(working copy)
@@ -131,16 +131,18 @@
 					'img[A|alt|src|height|width|usemap|ismap|name|longdesc|align|border|hspace|vspace][]' +
 					'iframe[A|name|src|height|width|sandbox|seamless|longdesc|frameborder|marginwidth|marginheight|scrolling|align][]' +
 					'embed[A|src|height|width|type][]' +
-					'object[*][]' +
+					'object[*][C]' +
 					'param[A|name|value|valuetype|type][]' +
-					'details[A|open][C|legend]' +
-					'command[A|type|label|icon|disabled|checked|radiogroup][]' +
+					'summary[A][B]' +
+					'details[A|open][C|legend|summary]' +
+					'command[A|type|label|icon|disabled|checked|radiogroup|command][]' +
 					'menu[A|type|label|compact][C|li]' +
 					'legend[A|align][C|B]' +
 					'div[A|align][C]' +
 					'source[A|src|type|media][]' +
-					'audio[A|src|autobuffer|autoplay|loop|controls][source]' +
-					'video[A|src|autobuffer|autoplay|loop|controls|width|height|poster][source]' +
+					'track[A|kind|src|srclang|label|default][]' +
+					'audio[A|src|autobuffer|autoplay|loop|controls|crossorigin|preload|mediagroup|muted][C|source|track]' +
+					'video[A|src|autobuffer|autoplay|loop|controls|width|height|poster|crossorigin|preload|mediagroup|muted][C|source|track]' +
 					'hr[A|align|noshade|size|width][]' +
 					'form[A|accept-charset|action|autocomplete|enctype|method|name|novalidate|target|onsubmit|onreset|accept][C]' +
 					'fieldset[A|disabled|form|name][C|legend]' +
@@ -155,7 +157,7 @@
 					'textarea[A|autofocus|disabled|form|maxlength|name|placeholder|readonly|required|rows|cols|wrap|tabindex|onfocus|onblur|onselect|onchange][]' +
 					'keygen[A|autofocus|challenge|disabled|form|keytype|name][]' +
 					'output[A|for|form|name][B]' +
-					'canvas[A|width|height][]' +
+					'canvas[A|width|height][a|button|input]' +
 					'map[A|name][B|C]' +
 					'area[A|shape|coords|href|alt|target|media|rel|ping|type|tabindex|onfocus|onblur|nohref][]' +
 					'mathml[A][]' +
Index: wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
===================================================================
--- wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js	(revision 23147)
+++ wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js	(working copy)
@@ -135,12 +135,6 @@
 				}
 			});
 
-			// Extend <object> and <embed> (#WP22790)
-			ed.onPreInit.add(function(ed) {
-				ed.schema.addValidElements('object[*],param[id|name|value|valuetype|type],embed[*]');
-				ed.schema.addValidChildren('+object[embed]');
-			});
-
 			ed.onInit.add(function(ed) {
 				var bodyClass = ed.getParam('body_class', ''), body = ed.getBody();