From c7b28dcb8265fcbe23f929b987d02dfaa9fcb4cb Mon Sep 17 00:00:00 2001
From: "aaronleventhal%moonset.net"
 <aaronleventhal%moonset.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 23 Jan 2005 03:48:00 +0000
Subject: [PATCH] Bug 256003. Remove -moz-user-focus from html.css, forms.css,
 ua.css. It's been deprecated from use in HTML. Patch by Martijn Wargers.
 r=bryner, sr=roc

git-svn-id: svn://10.0.0.236/trunk@168182 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/public/nsIContent.h |  4 ++--
 mozilla/layout/style/forms.css           | 12 ------------
 mozilla/layout/style/html.css            | 15 ---------------
 mozilla/layout/style/ua.css              |  5 -----
 4 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/mozilla/content/base/public/nsIContent.h b/mozilla/content/base/public/nsIContent.h
index a0a83ab7a02..506ba4a5ae7 100644
--- a/mozilla/content/base/public/nsIContent.h
+++ b/mozilla/content/base/public/nsIContent.h
@@ -427,7 +427,7 @@ public:
    * something like nsGenericHTMLElement::SetElementFocus().  This method is
    * the end result, the point where the content finds out it has been focused.
    * 
-   * All content elements are potentially focusable (according to CSS3).
+   * All content elements are potentially focusable.
    *
    * @param aPresContext the pres context
    * @see nsGenericHTMLElement::SetElementFocus()
@@ -442,7 +442,7 @@ public:
    * something like nsGenericHTMLElement::SetElementFocus().  This method is
    * the end result, the point where the content finds out it has been focused.
    * 
-   * All content elements are potentially focusable (according to CSS3).
+   * All content elements are potentially focusable.
    *
    * @param aPresContext the pres context
    * @see nsGenericHTMLElement::SetElementFocus()
diff --git a/mozilla/layout/style/forms.css b/mozilla/layout/style/forms.css
index 40e99caca56..04718b74a30 100644
--- a/mozilla/layout/style/forms.css
+++ b/mozilla/layout/style/forms.css
@@ -95,7 +95,6 @@ input {
   word-spacing: normal;
   letter-spacing: normal;
   cursor: text;
-  -moz-user-focus: normal;
   -moz-binding: url("resource://gre/res/builtin/platformHTMLBindings.xml#inputFields");
   text-indent: 0;
 }
@@ -116,7 +115,6 @@ textarea {
   letter-spacing: normal;
   vertical-align: text-bottom;
   cursor: text;
-  -moz-user-focus: normal;
   -moz-binding: url("resource://gre/res/builtin/platformHTMLBindings.xml#textAreas");
   -moz-appearance: textfield;
   text-indent: 0;
@@ -128,7 +126,6 @@ textarea > scrollbar {
 
 textarea > .anonymous-div,
 input > .anonymous-div {
-  -moz-user-focus: none;
   overflow: auto;
   border: 0px !important;
   padding: 0px;
@@ -150,7 +147,6 @@ select {
   cursor: default;
   -moz-box-sizing: border-box;
   -moz-user-select: none;
-  -moz-user-focus: normal;
   -moz-appearance: menulist;
   border-width: 2px;
   border-style: inset;
@@ -181,8 +177,6 @@ select > input[type="button"] {
   width: 12px;
   height: 12px;
   white-space: nowrap;
-  -moz-user-focus: none;
-
   position: static !important;
   background-image: url("arrow.gif") !important;
   background-repeat: no-repeat !important;
@@ -216,7 +210,6 @@ option {
   min-height: 1em;
   line-height: normal !important;
   -moz-user-select: none;
-  -moz-user-focus: none;
   text-indent: 0;
 }
 
@@ -237,7 +230,6 @@ optgroup {
   font-weight: bold;
   font-size: inherit;
   -moz-user-select: none;
-  -moz-user-focus: none;
   text-indent: 0;
 }
 
@@ -268,7 +260,6 @@ option[disabled],
 optgroup[disabled],
 select[disabled] {
   -moz-user-input: disabled;
-  -moz-user-focus: ignore;
   color: GrayText;
   background-color: ThreeDFace;
   cursor: default;
@@ -286,7 +277,6 @@ input[type="hidden"] {
   padding: 0;
   border: 0;
   cursor: auto;
-  -moz-user-focus: ignore;
   -moz-binding: none;
 }
 
@@ -432,7 +422,6 @@ input[type="submit"] {
   cursor: default;
   -moz-box-sizing: border-box;
   -moz-user-select: none;
-  -moz-user-focus: normal;
   -moz-binding: none;
 }
 
@@ -526,7 +515,6 @@ input[type="file"] > input[type="text"] {
 
 @media print {
   input, textarea, select, button {
-    -moz-user-focus: none !important;
     -moz-user-input: none !important;
   }
 
diff --git a/mozilla/layout/style/html.css b/mozilla/layout/style/html.css
index 311ffd6f14c..b620a65e8f1 100644
--- a/mozilla/layout/style/html.css
+++ b/mozilla/layout/style/html.css
@@ -397,11 +397,6 @@ hr[size="1"] {
 img[usemap], object[usemap] {
   cursor: pointer;
   color: blue;
-  -moz-user-focus: normal;
-}
-
-object, embed, applet {
-  -moz-user-focus: normal;
 }
 
 frameset {
@@ -411,13 +406,8 @@ frameset {
   float: none ! important;
 }
 
-frame {
-  -moz-user-focus: normal;
-}
-
 iframe {
   border: 2px inset;
-  -moz-user-focus: normal;
 }
 
 noframes {
@@ -474,11 +464,6 @@ marquee[height*="7"], marquee[height*="8"], marquee[height*="9"] {
 @media print {
 
   marquee { -moz-binding: none; }
- 
-  *|*:-moz-any-link img, img[usemap], object[usemap],
-  img[usemap], object[usemap], object, embed, applet, iframe {
-    -moz-user-focus: none !important;
-  }
 
   /* XXX this should not be necessary, we should be stopping blinking
      of any kind in print preview, not just the <blink> element */
diff --git a/mozilla/layout/style/ua.css b/mozilla/layout/style/ua.css
index 3af4b5451bb..ad1d4f8d115 100644
--- a/mozilla/layout/style/ua.css
+++ b/mozilla/layout/style/ua.css
@@ -117,7 +117,6 @@
 
 *|*:-moz-any-link {
   cursor: pointer;
-  -moz-user-focus: normal;
 }
 
 *|*:-moz-any-link:focus {
@@ -193,10 +192,6 @@
     background-color: #737373 !important;
   }
 
-  *|*:-moz-any-link {
-    -moz-user-focus: none !important;
-  }
-
 }
 
 /* XML parse error reporting */