Bug 630564 - Ctrl+Shift+X in the location bar in RTL mode should change the text alignment in addition to directionality; r=roc a=blocking-final+

browser/base/content/browser.css

@@ -207,7 +207,6 @@ html|input.uri-element-right-align:-moz-locale-dir(rtl),
 .ac-url-text:-moz-locale-dir(rtl),
 .ac-title:-moz-locale-dir(rtl) > description {
   direction: ltr !important;
-  text-align: right !important;
 }
 
 /* For results that are actions, their description text is shown instead of

layout/style/forms.css

@@ -114,6 +114,20 @@ input > .anonymous-div {
   line-height: -moz-block-height;
 }
 
+/* Make sure that the location bar's alignment in RTL mode changes according
+   to the input box direction if the user switches the text direction using
+   cmd_switchTextDirection (which applies a dir attribute to the input box's
+   anonymous div. */
+@-moz-document url-prefix(chrome://) {
+  input.uri-element-right-align:-moz-locale-dir(rtl) > .anonymous-div {
+    text-align: right !important;
+  }
+
+  input.uri-element-right-align:-moz-locale-dir(rtl) > .anonymous-div[dir=ltr] {
+    text-align: left !important;
+  }
+}
+
 textarea {
   margin: 1px 0 1px 0;
   border: 2px inset ThreeDFace;