Backout 262b6ad34702 (bug 1070778) due to bc1 failures. r=backout

iaxat · Sep 29, 2014 · 2429eb7 · 2429eb7
1 parent 9dff364
commit 2429eb7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 72 deletions.
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
@@ -295,8 +295,6 @@ skip-if = e10s # Bug ?????? - test directly manipulates content (directly gets e
 [browser_bug1015721.js]
 skip-if = os == 'win' || e10s # Bug 1056146 - FullZoomHelper uses promiseTabLoadEvent() which isn't e10s friendly
 [browser_bug1064280_changeUrlInPinnedTab.js]
-[browser_bug1070778.js]
-skip-if = os == "linux" # Bug 1073339 - Investigate autocomplete test unreliability on Linux
 [browser_canonizeURL.js]
 skip-if = e10s # Bug ?????? - [JavaScript Error: "Error in AboutHome.sendAboutHomeData TypeError: target.messageManager is undefined" {file: "resource:///modules/AboutHome.jsm" line: 208}]
 [browser_contentAreaClick.js]

diff --git a/browser/base/content/test/general/browser_bug1070778.js b/browser/base/content/test/general/browser_bug1070778.js
diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
@@ -125,6 +125,19 @@
 
       <field name="_value">""</field>
 
+      <!--
+        onBeforeValueGet is called by the base-binding's .value getter.
+        It can return an object with a "value" property, to override the
+        return value of the getter.
+      -->
+      <method name="onBeforeValueGet">
+        <body><![CDATA[
+          if (this.hasAttribute("actiontype"))
+            return {value: this._value};
+          return null;
+        ]]></body>
+      </method>
+
       <!--
         onBeforeValueSet is called by the base-binding's .value setter.
         It should return the value that the setter should use.
@@ -715,10 +728,8 @@
         ]]></body>
       </method>
 
-      <property name="textValue">
-        <getter><![CDATA[
-          return this.inputField.value;
-        ]]></getter>
+      <property name="textValue"
+                onget="return this.value;">
         <setter>
           <![CDATA[
           try {

diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
@@ -260,6 +260,11 @@
       <field name="_disableTrim">false</field>
       <property name="value">
         <getter><![CDATA[
+          if (typeof this.onBeforeValueGet == "function") {
+            var result = this.onBeforeValueGet();
+            if (result)
+              return result.value;
+          }
           return this.inputField.value;
         ]]></getter>
         <setter><![CDATA[