From 4130c8e2c57d02680bcf389e7f5ddc41400d3b59 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Mon, 8 Oct 2018 11:10:25 -0700
Subject: [PATCH] Bug 1419091: Delete platformHTMLBindings.xml. r=masayuki

Removes the now unused platformHTMLBindings.xml.

Differential Revision: https://phabricator.services.mozilla.com/D8932

--HG--
extra : rebase_source : a61de540b9b179af37ceefc59cbb60f08c8ef184
extra : intermediate-source : 15811bce212a0bbe0603ff31f3f95934050afe95
extra : source : 09a985b890cd7be3c5c63d6e59df77e3ac05aa54
---
 dom/xbl/builtin/android/jar.mn                |   6 -
 dom/xbl/builtin/android/moz.build             |   2 -
 .../builtin/android/platformHTMLBindings.xml  | 162 ------------
 dom/xbl/builtin/browser-base.inc              |  14 --
 dom/xbl/builtin/editor-base.inc               |  19 --
 dom/xbl/builtin/emacs/jar.mn                  |   6 -
 dom/xbl/builtin/emacs/moz.build               |   2 -
 .../builtin/emacs/platformHTMLBindings.xml    | 237 ------------------
 dom/xbl/builtin/input-fields-base.inc         |  17 --
 dom/xbl/builtin/mac/jar.mn                    |   6 -
 dom/xbl/builtin/mac/moz.build                 |   2 -
 dom/xbl/builtin/mac/platformHTMLBindings.xml  |  72 ------
 dom/xbl/builtin/textareas-base.inc            |  16 --
 dom/xbl/builtin/unix/jar.mn                   |   6 -
 dom/xbl/builtin/unix/moz.build                |   2 -
 dom/xbl/builtin/unix/platformHTMLBindings.xml |  82 ------
 dom/xbl/builtin/win/jar.mn                    |   6 -
 dom/xbl/builtin/win/moz.build                 |   2 -
 dom/xbl/builtin/win/platformHTMLBindings.xml  | 164 ------------
 19 files changed, 823 deletions(-)
 delete mode 100644 dom/xbl/builtin/android/jar.mn
 delete mode 100644 dom/xbl/builtin/android/platformHTMLBindings.xml
 delete mode 100644 dom/xbl/builtin/browser-base.inc
 delete mode 100644 dom/xbl/builtin/editor-base.inc
 delete mode 100644 dom/xbl/builtin/emacs/jar.mn
 delete mode 100644 dom/xbl/builtin/emacs/platformHTMLBindings.xml
 delete mode 100644 dom/xbl/builtin/input-fields-base.inc
 delete mode 100644 dom/xbl/builtin/mac/jar.mn
 delete mode 100644 dom/xbl/builtin/mac/platformHTMLBindings.xml
 delete mode 100644 dom/xbl/builtin/textareas-base.inc
 delete mode 100644 dom/xbl/builtin/unix/jar.mn
 delete mode 100644 dom/xbl/builtin/unix/platformHTMLBindings.xml
 delete mode 100644 dom/xbl/builtin/win/jar.mn
 delete mode 100644 dom/xbl/builtin/win/platformHTMLBindings.xml

diff --git a/dom/xbl/builtin/android/jar.mn b/dom/xbl/builtin/android/jar.mn
deleted file mode 100644
index 9f05c2dd6cd0..000000000000
--- a/dom/xbl/builtin/android/jar.mn
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-toolkit.jar:
-* content/global/platformHTMLBindings.xml   (platformHTMLBindings.xml)
diff --git a/dom/xbl/builtin/android/moz.build b/dom/xbl/builtin/android/moz.build
index 4588f4ae9c96..1d09fbdc7b67 100644
--- a/dom/xbl/builtin/android/moz.build
+++ b/dom/xbl/builtin/android/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-JAR_MANIFESTS += ['jar.mn']
-
 SOURCES += ['ShortcutKeyDefinitions.cpp']
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/xbl/builtin/android/platformHTMLBindings.xml b/dom/xbl/builtin/android/platformHTMLBindings.xml
deleted file mode 100644
index 03363c1b5e66..000000000000
--- a/dom/xbl/builtin/android/platformHTMLBindings.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<bindings id="htmlBindings"
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="inputFields" bindToUntrustedContent="true">
-    <handlers>
-#include ../input-fields-base.inc
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectWordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectWordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectBeginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectEndLine"/>
-
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_deleteToBeginningOfLine"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="alt" command="cmd_deleteToEndOfLine"/>
-    </handlers>
-  </binding>
-
-  <binding id="textAreas" bindToUntrustedContent="true">
-    <handlers>
-#include ../textareas-base.inc
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectWordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectWordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectBeginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectEndLine"/>
-
-      <handler event="keypress" keycode="VK_UP" modifiers="alt" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="alt" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_UP" modifiers="shift,alt" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
-
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="alt" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="alt" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift,alt" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
-
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" />
-
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_deleteToBeginningOfLine"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="alt" command="cmd_deleteToEndOfLine"/>
-    </handlers>
-  </binding>
-
-  <binding id="browser">
-    <handlers>
-#include ../browser-base.inc
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectCharPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectCharNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control,shift" command="cmd_selectWordPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control,shift" command="cmd_selectWordNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectBeginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectEndLine"/>
-
-      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectLinePrevious" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectLineNext" />
-      <handler event="keypress" keycode="VK_UP" modifiers="alt" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="alt" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_UP" modifiers="shift,alt" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
-
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="alt" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="alt" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift,alt" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
-
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" />
-
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_deleteToBeginningOfLine"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="alt" command="cmd_deleteToEndOfLine"/>
-    </handlers>
-  </binding>
-
-  <binding id="editor">
-    <handlers>
-#include ../editor-base.inc
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectWordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectWordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectBeginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectEndLine"/>
-
-      <handler event="keypress" keycode="VK_UP" modifiers="alt" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="alt" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_UP" modifiers="shift,alt" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
-
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="alt" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="alt" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift,alt" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
-
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" />
-
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_deleteToBeginningOfLine"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="alt" command="cmd_deleteToEndOfLine"/>
-    </handlers>
-  </binding>
-</bindings>
diff --git a/dom/xbl/builtin/browser-base.inc b/dom/xbl/builtin/browser-base.inc
deleted file mode 100644
index 03264c27099b..000000000000
--- a/dom/xbl/builtin/browser-base.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-      <handler event="keypress" key=" " modifiers="shift" command="cmd_scrollPageUp" />
-      <handler event="keypress" key=" " command="cmd_scrollPageDown" />
-
-      <handler event="keypress" keycode="VK_UP" command="cmd_moveUp" />
-      <handler event="keypress" keycode="VK_DOWN" command="cmd_moveDown" />
-      <handler event="keypress" keycode="VK_LEFT" command="cmd_moveLeft" />
-      <handler event="keypress" keycode="VK_RIGHT" command="cmd_moveRight" />
-
-      <handler event="keypress" key="x" command="cmd_cut" modifiers="accel"/>
-      <handler event="keypress" key="c" command="cmd_copy" modifiers="accel"/>
-      <handler event="keypress" key="v" command="cmd_paste" modifiers="accel"/>
-      <handler event="keypress" key="z" command="cmd_undo" modifiers="accel"/>
-      <handler event="keypress" key="z" command="cmd_redo" modifiers="accel,shift" />
-      <handler event="keypress" key="a" command="cmd_selectAll" modifiers="accel"/>
diff --git a/dom/xbl/builtin/editor-base.inc b/dom/xbl/builtin/editor-base.inc
deleted file mode 100644
index 1084da814467..000000000000
--- a/dom/xbl/builtin/editor-base.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-      <handler event="keypress" key=" " modifiers="shift" command="cmd_scrollPageUp" />
-      <handler event="keypress" key=" " command="cmd_scrollPageDown" />
-
-      <handler event="keypress" keycode="VK_LEFT" command="cmd_moveLeft"/>
-      <handler event="keypress" keycode="VK_RIGHT" command="cmd_moveRight"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight"/>
-
-      <handler event="keypress" keycode="VK_UP" command="cmd_moveUp"/>
-      <handler event="keypress" keycode="VK_DOWN" command="cmd_moveDown"/>
-      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown"/>
-
-      <handler event="keypress" key="z" command="cmd_undo" modifiers="accel"/>
-      <handler event="keypress" key="z" command="cmd_redo" modifiers="accel,shift" />
-      <handler event="keypress" key="x" command="cmd_cut" modifiers="accel"/>
-      <handler event="keypress" key="c" command="cmd_copy" modifiers="accel"/>
-      <handler event="keypress" key="v" command="cmd_paste" modifiers="accel"/>
-      <handler event="keypress" key="v" command="cmd_pasteNoFormatting" modifiers="accel,shift"/>
diff --git a/dom/xbl/builtin/emacs/jar.mn b/dom/xbl/builtin/emacs/jar.mn
deleted file mode 100644
index 9f05c2dd6cd0..000000000000
--- a/dom/xbl/builtin/emacs/jar.mn
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-toolkit.jar:
-* content/global/platformHTMLBindings.xml   (platformHTMLBindings.xml)
diff --git a/dom/xbl/builtin/emacs/moz.build b/dom/xbl/builtin/emacs/moz.build
index 4588f4ae9c96..1d09fbdc7b67 100644
--- a/dom/xbl/builtin/emacs/moz.build
+++ b/dom/xbl/builtin/emacs/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-JAR_MANIFESTS += ['jar.mn']
-
 SOURCES += ['ShortcutKeyDefinitions.cpp']
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/xbl/builtin/emacs/platformHTMLBindings.xml b/dom/xbl/builtin/emacs/platformHTMLBindings.xml
deleted file mode 100644
index 76c214ffa180..000000000000
--- a/dom/xbl/builtin/emacs/platformHTMLBindings.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<bindings id="htmlBindings"
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- 
-  <binding id="inputFields" bindToUntrustedContent="true">
-    <handlers>
-#include ../input-fields-base.inc
-    <!-- Emacsish single-line motion and delete keys -->
-    <handler event="keypress" key="a" modifiers="control"
-        command="cmd_beginLine"/>
-    <handler event="keypress" key="e" modifiers="control"
-        command="cmd_endLine"/>
-    <handler event="keypress" key="b" modifiers="control"
-        command="cmd_charPrevious"/>
-    <handler event="keypress" key="f" modifiers="control"
-        command="cmd_charNext"/>
-    <handler event="keypress" key="h" modifiers="control"
-        command="cmd_deleteCharBackward"/>
-    <handler event="keypress" key="d" modifiers="control"
-        command="cmd_deleteCharForward"/>
-    <handler event="keypress" key="w" modifiers="control"
-        command="cmd_deleteWordBackward"/>
-    <handler event="keypress" key="u" modifiers="control"
-        command="cmd_deleteToBeginningOfLine"/>
-    <handler event="keypress" key="k" modifiers="control"
-        command="cmd_deleteToEndOfLine"/>
-
-    <!-- Alternate Windows copy/paste/undo/redo keys -->
-    <handler event="keypress" keycode="VK_DELETE" modifiers="shift"
-        command="cmd_cutOrDelete"/>
-    <handler event="keypress" keycode="VK_DELETE" modifiers="control"
-        command="cmd_copyOrDelete"/>
-    <handler event="keypress" keycode="VK_INSERT" modifiers="control" 
-        command="cmd_copy"/>
-    <handler event="keypress" keycode="VK_INSERT" modifiers="shift"
-        command="cmd_paste"/>
-
-    <!-- navigating by word keys -->
-    <handler event="keypress" keycode="VK_HOME" 
-        command="cmd_beginLine"/>
-    <handler event="keypress" keycode="VK_END" 
-        command="cmd_endLine"/>
-    <handler event="keypress" keycode="VK_HOME" modifiers="shift"
-        command="cmd_selectBeginLine"/>
-    <handler event="keypress" keycode="VK_END" modifiers="shift"
-        command="cmd_selectEndLine"/>
-    <handler event="keypress" keycode="VK_HOME" modifiers="control"
-        command="cmd_beginLine"/>
-    <handler event="keypress" keycode="VK_END" modifiers="control" 
-        command="cmd_endLine"/>
-    <handler event="keypress" keycode="VK_HOME" modifiers="control,shift"
-        command="cmd_selectBeginLine"/>
-    <handler event="keypress" keycode="VK_END" modifiers="control,shift"
-        command="cmd_selectEndLine"/>
-    <handler event="keypress" keycode="VK_BACK" modifiers="control"
-        command="cmd_deleteWordBackward"/>
-
-    <handler event="keypress" keycode="VK_LEFT" modifiers="control" 
-        command="cmd_wordPrevious"/>
-    <handler event="keypress" keycode="VK_RIGHT" modifiers="control"
-        command="cmd_wordNext"/>
-    <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" 
-        command="cmd_selectWordPrevious"/>
-    <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" 
-        command="cmd_selectWordNext"/>
-    <handler event="keypress" key="y" modifiers="accel"
-        command="cmd_redo"/>
-    <handler event="keypress" key="a" modifiers="alt"
-        command="cmd_selectAll"/>
-    </handlers>
-  </binding>
-
-  <binding id="textAreas" bindToUntrustedContent="true">
-    <handlers>
-#include ../textareas-base.inc
-    <!-- Emacsish single-line motion and delete keys -->
-    <handler event="keypress" key="a" modifiers="control"
-        command="cmd_beginLine"/>
-    <handler event="keypress" key="e" modifiers="control"
-        command="cmd_endLine"/>
-    <handler event="keypress" id="key_left" key="b" modifiers="control"
-        command="cmd_charPrevious"/>
-    <handler event="keypress" id="key_right" key="f" modifiers="control"
-        command="cmd_charNext"/>
-    <handler event="keypress" id="key_delback" key="h" modifiers="control"
-        command="cmd_deleteCharBackward"/>
-    <handler event="keypress" id="key_delforw" key="d" modifiers="control"
-        command="cmd_deleteCharForward"/>
-    <handler event="keypress" id="key_delwback" key="w" modifiers="control"
-        command="cmd_deleteWordBackward"/>
-    <handler event="keypress" id="key_del_bol" key="u" modifiers="control"
-        command="cmd_deleteToBeginningOfLine"/>
-    <handler event="keypress" id="key_del_eol" key="k" modifiers="control"
-        command="cmd_deleteToEndOfLine"/>
-
-    <!-- Alternate Windows copy/paste/undo/redo keys -->
-    <handler event="keypress" keycode="VK_DELETE" modifiers="shift"
-        command="cmd_cutOrDelete"/>
-    <handler event="keypress" keycode="VK_DELETE" modifiers="control"
-        command="cmd_copyOrDelete"/>
-    <handler event="keypress" keycode="VK_INSERT" modifiers="control"
-        command="cmd_copy"/>
-    <handler event="keypress" keycode="VK_INSERT" modifiers="shift"
-        command="cmd_paste"/>
-
-    <!-- Emacsish multi-line motion and delete keys -->
-    <handler event="keypress" id="key_linedown" key="n" modifiers="control"
-        command="cmd_lineNext"/>
-    <handler event="keypress" id="key_lineup" key="p" modifiers="control"
-        command="cmd_linePrevious"/>
-
-    <!-- handle home/end/arrow keys and redo -->
-    <handler event="keypress" keycode="VK_HOME" 
-        command="cmd_beginLine"/>
-    <handler event="keypress" keycode="VK_END" 
-        command="cmd_endLine"/>
-    <handler event="keypress" keycode="VK_HOME" modifiers="shift"
-        command="cmd_selectBeginLine"/>
-    <handler event="keypress" keycode="VK_END" modifiers="shift"
-        command="cmd_selectEndLine"/>
-
-    <handler event="keypress" keycode="VK_HOME" modifiers="control" 
-        command="cmd_moveTop"/>
-    <handler event="keypress" keycode="VK_END" modifiers="control" 
-        command="cmd_moveBottom"/>
-    <handler event="keypress" keycode="VK_HOME" modifiers="shift,control"
-        command="cmd_selectTop"/>
-    <handler event="keypress" keycode="VK_END" modifiers="shift,control"
-        command="cmd_selectBottom"/>
-
-    <handler event="keypress" keycode="VK_PAGE_UP" 
-        command="cmd_movePageUp"/>
-    <handler event="keypress" keycode="VK_PAGE_DOWN" 
-        command="cmd_movePageDown"/>
-    <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift"
-        command="cmd_selectPageUp"/>
-    <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift"
-        command="cmd_selectPageDown"/>
-
-    <handler event="keypress" keycode="VK_LEFT" modifiers="control" 
-        command="cmd_wordPrevious"/>
-    <handler event="keypress" keycode="VK_RIGHT" modifiers="control" 
-        command="cmd_wordNext"/>
-    <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" 
-        command="cmd_selectWordPrevious"/>
-    <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" 
-        command="cmd_selectWordNext"/>
-    <handler event="keypress" keycode="VK_BACK" modifiers="control"
-        command="cmd_deleteWordBackward"/>
-    <handler event="keypress" key="y" modifiers="accel"
-        command="cmd_redo"/>
-    <handler event="keypress" key="a" modifiers="alt"
-        command="cmd_selectAll"/>
-    </handlers>
-  </binding>
-
-  <binding id="browser">
-    <handlers>
-#include ../browser-base.inc
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-
-      <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cut" /> 
-      <handler event="keypress" keycode="VK_DELETE" modifiers="control" command="cmd_copy" /> 
-      <handler event="keypress" keycode="VK_INSERT" modifiers="control" command="cmd_copy" /> 
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" /> 
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" /> 
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control,shift" command="cmd_selectWordPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control,shift" command="cmd_selectWordNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectCharPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectCharNext" />
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectLinePrevious" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectLineNext" />
-      <handler event="keypress" key="a" modifiers="alt" command="cmd_selectAll"/>
-    </handlers>
-  </binding>
-
-  <binding id="editor">
-    <handlers>
-#include ../editor-base.inc
-      <handler event="keypress" key="h" modifiers="control" command="cmd_deleteCharBackward"/>
-      <handler event="keypress" key="d" modifiers="control" command="cmd_deleteCharForward"/>
-      <handler event="keypress" key="k" modifiers="control" command="cmd_deleteToEndOfLine"/>
-      <handler event="keypress" key="u" modifiers="control" command="cmd_deleteToBeginningOfLine"/>
-      <handler event="keypress" key="a" modifiers="control" command="cmd_beginLine"/>
-      <handler event="keypress" key="e" modifiers="control" command="cmd_endLine"/>
-      <handler event="keypress" key="b" modifiers="control" command="cmd_charPrevious"/>
-      <handler event="keypress" key="f" modifiers="control" command="cmd_charNext"/>
-      <handler event="keypress" key="p" modifiers="control" command="cmd_linePrevious"/>
-      <handler event="keypress" key="n" modifiers="control" command="cmd_lineNext"/>
-      <handler event="keypress" key="x" modifiers="control" command="cmd_cut"/>
-      <handler event="keypress" key="c" modifiers="control" command="cmd_copy"/>
-      <handler event="keypress" key="v" modifiers="control" command="cmd_paste"/>
-      <handler event="keypress" key="z" modifiers="control" command="cmd_undo"/>
-      <handler event="keypress" key="y" modifiers="accel"   command="cmd_redo"/>
-      <handler event="keypress" key="a" modifiers="alt" command="cmd_selectAll"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cutOrDelete"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="control" command="cmd_copyOrDelete"/>
-      <handler event="keypress" keycode="VK_INSERT" modifiers="control" command="cmd_copy"/>
-      <handler event="keypress" keycode="VK_INSERT" modifiers="shift" command="cmd_paste"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectWordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectWordNext"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="control" command="cmd_deleteWordBackward"/>
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine"/>
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-    </handlers>
-  </binding>
-</bindings>
diff --git a/dom/xbl/builtin/input-fields-base.inc b/dom/xbl/builtin/input-fields-base.inc
deleted file mode 100644
index a19686291c27..000000000000
--- a/dom/xbl/builtin/input-fields-base.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-    <handler event="keypress" keycode="VK_LEFT" command="cmd_moveLeft"/>
-    <handler event="keypress" keycode="VK_RIGHT" command="cmd_moveRight"/>
-    <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft"/>
-    <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight"/>
-
-    <handler event="keypress" keycode="VK_UP" command="cmd_moveUp"/>
-    <handler event="keypress" keycode="VK_DOWN" command="cmd_moveDown"/>
-    <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp"/>
-    <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown"/>
-
-    <!-- Cut/copy/paste/undo -->
-    <handler event="keypress" key="c" modifiers="accel" command="cmd_copy"/>
-    <handler event="keypress" key="x" modifiers="accel" command="cmd_cut"/>
-    <handler event="keypress" key="v" modifiers="accel" command="cmd_paste"/>
-    <handler event="keypress" key="z" modifiers="accel" command="cmd_undo"/>
-    <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo" />
-
diff --git a/dom/xbl/builtin/mac/jar.mn b/dom/xbl/builtin/mac/jar.mn
deleted file mode 100644
index 9f05c2dd6cd0..000000000000
--- a/dom/xbl/builtin/mac/jar.mn
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-toolkit.jar:
-* content/global/platformHTMLBindings.xml   (platformHTMLBindings.xml)
diff --git a/dom/xbl/builtin/mac/moz.build b/dom/xbl/builtin/mac/moz.build
index 4588f4ae9c96..1d09fbdc7b67 100644
--- a/dom/xbl/builtin/mac/moz.build
+++ b/dom/xbl/builtin/mac/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-JAR_MANIFESTS += ['jar.mn']
-
 SOURCES += ['ShortcutKeyDefinitions.cpp']
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/xbl/builtin/mac/platformHTMLBindings.xml b/dom/xbl/builtin/mac/platformHTMLBindings.xml
deleted file mode 100644
index b7059239999f..000000000000
--- a/dom/xbl/builtin/mac/platformHTMLBindings.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<bindings id="htmlBindings"
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="inputFields" bindToUntrustedContent="true">
-    <handlers>
-      <handler event="keypress" key="c" modifiers="accel" command="cmd_copy"/>
-      <handler event="keypress" key="x" modifiers="accel" command="cmd_cut"/>
-      <handler event="keypress" key="v" modifiers="accel" command="cmd_paste"/>
-      <handler event="keypress" key="z" modifiers="accel" command="cmd_undo"/>
-      <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo"/>
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-    </handlers>
-  </binding>
-
-  <binding id="textAreas" bindToUntrustedContent="true">
-    <handlers>
-      <handler event="keypress" key="c" modifiers="accel" command="cmd_copy"/>
-      <handler event="keypress" key="x" modifiers="accel" command="cmd_cut"/>
-      <handler event="keypress" key="v" modifiers="accel" command="cmd_paste"/>
-      <handler event="keypress" key="z" modifiers="accel" command="cmd_undo"/>
-      <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo"/>
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-    </handlers>
-  </binding>
-
-  <binding id="browser">
-    <handlers>
-#include ../browser-base.inc
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_scrollPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_scrollPageDown"/>
-      <handler event="keypress" keycode="VK_HOME" command="cmd_scrollTop" /> 
-      <handler event="keypress" keycode="VK_END"  command="cmd_scrollBottom" /> 
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_moveLeft2" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_moveRight2" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt,shift" command="cmd_selectLeft2" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt,shift" command="cmd_selectRight2" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight" />
-      <handler event="keypress" keycode="VK_UP" modifiers="alt,shift" command="cmd_selectUp2" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="alt,shift" command="cmd_selectDown2" />
-      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown" />
-      <handler event="keypress" keycode="VK_UP" modifiers="accel" command="cmd_moveUp2"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="accel" command="cmd_moveDown2"/>
-    </handlers>
-  </binding>
-
-  <binding id="editor">
-    <handlers>
-      <handler event="keypress" key=" " modifiers="shift" command="cmd_scrollPageUp" />
-      <handler event="keypress" key=" " command="cmd_scrollPageDown" />
-
-      <handler event="keypress" key="z" command="cmd_undo" modifiers="accel"/>
-      <handler event="keypress" key="z" command="cmd_redo" modifiers="accel,shift" />
-      <handler event="keypress" key="x" command="cmd_cut" modifiers="accel"/>
-      <handler event="keypress" key="c" command="cmd_copy" modifiers="accel"/>
-      <handler event="keypress" key="v" command="cmd_paste" modifiers="accel"/>
-      <handler event="keypress" key="v" command="cmd_pasteNoFormatting" modifiers="accel,shift"/>
-      <handler event="keypress" key="a" command="cmd_selectAll" modifiers="accel"/>
-      <handler event="keypress" key="v" command="cmd_pasteNoFormatting" modifiers="accel,alt,shift"/>
-    </handlers>
-  </binding>
-
-</bindings>
diff --git a/dom/xbl/builtin/textareas-base.inc b/dom/xbl/builtin/textareas-base.inc
deleted file mode 100644
index 7c52359d7023..000000000000
--- a/dom/xbl/builtin/textareas-base.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-    <handler event="keypress" keycode="VK_LEFT" command="cmd_moveLeft"/>
-    <handler event="keypress" keycode="VK_RIGHT" command="cmd_moveRight"/>
-    <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft"/>
-    <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight"/>
-
-    <handler event="keypress" keycode="VK_UP" command="cmd_moveUp"/>
-    <handler event="keypress" keycode="VK_DOWN" command="cmd_moveDown"/>
-    <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp"/>
-    <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown"/>
-
-    <!-- Cut/copy/paste/undo -->
-    <handler event="keypress" key="c" modifiers="accel" command="cmd_copy"/>
-    <handler event="keypress" key="x" modifiers="accel" command="cmd_cut"/>
-    <handler event="keypress" key="v" modifiers="accel" command="cmd_paste"/>
-    <handler event="keypress" key="z" modifiers="accel" command="cmd_undo"/>
-    <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo" />
diff --git a/dom/xbl/builtin/unix/jar.mn b/dom/xbl/builtin/unix/jar.mn
deleted file mode 100644
index 9f05c2dd6cd0..000000000000
--- a/dom/xbl/builtin/unix/jar.mn
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-toolkit.jar:
-* content/global/platformHTMLBindings.xml   (platformHTMLBindings.xml)
diff --git a/dom/xbl/builtin/unix/moz.build b/dom/xbl/builtin/unix/moz.build
index 4588f4ae9c96..1d09fbdc7b67 100644
--- a/dom/xbl/builtin/unix/moz.build
+++ b/dom/xbl/builtin/unix/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-JAR_MANIFESTS += ['jar.mn']
-
 SOURCES += ['ShortcutKeyDefinitions.cpp']
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/xbl/builtin/unix/platformHTMLBindings.xml b/dom/xbl/builtin/unix/platformHTMLBindings.xml
deleted file mode 100644
index 75645f1f6a05..000000000000
--- a/dom/xbl/builtin/unix/platformHTMLBindings.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<bindings id="htmlBindings"
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- 
-  <binding id="inputFields" bindToUntrustedContent="true">
-    <handlers>
-#include ../input-fields-base.inc
-    <handler event="keypress" key="a" modifiers="alt"
-        command="cmd_selectAll"/>
-    <handler event="keypress" key="y" modifiers="accel"
-        command="cmd_redo"/>
-    <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo"/>
-    <handler event="keypress" key="z" modifiers="accel" command="cmd_undo"/>
-    </handlers>
-  </binding>
-
-  <binding id="textAreas" bindToUntrustedContent="true">
-    <handlers>
-#include ../textareas-base.inc
-    <handler event="keypress" key="a" modifiers="alt"
-        command="cmd_selectAll"/>
-    <handler event="keypress" key="y" modifiers="accel"
-        command="cmd_redo"/>
-    <handler event="keypress" key="z" modifiers="accel" command="cmd_undo"/>
-    <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo"/>
-    </handlers>
-  </binding>
-
-  <binding id="browser">
-    <handlers>
-#include ../browser-base.inc
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-
-      <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cut" /> 
-      <handler event="keypress" keycode="VK_DELETE" modifiers="control" command="cmd_copy" /> 
-      <handler event="keypress" keycode="VK_INSERT" modifiers="control" command="cmd_copy" /> 
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" /> 
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" /> 
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_moveLeft2" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_moveRight2" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control,shift" command="cmd_selectLeft2" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control,shift" command="cmd_selectRight2" />
-
-      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown" />
-      <handler event="keypress" keycode="VK_UP" modifiers="control" command="cmd_moveUp2" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="control" command="cmd_moveDown2" />
-      <handler event="keypress" keycode="VK_UP" modifiers="control,shift" command="cmd_selectUp2" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="control,shift" command="cmd_selectDown2" />
-
-      <handler event="keypress" key="a" modifiers="alt" command="cmd_selectAll"/>
-    </handlers>
-  </binding>
-
-  <binding id="editor">
-    <handlers>
-#include ../editor-base.inc
-      <handler event="keypress" key="z" modifiers="accel" command="cmd_undo"/>
-      <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo"/>
-      <handler event="keypress" key="y" modifiers="accel"   command="cmd_redo"/>
-      <handler event="keypress" key="a" modifiers="alt" command="cmd_selectAll"/>
-    </handlers>
-  </binding>
-</bindings>
diff --git a/dom/xbl/builtin/win/jar.mn b/dom/xbl/builtin/win/jar.mn
deleted file mode 100644
index 9f05c2dd6cd0..000000000000
--- a/dom/xbl/builtin/win/jar.mn
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-toolkit.jar:
-* content/global/platformHTMLBindings.xml   (platformHTMLBindings.xml)
diff --git a/dom/xbl/builtin/win/moz.build b/dom/xbl/builtin/win/moz.build
index 4588f4ae9c96..1d09fbdc7b67 100644
--- a/dom/xbl/builtin/win/moz.build
+++ b/dom/xbl/builtin/win/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-JAR_MANIFESTS += ['jar.mn']
-
 SOURCES += ['ShortcutKeyDefinitions.cpp']
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/xbl/builtin/win/platformHTMLBindings.xml b/dom/xbl/builtin/win/platformHTMLBindings.xml
deleted file mode 100644
index 1612138e1d3e..000000000000
--- a/dom/xbl/builtin/win/platformHTMLBindings.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<bindings id="htmlBindings"
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- 
-  <binding id="inputFields" bindToUntrustedContent="true">
-    <handlers>
-#include ../input-fields-base.inc
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine"/>
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_moveLeft2"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_moveRight2"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectLeft2"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectRight2"/>
-
-      <handler event="keypress" keycode="VK_UP" modifiers="control" command="cmd_moveUp2"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="control" command="cmd_moveDown2"/>
-      <handler event="keypress" keycode="VK_UP" modifiers="shift,control" command="cmd_selectUp2"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,control" command="cmd_selectDown2"/>
-
-      <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cutOrDelete"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="control" command="cmd_deleteWordForward"/>
-      <handler event="keypress" keycode="VK_INSERT" modifiers="control" command="cmd_copy"/>
-      <handler event="keypress" keycode="VK_INSERT" modifiers="shift" command="cmd_paste"/>
-
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_undo"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt,shift" command="cmd_redo"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="control" command="cmd_deleteWordBackward"/>
-
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-      <handler event="keypress" key="y" modifiers="accel" command="cmd_redo"/>
-    </handlers>
-  </binding>
-
-  <binding id="textAreas" bindToUntrustedContent="true">
-    <handlers>
-#include ../textareas-base.inc
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine"/>
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_moveLeft2"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_moveRight2"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectLeft2"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectRight2"/>
-
-      <handler event="keypress" keycode="VK_UP" modifiers="control" command="cmd_moveUp2"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="control" command="cmd_moveDown2"/>
-      <handler event="keypress" keycode="VK_UP" modifiers="shift,control" command="cmd_selectUp2"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,control" command="cmd_selectDown2"/>
-
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-
-      <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cutOrDelete"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="control" command="cmd_deleteWordForward"/>
-      <handler event="keypress" keycode="VK_INSERT" modifiers="control" command="cmd_copy"/>
-      <handler event="keypress" keycode="VK_INSERT" modifiers="shift" command="cmd_paste"/>
-
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_undo"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt,shift" command="cmd_redo"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="control" command="cmd_deleteWordBackward"/>
-
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-      <handler event="keypress" key="y" modifiers="accel" command="cmd_redo"/>
-     </handlers>
-  </binding>
-
-  <binding id="browser">
-    <handlers>
-#include ../browser-base.inc
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-
-      <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cut"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="control" command="cmd_deleteWordForward"/>
-      <handler event="keypress" keycode="VK_INSERT" modifiers="control" command="cmd_copy"/>
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" />
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_moveLeft2" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_moveRight2" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control,shift" command="cmd_selectLeft2" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control,shift" command="cmd_selectRight2" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight" />
-
-      <handler event="keypress" keycode="VK_UP" modifiers="control" command="cmd_moveUp2" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="control" command="cmd_moveDown2" />
-      <handler event="keypress" keycode="VK_UP" modifiers="control,shift" command="cmd_selectUp2" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="control,shift" command="cmd_selectDown2" />
-      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown" />
-
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-      <handler event="keypress" key="y" modifiers="accel" command="cmd_redo"/>
-    </handlers>
-  </binding>
-
-  <binding id="editor">
-    <handlers>
-#include ../editor-base.inc
-      <handler event="keypress" key="a" command="cmd_selectAll" modifiers="accel"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cutOrDelete"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="control" command="cmd_deleteWordForward"/>
-      <handler event="keypress" keycode="VK_INSERT" modifiers="control" command="cmd_copy"/>
-      <handler event="keypress" keycode="VK_INSERT" modifiers="shift" command="cmd_paste"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_undo"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt,shift" command="cmd_redo"/>
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="accel" command="cmd_moveLeft2"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="accel" command="cmd_moveRight2"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,accel" command="cmd_selectLeft2"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,accel" command="cmd_selectRight2"/>
-
-      <handler event="keypress" keycode="VK_UP" modifiers="accel" command="cmd_moveUp2"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="accel" command="cmd_moveDown2"/>
-      <handler event="keypress" keycode="VK_UP" modifiers="shift,accel" command="cmd_selectUp2"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,accel" command="cmd_selectDown2"/>
-
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="control" command="cmd_deleteWordBackward"/>
-
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" command="cmd_selectBeginLine" modifiers="shift"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_selectEndLine" modifiers="shift"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-      <handler event="keypress" key="y" modifiers="accel" command="cmd_redo"/>
-    </handlers>
-  </binding>
-</bindings>