Merge m-c to b2ginbound, a=merge
authorWes Kocher <wkocher@mozilla.com>
Mon, 21 Sep 2015 09:53:19 -0700
changeset 263664 7602a86cf4eef02896b5a2ac34608beecbd5c161
parent 263663 6cc2b74f1353cadb30569f066a66e42fd9ae0f44 (current diff)
parent 263585 197af2fb7e29ff8e4b3b6ced723b6172e954e17d (diff)
child 263665 e21098af023dbfac633596d772a4450276b9a786
push id65396
push usercbook@mozilla.com
push dateTue, 22 Sep 2015 10:50:42 +0000
treeherdermozilla-inbound@9a5faeebdcb5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone44.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
Merge m-c to b2ginbound, a=merge
testing/docker/phone-builder/REGISTRY
--- a/.hgtags
+++ b/.hgtags
@@ -115,8 +115,9 @@ 0000000000000000000000000000000000000000
 b297a6727acfd21e757ddd38cd61894812666265 FIREFOX_AURORA_36_BASE
 0000000000000000000000000000000000000000 FIREFOX_AURORA_37_BASE
 2c951493eef5b50b8085ef78ffe0d7902ff3d593 FIREFOX_AURORA_37_BASE
 98086da94ccdc88f6de86774ce3d1fa258dc7c44 FIREFOX_AURORA_38_BASE
 1b6bf6612c0f4d4fee81d18bf18016e692f874e1 FIREFOX_AURORA_39_BASE
 66a95a483d2c77dfc387019336d18093acd6aac2 FIREFOX_AURORA_40_BASE
 312c68b16549de9cea1557f461d5d234bd5e0a7d FIREFOX_AURORA_41_BASE
 7a19194812eb767bee7cdf8fc36ba9a383c1bead FIREFOX_AURORA_42_BASE
+fcef8ded82219c89298b4e376cfbdfba79a1d35a FIREFOX_AURORA_43_BASE
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1201224 - stop unifying test package during mac universal builds needed a CLOBBER
+Merge day clobber
\ No newline at end of file
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -1,16 +1,16 @@
 # 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/.
 
 MOZ_APP_BASENAME=B2G
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=43.0a1
+MOZ_APP_VERSION=44.0a1
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_UA_OS_AGNOSTIC=1
 
 MOZ_B2G_VERSION=2.5.0.0-prerelease
 MOZ_B2G_OS_NAME=Boot2Gecko
 
 MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial
--- a/browser/components/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -988,18 +988,16 @@ body[platform="win"] .share-service-drop
 }
 
 .showing-room-name > .text-chat-entries > .text-chat-scroller > .context-url-view-wrapper {
   padding-top: 0;
 }
 
 .room-context {
   background: #fff;
-  border-top: 2px solid #444;
-  border-bottom: 2px solid #444;
   position: absolute;
   left: 0;
   bottom: 0;
   width: 100%;
   height: 100%;
   font-size: .9em;
   display: flex;
   flex-flow: column nowrap;
@@ -1031,67 +1029,42 @@ body[platform="win"] .share-service-drop
 }
 
 .room-context > .error-display-area.error {
   margin: 1em 0 .5em 0;
   text-align: center;
   text-shadow: 1px 1px 0 rgba(0,0,0,.3);
 }
 
-.room-context > .checkbox-wrapper {
-  margin-bottom: .5em;
-  width: 100%;
-}
-
 .room-context-header {
   color: #333;
   font-size: 1.2rem;
   font-weight: bold;
   margin: 1rem auto;
 }
 
-.room-context-comment {
-  color: #707070;
-}
-
-.room-context-comment {
-  word-wrap: break-word;
-}
-
-:not(input).room-context-url {
-  color: #0095dd;
-  font-style: italic;
-  text-decoration: none;
-  display: block;
-  cursor: pointer;
-}
-
-.room-context-url:hover {
-  text-decoration: underline;
-}
-
 .room-context > form {
   margin-bottom: 1rem;
   padding: .5rem;
   width: 100%;
 }
 
 .room-context > form > textarea,
 .room-context > form > input[type="text"] {
+  border: 1px solid #c3c3c3;
+  border-radius: 4px;
+  box-shadow: none;
+  color: #4a4a4a;
   display: block;
-  width: 100%;
-  outline: none;
-  border-radius: 4px;
+  font-size: 1.1rem;
+  height: 2.6rem;
   margin: 10px 0;
-  border: 1px solid #c3c3c3;
-  height: 2.6rem;
+  outline: none;
   padding: 6px;
-  font-size: 1.1rem;
-  color: #4a4a4a;
-  box-shadow: none;
+  width: 100%;
 }
 
 .room-context > form > textarea {
   font-family: inherit;
   height: 5.2rem;
   resize: none;
 }
 
--- a/browser/components/loop/standalone/content/l10n/en-US/loop.properties
+++ b/browser/components/loop/standalone/content/l10n/en-US/loop.properties
@@ -80,13 +80,13 @@ rooms_read_while_wait_offer=Want somethi
 ## replaced by the brand name.
 standalone_title_with_room_name={{roomName}} — {{clientShortname}}
 status_error=Something went wrong
 
 # Text chat strings
 
 chat_textbox_placeholder=Type here…
 # LOCALIZATION NOTE (context_inroom_label2): this string is followed by the
-# title/URL of the website you are having a conversation about, displayed on a
+# title/domain of the website you are having a conversation about, displayed on a
 # separate line. If this structure doesn't work for your locale, you might want
 # to consider this as a stand-alone title. See example screenshot:
 # https://bug1084991.bugzilla.mozilla.org/attachment.cgi?id=8614721
 context_inroom_label2=Let's Talk About:
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1,1 +1,1 @@
-43.0a1
+44.0a1
--- a/browser/config/version_display.txt
+++ b/browser/config/version_display.txt
@@ -1,1 +1,1 @@
-43.0a1
+44.0a1
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -27,16 +27,21 @@ sign_in_again_use_as_guest_button2=Use {
 
 first_time_experience_button_label=Get Started
 ## LOCALIZATION_NOTE(first_time_experience_subheading): Message inviting the
 ## user to create his or her first conversation.
 first_time_experience_subheading=Join the conversation
 
 invite_header_text=Invite someone to join you.
 invite_header_text2=Invite a friend to join you
+## LOCALIZATION_NOTE(invite_facebook_button, invite_facebook_triggered,
+## invite_contacts_button, invite_contacts_triggered, invite_copy_button,
+## invite_copy_triggered, invite_email_button, invite_email_triggered): These
+## button/triggered pairs are labels under an iconic button that switch to the
+## triggered text when clicked/activated.
 invite_facebook_button=share on Facebook
 invite_facebook_triggered=shared!
 invite_contacts_button=share with contacts
 invite_contacts_triggered=shared!
 invite_copy_button=copy link
 invite_copy_triggered=copied!
 invite_email_button=email link
 invite_email_triggered=emailed!
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -5,9 +5,9 @@
 #    x.x.x.x
 #    x.x.x+
 #
 # Referenced by milestone.py.
 # Hopefully I'll be able to automate replacement of *all*
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-43.0a1
+44.0a1
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -2748,16 +2748,17 @@ public class BrowserApp extends GeckoApp
         // prevents this issue.
         fm.executePendingTransactions();
 
         Fragment f = fm.findFragmentById(R.id.search_container);
 
         // checking if fragment is already present
         if (f != null) {
             fm.beginTransaction().show(f).commitAllowingStateLoss();
+            mBrowserSearch.resetScrollState();
         } else {
             // add fragment if not already present
             fm.beginTransaction().add(R.id.search_container, mBrowserSearch, BROWSER_SEARCH_TAG).commitAllowingStateLoss();
         }
         mBrowserSearch.setUserVisibleHint(true);
 
         // We want to adjust the window size when the keyboard appears to bring the
         // SearchEngineBar above the keyboard. However, adjusting the window size
--- a/mobile/android/base/home/BrowserSearch.java
+++ b/mobile/android/base/home/BrowserSearch.java
@@ -505,16 +505,20 @@ public class BrowserSearch extends HomeF
                 // Great! Return including the rest of the path segment.
                 return uriSubstringUpToMatchedPath(url, hostOffset, hostOffset + searchLength);
             }
         } while (searchCount < MAX_AUTOCOMPLETE_SEARCH && c.moveToNext());
 
         return null;
     }
 
+    public void resetScrollState() {
+        mSearchEngineBar.scrollToPosition(0);
+    }
+
     private void filterSuggestions() {
         if (mSuggestClient == null || !mSuggestionsEnabled) {
             return;
         }
 
         if (mSuggestionLoaderCallbacks == null) {
             mSuggestionLoaderCallbacks = new SuggestionLoaderCallbacks();
         }
--- a/services/sync/moz.build
+++ b/services/sync/moz.build
@@ -41,17 +41,17 @@ EXTRA_JS_MODULES['services-sync'] += [
     'modules/util.js',
 ]
 
 EXTRA_PP_JS_MODULES['services-sync'] += [
     'modules/constants.js',
 ]
 
 # Definitions used by constants.js
-DEFINES['weave_version'] = '1.45.0'
+DEFINES['weave_version'] = '1.46.0'
 DEFINES['weave_id'] = '{340c2bbc-ce74-4362-90b5-7c26312808ef}'
 
 EXTRA_JS_MODULES['services-sync'].engines += [
     'modules/engines/addons.js',
     'modules/engines/bookmarks.js',
     'modules/engines/clients.js',
     'modules/engines/forms.js',
     'modules/engines/history.js',
deleted file mode 100644
--- a/testing/docker/phone-builder/REGISTRY
+++ /dev/null
@@ -1,1 +0,0 @@
-taskclusterprivate
--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -17,17 +17,17 @@ namespace mozilla {
 /**
  * A module implements one or more XPCOM components. This structure is used
  * for both binary and script modules, but the registration members
  * (cids/contractids/categoryentries) are unused for modules which are loaded
  * via a module loader.
  */
 struct Module
 {
-  static const unsigned int kVersion = 43;
+  static const unsigned int kVersion = 44;
 
   struct CIDEntry;
 
   typedef already_AddRefed<nsIFactory> (*GetFactoryProcPtr)(
     const Module& module, const CIDEntry& entry);
 
   typedef nsresult (*ConstructorProcPtr)(nsISupports* aOuter,
                                          const nsIID& aIID,