Bug 1225911 - Properly check if LOCATION_CHANGE_SAME_DOCUMENT is in aFlags. r=dao
authorJared Wein <jwein@mozilla.com>
Wed, 13 Jan 2016 07:51:00 +0100
changeset 279929 8a2d17f7f3d124477a9fdde11991a598cdeca821
parent 279928 070b01683e5d73bc9dbaa1257342425076556b53
child 279930 4be86232c89c4ef3d9d0c1f3b8a6f9c9b6c2b5a4
push id70268
push usercbook@mozilla.com
push dateThu, 14 Jan 2016 09:18:16 +0000
treeherdermozilla-inbound@4be86232c89c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1225911
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1225911 - Properly check if LOCATION_CHANGE_SAME_DOCUMENT is in aFlags. r=dao
browser/base/content/tabbrowser.xml
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -753,17 +753,17 @@
                 // failed URI (particularly for SSL errors). However, don't clear the value
                 // if the error page's URI is about:blank, because that causes complete
                 // loss of urlbar contents for invalid URI errors (see bug 867957).
                 // Another reason to clear the userTypedValue is if this was an anchor
                 // navigation.
                 if (this.mBrowser.userTypedClear > 0 ||
                     ((aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_ERROR_PAGE) &&
                      aLocation.spec != "about:blank") ||
-                     aFlags && Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) {
+                     aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) {
                   this.mBrowser.userTypedValue = null;
                 }
 
                 // If the browser was playing audio, we should remove the playing state.
                 if (this.mTab.hasAttribute("soundplaying") &&
                     (!this.mBrowser.lastURI ||
                      this.mBrowser.lastURI.spec != aLocation.spec)) {
                   this.mTab.removeAttribute("soundplaying");