From 774899a93bd39340b6e2bd527bb0cbb8374c9a7a Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Wed, 13 Aug 2014 19:30:07 +0100
Subject: [PATCH 001/109] Bug 1046200 - Introduce NewTabletUI utility API
 (r=mcomella)

---
 mobile/android/base/NewTabletUI.java | 32 ++++++++++++++++++++++++++++
 mobile/android/base/moz.build        |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 mobile/android/base/NewTabletUI.java

diff --git a/mobile/android/base/NewTabletUI.java b/mobile/android/base/NewTabletUI.java
new file mode 100644
index 000000000000..a468c38d7334
--- /dev/null
+++ b/mobile/android/base/NewTabletUI.java
@@ -0,0 +1,32 @@
+/* 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/. */
+
+package org.mozilla.gecko;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import org.mozilla.gecko.preferences.GeckoPreferences;
+import org.mozilla.gecko.util.HardwareUtils;
+
+public class NewTabletUI {
+    // XXX: Change default value to false before merging to m-c.
+    // This value should be in sync with preferences_display.xml.
+    private static final boolean DEFAULT = true;
+
+    private static Boolean sNewTabletUI;
+
+    public static synchronized boolean isEnabled(Context context) {
+        if (!HardwareUtils.isTablet()) {
+            return false;
+        }
+
+        if (sNewTabletUI == null) {
+            final SharedPreferences prefs = GeckoSharedPrefs.forApp(context);
+            sNewTabletUI = prefs.getBoolean(GeckoPreferences.PREFS_NEW_TABLET_UI, DEFAULT);
+        }
+
+        return sNewTabletUI;
+    }
+}
\ No newline at end of file
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 8fc14bdcfd44..b77975af6d5a 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -328,6 +328,7 @@ gbjar.sources += [
     'menu/MenuPanel.java',
     'menu/MenuPopup.java',
     'MotionEventInterceptor.java',
+    'NewTabletUI.java',
     'NotificationClient.java',
     'NotificationHandler.java',
     'NotificationHelper.java',

From 92bc904ee166c900da1fa55e9da826c191d0b189 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Thu, 14 Aug 2014 14:51:30 +0100
Subject: [PATCH 002/109] Bug 1053252 - Change package name for larch so it can
 be installed beside Nightly (r=margaret)

---
 mobile/android/branding/nightly/configure.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/android/branding/nightly/configure.sh b/mobile/android/branding/nightly/configure.sh
index 95f2a36158ce..2da058e9382b 100644
--- a/mobile/android/branding/nightly/configure.sh
+++ b/mobile/android/branding/nightly/configure.sh
@@ -2,6 +2,7 @@
 # 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_DISPLAYNAME=Nightly
+ANDROID_PACKAGE_NAME=org.mozilla.fennec_larch
+MOZ_APP_DISPLAYNAME=Larch Nightly
 MOZ_UPDATER=1
 MOZ_ANDROID_ANR_REPORTER=1

From f40a6b4462efa9ea5985ab70f8b71a5f238793ea Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Thu, 14 Aug 2014 15:15:57 +0100
Subject: [PATCH 003/109] Bug 1046200 - Define missing pref key constant in
 GeckoPreferences (r=mcomella)

---
 mobile/android/base/preferences/GeckoPreferences.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java
index 449950366a90..53b983229971 100644
--- a/mobile/android/base/preferences/GeckoPreferences.java
+++ b/mobile/android/base/preferences/GeckoPreferences.java
@@ -123,6 +123,7 @@ OnSharedPreferenceChangeListener
 
     public static final String PREFS_RESTORE_SESSION = NON_PREF_PREFIX + "restoreSession3";
     public static final String PREFS_SUGGESTED_SITES = NON_PREF_PREFIX + "home_suggested_sites";
+    public static final String PREFS_NEW_TABLET_UI = NON_PREF_PREFIX + "new_tablet_ui";
 
     // These values are chosen to be distinct from other Activity constants.
     private static final int REQUEST_CODE_PREF_SCREEN = 5;

From 9c95f917e738eea3818b753c3e6bb63692e67b6a Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Fri, 15 Aug 2014 10:50:42 +0100
Subject: [PATCH 004/109] Bug 1047561 - Add UI to enable/disable the new tablet
 UI (r=mcomella)

---
 mobile/android/base/preferences/GeckoPreferences.java     | 8 ++++++++
 mobile/android/base/resources/xml/preferences_display.xml | 6 ++++++
 mobile/android/base/tests/StringHelper.java               | 1 +
 mobile/android/base/tests/testSettingsMenuItems.java      | 4 ++++
 4 files changed, 19 insertions(+)

diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java
index 53b983229971..2a4e141c1f3d 100644
--- a/mobile/android/base/preferences/GeckoPreferences.java
+++ b/mobile/android/base/preferences/GeckoPreferences.java
@@ -663,6 +663,12 @@ OnSharedPreferenceChangeListener
                     preferences.removePreference(pref);
                     i--;
                     continue;
+                } else if (AppConstants.RELEASE_BUILD &&
+                           PREFS_NEW_TABLET_UI.equals(key)) {
+                    // Remove toggle for new tablet UI on release builds.
+                    preferences.removePreference(pref);
+                    i--;
+                    continue;
                 } else if (!AppConstants.MOZ_TELEMETRY_REPORTING &&
                            PREFS_TELEMETRY_ENABLED.equals(key)) {
                     preferences.removePreference(pref);
@@ -977,6 +983,8 @@ OnSharedPreferenceChangeListener
                              sharedPreferences.getString(key, null));
         } else if (PREFS_SUGGESTED_SITES.equals(key)) {
             refreshSuggestedSites();
+        } else if (PREFS_NEW_TABLET_UI.equals(key)) {
+            Toast.makeText(this, "Restart the browser for the changes to take effect", Toast.LENGTH_SHORT).show();
         }
     }
 
diff --git a/mobile/android/base/resources/xml/preferences_display.xml b/mobile/android/base/resources/xml/preferences_display.xml
index 50f6f8cddbc4..88f6fd21d871 100644
--- a/mobile/android/base/resources/xml/preferences_display.xml
+++ b/mobile/android/base/resources/xml/preferences_display.xml
@@ -25,6 +25,12 @@
                         android:title="@string/pref_scroll_title_bar2"
                         android:summary="@string/pref_scroll_title_bar_summary" />
 
+    <!-- Title string is hardcoded here because it's not meant to be translated
+         because this is just a temporary development toggle. -->
+    <CheckBoxPreference android:key="android.not_a_preference.new_tablet_ui"
+                        android:title="Enable new tablet UI"
+                        android:defaultValue="true" />
+
     <PreferenceCategory android:title="@string/pref_category_advanced">
 
         <CheckBoxPreference
diff --git a/mobile/android/base/tests/StringHelper.java b/mobile/android/base/tests/StringHelper.java
index 7fb664d74f2a..c69548d2f6d1 100644
--- a/mobile/android/base/tests/StringHelper.java
+++ b/mobile/android/base/tests/StringHelper.java
@@ -112,6 +112,7 @@ public class StringHelper {
     public static final String TEXT_SIZE_LABEL = "Text size";
     public static final String TITLE_BAR_LABEL = "Title bar";
     public static final String SCROLL_TITLE_BAR_LABEL="Full-screen browsing";
+    public static final String NEW_TABLET_UI="Enable new tablet UI";
     public static final String TEXT_REFLOW_LABEL = "Text reflow";
     public static final String CHARACTER_ENCODING_LABEL = "Character encoding";
     public static final String PLUGINS_LABEL = "Plugins";
diff --git a/mobile/android/base/tests/testSettingsMenuItems.java b/mobile/android/base/tests/testSettingsMenuItems.java
index 14c897ec98bb..5e8ed554e95e 100644
--- a/mobile/android/base/tests/testSettingsMenuItems.java
+++ b/mobile/android/base/tests/testSettingsMenuItems.java
@@ -159,6 +159,10 @@ public class testSettingsMenuItems extends PixelTest {
             String[] textReflowUi = { StringHelper.TEXT_REFLOW_LABEL };
             settingsMap.get(PATH_DISPLAY).add(textReflowUi);
 
+            // New tablet UI can only be enabled in non-release build
+            String[] newTabletUi = { StringHelper.NEW_TABLET_UI };
+            settingsMap.get(PATH_DISPLAY).add(newTabletUi);
+
             // Anonymous cell tower/wifi collection - only built if *not* release build
             String[] networkReportingUi = { "Mozilla Location Service", "Receives Wi-Fi and cellular location data when running in the background and shares it with Mozilla to improve our geolocation service" };
             settingsMap.get(PATH_MOZILLA).add(networkReportingUi);

From d0bda8638665320530fac35787a702dc9930028f Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 27 Aug 2014 15:33:58 -0700
Subject: [PATCH 005/109] Bug 1046203 - Part 0: Add basic new_tablet
 BrowserToolbar resources. r=lucasr

---
 .../drawable-hdpi/new_tablet_tabs_count.png   | Bin 0 -> 324 bytes
 .../new_tablet_tabs_count_foreground.png      | Bin 0 -> 350 bytes
 .../drawable-mdpi/new_tablet_tabs_count.png   | Bin 0 -> 270 bytes
 .../new_tablet_tabs_count_foreground.png      | Bin 0 -> 285 bytes
 .../drawable-xhdpi/new_tablet_tabs_count.png  | Bin 0 -> 304 bytes
 .../new_tablet_tabs_count_foreground.png      | Bin 0 -> 351 bytes
 .../new_tablet_browser_toolbar.xml            | 113 ++++++++++++++++++
 .../layout/new_tablet_tabs_counter.xml        |  16 +++
 .../android/base/resources/values/styles.xml  |   4 +
 9 files changed, 133 insertions(+)
 create mode 100644 mobile/android/base/resources/drawable-hdpi/new_tablet_tabs_count.png
 create mode 100644 mobile/android/base/resources/drawable-hdpi/new_tablet_tabs_count_foreground.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/new_tablet_tabs_count.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/new_tablet_tabs_count_foreground.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi/new_tablet_tabs_count.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi/new_tablet_tabs_count_foreground.png
 create mode 100644 mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
 create mode 100644 mobile/android/base/resources/layout/new_tablet_tabs_counter.xml

diff --git a/mobile/android/base/resources/drawable-hdpi/new_tablet_tabs_count.png b/mobile/android/base/resources/drawable-hdpi/new_tablet_tabs_count.png
new file mode 100644
index 0000000000000000000000000000000000000000..9de6aa137e34eb795c056fadf82357f332582a49
GIT binary patch
literal 324
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB*pj^6T^Rm@;DWu&Cj&(|3p^r=
z85p>QL70(Y)*K0-AbW|YuPggK4i<4yqrE>lIe<bJJzX3_A`ZX3zR~M&fJnnb{jGeZ
zA~ARGT5n@_mp>H#Np((aX^F-A2djdw_pt_ERMlfOHCyOrVV}aGGX1^U&Vs`;x;yOU
zxBpCPuoSa6nBwl<Y?^2MSy3tF*?R{;!=tLxDh^klZ@>J2HGJmJ8&BI_Ui&HYyy945
z^_Sc><2Nk3GSW*LtnctMWNmm^_0jCb7S^*ypPzkhe)H*Fd)6n}g8LHoYZufee~Gxn
zsuj@46|#Uy^u_+BxZ`Y9S=-kyW{gcXz3{AV#{8Wf7F`|5p`oEyEq*b4+pG0?n~JR$
P&~pr)u6{1-oD!M<8+(EI

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-hdpi/new_tablet_tabs_count_foreground.png b/mobile/android/base/resources/drawable-hdpi/new_tablet_tabs_count_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5e9273cbb90b2468186cc6c8c3c00043b003dc0
GIT binary patch
literal 350
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB*pj^6T^Rm@;DWu&Cj&(|3p^r=
z85p>QL70(Y)*K0-AbW|YuPggK4i<4yhElzV4xrF$PZ!6Kh{JEM@AYDK6k)rt`R0%2
ztGBp63)wY9aO_*!`mK^(S9gtW3wPN{A#UNG$l0QcdM9s~*zx(GS@q4`>1ng9rvO2X
zuh+})-{CXmV;{)m^0%oT+tJ<e`~A_F3!=|#^L$#Rw(sccIGUa~;by{x&z@T&9`G!`
z{paGY%EM3f8mC#@R26vhR?34>Gyse))U#}jHrX<}VcE{d@7NZ<DG|QF+!oEiyZc^t
zvs=Z>%IT}tJ<s@>I=48#tK<5z%y|VpZ0<MSFWXx>U&`3#k($!HU@x`Fp8rfUSj!s@
m&uRTLq5O<e(z++>pEK)}8d>LDTJs#}Z3a(QKbLh*2~7aj)Q>m-

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/new_tablet_tabs_count.png b/mobile/android/base/resources/drawable-mdpi/new_tablet_tabs_count.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b02a5bad770b6faf51540ba4cc0687985c7617e
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYYs>cdx@v7EBieT7I87=<6Kc6fkLxAT^vI^j=!C{k@t{+fNQ+WlrAgg
zB}rYYC6%jFxTY;gZk$rj;5BW*LKaOy6SqxD9Zm%qA6BpV{Bz#ApKSdz4X1D1esi;<
zP+AyMbb@VS9$QRf^ODmm4tQ%VV2p{FuVBgCyX5xjw$OrgjWQXHm)R%ry|^FS*2Mcj
z<!xt&^qOjQqrO(pCKZn+dG0<3!DxZDyXVwjZmRjbS@qu(_5&Ky<(KPjGy$E-;OXk;
Jvd$@?2>{4wU={!X

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/new_tablet_tabs_count_foreground.png b/mobile/android/base/resources/drawable-mdpi/new_tablet_tabs_count_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..51248bea245fe37c749bd2657f601d304061707c
GIT binary patch
literal 285
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYYs>cdx@v7EBieT7I9Ht?)fUFK%rHhE{-7{$KOuf$a}~@z*U}a4a3rC
zm1POS(-M2nIGofG@z}3ox~Pk}S6P+ynA%2`N&8EBpYHzdzv<7y7wV~N=dP_6+_8nd
z%wf90Z@xLIrq`lWSQ*t9c$(zzdAWE=cKruG-48xG&&}<4I*V5`Z?j}vyi@Iaw@w4o
zkK%^e2G@@==*8z{)Vz0h;I(Psif|2kTKy_Pj)y6kH>V+W$#1b8U+?c(VzbiBRB-Ya
ZrmX+^l38a|lYy>g@O1TaS?83{1OTV$WBULA

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi/new_tablet_tabs_count.png b/mobile/android/base/resources/drawable-xhdpi/new_tablet_tabs_count.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c58435e54e677e11dca78d63cd0024020bb1ee6
GIT binary patch
literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQgGF3aZMpK@QlQXYPZ!6KjC*gd?B#88ka75^Zm2db
zDsTt0^c>dL78A60FtoOI{%5^&u#4AcjZQC%RLCLK_od}e4*l)pH~78k=!MoPm!wuS
za%nVPm4A1i>3YYGKOz%?ZZWba7+-XpcTB0Paq|44&kVmea(B<$S@q~FbIx(Sm~Ur7
z=YEvTP<mu|ynn}g&M9+0=9t^F{P=PEOyy_ihBZP84h;;9Oe`D%P{y9>XM7pO>?V=S
nN{`rN8msfxPo4<`sn@vgGAkBFRA$WrdW6B#)z4*}Q$iB}4B~LC

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi/new_tablet_tabs_count_foreground.png b/mobile/android/base/resources/drawable-xhdpi/new_tablet_tabs_count_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0c0d2ff429ea8d8707ca5744ed404fb6e848d8d
GIT binary patch
literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQgGF4#!0Sz9Dp2T+r;B4q#=W;U7WN%-5OI5W*y$2)
z+v*L<*BOO)nGS9ih-<svnEt|QLh|ehB?2nEY>aG7i+mG}PS)q#e))IOwU_`e&81Va
zVwS&SKDU!~1Is4<^I?pv6PT^v|NVK@_wKIcvu^(4KFs{3f$;;o&)FP#CkxyAUoJm*
zpmS(?(t%T!*YlYLw3*X1nHkhpGPkW{-gJeLL!p6z35l3sw4lo(|0>&p4i1f53{M0Z
zE2SG`1KcF`?b-i(;jPnm1r8lO!*_t=$KOXEq~HJj_|s|m%g*nvuVo~PZ_h}T|B=Z3
jK>o(Q==Iu5h2C>jcxX-j;<UU2=x+v3S3j3^P6<r_mOh5q

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
new file mode 100644
index 000000000000..b3fec70e9e24
--- /dev/null
+++ b/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+    <!-- In editing mode, the toolbar shrinks by changing to
+         dynamically constructed LayoutParams. -->
+    <ImageView android:id="@+id/url_bar_entry"
+               android:layout_width="match_parent"
+               android:layout_height="match_parent"
+               android:layout_toLeftOf="@id/menu_items"
+               android:layout_marginLeft="20dp"
+               android:layout_marginTop="7dp"
+               android:layout_marginBottom="7dp"
+               android:duplicateParentState="true"
+               android:clickable="false"
+               android:focusable="false"
+               android:background="@drawable/url_bar_entry"/>
+
+    <org.mozilla.gecko.toolbar.ForwardButton style="@style/UrlBar.ImageButton.Forward"
+                                             android:id="@+id/forward"
+                                             android:layout_marginLeft="-15dp"
+                                             android:layout_alignLeft="@id/url_bar_entry"
+/>
+
+    <org.mozilla.gecko.toolbar.BackButton android:id="@+id/back"
+                                          style="@style/UrlBar.ImageButton"
+                                          android:layout_width="50dip"
+                                          android:layout_height="50dip"
+                                          android:layout_marginLeft="-15dp"
+                                          android:layout_alignLeft="@id/url_bar_entry"
+                                          android:layout_centerVertical="true"
+                                          android:padding="13dp"
+                                          android:src="@drawable/ic_menu_back"
+                                          android:contentDescription="@string/back"
+                                          android:background="@drawable/url_bar_nav_button"/>
+
+    <org.mozilla.gecko.toolbar.ToolbarEditLayout android:id="@+id/edit_layout"
+                  style="@style/UrlBar.Button"
+                  android:paddingLeft="12dp"
+                  android:paddingRight="12dp"
+                  android:visibility="gone"
+                  android:orientation="horizontal"
+                  android:layout_toRightOf="@id/back"
+                  android:layout_toLeftOf="@id/menu_items"/>
+
+    <org.mozilla.gecko.toolbar.ToolbarDisplayLayout android:id="@+id/display_layout"
+                  style="@style/UrlBar.Button.Container"
+                  android:layout_toRightOf="@id/back"
+                  android:layout_toLeftOf="@id/menu_items"/>
+
+    <LinearLayout android:id="@+id/menu_items"
+                  android:layout_width="wrap_content"
+                  android:layout_height="match_parent"
+                  android:layout_marginLeft="3dp"
+                  android:orientation="horizontal"
+                  android:layout_toLeftOf="@id/tabs"
+                  android:layout_alignWithParentIfMissing="true"/>
+
+    <org.mozilla.gecko.widget.ThemedImageButton android:id="@+id/tabs"
+                                                style="@style/UrlBar.ImageButton"
+                                                android:layout_width="56dip"
+                                                android:layout_toLeftOf="@id/menu"
+                                                android:background="@drawable/action_bar_button"/>
+
+    <!-- The TextSwitcher should be shifted 28dp on the right, to avoid
+         the curve. On a 56dp space, centering 24dp image will leave
+         16dp on all sides. However this image has a perception of
+         2 layers. Hence to center this, an additional 4dp is added to the right.
+         The margins will be 12dp on left, 48dp on right, instead of ideal 16dp
+         and 44dp. -->
+    <org.mozilla.gecko.toolbar.TabCounter android:id="@+id/tabs_counter"
+                        style="@style/UrlBar.ImageButton.TabCount.NewTablet"
+                        android:layout_width="24dip"
+                        android:layout_height="24dip"
+                        android:layout_margin="16dp"
+                        android:layout_centerVertical="true"
+                        android:layout_alignLeft="@id/tabs"
+                        android:layout_alignRight="@id/tabs"
+                        gecko:layout="@layout/new_tablet_tabs_counter"/>
+
+    <org.mozilla.gecko.widget.ThemedImageButton android:id="@+id/menu"
+                                                style="@style/UrlBar.ImageButton"
+                                                android:layout_width="56dip"
+                                                android:layout_alignParentRight="true"
+                                                android:contentDescription="@string/menu"
+                                                android:background="@drawable/action_bar_button"
+                                                android:visibility="gone"/>
+
+    <org.mozilla.gecko.widget.ThemedImageView android:id="@+id/menu_icon"
+                                              style="@style/UrlBar.ImageButton"
+                                              android:layout_alignLeft="@id/menu"
+                                              android:layout_alignRight="@id/menu"
+                                              android:gravity="center_vertical"
+                                              android:src="@drawable/menu_level"
+                                              android:visibility="gone"/>
+
+    <!-- We draw after the menu items so when they are hidden, the cancel button,
+         which is thus drawn on top, may be pressed. -->
+    <org.mozilla.gecko.widget.ThemedImageView
+            android:id="@+id/edit_cancel"
+            style="@style/UrlBar.ImageButton.Icon"
+            android:layout_alignParentRight="true"
+            android:src="@drawable/close_edit_mode_selector"
+            android:paddingLeft="2dp"
+            android:paddingRight="2dp"
+            android:contentDescription="@string/edit_mode_cancel"
+            android:visibility="gone"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/new_tablet_tabs_counter.xml b/mobile/android/base/resources/layout/new_tablet_tabs_counter.xml
new file mode 100644
index 000000000000..bb5983b4322c
--- /dev/null
+++ b/mobile/android/base/resources/layout/new_tablet_tabs_counter.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<org.mozilla.gecko.widget.ThemedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+                                         android:layout_width="24dip"
+                                         android:layout_height="24dip"
+                                         android:paddingTop="2dip"
+                                         android:paddingLeft="4dip"
+                                         android:background="@drawable/new_tablet_tabs_count_foreground"
+                                         android:textAppearance="@style/TextAppearance.Micro"
+                                         android:textColor="#eeeeee"
+                                         android:textStyle="bold"
+                                         android:duplicateParentState="true"
+                                         android:gravity="center"/>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index a896fcc07b3a..0a68ab10f30f 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -417,6 +417,10 @@
         <item name="android:clipToPadding">false</item>
     </style>
 
+    <style name="UrlBar.ImageButton.TabCount.NewTablet">
+        <item name="android:background">@drawable/new_tablet_tabs_count</item>
+    </style>
+
     <!-- URL bar -->
     <style name="UrlBar">
         <item name="android:layout_width">match_parent</item>

From 61808056252f7c613dec55c3ca7128b85089e26a Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 27 Aug 2014 15:34:02 -0700
Subject: [PATCH 006/109] Bug 1046203 - Part 1: Implement
 LayoutInflater.Factory in BrowserApp to inflate device specific
 BrowserToolbars. r=lucasr

---
 mobile/android/base/BrowserApp.java             | 16 +++++++++++++++-
 mobile/android/base/toolbar/BrowserToolbar.java |  6 +++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 0009bc784840..c9f4b849cac3 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -103,9 +103,11 @@ import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
+import android.util.AttributeSet;
 import android.util.Log;
 import android.view.InputDevice;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -131,7 +133,8 @@ public class BrowserApp extends GeckoApp
                                    BrowserSearch.OnEditSuggestionListener,
                                    HomePager.OnNewTabsListener,
                                    OnUrlOpenListener,
-                                   ActionModeCompat.Presenter {
+                                   ActionModeCompat.Presenter,
+                                   LayoutInflater.Factory {
     private static final String LOGTAG = "GeckoBrowserApp";
 
     private static final int TABS_ANIMATION_DURATION = 450;
@@ -228,6 +231,17 @@ public class BrowserApp extends GeckoApp
 
     private DynamicToolbar mDynamicToolbar = new DynamicToolbar();
 
+    @Override
+    public View onCreateView(final String name, final Context context, final AttributeSet attrs) {
+        final View view;
+        if (BrowserToolbar.class.getName().equals(name)) {
+            view = BrowserToolbar.create(context, attrs);
+        } else {
+            view = super.onCreateView(name, context, attrs);
+        }
+        return view;
+    }
+
     @Override
     public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
         if (tab == null) {
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index 39b91b433e4f..8a1279feee81 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -176,11 +176,11 @@ public class BrowserToolbar extends ThemedRelativeLayout
     private final LightweightTheme theme;
     private final ToolbarPrefs prefs;
 
-    public BrowserToolbar(Context context) {
-        this(context, null);
+    public static View create(final Context context, final AttributeSet attrs) {
+        return new BrowserToolbar(context, attrs);
     }
 
-    public BrowserToolbar(Context context, AttributeSet attrs) {
+    private BrowserToolbar(final Context context, final AttributeSet attrs) {
         super(context, attrs);
         setWillNotDraw(false);
 

From b8307fe4bfab2b98cf68786d4912232b949057b8 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 27 Aug 2014 15:34:03 -0700
Subject: [PATCH 007/109] Bug 1046203 - Part 2: Add boilerplate BrowserToolbar
 subclasses and phone implementation. r=lucasr

---
 mobile/android/base/moz.build                 |   6 +
 .../android/base/toolbar/BrowserToolbar.java  | 330 ++++--------------
 .../base/toolbar/BrowserToolbarNewTablet.java |  38 ++
 .../base/toolbar/BrowserToolbarPhone.java     | 135 +++++++
 .../base/toolbar/BrowserToolbarPhoneBase.java |  80 +++++
 .../base/toolbar/BrowserToolbarPreHC.java     |  71 ++++
 .../base/toolbar/BrowserToolbarTablet.java    |  37 ++
 .../toolbar/BrowserToolbarTabletBase.java     |  21 ++
 8 files changed, 454 insertions(+), 264 deletions(-)
 create mode 100644 mobile/android/base/toolbar/BrowserToolbarNewTablet.java
 create mode 100644 mobile/android/base/toolbar/BrowserToolbarPhone.java
 create mode 100644 mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
 create mode 100644 mobile/android/base/toolbar/BrowserToolbarPreHC.java
 create mode 100644 mobile/android/base/toolbar/BrowserToolbarTablet.java
 create mode 100644 mobile/android/base/toolbar/BrowserToolbarTabletBase.java

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index f15bebb36b71..577a80491908 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -403,6 +403,12 @@ gbjar.sources += [
     'toolbar/AutocompleteHandler.java',
     'toolbar/BackButton.java',
     'toolbar/BrowserToolbar.java',
+    'toolbar/BrowserToolbarNewTablet.java',
+    'toolbar/BrowserToolbarPhone.java',
+    'toolbar/BrowserToolbarPhoneBase.java',
+    'toolbar/BrowserToolbarPreHC.java',
+    'toolbar/BrowserToolbarTablet.java',
+    'toolbar/BrowserToolbarTabletBase.java',
     'toolbar/CanvasDelegate.java',
     'toolbar/ForwardButton.java',
     'toolbar/PageActionLayout.java',
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index 8a1279feee81..fdf6d83c2e9c 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -17,6 +17,7 @@ import org.mozilla.gecko.EventDispatcher;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.LightweightTheme;
+import org.mozilla.gecko.NewTabletUI;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
@@ -59,7 +60,6 @@ import android.view.animation.Interpolator;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
@@ -81,10 +81,10 @@ import android.widget.RelativeLayout;
 * as a set of listeners to allow {@code BrowserToolbar} users to react
 * to state changes accordingly.
 */
-public class BrowserToolbar extends ThemedRelativeLayout
-                            implements Tabs.OnTabsChangedListener,
-                                       GeckoMenu.ActionItemBarPresenter,
-                                       GeckoEventListener {
+public abstract class BrowserToolbar extends ThemedRelativeLayout
+                                     implements Tabs.OnTabsChangedListener,
+                                                GeckoMenu.ActionItemBarPresenter,
+                                                GeckoEventListener {
     private static final String LOGTAG = "GeckoToolbar";
 
     public interface OnActivateListener {
@@ -111,7 +111,7 @@ public class BrowserToolbar extends ThemedRelativeLayout
         public void onStopEditing();
     }
 
-    private enum UIMode {
+    protected enum UIMode {
         EDIT,
         DISPLAY
     }
@@ -121,51 +121,44 @@ public class BrowserToolbar extends ThemedRelativeLayout
         HIDE
     }
 
-    private ToolbarDisplayLayout urlDisplayLayout;
-    private ToolbarEditLayout urlEditLayout;
-    private View urlBarEntry;
+    private final boolean isNewTablet;
+
+    protected final ToolbarDisplayLayout urlDisplayLayout;
+    protected final ToolbarEditLayout urlEditLayout;
+    protected final View urlBarEntry;
     private RelativeLayout.LayoutParams urlBarEntryDefaultLayoutParams;
     private RelativeLayout.LayoutParams urlBarEntryShrunkenLayoutParams;
-    private ImageView urlBarTranslatingEdge;
     private boolean isSwitchingTabs;
-    private ThemedImageButton tabsButton;
+    protected final ThemedImageButton tabsButton;
     private ImageButton backButton;
     private ImageButton forwardButton;
 
     private ToolbarProgressView progressBar;
-    private TabCounter tabsCounter;
-    private ThemedImageButton menuButton;
-    private ThemedImageView menuIcon;
-    private LinearLayout actionItemBar;
+    protected final TabCounter tabsCounter;
+    protected final ThemedImageButton menuButton;
+    protected final ThemedImageView menuIcon;
+    protected final LinearLayout actionItemBar;
     private MenuPopup menuPopup;
-    private List<View> focusOrder;
+    protected final List<View> focusOrder;
 
-    private final ThemedImageView editCancel;
+    protected final ThemedImageView editCancel;
 
     private List<View> tabletDisplayModeViews;
     private boolean hidForwardButtonOnStartEditing;
 
-    private boolean shouldShrinkURLBar;
-
     private OnActivateListener activateListener;
     private OnFocusChangeListener focusChangeListener;
     private OnStartEditingListener startEditingListener;
     private OnStopEditingListener stopEditingListener;
-    private final PropertyAnimator.PropertyAnimationListener showEditingPhoneAnimationListener;
-    private final PropertyAnimator.PropertyAnimationListener stopEditingPhoneAnimationListener;
 
     private final BrowserApp activity;
     private boolean hasSoftMenuButton;
 
-    private UIMode uiMode;
-    private boolean isAnimatingEntry;
+    protected UIMode uiMode;
 
     private int urlBarViewOffset;
     private int defaultForwardMargin;
 
-    private Path roundCornerShape;
-    private Paint roundCornerPaint;
-
     private final Paint shadowPaint;
     private final int shadowSize;
 
@@ -176,21 +169,42 @@ public class BrowserToolbar extends ThemedRelativeLayout
     private final LightweightTheme theme;
     private final ToolbarPrefs prefs;
 
-    public static View create(final Context context, final AttributeSet attrs) {
-        return new BrowserToolbar(context, attrs);
+    public abstract boolean isAnimating();
+
+    protected abstract void triggerStartEditingTransition(PropertyAnimator animator);
+    protected abstract void triggerStopEditingTransition();
+
+    public static BrowserToolbar create(final Context context, final AttributeSet attrs) {
+        final BrowserToolbar toolbar;
+        if (NewTabletUI.isEnabled(context)) {
+            toolbar = new BrowserToolbarNewTablet(context, attrs);
+        } else if (HardwareUtils.isTablet()) {
+            toolbar = new BrowserToolbarTablet(context, attrs);
+        } else if (Versions.preHC) {
+            toolbar = new BrowserToolbarPreHC(context, attrs);
+        } else {
+            toolbar = new BrowserToolbarPhone(context, attrs);
+        }
+        return toolbar;
     }
 
-    private BrowserToolbar(final Context context, final AttributeSet attrs) {
+    protected BrowserToolbar(final Context context, final AttributeSet attrs) {
         super(context, attrs);
         setWillNotDraw(false);
 
+        isNewTablet = NewTabletUI.isEnabled(context);
         theme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();
 
         // BrowserToolbar is attached to BrowserApp only.
         activity = (BrowserApp) context;
 
         // Inflate the content.
-        LayoutInflater.from(context).inflate(R.layout.browser_toolbar, this);
+        // TODO: Remove the branch when new tablet becomes old tablet.
+        if (!isNewTablet) {
+            LayoutInflater.from(context).inflate(R.layout.browser_toolbar, this);
+        } else {
+            LayoutInflater.from(context).inflate(R.layout.new_tablet_browser_toolbar, this);
+        }
 
         Tabs.registerOnTabsChangedListener(this);
         isSwitchingTabs = true;
@@ -219,12 +233,6 @@ public class BrowserToolbar extends ThemedRelativeLayout
             urlBarEntryShrunkenLayoutParams.leftMargin = 0;
         }
 
-        // This will clip the translating edge's image at 60% of its width
-        urlBarTranslatingEdge = (ImageView) findViewById(R.id.url_bar_translating_edge);
-        if (urlBarTranslatingEdge != null) {
-            urlBarTranslatingEdge.getDrawable().setLevel(6000);
-        }
-
         tabsButton = (ThemedImageButton) findViewById(R.id.tabs);
         tabsCounter = (TabCounter) findViewById(R.id.tabs_counter);
         if (Versions.feature11Plus) {
@@ -243,30 +251,12 @@ public class BrowserToolbar extends ThemedRelativeLayout
 
         editCancel = (ThemedImageView) findViewById(R.id.edit_cancel);
 
-        // We use different layouts on phones and tablets, so adjust the focus
-        // order appropriately.
+        // The focusOrder List should be filled by sub-classes.
         focusOrder = new ArrayList<View>();
         if (HardwareUtils.isTablet()) {
             focusOrder.addAll(Arrays.asList(tabsButton, backButton, forwardButton, this));
             focusOrder.addAll(urlDisplayLayout.getFocusOrder());
             focusOrder.addAll(Arrays.asList(actionItemBar, menuButton));
-        } else {
-            focusOrder.add(this);
-            focusOrder.addAll(urlDisplayLayout.getFocusOrder());
-            focusOrder.addAll(Arrays.asList(tabsButton, menuButton));
-        }
-
-        if (!HardwareUtils.isTablet()) {
-            roundCornerShape = new Path();
-            roundCornerShape.moveTo(0, 0);
-            roundCornerShape.lineTo(30, 0);
-            roundCornerShape.cubicTo(0, 0, 0, 0, 0, 30);
-            roundCornerShape.lineTo(0, 0);
-
-            roundCornerPaint = new Paint();
-            roundCornerPaint.setAntiAlias(true);
-            roundCornerPaint.setColor(res.getColor(R.color.background_tabs));
-            roundCornerPaint.setStrokeWidth(0.0f);
         }
 
         shadowSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_shadow_size);
@@ -277,41 +267,6 @@ public class BrowserToolbar extends ThemedRelativeLayout
 
         setUIMode(UIMode.DISPLAY);
 
-        // Create these listeners here, once, to avoid constructing new listeners
-        // each time they are set on an animator (i.e. each time the url bar is clicked).
-        showEditingPhoneAnimationListener = new PropertyAnimator.PropertyAnimationListener() {
-            @Override
-            public void onPropertyAnimationStart() { /* Do nothing */ }
-
-            @Override
-            public void onPropertyAnimationEnd() {
-                isAnimatingEntry = false;
-            }
-        };
-
-        stopEditingPhoneAnimationListener = new PropertyAnimator.PropertyAnimationListener() {
-            @Override
-            public void onPropertyAnimationStart() { /* Do nothing */ }
-
-            @Override
-            public void onPropertyAnimationEnd() {
-                urlBarTranslatingEdge.setVisibility(View.INVISIBLE);
-                if (shouldShrinkURLBar) {
-                    urlBarEntry.setLayoutParams(urlBarEntryDefaultLayoutParams);
-                }
-
-                PropertyAnimator buttonsAnimator = new PropertyAnimator(300);
-                urlDisplayLayout.prepareStopEditingAnimation(buttonsAnimator);
-                buttonsAnimator.start();
-
-                isAnimatingEntry = false;
-
-                // Trigger animation to update the tabs counter once the
-                // tabs button is back on screen.
-                updateTabCountAndAnimate(Tabs.getInstance().getDisplayCount());
-            }
-        };
-
         prefs = new ToolbarPrefs();
         urlDisplayLayout.setToolbarPrefs(prefs);
         urlEditLayout.setToolbarPrefs(prefs);
@@ -479,7 +434,7 @@ public class BrowserToolbar extends ThemedRelativeLayout
             public void onClick(View v) {
                 // If we exit editing mode during the animation,
                 // we're put into an inconsistent state (bug 1017276).
-                if (!isAnimatingEntry) {
+                if (!isAnimating()) {
                     Telemetry.sendUIEvent(TelemetryContract.Event.CANCEL,
                                           TelemetryContract.Method.ACTIONBAR,
                                           getResources().getResourceEntryName(editCancel.getId()));
@@ -512,10 +467,6 @@ public class BrowserToolbar extends ThemedRelativeLayout
     public void draw(Canvas canvas) {
         super.draw(canvas);
 
-        if (!HardwareUtils.isTablet() && uiMode == UIMode.DISPLAY) {
-            canvas.drawPath(roundCornerShape, roundCornerPaint);
-        }
-
         final int height = getHeight();
         canvas.drawRect(0, height - shadowSize, getWidth(), height, shadowPaint);
     }
@@ -531,7 +482,7 @@ public class BrowserToolbar extends ThemedRelativeLayout
     public boolean onBackPressed() {
         // If we exit editing mode during the animation,
         // we're put into an inconsistent state (bug 1017276).
-        if (isEditing() && !isAnimatingEntry) {
+        if (isEditing() && !isAnimating()) {
             Telemetry.sendUIEvent(TelemetryContract.Event.CANCEL,
                                   TelemetryContract.Method.BACK);
             cancelEdit();
@@ -701,22 +652,6 @@ public class BrowserToolbar extends ThemedRelativeLayout
         menuButton.setNextFocusDownId(nextId);
     }
 
-    /**
-     * Returns the number of pixels the url bar translating edge
-     * needs to translate to the right to enter its editing mode state.
-     * A negative value means the edge must translate to the left.
-     */
-    private int getUrlBarEntryTranslation() {
-        // Find the distance from the right-edge of the url bar (where we're translating from) to
-        // the left-edge of the cancel button (where we're translating to; note that the cancel
-        // button must be laid out, i.e. not View.GONE).
-        return editCancel.getLeft() - urlBarEntry.getRight();
-    }
-
-    private int getUrlBarCurveTranslation() {
-        return getWidth() - tabsButton.getLeft();
-    }
-
     private boolean canDoBack(Tab tab) {
         return (tab.canDoBack() && !isEditing());
     }
@@ -749,7 +684,7 @@ public class BrowserToolbar extends ThemedRelativeLayout
         }
     }
 
-    private void updateTabCountAndAnimate(int count) {
+    protected void updateTabCountAndAnimate(final int count) {
         // Don't animate if the toolbar is hidden.
         if (!isVisible()) {
             updateTabCount(count);
@@ -810,6 +745,10 @@ public class BrowserToolbar extends ThemedRelativeLayout
     }
 
     private void updateFocusOrder() {
+        if (focusOrder.size() == 0) {
+            throw new IllegalStateException("Expected focusOrder to be initialized in subclass");
+        }
+
         View prevView = null;
 
         // If the element that has focus becomes disabled or invisible, focus
@@ -935,19 +874,19 @@ public class BrowserToolbar extends ThemedRelativeLayout
         stopEditingListener = listener;
     }
 
-    private void showUrlEditLayout() {
+    protected void showUrlEditLayout() {
         setUrlEditLayoutVisibility(true, null);
     }
 
-    private void showUrlEditLayout(PropertyAnimator animator) {
+    protected void showUrlEditLayout(final PropertyAnimator animator) {
         setUrlEditLayoutVisibility(true, animator);
     }
 
-    private void hideUrlEditLayout() {
+    protected void hideUrlEditLayout() {
         setUrlEditLayoutVisibility(false, null);
     }
 
-    private void hideUrlEditLayout(PropertyAnimator animator) {
+    protected void hideUrlEditLayout(final PropertyAnimator animator) {
         setUrlEditLayoutVisibility(false, animator);
     }
 
@@ -992,7 +931,9 @@ public class BrowserToolbar extends ThemedRelativeLayout
     }
 
     private void setCancelVisibility(final int visibility) {
-        editCancel.setVisibility(visibility);
+        if (!isNewTablet) {
+            editCancel.setVisibility(visibility);
+        }
     }
 
     /**
@@ -1044,10 +985,6 @@ public class BrowserToolbar extends ThemedRelativeLayout
         return (uiMode == UIMode.EDIT);
     }
 
-    public boolean isAnimating() {
-        return isAnimatingEntry;
-    }
-
     public void startEditing(String url, PropertyAnimator animator) {
         if (isEditing()) {
             return;
@@ -1063,44 +1000,12 @@ public class BrowserToolbar extends ThemedRelativeLayout
             startEditingListener.onStartEditing();
         }
 
-        if (HardwareUtils.isTablet()) {
+        if (isNewTablet) {
+            showUrlEditLayout();
+        } else if (HardwareUtils.isTablet()) {
             showEditingOnTablet();
         } else {
-            urlBarTranslatingEdge.setVisibility(View.VISIBLE);
-
-            final int curveTranslation = getUrlBarCurveTranslation();
-            final int entryTranslation = getUrlBarEntryTranslation();
-            shouldShrinkURLBar = (entryTranslation < 0);
-            if (shouldShrinkURLBar) {
-                urlBarEntry.setLayoutParams(urlBarEntryShrunkenLayoutParams);
-            }
-
-            if (Versions.preHC) {
-                showEditingOnPreHoneycomb(entryTranslation, curveTranslation);
-            } else {
-                showEditingWithPhoneAnimation(animator, entryTranslation, curveTranslation);
-            }
-        }
-    }
-
-    private void showEditingOnPreHoneycomb(final int entryTranslation,
-            final int curveTranslation) {
-        showUrlEditLayout();
-
-        // Prevent taps through the editing mode cancel button (bug 1001243).
-        tabsButton.setEnabled(false);
-
-        ViewHelper.setTranslationX(urlBarTranslatingEdge, entryTranslation);
-        ViewHelper.setTranslationX(tabsButton, curveTranslation);
-        ViewHelper.setTranslationX(tabsCounter, curveTranslation);
-        ViewHelper.setTranslationX(actionItemBar, curveTranslation);
-
-        if (hasSoftMenuButton) {
-            // Prevent tabs through the editing mode cancel button (bug 1001243).
-            menuButton.setEnabled(false);
-
-            ViewHelper.setTranslationX(menuButton, curveTranslation);
-            ViewHelper.setTranslationX(menuIcon, curveTranslation);
+            triggerStartEditingTransition(animator);
         }
     }
 
@@ -1129,43 +1034,6 @@ public class BrowserToolbar extends ThemedRelativeLayout
         showUrlEditLayout();
     }
 
-    private void showEditingWithPhoneAnimation(final PropertyAnimator animator,
-            final int entryTranslation, final int curveTranslation) {
-        if (isAnimatingEntry)
-            return;
-
-        urlDisplayLayout.prepareStartEditingAnimation();
-
-        // Slide toolbar elements.
-        animator.attach(urlBarTranslatingEdge,
-                        PropertyAnimator.Property.TRANSLATION_X,
-                        entryTranslation);
-        animator.attach(tabsButton,
-                        PropertyAnimator.Property.TRANSLATION_X,
-                        curveTranslation);
-        animator.attach(tabsCounter,
-                        PropertyAnimator.Property.TRANSLATION_X,
-                        curveTranslation);
-        animator.attach(actionItemBar,
-                        PropertyAnimator.Property.TRANSLATION_X,
-                        curveTranslation);
-
-        if (hasSoftMenuButton) {
-            animator.attach(menuButton,
-                            PropertyAnimator.Property.TRANSLATION_X,
-                            curveTranslation);
-
-            animator.attach(menuIcon,
-                            PropertyAnimator.Property.TRANSLATION_X,
-                            curveTranslation);
-        }
-
-        showUrlEditLayout(animator);
-
-        animator.addPropertyAnimationListener(showEditingPhoneAnimationListener);
-        isAnimatingEntry = true; // To be correct, this should be called last.
-    }
-
     /**
      * Exits edit mode without updating the toolbar title.
      *
@@ -1204,46 +1072,15 @@ public class BrowserToolbar extends ThemedRelativeLayout
 
         updateProgressVisibility();
 
-        // The animation looks cleaner if the text in the URL bar is
-        // not selected so clear the selection by clearing focus.
-        urlEditLayout.clearFocus();
-
-        if (Versions.preHC) {
-            stopEditingOnPreHoneycomb();
-        } else if (HardwareUtils.isTablet()) {
+        if (HardwareUtils.isTablet()) {
             stopEditingOnTablet();
         } else {
-            stopEditingWithPhoneAnimation();
+            triggerStopEditingTransition();
         }
 
         return url;
     }
 
-    private void stopEditingOnPreHoneycomb() {
-        hideUrlEditLayout();
-
-        updateTabCountAndAnimate(Tabs.getInstance().getDisplayCount());
-
-        if (shouldShrinkURLBar) {
-            urlBarEntry.setLayoutParams(urlBarEntryDefaultLayoutParams);
-        }
-
-        tabsButton.setEnabled(true);
-
-        urlBarTranslatingEdge.setVisibility(View.INVISIBLE);
-        ViewHelper.setTranslationX(urlBarTranslatingEdge, 0);
-        ViewHelper.setTranslationX(tabsButton, 0);
-        ViewHelper.setTranslationX(tabsCounter, 0);
-        ViewHelper.setTranslationX(actionItemBar, 0);
-
-        if (hasSoftMenuButton) {
-            menuButton.setEnabled(true);
-
-            ViewHelper.setTranslationX(menuButton, 0);
-            ViewHelper.setTranslationX(menuIcon, 0);
-        }
-    }
-
     private void stopEditingOnTablet() {
         if (tabletDisplayModeViews == null) {
             throw new IllegalStateException("We initialize tabletDisplayModeViews in the " +
@@ -1267,42 +1104,6 @@ public class BrowserToolbar extends ThemedRelativeLayout
         hideUrlEditLayout();
     }
 
-    private void stopEditingWithPhoneAnimation() {
-        final PropertyAnimator contentAnimator = new PropertyAnimator(250);
-        contentAnimator.setUseHardwareLayer(false);
-
-        // Slide the toolbar back to its original size.
-        contentAnimator.attach(urlBarTranslatingEdge,
-                               PropertyAnimator.Property.TRANSLATION_X,
-                               0);
-        contentAnimator.attach(tabsButton,
-                               PropertyAnimator.Property.TRANSLATION_X,
-                               0);
-        contentAnimator.attach(tabsCounter,
-                               PropertyAnimator.Property.TRANSLATION_X,
-                               0);
-        contentAnimator.attach(actionItemBar,
-                               PropertyAnimator.Property.TRANSLATION_X,
-                               0);
-
-        if (hasSoftMenuButton) {
-            contentAnimator.attach(menuButton,
-                                   PropertyAnimator.Property.TRANSLATION_X,
-                                   0);
-
-            contentAnimator.attach(menuIcon,
-                                   PropertyAnimator.Property.TRANSLATION_X,
-                                   0);
-        }
-
-        hideUrlEditLayout(contentAnimator);
-
-        contentAnimator.addPropertyAnimationListener(stopEditingPhoneAnimationListener);
-
-        isAnimatingEntry = true;
-        contentAnimator.start();
-    }
-
     private void setButtonEnabled(ImageButton button, boolean enabled) {
         final Drawable drawable = button.getDrawable();
         if (drawable != null) {
@@ -1542,3 +1343,4 @@ public class BrowserToolbar extends ThemedRelativeLayout
         editCancel.onLightweightThemeReset();
     }
 }
+
diff --git a/mobile/android/base/toolbar/BrowserToolbarNewTablet.java b/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
new file mode 100644
index 000000000000..f759cd3c2879
--- /dev/null
+++ b/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
@@ -0,0 +1,38 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * 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/. */
+
+package org.mozilla.gecko.toolbar;
+
+import org.mozilla.gecko.animation.PropertyAnimator;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+/**
+ * A toolbar implementation for the tablet redesign (bug 1014156).
+ * Expected to replace BrowserToolbarTablet once complete.
+ */
+class BrowserToolbarNewTablet extends BrowserToolbarTabletBase {
+
+    public BrowserToolbarNewTablet(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+        // TODO: Implement.
+    }
+
+    @Override
+    public boolean isAnimating() {
+        return false;
+    }
+
+    @Override
+    protected void triggerStartEditingTransition(PropertyAnimator animator) {
+        // TODO: Implement.
+    }
+
+    @Override
+    protected void triggerStopEditingTransition() {
+        // TODO: Implement.
+    }
+}
diff --git a/mobile/android/base/toolbar/BrowserToolbarPhone.java b/mobile/android/base/toolbar/BrowserToolbarPhone.java
new file mode 100644
index 000000000000..132ed4f3443d
--- /dev/null
+++ b/mobile/android/base/toolbar/BrowserToolbarPhone.java
@@ -0,0 +1,135 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * 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/. */
+
+package org.mozilla.gecko.toolbar;
+
+import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.PropertyAnimator.PropertyAnimationListener;
+import org.mozilla.gecko.util.HardwareUtils;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+/**
+ * A toolbar implementation for phones.
+ */
+class BrowserToolbarPhone extends BrowserToolbarPhoneBase {
+
+    private final PropertyAnimationListener showEditingListener;
+    private final PropertyAnimationListener stopEditingListener;
+
+    protected boolean isAnimatingEntry;
+
+    protected BrowserToolbarPhone(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+
+        // Create these listeners here, once, to avoid constructing new listeners
+        // each time they are set on an animator (i.e. each time the url bar is clicked).
+        showEditingListener = new PropertyAnimationListener() {
+            @Override
+            public void onPropertyAnimationStart() { /* Do nothing */ }
+
+            @Override
+            public void onPropertyAnimationEnd() {
+                isAnimatingEntry = false;
+            }
+        };
+
+        stopEditingListener = new PropertyAnimationListener() {
+            @Override
+            public void onPropertyAnimationStart() { /* Do nothing */ }
+
+            @Override
+            public void onPropertyAnimationEnd() {
+                urlBarTranslatingEdge.setVisibility(View.INVISIBLE);
+
+                final PropertyAnimator buttonsAnimator = new PropertyAnimator(300);
+                urlDisplayLayout.prepareStopEditingAnimation(buttonsAnimator);
+                buttonsAnimator.start();
+
+                isAnimatingEntry = false;
+
+                // Trigger animation to update the tabs counter once the
+                // tabs button is back on screen.
+                updateTabCountAndAnimate(Tabs.getInstance().getDisplayCount());
+            }
+        };
+    }
+
+    @Override
+    public boolean isAnimating() {
+        return isAnimatingEntry;
+    }
+
+    @Override
+    protected void triggerStartEditingTransition(final PropertyAnimator animator) {
+        if (isAnimatingEntry) {
+            return;
+        }
+
+        // The animation looks cleaner if the text in the URL bar is
+        // not selected so clear the selection by clearing focus.
+        urlEditLayout.clearFocus();
+
+        urlDisplayLayout.prepareStartEditingAnimation();
+        addAnimationsForEditing(animator, true);
+        showUrlEditLayout(animator);
+        urlBarTranslatingEdge.setVisibility(View.VISIBLE);
+        animator.addPropertyAnimationListener(showEditingListener);
+
+        isAnimatingEntry = true; // To be correct, this should be called last.
+    }
+
+    @Override
+    protected void triggerStopEditingTransition() {
+        final PropertyAnimator animator = new PropertyAnimator(250);
+        animator.setUseHardwareLayer(false);
+
+        addAnimationsForEditing(animator, false);
+        hideUrlEditLayout(animator);
+        animator.addPropertyAnimationListener(stopEditingListener);
+
+        isAnimatingEntry = true;
+        animator.start();
+    }
+
+    private void addAnimationsForEditing(final PropertyAnimator animator, final boolean isEditing) {
+        final int curveTranslation;
+        final int entryTranslation;
+        if (isEditing) {
+            curveTranslation = getUrlBarCurveTranslation();
+            entryTranslation = getUrlBarEntryTranslation();
+        } else {
+            curveTranslation = 0;
+            entryTranslation = 0;
+        }
+
+        // Slide toolbar elements.
+        animator.attach(urlBarTranslatingEdge,
+                        PropertyAnimator.Property.TRANSLATION_X,
+                        entryTranslation);
+        animator.attach(tabsButton,
+                        PropertyAnimator.Property.TRANSLATION_X,
+                        curveTranslation);
+        animator.attach(tabsCounter,
+                        PropertyAnimator.Property.TRANSLATION_X,
+                        curveTranslation);
+        animator.attach(actionItemBar,
+                        PropertyAnimator.Property.TRANSLATION_X,
+                        curveTranslation);
+
+        if (!HardwareUtils.hasMenuButton()) {
+            animator.attach(menuButton,
+                            PropertyAnimator.Property.TRANSLATION_X,
+                            curveTranslation);
+
+            animator.attach(menuIcon,
+                            PropertyAnimator.Property.TRANSLATION_X,
+                            curveTranslation);
+        }
+    }
+}
diff --git a/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
new file mode 100644
index 000000000000..df83f8428374
--- /dev/null
+++ b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
@@ -0,0 +1,80 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * 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/. */
+
+package org.mozilla.gecko.toolbar;
+
+import java.util.Arrays;
+
+import org.mozilla.gecko.R;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+
+/**
+ * A base implementations of the browser toolbar for phones.
+ * This class manages any Views, variables, etc. that are exclusive to phone.
+ */
+abstract class BrowserToolbarPhoneBase extends BrowserToolbar {
+
+    protected final ImageView urlBarTranslatingEdge;
+
+    private final Path roundCornerShape;
+    private final Paint roundCornerPaint;
+
+    public BrowserToolbarPhoneBase(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+        final Resources res = context.getResources();
+
+        urlBarTranslatingEdge = (ImageView) findViewById(R.id.url_bar_translating_edge);
+
+        // This will clip the translating edge's image at 60% of its width
+        urlBarTranslatingEdge.getDrawable().setLevel(6000);
+
+        focusOrder.add(this);
+        focusOrder.addAll(urlDisplayLayout.getFocusOrder());
+        focusOrder.addAll(Arrays.asList(tabsButton, menuButton));
+
+        roundCornerShape = new Path();
+        roundCornerShape.moveTo(0, 0);
+        roundCornerShape.lineTo(30, 0);
+        roundCornerShape.cubicTo(0, 0, 0, 0, 0, 30);
+        roundCornerShape.lineTo(0, 0);
+
+        roundCornerPaint = new Paint();
+        roundCornerPaint.setAntiAlias(true);
+        roundCornerPaint.setColor(res.getColor(R.color.background_tabs));
+        roundCornerPaint.setStrokeWidth(0.0f);
+    }
+
+    @Override
+    public void draw(final Canvas canvas) {
+        super.draw(canvas);
+
+        if (uiMode == UIMode.DISPLAY) {
+            canvas.drawPath(roundCornerShape, roundCornerPaint);
+        }
+    }
+
+    /**
+     * Returns the number of pixels the url bar translating edge
+     * needs to translate to the right to enter its editing mode state.
+     * A negative value means the edge must translate to the left.
+     */
+    protected int getUrlBarEntryTranslation() {
+        // Find the distance from the right-edge of the url bar (where we're translating from) to
+        // the left-edge of the cancel button (where we're translating to; note that the cancel
+        // button must be laid out, i.e. not View.GONE).
+        return editCancel.getLeft() - urlBarEntry.getRight();
+    }
+
+    protected int getUrlBarCurveTranslation() {
+        return getWidth() - tabsButton.getLeft();
+    }
+}
diff --git a/mobile/android/base/toolbar/BrowserToolbarPreHC.java b/mobile/android/base/toolbar/BrowserToolbarPreHC.java
new file mode 100644
index 000000000000..fc8a52b036ab
--- /dev/null
+++ b/mobile/android/base/toolbar/BrowserToolbarPreHC.java
@@ -0,0 +1,71 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * 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/. */
+
+package org.mozilla.gecko.toolbar;
+
+import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.ViewHelper;
+import org.mozilla.gecko.util.HardwareUtils;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+/**
+ * A toolbar implementation for pre-Honeycomb devices.
+ * The toolbar changes editing mode state without animating.
+ */
+class BrowserToolbarPreHC extends BrowserToolbarPhoneBase {
+
+    public BrowserToolbarPreHC(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean isAnimating() {
+        return false;
+    }
+
+    @Override
+    protected void triggerStartEditingTransition(final PropertyAnimator animator) {
+        showUrlEditLayout();
+        updateEditingState(true);
+    }
+
+    @Override
+    protected void triggerStopEditingTransition() {
+        hideUrlEditLayout();
+        updateTabCountAndAnimate(Tabs.getInstance().getDisplayCount());
+        updateEditingState(false);
+    }
+
+    private void updateEditingState(final boolean isEditing) {
+        final int curveTranslation;
+        final int entryTranslation;
+        if (isEditing) {
+            curveTranslation = getUrlBarCurveTranslation();
+            entryTranslation = getUrlBarEntryTranslation();
+        } else {
+            curveTranslation = 0;
+            entryTranslation = 0;
+        }
+
+        // Prevent taps through the editing mode cancel button (bug 1001243).
+        tabsButton.setEnabled(!isEditing);
+
+        ViewHelper.setTranslationX(urlBarTranslatingEdge, entryTranslation);
+        ViewHelper.setTranslationX(tabsButton, curveTranslation);
+        ViewHelper.setTranslationX(tabsCounter, curveTranslation);
+        ViewHelper.setTranslationX(actionItemBar, curveTranslation);
+
+        if (!HardwareUtils.hasMenuButton()) {
+            // Prevent tabs through the editing mode cancel button (bug 1001243).
+            menuButton.setEnabled(!isEditing);
+
+            ViewHelper.setTranslationX(menuButton, curveTranslation);
+            ViewHelper.setTranslationX(menuIcon, curveTranslation);
+        }
+    }
+}
diff --git a/mobile/android/base/toolbar/BrowserToolbarTablet.java b/mobile/android/base/toolbar/BrowserToolbarTablet.java
new file mode 100644
index 000000000000..19074a700ed5
--- /dev/null
+++ b/mobile/android/base/toolbar/BrowserToolbarTablet.java
@@ -0,0 +1,37 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * 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/. */
+
+package org.mozilla.gecko.toolbar;
+
+import org.mozilla.gecko.animation.PropertyAnimator;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+/**
+ * A toolbar implementation for tablets.
+ */
+class BrowserToolbarTablet extends BrowserToolbarTabletBase {
+
+    public BrowserToolbarTablet(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+        // TODO: Implement.
+    }
+
+    @Override
+    public boolean isAnimating() {
+        return false;
+    }
+
+    @Override
+    protected void triggerStartEditingTransition(final PropertyAnimator animator) {
+        // TODO: Implement.
+    }
+
+    @Override
+    protected void triggerStopEditingTransition() {
+        // TODO: Implement.
+    }
+}
diff --git a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
new file mode 100644
index 000000000000..4dfa153dfcc7
--- /dev/null
+++ b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
@@ -0,0 +1,21 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * 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/. */
+
+package org.mozilla.gecko.toolbar;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+/**
+ * A base implementations of the browser toolbar for tablets.
+ * This class manages any Views, variables, etc. that are exclusive to tablet.
+ */
+abstract class BrowserToolbarTabletBase extends BrowserToolbar {
+
+    public BrowserToolbarTabletBase(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+        // TODO: Implement.
+    }
+}

From fe19c3c87c759d5c9515e9dd2157c46a9c7fa8fe Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 27 Aug 2014 15:34:03 -0700
Subject: [PATCH 008/109] Bug 1046203 - Part 3: Create BrowserToolbar tablet
 and new_tablet implementations. r=lucasr

---
 .../android/base/toolbar/BrowserToolbar.java  | 349 +-----------------
 .../base/toolbar/BrowserToolbarNewTablet.java |  10 +-
 .../base/toolbar/BrowserToolbarPhoneBase.java |   6 +
 .../base/toolbar/BrowserToolbarTablet.java    | 229 +++++++++++-
 .../toolbar/BrowserToolbarTabletBase.java     | 104 +++++-
 .../base/toolbar/ToolbarDisplayLayout.java    |   2 +-
 6 files changed, 353 insertions(+), 347 deletions(-)

diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index fdf6d83c2e9c..bd18d011c8b7 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -6,7 +6,6 @@
 package org.mozilla.gecko.toolbar;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 
@@ -42,10 +41,9 @@ import org.mozilla.gecko.widget.ThemedRelativeLayout;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
+import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
-import android.graphics.Paint;
-import android.graphics.Path;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -54,15 +52,12 @@ import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
-import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
-import android.widget.RelativeLayout;
 
 /**
 * {@code BrowserToolbar} is single entry point for users of the toolbar
@@ -116,22 +111,13 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
         DISPLAY
     }
 
-    enum ForwardButtonAnimation {
-        SHOW,
-        HIDE
-    }
-
     private final boolean isNewTablet;
 
     protected final ToolbarDisplayLayout urlDisplayLayout;
     protected final ToolbarEditLayout urlEditLayout;
     protected final View urlBarEntry;
-    private RelativeLayout.LayoutParams urlBarEntryDefaultLayoutParams;
-    private RelativeLayout.LayoutParams urlBarEntryShrunkenLayoutParams;
-    private boolean isSwitchingTabs;
+    protected boolean isSwitchingTabs;
     protected final ThemedImageButton tabsButton;
-    private ImageButton backButton;
-    private ImageButton forwardButton;
 
     private ToolbarProgressView progressBar;
     protected final TabCounter tabsCounter;
@@ -143,9 +129,6 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
 
     protected final ThemedImageView editCancel;
 
-    private List<View> tabletDisplayModeViews;
-    private boolean hidForwardButtonOnStartEditing;
-
     private OnActivateListener activateListener;
     private OnFocusChangeListener focusChangeListener;
     private OnStartEditingListener startEditingListener;
@@ -156,21 +139,18 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
 
     protected UIMode uiMode;
 
-    private int urlBarViewOffset;
-    private int defaultForwardMargin;
-
     private final Paint shadowPaint;
     private final int shadowSize;
 
     private static final Interpolator buttonsInterpolator = new AccelerateInterpolator();
 
-    private static final int FORWARD_ANIMATION_DURATION = 450;
-
     private final LightweightTheme theme;
     private final ToolbarPrefs prefs;
 
     public abstract boolean isAnimating();
 
+    protected abstract void updateNavigationButtons(Tab tab);
+
     protected abstract void triggerStartEditingTransition(PropertyAnimator animator);
     protected abstract void triggerStopEditingTransition();
 
@@ -213,37 +193,16 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
             "Reader:Click",
             "Reader:LongClick");
 
-        final Resources res = getResources();
-        urlBarViewOffset = res.getDimensionPixelSize(R.dimen.url_bar_offset_left);
-        defaultForwardMargin = res.getDimensionPixelSize(R.dimen.forward_default_offset);
         urlDisplayLayout = (ToolbarDisplayLayout) findViewById(R.id.display_layout);
         urlBarEntry = findViewById(R.id.url_bar_entry);
         urlEditLayout = (ToolbarEditLayout) findViewById(R.id.edit_layout);
 
-        urlBarEntryDefaultLayoutParams = (RelativeLayout.LayoutParams) urlBarEntry.getLayoutParams();
-        // API level 19 adds a RelativeLayout.LayoutParams copy constructor, so we explicitly cast
-        // to ViewGroup.MarginLayoutParams to ensure consistency across platforms.
-        urlBarEntryShrunkenLayoutParams =
-                new RelativeLayout.LayoutParams((ViewGroup.MarginLayoutParams) urlBarEntryDefaultLayoutParams);
-        // Note: a shrunken phone layout is not displayed on any known devices,
-        // and thus shrunken layout params for phone are not maintained.
-        if (HardwareUtils.isTablet()) {
-            urlBarEntryShrunkenLayoutParams.addRule(RelativeLayout.ALIGN_RIGHT, R.id.edit_layout);
-            urlBarEntryShrunkenLayoutParams.addRule(RelativeLayout.ALIGN_LEFT, R.id.edit_layout);
-            urlBarEntryShrunkenLayoutParams.leftMargin = 0;
-        }
-
         tabsButton = (ThemedImageButton) findViewById(R.id.tabs);
         tabsCounter = (TabCounter) findViewById(R.id.tabs_counter);
         if (Versions.feature11Plus) {
             tabsCounter.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
         }
 
-        backButton = (ImageButton) findViewById(R.id.back);
-        setButtonEnabled(backButton, false);
-        forwardButton = (ImageButton) findViewById(R.id.forward);
-        setButtonEnabled(forwardButton, false);
-
         menuButton = (ThemedImageButton) findViewById(R.id.menu);
         menuIcon = (ThemedImageView) findViewById(R.id.menu_icon);
         actionItemBar = (LinearLayout) findViewById(R.id.menu_items);
@@ -253,12 +212,8 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
 
         // The focusOrder List should be filled by sub-classes.
         focusOrder = new ArrayList<View>();
-        if (HardwareUtils.isTablet()) {
-            focusOrder.addAll(Arrays.asList(tabsButton, backButton, forwardButton, this));
-            focusOrder.addAll(urlDisplayLayout.getFocusOrder());
-            focusOrder.addAll(Arrays.asList(actionItemBar, menuButton));
-        }
 
+        final Resources res = getResources();
         shadowSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_shadow_size);
 
         shadowPaint = new Paint();
@@ -272,34 +227,6 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
         urlEditLayout.setToolbarPrefs(prefs);
     }
 
-    public ArrayList<View> populateTabletViews() {
-        if (!HardwareUtils.isTablet()) {
-            // Avoid the runtime and memory overhead for non-tablet devices.
-            return null;
-        }
-
-        final View[] allTabletDisplayModeViews = new View[] {
-            actionItemBar,
-            backButton,
-            menuButton,
-            menuIcon,
-            tabsButton,
-            tabsCounter,
-        };
-        final ArrayList<View> listToPopulate = new ArrayList<View>(allTabletDisplayModeViews.length);
-
-        // Some tablet devices do not display all of the Views but instead rely on visibility
-        // to hide them. Find and return the ones that are relevant to our device.
-        for (final View v : allTabletDisplayModeViews) {
-            // These views should all be initialized and we explicitly do not
-            // check for null because we may be hiding bugs.
-            if (v.getVisibility() == View.VISIBLE) {
-                listToPopulate.add(v);
-            }
-        };
-        return listToPopulate;
-    }
-
     @Override
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
@@ -403,32 +330,6 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
         });
         tabsButton.setImageLevel(0);
 
-        backButton.setOnClickListener(new Button.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Tabs.getInstance().getSelectedTab().doBack();
-            }
-        });
-        backButton.setOnLongClickListener(new Button.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View view) {
-                return Tabs.getInstance().getSelectedTab().showBackHistory();
-            }
-        });
-
-        forwardButton.setOnClickListener(new Button.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Tabs.getInstance().getSelectedTab().doForward();
-            }
-        });
-        forwardButton.setOnLongClickListener(new Button.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View view) {
-                return Tabs.getInstance().getSelectedTab().showForwardHistory();
-            }
-        });
-
         editCancel.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -577,8 +478,7 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
                 case START:
                 case CLOSED:
                 case ADDED:
-                    updateBackButton(tab);
-                    updateForwardButton(tab);
+                    updateNavigationButtons(tab);
                     break;
 
                 case SELECTED:
@@ -594,8 +494,7 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
                     flags.add(UpdateFlags.FAVICON);
                     flags.add(UpdateFlags.SITE_IDENTITY);
 
-                    updateBackButton(tab);
-                    updateForwardButton(tab);
+                    updateNavigationButtons(tab);
                     break;
 
                 case TITLE:
@@ -646,20 +545,10 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
     public void setNextFocusDownId(int nextId) {
         super.setNextFocusDownId(nextId);
         tabsButton.setNextFocusDownId(nextId);
-        backButton.setNextFocusDownId(nextId);
-        forwardButton.setNextFocusDownId(nextId);
         urlDisplayLayout.setNextFocusDownId(nextId);
         menuButton.setNextFocusDownId(nextId);
     }
 
-    private boolean canDoBack(Tab tab) {
-        return (tab.canDoBack() && !isEditing());
-    }
-
-    private boolean canDoForward(Tab tab) {
-        return (tab.canDoForward() && !isEditing());
-    }
-
     private void addTab() {
         activity.addTab();
     }
@@ -931,47 +820,12 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
     }
 
     private void setCancelVisibility(final int visibility) {
+        // TODO: Remove this check (and maybe method) when NewTablet's editing mode is implemented.
         if (!isNewTablet) {
             editCancel.setVisibility(visibility);
         }
     }
 
-    /**
-     * Disables all toolbar elements which are not
-     * related to editing mode.
-     */
-    private void updateChildrenEnabledStateForEditing() {
-        // Disable toolbar elements while in editing mode
-        final boolean enabled = !isEditing();
-
-        if (!enabled) {
-            tabsCounter.onEnterEditingMode();
-        }
-
-        tabsButton.setEnabled(enabled);
-        menuButton.setEnabled(enabled);
-
-        final int actionItemsCount = actionItemBar.getChildCount();
-        for (int i = 0; i < actionItemsCount; i++) {
-            actionItemBar.getChildAt(i).setEnabled(enabled);
-        }
-
-        final Tab tab = Tabs.getInstance().getSelectedTab();
-        if (tab != null) {
-            setButtonEnabled(backButton, canDoBack(tab));
-            setButtonEnabled(forwardButton, canDoForward(tab));
-
-            // Once the editing mode is finished, we have to ensure that the
-            // forward button slides away if necessary. This is because we might
-            // have only disabled it (without hiding it) when the toolbar entered
-            // editing mode.
-            if (!isEditing()) {
-                animateForwardButton(canDoForward(tab) ?
-                                     ForwardButtonAnimation.SHOW : ForwardButtonAnimation.HIDE);
-            }
-        }
-    }
-
     private void setUIMode(final UIMode uiMode) {
         this.uiMode = uiMode;
         urlEditLayout.setEnabled(uiMode == UIMode.EDIT);
@@ -1000,38 +854,7 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
             startEditingListener.onStartEditing();
         }
 
-        if (isNewTablet) {
-            showUrlEditLayout();
-        } else if (HardwareUtils.isTablet()) {
-            showEditingOnTablet();
-        } else {
-            triggerStartEditingTransition(animator);
-        }
-    }
-
-    private void showEditingOnTablet() {
-        if (tabletDisplayModeViews == null) {
-            tabletDisplayModeViews = populateTabletViews();
-        }
-
-        urlBarEntry.setLayoutParams(urlBarEntryShrunkenLayoutParams);
-
-        // Hide display elements.
-        updateChildrenEnabledStateForEditing();
-        for (final View v : tabletDisplayModeViews) {
-            v.setVisibility(View.INVISIBLE);
-        }
-
-        final Tab selectedTab = Tabs.getInstance().getSelectedTab();
-        if (selectedTab != null && selectedTab.canDoForward()) {
-            hidForwardButtonOnStartEditing = true;
-            forwardButton.setVisibility(View.INVISIBLE);
-        } else {
-            hidForwardButtonOnStartEditing = false;
-        }
-
-        // Show editing elements.
-        showUrlEditLayout();
+        triggerStartEditingTransition(animator);
     }
 
     /**
@@ -1064,159 +887,16 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
         }
         setUIMode(UIMode.DISPLAY);
 
-        updateChildrenEnabledStateForEditing();
-
         if (stopEditingListener != null) {
             stopEditingListener.onStopEditing();
         }
 
         updateProgressVisibility();
-
-        if (HardwareUtils.isTablet()) {
-            stopEditingOnTablet();
-        } else {
-            triggerStopEditingTransition();
-        }
+        triggerStopEditingTransition();
 
         return url;
     }
 
-    private void stopEditingOnTablet() {
-        if (tabletDisplayModeViews == null) {
-            throw new IllegalStateException("We initialize tabletDisplayModeViews in the " +
-                    "transition to show editing mode and don't expect stop editing to be called " +
-                    "first.");
-        }
-
-        urlBarEntry.setLayoutParams(urlBarEntryDefaultLayoutParams);
-
-        // Show display elements.
-        updateChildrenEnabledStateForEditing();
-        for (final View v : tabletDisplayModeViews) {
-            v.setVisibility(View.VISIBLE);
-        }
-
-        if (hidForwardButtonOnStartEditing) {
-            forwardButton.setVisibility(View.VISIBLE);
-        }
-
-        // Hide editing elements.
-        hideUrlEditLayout();
-    }
-
-    private void setButtonEnabled(ImageButton button, boolean enabled) {
-        final Drawable drawable = button.getDrawable();
-        if (drawable != null) {
-            drawable.setAlpha(enabled ? 255 : 61);
-        }
-
-        button.setEnabled(enabled);
-    }
-
-    public void updateBackButton(Tab tab) {
-        setButtonEnabled(backButton, canDoBack(tab));
-    }
-
-    private void animateForwardButton(final ForwardButtonAnimation animation) {
-        // If the forward button is not visible, we must be
-        // in the phone UI.
-        if (forwardButton.getVisibility() != View.VISIBLE) {
-            return;
-        }
-
-        final boolean showing = (animation == ForwardButtonAnimation.SHOW);
-
-        // if the forward button's margin is non-zero, this means it has already
-        // been animated to be visible¸ and vice-versa.
-        MarginLayoutParams fwdParams = (MarginLayoutParams) forwardButton.getLayoutParams();
-        if ((fwdParams.leftMargin > defaultForwardMargin && showing) ||
-            (fwdParams.leftMargin == defaultForwardMargin && !showing)) {
-            return;
-        }
-
-        // We want the forward button to show immediately when switching tabs
-        final PropertyAnimator forwardAnim =
-                new PropertyAnimator(isSwitchingTabs ? 10 : FORWARD_ANIMATION_DURATION);
-        final int width = forwardButton.getWidth() / 2;
-
-        forwardAnim.addPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
-            @Override
-            public void onPropertyAnimationStart() {
-                if (!showing) {
-                    // Set the margin before the transition when hiding the forward button. We
-                    // have to do this so that the favicon isn't clipped during the transition
-                    MarginLayoutParams layoutParams =
-                        (MarginLayoutParams) urlDisplayLayout.getLayoutParams();
-                    layoutParams.leftMargin = 0;
-
-                    // Do the same on the URL edit container
-                    layoutParams = (MarginLayoutParams) urlEditLayout.getLayoutParams();
-                    layoutParams.leftMargin = 0;
-
-                    requestLayout();
-                    // Note, we already translated the favicon, site security, and text field
-                    // in prepareForwardAnimation, so they should appear to have not moved at
-                    // all at this point.
-                }
-            }
-
-            @Override
-            public void onPropertyAnimationEnd() {
-                if (showing) {
-                    MarginLayoutParams layoutParams =
-                        (MarginLayoutParams) urlDisplayLayout.getLayoutParams();
-                    layoutParams.leftMargin = urlBarViewOffset;
-
-                    layoutParams = (MarginLayoutParams) urlEditLayout.getLayoutParams();
-                    layoutParams.leftMargin = urlBarViewOffset;
-                }
-
-                urlDisplayLayout.finishForwardAnimation();
-
-                MarginLayoutParams layoutParams = (MarginLayoutParams) forwardButton.getLayoutParams();
-                layoutParams.leftMargin = defaultForwardMargin + (showing ? width : 0);
-                ViewHelper.setTranslationX(forwardButton, 0);
-
-                requestLayout();
-            }
-        });
-
-        prepareForwardAnimation(forwardAnim, animation, width);
-        forwardAnim.start();
-    }
-
-    public void updateForwardButton(Tab tab) {
-        final boolean enabled = canDoForward(tab);
-        if (forwardButton.isEnabled() == enabled)
-            return;
-
-        // Save the state on the forward button so that we can skip animations
-        // when there's nothing to change
-        setButtonEnabled(forwardButton, enabled);
-        animateForwardButton(enabled ? ForwardButtonAnimation.SHOW : ForwardButtonAnimation.HIDE);
-    }
-
-    private void prepareForwardAnimation(PropertyAnimator anim, ForwardButtonAnimation animation, int width) {
-        if (animation == ForwardButtonAnimation.HIDE) {
-            anim.attach(forwardButton,
-                      PropertyAnimator.Property.TRANSLATION_X,
-                      -width);
-            anim.attach(forwardButton,
-                      PropertyAnimator.Property.ALPHA,
-                      0);
-
-        } else {
-            anim.attach(forwardButton,
-                      PropertyAnimator.Property.TRANSLATION_X,
-                      width);
-            anim.attach(forwardButton,
-                      PropertyAnimator.Property.ALPHA,
-                      1);
-        }
-
-        urlDisplayLayout.prepareForwardAnimation(anim, animation, width);
-    }
-
     @Override
     public boolean addActionItem(View actionItem) {
         actionItemBar.addView(actionItem);
@@ -1237,14 +917,6 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
         menuIcon.setPrivateMode(isPrivate);
         editCancel.setPrivateMode(isPrivate);
         urlEditLayout.setPrivateMode(isPrivate);
-
-        if (backButton instanceof BackButton) {
-            ((BackButton) backButton).setPrivateMode(isPrivate);
-        }
-
-        if (forwardButton instanceof ForwardButton) {
-            ((ForwardButton) forwardButton).setPrivateMode(isPrivate);
-        }
     }
 
     public void show() {
@@ -1343,4 +1015,3 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
         editCancel.onLightweightThemeReset();
     }
 }
-
diff --git a/mobile/android/base/toolbar/BrowserToolbarNewTablet.java b/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
index f759cd3c2879..82a296a8e1d1 100644
--- a/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
+++ b/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
@@ -18,7 +18,6 @@ class BrowserToolbarNewTablet extends BrowserToolbarTabletBase {
 
     public BrowserToolbarNewTablet(final Context context, final AttributeSet attrs) {
         super(context, attrs);
-        // TODO: Implement.
     }
 
     @Override
@@ -27,12 +26,17 @@ class BrowserToolbarNewTablet extends BrowserToolbarTabletBase {
     }
 
     @Override
-    protected void triggerStartEditingTransition(PropertyAnimator animator) {
-        // TODO: Implement.
+    protected void triggerStartEditingTransition(final PropertyAnimator animator) {
+        showUrlEditLayout();
     }
 
     @Override
     protected void triggerStopEditingTransition() {
+        hideUrlEditLayout();
+    }
+
+    @Override
+    protected void animateForwardButton(final ForwardButtonAnimation animation) {
         // TODO: Implement.
     }
 }
diff --git a/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
index df83f8428374..3d0295e7c66d 100644
--- a/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
+++ b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
@@ -8,6 +8,7 @@ package org.mozilla.gecko.toolbar;
 import java.util.Arrays;
 
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.Tab;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -53,6 +54,11 @@ abstract class BrowserToolbarPhoneBase extends BrowserToolbar {
         roundCornerPaint.setStrokeWidth(0.0f);
     }
 
+    @Override
+    protected void updateNavigationButtons(final Tab tab) {
+        // We have no navigation buttons so do nothing.
+    }
+
     @Override
     public void draw(final Canvas canvas) {
         super.draw(canvas);
diff --git a/mobile/android/base/toolbar/BrowserToolbarTablet.java b/mobile/android/base/toolbar/BrowserToolbarTablet.java
index 19074a700ed5..27cb4ab40779 100644
--- a/mobile/android/base/toolbar/BrowserToolbarTablet.java
+++ b/mobile/android/base/toolbar/BrowserToolbarTablet.java
@@ -5,19 +5,76 @@
 
 package org.mozilla.gecko.toolbar;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.ViewHelper;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
 
 /**
  * A toolbar implementation for tablets.
  */
 class BrowserToolbarTablet extends BrowserToolbarTabletBase {
 
+    private static final int FORWARD_ANIMATION_DURATION = 450;
+
+    private final RelativeLayout.LayoutParams urlBarEntryDefaultLayoutParams;
+    private final RelativeLayout.LayoutParams urlBarEntryShrunkenLayoutParams;
+
+    private List<View> tabletDisplayModeViews;
+    private boolean hidForwardButtonOnStartEditing;
+
+    private final int urlBarViewOffset;
+    private final int defaultForwardMargin;
+
     public BrowserToolbarTablet(final Context context, final AttributeSet attrs) {
         super(context, attrs);
-        // TODO: Implement.
+
+        urlBarEntryDefaultLayoutParams = (RelativeLayout.LayoutParams) urlBarEntry.getLayoutParams();
+        // API level 19 adds a RelativeLayout.LayoutParams copy constructor, so we explicitly cast
+        // to ViewGroup.MarginLayoutParams to ensure consistency across platforms.
+        urlBarEntryShrunkenLayoutParams =
+                new RelativeLayout.LayoutParams((ViewGroup.MarginLayoutParams) urlBarEntryDefaultLayoutParams);
+        urlBarEntryShrunkenLayoutParams.addRule(RelativeLayout.ALIGN_RIGHT, R.id.edit_layout);
+        urlBarEntryShrunkenLayoutParams.addRule(RelativeLayout.ALIGN_LEFT, R.id.edit_layout);
+        urlBarEntryShrunkenLayoutParams.leftMargin = 0;
+
+        final Resources res = getResources();
+        urlBarViewOffset = res.getDimensionPixelSize(R.dimen.url_bar_offset_left);
+        defaultForwardMargin = res.getDimensionPixelSize(R.dimen.forward_default_offset);
+    }
+
+    private ArrayList<View> populateTabletViews() {
+        final View[] allTabletDisplayModeViews = new View[] {
+            actionItemBar,
+            backButton,
+            menuButton,
+            menuIcon,
+            tabsButton,
+            tabsCounter,
+        };
+        final ArrayList<View> listToPopulate = new ArrayList<View>(allTabletDisplayModeViews.length);
+
+        // Some tablet devices do not display all of the Views but instead rely on visibility
+        // to hide them. Find and return the ones that are relevant to our device.
+        for (final View v : allTabletDisplayModeViews) {
+            // These views should all be initialized and we explicitly do not
+            // check for null because we may be hiding bugs.
+            if (v.getVisibility() == View.VISIBLE) {
+                listToPopulate.add(v);
+            }
+        };
+        return listToPopulate;
     }
 
     @Override
@@ -27,11 +84,177 @@ class BrowserToolbarTablet extends BrowserToolbarTabletBase {
 
     @Override
     protected void triggerStartEditingTransition(final PropertyAnimator animator) {
-        // TODO: Implement.
+        if (tabletDisplayModeViews == null) {
+            tabletDisplayModeViews = populateTabletViews();
+        }
+
+        urlBarEntry.setLayoutParams(urlBarEntryShrunkenLayoutParams);
+
+        // Hide display elements.
+        updateChildrenState();
+        for (final View v : tabletDisplayModeViews) {
+            v.setVisibility(View.INVISIBLE);
+        }
+
+        final Tab selectedTab = Tabs.getInstance().getSelectedTab();
+        if (selectedTab != null && selectedTab.canDoForward()) {
+            hidForwardButtonOnStartEditing = true;
+            forwardButton.setVisibility(View.INVISIBLE);
+        } else {
+            hidForwardButtonOnStartEditing = false;
+        }
+
+        // Show editing elements.
+        showUrlEditLayout();
     }
 
     @Override
     protected void triggerStopEditingTransition() {
-        // TODO: Implement.
+        if (tabletDisplayModeViews == null) {
+            throw new IllegalStateException("We initialize tabletDisplayModeViews in the " +
+                    "transition to show editing mode and don't expect stop editing to be called " +
+                    "first.");
+        }
+
+        urlBarEntry.setLayoutParams(urlBarEntryDefaultLayoutParams);
+
+        // Show display elements.
+        updateChildrenState();
+        for (final View v : tabletDisplayModeViews) {
+            v.setVisibility(View.VISIBLE);
+        }
+
+        if (hidForwardButtonOnStartEditing) {
+            forwardButton.setVisibility(View.VISIBLE);
+        }
+
+        // Hide editing elements.
+        hideUrlEditLayout();
+    }
+
+    /**
+     * Disables all toolbar elements which are not
+     * related to editing mode.
+     */
+    private void updateChildrenState() {
+        // Disable toolbar elements while in editing mode
+        final boolean enabled = !isEditing();
+
+        if (!enabled) {
+            tabsCounter.onEnterEditingMode();
+        }
+
+        tabsButton.setEnabled(enabled);
+        menuButton.setEnabled(enabled);
+
+        final int actionItemsCount = actionItemBar.getChildCount();
+        for (int i = 0; i < actionItemsCount; ++i) {
+            actionItemBar.getChildAt(i).setEnabled(enabled);
+        }
+
+        final Tab tab = Tabs.getInstance().getSelectedTab();
+        if (tab != null) {
+            setButtonEnabled(backButton, canDoBack(tab));
+            setButtonEnabled(forwardButton, canDoForward(tab));
+
+            // Once the editing mode is finished, we have to ensure that the
+            // forward button slides away if necessary. This is because we might
+            // have only disabled it (without hiding it) when the toolbar entered
+            // editing mode.
+            if (!isEditing()) {
+                animateForwardButton(canDoForward(tab) ?
+                                     ForwardButtonAnimation.SHOW : ForwardButtonAnimation.HIDE);
+            }
+        }
+    }
+
+    @Override
+    protected void animateForwardButton(final ForwardButtonAnimation animation) {
+        // If the forward button is not visible, we must be
+        // in the phone UI.
+        if (forwardButton.getVisibility() != View.VISIBLE) {
+            return;
+        }
+
+        final boolean showing = (animation == ForwardButtonAnimation.SHOW);
+
+        // if the forward button's margin is non-zero, this means it has already
+        // been animated to be visible¸ and vice-versa.
+        MarginLayoutParams fwdParams = (MarginLayoutParams) forwardButton.getLayoutParams();
+        if ((fwdParams.leftMargin > defaultForwardMargin && showing) ||
+            (fwdParams.leftMargin == defaultForwardMargin && !showing)) {
+            return;
+        }
+
+        // We want the forward button to show immediately when switching tabs
+        final PropertyAnimator forwardAnim =
+                new PropertyAnimator(isSwitchingTabs ? 10 : FORWARD_ANIMATION_DURATION);
+        final int width = forwardButton.getWidth() / 2;
+
+        forwardAnim.addPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
+            @Override
+            public void onPropertyAnimationStart() {
+                if (!showing) {
+                    // Set the margin before the transition when hiding the forward button. We
+                    // have to do this so that the favicon isn't clipped during the transition
+                    MarginLayoutParams layoutParams =
+                        (MarginLayoutParams) urlDisplayLayout.getLayoutParams();
+                    layoutParams.leftMargin = 0;
+
+                    // Do the same on the URL edit container
+                    layoutParams = (MarginLayoutParams) urlEditLayout.getLayoutParams();
+                    layoutParams.leftMargin = 0;
+
+                    requestLayout();
+                    // Note, we already translated the favicon, site security, and text field
+                    // in prepareForwardAnimation, so they should appear to have not moved at
+                    // all at this point.
+                }
+            }
+
+            @Override
+            public void onPropertyAnimationEnd() {
+                if (showing) {
+                    MarginLayoutParams layoutParams =
+                        (MarginLayoutParams) urlDisplayLayout.getLayoutParams();
+                    layoutParams.leftMargin = urlBarViewOffset;
+
+                    layoutParams = (MarginLayoutParams) urlEditLayout.getLayoutParams();
+                    layoutParams.leftMargin = urlBarViewOffset;
+                }
+
+                urlDisplayLayout.finishForwardAnimation();
+
+                MarginLayoutParams layoutParams = (MarginLayoutParams) forwardButton.getLayoutParams();
+                layoutParams.leftMargin = defaultForwardMargin + (showing ? width : 0);
+                ViewHelper.setTranslationX(forwardButton, 0);
+
+                requestLayout();
+            }
+        });
+
+        prepareForwardAnimation(forwardAnim, animation, width);
+        forwardAnim.start();
+    }
+
+    private void prepareForwardAnimation(PropertyAnimator anim, ForwardButtonAnimation animation, int width) {
+        if (animation == ForwardButtonAnimation.HIDE) {
+            anim.attach(forwardButton,
+                      PropertyAnimator.Property.TRANSLATION_X,
+                      -width);
+            anim.attach(forwardButton,
+                      PropertyAnimator.Property.ALPHA,
+                      0);
+
+        } else {
+            anim.attach(forwardButton,
+                      PropertyAnimator.Property.TRANSLATION_X,
+                      width);
+            anim.attach(forwardButton,
+                      PropertyAnimator.Property.ALPHA,
+                      1);
+        }
+
+        urlDisplayLayout.prepareForwardAnimation(anim, animation, width);
     }
 }
diff --git a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
index 4dfa153dfcc7..2561634ccadf 100644
--- a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
+++ b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
@@ -5,8 +5,18 @@
 
 package org.mozilla.gecko.toolbar;
 
+import java.util.Arrays;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.Tabs;
+
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
 
 /**
  * A base implementations of the browser toolbar for tablets.
@@ -14,8 +24,100 @@ import android.util.AttributeSet;
  */
 abstract class BrowserToolbarTabletBase extends BrowserToolbar {
 
+    protected enum ForwardButtonAnimation {
+        SHOW,
+        HIDE
+    }
+
+    protected final BackButton backButton;
+    protected final ForwardButton forwardButton;
+
+    protected abstract void animateForwardButton(ForwardButtonAnimation animation);
+
     public BrowserToolbarTabletBase(final Context context, final AttributeSet attrs) {
         super(context, attrs);
-        // TODO: Implement.
+
+        backButton = (BackButton) findViewById(R.id.back);
+        setButtonEnabled(backButton, false);
+        forwardButton = (ForwardButton) findViewById(R.id.forward);
+        setButtonEnabled(forwardButton, false);
+        initButtonListeners();
+
+        focusOrder.addAll(Arrays.asList(tabsButton, (View) backButton, (View) forwardButton, this));
+        focusOrder.addAll(urlDisplayLayout.getFocusOrder());
+        focusOrder.addAll(Arrays.asList(actionItemBar, menuButton));
+    }
+
+    private void initButtonListeners() {
+        backButton.setOnClickListener(new Button.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Tabs.getInstance().getSelectedTab().doBack();
+            }
+        });
+        backButton.setOnLongClickListener(new Button.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View view) {
+                return Tabs.getInstance().getSelectedTab().showBackHistory();
+            }
+        });
+
+        forwardButton.setOnClickListener(new Button.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Tabs.getInstance().getSelectedTab().doForward();
+            }
+        });
+        forwardButton.setOnLongClickListener(new Button.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View view) {
+                return Tabs.getInstance().getSelectedTab().showForwardHistory();
+            }
+        });
+    }
+
+    @Override
+    protected void updateNavigationButtons(final Tab tab) {
+        setButtonEnabled(backButton, canDoBack(tab));
+
+        final boolean isForwardEnabled = canDoForward(tab);
+        if (forwardButton.isEnabled() != isForwardEnabled) {
+            // Save the state on the forward button so that we can skip animations
+            // when there's nothing to change
+            setButtonEnabled(forwardButton, isForwardEnabled);
+            animateForwardButton(
+                    isForwardEnabled ? ForwardButtonAnimation.SHOW : ForwardButtonAnimation.HIDE);
+        }
+    }
+
+    @Override
+    public void setNextFocusDownId(int nextId) {
+        super.setNextFocusDownId(nextId);
+        backButton.setNextFocusDownId(nextId);
+        forwardButton.setNextFocusDownId(nextId);
+    }
+
+    @Override
+    public void setPrivateMode(final boolean isPrivate) {
+        super.setPrivateMode(isPrivate);
+        backButton.setPrivateMode(isPrivate);
+        forwardButton.setPrivateMode(isPrivate);
+    }
+
+    protected boolean canDoBack(final Tab tab) {
+        return (tab.canDoBack() && !isEditing());
+    }
+
+    protected boolean canDoForward(final Tab tab) {
+        return (tab.canDoForward() && !isEditing());
+    }
+
+    protected static void setButtonEnabled(final ImageButton button, final boolean enabled) {
+        final Drawable drawable = button.getDrawable();
+        if (drawable != null) {
+            drawable.setAlpha(enabled ? 255 : 61);
+        }
+
+        button.setEnabled(enabled);
     }
 }
diff --git a/mobile/android/base/toolbar/ToolbarDisplayLayout.java b/mobile/android/base/toolbar/ToolbarDisplayLayout.java
index a12e04fec7cc..bcf528ef4c0f 100644
--- a/mobile/android/base/toolbar/ToolbarDisplayLayout.java
+++ b/mobile/android/base/toolbar/ToolbarDisplayLayout.java
@@ -18,7 +18,7 @@ import org.mozilla.gecko.SiteIdentity.SecurityMode;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.ViewHelper;
-import org.mozilla.gecko.toolbar.BrowserToolbar.ForwardButtonAnimation;
+import org.mozilla.gecko.toolbar.BrowserToolbarTabletBase.ForwardButtonAnimation;
 import org.mozilla.gecko.util.StringUtils;
 import org.mozilla.gecko.widget.ThemedLinearLayout;
 import org.mozilla.gecko.widget.ThemedTextView;

From b030a831ec42c8b52d5416737528261f35de1b74 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 27 Aug 2014 15:34:03 -0700
Subject: [PATCH 009/109] Bug 1046203 - Part 4: Remove unused views and move
 actionItemBar to TabletBase. r=lucasr

---
 .../layout-large-v11/browser_toolbar.xml         |  4 ++--
 .../base/resources/layout/browser_toolbar.xml    |  9 ---------
 mobile/android/base/resources/values/styles.xml  |  7 -------
 mobile/android/base/toolbar/BrowserToolbar.java  | 16 ++--------------
 .../base/toolbar/BrowserToolbarPhone.java        |  3 ---
 .../base/toolbar/BrowserToolbarPhoneBase.java    | 12 ++++++++++++
 .../base/toolbar/BrowserToolbarPreHC.java        |  1 -
 .../base/toolbar/BrowserToolbarTabletBase.java   | 16 ++++++++++++++++
 8 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
index 5acb7dea5a39..dff245d95f11 100644
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -35,7 +35,7 @@
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:layout_toRightOf="@id/tabs"
-               android:layout_toLeftOf="@id/menu_items"
+               android:layout_toLeftOf="@+id/menu_items"
                android:layout_marginLeft="-18dp"
                android:layout_marginTop="8dp"
                android:layout_marginBottom="8dp"
@@ -76,7 +76,7 @@
                   android:paddingLeft="8dip"
                   android:paddingRight="8dip"/>
 
-    <LinearLayout android:id="@+id/menu_items"
+    <LinearLayout android:id="@id/menu_items"
                   android:layout_width="wrap_content"
                   android:layout_height="match_parent"
                   android:layout_marginLeft="3dp"
diff --git a/mobile/android/base/resources/layout/browser_toolbar.xml b/mobile/android/base/resources/layout/browser_toolbar.xml
index 0d58f903c357..7956b9e62a29 100644
--- a/mobile/android/base/resources/layout/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -5,12 +5,6 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <ImageButton android:id="@+id/back"
-                 style="@style/UrlBar.ImageButton.Unused"/>
-
-    <ImageButton android:id="@+id/forward"
-                 style="@style/UrlBar.ImageButton.Unused"/>
-
     <!-- Note: any layout parameters setting the right edge of
          this View should be matched in the url_bar_translating_edge.
 
@@ -47,9 +41,6 @@
                android:src="@drawable/url_bar_translating_edge"
                android:scaleType="fitXY"/>
 
-    <LinearLayout android:id="@+id/menu_items"
-                  style="@style/UrlBar.ImageButton.Unused"/>
-
     <org.mozilla.gecko.toolbar.ShapedButton android:id="@+id/menu"
                                             style="@style/UrlBar.ImageButton"
                                             android:layout_alignParentRight="true"
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 0a68ab10f30f..b5e74fbdca2b 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -457,13 +457,6 @@
         <item name="android:background">@android:color/transparent</item>
     </style>
 
-    <!-- URL bar - Image Button - Unused -->
-    <style name="UrlBar.ImageButton.Unused">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_height">0dip</item>
-        <item name="android:visibility">gone</item>
-    </style>
-
     <!-- URL bar - Image Button - Icon -->
     <style name="UrlBar.ImageButton.Icon">
          <item name="android:layout_width">@dimen/browser_toolbar_icon_width</item>
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index bd18d011c8b7..38fe39ea07d0 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -123,7 +123,6 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
     protected final TabCounter tabsCounter;
     protected final ThemedImageButton menuButton;
     protected final ThemedImageView menuIcon;
-    protected final LinearLayout actionItemBar;
     private MenuPopup menuPopup;
     protected final List<View> focusOrder;
 
@@ -205,7 +204,6 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
 
         menuButton = (ThemedImageButton) findViewById(R.id.menu);
         menuIcon = (ThemedImageView) findViewById(R.id.menu_icon);
-        actionItemBar = (LinearLayout) findViewById(R.id.menu_items);
         hasSoftMenuButton = !HardwareUtils.hasMenuButton();
 
         editCancel = (ThemedImageView) findViewById(R.id.edit_cancel);
@@ -652,7 +650,8 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
                 continue;
             }
 
-            if (view == actionItemBar) {
+            if (view.getId() == R.id.menu_items) {
+                final LinearLayout actionItemBar = (LinearLayout) view;
                 final int childCount = actionItemBar.getChildCount();
                 for (int child = 0; child < childCount; child++) {
                     View childView = actionItemBar.getChildAt(child);
@@ -897,17 +896,6 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
         return url;
     }
 
-    @Override
-    public boolean addActionItem(View actionItem) {
-        actionItemBar.addView(actionItem);
-        return true;
-    }
-
-    @Override
-    public void removeActionItem(View actionItem) {
-        actionItemBar.removeView(actionItem);
-    }
-
     @Override
     public void setPrivateMode(boolean isPrivate) {
         super.setPrivateMode(isPrivate);
diff --git a/mobile/android/base/toolbar/BrowserToolbarPhone.java b/mobile/android/base/toolbar/BrowserToolbarPhone.java
index 132ed4f3443d..962771c825d8 100644
--- a/mobile/android/base/toolbar/BrowserToolbarPhone.java
+++ b/mobile/android/base/toolbar/BrowserToolbarPhone.java
@@ -118,9 +118,6 @@ class BrowserToolbarPhone extends BrowserToolbarPhoneBase {
         animator.attach(tabsCounter,
                         PropertyAnimator.Property.TRANSLATION_X,
                         curveTranslation);
-        animator.attach(actionItemBar,
-                        PropertyAnimator.Property.TRANSLATION_X,
-                        curveTranslation);
 
         if (!HardwareUtils.hasMenuButton()) {
             animator.attach(menuButton,
diff --git a/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
index 3d0295e7c66d..062d45a3f3dd 100644
--- a/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
+++ b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
@@ -16,6 +16,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.ImageView;
 
 /**
@@ -54,6 +55,17 @@ abstract class BrowserToolbarPhoneBase extends BrowserToolbar {
         roundCornerPaint.setStrokeWidth(0.0f);
     }
 
+    @Override
+    public boolean addActionItem(final View actionItem) {
+        // We have no action item bar.
+        return false;
+    }
+
+    @Override
+    public void removeActionItem(final View actionItem) {
+        // We have no action item bar.
+    }
+
     @Override
     protected void updateNavigationButtons(final Tab tab) {
         // We have no navigation buttons so do nothing.
diff --git a/mobile/android/base/toolbar/BrowserToolbarPreHC.java b/mobile/android/base/toolbar/BrowserToolbarPreHC.java
index fc8a52b036ab..454c9a63524d 100644
--- a/mobile/android/base/toolbar/BrowserToolbarPreHC.java
+++ b/mobile/android/base/toolbar/BrowserToolbarPreHC.java
@@ -58,7 +58,6 @@ class BrowserToolbarPreHC extends BrowserToolbarPhoneBase {
         ViewHelper.setTranslationX(urlBarTranslatingEdge, entryTranslation);
         ViewHelper.setTranslationX(tabsButton, curveTranslation);
         ViewHelper.setTranslationX(tabsCounter, curveTranslation);
-        ViewHelper.setTranslationX(actionItemBar, curveTranslation);
 
         if (!HardwareUtils.hasMenuButton()) {
             // Prevent tabs through the editing mode cancel button (bug 1001243).
diff --git a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
index 2561634ccadf..8c0b2824eebe 100644
--- a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
+++ b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
@@ -17,6 +17,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageButton;
+import android.widget.LinearLayout;
 
 /**
  * A base implementations of the browser toolbar for tablets.
@@ -29,6 +30,8 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
         HIDE
     }
 
+    protected final LinearLayout actionItemBar;
+
     protected final BackButton backButton;
     protected final ForwardButton forwardButton;
 
@@ -37,6 +40,8 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
     public BrowserToolbarTabletBase(final Context context, final AttributeSet attrs) {
         super(context, attrs);
 
+        actionItemBar = (LinearLayout) findViewById(R.id.menu_items);
+
         backButton = (BackButton) findViewById(R.id.back);
         setButtonEnabled(backButton, false);
         forwardButton = (ForwardButton) findViewById(R.id.forward);
@@ -76,6 +81,17 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
         });
     }
 
+    @Override
+    public boolean addActionItem(final View actionItem) {
+        actionItemBar.addView(actionItem);
+        return true;
+    }
+
+    @Override
+    public void removeActionItem(final View actionItem) {
+        actionItemBar.removeView(actionItem);
+    }
+
     @Override
     protected void updateNavigationButtons(final Tab tab) {
         setButtonEnabled(backButton, canDoBack(tab));

From 9bdbcb249d9d1647d806808a9f05eed32140550d Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 27 Aug 2014 15:34:03 -0700
Subject: [PATCH 010/109] Bug 1046203 - Part 5: Remove final isTablet
 invocations in BrowserToolbar. r=lucasr

---
 mobile/android/base/BrowserApp.java           |  2 +-
 .../android/base/toolbar/BrowserToolbar.java  | 88 ++-----------------
 .../base/toolbar/BrowserToolbarPhoneBase.java | 57 ++++++++++++
 .../toolbar/BrowserToolbarTabletBase.java     | 28 ++++++
 4 files changed, 94 insertions(+), 81 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index c9f4b849cac3..0be548042e49 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -1600,7 +1600,7 @@ public class BrowserApp extends GeckoApp
         }
 
         mTabsPanel.prepareTabsAnimation(mMainLayoutAnimator);
-        mBrowserToolbar.prepareTabsAnimation(mMainLayoutAnimator, areTabsShown());
+        mBrowserToolbar.triggerTabsPanelTransition(mMainLayoutAnimator, areTabsShown());
 
         // If the tabs layout is animating onto the screen, pin the dynamic
         // toolbar.
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index 38fe39ea07d0..34f253df7e3b 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -52,8 +52,6 @@ import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.Interpolator;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.LinearLayout;
@@ -133,25 +131,26 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
     private OnStartEditingListener startEditingListener;
     private OnStopEditingListener stopEditingListener;
 
-    private final BrowserApp activity;
-    private boolean hasSoftMenuButton;
+    protected final BrowserApp activity;
+    protected boolean hasSoftMenuButton;
 
     protected UIMode uiMode;
 
     private final Paint shadowPaint;
     private final int shadowSize;
 
-    private static final Interpolator buttonsInterpolator = new AccelerateInterpolator();
-
     private final LightweightTheme theme;
     private final ToolbarPrefs prefs;
 
     public abstract boolean isAnimating();
 
+    protected abstract boolean isTabsButtonOffscreen();
+
     protected abstract void updateNavigationButtons(Tab tab);
 
     protected abstract void triggerStartEditingTransition(PropertyAnimator animator);
     protected abstract void triggerStopEditingTransition();
+    public abstract void triggerTabsPanelTransition(PropertyAnimator animator, boolean areTabsShown);
 
     public static BrowserToolbar create(final Context context, final AttributeSet attrs) {
         final BrowserToolbar toolbar;
@@ -535,7 +534,7 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
         }
     }
 
-    private boolean isVisible() {
+    protected boolean isVisible() {
         return ViewHelper.getTranslationY(this) == 0;
     }
 
@@ -547,10 +546,6 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
         menuButton.setNextFocusDownId(nextId);
     }
 
-    private void addTab() {
-        activity.addTab();
-    }
-
     private void toggleTabs() {
         if (activity.areTabsShown()) {
             if (activity.hasTabsSideBar())
@@ -571,32 +566,12 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
         }
     }
 
-    protected void updateTabCountAndAnimate(final int count) {
-        // Don't animate if the toolbar is hidden.
-        if (!isVisible()) {
-            updateTabCount(count);
-            return;
-        }
-
+    protected void updateTabCount(final int count) {
         // If toolbar is in edit mode on a phone, this means the entry is expanded
         // and the tabs button is translated offscreen. Don't trigger tabs counter
         // updates until the tabs button is back on screen.
         // See stopEditing()
-        if (!isEditing() || HardwareUtils.isTablet()) {
-            tabsCounter.setCount(count);
-
-            tabsButton.setContentDescription((count > 1) ?
-                                             activity.getString(R.string.num_tabs, count) :
-                                             activity.getString(R.string.one_tab));
-        }
-    }
-
-    private void updateTabCount(int count) {
-        // If toolbar is in edit mode on a phone, this means the entry is expanded
-        // and the tabs button is translated offscreen. Don't trigger tabs counter
-        // updates until the tabs button is back on screen.
-        // See stopEditing()
-        if (isEditing() && !HardwareUtils.isTablet()) {
+        if (isTabsButtonOffscreen()) {
             return;
         }
 
@@ -687,53 +662,6 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
         urlDisplayLayout.setTitle(title);
     }
 
-    public void prepareTabsAnimation(PropertyAnimator animator, boolean tabsAreShown) {
-        if (!tabsAreShown) {
-            PropertyAnimator buttonsAnimator =
-                    new PropertyAnimator(animator.getDuration(), buttonsInterpolator);
-
-            buttonsAnimator.attach(tabsCounter,
-                                   PropertyAnimator.Property.ALPHA,
-                                   1.0f);
-
-            if (hasSoftMenuButton && !HardwareUtils.isTablet()) {
-                buttonsAnimator.attach(menuIcon,
-                                       PropertyAnimator.Property.ALPHA,
-                                       1.0f);
-            }
-
-            buttonsAnimator.start();
-
-            return;
-        }
-
-        ViewHelper.setAlpha(tabsCounter, 0.0f);
-
-        if (hasSoftMenuButton && !HardwareUtils.isTablet()) {
-            ViewHelper.setAlpha(menuIcon, 0.0f);
-        }
-    }
-
-    public void finishTabsAnimation(boolean tabsAreShown) {
-        if (tabsAreShown) {
-            return;
-        }
-
-        PropertyAnimator animator = new PropertyAnimator(150);
-
-        animator.attach(tabsCounter,
-                        PropertyAnimator.Property.ALPHA,
-                        1.0f);
-
-        if (hasSoftMenuButton && !HardwareUtils.isTablet()) {
-            animator.attach(menuIcon,
-                            PropertyAnimator.Property.ALPHA,
-                            1.0f);
-        }
-
-        animator.start();
-    }
-
     public void setOnActivateListener(OnActivateListener listener) {
         activateListener = listener;
     }
diff --git a/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
index 062d45a3f3dd..b39ad4959c55 100644
--- a/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
+++ b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
@@ -9,6 +9,8 @@ import java.util.Arrays;
 
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.ViewHelper;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -17,6 +19,8 @@ import android.graphics.Paint;
 import android.graphics.Path;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.Interpolator;
 import android.widget.ImageView;
 
 /**
@@ -30,6 +34,8 @@ abstract class BrowserToolbarPhoneBase extends BrowserToolbar {
     private final Path roundCornerShape;
     private final Paint roundCornerPaint;
 
+    private final Interpolator buttonsInterpolator = new AccelerateInterpolator();
+
     public BrowserToolbarPhoneBase(final Context context, final AttributeSet attrs) {
         super(context, attrs);
         final Resources res = context.getResources();
@@ -55,6 +61,11 @@ abstract class BrowserToolbarPhoneBase extends BrowserToolbar {
         roundCornerPaint.setStrokeWidth(0.0f);
     }
 
+    @Override
+    protected boolean isTabsButtonOffscreen() {
+        return isEditing();
+    }
+
     @Override
     public boolean addActionItem(final View actionItem) {
         // We have no action item bar.
@@ -80,6 +91,31 @@ abstract class BrowserToolbarPhoneBase extends BrowserToolbar {
         }
     }
 
+    @Override
+    public void triggerTabsPanelTransition(final PropertyAnimator animator, final boolean areTabsShown) {
+        if (areTabsShown) {
+            ViewHelper.setAlpha(tabsCounter, 0.0f);
+            if (hasSoftMenuButton) {
+                ViewHelper.setAlpha(menuIcon, 0.0f);
+            }
+            return;
+        }
+
+        final PropertyAnimator buttonsAnimator =
+                new PropertyAnimator(animator.getDuration(), buttonsInterpolator);
+
+        buttonsAnimator.attach(tabsCounter,
+                               PropertyAnimator.Property.ALPHA,
+                               1.0f);
+        if (hasSoftMenuButton) {
+            buttonsAnimator.attach(menuIcon,
+                                   PropertyAnimator.Property.ALPHA,
+                                   1.0f);
+        }
+
+        buttonsAnimator.start();
+    }
+
     /**
      * Returns the number of pixels the url bar translating edge
      * needs to translate to the right to enter its editing mode state.
@@ -95,4 +131,25 @@ abstract class BrowserToolbarPhoneBase extends BrowserToolbar {
     protected int getUrlBarCurveTranslation() {
         return getWidth() - tabsButton.getLeft();
     }
+
+    protected void updateTabCountAndAnimate(final int count) {
+        // Don't animate if the toolbar is hidden.
+        if (!isVisible()) {
+            updateTabCount(count);
+            return;
+        }
+
+        // If toolbar is in edit mode on a phone, this means the entry is expanded
+        // and the tabs button is translated offscreen. Don't trigger tabs counter
+        // updates until the tabs button is back on screen.
+        // See stopEditing()
+        if (!isTabsButtonOffscreen()) {
+            tabsCounter.setCount(count);
+
+            tabsButton.setContentDescription((count > 1) ?
+                                             activity.getString(R.string.num_tabs, count) :
+                                             activity.getString(R.string.one_tab));
+        }
+    }
+
 }
diff --git a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
index 8c0b2824eebe..e0b0fccbc031 100644
--- a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
+++ b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
@@ -10,11 +10,15 @@ import java.util.Arrays;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.ViewHelper;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.Interpolator;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
@@ -35,6 +39,8 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
     protected final BackButton backButton;
     protected final ForwardButton forwardButton;
 
+    private final Interpolator buttonsInterpolator = new AccelerateInterpolator();
+
     protected abstract void animateForwardButton(ForwardButtonAnimation animation);
 
     public BrowserToolbarTabletBase(final Context context, final AttributeSet attrs) {
@@ -81,6 +87,11 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
         });
     }
 
+    @Override
+    protected boolean isTabsButtonOffscreen() {
+        return false;
+    }
+
     @Override
     public boolean addActionItem(final View actionItem) {
         actionItemBar.addView(actionItem);
@@ -120,6 +131,23 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
         forwardButton.setPrivateMode(isPrivate);
     }
 
+    @Override
+    public void triggerTabsPanelTransition(final PropertyAnimator animator, final boolean areTabsShown) {
+        if (areTabsShown) {
+            ViewHelper.setAlpha(tabsCounter, 0.0f);
+            return;
+        }
+
+        final PropertyAnimator buttonsAnimator =
+                new PropertyAnimator(animator.getDuration(), buttonsInterpolator);
+
+        buttonsAnimator.attach(tabsCounter,
+                               PropertyAnimator.Property.ALPHA,
+                               1.0f);
+
+        buttonsAnimator.start();
+    }
+
     protected boolean canDoBack(final Tab tab) {
         return (tab.canDoBack() && !isEditing());
     }

From c23cada3af06e4d1ce3850c2e65c56085da5d82e Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 27 Aug 2014 15:34:04 -0700
Subject: [PATCH 011/109] Bug 1046203 - Part 6: Copy-pasta rough
 BrowserToolbarNewTablet forward button behavior. r=margaret

---
 .../new_tablet_browser_toolbar.xml            |   4 +-
 .../base/toolbar/BrowserToolbarNewTablet.java | 101 +++++++++++++++++-
 2 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
index b3fec70e9e24..d0cd4b4c6cb9 100644
--- a/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
@@ -22,9 +22,7 @@
 
     <org.mozilla.gecko.toolbar.ForwardButton style="@style/UrlBar.ImageButton.Forward"
                                              android:id="@+id/forward"
-                                             android:layout_marginLeft="-15dp"
-                                             android:layout_alignLeft="@id/url_bar_entry"
-/>
+                                             android:layout_alignLeft="@id/url_bar_entry"/>
 
     <org.mozilla.gecko.toolbar.BackButton android:id="@+id/back"
                                           style="@style/UrlBar.ImageButton"
diff --git a/mobile/android/base/toolbar/BrowserToolbarNewTablet.java b/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
index 82a296a8e1d1..d2ec71dde134 100644
--- a/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
+++ b/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
@@ -5,10 +5,14 @@
 
 package org.mozilla.gecko.toolbar;
 
+import org.mozilla.gecko.R;
 import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.ViewHelper;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.util.AttributeSet;
+import android.view.View;
 
 /**
  * A toolbar implementation for the tablet redesign (bug 1014156).
@@ -16,8 +20,17 @@ import android.util.AttributeSet;
  */
 class BrowserToolbarNewTablet extends BrowserToolbarTabletBase {
 
+    private static final int FORWARD_ANIMATION_DURATION = 450;
+
+    private final int urlBarViewOffset;
+    private final int defaultForwardMargin;
+
     public BrowserToolbarNewTablet(final Context context, final AttributeSet attrs) {
         super(context, attrs);
+
+        final Resources res = getResources();
+        urlBarViewOffset = res.getDimensionPixelSize(R.dimen.url_bar_offset_left);
+        defaultForwardMargin = res.getDimensionPixelSize(R.dimen.forward_default_offset);
     }
 
     @Override
@@ -35,8 +48,94 @@ class BrowserToolbarNewTablet extends BrowserToolbarTabletBase {
         hideUrlEditLayout();
     }
 
+    // TODO: Copy-pasta from BrowserToolbarTablet - implement a correctly working version.
     @Override
     protected void animateForwardButton(final ForwardButtonAnimation animation) {
-        // TODO: Implement.
+        // If the forward button is not visible, we must be
+        // in the phone UI.
+        if (forwardButton.getVisibility() != View.VISIBLE) {
+            return;
+        }
+
+        final boolean showing = (animation == ForwardButtonAnimation.SHOW);
+
+        // if the forward button's margin is non-zero, this means it has already
+        // been animated to be visible¸ and vice-versa.
+        MarginLayoutParams fwdParams = (MarginLayoutParams) forwardButton.getLayoutParams();
+        if ((fwdParams.leftMargin > defaultForwardMargin && showing) ||
+            (fwdParams.leftMargin == defaultForwardMargin && !showing)) {
+            return;
+        }
+
+        // We want the forward button to show immediately when switching tabs
+        final PropertyAnimator forwardAnim =
+                new PropertyAnimator(isSwitchingTabs ? 10 : FORWARD_ANIMATION_DURATION);
+        final int width = Math.round(forwardButton.getWidth() * .75f);
+
+        forwardAnim.addPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
+            @Override
+            public void onPropertyAnimationStart() {
+                if (!showing) {
+                    // Set the margin before the transition when hiding the forward button. We
+                    // have to do this so that the favicon isn't clipped during the transition
+                    MarginLayoutParams layoutParams =
+                        (MarginLayoutParams) urlDisplayLayout.getLayoutParams();
+                    layoutParams.leftMargin = 0;
+
+                    // Do the same on the URL edit container
+                    layoutParams = (MarginLayoutParams) urlEditLayout.getLayoutParams();
+                    layoutParams.leftMargin = 0;
+
+                    requestLayout();
+                    // Note, we already translated the favicon, site security, and text field
+                    // in prepareForwardAnimation, so they should appear to have not moved at
+                    // all at this point.
+                }
+            }
+
+            @Override
+            public void onPropertyAnimationEnd() {
+                if (showing) {
+                    MarginLayoutParams layoutParams =
+                        (MarginLayoutParams) urlDisplayLayout.getLayoutParams();
+                    layoutParams.leftMargin = urlBarViewOffset;
+
+                    layoutParams = (MarginLayoutParams) urlEditLayout.getLayoutParams();
+                    layoutParams.leftMargin = urlBarViewOffset;
+                }
+
+                urlDisplayLayout.finishForwardAnimation();
+
+                MarginLayoutParams layoutParams = (MarginLayoutParams) forwardButton.getLayoutParams();
+                layoutParams.leftMargin = defaultForwardMargin + (showing ? width : 0);
+                ViewHelper.setTranslationX(forwardButton, 0);
+
+                requestLayout();
+            }
+        });
+
+        prepareForwardAnimation(forwardAnim, animation, width);
+        forwardAnim.start();
+    }
+
+    private void prepareForwardAnimation(PropertyAnimator anim, ForwardButtonAnimation animation, int width) {
+        if (animation == ForwardButtonAnimation.HIDE) {
+            anim.attach(forwardButton,
+                      PropertyAnimator.Property.TRANSLATION_X,
+                      -width);
+            anim.attach(forwardButton,
+                      PropertyAnimator.Property.ALPHA,
+                      0);
+
+        } else {
+            anim.attach(forwardButton,
+                      PropertyAnimator.Property.TRANSLATION_X,
+                      width);
+            anim.attach(forwardButton,
+                      PropertyAnimator.Property.ALPHA,
+                      1);
+        }
+
+        urlDisplayLayout.prepareForwardAnimation(anim, animation, width);
     }
 }

From 3f7e90705fe072e4a716451308d885f8a7ff7bf3 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 27 Aug 2014 16:14:39 -0700
Subject: [PATCH 012/109] Bug 1057651 - Remove unnecessary padding on
 edit_cancel in new_tablet_browser_toolbar. r=lucasr

---
 .../resources/layout-large-v11/new_tablet_browser_toolbar.xml   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
index d0cd4b4c6cb9..ac38cc2120f6 100644
--- a/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
@@ -103,8 +103,6 @@
             style="@style/UrlBar.ImageButton.Icon"
             android:layout_alignParentRight="true"
             android:src="@drawable/close_edit_mode_selector"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
             android:contentDescription="@string/edit_mode_cancel"
             android:visibility="gone"/>
 

From 0d8c52185dd515c0a22045878baba059eb44584a Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Wed, 27 Aug 2014 15:45:23 +0100
Subject: [PATCH 013/109] Bug 1046209 - Part 1: Rename TabsTray to
 TabsListLayout (r=lucasr)

--HG--
rename : mobile/android/base/tabs/TabsTray.java => mobile/android/base/tabs/TabsListLayout.java
---
 mobile/android/base/moz.build                 |  2 +-
 .../layout-large-land-v11/tabs_panel.xml      | 14 ++++----
 .../resources/layout/private_tabs_panel.xml   | 14 ++++----
 .../base/resources/layout/tabs_panel.xml      | 14 ++++----
 .../android/base/tabs/PrivateTabsPanel.java   |  4 +--
 .../{TabsTray.java => TabsListLayout.java}    | 36 +++++++++----------
 6 files changed, 42 insertions(+), 42 deletions(-)
 rename mobile/android/base/tabs/{TabsTray.java => TabsListLayout.java} (94%)

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 577a80491908..c083c5ed7024 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -392,8 +392,8 @@ gbjar.sources += [
     'tabs/RemoteTabsSetupPanel.java',
     'tabs/RemoteTabsVerificationPanel.java',
     'tabs/TabCurve.java',
+    'tabs/TabsListLayout.java',
     'tabs/TabsPanel.java',
-    'tabs/TabsTray.java',
     'TabsAccessor.java',
     'Telemetry.java',
     'TelemetryContract.java',
diff --git a/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml b/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
index 80f34c2f6ae9..b356fc971010 100644
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
+++ b/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
@@ -32,13 +32,13 @@
           android:layout_height="0dip"
           android:layout_weight="1.0">
 
-        <org.mozilla.gecko.tabs.TabsTray android:id="@+id/normal_tabs"
-                                         style="@style/TabsList"
-                                         android:layout_width="match_parent"
-                                         android:layout_height="match_parent"
-                                         android:choiceMode="singleChoice"
-                                         android:visibility="gone"
-                                         gecko:tabs="tabs_normal"/>
+        <org.mozilla.gecko.tabs.TabsListLayout android:id="@+id/normal_tabs"
+                                               style="@style/TabsList"
+                                               android:layout_width="match_parent"
+                                               android:layout_height="match_parent"
+                                               android:choiceMode="singleChoice"
+                                               android:visibility="gone"
+                                               gecko:tabs="tabs_normal"/>
 
         <org.mozilla.gecko.tabs.PrivateTabsPanel
                 android:id="@+id/private_tabs_panel"
diff --git a/mobile/android/base/resources/layout/private_tabs_panel.xml b/mobile/android/base/resources/layout/private_tabs_panel.xml
index daea1a6874da..73197ca7a786 100644
--- a/mobile/android/base/resources/layout/private_tabs_panel.xml
+++ b/mobile/android/base/resources/layout/private_tabs_panel.xml
@@ -45,13 +45,13 @@
 
     </ScrollView>
 
-    <!-- Note: for an unknown reason, scrolling in the TabsTray
+    <!-- Note: for an unknown reason, scrolling in the TabsListLayout
          does not work unless it is laid out after the empty view. -->
-    <org.mozilla.gecko.tabs.TabsTray android:id="@+id/private_tabs_tray"
-                                     style="@style/TabsList"
-                                     android:layout_width="match_parent"
-                                     android:layout_height="match_parent"
-                                     android:choiceMode="singleChoice"
-                                     gecko:tabs="tabs_private"/>
+    <org.mozilla.gecko.tabs.TabsListLayout android:id="@+id/private_tabs_tray"
+                                           style="@style/TabsList"
+                                           android:layout_width="match_parent"
+                                           android:layout_height="match_parent"
+                                           android:choiceMode="singleChoice"
+                                           gecko:tabs="tabs_private"/>
 
 </merge>
diff --git a/mobile/android/base/resources/layout/tabs_panel.xml b/mobile/android/base/resources/layout/tabs_panel.xml
index 4a481c0f367e..80a7b3cca19d 100644
--- a/mobile/android/base/resources/layout/tabs_panel.xml
+++ b/mobile/android/base/resources/layout/tabs_panel.xml
@@ -31,13 +31,13 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content">
 
-        <org.mozilla.gecko.tabs.TabsTray android:id="@+id/normal_tabs"
-                                         style="@style/TabsList"
-                                         android:layout_width="match_parent"
-                                         android:layout_height="match_parent"
-                                         android:choiceMode="singleChoice"
-                                         android:visibility="gone"
-                                         gecko:tabs="tabs_normal"/>
+        <org.mozilla.gecko.tabs.TabsListLayout android:id="@+id/normal_tabs"
+                                               style="@style/TabsList"
+                                               android:layout_width="match_parent"
+                                               android:layout_height="match_parent"
+                                               android:choiceMode="singleChoice"
+                                               android:visibility="gone"
+                                               gecko:tabs="tabs_normal"/>
 
         <org.mozilla.gecko.tabs.PrivateTabsPanel
                 android:id="@+id/private_tabs_panel"
diff --git a/mobile/android/base/tabs/PrivateTabsPanel.java b/mobile/android/base/tabs/PrivateTabsPanel.java
index 6e4a28024116..353824747f46 100644
--- a/mobile/android/base/tabs/PrivateTabsPanel.java
+++ b/mobile/android/base/tabs/PrivateTabsPanel.java
@@ -26,13 +26,13 @@ import android.widget.FrameLayout;
  */
 class PrivateTabsPanel extends FrameLayout implements CloseAllPanelView {
     private TabsPanel tabsPanel;
-    private TabsTray tabsTray;
+    private TabsListLayout tabsTray;
 
     public PrivateTabsPanel(Context context, AttributeSet attrs) {
         super(context, attrs);
 
         LayoutInflater.from(context).inflate(R.layout.private_tabs_panel, this);
-        tabsTray = (TabsTray) findViewById(R.id.private_tabs_tray);
+        tabsTray = (TabsListLayout) findViewById(R.id.private_tabs_tray);
 
         final View emptyView = findViewById(R.id.private_tabs_empty);
         tabsTray.setEmptyView(emptyView);
diff --git a/mobile/android/base/tabs/TabsTray.java b/mobile/android/base/tabs/TabsListLayout.java
similarity index 94%
rename from mobile/android/base/tabs/TabsTray.java
rename to mobile/android/base/tabs/TabsListLayout.java
index 446202f7aa1d..62ca780a6bca 100644
--- a/mobile/android/base/tabs/TabsTray.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -38,9 +38,9 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-class TabsTray extends TwoWayView
-               implements TabsPanel.CloseAllPanelView {
-    private static final String LOGTAG = "Gecko" + TabsTray.class.getSimpleName();
+class TabsListLayout extends TwoWayView implements
+                           TabsPanel.CloseAllPanelView {
+    private static final String LOGTAG = "Gecko" + TabsListLayout.class.getSimpleName();
 
     private Context mContext;
     private TabsPanel mTabsPanel;
@@ -63,7 +63,7 @@ class TabsTray extends TwoWayView
 
     private int mOriginalSize;
 
-    public TabsTray(Context context, AttributeSet attrs) {
+    public TabsListLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContext = context;
 
@@ -181,7 +181,7 @@ class TabsTray extends TwoWayView
                 case THUMBNAIL:
                 case TITLE:
                 case RECORDING_CHANGE:
-                    View view = TabsTray.this.getChildAt(getPositionForTab(tab) - TabsTray.this.getFirstVisiblePosition());
+                    View view = TabsListLayout.this.getChildAt(getPositionForTab(tab) - TabsListLayout.this.getFirstVisiblePosition());
                     if (view == null)
                         return;
 
@@ -212,7 +212,7 @@ class TabsTray extends TwoWayView
             updateSelectedStyle(selected);
 
             if (selected != -1) {
-                TabsTray.this.setSelection(selected);
+                TabsListLayout.this.setSelection(selected);
             }
         }
 
@@ -223,7 +223,7 @@ class TabsTray extends TwoWayView
          */
         private void updateSelectedStyle(int selected) {
             for (int i = 0; i < getCount(); i++) {
-                TabsTray.this.setItemChecked(i, (i == selected));
+                TabsListLayout.this.setItemChecked(i, (i == selected));
             }
         }
 
@@ -373,7 +373,7 @@ class TabsTray extends TwoWayView
                     autoHidePanel();
 
                     // Re-enable the view after the animation is done.
-                    TabsTray.this.setEnabled(true);
+                    TabsListLayout.this.setEnabled(true);
 
                     // Then actually close all the tabs.
                     final Iterable<Tab> tabs = Tabs.getInstance().getTabsInOrder();
@@ -512,7 +512,7 @@ class TabsTray extends TwoWayView
         public TabSwipeGestureListener() {
             mEnabled = true;
 
-            ViewConfiguration vc = ViewConfiguration.get(TabsTray.this.getContext());
+            ViewConfiguration vc = ViewConfiguration.get(TabsListLayout.this.getContext());
             mSwipeThreshold = vc.getScaledTouchSlop();
             mMinFlingVelocity = (int) (getContext().getResources().getDisplayMetrics().density * MIN_VELOCITY);
             mMaxFlingVelocity = vc.getScaledMaximumFlingVelocity();
@@ -541,8 +541,8 @@ class TabsTray extends TwoWayView
                 return false;
 
             if (mListWidth < 2 || mListHeight < 2) {
-                mListWidth = TabsTray.this.getWidth();
-                mListHeight = TabsTray.this.getHeight();
+                mListWidth = TabsListLayout.this.getWidth();
+                mListHeight = TabsListLayout.this.getHeight();
             }
 
             switch (e.getActionMasked()) {
@@ -663,7 +663,7 @@ class TabsTray extends TwoWayView
 
                     if (isSwipingToClose) {
                         mSwiping = true;
-                        TabsTray.this.requestDisallowInterceptTouchEvent(true);
+                        TabsListLayout.this.requestDisallowInterceptTouchEvent(true);
 
                         TabRow tab = (TabRow) mSwipeView.getTag();
                         tab.close.setVisibility(View.INVISIBLE);
@@ -673,7 +673,7 @@ class TabsTray extends TwoWayView
                         MotionEvent cancelEvent = MotionEvent.obtain(e);
                         cancelEvent.setAction(MotionEvent.ACTION_CANCEL |
                                 (e.getActionIndex() << MotionEvent.ACTION_POINTER_INDEX_SHIFT));
-                        TabsTray.this.onTouchEvent(cancelEvent);
+                        TabsListLayout.this.onTouchEvent(cancelEvent);
                         cancelEvent.recycle();
                     }
 
@@ -700,13 +700,13 @@ class TabsTray extends TwoWayView
             Rect rect = new Rect();
 
             int[] listViewCoords = new int[2];
-            TabsTray.this.getLocationOnScreen(listViewCoords);
+            TabsListLayout.this.getLocationOnScreen(listViewCoords);
 
             int x = (int) rawX - listViewCoords[0];
             int y = (int) rawY - listViewCoords[1];
 
-            for (int i = 0; i < TabsTray.this.getChildCount(); i++) {
-                View child = TabsTray.this.getChildAt(i);
+            for (int i = 0; i < TabsListLayout.this.getChildCount(); i++) {
+                View child = TabsListLayout.this.getChildAt(i);
                 child.getHitRect(rect);
 
                 if (rect.contains(x, y))
@@ -720,14 +720,14 @@ class TabsTray extends TwoWayView
             if (mPendingCheckForTap == null)
                 mPendingCheckForTap = new CheckForTap();
 
-            TabsTray.this.postDelayed(mPendingCheckForTap, ViewConfiguration.getTapTimeout());
+            TabsListLayout.this.postDelayed(mPendingCheckForTap, ViewConfiguration.getTapTimeout());
         }
 
         private void cancelCheckForTap() {
             if (mPendingCheckForTap == null)
                 return;
 
-            TabsTray.this.removeCallbacks(mPendingCheckForTap);
+            TabsListLayout.this.removeCallbacks(mPendingCheckForTap);
         }
 
         private class CheckForTap implements Runnable {

From a688d971da0ac456dd5a7741259d65506c7bdf6f Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Wed, 27 Aug 2014 16:17:59 +0100
Subject: [PATCH 014/109] Bug 1046209 - Part 2: Extract TabsLayout interface
 (r=lucasr)

---
 mobile/android/base/tabs/PrivateTabsPanel.java | 17 +++++++++--------
 mobile/android/base/tabs/TabsListLayout.java   |  5 +++--
 mobile/android/base/tabs/TabsPanel.java        |  4 ++++
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/mobile/android/base/tabs/PrivateTabsPanel.java b/mobile/android/base/tabs/PrivateTabsPanel.java
index 353824747f46..5d0629ecdfd5 100644
--- a/mobile/android/base/tabs/PrivateTabsPanel.java
+++ b/mobile/android/base/tabs/PrivateTabsPanel.java
@@ -11,6 +11,7 @@ import org.mozilla.gecko.BrowserLocaleManager;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.tabs.TabsPanel.CloseAllPanelView;
+import org.mozilla.gecko.tabs.TabsPanel.TabsLayout;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -26,16 +27,16 @@ import android.widget.FrameLayout;
  */
 class PrivateTabsPanel extends FrameLayout implements CloseAllPanelView {
     private TabsPanel tabsPanel;
-    private TabsListLayout tabsTray;
+    private TabsLayout tabsLayout;
 
     public PrivateTabsPanel(Context context, AttributeSet attrs) {
         super(context, attrs);
 
         LayoutInflater.from(context).inflate(R.layout.private_tabs_panel, this);
-        tabsTray = (TabsListLayout) findViewById(R.id.private_tabs_tray);
+        tabsLayout = (TabsLayout) findViewById(R.id.private_tabs_tray);
 
         final View emptyView = findViewById(R.id.private_tabs_empty);
-        tabsTray.setEmptyView(emptyView);
+        tabsLayout.setEmptyView(emptyView);
 
         final View learnMore = findViewById(R.id.private_tabs_learn_more);
         learnMore.setOnClickListener(new OnClickListener() {
@@ -55,28 +56,28 @@ class PrivateTabsPanel extends FrameLayout implements CloseAllPanelView {
     @Override
     public void setTabsPanel(TabsPanel panel) {
         tabsPanel = panel;
-        tabsTray.setTabsPanel(panel);
+        tabsLayout.setTabsPanel(panel);
     }
 
     @Override
     public void show() {
-        tabsTray.show();
+        tabsLayout.show();
         setVisibility(View.VISIBLE);
     }
 
     @Override
     public void hide() {
         setVisibility(View.GONE);
-        tabsTray.hide();
+        tabsLayout.hide();
     }
 
     @Override
     public boolean shouldExpand() {
-        return tabsTray.shouldExpand();
+        return tabsLayout.shouldExpand();
     }
 
     @Override
     public void closeAll() {
-        tabsTray.closeAll();
+        tabsLayout.closeAll();
     }
 }
diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index 62ca780a6bca..8b0b8ce42886 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -14,6 +14,7 @@ import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.tabs.TabsPanel.TabsLayout;
 import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.PropertyAnimator.Property;
 import org.mozilla.gecko.animation.ViewHelper;
@@ -38,8 +39,8 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-class TabsListLayout extends TwoWayView implements
-                           TabsPanel.CloseAllPanelView {
+class TabsListLayout extends TwoWayView 
+                     implements TabsLayout {
     private static final String LOGTAG = "Gecko" + TabsListLayout.class.getSimpleName();
 
     private Context mContext;
diff --git a/mobile/android/base/tabs/TabsPanel.java b/mobile/android/base/tabs/TabsPanel.java
index 0d20309cf707..689257a2aad8 100644
--- a/mobile/android/base/tabs/TabsPanel.java
+++ b/mobile/android/base/tabs/TabsPanel.java
@@ -61,6 +61,10 @@ public class TabsPanel extends LinearLayout
         public void closeAll();
     }
 
+    public static interface TabsLayout extends CloseAllPanelView {
+        public void setEmptyView(View view);
+    }
+
     public static interface TabsLayoutChangeListener {
         public void onTabsLayoutChange(int width, int height);
     }

From d287fdf6d0da9c3b12a1e89f3d26bc7e9a90fcec Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Wed, 27 Aug 2014 17:11:56 +0100
Subject: [PATCH 015/109] Bug 1056169 - Factor out TabRow and rename it to
 TabsLayoutItemView (r=lucasr)

---
 mobile/android/base/moz.build                 |  1 +
 .../android/base/tabs/TabsLayoutItemView.java | 31 ++++++++
 mobile/android/base/tabs/TabsListLayout.java  | 72 +++++++------------
 3 files changed, 58 insertions(+), 46 deletions(-)
 create mode 100644 mobile/android/base/tabs/TabsLayoutItemView.java

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index c083c5ed7024..8dbb606940f5 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -392,6 +392,7 @@ gbjar.sources += [
     'tabs/RemoteTabsSetupPanel.java',
     'tabs/RemoteTabsVerificationPanel.java',
     'tabs/TabCurve.java',
+    'tabs/TabsLayoutItemView.java',
     'tabs/TabsListLayout.java',
     'tabs/TabsPanel.java',
     'TabsAccessor.java',
diff --git a/mobile/android/base/tabs/TabsLayoutItemView.java b/mobile/android/base/tabs/TabsLayoutItemView.java
new file mode 100644
index 000000000000..715d46347cf8
--- /dev/null
+++ b/mobile/android/base/tabs/TabsLayoutItemView.java
@@ -0,0 +1,31 @@
+/* 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/. */
+
+package org.mozilla.gecko.tabs;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.widget.TabThumbnailWrapper;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+public class TabsLayoutItemView {
+    int id;
+    TextView title;
+    ImageView thumbnail;
+    ImageButton close;
+    ViewGroup info;
+    TabThumbnailWrapper thumbnailWrapper;
+
+    public TabsLayoutItemView(View view) {
+        info = (ViewGroup) view;
+        title = (TextView) view.findViewById(R.id.title);
+        thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
+        close = (ImageButton) view.findViewById(R.id.close);
+        thumbnailWrapper = (TabThumbnailWrapper) view.findViewById(R.id.wrapper);
+    }
+}
\ No newline at end of file
diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index 8b0b8ce42886..dfe653895064 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -20,7 +20,6 @@ import org.mozilla.gecko.animation.PropertyAnimator.Property;
 import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.widget.TwoWayView;
-import org.mozilla.gecko.widget.TabThumbnailWrapper;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -35,11 +34,8 @@ import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.TextView;
 
-class TabsListLayout extends TwoWayView 
+class TabsListLayout extends TwoWayView
                      implements TabsLayout {
     private static final String LOGTAG = "Gecko" + TabsListLayout.class.getSimpleName();
 
@@ -86,9 +82,9 @@ class TabsListLayout extends TwoWayView
         setRecyclerListener(new RecyclerListener() {
             @Override
             public void onMovedToScrapHeap(View view) {
-                TabRow row = (TabRow) view.getTag();
-                row.thumbnail.setImageDrawable(null);
-                row.close.setVisibility(View.VISIBLE);
+                TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
+                item.thumbnail.setImageDrawable(null);
+                item.close.setVisibility(View.VISIBLE);
             }
         });
     }
@@ -123,23 +119,7 @@ class TabsListLayout extends TwoWayView
         mTabsPanel.autoHidePanel();
     }
 
-    // ViewHolder for a row in the list
-    private class TabRow {
-        int id;
-        TextView title;
-        ImageView thumbnail;
-        ImageButton close;
-        ViewGroup info;
-        TabThumbnailWrapper thumbnailWrapper;
 
-        public TabRow(View view) {
-            info = (ViewGroup) view;
-            title = (TextView) view.findViewById(R.id.title);
-            thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
-            close = (ImageButton) view.findViewById(R.id.close);
-            thumbnailWrapper = (TabThumbnailWrapper) view.findViewById(R.id.wrapper);
-        }
-    }
 
     // Adapter to bind tabs into a list
     private class TabsAdapter extends BaseAdapter implements Tabs.OnTabsChangedListener {
@@ -155,7 +135,7 @@ class TabsListLayout extends TwoWayView
             mOnCloseClickListener = new Button.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    TabRow tab = (TabRow) v.getTag();
+                    TabsLayoutItemView tab = (TabsLayoutItemView) v.getTag();
                     final int pos = (isVertical() ? tab.info.getWidth() : 0 - tab.info.getHeight());
                     animateClose(tab.info, pos);
                 }
@@ -186,8 +166,8 @@ class TabsListLayout extends TwoWayView
                     if (view == null)
                         return;
 
-                    TabRow row = (TabRow) view.getTag();
-                    assignValues(row, tab);
+                    TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
+                    assignValues(item, tab);
                     break;
             }
         }
@@ -265,23 +245,23 @@ class TabsListLayout extends TwoWayView
             }
         }
 
-        private void assignValues(TabRow row, Tab tab) {
-            if (row == null || tab == null)
+        private void assignValues(TabsLayoutItemView item, Tab tab) {
+            if (item == null || tab == null)
                 return;
 
-            row.id = tab.getId();
+            item.id = tab.getId();
 
             Drawable thumbnailImage = tab.getThumbnail();
             if (thumbnailImage != null) {
-                row.thumbnail.setImageDrawable(thumbnailImage);
+                item.thumbnail.setImageDrawable(thumbnailImage);
             } else {
-                row.thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
+                item.thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
             }
-            if (row.thumbnailWrapper != null) {
-                row.thumbnailWrapper.setRecording(tab.isRecording());
+            if (item.thumbnailWrapper != null) {
+                item.thumbnailWrapper.setRecording(tab.isRecording());
             }
-            row.title.setText(tab.getDisplayTitle());
-            row.close.setTag(row);
+            item.title.setText(tab.getDisplayTitle());
+            item.close.setTag(item);
         }
 
         private void resetTransforms(View view) {
@@ -305,22 +285,22 @@ class TabsListLayout extends TwoWayView
 
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
-            TabRow row;
+            TabsLayoutItemView item;
 
             if (convertView == null) {
                 convertView = mInflater.inflate(R.layout.tabs_row, null);
-                row = new TabRow(convertView);
-                row.close.setOnClickListener(mOnCloseClickListener);
-                convertView.setTag(row);
+                item = new TabsLayoutItemView(convertView);
+                item.close.setOnClickListener(mOnCloseClickListener);
+                convertView.setTag(item);
             } else {
-                row = (TabRow) convertView.getTag();
+                item = (TabsLayoutItemView) convertView.getTag();
                 // If we're recycling this view, there's a chance it was transformed during
                 // the close animation. Remove any of those properties.
                 resetTransforms(convertView);
             }
 
             Tab tab = mTabs.get(position);
-            assignValues(row, tab);
+            assignValues(item, tab);
 
             return convertView;
         }
@@ -443,7 +423,7 @@ class TabsListLayout extends TwoWayView
         else
             animator.attach(view, Property.WIDTH, 1);
 
-        TabRow tab = (TabRow)view.getTag();
+        TabsLayoutItemView tab = (TabsLayoutItemView)view.getTag();
         final int tabId = tab.id;
 
         // Caching this assumes that all rows are the same height
@@ -480,7 +460,7 @@ class TabsListLayout extends TwoWayView
             public void onPropertyAnimationStart() { }
             @Override
             public void onPropertyAnimationEnd() {
-                TabRow tab = (TabRow) view.getTag();
+                TabsLayoutItemView tab = (TabsLayoutItemView) view.getTag();
                 tab.close.setVisibility(View.VISIBLE);
             }
         });
@@ -578,7 +558,7 @@ class TabsListLayout extends TwoWayView
                     mSwipeView.setPressed(false);
 
                     if (!mSwiping) {
-                        TabRow tab = (TabRow) mSwipeView.getTag();
+                        TabsLayoutItemView tab = (TabsLayoutItemView) mSwipeView.getTag();
                         Tabs.getInstance().selectTab(tab.id);
                         autoHidePanel();
 
@@ -666,7 +646,7 @@ class TabsListLayout extends TwoWayView
                         mSwiping = true;
                         TabsListLayout.this.requestDisallowInterceptTouchEvent(true);
 
-                        TabRow tab = (TabRow) mSwipeView.getTag();
+                        TabsLayoutItemView tab = (TabsLayoutItemView) mSwipeView.getTag();
                         tab.close.setVisibility(View.INVISIBLE);
 
                         // Stops listview from highlighting the touched item

From 448d7c666638f4863d7cf80a854acfd875f27657 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 10 Sep 2014 14:51:16 -0700
Subject: [PATCH 016/109] Bug 1062338 - Remove useless ic_menu_back drawable
 xml. r=lucasr

---
 .../android/base/resources/drawable/ic_menu_back.xml  | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 mobile/android/base/resources/drawable/ic_menu_back.xml

diff --git a/mobile/android/base/resources/drawable/ic_menu_back.xml b/mobile/android/base/resources/drawable/ic_menu_back.xml
deleted file mode 100644
index 9832a2203964..000000000000
--- a/mobile/android/base/resources/drawable/ic_menu_back.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-
-     <solid android:color="@android:color/transparent"/>
-
-</shape>

From 1ca6e1f1051155e50a0a6fe5f1cefa972af30583 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Wed, 10 Sep 2014 15:09:24 -0700
Subject: [PATCH 017/109] Bug 1024527 - Move search_strings.dtd into
 m/a/base/locales/en-US. r=Pike

--HG--
rename : mobile/android/search/strings/search_strings.dtd => mobile/android/base/locales/en-US/search_strings.dtd
---
 mobile/android/base/locales/Makefile.in                         | 2 +-
 .../{search/strings => base/locales/en-US}/search_strings.dtd   | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename mobile/android/{search/strings => base/locales/en-US}/search_strings.dtd (100%)

diff --git a/mobile/android/base/locales/Makefile.in b/mobile/android/base/locales/Makefile.in
index 09a94a76e9a9..a5dd26bd2e6a 100644
--- a/mobile/android/base/locales/Makefile.in
+++ b/mobile/android/base/locales/Makefile.in
@@ -11,7 +11,7 @@ AB_rCD = $(if $(filter he, $(AB_CD)),iw,$(if $(filter id, $(AB_CD)),in,$(subst -
 # The search strings path is always passed to strings.xml.in; the
 # decision to include is made based on the feature flag at the
 # inclusion site.
-SEARCHSTRINGSPATH = $(srcdir)/../../search/strings/search_strings.dtd
+SEARCHSTRINGSPATH = $(abspath $(call MERGE_FILE,search_strings.dtd))
 
 SYNCSTRINGSPATH = $(abspath $(call MERGE_FILE,sync_strings.dtd))
 STRINGSPATH = $(abspath $(call MERGE_FILE,android_strings.dtd))
diff --git a/mobile/android/search/strings/search_strings.dtd b/mobile/android/base/locales/en-US/search_strings.dtd
similarity index 100%
rename from mobile/android/search/strings/search_strings.dtd
rename to mobile/android/base/locales/en-US/search_strings.dtd

From 77beea494c5709c21ab8d1e100db8c871709d115 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 10 Sep 2014 16:32:14 -0700
Subject: [PATCH 018/109] Bug 815682 - Lockscreen widget for guest sessions.
 r=bnicholson, rnewman

---
 mobile/android/base/BrowserApp.java           | 38 ++++++++--
 mobile/android/base/GeckoApp.java             | 19 ++++-
 mobile/android/base/GeckoProfile.java         | 29 +++++---
 mobile/android/base/GuestSession.java         | 74 +++++++++++++++++++
 mobile/android/base/Restarter.java            | 24 ++++--
 mobile/android/base/moz.build                 |  1 +
 .../base/preferences/GeckoPreferences.java    |  5 ++
 .../java/org/mozilla/search/SearchWidget.java | 17 ++++-
 .../search/res/layout/keyguard_widget.xml     | 43 +++++++++++
 .../search/res/xml/search_widget_info.xml     |  5 +-
 10 files changed, 226 insertions(+), 29 deletions(-)
 create mode 100644 mobile/android/base/GuestSession.java
 create mode 100644 mobile/android/search/res/layout/keyguard_widget.xml

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 9d69e5c915c9..9e3151617aa2 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -27,6 +27,7 @@ import org.mozilla.gecko.db.BrowserContract.Combined;
 import org.mozilla.gecko.db.BrowserContract.ReadingListItems;
 import org.mozilla.gecko.db.BrowserContract.SearchHistory;
 import org.mozilla.gecko.db.BrowserDB;
+import org.mozilla.gecko.db.DBUtils;
 import org.mozilla.gecko.db.SuggestedSites;
 import org.mozilla.gecko.distribution.Distribution;
 import org.mozilla.gecko.favicons.Favicons;
@@ -78,6 +79,7 @@ import org.mozilla.gecko.widget.GeckoActionProvider;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
+import android.app.KeyguardManager;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -496,11 +498,17 @@ public class BrowserApp extends GeckoApp
         mAboutHomeStartupTimer = new Telemetry.UptimeTimer("FENNEC_STARTUP_TIME_ABOUTHOME");
 
         final Intent intent = getIntent();
+        final String args = intent.getStringExtra("args");
 
-        String args = intent.getStringExtra("args");
-        if (args != null && args.contains(GUEST_BROWSING_ARG)) {
+        if (GuestSession.shouldUse(this, args)) {
+            GuestSession.configureWindow(getWindow());
             mProfile = GeckoProfile.createGuestProfile(this);
         } else {
+            // We also allow non-guest sessions if the keyguard isn't a secure one.
+            final KeyguardManager manager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
+            if (Versions.feature16Plus && !manager.isKeyguardSecure()) {
+                GuestSession.configureWindow(getWindow());
+            }
             GeckoProfile.maybeCleanupGuestProfile(this);
         }
 
@@ -695,6 +703,18 @@ public class BrowserApp extends GeckoApp
     @Override
     public void onResume() {
         super.onResume();
+
+        final String args = getIntent().getStringExtra("args");
+        // If an external intent tries to start Fennec in guest mode, and it's not already
+        // in guest mode, this will change modes before opening the url.
+        final boolean enableGuestSession = GuestSession.shouldUse(this, args);
+        final boolean inGuestSession = GeckoProfile.get(this).inGuestMode();
+        if (enableGuestSession != inGuestSession) {
+            doRestart(getIntent());
+            GeckoAppShell.systemExit();
+            return;
+        }
+
         EventDispatcher.getInstance().unregisterGeckoThreadListener((GeckoEventListener)this,
             "Prompt:ShowTop");
         if (AppConstants.MOZ_STUMBLER_BUILD_TIME_ENABLED) {
@@ -2630,10 +2650,11 @@ public class BrowserApp extends GeckoApp
 
         charEncoding.setVisible(GeckoPreferences.getCharEncodingState());
 
-        if (mProfile.inGuestMode())
+        if (mProfile.inGuestMode()) {
             exitGuestMode.setVisible(true);
-        else
+        } else {
             enterGuestMode.setVisible(true);
+        }
 
         return true;
     }
@@ -2798,7 +2819,14 @@ public class BrowserApp extends GeckoApp
                         } else {
                             GeckoProfile.leaveGuestSession(BrowserApp.this);
                         }
-                        doRestart(args);
+
+                        if (!GuestSession.isSecureKeyguardLocked(BrowserApp.this)) {
+                            doRestart(args);
+                        } else {
+                            // If the secure keyguard is up, we don't want to restart.
+                            // Just clear the guest profile data.
+                            GeckoProfile.maybeCleanupGuestProfile(BrowserApp.this);
+                        }
                         GeckoAppShell.systemExit();
                     }
                 } catch(JSONException ex) {
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 36bdfc785ae8..b6c3f31c5a40 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -2163,21 +2163,32 @@ public abstract class GeckoApp
     }
 
     public void doRestart() {
-        doRestart(RESTARTER_ACTION, null);
+        doRestart(RESTARTER_ACTION, null, null);
     }
 
     public void doRestart(String args) {
-        doRestart(RESTARTER_ACTION, args);
+        doRestart(RESTARTER_ACTION, args, null);
     }
 
-    public void doRestart(String action, String args) {
+    public void doRestart(Intent intent) {
+        doRestart(RESTARTER_ACTION, null, intent);
+    }
+
+    public void doRestart(String action, String args, Intent restartIntent) {
         Log.d(LOGTAG, "doRestart(\"" + action + "\")");
         try {
             Intent intent = new Intent(action);
             intent.setClassName(AppConstants.ANDROID_PACKAGE_NAME, RESTARTER_CLASS);
+
             /* TODO: addEnvToIntent(intent); */
-            if (args != null)
+            if (args != null) {
                 intent.putExtra("args", args);
+            }
+
+            if (restartIntent != null) {
+                intent.putExtra(Intent.EXTRA_INTENT, restartIntent);
+            }
+
             intent.putExtra("didRestart", true);
             Log.d(LOGTAG, "Restart intent: " + intent.toString());
             GeckoAppShell.killAnyZombies();
diff --git a/mobile/android/base/GeckoProfile.java b/mobile/android/base/GeckoProfile.java
index 2a77a97f86b0..d1ed00e91ac7 100644
--- a/mobile/android/base/GeckoProfile.java
+++ b/mobile/android/base/GeckoProfile.java
@@ -90,10 +90,9 @@ public final class GeckoProfile {
             }
         }
 
-        // If the guest profile exists and is locked, return it
-        GeckoProfile guest = GeckoProfile.getGuestProfile(context);
-        if (guest != null && guest.locked()) {
-            return guest;
+        // If the guest profile should be used return it.
+        if (GuestSession.shouldUse(context, "")) {
+            return GeckoProfile.getGuestProfile(context);
         }
 
         if (isGeckoApp) {
@@ -194,12 +193,17 @@ public final class GeckoProfile {
 
     public static GeckoProfile createGuestProfile(Context context) {
         try {
-            removeGuestProfile(context);
             // We need to force the creation of a new guest profile if we want it outside of the normal profile path,
             // otherwise GeckoProfile.getDir will try to be smart and build it for us in the normal profiles dir.
             getGuestDir(context).mkdir();
             GeckoProfile profile = getGuestProfile(context);
-            profile.lock();
+
+            // If we're creating this guest session over the keyguard, don't lock it.
+            // This will force the guest session to exit if the user unlocks their phone
+            // and starts Fennec.
+            if (!GuestSession.isSecureKeyguardLocked(context)) {
+                profile.lock();
+            }
 
             /*
              * Now do the things that createProfileDirectory normally does --
@@ -228,7 +232,7 @@ public final class GeckoProfile {
         return sGuestDir;
     }
 
-    private static GeckoProfile getGuestProfile(Context context) {
+    public static GeckoProfile getGuestProfile(Context context) {
         if (sGuestProfile == null) {
             File guestDir = getGuestDir(context);
             if (guestDir.exists()) {
@@ -242,10 +246,11 @@ public final class GeckoProfile {
 
     public static boolean maybeCleanupGuestProfile(final Context context) {
         final GeckoProfile profile = getGuestProfile(context);
-
         if (profile == null) {
             return false;
-        } else if (!profile.locked()) {
+        }
+
+        if (!profile.locked()) {
             profile.mInGuestMode = false;
 
             // If the guest dir exists, but it's unlocked, delete it
@@ -357,6 +362,11 @@ public final class GeckoProfile {
 
         try {
             final File lockFile = new File(profileDir, LOCK_FILE_NAME);
+            if (!lockFile.exists()) {
+                mLocked = LockState.UNLOCKED;
+                return true;
+            }
+
             final boolean result = delete(lockFile);
             if (result) {
                 mLocked = LockState.UNLOCKED;
@@ -367,6 +377,7 @@ public final class GeckoProfile {
         } catch(IOException ex) {
             Log.e(LOGTAG, "Error unlocking profile", ex);
         }
+
         mLocked = LockState.LOCKED;
         return false;
     }
diff --git a/mobile/android/base/GuestSession.java b/mobile/android/base/GuestSession.java
new file mode 100644
index 000000000000..aa8bfc210b83
--- /dev/null
+++ b/mobile/android/base/GuestSession.java
@@ -0,0 +1,74 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * 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/. */
+
+package org.mozilla.gecko;
+
+import org.mozilla.gecko.prompts.Prompt;
+import org.mozilla.gecko.util.EventCallback;
+import org.mozilla.gecko.util.NativeEventListener;
+import org.mozilla.gecko.util.NativeJSObject;
+import org.mozilla.gecko.util.ThreadUtils;
+
+import java.io.File;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.app.KeyguardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.util.Log;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ListView;
+
+// Utility methods for entering/exiting guest mode.
+public final class GuestSession {
+    private static final String LOGTAG = "GeckoGuestSession";
+
+    // Returns true if the user is using a secure keyguard, and its currently locked.
+    static boolean isSecureKeyguardLocked(Context context) {
+        final KeyguardManager manager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
+
+        if (AppConstants.Versions.preJB) {
+            return false;
+        }
+
+        return manager.isKeyguardLocked() && manager.isKeyguardSecure();
+    }
+
+    /* Returns true if you should be in guest mode. This can be because a secure keyguard
+     * is locked, or because the user has explicitly started guest mode via a dialog. If the
+     * user has explicitly started Fennec in guest mode, this will return true until they
+     * explicitly exit it.
+     */
+    public static boolean shouldUse(final Context context, final String args) {
+        // Did the command line args request guest mode?
+        if (args != null && args.contains(BrowserApp.GUEST_BROWSING_ARG)) {
+            return true;
+        }
+
+        // Otherwise, is the device locked?
+        final boolean keyguard = isSecureKeyguardLocked(context);
+        if (keyguard) {
+            return true;
+        }
+
+        // Otherwise, is there a locked guest mode profile?
+        final GeckoProfile profile = GeckoProfile.getGuestProfile(context);
+        if (profile == null) {
+            return false;
+        }
+
+        return profile.locked();
+    }
+
+    public static void configureWindow(Window window) {
+        // In guest sessions we allow showing over the keyguard.
+        window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+        window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+    }
+}
diff --git a/mobile/android/base/Restarter.java b/mobile/android/base/Restarter.java
index 19529bed67f5..450fe2997cec 100644
--- a/mobile/android/base/Restarter.java
+++ b/mobile/android/base/Restarter.java
@@ -39,19 +39,33 @@ public class Restarter extends Activity {
                 }
             }
         } catch (Exception e) {
-            Log.i(LOGTAG, e.toString());
+            Log.i(LOGTAG, "Error killing gecko", e);
         }
+
         try {
-            Intent intent = new Intent(Intent.ACTION_MAIN);
+            final Intent originalIntent = getIntent();
+            Intent intent = null;
+            if (originalIntent.hasExtra(Intent.EXTRA_INTENT)) {
+                intent = (Intent) originalIntent.getParcelableExtra(Intent.EXTRA_INTENT);
+                originalIntent.removeExtra(Intent.EXTRA_INTENT);
+            }
+
+            if (intent == null) {
+                intent = new Intent(Intent.ACTION_MAIN);
+            }
+
             intent.setClassName(AppConstants.ANDROID_PACKAGE_NAME,
                                 AppConstants.BROWSER_INTENT_CLASS_NAME);
-            Bundle b = getIntent().getExtras();
-            if (b != null)
+
+            Bundle b = originalIntent.getExtras();
+            if (b != null) {
                 intent.putExtras(b);
+            }
+
             Log.i(LOGTAG, intent.toString());
             startActivity(intent);
         } catch (Exception e) {
-            Log.i(LOGTAG, e.toString());
+            Log.i(LOGTAG, "Error restarting", e);
         }
     }
 }
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index ea98e9e281aa..9df7bbf9fcfe 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -251,6 +251,7 @@ gbjar.sources += [
     'gfx/ViewTransform.java',
     'gfx/VirtualLayer.java',
     'GlobalHistory.java',
+    'GuestSession.java',
     'health/BrowserHealthRecorder.java',
     'health/BrowserHealthReporter.java',
     'health/HealthRecorder.java',
diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java
index 330e56f47ebe..25f7888d6d5f 100644
--- a/mobile/android/base/preferences/GeckoPreferences.java
+++ b/mobile/android/base/preferences/GeckoPreferences.java
@@ -24,6 +24,7 @@ import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.GeckoProfile;
 import org.mozilla.gecko.GeckoSharedPrefs;
+import org.mozilla.gecko.GuestSession;
 import org.mozilla.gecko.LocaleManager;
 import org.mozilla.gecko.PrefsHelper;
 import org.mozilla.gecko.R;
@@ -288,6 +289,10 @@ OnSharedPreferenceChangeListener
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        if (GeckoProfile.get(this).inGuestMode()) {
+            GuestSession.configureWindow(getWindow());
+        }
+
         // Apply the current user-selected locale, if necessary.
         checkLocale();
 
diff --git a/mobile/android/search/java/org/mozilla/search/SearchWidget.java b/mobile/android/search/java/org/mozilla/search/SearchWidget.java
index 51ae18419368..ef19067e330f 100644
--- a/mobile/android/search/java/org/mozilla/search/SearchWidget.java
+++ b/mobile/android/search/java/org/mozilla/search/SearchWidget.java
@@ -5,6 +5,7 @@
 
 package org.mozilla.search;
 
+import org.mozilla.gecko.AboutPages;
 import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
@@ -13,6 +14,7 @@ import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
+import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -63,7 +65,6 @@ public class SearchWidget extends AppWidgetProvider {
     public void onReceive(final Context context, final Intent intent) {
         // This will hold the intent to redispatch
         final Intent redirect;
-        Log.i(LOGTAG, "Got intent  " + intent.getAction());
         if (intent.getAction().equals(ACTION_LAUNCH_BROWSER)) {
             redirect = buildRedirectIntent(Intent.ACTION_MAIN,
                     AppConstants.ANDROID_PACKAGE_NAME,
@@ -105,9 +106,17 @@ public class SearchWidget extends AppWidgetProvider {
 
     // Utility to create the view for this widget and attach any event listeners to it
     private void addView(final AppWidgetManager manager, final Context context, final int id, final Bundle options) {
-        final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.search_widget);
+        final int category = options.getInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY, -1);
+        final boolean isKeyguard = category == AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD;
+
+        final RemoteViews views;
+        if (isKeyguard) {
+            views = new RemoteViews(context.getPackageName(), R.layout.keyguard_widget);
+        } else {
+            views = new RemoteViews(context.getPackageName(), R.layout.search_widget);
+            addClickIntent(context, views, R.id.search_button, ACTION_LAUNCH_SEARCH);
+        }
 
-        addClickIntent(context, views, R.id.search_button, ACTION_LAUNCH_SEARCH);
         addClickIntent(context, views, R.id.new_tab_button, ACTION_LAUNCH_NEW_TAB);
         // Clicking the logo also launches the browser
         addClickIntent(context, views, R.id.logo_button, ACTION_LAUNCH_BROWSER);
@@ -119,7 +128,7 @@ public class SearchWidget extends AppWidgetProvider {
     private void addClickIntent(final Context context, final RemoteViews views, final int viewId, final String action) {
         final Intent intent = new Intent(context, SearchWidget.class);
         intent.setAction(action);
-        intent.setData(Uri.parse("about:home"));
+        intent.setData(Uri.parse(AboutPages.HOME));
         final PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, intent, 0);
         views.setOnClickPendingIntent(viewId, pendingIntent);
     }
diff --git a/mobile/android/search/res/layout/keyguard_widget.xml b/mobile/android/search/res/layout/keyguard_widget.xml
new file mode 100644
index 000000000000..082fce39a0cb
--- /dev/null
+++ b/mobile/android/search/res/layout/keyguard_widget.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/widget_header_height"
+    android:orientation="horizontal"
+    android:background="@drawable/widget_bg">
+
+    <ImageView android:id="@+id/logo_button"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:padding="@dimen/widget_padding"
+        android:background="@drawable/widget_button_left"
+        android:layout_height="match_parent"
+        android:src="@drawable/widget_icon"/>
+
+    <LinearLayout android:id="@+id/new_tab_button"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
+        android:contentDescription="@string/new_tab"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:background="@drawable/widget_button_right">
+
+        <TextView android:id="@+id/new_tab_button_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/ic_widget_new_tab"
+            android:drawablePadding="@dimen/widget_padding"
+            android:gravity="center"
+            android:text="@string/new_tab"
+            android:fontFamily="sans-serif"
+            android:textSize="@dimen/widget_text_size"
+            android:textColor="@color/widget_text_color"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/mobile/android/search/res/xml/search_widget_info.xml b/mobile/android/search/res/xml/search_widget_info.xml
index f837c4a208ee..a99b24976b91 100644
--- a/mobile/android/search/res/xml/search_widget_info.xml
+++ b/mobile/android/search/res/xml/search_widget_info.xml
@@ -7,6 +7,7 @@
     android:minWidth="300dp"
     android:minHeight="40dp"
     android:label="@string/search_widget_name"
-    android:widgetCategory="home_screen"
+    android:widgetCategory="home_screen|keyguard"
     android:previewImage="@drawable/launcher_widget"
-    android:initialLayout="@layout/search_widget"/>
+    android:initialLayout="@layout/search_widget"
+    android:initialKeyguardLayout="@layout/keyguard_widget"/>

From 173f344670c2f00e7113e2b2081cdb34bbfb0018 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 10 Sep 2014 16:32:22 -0700
Subject: [PATCH 019/109] Bug 897711 - Show a notification when in guest mode.
 r=bnicholson

---
 mobile/android/base/AndroidManifest.xml.in    |   5 +++
 mobile/android/base/BrowserApp.java           |  23 +++++++++--
 mobile/android/base/GeckoProfile.java         |   9 ++++-
 mobile/android/base/GuestSession.java         |  36 ++++++++++++++++++
 .../base/locales/en-US/android_strings.dtd    |   2 +
 mobile/android/base/prompts/Prompt.java       |   6 ++-
 .../drawable-hdpi-v11/alert_guest.png         | Bin 0 -> 1099 bytes
 .../resources/drawable-hdpi/alert_guest.png   | Bin 0 -> 1335 bytes
 .../drawable-mdpi-v11/alert_guest.png         | Bin 0 -> 782 bytes
 .../resources/drawable-mdpi/alert_guest.png   | Bin 0 -> 669 bytes
 .../drawable-xhdpi-v11/alert_guest.png        | Bin 0 -> 1514 bytes
 .../resources/drawable-xhdpi/alert_guest.png  | Bin 0 -> 891 bytes
 mobile/android/base/resources/values/ids.xml  |  10 +++++
 mobile/android/base/strings.xml.in            |   2 +
 14 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 mobile/android/base/resources/drawable-hdpi-v11/alert_guest.png
 create mode 100644 mobile/android/base/resources/drawable-hdpi/alert_guest.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi-v11/alert_guest.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/alert_guest.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi-v11/alert_guest.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi/alert_guest.png
 create mode 100644 mobile/android/base/resources/values/ids.xml

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index bd5f65961b9b..6030334d98cc 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -149,6 +149,11 @@
                 <action android:name="org.mozilla.gecko.ACTION_ALERT_CALLBACK" />
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="org.mozilla.gecko.GUEST_SESSION_INPROGRESS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
             <!-- Notification API V2 -->
             <intent-filter>
                 <action android:name="@ANDROID_PACKAGE_NAME@.helperBroadcastAction" />
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 9e3151617aa2..9502666b45c4 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -183,7 +183,7 @@ public class BrowserApp extends GeckoApp
     }
 
     // The types of guest mdoe dialogs we show
-    private static enum GuestModeDialog {
+    public static enum GuestModeDialog {
         ENTERING,
         LEAVING
     }
@@ -526,11 +526,15 @@ public class BrowserApp extends GeckoApp
         mBrowserToolbar = (BrowserToolbar) findViewById(R.id.browser_toolbar);
         mProgressView = (ToolbarProgressView) findViewById(R.id.progress);
         mBrowserToolbar.setProgressBar(mProgressView);
-        if (Intent.ACTION_VIEW.equals(intent.getAction())) {
+
+        final String action = intent.getAction();
+        if (Intent.ACTION_VIEW.equals(action)) {
             // Show the target URL immediately in the toolbar.
             mBrowserToolbar.setTitle(intent.getDataString());
 
             Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.INTENT);
+        } else if (GuestSession.NOTIFICATION_INTENT.equals(action)) {
+            showGuestModeDialog(BrowserApp.GuestModeDialog.LEAVING);
         }
 
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideOnTouchListener());
@@ -646,6 +650,13 @@ public class BrowserApp extends GeckoApp
                 Log.e(LOGTAG, "Error initializing media manager", ex);
             }
         }
+
+        if (getProfile().inGuestMode()) {
+            GuestSession.showNotification(this);
+        } else {
+            // If we're restarting, we won't destroy the activity. Make sure we remove any guest notifications that might have been shown.
+            GuestSession.hideNotification(this);
+        }
     }
 
     private void registerOnboardingReceiver(Context context) {
@@ -1012,6 +1023,8 @@ public class BrowserApp extends GeckoApp
             mBrowserHealthReporter = null;
         }
 
+        GuestSession.onDestroy(this);
+
         EventDispatcher.getInstance().unregisterGeckoThreadListener((GeckoEventListener)this,
             "Menu:Update",
             "Reader:Added",
@@ -2806,7 +2819,7 @@ public class BrowserApp extends GeckoApp
         return super.onOptionsItemSelected(item);
     }
 
-    private void showGuestModeDialog(final GuestModeDialog type) {
+    public void showGuestModeDialog(final GuestModeDialog type) {
         final Prompt ps = new Prompt(this, new Prompt.PromptCallback() {
             @Override
             public void onPromptFinished(String result) {
@@ -2903,7 +2916,9 @@ public class BrowserApp extends GeckoApp
         }
 
         // Only solicit feedback when the app has been launched from the icon shortcut.
-        if (!Intent.ACTION_MAIN.equals(action)) {
+        if (GuestSession.NOTIFICATION_INTENT.equals(action)) {
+            showGuestModeDialog(BrowserApp.GuestModeDialog.LEAVING);
+        } else if (!Intent.ACTION_MAIN.equals(action)) {
             return;
         }
 
diff --git a/mobile/android/base/GeckoProfile.java b/mobile/android/base/GeckoProfile.java
index d1ed00e91ac7..2ac7ff60379d 100644
--- a/mobile/android/base/GeckoProfile.java
+++ b/mobile/android/base/GeckoProfile.java
@@ -335,12 +335,17 @@ public final class GeckoProfile {
         try {
             // If this dir doesn't exist getDir will create it for us
             final File lockFile = new File(getDir(), LOCK_FILE_NAME);
-            final boolean result = lockFile.createNewFile();
-            if (result) {
+            final boolean result;
+            lockFile.createNewFile();
+
+            if (lockFile.exists()) {
                 mLocked = LockState.LOCKED;
+                result = true;
             } else {
                 mLocked = LockState.UNLOCKED;
+                result = false;
             }
+
             return result;
         } catch(IOException ex) {
             Log.e(LOGTAG, "Error locking profile", ex);
diff --git a/mobile/android/base/GuestSession.java b/mobile/android/base/GuestSession.java
index aa8bfc210b83..86937ec8ba97 100644
--- a/mobile/android/base/GuestSession.java
+++ b/mobile/android/base/GuestSession.java
@@ -17,9 +17,14 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import android.app.KeyguardManager;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Intent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.net.Uri;
+import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.view.Window;
 import android.view.WindowManager;
@@ -28,6 +33,8 @@ import android.widget.ListView;
 // Utility methods for entering/exiting guest mode.
 public final class GuestSession {
     private static final String LOGTAG = "GeckoGuestSession";
+    public static final String NOTIFICATION_INTENT = "org.mozilla.gecko.GUEST_SESSION_INPROGRESS";
+    private static final int NOTIFICATION_ID = LOGTAG.hashCode();
 
     // Returns true if the user is using a secure keyguard, and its currently locked.
     static boolean isSecureKeyguardLocked(Context context) {
@@ -66,6 +73,35 @@ public final class GuestSession {
         return profile.locked();
     }
 
+    private static PendingIntent getNotificationIntent(Context context) {
+        Intent intent = new Intent(NOTIFICATION_INTENT);
+        return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+
+    public static void showNotification(Context context) {
+        final NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
+        final Resources res = context.getResources();
+        builder.setContentTitle(res.getString(R.string.guest_browsing_notification_title))
+               .setContentText(res.getString(R.string.guest_browsing_notification_text))
+               .setSmallIcon(R.drawable.alert_guest)
+               .setOngoing(true)
+               .setContentIntent(getNotificationIntent(context));
+
+        final NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        manager.notify(NOTIFICATION_ID, builder.build());
+    }
+
+    public static void hideNotification(Context context) {
+        final NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        manager.cancel(NOTIFICATION_ID);
+    }
+
+    public static void onDestroy(Context context) {
+        if (GeckoProfile.get(context).inGuestMode()) {
+            hideNotification(context);
+        }
+    }
+
     public static void configureWindow(Window window) {
         // In guest sessions we allow showing over the keyguard.
         window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 27d2e873aa57..e0b4c2ae6228 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -489,6 +489,8 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY guest_session_dialog_cancel "Cancel">
 <!ENTITY new_guest_session_title "&brandShortName; will now restart">
 <!ENTITY new_guest_session_text "The person using it will not be able to see any of your personal browsing data (like saved passwords, history or bookmarks).\n\nWhen your guest is done, their browsing data will be deleted and your session will be restored.">
+<!ENTITY guest_browsing_notification_title "Guest browsing is enabled">
+<!ENTITY guest_browsing_notification_text "Tap to exit">
 
 <!ENTITY exit_guest_session_title "&brandShortName; will now restart">
 <!ENTITY exit_guest_session_text "The browsing data from this session will be deleted.">
diff --git a/mobile/android/base/prompts/Prompt.java b/mobile/android/base/prompts/Prompt.java
index 41b5ec27eb40..68b8125c4caf 100644
--- a/mobile/android/base/prompts/Prompt.java
+++ b/mobile/android/base/prompts/Prompt.java
@@ -11,6 +11,7 @@ import org.json.JSONObject;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
@@ -162,7 +163,10 @@ public class Prompt implements OnClickListener, OnCancelListener, OnItemClickLis
 
     private void create(String title, String text, PromptListItem[] listItems, int choiceMode)
             throws IllegalStateException {
-        GeckoAppShell.getLayerView().abortPanning();
+        final LayerView view = GeckoAppShell.getLayerView();
+        if (view != null) {
+            view.abortPanning();
+        }
 
         AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
         if (!TextUtils.isEmpty(title)) {
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/alert_guest.png b/mobile/android/base/resources/drawable-hdpi-v11/alert_guest.png
new file mode 100644
index 0000000000000000000000000000000000000000..55d569730182a3f73787da8905f4614b983826c0
GIT binary patch
literal 1099
zcmV-R1ho5!P)<h;3K|Lk000e1NJLTq002J#002J-1^@s6S6>j{00006VoOIv0D}O7
z0E3vv27Ukl010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U$K{1}Coz81?`F1K3GK
zK~!ko?O8i$R6!KI^EL}Eh`Zt^7y>IHg3T5S8h_D%q)L^-YKs&?3Q3X1!bY@7Wn+~>
zuvD-JK>`vKf^4%vV>AeEV~X`hlmy-Q#i+-^30#Kvnc10Lmt+ns%)YrZXU@#LH}~El
z^6>ER@bK{P@E`)v3E&cdGJsY5!#4m60ImV(Z4z$^z&QZ70Mr2dmcJT+I{=0Oh-L~O
z0Z>Ogege1-AnlO17r-KtvCx#s2XFyqn0B!eQuvAi?+SptOW_5%qNW(P<P88+)II^^
z<!g|V<%^0<89?Al{0thys?GM7?>NU`jP0OeTXG>hFF!1eVkBfD`!%`eOm-1~F=jvK
zLi`x)Fs<}glc&RQ0&iBC^t8rU)6D)ifNY$-&U<mva{i8lJj)Q#6oAo~c1PLx=7kU&
zNkr0So@qO3E5654d^dm$`@fTM-vDqmqTL}@ermw?f|a{$#qW3U&D_Jv9ZKC505<`o
zl;?X{`GW!1XI9>AE55^l_#FxL=ZWZcOq(ADT%TNu|K&hDAN;Nen*rtjhQZ`D1Re1o
z9q@cksQ)TgKZ-YJz?IV-yN>vprSNqjL_MZ{jfl<)A?_*9-?H)n1HQcO*mcA|vlPD+
zQ}>F9jte0kCGeUYw<j7rB|;sC0ZS+6s?y&k76Ei7aMzf9pT=1GnSIrThZh(|RVoT0
zf@YJvFKK&?^;6NX=RweftH5TWLE&?jyoVJRw=>4JTXAiBU5Vc-{c%$aIpCgR{auQ&
zyUgrvxlU%>F%<sJMNAD~i1oP?V^`G)eO<-YNtkrRn^sb1*@(R2Cf0Ow2qr7@z;N96
zU5J;FTA4jM6=HUpl^^OvfJWjI9F;JvI^1~c3Etj5R(|i&z1_0d*5Y+PI3<}8HNmV*
zDhdnkqKx(VF`EyuE3o>SOtWWf6PFW~-W}u-G_K>(N#2aS9I1p|O2o8#t=QH9OsXDc
z9C1pXt234v+c12SzQU+nsZ_}7U6)5y)NM>(f<N#&qHS67W}_MpDuG0^QJ1$m!!Zuj
z=GE6>gB@D}uoS~N7Uma!LHnSZklEFlgo51mVJJmKPyZ8>0E&)3*g}3o_-<GRAcQnn
zc95cWfm{R5ly+!NL~mGD=vW|+j&>0Kq*=nHhx&(zc(ivWAfh6*2ky3jgQvBM0TC72
zM0}+M94}e9Cm^DOZ6f}03pjYt(-n}L>nK~iYUcaSz;APMfniR(S*W&%=O-(t10@#z
zUwGaM5+THQ_BSH{)G7M@Y|F><Y1*FH5CE`E#jpEpjfaPahlhuUhlj`3z+Y8r9n~G*
RDsTV*002ovPDHLkV1n_J_;LUM

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-hdpi/alert_guest.png b/mobile/android/base/resources/drawable-hdpi/alert_guest.png
new file mode 100644
index 0000000000000000000000000000000000000000..b812a703f5384af8f2cb204c5dc3f855400907ba
GIT binary patch
literal 1335
zcmV-71<3k|P)<h;3K|Lk000e1NJLTq002J#002J-1^@s6S6>j{00006VoOIv0D}O7
z0E3vv27Ukl010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U$K{2L)qrXj1?H1jI>1
zK~!ko?V4R^9Yqw!e_0bSC>o6#Ey0#ju?P_Y{ZdndMG>M8Z9!=(y3|pb6cIs-P!xU9
zmj*?|cG@!N5UdiZv=l^}+WJv3C?S<%ybmfQRYa*DNs)-r=);{`$IITkvv)VwknA5W
zoSlz7=RdPEbIzFyIdbI4kt0Wr9P<zjNjro>wgFp#9^g8l6_^4>f#bj)qt#bg8yX6E
z9<agwx`1|D^(`<2ybc^PTKzpM<U=9v16~3ys?uy4*ad7iT1{s}d>JqRbjCCt1~&N)
zenSESdMznm90WEdnTaaIPXKM6U48&o8?DCT8U~&QbO0|Vw0k}9NJ`=X&|gOUQD6zs
zXn#w9?M{6g&~N)zMWd%3&jC#}*#A^0<gOH-|3+Yq^L(4p>S$S;F`zFL@+2^5%hm#$
zfc>dvJ`{4X-P~$HE3mojeTPFKyFB}Eb7wq)_&M0Rhn=DaviR)p^j#hmu%Ybvdf-SX
z<ocLFzZmFtihTB)y^h>%-;s*^jVU+l6%l34z=2T62dng3>DV{qvvh2mA&1+_wB(nj
zB;Oti+3Y-D=;+=X3i(Whe%CniNCJJMj=U%>`71Iws#~jUvQLLXYU{+fxXh7%OrYzm
zBVUr1d}9XW&yT6UKVoNg`~03j*RNTU|1$&fuJM(;!|n)A(Rc7_f)Dv$GSG82rv5iO
z`<3*zB+%93Yr7Bmv6RFojaCy?>VE>(8Li$fEC0@suS%eAv9Iku<WHs~|9O?VabS(n
z>eCp#Nsikad`}4<@*k!of2>0J2(YSB1ZK;}o#S$qhd0{g!~uo4;KqmiM>bNb6$c__
z`(5A`qgC8{2OQZau-fU!Z)FnFhC)6I?5KhGaii6`6j9xB;0tGxuB<d*p^)vsY5O<>
zTpJhH`}*uJ*lbNw^rcxZMyrC&3zV?6N^`gF4WEQY;AzAe;BZ3QzX#sQ;F#2oytzud
zEsp$3R_A;PZzeSQpwVh31M-8wWGNzyiqvdgak+i`8TcS;@`DMDK9YqOW+OHC#JMS=
z*;+?_-#2*@Brswkq1|UP^h76PyuHgE+52P)Sio4&<YU9tP{=0WE<h%H_miQJeZYIQ
zrmsUGJ1OSn+*H`d5lv4x@*OtK{;JVxswOALCN3WW1pYbmC=>u?jhXNu+-wKCm;YvN
z0fvoMD=PFm&A+!erG4TxV7JlgR4jR$O}X7F?#XyrOj%#yD8)S6sL|>#M|X!E=zD=n
zBl-^m+bRS>ghKWJd&&mDb<z8Q0e1o#oX)pehvMowExAb>^cd^B+#S)TboHgIx977|
zwg691%o0cG++nnO`5bxc7Z-pF=Ez=D0G>Bm?Mo3Cbl5MrH=_C;qt*Tr`JKSybAa@2
zV4u-yB&!#OLN?f?^qBKCd;=^ik^h?XDe5fHQiC()I|u>A>+DiiXmwzB^|?TNc(#aJ
z4|T@w{w3TT5P#=gFC40a4tF_q20+IgA^%Aobht78(tzUq_FTYcb<p7kJ&OXexsFPU
z@!4GO4&2+EmVjhA@!7(cb<*>PBR2(QvGD(eQ}s|%7U(oLghEbG{ohsdI-YN0VPZO<
t_%Dfth$(X9$dMyQjvP61<j65E@DHL#S`C=Ke^CGc002ovPDHLkV1nYpb07c!

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi-v11/alert_guest.png b/mobile/android/base/resources/drawable-mdpi-v11/alert_guest.png
new file mode 100644
index 0000000000000000000000000000000000000000..051b13f8b8e21a81b252ed6c9239fcaf4180ebe8
GIT binary patch
literal 782
zcmV+p1M&QcP)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400006VoOIv0D}O7
z0E3vv27Ukl010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U$K{2m*SH;XeQX0-H%h
zK~z}7?U+AkR6!8NXD<fMKe^&iBoG1?77{Rp%|WmT2&OSry3`gaY*Srf7lo7-)|S_#
zI<PpRMhGcv4zUn57zo-V5EJ!6a^BBoHZ05gw=eGs@qNwS&b<Bh+qe5>W>2I<i4rCL
zJpiM?60ivz0X?7#G=W-9&N-kB>;Wgh4)7efaUPK`iN_~kB9QZO0^boZn@8vh>1YSO
zNsA^>*OxH`yioi1pq&E7bcI<k?Tl;1O$5BMB4hk*^*;&``jG5camF108^9%xuL|__
z`O%m;7u4Sg5xO2AwCf24=(vJ_n%WN%<{Y=%A0qTHKxoey*K_P^j=iF`e!`qppU*`l
zX51iWM5{W#r=8y;X}rdmV-YzOk!sZOh!eUMAnrqiZC^wlIQ=ng4^y~)d(Wo|Z3hT_
z?e%|%$bDl>)B-M~a9KV5tY>rr7-T%7_ndLtKqH3pvpzo?<8P|}U1-41^5yTug`0$|
zv=-s3DHp(8o}8S9<p91qaIE9%o^L5M)A_l6FG1uWN3OToXTh_#)V`Q@c%#C_sffHy
znD>h@W;byCHtWoI_Pg4y2MhJWMW`<h$J$=>?6&_aSSU~xk?TppJ?n>Lvy+HSYIoan
z+iY|><Q&}uR-L?^gk3EM=YjErk7!xzSBsgLGkT;&^mLp!qt#0%Abv*SBk&Zs12nYG
zbo2j)FVa~|%j4Pv7IkOO9$ck(xC>qb<}>W(6!1*1JMQ9)UCl|sB5m!N`!1w4arf+~
zI0b9b=oWCfd}40}6%lC+=@R><01lh?Z&yU*){un0FMz`)l*vj;tjvQy+I}s7YhT-|
z6%n~suuz+^z7;9d0EbZ(^*QiUM6MLQO9o&FTR&3%Ay%S9iT?zD0ZBNMHZNnuTL1t6
M07*qoM6N<$f@q^#R{#J2

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/alert_guest.png b/mobile/android/base/resources/drawable-mdpi/alert_guest.png
new file mode 100644
index 0000000000000000000000000000000000000000..40e5ccac9ef971f2f143217768c3497092dda528
GIT binary patch
literal 669
zcmeAS@N?(olHy`uVBq!ia0vp^S|H593?x6vT4n;Ns{uYCuJOqk!w>CJk_!ZSkg+7l
zFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|IGKdlwf8Se
zodeY4=;`7ZVsZNI<kNnK4Fp`(`_mq}hCJ20(v`v<qIEYwv~hyKg5Uq=x5#%s?p!XE
zba!{bl#eG<Y>ItLF58y`CGYFYowe=u+GhU^R&5*8#e?UpG0YTZVcfhg;e3GU;<W80
z8_j(}8y3!U@ttCOBf?5~1=FWO$FCQSwzucF9p>s{mF;v}VD4hIIJqH>=j!W&0&ln6
zR?3@tG2y~7wd@+DpApgVOV)2q$PhAn{U9m*eq-Yjv66=ys(!zzh}ZOZRr>ti4VJA^
z?rLXr#B{?wSBk%J`f=rSU2oi<HBKesTfJ5ny|CRbeKc}=UCjEe{Bnj@SBaH}dxyuq
z;(r^I%aU$zmPviOV3UxK@77<Z?v}50SQc@Ag-p($gmq7U9h>_9vF)x48ectBj+V>Y
zn{+JYdJ*|sElhD?WX0M&Q$m8Z%oP46|22=js(;O^dF|xGH9ElXW$<+Mb6Mw<&;$UL
C6AS?W

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/alert_guest.png b/mobile/android/base/resources/drawable-xhdpi-v11/alert_guest.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bb71d4c77f27fef3352f5fb00f1ced5369757c5
GIT binary patch
literal 1514
zcmV<G1r_><P)<h;3K|Lk000e1NJLTq002|~002}71^@s69BUB400006VoOIv0D}O7
z0E3vv27Ukl010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U$K{2rfuejobhL1$RkA
zK~#9!?VL|&9Yq|+zw??@t=N=WF-=JuM0{Xt144=+np|Qn8W4PV$)yM5#d9vfLk<DW
zsi)ooJy|b(LNN$cN|6R3MpH4ACZ$+4mZVA&YDrB^^nJZdFwWb3J3G6xZy)|Xr%W<4
z``zFC|IKd$2!bF8f*=TjAP9mW2trz@G%6w40pLvl{Qx=vv;t@Xuma#VfGYq#Q%ZeR
zkC!C58^B2brvUT<I09fVfCm7U0n7mS0>DM3)bDj`4Uz{)o+DYI9kV36GuBulxoD|x
zo#dEqfXt0~EQZjXY?6F01AU6*S-LSz@<5ixY$y2}lQHC3<C%o|=1A^AMlC<Z<ZO^E
zdeS%$^2{-kJtSLnzC9$1B!@}P2jri~!k~jpk4ql(?FyKRrb%{Mlq(zMDpBRq5Io0p
z>CB+PyJM6$N8fp$#_VGHoC$c&B*}4-yBsuLHivn_2HDu2B77M10}lqhRbv!P##tCh
zwghb9jyb&NtWihFwrnBhvtIGgPS4iZq6`3-CfROTSGRFk`C2J;-9b~?NcZ?M=<}Xt
zlcPqudB@K$0GP3y2hHC2rK6tjBJ?FUs2+OzJsGsaNI!0*TLD}lIT*8^MMph98tG?z
z^w4(r<0*?gj{^8e&*Nb}h*l&0tD~M(BfZ~;L7P1qv?Zd4?sVpi0JspcSUqB-|8&%I
z-$*~<YYz2=*;q{x`AYykwW#MWCl{Pjo35QHF9zK((l*|nmjZsb6|-S#trt6a=)<6E
z9u0agV7{#R&H&!G7^+V?>e&~eFO)bfxT1T2kGb?tjJyv4yrY!*IN)!;80j`gJ%^0+
zQtCZa&npX_dgx8de0Kr#h8Pn7<|6i`uKVo;A447hzV%?t2LR?R@?8UPLMio4jXbkP
z`h=sVmyPs{ue1D+hqL@-z;jH>HfMV6f?GDqo{GC5kz6(EDEjK57Xwz(q?98TpAP}N
zt(5x1Vp{qez$eD9PsY^quCb9{P)gl|FGyZWv3CZ##z=myuUG~h^z{Wirz=MJX`}3@
z*9{}d{uB*5;Ys7Hi%&Gf7up8j1PFFvQ{U(N&{vA`xrUT8Z%NN)a;!;dahmj~FKBV<
zw<xok)H&^X^t_P5;#Br!(2&KcFQVA10gKV~Obn{SRjwv@=PkWs@QGRf>k;{T(`fJ{
z&XFWnz}GT}A-bv$4cojJv6nTkcP?jb(4_=rfABre>!b2o3}?v^BYit-g9>6$G3fup
zpxRmRR)Xgq_7;utuY=<>sxQ~>*C=+wNFViTdA;#1=}?zS3LE=%k`rmhHj(VmAv{5$
zma`FMM?wOGhf)n|B-uuC)G@d=PJrua7vZ|02ei|s;u?<{;#ApYRmYnaU5%);6Qr!q
z+*z@zdsv&zw4?9n7cG1SLzeG75>Z!0kI<4;*tnj1hDqLHec9Bp`<($Ay8<HYf|%DM
zs~EF0_37TY5mEoL4&ZGMt7vyhk;!RN(Ghq(T4RsJh?z<w++2@<QHyxkb&`ES6$~@q
zoDT`xrXKcVzP>Qg^ZQgpJiam~_C+=x=k&`eWPqM-#zLmVft?w98qk>I_1e7a4mcik
z`>?&Sf1?2pC6o1fu=cl_&wmZj(Y_?7P<<DjXYMMc4%S-)$z}XEg!0gK4?W&sz4QB=
z=rAKyju-SkYHx!X^hQo}n3sRW0)QeKkDqg*<0sQeT>$W00~+*BPIQ>D_=gJs4mO}c
zmvW+G#YjJ0Ky@r+Be0ee9p=XkEd{s-rRM2H>V<i8yRU%i@aINgD<?Y48-SK3xW}Q_
zlY1m{DXf6%Z-fMQ9xI^wV=2L%W<|1sl>Xh2AP9mW2!bF8f*=TjAP8yl4?!{b30bm7
Q0ssI207*qoM6N<$f?#pI(EtDd

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_guest.png b/mobile/android/base/resources/drawable-xhdpi/alert_guest.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ca6d845102329b0a71f6cff47a95a65a8159181
GIT binary patch
literal 891
zcmeAS@N?(olHy`uVBq!ia0vp^At21b3?#L;KKKlzRtNZmxW*@E3>9?3?6Mfp*^DJY
ze!&b5&u*lFI7!~_E({&4vK~MVXMsm#F#`j)FbFd;%$g$s6l5>)^mS#w$H^qbA(i={
zGLwOU$<x!tF(l&f+ZngJnhgZnq7{`mxNbe_6l=M}#j5|!>C->|ZC54ECK`Eei@nkM
zC%o(O`7=Ih#@`A!xVX4}<!3!=x#Pe0>bpt(B^Jy1j;Jq;Va<}rFLO>we78(r^@NtI
zb(Pc1a;?)T;aX*uht7yZSD8rY@rSRM|NM2jq?f7hF@?8!+t*tsr988mA{D>RV#Y50
zDVK_Frff|qzg>I3E`uwC-|_sJRyPxsRqU;n%OzQsX2%p&CaRx3F4R`$_F~QhFQ+R~
zUtY-tvGp!}TY7Qs)51?}L6_b~d;HIQ&fME_V9T2Wj0-#YOZx7e$j{q+m&Ix2`rpUj
zIvB10@`C&6^)(W~0#OGq9AS$U4{pA2Xzv%-3{{07-YkuO>PKYEG7|4ijX!ab+fn-8
zg1c|Ere0LMaHQnRTj_f3l|hkb53|fIQ9FJ1YhT`J;Y|T2>Ua2xd}{2HS-#q^^yTuP
zRnIbF_}+Qv@{|Rwvbs`j8ya!DKjzYr-TjwM6yMyAdmAD4|Lo-B8+K2O+!MY~(@O5;
zbVjZfQy0$kUZf^drF`ok`?Sp3>3vQ)4t)>H7Uiz))M!1JXI<-(`7rL#nbyK3{f)aG
z$i7iiJTDUdDTK>U^Yo<cx3vzj8%Hh?^lRhEEMUGh%XH~!8NbII@>0b*jvMCPXzMxW
z#9S1f`!i|P^|Xt>9oF72E3T2bd?Yk-VYat~?SjdoRjC2;@4bJ!Z?M1euzBX*U!O00
z6R4G&b#U>$>I*Wn=HF{QcDmqe;)@L1uXPIof9pSD_S(aB%F^qJ`2t5EsE@iYH~Wl2
UXSwh)U^-*)boFyt=akR{07^xG=>Px#

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/values/ids.xml b/mobile/android/base/resources/values/ids.xml
new file mode 100644
index 000000000000..4e25fe2c5c4d
--- /dev/null
+++ b/mobile/android/base/resources/values/ids.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<resources>
+
+    <item type="id" name="guestNotification"/>
+
+</resources>
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index a977c44510ba..25cd65a0075f 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -447,6 +447,8 @@
   <string name="guest_session_dialog_cancel">&guest_session_dialog_cancel;</string>
   <string name="new_guest_session_title">&new_guest_session_title;</string>
   <string name="new_guest_session_text">&new_guest_session_text;</string>
+  <string name="guest_browsing_notification_title">&guest_browsing_notification_title;</string>
+  <string name="guest_browsing_notification_text">&guest_browsing_notification_text;</string>
 
   <string name="exit_guest_session_title">&exit_guest_session_title;</string>
   <string name="exit_guest_session_text">&exit_guest_session_text;</string>

From 86866fcfc3c83779f3d90f2da8b0eb455b7c03b5 Mon Sep 17 00:00:00 2001
From: "Alexander J. Vincent" <ajvincent@gmail.com>
Date: Mon, 8 Sep 2014 22:28:41 -0700
Subject: [PATCH 020/109] Bug 1060742 - Reorder BinarySearch.jsm arguments for
 easier curried search functions. r=adw

---
 toolkit/modules/BinarySearch.jsm               | 18 +++++++++---------
 toolkit/modules/NewTabUtils.jsm                |  9 ++++++---
 .../tests/xpcshell/test_BinarySearch.js        |  6 +++---
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/toolkit/modules/BinarySearch.jsm b/toolkit/modules/BinarySearch.jsm
index b07879b78eab..9db9df7b7a26 100644
--- a/toolkit/modules/BinarySearch.jsm
+++ b/toolkit/modules/BinarySearch.jsm
@@ -18,8 +18,8 @@ this.BinarySearch = Object.freeze({
    *
    * @return The index of `target` in `array` or -1 if `target` is not found.
    */
-  indexOf: function (array, target, comparator) {
-    let [found, idx] = this.search(array, target, comparator);
+  indexOf: function (comparator, array, target) {
+    let [found, idx] = this.search(comparator, array, target);
     return found ? idx : -1;
   },
 
@@ -32,17 +32,13 @@ this.BinarySearch = Object.freeze({
    * @return The index in `array` where `target` may be inserted to keep `array`
    *         ordered.
    */
-  insertionIndexOf: function (array, target, comparator) {
-    return this.search(array, target, comparator)[1];
+  insertionIndexOf: function (comparator, array, target) {
+    return this.search(comparator, array, target)[1];
   },
 
   /**
    * Searches for the given target in the given array.
    *
-   * @param  array
-   *         An array whose elements are ordered by `comparator`.
-   * @param  target
-   *         The value to search for.
    * @param  comparator
    *         A function that takes two arguments and compares them, returning a
    *         negative number if the first should be ordered before the second,
@@ -50,13 +46,17 @@ this.BinarySearch = Object.freeze({
    *         number if the second should be ordered before the first.  The first
    *         argument is always `target`, and the second argument is a value
    *         from the array.
+   * @param  array
+   *         An array whose elements are ordered by `comparator`.
+   * @param  target
+   *         The value to search for.
    * @return An array with two elements.  If `target` is found, the first
    *         element is true, and the second element is its index in the array.
    *         If `target` is not found, the first element is false, and the
    *         second element is the index where it may be inserted to keep the
    *         array ordered.
    */
-  search: function (array, target, comparator) {
+  search: function (comparator, array, target) {
     let low = 0;
     let high = array.length - 1;
     while (low <= high) {
diff --git a/toolkit/modules/NewTabUtils.jsm b/toolkit/modules/NewTabUtils.jsm
index 8f1208a27b19..dd719a5da563 100644
--- a/toolkit/modules/NewTabUtils.jsm
+++ b/toolkit/modules/NewTabUtils.jsm
@@ -632,8 +632,7 @@ let PlacesProvider = {
             i++;
         }
         for (let link of outOfOrder) {
-          i = BinarySearch.insertionIndexOf(links, link,
-                                            Links.compareLinks.bind(Links));
+          i = BinarySearch.insertionIndexOf(Links.compareLinks, links, link);
           links.splice(i, 0, link);
         }
 
@@ -871,6 +870,8 @@ let Links = {
    * @return A negative number if aLink1 is ordered before aLink2, zero if
    *         aLink1 and aLink2 have the same ordering, or a positive number if
    *         aLink1 is ordered after aLink2.
+   *
+   * @note compareLinks's this object is bound to Links below.
    */
   compareLinks: function Links_compareLinks(aLink1, aLink2) {
     for (let prop of this._sortProperties) {
@@ -1037,7 +1038,7 @@ let Links = {
   },
 
   _binsearch: function Links__binsearch(aArray, aLink, aMethod) {
-    return BinarySearch[aMethod](aArray, aLink, this.compareLinks.bind(this));
+    return BinarySearch[aMethod](this.compareLinks, aArray, aLink);
   },
 
   /**
@@ -1066,6 +1067,8 @@ let Links = {
                                          Ci.nsISupportsWeakReference])
 };
 
+Links.compareLinks = Links.compareLinks.bind(Links);
+
 /**
  * Singleton used to collect telemetry data.
  *
diff --git a/toolkit/modules/tests/xpcshell/test_BinarySearch.js b/toolkit/modules/tests/xpcshell/test_BinarySearch.js
index 1601bffb194e..f48b0bccff23 100644
--- a/toolkit/modules/tests/xpcshell/test_BinarySearch.js
+++ b/toolkit/modules/tests/xpcshell/test_BinarySearch.js
@@ -67,13 +67,13 @@ function run_test() {
 }
 
 function ok(array, target, expectedFound, expectedIdx) {
-  let [found, idx] = BinarySearch.search(array, target, cmp);
+  let [found, idx] = BinarySearch.search(cmp, array, target);
   do_check_eq(found, expectedFound);
   do_check_eq(idx, expectedIdx);
 
   idx = expectedFound ? expectedIdx : -1;
-  do_check_eq(BinarySearch.indexOf(array, target, cmp), idx);
-  do_check_eq(BinarySearch.insertionIndexOf(array, target, cmp), expectedIdx);
+  do_check_eq(BinarySearch.indexOf(cmp, array, target), idx);
+  do_check_eq(BinarySearch.insertionIndexOf(cmp, array, target), expectedIdx);
 }
 
 function cmp(num1, num2) {

From cda2a1e7714cc8ac60743863e8455d23c19ab2de Mon Sep 17 00:00:00 2001
From: Chenxia Liu <liuche@mozilla.com>
Date: Wed, 10 Sep 2014 17:54:22 -0700
Subject: [PATCH 021/109] Bug 1063748 - Follow-up: Add telemetry for Onboarding
 first run screen buttons. r=mfinkle

---
 mobile/android/base/StartPane.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mobile/android/base/StartPane.java b/mobile/android/base/StartPane.java
index c6e1a7e7dd19..7092b23f7c89 100644
--- a/mobile/android/base/StartPane.java
+++ b/mobile/android/base/StartPane.java
@@ -21,6 +21,7 @@ public class StartPane extends Activity {
 
             @Override
             public void onClick(View v) {
+                Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.BUTTON, "firstrun-sync");
                 showAccountSetup();
             }
         });
@@ -30,6 +31,7 @@ public class StartPane extends Activity {
 
             @Override
             public void onClick(View v) {
+                Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.BUTTON, "firstrun-browser");
                 showBrowser();
             }
         });

From 656c725b0f835c73fb99f929a90a0263888f3c97 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 10 Sep 2014 22:00:26 -0400
Subject: [PATCH 022/109] Backed out 2 changesets (bug 815682, bug 897711) for
 Android S4 failures.

Backed out changeset 14f00ee7be7d (bug 897711)
Backed out changeset 3de21c283716 (bug 815682)
---
 mobile/android/base/AndroidManifest.xml.in    |   5 -
 mobile/android/base/BrowserApp.java           |  61 ++--------
 mobile/android/base/GeckoApp.java             |  19 +--
 mobile/android/base/GeckoProfile.java         |  38 ++----
 mobile/android/base/GuestSession.java         | 110 ------------------
 mobile/android/base/Restarter.java            |  24 +---
 .../base/locales/en-US/android_strings.dtd    |   2 -
 mobile/android/base/moz.build                 |   1 -
 .../base/preferences/GeckoPreferences.java    |   5 -
 mobile/android/base/prompts/Prompt.java       |   6 +-
 .../drawable-hdpi-v11/alert_guest.png         | Bin 1099 -> 0 bytes
 .../resources/drawable-hdpi/alert_guest.png   | Bin 1335 -> 0 bytes
 .../drawable-mdpi-v11/alert_guest.png         | Bin 782 -> 0 bytes
 .../resources/drawable-mdpi/alert_guest.png   | Bin 669 -> 0 bytes
 .../drawable-xhdpi-v11/alert_guest.png        | Bin 1514 -> 0 bytes
 .../resources/drawable-xhdpi/alert_guest.png  | Bin 891 -> 0 bytes
 mobile/android/base/resources/values/ids.xml  |  10 --
 mobile/android/base/strings.xml.in            |   2 -
 .../java/org/mozilla/search/SearchWidget.java |  17 +--
 .../search/res/layout/keyguard_widget.xml     |  43 -------
 .../search/res/xml/search_widget_info.xml     |   5 +-
 21 files changed, 36 insertions(+), 312 deletions(-)
 delete mode 100644 mobile/android/base/GuestSession.java
 delete mode 100644 mobile/android/base/resources/drawable-hdpi-v11/alert_guest.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/alert_guest.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi-v11/alert_guest.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/alert_guest.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi-v11/alert_guest.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/alert_guest.png
 delete mode 100644 mobile/android/base/resources/values/ids.xml
 delete mode 100644 mobile/android/search/res/layout/keyguard_widget.xml

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 6030334d98cc..bd5f65961b9b 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -149,11 +149,6 @@
                 <action android:name="org.mozilla.gecko.ACTION_ALERT_CALLBACK" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="org.mozilla.gecko.GUEST_SESSION_INPROGRESS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
             <!-- Notification API V2 -->
             <intent-filter>
                 <action android:name="@ANDROID_PACKAGE_NAME@.helperBroadcastAction" />
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 9502666b45c4..9d69e5c915c9 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -27,7 +27,6 @@ import org.mozilla.gecko.db.BrowserContract.Combined;
 import org.mozilla.gecko.db.BrowserContract.ReadingListItems;
 import org.mozilla.gecko.db.BrowserContract.SearchHistory;
 import org.mozilla.gecko.db.BrowserDB;
-import org.mozilla.gecko.db.DBUtils;
 import org.mozilla.gecko.db.SuggestedSites;
 import org.mozilla.gecko.distribution.Distribution;
 import org.mozilla.gecko.favicons.Favicons;
@@ -79,7 +78,6 @@ import org.mozilla.gecko.widget.GeckoActionProvider;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
-import android.app.KeyguardManager;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -183,7 +181,7 @@ public class BrowserApp extends GeckoApp
     }
 
     // The types of guest mdoe dialogs we show
-    public static enum GuestModeDialog {
+    private static enum GuestModeDialog {
         ENTERING,
         LEAVING
     }
@@ -498,17 +496,11 @@ public class BrowserApp extends GeckoApp
         mAboutHomeStartupTimer = new Telemetry.UptimeTimer("FENNEC_STARTUP_TIME_ABOUTHOME");
 
         final Intent intent = getIntent();
-        final String args = intent.getStringExtra("args");
 
-        if (GuestSession.shouldUse(this, args)) {
-            GuestSession.configureWindow(getWindow());
+        String args = intent.getStringExtra("args");
+        if (args != null && args.contains(GUEST_BROWSING_ARG)) {
             mProfile = GeckoProfile.createGuestProfile(this);
         } else {
-            // We also allow non-guest sessions if the keyguard isn't a secure one.
-            final KeyguardManager manager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
-            if (Versions.feature16Plus && !manager.isKeyguardSecure()) {
-                GuestSession.configureWindow(getWindow());
-            }
             GeckoProfile.maybeCleanupGuestProfile(this);
         }
 
@@ -526,15 +518,11 @@ public class BrowserApp extends GeckoApp
         mBrowserToolbar = (BrowserToolbar) findViewById(R.id.browser_toolbar);
         mProgressView = (ToolbarProgressView) findViewById(R.id.progress);
         mBrowserToolbar.setProgressBar(mProgressView);
-
-        final String action = intent.getAction();
-        if (Intent.ACTION_VIEW.equals(action)) {
+        if (Intent.ACTION_VIEW.equals(intent.getAction())) {
             // Show the target URL immediately in the toolbar.
             mBrowserToolbar.setTitle(intent.getDataString());
 
             Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.INTENT);
-        } else if (GuestSession.NOTIFICATION_INTENT.equals(action)) {
-            showGuestModeDialog(BrowserApp.GuestModeDialog.LEAVING);
         }
 
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideOnTouchListener());
@@ -650,13 +638,6 @@ public class BrowserApp extends GeckoApp
                 Log.e(LOGTAG, "Error initializing media manager", ex);
             }
         }
-
-        if (getProfile().inGuestMode()) {
-            GuestSession.showNotification(this);
-        } else {
-            // If we're restarting, we won't destroy the activity. Make sure we remove any guest notifications that might have been shown.
-            GuestSession.hideNotification(this);
-        }
     }
 
     private void registerOnboardingReceiver(Context context) {
@@ -714,18 +695,6 @@ public class BrowserApp extends GeckoApp
     @Override
     public void onResume() {
         super.onResume();
-
-        final String args = getIntent().getStringExtra("args");
-        // If an external intent tries to start Fennec in guest mode, and it's not already
-        // in guest mode, this will change modes before opening the url.
-        final boolean enableGuestSession = GuestSession.shouldUse(this, args);
-        final boolean inGuestSession = GeckoProfile.get(this).inGuestMode();
-        if (enableGuestSession != inGuestSession) {
-            doRestart(getIntent());
-            GeckoAppShell.systemExit();
-            return;
-        }
-
         EventDispatcher.getInstance().unregisterGeckoThreadListener((GeckoEventListener)this,
             "Prompt:ShowTop");
         if (AppConstants.MOZ_STUMBLER_BUILD_TIME_ENABLED) {
@@ -1023,8 +992,6 @@ public class BrowserApp extends GeckoApp
             mBrowserHealthReporter = null;
         }
 
-        GuestSession.onDestroy(this);
-
         EventDispatcher.getInstance().unregisterGeckoThreadListener((GeckoEventListener)this,
             "Menu:Update",
             "Reader:Added",
@@ -2663,11 +2630,10 @@ public class BrowserApp extends GeckoApp
 
         charEncoding.setVisible(GeckoPreferences.getCharEncodingState());
 
-        if (mProfile.inGuestMode()) {
+        if (mProfile.inGuestMode())
             exitGuestMode.setVisible(true);
-        } else {
+        else
             enterGuestMode.setVisible(true);
-        }
 
         return true;
     }
@@ -2819,7 +2785,7 @@ public class BrowserApp extends GeckoApp
         return super.onOptionsItemSelected(item);
     }
 
-    public void showGuestModeDialog(final GuestModeDialog type) {
+    private void showGuestModeDialog(final GuestModeDialog type) {
         final Prompt ps = new Prompt(this, new Prompt.PromptCallback() {
             @Override
             public void onPromptFinished(String result) {
@@ -2832,14 +2798,7 @@ public class BrowserApp extends GeckoApp
                         } else {
                             GeckoProfile.leaveGuestSession(BrowserApp.this);
                         }
-
-                        if (!GuestSession.isSecureKeyguardLocked(BrowserApp.this)) {
-                            doRestart(args);
-                        } else {
-                            // If the secure keyguard is up, we don't want to restart.
-                            // Just clear the guest profile data.
-                            GeckoProfile.maybeCleanupGuestProfile(BrowserApp.this);
-                        }
+                        doRestart(args);
                         GeckoAppShell.systemExit();
                     }
                 } catch(JSONException ex) {
@@ -2916,9 +2875,7 @@ public class BrowserApp extends GeckoApp
         }
 
         // Only solicit feedback when the app has been launched from the icon shortcut.
-        if (GuestSession.NOTIFICATION_INTENT.equals(action)) {
-            showGuestModeDialog(BrowserApp.GuestModeDialog.LEAVING);
-        } else if (!Intent.ACTION_MAIN.equals(action)) {
+        if (!Intent.ACTION_MAIN.equals(action)) {
             return;
         }
 
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index b6c3f31c5a40..36bdfc785ae8 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -2163,32 +2163,21 @@ public abstract class GeckoApp
     }
 
     public void doRestart() {
-        doRestart(RESTARTER_ACTION, null, null);
+        doRestart(RESTARTER_ACTION, null);
     }
 
     public void doRestart(String args) {
-        doRestart(RESTARTER_ACTION, args, null);
+        doRestart(RESTARTER_ACTION, args);
     }
 
-    public void doRestart(Intent intent) {
-        doRestart(RESTARTER_ACTION, null, intent);
-    }
-
-    public void doRestart(String action, String args, Intent restartIntent) {
+    public void doRestart(String action, String args) {
         Log.d(LOGTAG, "doRestart(\"" + action + "\")");
         try {
             Intent intent = new Intent(action);
             intent.setClassName(AppConstants.ANDROID_PACKAGE_NAME, RESTARTER_CLASS);
-
             /* TODO: addEnvToIntent(intent); */
-            if (args != null) {
+            if (args != null)
                 intent.putExtra("args", args);
-            }
-
-            if (restartIntent != null) {
-                intent.putExtra(Intent.EXTRA_INTENT, restartIntent);
-            }
-
             intent.putExtra("didRestart", true);
             Log.d(LOGTAG, "Restart intent: " + intent.toString());
             GeckoAppShell.killAnyZombies();
diff --git a/mobile/android/base/GeckoProfile.java b/mobile/android/base/GeckoProfile.java
index 2ac7ff60379d..2a77a97f86b0 100644
--- a/mobile/android/base/GeckoProfile.java
+++ b/mobile/android/base/GeckoProfile.java
@@ -90,9 +90,10 @@ public final class GeckoProfile {
             }
         }
 
-        // If the guest profile should be used return it.
-        if (GuestSession.shouldUse(context, "")) {
-            return GeckoProfile.getGuestProfile(context);
+        // If the guest profile exists and is locked, return it
+        GeckoProfile guest = GeckoProfile.getGuestProfile(context);
+        if (guest != null && guest.locked()) {
+            return guest;
         }
 
         if (isGeckoApp) {
@@ -193,17 +194,12 @@ public final class GeckoProfile {
 
     public static GeckoProfile createGuestProfile(Context context) {
         try {
+            removeGuestProfile(context);
             // We need to force the creation of a new guest profile if we want it outside of the normal profile path,
             // otherwise GeckoProfile.getDir will try to be smart and build it for us in the normal profiles dir.
             getGuestDir(context).mkdir();
             GeckoProfile profile = getGuestProfile(context);
-
-            // If we're creating this guest session over the keyguard, don't lock it.
-            // This will force the guest session to exit if the user unlocks their phone
-            // and starts Fennec.
-            if (!GuestSession.isSecureKeyguardLocked(context)) {
-                profile.lock();
-            }
+            profile.lock();
 
             /*
              * Now do the things that createProfileDirectory normally does --
@@ -232,7 +228,7 @@ public final class GeckoProfile {
         return sGuestDir;
     }
 
-    public static GeckoProfile getGuestProfile(Context context) {
+    private static GeckoProfile getGuestProfile(Context context) {
         if (sGuestProfile == null) {
             File guestDir = getGuestDir(context);
             if (guestDir.exists()) {
@@ -246,11 +242,10 @@ public final class GeckoProfile {
 
     public static boolean maybeCleanupGuestProfile(final Context context) {
         final GeckoProfile profile = getGuestProfile(context);
+
         if (profile == null) {
             return false;
-        }
-
-        if (!profile.locked()) {
+        } else if (!profile.locked()) {
             profile.mInGuestMode = false;
 
             // If the guest dir exists, but it's unlocked, delete it
@@ -335,17 +330,12 @@ public final class GeckoProfile {
         try {
             // If this dir doesn't exist getDir will create it for us
             final File lockFile = new File(getDir(), LOCK_FILE_NAME);
-            final boolean result;
-            lockFile.createNewFile();
-
-            if (lockFile.exists()) {
+            final boolean result = lockFile.createNewFile();
+            if (result) {
                 mLocked = LockState.LOCKED;
-                result = true;
             } else {
                 mLocked = LockState.UNLOCKED;
-                result = false;
             }
-
             return result;
         } catch(IOException ex) {
             Log.e(LOGTAG, "Error locking profile", ex);
@@ -367,11 +357,6 @@ public final class GeckoProfile {
 
         try {
             final File lockFile = new File(profileDir, LOCK_FILE_NAME);
-            if (!lockFile.exists()) {
-                mLocked = LockState.UNLOCKED;
-                return true;
-            }
-
             final boolean result = delete(lockFile);
             if (result) {
                 mLocked = LockState.UNLOCKED;
@@ -382,7 +367,6 @@ public final class GeckoProfile {
         } catch(IOException ex) {
             Log.e(LOGTAG, "Error unlocking profile", ex);
         }
-
         mLocked = LockState.LOCKED;
         return false;
     }
diff --git a/mobile/android/base/GuestSession.java b/mobile/android/base/GuestSession.java
deleted file mode 100644
index 86937ec8ba97..000000000000
--- a/mobile/android/base/GuestSession.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * 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/. */
-
-package org.mozilla.gecko;
-
-import org.mozilla.gecko.prompts.Prompt;
-import org.mozilla.gecko.util.EventCallback;
-import org.mozilla.gecko.util.NativeEventListener;
-import org.mozilla.gecko.util.NativeJSObject;
-import org.mozilla.gecko.util.ThreadUtils;
-
-import java.io.File;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.KeyguardManager;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
-import android.util.Log;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.ListView;
-
-// Utility methods for entering/exiting guest mode.
-public final class GuestSession {
-    private static final String LOGTAG = "GeckoGuestSession";
-    public static final String NOTIFICATION_INTENT = "org.mozilla.gecko.GUEST_SESSION_INPROGRESS";
-    private static final int NOTIFICATION_ID = LOGTAG.hashCode();
-
-    // Returns true if the user is using a secure keyguard, and its currently locked.
-    static boolean isSecureKeyguardLocked(Context context) {
-        final KeyguardManager manager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
-
-        if (AppConstants.Versions.preJB) {
-            return false;
-        }
-
-        return manager.isKeyguardLocked() && manager.isKeyguardSecure();
-    }
-
-    /* Returns true if you should be in guest mode. This can be because a secure keyguard
-     * is locked, or because the user has explicitly started guest mode via a dialog. If the
-     * user has explicitly started Fennec in guest mode, this will return true until they
-     * explicitly exit it.
-     */
-    public static boolean shouldUse(final Context context, final String args) {
-        // Did the command line args request guest mode?
-        if (args != null && args.contains(BrowserApp.GUEST_BROWSING_ARG)) {
-            return true;
-        }
-
-        // Otherwise, is the device locked?
-        final boolean keyguard = isSecureKeyguardLocked(context);
-        if (keyguard) {
-            return true;
-        }
-
-        // Otherwise, is there a locked guest mode profile?
-        final GeckoProfile profile = GeckoProfile.getGuestProfile(context);
-        if (profile == null) {
-            return false;
-        }
-
-        return profile.locked();
-    }
-
-    private static PendingIntent getNotificationIntent(Context context) {
-        Intent intent = new Intent(NOTIFICATION_INTENT);
-        return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-    }
-
-    public static void showNotification(Context context) {
-        final NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
-        final Resources res = context.getResources();
-        builder.setContentTitle(res.getString(R.string.guest_browsing_notification_title))
-               .setContentText(res.getString(R.string.guest_browsing_notification_text))
-               .setSmallIcon(R.drawable.alert_guest)
-               .setOngoing(true)
-               .setContentIntent(getNotificationIntent(context));
-
-        final NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        manager.notify(NOTIFICATION_ID, builder.build());
-    }
-
-    public static void hideNotification(Context context) {
-        final NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        manager.cancel(NOTIFICATION_ID);
-    }
-
-    public static void onDestroy(Context context) {
-        if (GeckoProfile.get(context).inGuestMode()) {
-            hideNotification(context);
-        }
-    }
-
-    public static void configureWindow(Window window) {
-        // In guest sessions we allow showing over the keyguard.
-        window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
-        window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-    }
-}
diff --git a/mobile/android/base/Restarter.java b/mobile/android/base/Restarter.java
index 450fe2997cec..19529bed67f5 100644
--- a/mobile/android/base/Restarter.java
+++ b/mobile/android/base/Restarter.java
@@ -39,33 +39,19 @@ public class Restarter extends Activity {
                 }
             }
         } catch (Exception e) {
-            Log.i(LOGTAG, "Error killing gecko", e);
+            Log.i(LOGTAG, e.toString());
         }
-
         try {
-            final Intent originalIntent = getIntent();
-            Intent intent = null;
-            if (originalIntent.hasExtra(Intent.EXTRA_INTENT)) {
-                intent = (Intent) originalIntent.getParcelableExtra(Intent.EXTRA_INTENT);
-                originalIntent.removeExtra(Intent.EXTRA_INTENT);
-            }
-
-            if (intent == null) {
-                intent = new Intent(Intent.ACTION_MAIN);
-            }
-
+            Intent intent = new Intent(Intent.ACTION_MAIN);
             intent.setClassName(AppConstants.ANDROID_PACKAGE_NAME,
                                 AppConstants.BROWSER_INTENT_CLASS_NAME);
-
-            Bundle b = originalIntent.getExtras();
-            if (b != null) {
+            Bundle b = getIntent().getExtras();
+            if (b != null)
                 intent.putExtras(b);
-            }
-
             Log.i(LOGTAG, intent.toString());
             startActivity(intent);
         } catch (Exception e) {
-            Log.i(LOGTAG, "Error restarting", e);
+            Log.i(LOGTAG, e.toString());
         }
     }
 }
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index e0b4c2ae6228..27d2e873aa57 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -489,8 +489,6 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY guest_session_dialog_cancel "Cancel">
 <!ENTITY new_guest_session_title "&brandShortName; will now restart">
 <!ENTITY new_guest_session_text "The person using it will not be able to see any of your personal browsing data (like saved passwords, history or bookmarks).\n\nWhen your guest is done, their browsing data will be deleted and your session will be restored.">
-<!ENTITY guest_browsing_notification_title "Guest browsing is enabled">
-<!ENTITY guest_browsing_notification_text "Tap to exit">
 
 <!ENTITY exit_guest_session_title "&brandShortName; will now restart">
 <!ENTITY exit_guest_session_text "The browsing data from this session will be deleted.">
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 9df7bbf9fcfe..ea98e9e281aa 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -251,7 +251,6 @@ gbjar.sources += [
     'gfx/ViewTransform.java',
     'gfx/VirtualLayer.java',
     'GlobalHistory.java',
-    'GuestSession.java',
     'health/BrowserHealthRecorder.java',
     'health/BrowserHealthReporter.java',
     'health/HealthRecorder.java',
diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java
index 25f7888d6d5f..330e56f47ebe 100644
--- a/mobile/android/base/preferences/GeckoPreferences.java
+++ b/mobile/android/base/preferences/GeckoPreferences.java
@@ -24,7 +24,6 @@ import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.GeckoProfile;
 import org.mozilla.gecko.GeckoSharedPrefs;
-import org.mozilla.gecko.GuestSession;
 import org.mozilla.gecko.LocaleManager;
 import org.mozilla.gecko.PrefsHelper;
 import org.mozilla.gecko.R;
@@ -289,10 +288,6 @@ OnSharedPreferenceChangeListener
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (GeckoProfile.get(this).inGuestMode()) {
-            GuestSession.configureWindow(getWindow());
-        }
-
         // Apply the current user-selected locale, if necessary.
         checkLocale();
 
diff --git a/mobile/android/base/prompts/Prompt.java b/mobile/android/base/prompts/Prompt.java
index 68b8125c4caf..41b5ec27eb40 100644
--- a/mobile/android/base/prompts/Prompt.java
+++ b/mobile/android/base/prompts/Prompt.java
@@ -11,7 +11,6 @@ import org.json.JSONObject;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.R;
-import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
@@ -163,10 +162,7 @@ public class Prompt implements OnClickListener, OnCancelListener, OnItemClickLis
 
     private void create(String title, String text, PromptListItem[] listItems, int choiceMode)
             throws IllegalStateException {
-        final LayerView view = GeckoAppShell.getLayerView();
-        if (view != null) {
-            view.abortPanning();
-        }
+        GeckoAppShell.getLayerView().abortPanning();
 
         AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
         if (!TextUtils.isEmpty(title)) {
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/alert_guest.png b/mobile/android/base/resources/drawable-hdpi-v11/alert_guest.png
deleted file mode 100644
index 55d569730182a3f73787da8905f4614b983826c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1099
zcmV-R1ho5!P)<h;3K|Lk000e1NJLTq002J#002J-1^@s6S6>j{00006VoOIv0D}O7
z0E3vv27Ukl010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U$K{1}Coz81?`F1K3GK
zK~!ko?O8i$R6!KI^EL}Eh`Zt^7y>IHg3T5S8h_D%q)L^-YKs&?3Q3X1!bY@7Wn+~>
zuvD-JK>`vKf^4%vV>AeEV~X`hlmy-Q#i+-^30#Kvnc10Lmt+ns%)YrZXU@#LH}~El
z^6>ER@bK{P@E`)v3E&cdGJsY5!#4m60ImV(Z4z$^z&QZ70Mr2dmcJT+I{=0Oh-L~O
z0Z>Ogege1-AnlO17r-KtvCx#s2XFyqn0B!eQuvAi?+SptOW_5%qNW(P<P88+)II^^
z<!g|V<%^0<89?Al{0thys?GM7?>NU`jP0OeTXG>hFF!1eVkBfD`!%`eOm-1~F=jvK
zLi`x)Fs<}glc&RQ0&iBC^t8rU)6D)ifNY$-&U<mva{i8lJj)Q#6oAo~c1PLx=7kU&
zNkr0So@qO3E5654d^dm$`@fTM-vDqmqTL}@ermw?f|a{$#qW3U&D_Jv9ZKC505<`o
zl;?X{`GW!1XI9>AE55^l_#FxL=ZWZcOq(ADT%TNu|K&hDAN;Nen*rtjhQZ`D1Re1o
z9q@cksQ)TgKZ-YJz?IV-yN>vprSNqjL_MZ{jfl<)A?_*9-?H)n1HQcO*mcA|vlPD+
zQ}>F9jte0kCGeUYw<j7rB|;sC0ZS+6s?y&k76Ei7aMzf9pT=1GnSIrThZh(|RVoT0
zf@YJvFKK&?^;6NX=RweftH5TWLE&?jyoVJRw=>4JTXAiBU5Vc-{c%$aIpCgR{auQ&
zyUgrvxlU%>F%<sJMNAD~i1oP?V^`G)eO<-YNtkrRn^sb1*@(R2Cf0Ow2qr7@z;N96
zU5J;FTA4jM6=HUpl^^OvfJWjI9F;JvI^1~c3Etj5R(|i&z1_0d*5Y+PI3<}8HNmV*
zDhdnkqKx(VF`EyuE3o>SOtWWf6PFW~-W}u-G_K>(N#2aS9I1p|O2o8#t=QH9OsXDc
z9C1pXt234v+c12SzQU+nsZ_}7U6)5y)NM>(f<N#&qHS67W}_MpDuG0^QJ1$m!!Zuj
z=GE6>gB@D}uoS~N7Uma!LHnSZklEFlgo51mVJJmKPyZ8>0E&)3*g}3o_-<GRAcQnn
zc95cWfm{R5ly+!NL~mGD=vW|+j&>0Kq*=nHhx&(zc(ivWAfh6*2ky3jgQvBM0TC72
zM0}+M94}e9Cm^DOZ6f}03pjYt(-n}L>nK~iYUcaSz;APMfniR(S*W&%=O-(t10@#z
zUwGaM5+THQ_BSH{)G7M@Y|F><Y1*FH5CE`E#jpEpjfaPahlhuUhlj`3z+Y8r9n~G*
RDsTV*002ovPDHLkV1n_J_;LUM

diff --git a/mobile/android/base/resources/drawable-hdpi/alert_guest.png b/mobile/android/base/resources/drawable-hdpi/alert_guest.png
deleted file mode 100644
index b812a703f5384af8f2cb204c5dc3f855400907ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1335
zcmV-71<3k|P)<h;3K|Lk000e1NJLTq002J#002J-1^@s6S6>j{00006VoOIv0D}O7
z0E3vv27Ukl010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U$K{2L)qrXj1?H1jI>1
zK~!ko?V4R^9Yqw!e_0bSC>o6#Ey0#ju?P_Y{ZdndMG>M8Z9!=(y3|pb6cIs-P!xU9
zmj*?|cG@!N5UdiZv=l^}+WJv3C?S<%ybmfQRYa*DNs)-r=);{`$IITkvv)VwknA5W
zoSlz7=RdPEbIzFyIdbI4kt0Wr9P<zjNjro>wgFp#9^g8l6_^4>f#bj)qt#bg8yX6E
z9<agwx`1|D^(`<2ybc^PTKzpM<U=9v16~3ys?uy4*ad7iT1{s}d>JqRbjCCt1~&N)
zenSESdMznm90WEdnTaaIPXKM6U48&o8?DCT8U~&QbO0|Vw0k}9NJ`=X&|gOUQD6zs
zXn#w9?M{6g&~N)zMWd%3&jC#}*#A^0<gOH-|3+Yq^L(4p>S$S;F`zFL@+2^5%hm#$
zfc>dvJ`{4X-P~$HE3mojeTPFKyFB}Eb7wq)_&M0Rhn=DaviR)p^j#hmu%Ybvdf-SX
z<ocLFzZmFtihTB)y^h>%-;s*^jVU+l6%l34z=2T62dng3>DV{qvvh2mA&1+_wB(nj
zB;Oti+3Y-D=;+=X3i(Whe%CniNCJJMj=U%>`71Iws#~jUvQLLXYU{+fxXh7%OrYzm
zBVUr1d}9XW&yT6UKVoNg`~03j*RNTU|1$&fuJM(;!|n)A(Rc7_f)Dv$GSG82rv5iO
z`<3*zB+%93Yr7Bmv6RFojaCy?>VE>(8Li$fEC0@suS%eAv9Iku<WHs~|9O?VabS(n
z>eCp#Nsikad`}4<@*k!of2>0J2(YSB1ZK;}o#S$qhd0{g!~uo4;KqmiM>bNb6$c__
z`(5A`qgC8{2OQZau-fU!Z)FnFhC)6I?5KhGaii6`6j9xB;0tGxuB<d*p^)vsY5O<>
zTpJhH`}*uJ*lbNw^rcxZMyrC&3zV?6N^`gF4WEQY;AzAe;BZ3QzX#sQ;F#2oytzud
zEsp$3R_A;PZzeSQpwVh31M-8wWGNzyiqvdgak+i`8TcS;@`DMDK9YqOW+OHC#JMS=
z*;+?_-#2*@Brswkq1|UP^h76PyuHgE+52P)Sio4&<YU9tP{=0WE<h%H_miQJeZYIQ
zrmsUGJ1OSn+*H`d5lv4x@*OtK{;JVxswOALCN3WW1pYbmC=>u?jhXNu+-wKCm;YvN
z0fvoMD=PFm&A+!erG4TxV7JlgR4jR$O}X7F?#XyrOj%#yD8)S6sL|>#M|X!E=zD=n
zBl-^m+bRS>ghKWJd&&mDb<z8Q0e1o#oX)pehvMowExAb>^cd^B+#S)TboHgIx977|
zwg691%o0cG++nnO`5bxc7Z-pF=Ez=D0G>Bm?Mo3Cbl5MrH=_C;qt*Tr`JKSybAa@2
zV4u-yB&!#OLN?f?^qBKCd;=^ik^h?XDe5fHQiC()I|u>A>+DiiXmwzB^|?TNc(#aJ
z4|T@w{w3TT5P#=gFC40a4tF_q20+IgA^%Aobht78(tzUq_FTYcb<p7kJ&OXexsFPU
z@!4GO4&2+EmVjhA@!7(cb<*>PBR2(QvGD(eQ}s|%7U(oLghEbG{ohsdI-YN0VPZO<
t_%Dfth$(X9$dMyQjvP61<j65E@DHL#S`C=Ke^CGc002ovPDHLkV1nYpb07c!

diff --git a/mobile/android/base/resources/drawable-mdpi-v11/alert_guest.png b/mobile/android/base/resources/drawable-mdpi-v11/alert_guest.png
deleted file mode 100644
index 051b13f8b8e21a81b252ed6c9239fcaf4180ebe8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 782
zcmV+p1M&QcP)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400006VoOIv0D}O7
z0E3vv27Ukl010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U$K{2m*SH;XeQX0-H%h
zK~z}7?U+AkR6!8NXD<fMKe^&iBoG1?77{Rp%|WmT2&OSry3`gaY*Srf7lo7-)|S_#
zI<PpRMhGcv4zUn57zo-V5EJ!6a^BBoHZ05gw=eGs@qNwS&b<Bh+qe5>W>2I<i4rCL
zJpiM?60ivz0X?7#G=W-9&N-kB>;Wgh4)7efaUPK`iN_~kB9QZO0^boZn@8vh>1YSO
zNsA^>*OxH`yioi1pq&E7bcI<k?Tl;1O$5BMB4hk*^*;&``jG5camF108^9%xuL|__
z`O%m;7u4Sg5xO2AwCf24=(vJ_n%WN%<{Y=%A0qTHKxoey*K_P^j=iF`e!`qppU*`l
zX51iWM5{W#r=8y;X}rdmV-YzOk!sZOh!eUMAnrqiZC^wlIQ=ng4^y~)d(Wo|Z3hT_
z?e%|%$bDl>)B-M~a9KV5tY>rr7-T%7_ndLtKqH3pvpzo?<8P|}U1-41^5yTug`0$|
zv=-s3DHp(8o}8S9<p91qaIE9%o^L5M)A_l6FG1uWN3OToXTh_#)V`Q@c%#C_sffHy
znD>h@W;byCHtWoI_Pg4y2MhJWMW`<h$J$=>?6&_aSSU~xk?TppJ?n>Lvy+HSYIoan
z+iY|><Q&}uR-L?^gk3EM=YjErk7!xzSBsgLGkT;&^mLp!qt#0%Abv*SBk&Zs12nYG
zbo2j)FVa~|%j4Pv7IkOO9$ck(xC>qb<}>W(6!1*1JMQ9)UCl|sB5m!N`!1w4arf+~
zI0b9b=oWCfd}40}6%lC+=@R><01lh?Z&yU*){un0FMz`)l*vj;tjvQy+I}s7YhT-|
z6%n~suuz+^z7;9d0EbZ(^*QiUM6MLQO9o&FTR&3%Ay%S9iT?zD0ZBNMHZNnuTL1t6
M07*qoM6N<$f@q^#R{#J2

diff --git a/mobile/android/base/resources/drawable-mdpi/alert_guest.png b/mobile/android/base/resources/drawable-mdpi/alert_guest.png
deleted file mode 100644
index 40e5ccac9ef971f2f143217768c3497092dda528..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmeAS@N?(olHy`uVBq!ia0vp^S|H593?x6vT4n;Ns{uYCuJOqk!w>CJk_!ZSkg+7l
zFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|IGKdlwf8Se
zodeY4=;`7ZVsZNI<kNnK4Fp`(`_mq}hCJ20(v`v<qIEYwv~hyKg5Uq=x5#%s?p!XE
zba!{bl#eG<Y>ItLF58y`CGYFYowe=u+GhU^R&5*8#e?UpG0YTZVcfhg;e3GU;<W80
z8_j(}8y3!U@ttCOBf?5~1=FWO$FCQSwzucF9p>s{mF;v}VD4hIIJqH>=j!W&0&ln6
zR?3@tG2y~7wd@+DpApgVOV)2q$PhAn{U9m*eq-Yjv66=ys(!zzh}ZOZRr>ti4VJA^
z?rLXr#B{?wSBk%J`f=rSU2oi<HBKesTfJ5ny|CRbeKc}=UCjEe{Bnj@SBaH}dxyuq
z;(r^I%aU$zmPviOV3UxK@77<Z?v}50SQc@Ag-p($gmq7U9h>_9vF)x48ectBj+V>Y
zn{+JYdJ*|sElhD?WX0M&Q$m8Z%oP46|22=js(;O^dF|xGH9ElXW$<+Mb6Mw<&;$UL
C6AS?W

diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/alert_guest.png b/mobile/android/base/resources/drawable-xhdpi-v11/alert_guest.png
deleted file mode 100644
index 5bb71d4c77f27fef3352f5fb00f1ced5369757c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1514
zcmV<G1r_><P)<h;3K|Lk000e1NJLTq002|~002}71^@s69BUB400006VoOIv0D}O7
z0E3vv27Ukl010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U$K{2rfuejobhL1$RkA
zK~#9!?VL|&9Yq|+zw??@t=N=WF-=JuM0{Xt144=+np|Qn8W4PV$)yM5#d9vfLk<DW
zsi)ooJy|b(LNN$cN|6R3MpH4ACZ$+4mZVA&YDrB^^nJZdFwWb3J3G6xZy)|Xr%W<4
z``zFC|IKd$2!bF8f*=TjAP9mW2trz@G%6w40pLvl{Qx=vv;t@Xuma#VfGYq#Q%ZeR
zkC!C58^B2brvUT<I09fVfCm7U0n7mS0>DM3)bDj`4Uz{)o+DYI9kV36GuBulxoD|x
zo#dEqfXt0~EQZjXY?6F01AU6*S-LSz@<5ixY$y2}lQHC3<C%o|=1A^AMlC<Z<ZO^E
zdeS%$^2{-kJtSLnzC9$1B!@}P2jri~!k~jpk4ql(?FyKRrb%{Mlq(zMDpBRq5Io0p
z>CB+PyJM6$N8fp$#_VGHoC$c&B*}4-yBsuLHivn_2HDu2B77M10}lqhRbv!P##tCh
zwghb9jyb&NtWihFwrnBhvtIGgPS4iZq6`3-CfROTSGRFk`C2J;-9b~?NcZ?M=<}Xt
zlcPqudB@K$0GP3y2hHC2rK6tjBJ?FUs2+OzJsGsaNI!0*TLD}lIT*8^MMph98tG?z
z^w4(r<0*?gj{^8e&*Nb}h*l&0tD~M(BfZ~;L7P1qv?Zd4?sVpi0JspcSUqB-|8&%I
z-$*~<YYz2=*;q{x`AYykwW#MWCl{Pjo35QHF9zK((l*|nmjZsb6|-S#trt6a=)<6E
z9u0agV7{#R&H&!G7^+V?>e&~eFO)bfxT1T2kGb?tjJyv4yrY!*IN)!;80j`gJ%^0+
zQtCZa&npX_dgx8de0Kr#h8Pn7<|6i`uKVo;A447hzV%?t2LR?R@?8UPLMio4jXbkP
z`h=sVmyPs{ue1D+hqL@-z;jH>HfMV6f?GDqo{GC5kz6(EDEjK57Xwz(q?98TpAP}N
zt(5x1Vp{qez$eD9PsY^quCb9{P)gl|FGyZWv3CZ##z=myuUG~h^z{Wirz=MJX`}3@
z*9{}d{uB*5;Ys7Hi%&Gf7up8j1PFFvQ{U(N&{vA`xrUT8Z%NN)a;!;dahmj~FKBV<
zw<xok)H&^X^t_P5;#Br!(2&KcFQVA10gKV~Obn{SRjwv@=PkWs@QGRf>k;{T(`fJ{
z&XFWnz}GT}A-bv$4cojJv6nTkcP?jb(4_=rfABre>!b2o3}?v^BYit-g9>6$G3fup
zpxRmRR)Xgq_7;utuY=<>sxQ~>*C=+wNFViTdA;#1=}?zS3LE=%k`rmhHj(VmAv{5$
zma`FMM?wOGhf)n|B-uuC)G@d=PJrua7vZ|02ei|s;u?<{;#ApYRmYnaU5%);6Qr!q
z+*z@zdsv&zw4?9n7cG1SLzeG75>Z!0kI<4;*tnj1hDqLHec9Bp`<($Ay8<HYf|%DM
zs~EF0_37TY5mEoL4&ZGMt7vyhk;!RN(Ghq(T4RsJh?z<w++2@<QHyxkb&`ES6$~@q
zoDT`xrXKcVzP>Qg^ZQgpJiam~_C+=x=k&`eWPqM-#zLmVft?w98qk>I_1e7a4mcik
z`>?&Sf1?2pC6o1fu=cl_&wmZj(Y_?7P<<DjXYMMc4%S-)$z}XEg!0gK4?W&sz4QB=
z=rAKyju-SkYHx!X^hQo}n3sRW0)QeKkDqg*<0sQeT>$W00~+*BPIQ>D_=gJs4mO}c
zmvW+G#YjJ0Ky@r+Be0ee9p=XkEd{s-rRM2H>V<i8yRU%i@aINgD<?Y48-SK3xW}Q_
zlY1m{DXf6%Z-fMQ9xI^wV=2L%W<|1sl>Xh2AP9mW2!bF8f*=TjAP8yl4?!{b30bm7
Q0ssI207*qoM6N<$f?#pI(EtDd

diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_guest.png b/mobile/android/base/resources/drawable-xhdpi/alert_guest.png
deleted file mode 100644
index 4ca6d845102329b0a71f6cff47a95a65a8159181..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 891
zcmeAS@N?(olHy`uVBq!ia0vp^At21b3?#L;KKKlzRtNZmxW*@E3>9?3?6Mfp*^DJY
ze!&b5&u*lFI7!~_E({&4vK~MVXMsm#F#`j)FbFd;%$g$s6l5>)^mS#w$H^qbA(i={
zGLwOU$<x!tF(l&f+ZngJnhgZnq7{`mxNbe_6l=M}#j5|!>C->|ZC54ECK`Eei@nkM
zC%o(O`7=Ih#@`A!xVX4}<!3!=x#Pe0>bpt(B^Jy1j;Jq;Va<}rFLO>we78(r^@NtI
zb(Pc1a;?)T;aX*uht7yZSD8rY@rSRM|NM2jq?f7hF@?8!+t*tsr988mA{D>RV#Y50
zDVK_Frff|qzg>I3E`uwC-|_sJRyPxsRqU;n%OzQsX2%p&CaRx3F4R`$_F~QhFQ+R~
zUtY-tvGp!}TY7Qs)51?}L6_b~d;HIQ&fME_V9T2Wj0-#YOZx7e$j{q+m&Ix2`rpUj
zIvB10@`C&6^)(W~0#OGq9AS$U4{pA2Xzv%-3{{07-YkuO>PKYEG7|4ijX!ab+fn-8
zg1c|Ere0LMaHQnRTj_f3l|hkb53|fIQ9FJ1YhT`J;Y|T2>Ua2xd}{2HS-#q^^yTuP
zRnIbF_}+Qv@{|Rwvbs`j8ya!DKjzYr-TjwM6yMyAdmAD4|Lo-B8+K2O+!MY~(@O5;
zbVjZfQy0$kUZf^drF`ok`?Sp3>3vQ)4t)>H7Uiz))M!1JXI<-(`7rL#nbyK3{f)aG
z$i7iiJTDUdDTK>U^Yo<cx3vzj8%Hh?^lRhEEMUGh%XH~!8NbII@>0b*jvMCPXzMxW
z#9S1f`!i|P^|Xt>9oF72E3T2bd?Yk-VYat~?SjdoRjC2;@4bJ!Z?M1euzBX*U!O00
z6R4G&b#U>$>I*Wn=HF{QcDmqe;)@L1uXPIof9pSD_S(aB%F^qJ`2t5EsE@iYH~Wl2
UXSwh)U^-*)boFyt=akR{07^xG=>Px#

diff --git a/mobile/android/base/resources/values/ids.xml b/mobile/android/base/resources/values/ids.xml
deleted file mode 100644
index 4e25fe2c5c4d..000000000000
--- a/mobile/android/base/resources/values/ids.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-
-<resources>
-
-    <item type="id" name="guestNotification"/>
-
-</resources>
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 25cd65a0075f..a977c44510ba 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -447,8 +447,6 @@
   <string name="guest_session_dialog_cancel">&guest_session_dialog_cancel;</string>
   <string name="new_guest_session_title">&new_guest_session_title;</string>
   <string name="new_guest_session_text">&new_guest_session_text;</string>
-  <string name="guest_browsing_notification_title">&guest_browsing_notification_title;</string>
-  <string name="guest_browsing_notification_text">&guest_browsing_notification_text;</string>
 
   <string name="exit_guest_session_title">&exit_guest_session_title;</string>
   <string name="exit_guest_session_text">&exit_guest_session_text;</string>
diff --git a/mobile/android/search/java/org/mozilla/search/SearchWidget.java b/mobile/android/search/java/org/mozilla/search/SearchWidget.java
index ef19067e330f..51ae18419368 100644
--- a/mobile/android/search/java/org/mozilla/search/SearchWidget.java
+++ b/mobile/android/search/java/org/mozilla/search/SearchWidget.java
@@ -5,7 +5,6 @@
 
 package org.mozilla.search;
 
-import org.mozilla.gecko.AboutPages;
 import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
@@ -14,7 +13,6 @@ import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
-import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -65,6 +63,7 @@ public class SearchWidget extends AppWidgetProvider {
     public void onReceive(final Context context, final Intent intent) {
         // This will hold the intent to redispatch
         final Intent redirect;
+        Log.i(LOGTAG, "Got intent  " + intent.getAction());
         if (intent.getAction().equals(ACTION_LAUNCH_BROWSER)) {
             redirect = buildRedirectIntent(Intent.ACTION_MAIN,
                     AppConstants.ANDROID_PACKAGE_NAME,
@@ -106,17 +105,9 @@ public class SearchWidget extends AppWidgetProvider {
 
     // Utility to create the view for this widget and attach any event listeners to it
     private void addView(final AppWidgetManager manager, final Context context, final int id, final Bundle options) {
-        final int category = options.getInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY, -1);
-        final boolean isKeyguard = category == AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD;
-
-        final RemoteViews views;
-        if (isKeyguard) {
-            views = new RemoteViews(context.getPackageName(), R.layout.keyguard_widget);
-        } else {
-            views = new RemoteViews(context.getPackageName(), R.layout.search_widget);
-            addClickIntent(context, views, R.id.search_button, ACTION_LAUNCH_SEARCH);
-        }
+        final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.search_widget);
 
+        addClickIntent(context, views, R.id.search_button, ACTION_LAUNCH_SEARCH);
         addClickIntent(context, views, R.id.new_tab_button, ACTION_LAUNCH_NEW_TAB);
         // Clicking the logo also launches the browser
         addClickIntent(context, views, R.id.logo_button, ACTION_LAUNCH_BROWSER);
@@ -128,7 +119,7 @@ public class SearchWidget extends AppWidgetProvider {
     private void addClickIntent(final Context context, final RemoteViews views, final int viewId, final String action) {
         final Intent intent = new Intent(context, SearchWidget.class);
         intent.setAction(action);
-        intent.setData(Uri.parse(AboutPages.HOME));
+        intent.setData(Uri.parse("about:home"));
         final PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, intent, 0);
         views.setOnClickPendingIntent(viewId, pendingIntent);
     }
diff --git a/mobile/android/search/res/layout/keyguard_widget.xml b/mobile/android/search/res/layout/keyguard_widget.xml
deleted file mode 100644
index 082fce39a0cb..000000000000
--- a/mobile/android/search/res/layout/keyguard_widget.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/widget_header_height"
-    android:orientation="horizontal"
-    android:background="@drawable/widget_bg">
-
-    <ImageView android:id="@+id/logo_button"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:padding="@dimen/widget_padding"
-        android:background="@drawable/widget_button_left"
-        android:layout_height="match_parent"
-        android:src="@drawable/widget_icon"/>
-
-    <LinearLayout android:id="@+id/new_tab_button"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:contentDescription="@string/new_tab"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:background="@drawable/widget_button_right">
-
-        <TextView android:id="@+id/new_tab_button_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_widget_new_tab"
-            android:drawablePadding="@dimen/widget_padding"
-            android:gravity="center"
-            android:text="@string/new_tab"
-            android:fontFamily="sans-serif"
-            android:textSize="@dimen/widget_text_size"
-            android:textColor="@color/widget_text_color"/>
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/mobile/android/search/res/xml/search_widget_info.xml b/mobile/android/search/res/xml/search_widget_info.xml
index a99b24976b91..f837c4a208ee 100644
--- a/mobile/android/search/res/xml/search_widget_info.xml
+++ b/mobile/android/search/res/xml/search_widget_info.xml
@@ -7,7 +7,6 @@
     android:minWidth="300dp"
     android:minHeight="40dp"
     android:label="@string/search_widget_name"
-    android:widgetCategory="home_screen|keyguard"
+    android:widgetCategory="home_screen"
     android:previewImage="@drawable/launcher_widget"
-    android:initialLayout="@layout/search_widget"
-    android:initialKeyguardLayout="@layout/keyguard_widget"/>
+    android:initialLayout="@layout/search_widget"/>

From f528007ab08fe6b2017d1c9e95cf671309e4c0ea Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Wed, 10 Sep 2014 22:09:09 -0400
Subject: [PATCH 023/109] Bug 887755 - Lightweight theme preview is broken
 r=margaret

---
 mobile/android/chrome/content/browser.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 3b37230e7f97..1da8a629fe9b 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -95,6 +95,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "CharsetMenu",
 XPCOMUtils.defineLazyModuleGetter(this, "NetErrorHelper",
                                   "resource://gre/modules/NetErrorHelper.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "PermissionsUtils",
+                                  "resource://gre/modules/PermissionsUtils.jsm");
+
 // Lazily-loaded browser scripts:
 [
   ["SelectHelper", "chrome://browser/content/SelectHelper.js"],
@@ -2848,6 +2851,9 @@ var LightWeightThemeWebInstaller = {
   },
 
   _isAllowed: function (node) {
+    // Make sure the whitelist has been imported to permissions
+    PermissionsUtils.importFromPrefs("xpinstall.", "install");
+
     let pm = Services.perms;
 
     let uri = node.ownerDocument.documentURIObject;

From a316f27bea258c68fc7280fff7a9819b2a6b4225 Mon Sep 17 00:00:00 2001
From: Alan K <akligman@mozilla.com>
Date: Wed, 10 Sep 2014 14:54:00 +0200
Subject: [PATCH 024/109] Bug 1052009 - Enable CloudSync in Nightly (mochitest
 fix). r=gps

---
 .../tests/mochitest/browser_tabEvents.js      | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/services/cloudsync/tests/mochitest/browser_tabEvents.js b/services/cloudsync/tests/mochitest/browser_tabEvents.js
index aedc02ea0579..1eec99776097 100644
--- a/services/cloudsync/tests/mochitest/browser_tabEvents.js
+++ b/services/cloudsync/tests/mochitest/browser_tabEvents.js
@@ -23,9 +23,12 @@ function test() {
   ];
 
   let nevents = 0;
+  let nflushed = 0;
   function handleTabChangeEvent () {
     cloudSync.tabs.removeEventListener("change", handleTabChangeEvent);
     ++ nevents;
+    info("tab change event " + nevents);
+    next();
   }
 
   function getLocalTabs() {
@@ -50,18 +53,16 @@ function test() {
 
   cloudSync.tabs.addEventListener("change", handleTabChangeEvent);
 
-  let nflushed = 0;
   expected.forEach(function(url) {
     let tab = gBrowser.addTab(url);
 
     function flush() {
-      tab.linkedBrowser.removeEventListener("load", flush);
+      tab.linkedBrowser.removeEventListener("load", flush, true);
       local.TabState.flush(tab.linkedBrowser);
       ++ nflushed;
+      info("flushed " + nflushed);
 
-      if (nflushed == expected.length) {
-        getLocalTabs();
-      }
+      next();
     }
 
     tab.linkedBrowser.addEventListener("load", flush, true);
@@ -69,4 +70,10 @@ function test() {
     opentabs.push(tab);
   });
 
-}
\ No newline at end of file
+  function next() {
+    if (nevents == 1 && nflushed == expected.length) {
+      getLocalTabs();
+    }
+  }
+
+}

From 603011765d1e4cae39a61659e56884288d3be7e4 Mon Sep 17 00:00:00 2001
From: Alex Bardas <abardas@mozilla.com>
Date: Wed, 10 Sep 2014 13:39:00 +0200
Subject: [PATCH 025/109] Bug 1053939 - pass entry point to fxa content server
 when opening about:accounts + tests. r=markh

---
 .../content/aboutaccounts/aboutaccounts.js    | 27 ++++++++---
 browser/base/content/browser-fxaccounts.js    | 16 ++++++-
 browser/base/content/browser-menubar.inc      |  4 +-
 browser/base/content/browser-syncui.js        | 22 +++++++--
 browser/base/content/browser.js               | 24 ++++++++--
 .../test/general/browser_aboutAccounts.js     | 32 +++++++++++++
 .../content/test/general/browser_aboutHome.js | 12 +++++
 ...195_switchToTabHavingURI_ignoreFragment.js | 45 +++++++++++++++----
 .../test/browser_967000_button_sync.js        | 38 +++++++++++++---
 .../components/preferences/in-content/sync.js | 20 ++++++---
 browser/components/preferences/sync.js        | 20 ++++++---
 browser/modules/AboutHome.jsm                 |  2 +-
 browser/modules/UITour.jsm                    |  2 +-
 browser/modules/test/browser_UITour_sync.js   |  2 +-
 14 files changed, 217 insertions(+), 49 deletions(-)

diff --git a/browser/base/content/aboutaccounts/aboutaccounts.js b/browser/base/content/aboutaccounts/aboutaccounts.js
index af31be92e5be..4e719e91e828 100644
--- a/browser/base/content/aboutaccounts/aboutaccounts.js
+++ b/browser/base/content/aboutaccounts/aboutaccounts.js
@@ -96,7 +96,7 @@ function shouldAllowRelink(acctName) {
 let wrapper = {
   iframe: null,
 
-  init: function (url=null) {
+  init: function (url, entryPoint) {
     let weave = Cc["@mozilla.org/weave/service;1"]
                   .getService(Ci.nsISupports)
                   .wrappedJSObject;
@@ -116,9 +116,11 @@ let wrapper = {
     let iframe = document.getElementById("remote");
     this.iframe = iframe;
     iframe.addEventListener("load", this);
-
     try {
-      iframe.src = url || fxAccounts.getAccountsSignUpURI();
+      if (entryPoint) {
+        url += (url.indexOf("?") >= 0 ? "&" : "?") + entryPoint;
+      }
+      iframe.src = url;
     } catch (e) {
       error("Couldn't init Firefox Account wrapper: " + e.message);
     }
@@ -288,6 +290,17 @@ function openPrefs() {
 
 function init() {
   fxAccounts.getSignedInUser().then(user => {
+    // If the url contains an entrypoint query parameter, extract it into a variable
+    // to append it to the accounts URI resource.
+    // Works for the following cases:
+    // - about:accounts?entrypoint="abouthome"
+    // - about:accounts?entrypoint=abouthome&action=signup
+    let entryPointQParam = "entrypoint=";
+    let entryPointPos = window.location.href.indexOf(entryPointQParam);
+    let entryPoint = "";
+    if (entryPointPos >= 0) {
+      entryPoint = window.location.href.substring(entryPointPos).split("&")[0];
+    }
     // tests in particular might cause the window to start closing before
     // getSignedInUser has returned.
     if (window.closed) {
@@ -299,7 +312,7 @@ function init() {
         show("stage", "manage");
       } else {
         show("remote");
-        wrapper.init(fxAccounts.getAccountsSignInURI());
+        wrapper.init(fxAccounts.getAccountsSignInURI(), entryPoint);
       }
     } else if (window.location.href.contains("action=signup")) {
       if (user) {
@@ -307,7 +320,7 @@ function init() {
         show("stage", "manage");
       } else {
         show("remote");
-        wrapper.init();
+        wrapper.init(fxAccounts.getAccountsSignUpURI(), entryPoint);
       }
     } else if (window.location.href.contains("action=reauth")) {
       // ideally we would only show this when we know the user is in a
@@ -316,7 +329,7 @@ function init() {
       // promiseAccountsForceSigninURI, just always show it.
       fxAccounts.promiseAccountsForceSigninURI().then(url => {
         show("remote");
-        wrapper.init(url);
+        wrapper.init(url, entryPoint);
       });
     } else {
       // No action specified
@@ -327,7 +340,7 @@ function init() {
       } else {
         show("stage", "intro");
         // load the remote frame in the background
-        wrapper.init();
+        wrapper.init(fxAccounts.getAccountsSignUpURI(), entryPoint);
       }
     }
   });
diff --git a/browser/base/content/browser-fxaccounts.js b/browser/base/content/browser-fxaccounts.js
index 2921995358af..4f103e02ec5b 100644
--- a/browser/base/content/browser-fxaccounts.js
+++ b/browser/base/content/browser-fxaccounts.js
@@ -224,10 +224,22 @@ let gFxAccounts = {
   },
 
   openAccountsPage: function () {
-    switchToTabHavingURI("about:accounts", true);
+    let entryPoint = "menupanel";
+    if (UITour.originTabs.get(window) && UITour.originTabs.get(window).has(gBrowser.selectedTab)) {
+      entryPoint = "uitour";
+    }
+    switchToTabHavingURI("about:accounts?entrypoint=" + entryPoint, true, {
+      replaceQueryString: true
+    });
   },
 
   openSignInAgainPage: function () {
-    switchToTabHavingURI("about:accounts?action=reauth", true);
+    let entryPoint = "menupanel";
+    if (UITour.originTabs.get(window) && UITour.originTabs.get(window).has(gBrowser.selectedTab)) {
+      entryPoint = "uitour";
+    }
+    switchToTabHavingURI("about:accounts?action=reauth&entrypoint=" + entryPoint, true, {
+      replaceQueryString: true
+    });
   }
 };
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index d15c0450bacc..2fb1a37ee57d 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -476,7 +476,7 @@
                         label="&syncSetup.label;"
                         accesskey="&syncSetup.accesskey;"
                         observes="sync-setup-state"
-                        oncommand="gSyncUI.openSetup()"/>
+                        oncommand="gSyncUI.openSetup(null, 'menubar')"/>
               <menuitem id="sync-syncnowitem"
                         label="&syncSyncNowItem.label;"
                         accesskey="&syncSyncNowItem.accesskey;"
@@ -486,7 +486,7 @@
                         label="&syncReAuthItem.label;"
                         accesskey="&syncReAuthItem.accesskey;"
                         observes="sync-reauth-state"
-                        oncommand="gSyncUI.openSignInAgainPage();"/>
+                        oncommand="gSyncUI.openSignInAgainPage('menubar');"/>
 #endif
               <menuseparator id="devToolsSeparator"/>
               <menu id="webDeveloperMenu"
diff --git a/browser/base/content/browser-syncui.js b/browser/base/content/browser-syncui.js
index 623947e8fd2d..f7fde1b5a613 100644
--- a/browser/base/content/browser-syncui.js
+++ b/browser/base/content/browser-syncui.js
@@ -314,9 +314,11 @@ let gSyncUI = {
    *          null    -- regular set up wizard
    *          "pair"  -- pair a device first
    *          "reset" -- reset sync
+   * @param entryPoint
+   *        Indicates the entrypoint from where this method was called.
    */
 
-  openSetup: function SUI_openSetup(wizardType) {
+  openSetup: function SUI_openSetup(wizardType, entryPoint = "syncbutton") {
     let xps = Components.classes["@mozilla.org/weave/service;1"]
                                 .getService(Components.interfaces.nsISupports)
                                 .wrappedJSObject;
@@ -325,7 +327,13 @@ let gSyncUI = {
         if (userData) {
           this.openPrefs();
         } else {
-          switchToTabHavingURI("about:accounts", true);
+          // If the user is also in an uitour, set the entrypoint to `uitour`
+          if (UITour.originTabs.get(window) && UITour.originTabs.get(window).has(gBrowser.selectedTab)) {
+            entryPoint = "uitour";
+          }
+          switchToTabHavingURI("about:accounts?entrypoint=" + entryPoint, true, {
+            replaceQueryString: true
+          });
         }
       });
     } else {
@@ -366,8 +374,14 @@ let gSyncUI = {
     openPreferences("paneSync");
   },
 
-  openSignInAgainPage: function () {
-    switchToTabHavingURI("about:accounts?action=reauth", true);
+  openSignInAgainPage: function (entryPoint = "syncbutton") {
+    // If the user is also in an uitour, set the entrypoint to `uitour`
+    if (UITour.originTabs.get(window) && UITour.originTabs.get(window).has(gBrowser.selectedTab)) {
+      entryPoint = "uitour";
+    }
+    switchToTabHavingURI("about:accounts?action=reauth&entrypoint=" + entryPoint, true, {
+      replaceQueryString: true
+    });
   },
 
   // Helpers
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 0c7be40bdb7d..29562a26be7f 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -180,6 +180,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "TabCrashReporter",
 XPCOMUtils.defineLazyModuleGetter(this, "FormValidationHandler",
   "resource:///modules/FormValidationHandler.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "UITour",
+  "resource:///modules/UITour.jsm");
+
 let gInitialPages = [
   "about:blank",
   "about:newtab",
@@ -6916,9 +6919,13 @@ let gRemoteTabsUI = {
  *        If switching to this URI results in us opening a tab, aOpenParams
  *        will be the parameter object that gets passed to openUILinkIn. Please
  *        see the documentation for openUILinkIn to see what parameters can be
- *        passed via this object. This object also allows the 'ignoreFragment'
- *        property to be set to true to exclude fragment-portion matching when
- *        comparing URIs.
+ *        passed via this object.
+ *        This object also allows:
+ *        - 'ignoreFragment' property to be set to true to exclude fragment-portion
+ *        matching when comparing URIs.
+ *        - 'replaceQueryString' property to be set to true to exclude query string
+ *        matching when comparing URIs and ovewrite the initial query string with
+ *        the one from the new URI.
  * @return True if an existing tab was found, false otherwise
  */
 function switchToTabHavingURI(aURI, aOpenNew, aOpenParams={}) {
@@ -6929,6 +6936,8 @@ function switchToTabHavingURI(aURI, aOpenNew, aOpenParams={}) {
   ]);
 
   let ignoreFragment = aOpenParams.ignoreFragment;
+  let replaceQueryString = aOpenParams.replaceQueryString;
+
   // This property is only used by switchToTabHavingURI and should
   // not be used as a parameter for the new load.
   delete aOpenParams.ignoreFragment;
@@ -6960,6 +6969,15 @@ function switchToTabHavingURI(aURI, aOpenNew, aOpenParams={}) {
         }
         return true;
       }
+      if (replaceQueryString) {
+        if (browser.currentURI.spec.split("?")[0] == aURI.spec.split("?")[0]) {
+          // Focus the matching window & tab
+          aWindow.focus();
+          aWindow.gBrowser.tabContainer.selectedIndex = i;
+          browser.loadURI(aURI.spec);
+          return true;
+        }
+      }
     }
     return false;
   }
diff --git a/browser/base/content/test/general/browser_aboutAccounts.js b/browser/base/content/test/general/browser_aboutAccounts.js
index 517cc7291e68..836be22de044 100644
--- a/browser/base/content/test/general/browser_aboutAccounts.js
+++ b/browser/base/content/test/general/browser_aboutAccounts.js
@@ -189,6 +189,38 @@ let gTests = [
     is(tab.linkedBrowser.contentDocument.location.href, "about:accounts?action=signin");
   }
 },
+{
+  desc: "Test entrypoint query string, no action, no user logged in",
+  teardown: () => gBrowser.removeCurrentTab(),
+  run: function* () {
+    // When this loads with no user logged-in, we expect the "normal" URL
+    setPref("identity.fxaccounts.remote.signup.uri", "https://example.com/");
+    let [tab, url] = yield promiseNewTabWithIframeLoadEvent("about:accounts?entrypoint=abouthome");
+    is(url, "https://example.com/?entrypoint=abouthome", "entrypoint=abouthome got the expected URL");
+  },
+},
+{
+  desc: "Test entrypoint query string for signin",
+  teardown: () => gBrowser.removeCurrentTab(),
+  run: function* () {
+    // When this loads with no user logged-in, we expect the "normal" URL
+    const expected_url = "https://example.com/?is_sign_in";
+    setPref("identity.fxaccounts.remote.signin.uri", expected_url);
+    let [tab, url] = yield promiseNewTabWithIframeLoadEvent("about:accounts?action=signin&entrypoint=abouthome");
+    is(url, expected_url + "&entrypoint=abouthome", "entrypoint=abouthome got the expected URL");
+  },
+},
+{
+  desc: "Test entrypoint query string for signup",
+  teardown: () => gBrowser.removeCurrentTab(),
+  run: function* () {
+    // When this loads with no user logged-in, we expect the "normal" URL
+    const sign_up_url = "https://example.com/?is_sign_up";
+    setPref("identity.fxaccounts.remote.signup.uri", sign_up_url);
+    let [tab, url] = yield promiseNewTabWithIframeLoadEvent("about:accounts?entrypoint=abouthome&action=signup");
+    is(url, sign_up_url + "&entrypoint=abouthome", "entrypoint=abouthome got the expected URL");
+  },
+},
 ]; // gTests
 
 function test()
diff --git a/browser/base/content/test/general/browser_aboutHome.js b/browser/base/content/test/general/browser_aboutHome.js
index c5a889bcf043..4be475055af9 100644
--- a/browser/base/content/test/general/browser_aboutHome.js
+++ b/browser/base/content/test/general/browser_aboutHome.js
@@ -454,6 +454,18 @@ let gTests = [
     yield promiseWaitForCondition(() => doc.activeElement === searchInput);
     is(searchInput, doc.activeElement, "Search bar should be the active element.");
   })
+},
+{
+  desc: "Sync button should open about:accounts page with `abouthome` entrypoint",
+  setup: function () {},
+  run: Task.async(function* () {
+    let syncButton = gBrowser.selectedTab.linkedBrowser.contentDocument.getElementById("sync");
+    yield EventUtils.synthesizeMouseAtCenter(syncButton, {}, gBrowser.contentWindow);
+
+    yield promiseTabLoadEvent(gBrowser.selectedTab, null, "load");
+    is(gBrowser.currentURI.spec, "about:accounts?entrypoint=abouthome",
+      "Entry point should be `abouthome`.");
+  })
 }
 
 ];
diff --git a/browser/base/content/test/general/browser_bug1025195_switchToTabHavingURI_ignoreFragment.js b/browser/base/content/test/general/browser_bug1025195_switchToTabHavingURI_ignoreFragment.js
index a6ecad35ca93..fef091b8b771 100644
--- a/browser/base/content/test/general/browser_bug1025195_switchToTabHavingURI_ignoreFragment.js
+++ b/browser/base/content/test/general/browser_bug1025195_switchToTabHavingURI_ignoreFragment.js
@@ -15,21 +15,48 @@ add_task(function() {
   gBrowser.selectedTab = tabRefAboutMozilla;
   let numTabsAtStart = gBrowser.tabs.length;
 
-  switchTab("about:home#1", false, true);
-  switchTab("about:mozilla", false, true);
-  switchTab("about:home#2", true, true);
+  switchTab("about:home#1", false, false, true);
+  switchTab("about:mozilla", false, false, true);
+  switchTab("about:home#2", true, false, true);
   is(tabRefAboutHome, gBrowser.selectedTab, "The same about:home tab should be switched to");
   is(gBrowser.currentURI.ref, "2", "The ref should be updated to the new ref");
-  switchTab("about:mozilla", false, true);
-  switchTab("about:home#1", false, false);
+  switchTab("about:mozilla", false, false, true);
+  switchTab("about:home#1", false, false, false);
   isnot(tabRefAboutHome, gBrowser.selectedTab, "Selected tab should not be initial about:blank tab");
   is(gBrowser.tabs.length, numTabsAtStart + 1, "Should have one new tab opened");
-  switchTab("about:about", true, false);
+  switchTab("about:about", true, false, false);
 });
 
-function switchTab(aURI, aIgnoreFragment, aShouldFindExistingTab) {
-  let tabFound = switchToTabHavingURI(aURI, true, {ignoreFragment: aIgnoreFragment});
+
+// Test for replaceQueryString option.
+add_task(function() {
+  registerCleanupFunction(function() {
+    while (gBrowser.tabs.length > 1)
+      gBrowser.removeCurrentTab();
+  });
+
+  let tabRefAboutHome = gBrowser.addTab("about:home?hello=firefox");
+  yield promiseTabLoaded(tabRefAboutHome);
+
+  switchTab("about:home", false, false, false);
+  switchTab("about:home?hello=firefox", false, false, true);
+  switchTab("about:home?hello=firefoxos", false, false, false);
+  // Remove the last opened tab to test replaceQueryString option.
+  gBrowser.removeCurrentTab();
+  switchTab("about:home?hello=firefoxos", false, true, true);
+  is(tabRefAboutHome, gBrowser.selectedTab, "Selected tab should be the initial about:home tab");
+  // Wait for the tab to load the new URI spec.
+  yield promiseTabLoaded(tabRefAboutHome);
+  is(gBrowser.currentURI.spec, "about:home?hello=firefoxos", "The spec should be updated to the new spec");
+});
+
+function switchTab(aURI, aIgnoreFragment, aReplaceQueryString, aShouldFindExistingTab) {
+  let tabFound = switchToTabHavingURI(aURI, true, {
+    ignoreFragment: aIgnoreFragment,
+    replaceQueryString: aReplaceQueryString
+  });
   is(tabFound, aShouldFindExistingTab,
      "Should switch to existing " + aURI + " tab if one existed, " +
-     (aIgnoreFragment ? "ignoring" : "including") + " fragment portion");
+     (aIgnoreFragment ? "ignoring" : "including") + " fragment portion, " +
+     (aReplaceQueryString ? "ignoring" : "replacing") + " query string.");
 }
diff --git a/browser/components/customizableui/test/browser_967000_button_sync.js b/browser/components/customizableui/test/browser_967000_button_sync.js
index 0310871d0c76..eaf5110c6d47 100644
--- a/browser/components/customizableui/test/browser_967000_button_sync.js
+++ b/browser/components/customizableui/test/browser_967000_button_sync.js
@@ -2,12 +2,16 @@
  * 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/. */
 
+// The test expects the about:accounts page to open in the current tab
+
 "use strict";
 
+XPCOMUtils.defineLazyModuleGetter(this, "UITour", "resource:///modules/UITour.jsm");
+
 let initialLocation = gBrowser.currentURI.spec;
 let newTab = null;
 
-add_task(function() {
+function openAboutAccountsFromMenuPanel(entryPoint) {
   info("Check Sync button functionality");
   Services.prefs.setCharPref("identity.fxaccounts.remote.signup.uri", "http://example.com/");
 
@@ -17,14 +21,27 @@ add_task(function() {
   // check the button's functionality
   yield PanelUI.show();
 
+  if (entryPoint == "uitour") {
+    UITour.originTabs.set(window, new Set());
+    UITour.originTabs.get(window).add(gBrowser.selectedTab);
+  }
+
   let syncButton = document.getElementById("sync-button");
   ok(syncButton, "The Sync button was added to the Panel Menu");
+
+  let deferred = Promise.defer();
+  let handler = () => {
+    gBrowser.selectedTab.removeEventListener("load", handler, true);
+    deferred.resolve();
+  }
+  gBrowser.selectedTab.addEventListener("load", handler, true);
+
   syncButton.click();
-
+  yield deferred.promise;
   newTab = gBrowser.selectedTab;
-  yield promiseTabLoadEvent(newTab, "about:accounts");
 
-  is(gBrowser.currentURI.spec, "about:accounts", "Firefox Sync page opened");
+  is(gBrowser.currentURI.spec, "about:accounts?entrypoint=" + entryPoint,
+    "Firefox Sync page opened with `menupanel` entrypoint");
   ok(!isPanelUIOpen(), "The panel closed");
 
   if(isPanelUIOpen()) {
@@ -32,9 +49,9 @@ add_task(function() {
     PanelUI.hide();
     yield panelHidePromise;
   }
-});
+}
 
-add_task(function asyncCleanup() {
+function asyncCleanup() {
   Services.prefs.clearUserPref("identity.fxaccounts.remote.signup.uri");
   // reset the panel UI to the default state
   yield resetCustomization();
@@ -43,4 +60,11 @@ add_task(function asyncCleanup() {
   // restore the tabs
   gBrowser.addTab(initialLocation);
   gBrowser.removeTab(newTab);
-});
+  UITour.originTabs.delete(window);
+}
+
+add_task(() => openAboutAccountsFromMenuPanel("syncbutton"));
+add_task(asyncCleanup);
+// Test that uitour is in progress, the entrypoint is `uitour` and not `menupanel`
+add_task(() => openAboutAccountsFromMenuPanel("uitour"));
+add_task(asyncCleanup);
diff --git a/browser/components/preferences/in-content/sync.js b/browser/components/preferences/in-content/sync.js
index be1664973ee2..078bcd60735a 100644
--- a/browser/components/preferences/in-content/sync.js
+++ b/browser/components/preferences/in-content/sync.js
@@ -313,7 +313,9 @@ let gSyncPane = {
                   .wrappedJSObject;
 
     if (service.fxAccountsEnabled) {
-      this.openContentInBrowser("about:accounts");
+      this.openContentInBrowser("about:accounts?entrypoint=preferences", {
+        replaceQueryString: true
+      });
     } else {
       let win = Services.wm.getMostRecentWindow("Weave:AccountSetup");
       if (win)
@@ -326,7 +328,7 @@ let gSyncPane = {
     }
   },
 
-  openContentInBrowser: function(url) {
+  openContentInBrowser: function(url, options) {
     let win = Services.wm.getMostRecentWindow("navigator:browser");
     if (!win) {
       // no window to use, so use _openLink to create a new one.  We don't
@@ -335,7 +337,7 @@ let gSyncPane = {
       gSyncUtils._openLink(url);
       return;
     }
-    win.openUILinkIn(url, "tab");
+    win.switchToTabHavingURI(url, true, options);
   },
 
 
@@ -350,15 +352,21 @@ let gSyncPane = {
   },
 
   signUp: function() {
-    this.openContentInBrowser("about:accounts?action=signup");
+    this.openContentInBrowser("about:accounts?action=signup&entrypoint=preferences", {
+      replaceQueryString: true
+    });
   },
 
   signIn: function() {
-    this.openContentInBrowser("about:accounts?action=signin");
+    this.openContentInBrowser("about:accounts?action=signin&entrypoint=preferences", {
+      replaceQueryString: true
+    });
   },
 
   reSignIn: function() {
-    this.openContentInBrowser("about:accounts?action=reauth");
+    this.openContentInBrowser("about:accounts?action=reauth&entrypoint=preferences", {
+      replaceQueryString: true
+    });
   },
 
   manageFirefoxAccount: function() {
diff --git a/browser/components/preferences/sync.js b/browser/components/preferences/sync.js
index 05f6e8e11b79..3133cc042500 100644
--- a/browser/components/preferences/sync.js
+++ b/browser/components/preferences/sync.js
@@ -229,7 +229,9 @@ let gSyncPane = {
                   .wrappedJSObject;
 
     if (service.fxAccountsEnabled) {
-      this.openContentInBrowser("about:accounts");
+      this.openContentInBrowser("about:accounts?entrypoint=preferences", {
+        replaceQueryString: true
+      });
     } else {
       let win = Services.wm.getMostRecentWindow("Weave:AccountSetup");
       if (win) {
@@ -242,7 +244,7 @@ let gSyncPane = {
     }
   },
 
-  openContentInBrowser: function(url) {
+  openContentInBrowser: function(url, options) {
     let win = Services.wm.getMostRecentWindow("navigator:browser");
     if (!win) {
       // no window to use, so use _openLink to create a new one.  We don't
@@ -251,21 +253,27 @@ let gSyncPane = {
       gSyncUtils._openLink(url);
       return;
     }
-    win.switchToTabHavingURI(url, true);
+    win.switchToTabHavingURI(url, true, options);
     // seeing as we are doing this in a tab we close the prefs dialog.
     window.close();
   },
 
   signUp: function() {
-    this.openContentInBrowser("about:accounts?action=signup");
+    this.openContentInBrowser("about:accounts?action=signup&entrypoint=preferences", {
+      replaceQueryString: true
+    });
   },
 
   signIn: function() {
-    this.openContentInBrowser("about:accounts?action=signin");
+    this.openContentInBrowser("about:accounts?action=signin&entrypoint=preferences", {
+      replaceQueryString: true
+    });
   },
 
   reSignIn: function() {
-    this.openContentInBrowser("about:accounts?action=reauth");
+    this.openContentInBrowser("about:accounts?action=reauth&entrypoint=preferences", {
+      replaceQueryString: true
+    });
   },
 
   manageFirefoxAccount: function() {
diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm
index 3c0d480eee64..10e204eb638a 100644
--- a/browser/modules/AboutHome.jsm
+++ b/browser/modules/AboutHome.jsm
@@ -159,7 +159,7 @@ let AboutHome = {
             if (userData) {
               window.openPreferences("paneSync");
             } else {
-              window.loadURI("about:accounts");
+              window.loadURI("about:accounts?entrypoint=abouthome");
             }
           });
         } else {
diff --git a/browser/modules/UITour.jsm b/browser/modules/UITour.jsm
index 0cdeef2b8f78..d039b39abef2 100644
--- a/browser/modules/UITour.jsm
+++ b/browser/modules/UITour.jsm
@@ -424,7 +424,7 @@ this.UITour = {
         // 'signup' is the only action that makes sense currently, so we don't
         // accept arbitrary actions just to be safe...
         // We want to replace the current tab.
-        contentDocument.location.href = "about:accounts?action=signup";
+        contentDocument.location.href = "about:accounts?action=signup&entrypoint=uitour";
         break;
       }
     }
diff --git a/browser/modules/test/browser_UITour_sync.js b/browser/modules/test/browser_UITour_sync.js
index 883bf59328fe..423b4d3ccbf6 100644
--- a/browser/modules/test/browser_UITour_sync.js
+++ b/browser/modules/test/browser_UITour_sync.js
@@ -51,7 +51,7 @@ let tests = [
         tabBrowser.removeEventListener("load", onload, true);
 
         ise(tabBrowser.contentDocument.location.href,
-            "about:accounts?action=signup",
+            "about:accounts?action=signup&entrypoint=uitour",
             "about:accounts should have replaced the tab");
 
         // the iframe in about:accounts will still be loading, so we stop

From acb340c7911b0a98710e4482af24acf29d44d23c Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 9 Sep 2014 14:27:00 +0200
Subject: [PATCH 026/109] Bug 1064743 - Support simultaneous sends in the
 transport. r=past

---
 .../transport/tests/unit/test_queue.js        | 172 ++++++++++++++++++
 .../transport/tests/unit/xpcshell.ini         |   1 +
 toolkit/devtools/transport/transport.js       |   2 +-
 3 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 toolkit/devtools/transport/tests/unit/test_queue.js

diff --git a/toolkit/devtools/transport/tests/unit/test_queue.js b/toolkit/devtools/transport/tests/unit/test_queue.js
new file mode 100644
index 000000000000..c67b37e6aa4e
--- /dev/null
+++ b/toolkit/devtools/transport/tests/unit/test_queue.js
@@ -0,0 +1,172 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * This test verifies that the transport's queue operates correctly when various
+ * packets are scheduled simultaneously.
+ */
+
+let { DebuggerServer } =
+  Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
+let { FileUtils } = Cu.import("resource://gre/modules/FileUtils.jsm", {});
+let { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm", {});
+
+function run_test() {
+  initTestDebuggerServer();
+
+  add_task(function() {
+    yield test_transport(socket_transport);
+    yield test_transport(local_transport);
+    DebuggerServer.destroy();
+  });
+
+  run_next_test();
+}
+
+/*** Tests ***/
+
+function test_transport(transportFactory) {
+  let clientDeferred = promise.defer();
+  let serverDeferred = promise.defer();
+
+  // Ensure test files are not present from a failed run
+  cleanup_files();
+  let reallyLong = really_long();
+  writeTestTempFile("bulk-input", reallyLong);
+
+  do_check_eq(Object.keys(DebuggerServer._connections).length, 0);
+
+  let transport = transportFactory();
+
+  // Sending from client to server
+  function write_data({copyFrom}) {
+    NetUtil.asyncFetch(getTestTempFile("bulk-input"), function(input, status) {
+      copyFrom(input).then(() => {
+        input.close();
+      });
+    });
+  }
+
+  // Receiving on server from client
+  function on_bulk_packet({actor, type, length, copyTo}) {
+    do_check_eq(actor, "root");
+    do_check_eq(type, "file-stream");
+    do_check_eq(length, reallyLong.length);
+
+    let outputFile = getTestTempFile("bulk-output", true);
+    outputFile.create(Ci.nsIFile.NORMAL_FILE_TYPE, parseInt("666", 8));
+
+    let output = FileUtils.openSafeFileOutputStream(outputFile);
+
+    copyTo(output).then(() => {
+      FileUtils.closeSafeFileOutputStream(output);
+      return verify();
+    }).then(() => {
+      // It's now safe to close
+      transport.hooks.onClosed = () => {
+        clientDeferred.resolve();
+      };
+      transport.close();
+    });
+  }
+
+  // Client
+
+  function send_packets() {
+    // Specifically, we want to ensure that multiple send()s proceed without
+    // causing the transport to die.
+    transport.send({
+      actor: "root",
+      type: "explode"
+    });
+
+    transport.startBulkSend({
+       actor: "root",
+       type: "file-stream",
+       length: reallyLong.length
+    }).then(write_data);
+  }
+
+  transport.hooks = {
+    onPacket: function(packet) {
+      if (packet.error) {
+        transport.hooks.onError(packet);
+      } else if (packet.applicationType) {
+        transport.hooks.onServerHello(packet);
+      } else {
+        do_throw("Unexpected server reply");
+      }
+    },
+
+    onServerHello: function(packet) {
+      // We've received the initial start up packet
+      do_check_eq(packet.from, "root");
+      do_check_eq(packet.applicationType, "xpcshell-tests");
+
+      // Server
+      do_check_eq(Object.keys(DebuggerServer._connections).length, 1);
+      do_print(Object.keys(DebuggerServer._connections));
+      for (let connId in DebuggerServer._connections) {
+        DebuggerServer._connections[connId].onBulkPacket = on_bulk_packet;
+      }
+
+      DebuggerServer.on("connectionchange", (event, type) => {
+        if (type === "closed") {
+          serverDeferred.resolve();
+        }
+      });
+
+      send_packets();
+    },
+
+    onError: function(packet) {
+      // The explode actor doesn't exist
+      do_check_eq(packet.from, "root");
+      do_check_eq(packet.error, "noSuchActor");
+    },
+
+    onClosed: function() {
+      do_throw("Transport closed before we expected");
+    }
+  };
+
+  transport.ready();
+
+  return promise.all([clientDeferred.promise, serverDeferred.promise]);
+}
+
+/*** Test Utils ***/
+
+function verify() {
+  let reallyLong = really_long();
+
+  let inputFile = getTestTempFile("bulk-input");
+  let outputFile = getTestTempFile("bulk-output");
+
+  do_check_eq(inputFile.fileSize, reallyLong.length);
+  do_check_eq(outputFile.fileSize, reallyLong.length);
+
+  // Ensure output file contents actually match
+  let compareDeferred = promise.defer();
+  NetUtil.asyncFetch(getTestTempFile("bulk-output"), input => {
+    let outputData = NetUtil.readInputStreamToString(input, reallyLong.length);
+    // Avoid do_check_eq here so we don't log the contents
+    do_check_true(outputData === reallyLong);
+    input.close();
+    compareDeferred.resolve();
+  });
+
+  return compareDeferred.promise.then(cleanup_files);
+}
+
+function cleanup_files() {
+  let inputFile = getTestTempFile("bulk-input", true);
+  if (inputFile.exists()) {
+    inputFile.remove(false);
+  }
+
+  let outputFile = getTestTempFile("bulk-output", true);
+  if (outputFile.exists()) {
+    outputFile.remove(false);
+  }
+}
diff --git a/toolkit/devtools/transport/tests/unit/xpcshell.ini b/toolkit/devtools/transport/tests/unit/xpcshell.ini
index 40543751b650..d41d39ec75a5 100644
--- a/toolkit/devtools/transport/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/transport/tests/unit/xpcshell.ini
@@ -15,4 +15,5 @@ reason = bug 821285
 [test_delimited_read.js]
 [test_no_bulk.js]
 [test_packet.js]
+[test_queue.js]
 [test_transport_bulk.js]
diff --git a/toolkit/devtools/transport/transport.js b/toolkit/devtools/transport/transport.js
index d8f1f9dfce89..82cceaa84d5d 100644
--- a/toolkit/devtools/transport/transport.js
+++ b/toolkit/devtools/transport/transport.js
@@ -259,7 +259,7 @@ DebuggerTransport.prototype = {
    * may not complete.
    */
   onOutputStreamReady: DevToolsUtils.makeInfallible(function(stream) {
-    if (this._outgoing.length === 0) {
+    if (!this._outgoingEnabled || this._outgoing.length === 0) {
       return;
     }
 

From 10c273df5797ed54f57f23d4041bcef0c0f3fad2 Mon Sep 17 00:00:00 2001
From: Alan K <akligman@mozilla.com>
Date: Fri, 29 Aug 2014 10:50:00 +0200
Subject: [PATCH 027/109] Bug 1052009 - Enable CloudSync in Nightly. r=rnewman

---
 browser/confvars.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/confvars.sh b/browser/confvars.sh
index 4f94ba0e1d82..e33736bb9874 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -31,6 +31,7 @@ MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_HEALTHREPORT=1
 MOZ_SERVICES_METRICS=1
 MOZ_SERVICES_SYNC=1
+MOZ_SERVICES_CLOUDSYNC=1
 MOZ_APP_VERSION=$FIREFOX_VERSION
 MOZ_EXTENSIONS_DEFAULT=" gio"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh

From 385660b12ed4002ded1525f17f43de2da7db3bb7 Mon Sep 17 00:00:00 2001
From: Eric Faust <efaustbmo@gmail.com>
Date: Wed, 10 Sep 2014 15:52:36 -0700
Subject: [PATCH 028/109] Bug 966518 - Part 0: Make proxy callability into a
 trap, rather than a class check. (r=bholley, r=djvj, r=peterv)

---
 dom/base/nsGlobalWindow.cpp                   | 10 ++--
 dom/bindings/Codegen.py                       | 36 +++++++++++--
 js/ipc/WrapperOwner.cpp                       | 28 +++++++---
 js/ipc/WrapperOwner.h                         |  2 +
 js/public/Class.h                             |  3 +-
 js/src/jit/CodeGenerator.cpp                  | 50 ++++++++++++++++-
 js/src/jit/CodeGenerator.h                    |  2 +
 js/src/jit/IonCaches.cpp                      | 14 +----
 js/src/jit/IonMacroAssembler.h                | 15 +++++-
 js/src/jit/MCallOptimize.cpp                  |  4 +-
 js/src/jit/VMFunctions.cpp                    |  6 +++
 js/src/jit/VMFunctions.h                      |  2 +
 js/src/jsapi-tests/testBug604087.cpp          |  6 +--
 js/src/jscntxtinlines.h                       |  2 +-
 js/src/jscompartment.cpp                      |  4 +-
 js/src/jsfriendapi.cpp                        |  6 +++
 js/src/jsfriendapi.h                          | 13 +++--
 js/src/jsfun.cpp                              |  2 +-
 js/src/jsinfer.cpp                            |  2 +-
 js/src/jsobj.cpp                              | 42 ++++++++++++++-
 js/src/jsobj.h                                |  6 +--
 js/src/jsprototypes.h                         |  2 +-
 js/src/jsproxy.h                              | 23 ++++----
 js/src/jswrapper.h                            | 10 ++--
 js/src/proxy/BaseProxyHandler.cpp             | 12 +++++
 js/src/proxy/DirectProxyHandler.cpp           |  7 +++
 js/src/proxy/Proxy.cpp                        | 19 +++----
 js/src/proxy/ScriptedDirectProxyHandler.cpp   | 20 ++++---
 js/src/proxy/ScriptedDirectProxyHandler.h     |  7 +++
 js/src/proxy/ScriptedIndirectProxyHandler.cpp | 54 +++++++++----------
 js/src/proxy/ScriptedIndirectProxyHandler.h   | 20 ++++++-
 js/src/proxy/Wrapper.cpp                      | 19 ++++---
 js/src/shell/js.cpp                           |  3 +-
 js/src/vm/Interpreter.cpp                     | 13 ++---
 js/src/vm/ProxyObject.h                       | 12 +++--
 js/src/vm/ScopeObject.cpp                     |  2 +-
 js/src/vm/ScopeObject.h                       |  2 +-
 js/xpconnect/src/Sandbox.cpp                  |  4 +-
 38 files changed, 346 insertions(+), 138 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index e6554edf96f2..df5f51713338 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -642,6 +642,12 @@ public:
                      JS::Handle<jsid> id, JS::Handle<JSObject*> callable) const MOZ_OVERRIDE;
   virtual bool unwatch(JSContext *cx, JS::Handle<JSObject*> proxy,
                        JS::Handle<jsid> id) const MOZ_OVERRIDE;
+  virtual bool isCallable(JSObject *obj) const MOZ_OVERRIDE {
+    return false;
+  }
+  virtual bool isConstructor(JSObject *obj) const MOZ_OVERRIDE {
+    return false;
+  }
 
   // Derived traps
   virtual bool has(JSContext *cx, JS::Handle<JSObject*> proxy,
@@ -694,8 +700,6 @@ const js::Class OuterWindowProxyClass =
         "Proxy",
         0, /* additional slots */
         0, /* additional class flags */
-        nullptr, /* call */
-        nullptr, /* construct */
         PROXY_MAKE_EXT(
             nullptr, /* outerObject */
             js::proxy_innerObject,
@@ -1055,7 +1059,7 @@ NewOuterWindowProxy(JSContext *cx, JS::Handle<JSObject*> parent, bool isChrome)
   JSObject *obj = js::Wrapper::New(cx, parent, parent,
                                    isChrome ? &nsChromeOuterWindowProxy::singleton
                                             : &nsOuterWindowProxy::singleton,
-                                   &options);
+                                   options);
 
   NS_ASSERTION(js::GetObjectClass(obj)->ext.innerObject, "bad class");
   return obj;
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 3ba151be5924..7a127de556e2 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -481,21 +481,17 @@ class CGDOMProxyJSClass(CGThing):
         # HTMLAllCollection.  So just hardcode it here.
         if self.descriptor.interface.identifier.name == "HTMLAllCollection":
             flags.append("JSCLASS_EMULATES_UNDEFINED")
-        callHook = LEGACYCALLER_HOOK_NAME if self.descriptor.operations["LegacyCaller"] else 'nullptr'
         return fill(
             """
             static const DOMJSClass Class = {
               PROXY_CLASS_DEF("${name}",
                               0, /* extra slots */
-                              ${flags},
-                              ${call}, /* call */
-                              nullptr  /* construct */),
+                              ${flags}),
               $*{descriptor}
             };
             """,
             name=self.descriptor.interface.identifier.name,
             flags=" | ".join(flags),
-            call=callHook,
             descriptor=DOMClass(self.descriptor))
 
 
@@ -10641,6 +10637,33 @@ class CGDOMJSProxyHandler_getInstance(ClassMethod):
             """)
 
 
+class CGDOMJSProxyHandler_call(ClassMethod):
+    def __init__(self):
+        args = [Argument('JSContext*', 'cx'),
+                Argument('JS::Handle<JSObject*>', 'proxy'),
+                Argument('const JS::CallArgs&', 'args')]
+
+        ClassMethod.__init__(self, "call", "bool", args, virtual=True, override=True, const=True)
+
+    def getBody(self):
+        return fill(
+            """
+            return js::ForwardToNative(cx, ${legacyCaller}, args);
+            """,
+            legacyCaller=LEGACYCALLER_HOOK_NAME)
+
+
+class CGDOMJSProxyHandler_isCallable(ClassMethod):
+    def __init__(self):
+        ClassMethod.__init__(self, "isCallable", "bool", [Argument('JSObject*', 'obj')],
+                           virtual=True, override=True, const=True)
+
+    def getBody(self):
+        return dedent("""
+            return true;
+        """)
+
+
 class CGDOMJSProxyHandler(CGClass):
     def __init__(self, descriptor):
         assert (descriptor.supportsIndexedProperties() or
@@ -10672,6 +10695,9 @@ class CGDOMJSProxyHandler(CGClass):
             (descriptor.operations['NamedSetter'] is not None and
              descriptor.interface.getExtendedAttribute('OverrideBuiltins'))):
             methods.append(CGDOMJSProxyHandler_setCustom(descriptor))
+        if descriptor.operations['LegacyCaller']:
+            methods.append(CGDOMJSProxyHandler_call())
+            methods.append(CGDOMJSProxyHandler_isCallable())
 
         CGClass.__init__(self, 'DOMProxyHandler',
                          bases=[ClassBase('mozilla::dom::DOMProxyHandler')],
diff --git a/js/ipc/WrapperOwner.cpp b/js/ipc/WrapperOwner.cpp
index e3bd8cbe039f..d3faf2b9ec38 100644
--- a/js/ipc/WrapperOwner.cpp
+++ b/js/ipc/WrapperOwner.cpp
@@ -82,6 +82,8 @@ class CPOWProxyHandler : public BaseProxyHandler
                                JSContext *cx) const MOZ_OVERRIDE;
     virtual const char* className(JSContext *cx, HandleObject proxy) const MOZ_OVERRIDE;
     virtual void finalize(JSFreeOp *fop, JSObject *proxy) const MOZ_OVERRIDE;
+    virtual bool isCallable(JSObject *obj) const MOZ_OVERRIDE;
+    virtual bool isConstructor(JSObject *obj) const MOZ_OVERRIDE;
 
     static const char family;
     static const CPOWProxyHandler singleton;
@@ -620,6 +622,25 @@ CPOWProxyHandler::finalize(JSFreeOp *fop, JSObject *proxy) const
     OwnerOf(proxy)->drop(proxy);
 }
 
+bool
+CPOWProxyHandler::isCallable(JSObject *obj) const
+{
+    return OwnerOf(obj)->isCallable(obj);
+}
+
+bool
+CPOWProxyHandler::isConstructor(JSObject *obj) const
+{
+    return isCallable(obj);
+}
+
+bool
+WrapperOwner::isCallable(JSObject *obj)
+{
+    ObjectId objId = idOf(obj);
+    return !!(objId & OBJECT_IS_CALLABLE);
+}
+
 void
 WrapperOwner::drop(JSObject *obj)
 {
@@ -837,19 +858,14 @@ WrapperOwner::fromRemoteObjectVariant(JSContext *cx, RemoteObject objVar)
         return nullptr;
     }
 
-    bool callable = !!(objId & OBJECT_IS_CALLABLE);
-
     RootedObject global(cx, JS::CurrentGlobalOrNull(cx));
 
     RootedValue v(cx, UndefinedValue());
-    ProxyOptions options;
-    options.selectDefaultClass(callable);
     obj = NewProxyObject(cx,
                          &CPOWProxyHandler::singleton,
                          v,
                          nullptr,
-                         global,
-                         options);
+                         global);
     if (!obj)
         return nullptr;
 
diff --git a/js/ipc/WrapperOwner.h b/js/ipc/WrapperOwner.h
index fcc1dc9f86f9..dd2fca40e3be 100644
--- a/js/ipc/WrapperOwner.h
+++ b/js/ipc/WrapperOwner.h
@@ -59,6 +59,8 @@ class WrapperOwner : public virtual JavaScriptShared
                          bool construct);
     bool objectClassIs(JSContext *cx, JS::HandleObject obj, js::ESClassValue classValue);
     const char* className(JSContext *cx, JS::HandleObject proxy);
+    bool isCallable(JSObject *obj);
+    // isConstructable is implemented here as isCallable.
 
     nsresult instanceOf(JSObject *obj, const nsID *id, bool *bp);
 
diff --git a/js/public/Class.h b/js/public/Class.h
index b55bd1b0754d..9e5aeeb08267 100644
--- a/js/public/Class.h
+++ b/js/public/Class.h
@@ -482,7 +482,8 @@ struct Class
         return flags & JSCLASS_EMULATES_UNDEFINED;
     }
 
-    bool isCallable() const {
+    bool nonProxyCallable() const {
+        MOZ_ASSERT(!isProxy());
         return this == js::FunctionClassPtr || call;
     }
 
diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
index aebb6271b5bb..0eb0399350dd 100644
--- a/js/src/jit/CodeGenerator.cpp
+++ b/js/src/jit/CodeGenerator.cpp
@@ -8764,16 +8764,40 @@ CodeGenerator::visitProfilerStackOp(LProfilerStackOp *lir)
     }
 }
 
+class OutOfLineIsCallable : public OutOfLineCodeBase<CodeGenerator>
+{
+    LIsCallable *ins_;
+
+  public:
+    OutOfLineIsCallable(LIsCallable *ins)
+      : ins_(ins)
+    { }
+
+    bool accept(CodeGenerator *codegen) {
+        return codegen->visitOutOfLineIsCallable(this);
+    }
+    LIsCallable *ins() const {
+        return ins_;
+    }
+};
+
 bool
 CodeGenerator::visitIsCallable(LIsCallable *ins)
 {
     Register object = ToRegister(ins->object());
     Register output = ToRegister(ins->output());
 
+    OutOfLineIsCallable *ool = new(alloc()) OutOfLineIsCallable(ins);
+    if (!addOutOfLineCode(ool, ins->mir()))
+        return false;
+
+    Label notFunction, done;
     masm.loadObjClass(object, output);
 
-    // An object is callable iff (is<JSFunction>() || getClass()->call).
-    Label notFunction, done, notCall;
+    // Just skim proxies off. Their notion of isCallable() is more complicated.
+    masm.branchTestClassIsProxy(true, output, ool->entry());
+
+    // An object is callable iff (is<JSFunction>() || getClass()->call.
     masm.branchPtr(Assembler::NotEqual, output, ImmPtr(&JSFunction::class_), &notFunction);
     masm.move32(Imm32(1), output);
     masm.jump(&done);
@@ -8781,6 +8805,28 @@ CodeGenerator::visitIsCallable(LIsCallable *ins)
     masm.bind(&notFunction);
     masm.cmpPtrSet(Assembler::NonZero, Address(output, offsetof(js::Class, call)), ImmPtr(nullptr), output);
     masm.bind(&done);
+    masm.bind(ool->rejoin());
+
+    return true;
+}
+
+bool
+CodeGenerator::visitOutOfLineIsCallable(OutOfLineIsCallable *ool)
+{
+    LIsCallable *ins = ool->ins();
+    Register object = ToRegister(ins->object());
+    Register output = ToRegister(ins->output());
+
+    saveVolatile(output);
+    masm.setupUnalignedABICall(1, output);
+    masm.passABIArg(object);
+    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, ObjectIsCallable));
+    masm.storeCallResult(output);
+    // C++ compilers like to only use the bottom byte for bools, but we need to maintain the entire
+    // register.
+    masm.and32(Imm32(0xFF), output);
+    restoreVolatile(output);
+    masm.jump(ool->rejoin());
 
     return true;
 }
diff --git a/js/src/jit/CodeGenerator.h b/js/src/jit/CodeGenerator.h
index d3a53a0335d8..637cdd6654b2 100644
--- a/js/src/jit/CodeGenerator.h
+++ b/js/src/jit/CodeGenerator.h
@@ -43,6 +43,7 @@ class OutOfLineLoadTypedArray;
 class OutOfLineNewGCThingPar;
 class OutOfLineUpdateCache;
 class OutOfLineCallPostWriteBarrier;
+class OutOfLineIsCallable;
 
 class CodeGenerator : public CodeGeneratorSpecific
 {
@@ -296,6 +297,7 @@ class CodeGenerator : public CodeGeneratorSpecific
     bool visitCallDOMNative(LCallDOMNative *lir);
     bool visitCallGetIntrinsicValue(LCallGetIntrinsicValue *lir);
     bool visitIsCallable(LIsCallable *lir);
+    bool visitOutOfLineIsCallable(OutOfLineIsCallable *ool);
     bool visitIsObject(LIsObject *lir);
     bool visitHaveSameClass(LHaveSameClass *lir);
     bool visitHasClass(LHasClass *lir);
diff --git a/js/src/jit/IonCaches.cpp b/js/src/jit/IonCaches.cpp
index ffc8f9b4db2f..454951a7bde4 100644
--- a/js/src/jit/IonCaches.cpp
+++ b/js/src/jit/IonCaches.cpp
@@ -1567,16 +1567,6 @@ GetPropertyIC::tryAttachProxy(JSContext *cx, HandleScript outerScript, IonScript
     return tryAttachGenericProxy(cx, outerScript, ion, obj, name, returnAddr, emitted);
 }
 
-static void
-GenerateProxyClassGuards(MacroAssembler &masm, Register object, Register scratchReg,
-                         Label *failures)
-{
-    masm.loadObjClass(object, scratchReg);
-    masm.branchTest32(Assembler::Zero,
-                      Address(scratchReg, Class::offsetOfFlags()),
-                      Imm32(JSCLASS_IS_PROXY), failures);
-}
-
 bool
 GetPropertyIC::tryAttachGenericProxy(JSContext *cx, HandleScript outerScript, IonScript *ion,
                                      HandleObject obj, HandlePropertyName name, void *returnAddr,
@@ -1602,7 +1592,7 @@ GetPropertyIC::tryAttachGenericProxy(JSContext *cx, HandleScript outerScript, Io
 
     Register scratchReg = output().valueReg().scratchReg();
 
-    GenerateProxyClassGuards(masm, object(), scratchReg, &failures);
+    masm.branchTestObjectIsProxy(false, object(), scratchReg, &failures);
 
     // Ensure that the incoming object is not a DOM proxy, so that we can get to
     // the specialized stubs
@@ -2181,7 +2171,7 @@ SetPropertyIC::attachGenericProxy(JSContext *cx, HandleScript outerScript, IonSc
         Register scratch = regSet.takeGeneral();
         masm.push(scratch);
 
-        GenerateProxyClassGuards(masm, object(), scratch, &proxyFailures);
+        masm.branchTestObjectIsProxy(false, object(), scratch, &proxyFailures);
 
         // Remove the DOM proxies. They'll take care of themselves so this stub doesn't
         // catch too much. The failure case is actually Equal. Fall through to the failure code.
diff --git a/js/src/jit/IonMacroAssembler.h b/js/src/jit/IonMacroAssembler.h
index 100dfef30603..2aa33e80e892 100644
--- a/js/src/jit/IonMacroAssembler.h
+++ b/js/src/jit/IonMacroAssembler.h
@@ -982,12 +982,25 @@ class MacroAssembler : public MacroAssemblerSpecific
         loadObjClass(objReg, scratch);
         Address flags(scratch, Class::offsetOfFlags());
 
-        branchTest32(Assembler::NonZero, flags, Imm32(JSCLASS_IS_PROXY), slowCheck);
+        branchTestClassIsProxy(true, scratch, slowCheck);
 
         Condition cond = truthy ? Assembler::Zero : Assembler::NonZero;
         branchTest32(cond, flags, Imm32(JSCLASS_EMULATES_UNDEFINED), checked);
     }
 
+    void branchTestClassIsProxy(bool proxy, Register clasp, Label *label)
+    {
+        branchTest32(proxy ? Assembler::NonZero : Assembler::Zero,
+                     Address(clasp, Class::offsetOfFlags()),
+                     Imm32(JSCLASS_IS_PROXY), label);
+    }
+
+    void branchTestObjectIsProxy(bool proxy, Register object, Register scratch, Label *label)
+    {
+        loadObjClass(object, scratch);
+        branchTestClassIsProxy(proxy, scratch, label);
+    }
+
   private:
     // These two functions are helpers used around call sites throughout the
     // assembler. They are called from the above call wrappers to emit the
diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp
index f380f9b68458..a07271ffa89f 100644
--- a/js/src/jit/MCallOptimize.cpp
+++ b/js/src/jit/MCallOptimize.cpp
@@ -1982,9 +1982,9 @@ IonBuilder::inlineIsCallable(CallInfo &callInfo)
     } else {
         types::TemporaryTypeSet *types = callInfo.getArg(0)->resultTypeSet();
         const Class *clasp = types ? types->getKnownClass() : nullptr;
-        if (clasp) {
+        if (clasp && !clasp->isProxy()) {
             isCallableKnown = true;
-            isCallableConstant = clasp->isCallable();
+            isCallableConstant = clasp->nonProxyCallable();
         }
     }
 
diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp
index a680890bab91..decab0dce07e 100644
--- a/js/src/jit/VMFunctions.cpp
+++ b/js/src/jit/VMFunctions.cpp
@@ -1239,6 +1239,12 @@ TypedObjectProto(JSObject *obj)
     return &typedObj.typedProto();
 }
 
+bool
+ObjectIsCallable(JSObject *obj)
+{
+    return obj->isCallable();
+}
+
 void
 MarkValueFromIon(JSRuntime *rt, Value *vp)
 {
diff --git a/js/src/jit/VMFunctions.h b/js/src/jit/VMFunctions.h
index 792cb26f68aa..01b7c3406e7e 100644
--- a/js/src/jit/VMFunctions.h
+++ b/js/src/jit/VMFunctions.h
@@ -747,6 +747,8 @@ IonMarkFunction(MIRType type)
     }
 }
 
+bool ObjectIsCallable(JSObject *obj);
+
 } // namespace jit
 } // namespace js
 
diff --git a/js/src/jsapi-tests/testBug604087.cpp b/js/src/jsapi-tests/testBug604087.cpp
index 59af7a29ed2d..01280541a0c7 100644
--- a/js/src/jsapi-tests/testBug604087.cpp
+++ b/js/src/jsapi-tests/testBug604087.cpp
@@ -19,8 +19,6 @@ const js::Class OuterWrapperClass =
         "Proxy",
         0, /* additional slots */
         0, /* additional class flags */
-        nullptr, /* call */
-        nullptr, /* construct */
         PROXY_MAKE_EXT(
             nullptr, /* outerObject */
             js::proxy_innerObject,
@@ -63,7 +61,7 @@ BEGIN_TEST(testBug604087)
     js::WrapperOptions options;
     options.setClass(&OuterWrapperClass);
     options.setSingleton(true);
-    JS::RootedObject outerObj(cx, js::Wrapper::New(cx, global, global, &js::Wrapper::singleton, &options));
+    JS::RootedObject outerObj(cx, js::Wrapper::New(cx, global, global, &js::Wrapper::singleton, options));
     JS::RootedObject compartment2(cx, JS_NewGlobalObject(cx, getGlobalClass(), nullptr, JS::FireOnNewGlobalHook));
     JS::RootedObject compartment3(cx, JS_NewGlobalObject(cx, getGlobalClass(), nullptr, JS::FireOnNewGlobalHook));
     JS::RootedObject compartment4(cx, JS_NewGlobalObject(cx, getGlobalClass(), nullptr, JS::FireOnNewGlobalHook));
@@ -84,7 +82,7 @@ BEGIN_TEST(testBug604087)
     JS::RootedObject next(cx);
     {
         JSAutoCompartment ac(cx, compartment2);
-        next = js::Wrapper::New(cx, compartment2, compartment2, &js::Wrapper::singleton, &options);
+        next = js::Wrapper::New(cx, compartment2, compartment2, &js::Wrapper::singleton, options);
         CHECK(next);
     }
 
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index 3ec491d60d40..e2e080a36f20 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -284,7 +284,7 @@ CallJSNativeConstructor(JSContext *cx, Native native, const CallArgs &args)
      *
      * - (new Object(Object)) returns the callee.
      */
-    JS_ASSERT_IF(native != ProxyObject::callableClass_.construct &&
+    JS_ASSERT_IF(native != js::proxy_Construct &&
                  native != js::CallOrConstructBoundFunction &&
                  native != js::IteratorConstructor &&
                  (!callee->is<JSFunction>() || callee->as<JSFunction>().native() != obj_construct),
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index a3c541802016..b5ea30a354d6 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -435,8 +435,8 @@ JSCompartment::wrap(JSContext *cx, MutableHandleObject obj, HandleObject existin
     if (existing) {
         // Is it possible to reuse |existing|?
         if (!existing->getTaggedProto().isLazy() ||
-            // Note: don't use is<ObjectProxyObject>() here -- it also matches subclasses!
-            existing->getClass() != &ProxyObject::uncallableClass_ ||
+            // Note: Class asserted above, so all that's left to check is callability
+            existing->isCallable() ||
             existing->getParent() != global ||
             obj->isCallable())
         {
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index 68a8c6d2f287..ece3f80a3ba7 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -1218,3 +1218,9 @@ JS_StoreStringPostBarrierCallback(JSContext* cx,
         rt->gc.storeBuffer.putCallback(callback, key, data);
 }
 #endif /* JSGC_GENERATIONAL */
+
+JS_FRIEND_API(bool)
+js::ForwardToNative(JSContext *cx, JSNative native, const CallArgs &args)
+{
+    return native(cx, args.length(), args.base());
+}
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index c1eec8ea3725..845443d5cc5c 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -266,7 +266,7 @@ namespace js {
         js::proxy_ObjectMoved                                           \
     }
 
-#define PROXY_CLASS_WITH_EXT(name, extraSlots, flags, callOp, constructOp, ext)         \
+#define PROXY_CLASS_WITH_EXT(name, extraSlots, flags, ext)                              \
     {                                                                                   \
         name,                                                                           \
         js::Class::NON_NATIVE |                                                         \
@@ -282,9 +282,9 @@ namespace js {
         JS_ResolveStub,                                                                 \
         js::proxy_Convert,                                                              \
         js::proxy_Finalize,      /* finalize    */                                      \
-        callOp,                  /* call        */                                      \
+        nullptr,                  /* call        */                                     \
         js::proxy_HasInstance,   /* hasInstance */                                      \
-        constructOp,             /* construct   */                                      \
+        nullptr,             /* construct   */                                          \
         js::proxy_Trace,         /* trace       */                                      \
         JS_NULL_CLASS_SPEC,                                                             \
         ext,                                                                            \
@@ -311,8 +311,8 @@ namespace js {
         }                                                                               \
     }
 
-#define PROXY_CLASS_DEF(name, extraSlots, flags, callOp, constructOp)   \
-  PROXY_CLASS_WITH_EXT(name, extraSlots, flags, callOp, constructOp,    \
+#define PROXY_CLASS_DEF(name, extraSlots, flags)                        \
+  PROXY_CLASS_WITH_EXT(name, extraSlots, flags,                         \
                        PROXY_MAKE_EXT(                                  \
                          nullptr, /* outerObject */                     \
                          nullptr, /* innerObject */                     \
@@ -2476,6 +2476,9 @@ JS_FRIEND_API(bool)
 SliceSlowly(JSContext* cx, JS::HandleObject obj, JS::HandleObject receiver,
             uint32_t begin, uint32_t end, JS::HandleObject result);
 
+JS_FRIEND_API(bool)
+ForwardToNative(JSContext *cx, JSNative native, const JS::CallArgs &args);
+
 /* ES5 8.12.8. */
 extern JS_FRIEND_API(bool)
 DefaultValue(JSContext *cx, JS::HandleObject obj, JSType hint, JS::MutableHandleValue vp);
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 24562a1d1451..3288288e1eac 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -2183,7 +2183,7 @@ CheckIsValidConstructible(Value calleev)
     if (callee->is<JSFunction>())
         JS_ASSERT(callee->as<JSFunction>().isNativeConstructor());
     else
-        JS_ASSERT(callee->getClass()->construct != nullptr);
+        JS_ASSERT(callee->constructHook() != nullptr);
 }
 
 } // namespace detail
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index 96111e3451dc..6e221106febc 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -2063,7 +2063,7 @@ TemporaryTypeSet::maybeCallable()
     unsigned count = getObjectCount();
     for (unsigned i = 0; i < count; i++) {
         const Class *clasp = getObjectClass(i);
-        if (clasp && clasp->isCallable())
+        if (clasp && (clasp->isProxy() || clasp->nonProxyCallable()))
             return true;
     }
 
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 85ab99259567..cbd602da6fda 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -3794,6 +3794,14 @@ js::FindClassObject(ExclusiveContext *cx, MutableHandleObject protop, const Clas
     return true;
 }
 
+bool
+JSObject::isCallable() const
+{
+    if (is<JSFunction>())
+        return true;
+    return callHook() != nullptr;
+}
+
 bool
 JSObject::isConstructor() const
 {
@@ -3801,7 +3809,39 @@ JSObject::isConstructor() const
         const JSFunction &fun = as<JSFunction>();
         return fun.isNativeConstructor() || fun.isInterpretedConstructor();
     }
-    return getClass()->construct != nullptr;
+    return constructHook() != nullptr;
+}
+
+JSNative
+JSObject::callHook() const
+{
+    const js::Class *clasp = getClass();
+
+    if (clasp->call)
+        return clasp->call;
+
+    if (is<js::ProxyObject>()) {
+        const js::ProxyObject &p = as<js::ProxyObject>();
+        if (p.handler()->isCallable(const_cast<JSObject*>(this)))
+            return js::proxy_Call;
+    }
+    return nullptr;
+}
+
+JSNative
+JSObject::constructHook() const
+{
+    const js::Class *clasp = getClass();
+
+    if (clasp->construct)
+        return clasp->construct;
+
+    if (is<js::ProxyObject>()) {
+        const js::ProxyObject &p = as<js::ProxyObject>();
+        if (p.handler()->isConstructor(const_cast<JSObject*>(this)))
+            return js::proxy_Construct;
+    }
+    return nullptr;
 }
 
 /* static */ bool
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index f45dd8c24602..226c192061ee 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -851,10 +851,10 @@ class JSObject : public js::ObjectImpl
     /*
      * Back to generic stuff.
      */
-    bool isCallable() {
-        return getClass()->isCallable();
-    }
+    bool isCallable() const;
     bool isConstructor() const;
+    JSNative callHook() const;
+    JSNative constructHook() const;
 
     inline void finish(js::FreeOp *fop);
     MOZ_ALWAYS_INLINE void finalize(js::FreeOp *fop);
diff --git a/js/src/jsprototypes.h b/js/src/jsprototypes.h
index 75178049f127..7d2ef12e5c59 100644
--- a/js/src/jsprototypes.h
+++ b/js/src/jsprototypes.h
@@ -98,7 +98,7 @@
     real(Float32Array,          28,     js_InitViaClassSpec,       TYPED_ARRAY_CLASP(Float32)) \
     real(Float64Array,          29,     js_InitViaClassSpec,       TYPED_ARRAY_CLASP(Float64)) \
     real(Uint8ClampedArray,     30,     js_InitViaClassSpec,       TYPED_ARRAY_CLASP(Uint8Clamped)) \
-    real(Proxy,                 31,     js_InitProxyClass,         &ProxyObject::uncallableClass_) \
+    real(Proxy,                 31,     js_InitProxyClass,         OCLASP(Proxy)) \
     real(WeakMap,               32,     js_InitWeakMapClass,       OCLASP(WeakMap)) \
     real(Map,                   33,     js_InitMapClass,           OCLASP(Map)) \
     real(Set,                   34,     js_InitSetClass,           OCLASP(Set)) \
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index 4d90072c6e17..5889276bd31c 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -224,6 +224,13 @@ class JS_FRIEND_API(BaseProxyHandler)
     virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy, MutableHandleObject protop) const;
     virtual bool setPrototypeOf(JSContext *cx, HandleObject proxy, HandleObject proto, bool *bp) const;
 
+    // Allow proxies, wrappers in particular, to specify callability at runtime.
+    // Note: These do not take const JSObject *, but they do in spirit.
+    //       We are not prepared to do this, as there's little const correctness
+    //       in the external APIs that handle proxies.
+    virtual bool isCallable(JSObject *obj) const;
+    virtual bool isConstructor(JSObject *obj) const;
+
     // These two hooks must be overridden, or not overridden, in tandem -- no
     // overriding just one!
     virtual bool watch(JSContext *cx, JS::HandleObject proxy, JS::HandleId id,
@@ -306,11 +313,10 @@ class JS_PUBLIC_API(DirectProxyHandler) : public BaseProxyHandler
                                  RegExpGuard *g) const MOZ_OVERRIDE;
     virtual bool boxedValue_unbox(JSContext *cx, HandleObject proxy, MutableHandleValue vp) const;
     virtual JSObject *weakmapKeyDelegate(JSObject *proxy) const MOZ_OVERRIDE;
+    virtual bool isCallable(JSObject *obj) const MOZ_OVERRIDE;
 };
 
-// Use these in places where you don't want to #include vm/ProxyObject.h.
-extern JS_FRIEND_DATA(const js::Class* const) CallableProxyClassPtr;
-extern JS_FRIEND_DATA(const js::Class* const) UncallableProxyClassPtr;
+extern JS_FRIEND_DATA(const js::Class* const) ProxyClassPtr;
 
 inline bool IsProxy(JSObject *obj)
 {
@@ -382,14 +388,14 @@ IsScriptedProxy(JSObject *obj)
 class MOZ_STACK_CLASS ProxyOptions {
   protected:
     /* protected constructor for subclass */
-    ProxyOptions(bool singletonArg, const Class *claspArg)
+    ProxyOptions(bool singletonArg)
       : singleton_(singletonArg),
-        clasp_(claspArg)
+        clasp_(ProxyClassPtr)
     {}
 
   public:
     ProxyOptions() : singleton_(false),
-                     clasp_(UncallableProxyClassPtr)
+                     clasp_(ProxyClassPtr)
     {}
 
     bool singleton() const { return singleton_; }
@@ -405,11 +411,6 @@ class MOZ_STACK_CLASS ProxyOptions {
         clasp_ = claspArg;
         return *this;
     }
-    ProxyOptions &selectDefaultClass(bool callable) {
-        const Class *classp = callable? CallableProxyClassPtr :
-                                        UncallableProxyClassPtr;
-        return setClass(classp);
-    }
 
   private:
     bool singleton_;
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index 1e507a70f10d..e1ca14569fe0 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -23,11 +23,11 @@ class DummyFrameGuard;
  */
 class MOZ_STACK_CLASS WrapperOptions : public ProxyOptions {
   public:
-    WrapperOptions() : ProxyOptions(false, nullptr),
+    WrapperOptions() : ProxyOptions(false),
                        proto_()
     {}
 
-    explicit WrapperOptions(JSContext *cx) : ProxyOptions(false, nullptr),
+    explicit WrapperOptions(JSContext *cx) : ProxyOptions(false),
                                              proto_()
     {
         proto_.emplace(cx);
@@ -69,7 +69,7 @@ class JS_FRIEND_API(Wrapper) : public DirectProxyHandler
                               MutableHandleValue vp) const MOZ_OVERRIDE;
 
     static JSObject *New(JSContext *cx, JSObject *obj, JSObject *parent, const Wrapper *handler,
-                         const WrapperOptions *options = nullptr);
+                         const WrapperOptions &options = WrapperOptions());
 
     static JSObject *Renew(JSContext *cx, JSObject *existing, JSObject *obj, const Wrapper *handler);
 
@@ -88,6 +88,7 @@ class JS_FRIEND_API(Wrapper) : public DirectProxyHandler
     { }
 
     virtual bool finalizeInBackground(Value priv) const MOZ_OVERRIDE;
+    virtual bool isConstructor(JSObject *obj) const MOZ_OVERRIDE;
 
     static const char family;
     static const Wrapper singleton;
@@ -198,6 +199,9 @@ class JS_FRIEND_API(SecurityWrapper) : public Base
                        JS::HandleObject callable) const MOZ_OVERRIDE;
     virtual bool unwatch(JSContext *cx, JS::HandleObject proxy, JS::HandleId id) const MOZ_OVERRIDE;
 
+    // Allow isCallable and isConstructor. They used to be class-level, and so could not be guarded
+    // against.
+
     /*
      * Allow our subclasses to select the superclass behavior they want without
      * needing to specify an exact superclass.
diff --git a/js/src/proxy/BaseProxyHandler.cpp b/js/src/proxy/BaseProxyHandler.cpp
index 59a54360617d..72a64b115031 100644
--- a/js/src/proxy/BaseProxyHandler.cpp
+++ b/js/src/proxy/BaseProxyHandler.cpp
@@ -341,3 +341,15 @@ BaseProxyHandler::slice(JSContext *cx, HandleObject proxy, uint32_t begin, uint3
 
     return js::SliceSlowly(cx, proxy, proxy, begin, end, result);
 }
+
+bool
+BaseProxyHandler::isCallable(JSObject *obj) const
+{
+    return false;
+}
+
+bool
+BaseProxyHandler::isConstructor(JSObject *obj) const
+{
+    return false;
+}
diff --git a/js/src/proxy/DirectProxyHandler.cpp b/js/src/proxy/DirectProxyHandler.cpp
index c53a2a4650af..d4a9b1039bd7 100644
--- a/js/src/proxy/DirectProxyHandler.cpp
+++ b/js/src/proxy/DirectProxyHandler.cpp
@@ -248,3 +248,10 @@ DirectProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy) const
     RootedObject target(cx, proxy->as<ProxyObject>().target());
     return JSObject::preventExtensions(cx, target);
 }
+
+bool
+DirectProxyHandler::isCallable(JSObject *obj) const
+{
+    JSObject * target = obj->as<ProxyObject>().target();
+    return target->isCallable();
+}
diff --git a/js/src/proxy/Proxy.cpp b/js/src/proxy/Proxy.cpp
index 5ae02cd685dc..4a48dab4b1ff 100644
--- a/js/src/proxy/Proxy.cpp
+++ b/js/src/proxy/Proxy.cpp
@@ -839,18 +839,12 @@ js::proxy_Slice(JSContext *cx, HandleObject proxy, uint32_t begin, uint32_t end,
     return Proxy::slice(cx, proxy, begin, end, result);
 }
 
-#define PROXY_CLASS(callOp, constructOp)                        \
-    PROXY_CLASS_DEF("Proxy",                                    \
-                    0, /* additional slots */                   \
-                    JSCLASS_HAS_CACHED_PROTO(JSProto_Proxy),    \
-                    callOp,                                     \
-                    constructOp)
+const Class js::ProxyObject::class_ =
+    PROXY_CLASS_DEF("Proxy",
+                    0,
+                    JSCLASS_HAS_CACHED_PROTO(JSProto_Proxy));
 
-const Class js::ProxyObject::uncallableClass_ = PROXY_CLASS(nullptr, nullptr);
-const Class js::ProxyObject::callableClass_ = PROXY_CLASS(proxy_Call, proxy_Construct);
-
-const Class* const js::CallableProxyClassPtr = &ProxyObject::callableClass_;
-const Class* const js::UncallableProxyClassPtr = &ProxyObject::uncallableClass_;
+const Class* const js::ProxyClassPtr = &js::ProxyObject::class_;
 
 JS_FRIEND_API(JSObject *)
 js::NewProxyObject(JSContext *cx, const BaseProxyHandler *handler, HandleValue priv, JSObject *proto_,
@@ -865,7 +859,8 @@ ProxyObject::renew(JSContext *cx, const BaseProxyHandler *handler, Value priv)
 {
     JS_ASSERT_IF(IsCrossCompartmentWrapper(this), IsDeadProxyObject(this));
     JS_ASSERT(getParent() == cx->global());
-    JS_ASSERT(getClass() == &uncallableClass_);
+    JS_ASSERT(getClass() == &ProxyObject::class_);
+    JS_ASSERT(!isCallable());
     JS_ASSERT(!getClass()->ext.innerObject);
     JS_ASSERT(getTaggedProto().isLazy());
 
diff --git a/js/src/proxy/ScriptedDirectProxyHandler.cpp b/js/src/proxy/ScriptedDirectProxyHandler.cpp
index dad7d116e45e..d631b6c9a7da 100644
--- a/js/src/proxy/ScriptedDirectProxyHandler.cpp
+++ b/js/src/proxy/ScriptedDirectProxyHandler.cpp
@@ -1083,6 +1083,13 @@ ScriptedDirectProxyHandler::construct(JSContext *cx, HandleObject proxy, const C
     return true;
 }
 
+bool
+ScriptedDirectProxyHandler::isCallable(JSObject *obj) const
+{
+    MOZ_ASSERT(obj->as<ProxyObject>().handler() == &ScriptedDirectProxyHandler::singleton);
+    return obj->as<ProxyObject>().extra(IS_CALLABLE_EXTRA).toBoolean();
+}
+
 const char ScriptedDirectProxyHandler::family = 0;
 const ScriptedDirectProxyHandler ScriptedDirectProxyHandler::singleton;
 
@@ -1102,15 +1109,14 @@ js::proxy(JSContext *cx, unsigned argc, jsval *vp)
     if (!handler)
         return false;
     RootedValue priv(cx, ObjectValue(*target));
-    ProxyOptions options;
-    options.selectDefaultClass(target->isCallable());
-    ProxyObject *proxy =
-        ProxyObject::New(cx, &ScriptedDirectProxyHandler::singleton,
-                         priv, TaggedProto(TaggedProto::LazyProto), cx->global(),
-                         options);
+    JSObject *proxy =
+        NewProxyObject(cx, &ScriptedDirectProxyHandler::singleton,
+                       priv, TaggedProto::LazyProto, cx->global());
     if (!proxy)
         return false;
-    proxy->setExtra(ScriptedDirectProxyHandler::HANDLER_EXTRA, ObjectValue(*handler));
+    proxy->as<ProxyObject>().setExtra(ScriptedDirectProxyHandler::HANDLER_EXTRA, ObjectValue(*handler));
+    proxy->as<ProxyObject>().setExtra(ScriptedDirectProxyHandler::IS_CALLABLE_EXTRA,
+                                      BooleanValue(target->isCallable()));
     args.rval().setObject(*proxy);
     return true;
 }
diff --git a/js/src/proxy/ScriptedDirectProxyHandler.h b/js/src/proxy/ScriptedDirectProxyHandler.h
index 02af5b74b5a3..980b1bfb7151 100644
--- a/js/src/proxy/ScriptedDirectProxyHandler.h
+++ b/js/src/proxy/ScriptedDirectProxyHandler.h
@@ -54,6 +54,12 @@ class ScriptedDirectProxyHandler : public DirectProxyHandler {
     /* Spidermonkey extensions. */
     virtual bool call(JSContext *cx, HandleObject proxy, const CallArgs &args) const MOZ_OVERRIDE;
     virtual bool construct(JSContext *cx, HandleObject proxy, const CallArgs &args) const MOZ_OVERRIDE;
+    virtual bool isCallable(JSObject *obj) const MOZ_OVERRIDE;
+    virtual bool isConstructor(JSObject *obj) const MOZ_OVERRIDE {
+        // For now we maintain the broken behavior that a scripted proxy is constructable if it's
+        // callable. See bug 929467.
+        return isCallable(obj);
+    }
     virtual bool isScripted() const MOZ_OVERRIDE { return true; }
 
     static const char family;
@@ -62,6 +68,7 @@ class ScriptedDirectProxyHandler : public DirectProxyHandler {
     // The "proxy extra" slot index in which the handler is stored. Revocable proxies need to set
     // this at revocation time.
     static const int HANDLER_EXTRA = 0;
+    static const int IS_CALLABLE_EXTRA = 1;
     // The "function extended" slot index in which the revocation object is stored. Per spec, this
     // is to be cleared during the first revocation.
     static const int REVOKE_SLOT = 0;
diff --git a/js/src/proxy/ScriptedIndirectProxyHandler.cpp b/js/src/proxy/ScriptedIndirectProxyHandler.cpp
index 08adcf7490a2..fa8f68871a56 100644
--- a/js/src/proxy/ScriptedIndirectProxyHandler.cpp
+++ b/js/src/proxy/ScriptedIndirectProxyHandler.cpp
@@ -328,29 +328,6 @@ ScriptedIndirectProxyHandler::iterate(JSContext *cx, HandleObject proxy, unsigne
            ReturnedValueMustNotBePrimitive(cx, proxy, cx->names().iterate, vp);
 }
 
-bool
-ScriptedIndirectProxyHandler::call(JSContext *cx, HandleObject proxy, const CallArgs &args) const
-{
-    assertEnteredPolicy(cx, proxy, JSID_VOID, CALL);
-    RootedObject ccHolder(cx, &proxy->as<ProxyObject>().extra(0).toObject());
-    JS_ASSERT(ccHolder->getClass() == &CallConstructHolder);
-    RootedValue call(cx, ccHolder->getReservedSlot(0));
-    JS_ASSERT(call.isObject() && call.toObject().isCallable());
-    return Invoke(cx, args.thisv(), call, args.length(), args.array(), args.rval());
-}
-
-bool
-ScriptedIndirectProxyHandler::construct(JSContext *cx, HandleObject proxy, const CallArgs &args) const
-{
-    assertEnteredPolicy(cx, proxy, JSID_VOID, CALL);
-    RootedObject ccHolder(cx, &proxy->as<ProxyObject>().extra(0).toObject());
-    JS_ASSERT(ccHolder->getClass() == &CallConstructHolder);
-    RootedValue construct(cx, ccHolder->getReservedSlot(1));
-    JS_ASSERT(construct.isObject() && construct.toObject().isCallable());
-    return InvokeConstructor(cx, construct, args.length(), args.array(),
-                             args.rval().address());
-}
-
 bool
 ScriptedIndirectProxyHandler::nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl,
                                          CallArgs args) const
@@ -375,6 +352,31 @@ ScriptedIndirectProxyHandler::fun_toString(JSContext *cx, HandleObject proxy, un
 
 const ScriptedIndirectProxyHandler ScriptedIndirectProxyHandler::singleton;
 
+bool
+CallableScriptedIndirectProxyHandler::call(JSContext *cx, HandleObject proxy, const CallArgs &args) const
+{
+    assertEnteredPolicy(cx, proxy, JSID_VOID, CALL);
+    RootedObject ccHolder(cx, &proxy->as<ProxyObject>().extra(0).toObject());
+    JS_ASSERT(ccHolder->getClass() == &CallConstructHolder);
+    RootedValue call(cx, ccHolder->getReservedSlot(0));
+    JS_ASSERT(call.isObject() && call.toObject().isCallable());
+    return Invoke(cx, args.thisv(), call, args.length(), args.array(), args.rval());
+}
+
+bool
+CallableScriptedIndirectProxyHandler::construct(JSContext *cx, HandleObject proxy, const CallArgs &args) const
+{
+    assertEnteredPolicy(cx, proxy, JSID_VOID, CALL);
+    RootedObject ccHolder(cx, &proxy->as<ProxyObject>().extra(0).toObject());
+    JS_ASSERT(ccHolder->getClass() == &CallConstructHolder);
+    RootedValue construct(cx, ccHolder->getReservedSlot(1));
+    JS_ASSERT(construct.isObject() && construct.toObject().isCallable());
+    return InvokeConstructor(cx, construct, args.length(), args.array(),
+                             args.rval().address());
+}
+
+const CallableScriptedIndirectProxyHandler CallableScriptedIndirectProxyHandler::singleton;
+
 bool
 js::proxy_create(JSContext *cx, unsigned argc, Value *vp)
 {
@@ -448,11 +450,9 @@ js::proxy_createFunction(JSContext *cx, unsigned argc, Value *vp)
     ccHolder->setReservedSlot(1, ObjectValue(*construct));
 
     RootedValue priv(cx, ObjectValue(*handler));
-    ProxyOptions options;
-    options.selectDefaultClass(true);
     JSObject *proxy =
-        ProxyObject::New(cx, &ScriptedIndirectProxyHandler::singleton,
-                         priv, TaggedProto(proto), parent, options);
+        NewProxyObject(cx, &CallableScriptedIndirectProxyHandler::singleton,
+                       priv, proto, parent);
     if (!proxy)
         return false;
     proxy->as<ProxyObject>().setExtra(0, ObjectValue(*ccHolder));
diff --git a/js/src/proxy/ScriptedIndirectProxyHandler.h b/js/src/proxy/ScriptedIndirectProxyHandler.h
index 9ea8fa960d71..3b8c973fc6cf 100644
--- a/js/src/proxy/ScriptedIndirectProxyHandler.h
+++ b/js/src/proxy/ScriptedIndirectProxyHandler.h
@@ -45,8 +45,6 @@ class ScriptedIndirectProxyHandler : public BaseProxyHandler
 
     /* Spidermonkey extensions. */
     virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE;
-    virtual bool call(JSContext *cx, HandleObject proxy, const CallArgs &args) const MOZ_OVERRIDE;
-    virtual bool construct(JSContext *cx, HandleObject proxy, const CallArgs &args) const MOZ_OVERRIDE;
     virtual bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl,
                             CallArgs args) const MOZ_OVERRIDE;
     virtual JSString *fun_toString(JSContext *cx, HandleObject proxy, unsigned indent) const MOZ_OVERRIDE;
@@ -56,6 +54,24 @@ class ScriptedIndirectProxyHandler : public BaseProxyHandler
     static const ScriptedIndirectProxyHandler singleton;
 };
 
+/* Derived class to handle Proxy.createFunction() */
+class CallableScriptedIndirectProxyHandler : public ScriptedIndirectProxyHandler
+{
+  public:
+    CallableScriptedIndirectProxyHandler() : ScriptedIndirectProxyHandler() { }
+    virtual bool call(JSContext *cx, HandleObject proxy, const CallArgs &args) const MOZ_OVERRIDE;
+    virtual bool construct(JSContext *cx, HandleObject proxy, const CallArgs &args) const MOZ_OVERRIDE;
+
+    virtual bool isCallable(JSObject *obj) const MOZ_OVERRIDE {
+        return true;
+    }
+    virtual bool isConstructor(JSObject *obj) const MOZ_OVERRIDE {
+        return true;
+    }
+
+    static const CallableScriptedIndirectProxyHandler singleton;
+};
+
 bool
 proxy_create(JSContext *cx, unsigned argc, Value *vp);
 
diff --git a/js/src/proxy/Wrapper.cpp b/js/src/proxy/Wrapper.cpp
index c8d2dd59f573..ac74f304e41c 100644
--- a/js/src/proxy/Wrapper.cpp
+++ b/js/src/proxy/Wrapper.cpp
@@ -34,18 +34,12 @@ Wrapper::defaultValue(JSContext *cx, HandleObject proxy, JSType hint, MutableHan
 
 JSObject *
 Wrapper::New(JSContext *cx, JSObject *obj, JSObject *parent, const Wrapper *handler,
-             const WrapperOptions *options)
+             const WrapperOptions &options)
 {
     JS_ASSERT(parent);
 
     RootedValue priv(cx, ObjectValue(*obj));
-    mozilla::Maybe<WrapperOptions> opts;
-    if (!options) {
-        opts.emplace();
-        opts->selectDefaultClass(obj->isCallable());
-        options = opts.ptr();
-    }
-    return NewProxyObject(cx, handler, priv, options->proto(), parent, *options);
+    return NewProxyObject(cx, handler, priv, options.proto(), parent, options);
 }
 
 JSObject *
@@ -70,6 +64,15 @@ Wrapper::wrappedObject(JSObject *wrapper)
     return wrapper->as<ProxyObject>().target();
 }
 
+bool
+Wrapper::isConstructor(JSObject *obj) const
+{
+    // For now, all wrappers are constructable if they are callable. We will want to eventually
+    // decouple this behavior, but none of the Wrapper infrastructure is currently prepared for
+    // that.
+    return isCallable(obj);
+}
+
 JS_FRIEND_API(JSObject *)
 js::UncheckedUnwrap(JSObject *wrapped, bool stopAtOuter, unsigned *flagsp)
 {
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 799343bc8567..6db13018d7ba 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -4032,9 +4032,8 @@ WrapWithProto(JSContext *cx, unsigned argc, jsval *vp)
 
     WrapperOptions options(cx);
     options.setProto(proto.toObjectOrNull());
-    options.selectDefaultClass(obj.toObject().isCallable());
     JSObject *wrapped = Wrapper::New(cx, &obj.toObject(), &obj.toObject().global(),
-                                     &Wrapper::singletonWithPrototype, &options);
+                                     &Wrapper::singletonWithPrototype, options);
     if (!wrapped)
         return false;
 
diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 9d963d5f78f8..1fa273e99728 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -468,10 +468,11 @@ js::Invoke(JSContext *cx, CallArgs args, MaybeConstruct construct)
         if (MOZ_UNLIKELY(clasp == &js_NoSuchMethodClass))
             return NoSuchMethod(cx, args.length(), args.base());
 #endif
-        JS_ASSERT_IF(construct, !clasp->construct);
-        if (!clasp->call)
+        JS_ASSERT_IF(construct, !callee.constructHook());
+        JSNative call = callee.callHook();
+        if (!call)
             return ReportIsNotFunction(cx, args.calleev(), args.length() + 1, construct);
-        return CallJSNative(cx, clasp->call, args);
+        return CallJSNative(cx, call, args);
     }
 
     /* Invoke native functions. */
@@ -571,11 +572,11 @@ js::InvokeConstructor(JSContext *cx, CallArgs args)
         return true;
     }
 
-    const Class *clasp = callee.getClass();
-    if (!clasp->construct)
+    JSNative construct = callee.constructHook();
+    if (!construct)
         return ReportIsNotFunction(cx, args.calleev(), args.length() + 1, CONSTRUCT);
 
-    return CallJSNativeConstructor(cx, clasp->construct, args);
+    return CallJSNativeConstructor(cx, construct, args);
 }
 
 bool
diff --git a/js/src/vm/ProxyObject.h b/js/src/vm/ProxyObject.h
index 42cb36abf3a9..437f5e3c2426 100644
--- a/js/src/vm/ProxyObject.h
+++ b/js/src/vm/ProxyObject.h
@@ -42,8 +42,9 @@ class ProxyObject : public JSObject
         return const_cast<ProxyObject*>(this)->private_().toObjectOrNull();
     }
 
-    const BaseProxyHandler *handler() {
-        return static_cast<const BaseProxyHandler*>(GetReservedSlot(this, HANDLER_SLOT).toPrivate());
+    const BaseProxyHandler *handler() const {
+        return static_cast<const BaseProxyHandler*>(
+            GetReservedSlot(const_cast<ProxyObject*>(this), HANDLER_SLOT).toPrivate());
     }
 
     void initHandler(const BaseProxyHandler *handler);
@@ -85,9 +86,13 @@ class ProxyObject : public JSObject
 
         // proxy_Trace is just a trivial wrapper around ProxyObject::trace for
         // friend api exposure.
+
+        // Proxy classes are not allowed to have call or construct hooks directly. Their
+        // callability is instead decided by a trap call
         return clasp->isProxy() &&
                (clasp->flags & JSCLASS_IMPLEMENTS_BARRIERS) &&
                clasp->trace == proxy_Trace &&
+               !clasp->call && !clasp->construct &&
                JSCLASS_RESERVED_SLOTS(clasp) >= PROXY_MINIMUM_SLOTS;
     }
 
@@ -100,8 +105,7 @@ class ProxyObject : public JSObject
 
     void nuke(const BaseProxyHandler *handler);
 
-    static const Class callableClass_;
-    static const Class uncallableClass_;
+    static const Class class_;
 };
 
 } // namespace js
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index 46a49914abaa..aaa0c55ff16f 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -1657,7 +1657,7 @@ DebugScopeObject::getMaybeSentinelValue(JSContext *cx, HandleId id, MutableHandl
 bool
 js_IsDebugScopeSlow(ProxyObject *proxy)
 {
-    JS_ASSERT(proxy->hasClass(&ProxyObject::uncallableClass_));
+    JS_ASSERT(proxy->hasClass(&ProxyObject::class_));
     return proxy->handler() == &DebugScopeProxy::singleton;
 }
 
diff --git a/js/src/vm/ScopeObject.h b/js/src/vm/ScopeObject.h
index 9c5528c2a960..2350e8690fbc 100644
--- a/js/src/vm/ScopeObject.h
+++ b/js/src/vm/ScopeObject.h
@@ -914,7 +914,7 @@ JSObject::is<js::DebugScopeObject>() const
     extern bool js_IsDebugScopeSlow(js::ProxyObject *proxy);
 
     // Note: don't use is<ProxyObject>() here -- it also matches subclasses!
-    return hasClass(&js::ProxyObject::uncallableClass_) &&
+    return hasClass(&js::ProxyObject::class_) &&
            js_IsDebugScopeSlow(&const_cast<JSObject*>(this)->as<js::ProxyObject>());
 }
 
diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp
index 967dcbf07b32..79f82adbf926 100644
--- a/js/xpconnect/src/Sandbox.cpp
+++ b/js/xpconnect/src/Sandbox.cpp
@@ -562,11 +562,9 @@ WrapCallable(JSContext *cx, JSObject *callable, JSObject *sandboxProtoProxy)
                  &xpc::sandboxProxyHandler);
 
     RootedValue priv(cx, ObjectValue(*callable));
-    js::ProxyOptions options;
-    options.selectDefaultClass(true);
     return js::NewProxyObject(cx, &xpc::sandboxCallableProxyHandler,
                               priv, nullptr,
-                              sandboxProtoProxy, options);
+                              sandboxProtoProxy);
 }
 
 template<typename Op>

From 3fa8c4b046b4b7bf5bf702ac2bbc54c97d326bdd Mon Sep 17 00:00:00 2001
From: Seth Fowler <seth@mozilla.com>
Date: Wed, 10 Sep 2014 17:06:37 -0700
Subject: [PATCH 029/109] Bug 1057894 (Part 1) - Make VolatileBufferPtr's
 moveable. r=mwu

---
 memory/mozalloc/VolatileBuffer.h | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/memory/mozalloc/VolatileBuffer.h b/memory/mozalloc/VolatileBuffer.h
index 89e875156efc..0f8a1e6dd13e 100644
--- a/memory/mozalloc/VolatileBuffer.h
+++ b/memory/mozalloc/VolatileBuffer.h
@@ -91,6 +91,7 @@ public:
   }
 
 protected:
+  RefPtr<VolatileBuffer> mVBuf;
   void* mMapping;
 
   void Set(VolatileBuffer* vbuf) {
@@ -100,7 +101,6 @@ protected:
   }
 
 private:
-  RefPtr<VolatileBuffer> mVBuf;
   bool mPurged;
 
   void Lock() {
@@ -126,13 +126,30 @@ public:
   explicit VolatileBufferPtr(VolatileBuffer* vbuf) : VolatileBufferPtr_base(vbuf) {}
   VolatileBufferPtr() : VolatileBufferPtr_base(nullptr) {}
 
+  VolatileBufferPtr(VolatileBufferPtr&& aOther)
+    : VolatileBufferPtr_base(aOther.mVBuf)
+  {
+    aOther.Set(nullptr);
+  }
+
   operator T*() const {
     return (T*) mMapping;
   }
 
-  void operator =(VolatileBuffer* vbuf) {
-    Set(vbuf);
+  VolatileBufferPtr& operator=(VolatileBuffer* aVBuf)
+  {
+    Set(aVBuf);
+    return *this;
   }
+
+  VolatileBufferPtr& operator=(VolatileBufferPtr&& aOther)
+  {
+    MOZ_ASSERT(this != &aOther, "Self-moves are prohibited");
+    Set(aOther.mVBuf);
+    aOther.Set(nullptr);
+    return *this;
+  }
+
 private:
   VolatileBufferPtr(VolatileBufferPtr const& vbufptr) MOZ_DELETE;
 };

From 53036348cb053fa9bbac03436fa42052f4d212a6 Mon Sep 17 00:00:00 2001
From: Seth Fowler <seth@mozilla.com>
Date: Wed, 10 Sep 2014 17:06:45 -0700
Subject: [PATCH 030/109] Bug 1057894 (Part 2) - Add RAII smart handles for
 imgFrame locking. r=tn

---
 image/src/imgFrame.cpp |  12 +++
 image/src/imgFrame.h   | 180 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 172 insertions(+), 20 deletions(-)

diff --git a/image/src/imgFrame.cpp b/image/src/imgFrame.cpp
index 77c89f7776b7..66b85c93fa37 100644
--- a/image/src/imgFrame.cpp
+++ b/image/src/imgFrame.cpp
@@ -312,6 +312,18 @@ nsresult imgFrame::Optimize()
   return NS_OK;
 }
 
+DrawableFrameRef
+imgFrame::DrawableRef()
+{
+  return DrawableFrameRef(this);
+}
+
+RawAccessFrameRef
+imgFrame::RawAccessRef()
+{
+  return RawAccessFrameRef(this);
+}
+
 imgFrame::SurfaceWithFormat
 imgFrame::SurfaceForDrawing(bool               aDoPadding,
                             bool               aDoPartialDecode,
diff --git a/image/src/imgFrame.h b/image/src/imgFrame.h
index 9db2e59a7a41..a8ae60b0caaa 100644
--- a/image/src/imgFrame.h
+++ b/image/src/imgFrame.h
@@ -8,6 +8,7 @@
 #define imgFrame_h
 
 #include "mozilla/MemoryReporting.h"
+#include "mozilla/Move.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/VolatileBuffer.h"
 #include "gfxDrawable.h"
@@ -17,6 +18,8 @@ namespace mozilla {
 namespace image {
 
 class ImageRegion;
+class DrawableFrameRef;
+class RawAccessFrameRef;
 
 class imgFrame
 {
@@ -36,6 +39,9 @@ public:
   nsresult Init(int32_t aX, int32_t aY, int32_t aWidth, int32_t aHeight, SurfaceFormat aFormat, uint8_t aPaletteDepth = 0);
   nsresult Optimize();
 
+  DrawableFrameRef DrawableRef();
+  RawAccessFrameRef RawAccessRef();
+
   bool Draw(gfxContext* aContext, const ImageRegion& aRegion,
             const nsIntMargin& aPadding, GraphicsFilter aFilter,
             uint32_t aImageFlags);
@@ -165,32 +171,166 @@ private: // data
 
   /** Have we called DiscardTracker::InformAllocation()? */
   bool mInformedDiscardTracker;
+
+  friend class DrawableFrameRef;
+  friend class RawAccessFrameRef;
 };
 
-  // An RAII class to ensure it's easy to balance locks and unlocks on
-  // imgFrames.
-  class AutoFrameLocker
-  {
-  public:
-    explicit AutoFrameLocker(imgFrame* frame)
-      : mFrame(frame)
-      , mSucceeded(NS_SUCCEEDED(frame->LockImageData()))
-    {}
+/**
+ * A reference to an imgFrame that holds the imgFrame's surface in memory,
+ * allowing drawing. If you have a DrawableFrameRef |ref| and |if (ref)| returns
+ * true, then calls to Draw() and GetSurface() are guaranteed to succeed.
+ */
+class DrawableFrameRef MOZ_FINAL
+{
+  // Implementation details for safe boolean conversion.
+  typedef void (DrawableFrameRef::* ConvertibleToBool)(float*****, double*****);
+  void nonNull(float*****, double*****) {}
 
-    ~AutoFrameLocker()
-    {
-      if (mSucceeded) {
-        mFrame->UnlockImageData();
-      }
+public:
+  DrawableFrameRef() { }
+
+  explicit DrawableFrameRef(imgFrame* aFrame)
+    : mFrame(aFrame)
+    , mRef(aFrame->mVBuf)
+  {
+    if (mRef.WasBufferPurged()) {
+      mFrame = nullptr;
+      mRef = nullptr;
+    }
+  }
+
+  DrawableFrameRef(DrawableFrameRef&& aOther)
+    : mFrame(aOther.mFrame.forget())
+    , mRef(Move(aOther.mRef))
+  { }
+
+  DrawableFrameRef& operator=(DrawableFrameRef&& aOther)
+  {
+    MOZ_ASSERT(this != &aOther, "Self-moves are prohibited");
+    mFrame = aOther.mFrame.forget();
+    mRef = Move(aOther.mRef);
+    return *this;
+  }
+
+  operator ConvertibleToBool() const
+  {
+    return bool(mFrame) ? &DrawableFrameRef::nonNull : 0;
+  }
+
+  imgFrame* operator->()
+  {
+    MOZ_ASSERT(mFrame);
+    return mFrame;
+  }
+
+  const imgFrame* operator->() const
+  {
+    MOZ_ASSERT(mFrame);
+    return mFrame;
+  }
+
+  imgFrame* get() { return mFrame; }
+  const imgFrame* get() const { return mFrame; }
+
+  void reset()
+  {
+    mFrame = nullptr;
+    mRef = nullptr;
+  }
+
+private:
+  nsRefPtr<imgFrame> mFrame;
+  VolatileBufferPtr<uint8_t> mRef;
+};
+
+/**
+ * A reference to an imgFrame that holds the imgFrame's surface in memory in a
+ * format appropriate for access as raw data. If you have a RawAccessFrameRef
+ * |ref| and |if (ref)| is true, then calls to GetImageData(), GetPaletteData(),
+ * and GetDrawTarget() are guaranteed to succeed. This guarantee is stronger
+ * than DrawableFrameRef, so everything that a valid DrawableFrameRef guarantees
+ * is also guaranteed by a valid RawAccessFrameRef.
+ *
+ * This may be considerably more expensive than is necessary just for drawing,
+ * so only use this when you need to read or write the raw underlying image data
+ * that the imgFrame holds.
+ */
+class RawAccessFrameRef MOZ_FINAL
+{
+  // Implementation details for safe boolean conversion.
+  typedef void (RawAccessFrameRef::* ConvertibleToBool)(float*****, double*****);
+  void nonNull(float*****, double*****) {}
+
+public:
+  RawAccessFrameRef() { }
+
+  explicit RawAccessFrameRef(imgFrame* aFrame)
+    : mFrame(aFrame)
+  {
+    MOZ_ASSERT(mFrame, "Need a frame");
+
+    if (NS_FAILED(mFrame->LockImageData())) {
+      mFrame->UnlockImageData();
+      mFrame = nullptr;
+    }
+  }
+
+  RawAccessFrameRef(RawAccessFrameRef&& aOther)
+    : mFrame(aOther.mFrame.forget())
+  { }
+
+  ~RawAccessFrameRef()
+  {
+    if (mFrame) {
+      mFrame->UnlockImageData();
+    }
+  }
+
+  RawAccessFrameRef& operator=(RawAccessFrameRef&& aOther)
+  {
+    MOZ_ASSERT(this != &aOther, "Self-moves are prohibited");
+
+    if (mFrame) {
+      mFrame->UnlockImageData();
     }
 
-    // Whether the lock request succeeded.
-    bool Succeeded() { return mSucceeded; }
+    mFrame = aOther.mFrame.forget();
 
-  private:
-    nsRefPtr<imgFrame> mFrame;
-    bool mSucceeded;
-  };
+    return *this;
+  }
+
+  operator ConvertibleToBool() const
+  {
+    return bool(mFrame) ? &RawAccessFrameRef::nonNull : 0;
+  }
+
+  imgFrame* operator->()
+  {
+    MOZ_ASSERT(mFrame);
+    return mFrame.get();
+  }
+
+  const imgFrame* operator->() const
+  {
+    MOZ_ASSERT(mFrame);
+    return mFrame;
+  }
+
+  imgFrame* get() { return mFrame; }
+  const imgFrame* get() const { return mFrame; }
+
+  void reset()
+  {
+    if (mFrame) {
+      mFrame->UnlockImageData();
+    }
+    mFrame = nullptr;
+  }
+
+private:
+  nsRefPtr<imgFrame> mFrame;
+};
 
 } // namespace image
 } // namespace mozilla

From a38518d34554a7da31947f80f5c97fb28d504fdc Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Wed, 10 Sep 2014 17:15:40 -0700
Subject: [PATCH 031/109] Bug 1042680 - Allow add-ons to assign to var-declared
 chrome global with compartment_per_addon (r=bholley)

---
 js/xpconnect/src/Sandbox.cpp                  | 25 +++++++++++++++++--
 .../tests/unit/test_writeToGlobalPrototype.js |  6 ++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp
index 79f82adbf926..85b076cebdf7 100644
--- a/js/xpconnect/src/Sandbox.cpp
+++ b/js/xpconnect/src/Sandbox.cpp
@@ -406,10 +406,31 @@ sandbox_addProperty(JSContext *cx, HandleObject obj, HandleId id, MutableHandleV
     // After bug 1015790 is fixed, we should be able to remove this unwrapping.
     RootedObject unwrappedProto(cx, js::UncheckedUnwrap(proto, /* stopAtOuter = */ false));
 
-    if (!JS_CopyPropertyFrom(cx, id, unwrappedProto, obj))
+    Rooted<JSPropertyDescriptor> pd(cx);
+    if (!JS_GetPropertyDescriptorById(cx, proto, id, &pd))
         return false;
 
-    Rooted<JSPropertyDescriptor> pd(cx);
+    // This is a little icky. If the property exists and is not configurable,
+    // then JS_CopyPropertyFrom will throw an exception when we try to do a
+    // normal assignment since it will think we're trying to remove the
+    // non-configurability. So we do JS_SetPropertyById in that case.
+    //
+    // However, in the case of |const x = 3|, we get called once for
+    // JSOP_DEFCONST and once for JSOP_SETCONST. The first one creates the
+    // property as readonly and configurable. The second one changes the
+    // attributes to readonly and not configurable. If we use JS_SetPropertyById
+    // for the second call, it will throw an exception because the property is
+    // readonly. We have to use JS_CopyPropertyFrom since it ignores the
+    // readonly attribute (as it calls JSObject::defineProperty). See bug
+    // 1019181.
+    if (pd.object() && pd.isPermanent()) {
+        if (!JS_SetPropertyById(cx, proto, id, vp))
+            return false;
+    } else {
+        if (!JS_CopyPropertyFrom(cx, id, unwrappedProto, obj))
+            return false;
+    }
+
     if (!JS_GetPropertyDescriptorById(cx, obj, id, &pd))
         return false;
     unsigned attrs = pd.attributes() & ~(JSPROP_GETTER | JSPROP_SETTER);
diff --git a/js/xpconnect/tests/unit/test_writeToGlobalPrototype.js b/js/xpconnect/tests/unit/test_writeToGlobalPrototype.js
index 91a9c3b655eb..57999d503cf8 100644
--- a/js/xpconnect/tests/unit/test_writeToGlobalPrototype.js
+++ b/js/xpconnect/tests/unit/test_writeToGlobalPrototype.js
@@ -1,4 +1,4 @@
-const A = 3;
+var G = 3;
 
 const Cu = Components.utils;
 
@@ -36,6 +36,10 @@ function run_test()
   Cu.evalInSandbox("q = 12", s);
   do_check_eq(q, 12);
 
+  do_check_eq(Cu.evalInSandbox("G", s), 3);
+  Cu.evalInSandbox("G = 12", s);
+  do_check_eq(G, 12);
+
   Cu.evalInSandbox("Object.defineProperty(this, 'x', {enumerable: false, value: 3})", s);
   do_check_eq(Cu.evalInSandbox("x", s), 3);
   do_check_eq(x, 3);

From d282184f34b182f1654ce8a823cfe531c54810f5 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Wed, 10 Sep 2014 17:15:40 -0700
Subject: [PATCH 032/109] Bug 1057663 - Make sure content process crashes
 always get reported (r=felipe)

---
 browser/base/content/aboutTabCrashed.js |  4 ++++
 browser/base/content/browser.js         | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/aboutTabCrashed.js b/browser/base/content/aboutTabCrashed.js
index 43a807b57fb9..b367be251eca 100644
--- a/browser/base/content/aboutTabCrashed.js
+++ b/browser/base/content/aboutTabCrashed.js
@@ -11,3 +11,7 @@ function parseQueryString() {
 }
 
 document.title = parseQueryString();
+
+// Error pages are loaded as LOAD_BACKGROUND, so they don't get load events.
+var event = new CustomEvent("AboutTabCrashedLoad", {bubbles:true});
+document.dispatchEvent(event);
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 0c7be40bdb7d..fd8208de3769 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1017,6 +1017,12 @@ var gBrowserInit = {
       }
     });
 
+    gBrowser.addEventListener("AboutTabCrashedLoad", function(event) {
+#ifdef MOZ_CRASHREPORTER
+      TabCrashReporter.onAboutTabCrashedLoad(gBrowser.getBrowserForDocument(event.target));
+#endif
+    }, false, true);
+
     if (uriToLoad && uriToLoad != "about:blank") {
       if (uriToLoad instanceof Ci.nsISupportsArray) {
         let count = uriToLoad.Count();
@@ -4044,11 +4050,6 @@ var TabsProgressListener = {
         if (event.target.documentElement)
           event.target.documentElement.removeAttribute("hasBrowserHandlers");
       }, true);
-
-#ifdef MOZ_CRASHREPORTER
-      if (doc.documentURI.startsWith("about:tabcrashed"))
-        TabCrashReporter.onAboutTabCrashedLoad(aBrowser);
-#endif
     }
   },
 

From 41b9d7aba6f5d8dd40fb12c65f2482a961c6b32a Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Wed, 10 Sep 2014 17:15:40 -0700
Subject: [PATCH 033/109] Bug 1060042 - CPOWs need a hasInstance hook
 (r=mrbkap)

---
 js/ipc/JavaScriptBase.h  |  6 ++++++
 js/ipc/PJavaScript.ipdl  |  1 +
 js/ipc/WrapperAnswer.cpp | 24 ++++++++++++++++++++++++
 js/ipc/WrapperAnswer.h   |  1 +
 js/ipc/WrapperOwner.cpp  | 26 ++++++++++++++++++++++++++
 js/ipc/WrapperOwner.h    |  3 +++
 6 files changed, 61 insertions(+)

diff --git a/js/ipc/JavaScriptBase.h b/js/ipc/JavaScriptBase.h
index 47a425b95d3d..28db09b557ac 100644
--- a/js/ipc/JavaScriptBase.h
+++ b/js/ipc/JavaScriptBase.h
@@ -87,6 +87,9 @@ class JavaScriptBase : public WrapperOwner, public WrapperAnswer, public Base
                                nsTArray<JSParam> *outparams) {
         return Answer::AnswerCallOrConstruct(objId, argv, construct, rs, result, outparams);
     }
+    bool AnswerHasInstance(const ObjectId &objId, const JSVariant &v, ReturnStatus *rs, bool *bp) {
+        return Answer::AnswerHasInstance(objId, v, rs, bp);
+    }
     bool AnswerObjectClassIs(const ObjectId &objId, const uint32_t &classValue,
                              bool *result) {
         return Answer::AnswerObjectClassIs(objId, classValue, result);
@@ -169,6 +172,9 @@ class JavaScriptBase : public WrapperOwner, public WrapperAnswer, public Base
                              nsTArray<JSParam> *outparams) {
         return Base::CallCallOrConstruct(objId, argv, construct, rs, result, outparams);
     }
+    bool CallHasInstance(const ObjectId &objId, const JSVariant &v, ReturnStatus *rs, bool *bp) {
+        return Base::CallHasInstance(objId, v, rs, bp);
+    }
     bool CallObjectClassIs(const ObjectId &objId, const uint32_t &classValue,
                            bool *result) {
         return Base::CallObjectClassIs(objId, classValue, result);
diff --git a/js/ipc/PJavaScript.ipdl b/js/ipc/PJavaScript.ipdl
index 4200a07afb34..46b4dd4a9b31 100644
--- a/js/ipc/PJavaScript.ipdl
+++ b/js/ipc/PJavaScript.ipdl
@@ -37,6 +37,7 @@ both:
 
     rpc IsExtensible(uint64_t objId) returns (ReturnStatus rs, bool result);
     rpc CallOrConstruct(uint64_t objId, JSParam[] argv, bool construct) returns (ReturnStatus rs, JSVariant result, JSParam[] outparams);
+    rpc HasInstance(uint64_t objId, JSVariant v) returns (ReturnStatus rs, bool has);
     rpc ObjectClassIs(uint64_t objId, uint32_t classValue) returns (bool result);
     rpc ClassName(uint64_t objId) returns (nsString name);
 
diff --git a/js/ipc/WrapperAnswer.cpp b/js/ipc/WrapperAnswer.cpp
index 7ad31f7607d4..4f13668d63e2 100644
--- a/js/ipc/WrapperAnswer.cpp
+++ b/js/ipc/WrapperAnswer.cpp
@@ -486,6 +486,30 @@ WrapperAnswer::AnswerCallOrConstruct(const ObjectId &objId,
     return ok(rs);
 }
 
+bool
+WrapperAnswer::AnswerHasInstance(const ObjectId &objId, const JSVariant &vVar, ReturnStatus *rs, bool *bp)
+{
+    AutoSafeJSContext cx;
+    JSAutoRequest request(cx);
+
+    RootedObject obj(cx, findObjectById(cx, objId));
+    if (!obj)
+        return fail(cx, rs);
+
+    JSAutoCompartment comp(cx, obj);
+
+    LOG("%s.hasInstance(%s)", ReceiverObj(objId), InVariant(vVar));
+
+    RootedValue val(cx);
+    if (!fromVariant(cx, vVar, &val))
+        return fail(cx, rs);
+
+    if (!JS_HasInstance(cx, obj, val, bp))
+        return fail(cx, rs);
+
+    return ok(rs);
+}
+
 bool
 WrapperAnswer::AnswerObjectClassIs(const ObjectId &objId, const uint32_t &classValue,
 				   bool *result)
diff --git a/js/ipc/WrapperAnswer.h b/js/ipc/WrapperAnswer.h
index 4d29f8c3e530..e48a4962683d 100644
--- a/js/ipc/WrapperAnswer.h
+++ b/js/ipc/WrapperAnswer.h
@@ -48,6 +48,7 @@ class WrapperAnswer : public virtual JavaScriptShared
     bool AnswerCallOrConstruct(const ObjectId &objId, const nsTArray<JSParam> &argv,
                                const bool &construct, ReturnStatus *rs, JSVariant *result,
                                nsTArray<JSParam> *outparams);
+    bool AnswerHasInstance(const ObjectId &objId, const JSVariant &v, ReturnStatus *rs, bool *bp);
     bool AnswerObjectClassIs(const ObjectId &objId, const uint32_t &classValue,
                              bool *result);
     bool AnswerClassName(const ObjectId &objId, nsString *result);
diff --git a/js/ipc/WrapperOwner.cpp b/js/ipc/WrapperOwner.cpp
index d3faf2b9ec38..1ff3e4df2f87 100644
--- a/js/ipc/WrapperOwner.cpp
+++ b/js/ipc/WrapperOwner.cpp
@@ -78,6 +78,8 @@ class CPOWProxyHandler : public BaseProxyHandler
     virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE;
     virtual bool call(JSContext *cx, HandleObject proxy, const CallArgs &args) const MOZ_OVERRIDE;
     virtual bool construct(JSContext *cx, HandleObject proxy, const CallArgs &args) const MOZ_OVERRIDE;
+    virtual bool hasInstance(JSContext *cx, HandleObject proxy,
+                             MutableHandleValue v, bool *bp) const MOZ_OVERRIDE;
     virtual bool objectClassIs(HandleObject obj, js::ESClassValue classValue,
                                JSContext *cx) const MOZ_OVERRIDE;
     virtual const char* className(JSContext *cx, HandleObject proxy) const MOZ_OVERRIDE;
@@ -570,6 +572,30 @@ WrapperOwner::callOrConstruct(JSContext *cx, HandleObject proxy, const CallArgs
     return true;
 }
 
+bool
+CPOWProxyHandler::hasInstance(JSContext *cx, HandleObject proxy, MutableHandleValue v, bool *bp) const
+{
+    FORWARD(hasInstance, (cx, proxy, v, bp));
+}
+
+bool
+WrapperOwner::hasInstance(JSContext *cx, HandleObject proxy, MutableHandleValue v, bool *bp)
+{
+    ObjectId objId = idOf(proxy);
+
+    JSVariant vVar;
+    if (!toVariant(cx, v, &vVar))
+        return false;
+
+    ReturnStatus status;
+    JSVariant result;
+    if (!CallHasInstance(objId, vVar, &status, bp))
+        return ipcfail(cx);
+
+    LOG_STACK();
+
+    return ok(cx, status);
+}
 
 bool
 CPOWProxyHandler::objectClassIs(HandleObject proxy, js::ESClassValue classValue, JSContext *cx) const
diff --git a/js/ipc/WrapperOwner.h b/js/ipc/WrapperOwner.h
index dd2fca40e3be..c75a1e106145 100644
--- a/js/ipc/WrapperOwner.h
+++ b/js/ipc/WrapperOwner.h
@@ -57,6 +57,7 @@ class WrapperOwner : public virtual JavaScriptShared
     bool isExtensible(JSContext *cx, JS::HandleObject proxy, bool *extensible);
     bool callOrConstruct(JSContext *cx, JS::HandleObject proxy, const JS::CallArgs &args,
                          bool construct);
+    bool hasInstance(JSContext *cx, JS::HandleObject proxy, JS::MutableHandleValue v, bool *bp);
     bool objectClassIs(JSContext *cx, JS::HandleObject obj, js::ESClassValue classValue);
     const char* className(JSContext *cx, JS::HandleObject proxy);
     bool isCallable(JSObject *obj);
@@ -131,6 +132,8 @@ class WrapperOwner : public virtual JavaScriptShared
     virtual bool CallCallOrConstruct(const ObjectId &objId, const nsTArray<JSParam> &argv,
                                      const bool &construct, ReturnStatus *rs, JSVariant *result,
                                      nsTArray<JSParam> *outparams) = 0;
+    virtual bool CallHasInstance(const ObjectId &objId, const JSVariant &v,
+                                 ReturnStatus *rs, bool *bp) = 0;
     virtual bool CallObjectClassIs(const ObjectId &objId, const uint32_t &classValue,
                                    bool *result) = 0;
     virtual bool CallClassName(const ObjectId &objId, nsString *result) = 0;

From 3814244dbb2aaca9692fb83036c2b6b9e1a5c4d6 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Wed, 10 Sep 2014 17:15:41 -0700
Subject: [PATCH 034/109] Bug 1058543 - Make page info work again in e10s
 (r=mconley)

---
 browser/base/content/pageinfo/pageInfo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js
index eb1b31c5090d..abc8f4d65b6a 100644
--- a/browser/base/content/pageinfo/pageInfo.js
+++ b/browser/base/content/pageinfo/pageInfo.js
@@ -323,7 +323,7 @@ function onLoadPageInfo()
              window.arguments[0];
 
   if (!args || !args.doc) {
-    gWindow = window.opener.content;
+    gWindow = window.opener.gBrowser.selectedBrowser.contentWindowAsCPOW;
     gDocument = gWindow.document;
   }
 

From 358c1f203e93dc642d1acca1b1540ee6e9e31372 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Wed, 10 Sep 2014 17:15:41 -0700
Subject: [PATCH 035/109] Bug 1062024 - Allow CPOWs to be passed to COWs
 (r=bholley)

---
 js/xpconnect/wrappers/ChromeObjectWrapper.cpp | 12 ++++++++++++
 js/xpconnect/wrappers/moz.build               |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/js/xpconnect/wrappers/ChromeObjectWrapper.cpp b/js/xpconnect/wrappers/ChromeObjectWrapper.cpp
index 6b2d3a312b93..75f67d387d45 100644
--- a/js/xpconnect/wrappers/ChromeObjectWrapper.cpp
+++ b/js/xpconnect/wrappers/ChromeObjectWrapper.cpp
@@ -7,9 +7,11 @@
 #include "ChromeObjectWrapper.h"
 #include "WrapperFactory.h"
 #include "AccessCheck.h"
+#include "JavaScriptParent.h"
 #include "xpcprivate.h"
 #include "jsapi.h"
 #include "jswrapper.h"
+#include "nsXULAppAPI.h"
 
 using namespace JS;
 
@@ -116,6 +118,16 @@ CheckPassToChrome(JSContext *cx, HandleObject wrapper, HandleValue v)
     if (!js::IsWrapper(obj))
         return true;
 
+    // CPOWs use COWs (in the unprivileged junk scope) for all child->parent
+    // references. Without this test, the child process wouldn't be able to
+    // pass any objects at all to CPOWs.
+    if (mozilla::jsipc::IsWrappedCPOW(obj) &&
+        js::GetObjectCompartment(wrapper) == js::GetObjectCompartment(xpc::UnprivilegedJunkScope()) &&
+        XRE_GetProcessType() == GeckoProcessType_Default)
+    {
+        return true;
+    }
+
     // COWs are fine to pass back if and only if they have __exposedProps__,
     // since presumably content should never have a reason to pass an opaque
     // object back to chrome.
diff --git a/js/xpconnect/wrappers/moz.build b/js/xpconnect/wrappers/moz.build
index da9908ccb372..33bb86edff83 100644
--- a/js/xpconnect/wrappers/moz.build
+++ b/js/xpconnect/wrappers/moz.build
@@ -32,10 +32,13 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../../../dom/base',
     '../src',
+    '/js/ipc',
 ]
 

From d1a93f6238a76b45d78e5db160d659563a239ff9 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 01:45:04 +0100
Subject: [PATCH 036/109] Bug 1065718 - Make gfxMatrix's Translate(), Scale()
 and Rotate() methods return a non-const reference. r=Bas

---
 gfx/thebes/gfxMatrix.cpp |  8 ++++----
 gfx/thebes/gfxMatrix.h   | 12 ++++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/gfx/thebes/gfxMatrix.cpp b/gfx/thebes/gfxMatrix.cpp
index 9fe86d134f1d..8138d59c7ac5 100644
--- a/gfx/thebes/gfxMatrix.cpp
+++ b/gfx/thebes/gfxMatrix.cpp
@@ -23,21 +23,21 @@ gfxMatrix::Invert()
     return cairo_matrix_invert(CAIRO_MATRIX(this)) == CAIRO_STATUS_SUCCESS;
 }
 
-const gfxMatrix&
+gfxMatrix&
 gfxMatrix::Scale(gfxFloat x, gfxFloat y)
 {
     cairo_matrix_scale(CAIRO_MATRIX(this), x, y);
     return *this;
 }
 
-const gfxMatrix&
+gfxMatrix&
 gfxMatrix::Translate(const gfxPoint& pt)
 {
     cairo_matrix_translate(CAIRO_MATRIX(this), pt.x, pt.y);
     return *this;
 }
 
-const gfxMatrix&
+gfxMatrix&
 gfxMatrix::Rotate(gfxFloat radians)
 {
     cairo_matrix_rotate(CAIRO_MATRIX(this), radians);
@@ -51,7 +51,7 @@ gfxMatrix::operator *= (const gfxMatrix& m)
     return *this;
 }
 
-const gfxMatrix&
+gfxMatrix&
 gfxMatrix::PreMultiply(const gfxMatrix& m)
 {
     cairo_matrix_multiply(CAIRO_MATRIX(this), CONST_CAIRO_MATRIX(&m), CAIRO_MATRIX(this));
diff --git a/gfx/thebes/gfxMatrix.h b/gfx/thebes/gfxMatrix.h
index 9305a4c68860..e4c398ed299a 100644
--- a/gfx/thebes/gfxMatrix.h
+++ b/gfx/thebes/gfxMatrix.h
@@ -127,13 +127,17 @@ public:
      * Scales this matrix. The scale is pre-multiplied onto this matrix,
      * i.e. the scaling takes place before the other transformations.
      */
-    const gfxMatrix& Scale(gfxFloat x, gfxFloat y);
+    gfxMatrix& Scale(gfxFloat x, gfxFloat y);
 
     /**
      * Translates this matrix. The translation is pre-multiplied onto this matrix,
      * i.e. the translation takes place before the other transformations.
      */
-    const gfxMatrix& Translate(const gfxPoint& pt);
+    gfxMatrix& Translate(const gfxPoint& pt);
+
+    gfxMatrix& Translate(gfxFloat x, gfxFloat y) {
+      return Translate(gfxPoint(x, y));
+    }
 
     /**
      * Rotates this matrix. The rotation is pre-multiplied onto this matrix,
@@ -141,14 +145,14 @@ public:
      *
      * @param radians Angle in radians.
      */
-    const gfxMatrix& Rotate(gfxFloat radians);
+    gfxMatrix& Rotate(gfxFloat radians);
 
     /**
      * Multiplies the current matrix with m.
      * This is a pre-multiplication, i.e. the transformations of m are
      * applied _before_ the existing transformations.
      */
-    const gfxMatrix& PreMultiply(const gfxMatrix& m);
+    gfxMatrix& PreMultiply(const gfxMatrix& m);
 
     static gfxMatrix Translation(gfxFloat aX, gfxFloat aY)
     {

From 24dd1d2cf15c0d11c47de2f87e0d90feae258a64 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 01:45:05 +0100
Subject: [PATCH 037/109] Bug 1065737 - Add a PreMultiply() method to Moz2D's
 Matrix class. r=Bas

---
 gfx/2d/Matrix.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gfx/2d/Matrix.h b/gfx/2d/Matrix.h
index f03839f876f5..34a204a99f8f 100644
--- a/gfx/2d/Matrix.h
+++ b/gfx/2d/Matrix.h
@@ -211,6 +211,15 @@ public:
     return *this;
   }
 
+  /**
+   * Multiplies in the opposite order to operator=*.
+   */
+  Matrix &PreMultiply(const Matrix &aMatrix)
+  {
+    *this = aMatrix * *this;
+    return *this;
+  }
+
   /* Returns true if the other matrix is fuzzy-equal to this matrix.
    * Note that this isn't a cheap comparison!
    */

From 94784d615ca7648547573a17487addb50a573343 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 01:46:16 +0100
Subject: [PATCH 038/109] Bug 1065743 - Make Moz2D's DrawTarget::GetTransform()
 return a copy instead of a const reference. r=Bas

---
 gfx/2d/2D.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h
index 10c3117d6d1a..474cf567aa71 100644
--- a/gfx/2d/2D.h
+++ b/gfx/2d/2D.h
@@ -960,7 +960,7 @@ public:
    */
   virtual TemporaryRef<FilterNode> CreateFilter(FilterType aType) = 0;
 
-  const Matrix &GetTransform() const { return mTransform; }
+  Matrix GetTransform() const { return mTransform; }
 
   /**
    * Set a transform on the surface, this transform is applied at drawing time

From 56ee18012ca2ef199886a92d723dfe0b31f9d5da Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 01:46:19 +0100
Subject: [PATCH 039/109] Bug 1065764, part 1 - Make
 gfxMatrix::NudgeToIntegers() return a reference. r=Bas

---
 gfx/thebes/gfxMatrix.cpp | 3 ++-
 gfx/thebes/gfxMatrix.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gfx/thebes/gfxMatrix.cpp b/gfx/thebes/gfxMatrix.cpp
index 8138d59c7ac5..6a8109236467 100644
--- a/gfx/thebes/gfxMatrix.cpp
+++ b/gfx/thebes/gfxMatrix.cpp
@@ -147,7 +147,7 @@ static void NudgeToInteger(double *aVal)
     *aVal = f;
 }
 
-void
+gfxMatrix&
 gfxMatrix::NudgeToIntegers(void)
 {
     NudgeToInteger(&_11);
@@ -156,4 +156,5 @@ gfxMatrix::NudgeToIntegers(void)
     NudgeToInteger(&_22);
     NudgeToInteger(&_31);
     NudgeToInteger(&_32);
+    return *this;
 }
diff --git a/gfx/thebes/gfxMatrix.h b/gfx/thebes/gfxMatrix.h
index e4c398ed299a..a27cd5bf80b4 100644
--- a/gfx/thebes/gfxMatrix.h
+++ b/gfx/thebes/gfxMatrix.h
@@ -284,7 +284,7 @@ public:
      * to integers. In particular, components that are integral when
      * converted to single precision are set to those integers.
      */
-    void NudgeToIntegers(void);
+    gfxMatrix& NudgeToIntegers(void);
 
     /**
      * Returns true if matrix is multiple of 90 degrees rotation with flipping,

From 58325191a81a415b36364a4eb616869ef29ba9fa Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 01:46:21 +0100
Subject: [PATCH 040/109] Bug 1065764, part 2 - Make Moz2D's
 Matrix::NudgeToIntegers() return a reference. r=Bas

---
 gfx/2d/Matrix.cpp | 3 ++-
 gfx/2d/Matrix.h   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gfx/2d/Matrix.cpp b/gfx/2d/Matrix.cpp
index 99493b63d829..0b9c26b765ab 100644
--- a/gfx/2d/Matrix.cpp
+++ b/gfx/2d/Matrix.cpp
@@ -62,7 +62,7 @@ Matrix::TransformBounds(const Rect &aRect) const
   return Rect(min_x, min_y, max_x - min_x, max_y - min_y);
 }
 
-void
+Matrix&
 Matrix::NudgeToIntegers()
 {
   NudgeToInteger(&_11);
@@ -71,6 +71,7 @@ Matrix::NudgeToIntegers()
   NudgeToInteger(&_22);
   NudgeToInteger(&_31);
   NudgeToInteger(&_32);
+  return *this;
 }
 
 Rect
diff --git a/gfx/2d/Matrix.h b/gfx/2d/Matrix.h
index 34a204a99f8f..8e2055c9f4a0 100644
--- a/gfx/2d/Matrix.h
+++ b/gfx/2d/Matrix.h
@@ -300,7 +300,7 @@ public:
     return Determinant() == 0;
   }
 
-  GFX2D_API void NudgeToIntegers();
+  GFX2D_API Matrix &NudgeToIntegers();
 
   bool IsTranslation() const
   {
@@ -738,7 +738,7 @@ public:
     return (__33 * det) < 0;
   }
 
-  void NudgeToIntegersFixedEpsilon()
+  Matrix4x4 &NudgeToIntegersFixedEpsilon()
   {
     static const float error = 1e-5f;
     NudgeToInteger(&_11, error);
@@ -757,6 +757,7 @@ public:
     NudgeToInteger(&_42, error);
     NudgeToInteger(&_43, error);
     NudgeToInteger(&_44, error);
+    return *this;
   }
 
   Point4D TransposedVector(int aIndex) const

From 7bee1eeb55d003697f603c5023b45904691cbf0d Mon Sep 17 00:00:00 2001
From: Eric Rahm <erahm@mozilla.com>
Date: Tue, 9 Sep 2014 16:52:08 -0700
Subject: [PATCH 041/109] Bug 1059593 - logcat entries from console logging
 should include app name. r=dhylands

--HG--
extra : rebase_source : 8e924b6a97b49eee3bfa0c89e81d15cd3b4dfaef
---
 xpcom/base/nsConsoleService.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/xpcom/base/nsConsoleService.cpp b/xpcom/base/nsConsoleService.cpp
index 8fdbedbc6c37..bc7c0ea13842 100644
--- a/xpcom/base/nsConsoleService.cpp
+++ b/xpcom/base/nsConsoleService.cpp
@@ -25,6 +25,7 @@
 
 #if defined(ANDROID)
 #include <android/log.h>
+#include "mozilla/dom/ContentChild.h"
 #endif
 #ifdef XP_WIN
 #include <windows.h>
@@ -204,7 +205,18 @@ nsConsoleService::LogMessageWithMode(nsIConsoleMessage* aMessage,
     if (aOutputMode == OutputToLog) {
       nsCString msg;
       aMessage->ToString(msg);
-      __android_log_print(ANDROID_LOG_ERROR, "GeckoConsole",
+
+      /** Attempt to use the process name as the log tag. */
+      mozilla::dom::ContentChild* child =
+          mozilla::dom::ContentChild::GetSingleton();
+      nsCString appName;
+      if (child) {
+        child->GetProcessName(appName);
+      } else {
+        appName = "GeckoConsole";
+      }
+
+      __android_log_print(ANDROID_LOG_ERROR, appName.get(),
                           "%s", msg.get());
     }
 #endif

From a23b1f37d89cd139b91f01f740578bcc33cf1c38 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 10 Sep 2014 22:06:53 -0400
Subject: [PATCH 042/109] Bug 1065668 - Fix more bad implicit ctors in
 profiler; r=BenWa

---
 tools/profiler/ProfilerMarkers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/profiler/ProfilerMarkers.h b/tools/profiler/ProfilerMarkers.h
index e5691ab05790..c8ab8ec78f03 100644
--- a/tools/profiler/ProfilerMarkers.h
+++ b/tools/profiler/ProfilerMarkers.h
@@ -156,7 +156,7 @@ private:
 class TouchDataPayload : public ProfilerMarkerPayload
 {
 public:
-  TouchDataPayload(const mozilla::ScreenIntPoint& aPoint);
+  explicit TouchDataPayload(const mozilla::ScreenIntPoint& aPoint);
   virtual ~TouchDataPayload() {}
 
 protected:

From 6e8ee4741ee4091431947ec7c97623e2fa0329ef Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Wed, 10 Sep 2014 21:47:00 -0500
Subject: [PATCH 043/109] Bug 1063364. imgLoader::SetHasProxies/SetHasNoProxies
 should operate on imgRequests/imgCacheEntrys not URIs. r=seth

There can be more than one imgRequest alive for any given URI, so when we tell the imgLoader that we have/do not have proxies we should be specific which imgRequest/imgCacheEntry this applies to so we don't change the wrong imgRequest/imgCacheEntry.
---
 image/src/imgLoader.cpp  | 47 +++++++++++++++++++++++++---------------
 image/src/imgLoader.h    |  4 ++--
 image/src/imgRequest.cpp |  4 ++--
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp
index 3ecbafd9b336..295f13482a32 100644
--- a/image/src/imgLoader.cpp
+++ b/image/src/imgLoader.cpp
@@ -1319,58 +1319,69 @@ bool imgLoader::PutIntoCache(nsIURI *key, imgCacheEntry *entry)
   return true;
 }
 
-bool imgLoader::SetHasNoProxies(ImageURL *key, imgCacheEntry *entry)
+bool imgLoader::SetHasNoProxies(imgRequest *aRequest, imgCacheEntry *aEntry)
 {
+  nsRefPtr<ImageURL> uri;
+  aRequest->GetURI(getter_AddRefs(uri));
+
 #if defined(PR_LOGGING)
   nsAutoCString spec;
-  key->GetSpec(spec);
+  uri->GetSpec(spec);
 
   LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(), "imgLoader::SetHasNoProxies", "uri", spec.get());
 #endif
 
-  if (entry->Evicted())
+  aEntry->SetHasNoProxies(true);
+
+  if (aEntry->Evicted())
     return false;
 
-  imgCacheQueue &queue = GetCacheQueue(key);
+  imgCacheQueue &queue = GetCacheQueue(uri);
 
   nsresult addrv = NS_OK;
 
   if (mCacheTracker)
-    addrv = mCacheTracker->AddObject(entry);
+    addrv = mCacheTracker->AddObject(aEntry);
 
   if (NS_SUCCEEDED(addrv)) {
-    queue.Push(entry);
-    entry->SetHasNoProxies(true);
+    queue.Push(aEntry);
   }
 
-  imgCacheTable &cache = GetCache(key);
+  imgCacheTable &cache = GetCache(uri);
   CheckCacheLimits(cache, queue);
 
   return true;
 }
 
-bool imgLoader::SetHasProxies(ImageURL *key)
+bool imgLoader::SetHasProxies(imgRequest *aRequest)
 {
   VerifyCacheSizes();
 
-  imgCacheTable &cache = GetCache(key);
+  nsRefPtr<ImageURL> uri;
+  aRequest->GetURI(getter_AddRefs(uri));
+
+  imgCacheTable &cache = GetCache(uri);
 
   nsAutoCString spec;
-  key->GetSpec(spec);
+  uri->GetSpec(spec);
 
   LOG_STATIC_FUNC_WITH_PARAM(GetImgLog(), "imgLoader::SetHasProxies", "uri", spec.get());
 
   nsRefPtr<imgCacheEntry> entry;
-  if (cache.Get(spec, getter_AddRefs(entry)) && entry && entry->HasNoProxies()) {
-    imgCacheQueue &queue = GetCacheQueue(key);
-    queue.Remove(entry);
+  if (cache.Get(spec, getter_AddRefs(entry)) && entry) {
+    // Make sure the cache entry is for the right request
+    nsRefPtr<imgRequest> entryRequest = entry->GetRequest();
+    if (entryRequest == aRequest && entry->HasNoProxies()) {
+      imgCacheQueue &queue = GetCacheQueue(uri);
+      queue.Remove(entry);
 
-    if (mCacheTracker)
-      mCacheTracker->RemoveObject(entry);
+      if (mCacheTracker)
+        mCacheTracker->RemoveObject(entry);
 
-    entry->SetHasNoProxies(false);
+      entry->SetHasNoProxies(false);
 
-    return true;
+      return true;
+    }
   }
 
   return false;
diff --git a/image/src/imgLoader.h b/image/src/imgLoader.h
index 13074d122807..334a3a16b260 100644
--- a/image/src/imgLoader.h
+++ b/image/src/imgLoader.h
@@ -329,8 +329,8 @@ public:
   // HasObservers(). The request's cache entry will be re-set before this
   // happens, by calling imgRequest::SetCacheEntry() when an entry with no
   // observers is re-requested.
-  bool SetHasNoProxies(ImageURL *key, imgCacheEntry *entry);
-  bool SetHasProxies(ImageURL *key);
+  bool SetHasNoProxies(imgRequest *aRequest, imgCacheEntry *aEntry);
+  bool SetHasProxies(imgRequest *aRequest);
 
 private: // methods
 
diff --git a/image/src/imgRequest.cpp b/image/src/imgRequest.cpp
index 7123c695e1f2..3bca07711e34 100644
--- a/image/src/imgRequest.cpp
+++ b/image/src/imgRequest.cpp
@@ -177,7 +177,7 @@ void imgRequest::AddProxy(imgRequestProxy *proxy)
   if (statusTracker->ConsumerCount() == 0) {
     NS_ABORT_IF_FALSE(mURI, "Trying to SetHasProxies without key uri.");
     if (mLoader) {
-      mLoader->SetHasProxies(mURI);
+      mLoader->SetHasProxies(this);
     }
   }
 
@@ -209,7 +209,7 @@ nsresult imgRequest::RemoveProxy(imgRequestProxy *proxy, nsresult aStatus)
       NS_ABORT_IF_FALSE(mURI, "Removing last observer without key uri.");
 
       if (mLoader) {
-        mLoader->SetHasNoProxies(mURI, mCacheEntry);
+        mLoader->SetHasNoProxies(this, mCacheEntry);
       }
     }
 #if defined(PR_LOGGING)

From c47300cd6803fd7329ef061c406cd6e304ba74c3 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 11 Sep 2014 12:12:18 +0900
Subject: [PATCH 044/109] Bug 1063860 - Refresh some of the variable/tier
 associations in mozbuild.context. r=gps

---
 python/mozbuild/mozbuild/frontend/context.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
index 1d5fc173df14..b78813ef8882 100644
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -830,7 +830,7 @@ VARIABLES = {
         When this variable is present, the results of this directory will end up
         being placed in the $(DIST_SUBDIR) subdirectory of where it would
         otherwise be placed.
-        """, 'libs'),
+        """, None),
 
     'FINAL_TARGET': (FinalTargetValue, unicode,
         """The name of the directory to install targets to.
@@ -840,7 +840,7 @@ VARIABLES = {
         neither are present, the result is dist/bin. If XPI_NAME is present, the
         result is dist/xpi-stage/$(XPI_NAME). If DIST_SUBDIR is present, then
         the $(DIST_SUBDIR) directory of the otherwise default value is used.
-        """, 'libs'),
+        """, None),
 
     'GYP_DIRS': (StrictOrderingOnAppendListWithFlagsFactory({
             'variables': dict,
@@ -930,7 +930,7 @@ VARIABLES = {
            Note that the ordering of flags matters here; these flags will be
            added to the linker's command line in the same order as they
            appear in the moz.build file.
-        """, 'libs'),
+        """, None),
 
     'EXTRA_DSO_LDOPTS': (List, list,
         """Flags passed to the linker when linking a shared library.
@@ -938,7 +938,7 @@ VARIABLES = {
            Note that the ordering of flags matter here, these flags will be
            added to the linker's command line in the same order as they
            appear in the moz.build file.
-        """, 'libs'),
+        """, None),
 
     'WIN32_EXE_LDFLAGS': (List, list,
         """Flags passed to the linker when linking a Windows .exe executable
@@ -949,7 +949,7 @@ VARIABLES = {
            appear in the moz.build file.
 
            This variable only has an effect on Windows.
-        """, 'libs'),
+        """, None),
 }
 
 # Sanity check: we don't want any variable above to have a list as storage type.

From 203b34527955125c0d13241cd6895b3bb0d410c9 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 11 Sep 2014 12:19:28 +0900
Subject: [PATCH 045/109] Bug 1059255 - Stop building stdc++compat as a real
 library. r=mshal

Incidentally, this makes the build fail because stdc++compat.o then appears
twice on the libxul linkage command line. This, in turn, is because
widget/xremoteclient creates both a program and an intermediate library for
libxul. The Program() template adds stdc++compat to the directory data,
which ends up being added to libxul as well. The same kind of issue arises
when linking the gtest-enabled libxul.

While eventually we'll be able to avoid those problems, it's not the case
yet, so work around the issue by making expand-libs skip .desc files that
appear multiple times.
---
 build/unix/stdc++compat/Makefile.in | 1 -
 config/expandlibs.py                | 9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build/unix/stdc++compat/Makefile.in b/build/unix/stdc++compat/Makefile.in
index 6f988a8644ea..095039de1e91 100644
--- a/build/unix/stdc++compat/Makefile.in
+++ b/build/unix/stdc++compat/Makefile.in
@@ -2,7 +2,6 @@
 # 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/.
 
-NO_EXPAND_LIBS = 1
 ENABLE_CLANG_PLUGIN :=
 
 include $(topsrcdir)/config/rules.mk
diff --git a/config/expandlibs.py b/config/expandlibs.py
index 4751235afca2..b4f35b8f6a97 100644
--- a/config/expandlibs.py
+++ b/config/expandlibs.py
@@ -104,6 +104,7 @@ class ExpandArgs(list):
         '''Creates a clone of the |args| list and performs file expansion on
         each item it contains'''
         super(ExpandArgs, self).__init__()
+        self._descs = set()
         for arg in args:
             self += self._expand(arg)
 
@@ -124,8 +125,12 @@ class ExpandArgs(list):
 
     def _expand_desc(self, arg):
         '''Internal function taking care of lib descriptor expansion only'''
-        if os.path.exists(arg + conf.LIBS_DESC_SUFFIX):
-            with open(arg + conf.LIBS_DESC_SUFFIX, 'r') as f:
+        desc = os.path.abspath(arg + conf.LIBS_DESC_SUFFIX)
+        if os.path.exists(desc):
+            if desc in self._descs:
+                return []
+            self._descs.add(desc)
+            with open(desc, 'r') as f:
                 desc = LibDescriptor(f.readlines())
             objs = [relativize(o) for o in desc['OBJS']]
             for lib in desc['LIBS']:

From 9a48b15ea53f93e2131b0cf4f2357be3a602c9c5 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 11 Sep 2014 12:20:41 +0900
Subject: [PATCH 046/109] Bug 1059255 - Make stdc++compat errors fatal. r=mshal

---
 config/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.mk b/config/config.mk
index 1d1e9c29da2d..ed85218a61af 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -667,7 +667,7 @@ EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB)
 
 ifneq (,$(MOZ_LIBSTDCXX_TARGET_VERSION)$(MOZ_LIBSTDCXX_HOST_VERSION))
 ifneq ($(OS_ARCH),Darwin)
-CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_stdcxx | We do not want these libstdc++ symbols to be used:' && $(TOOLCHAIN_PREFIX)objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && false || true
+CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -v -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null || ( echo 'TEST-UNEXPECTED-FAIL | check_stdcxx | We do not want these libstdc++ symbols to be used:' && $(TOOLCHAIN_PREFIX)objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && false)
 endif
 endif
 

From 6854b0847f7b414b9f38c445b53f636e0b5201d4 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 11 Sep 2014 12:24:44 +0900
Subject: [PATCH 047/109] Bug 1051209 - Properly link libxul.so on GTK+3 builds
 after bug 1045783. r=mshal

---
 configure.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 63846bb192d4..0af7bee73dde 100644
--- a/configure.in
+++ b/configure.in
@@ -4154,7 +4154,6 @@ cairo-gtk3)
     USE_FC_FREETYPE=1
 
     TK_CFLAGS='$(MOZ_GTK3_CFLAGS)'
-    TK_LIBS='$(MOZ_GTK3_LIBS)'
     MOZ_WIDGET_GTK=3
     AC_DEFINE_UNQUOTED(MOZ_WIDGET_GTK,$MOZ_WIDGET_GTK)
     MOZ_PDF_PRINTING=1
@@ -4267,6 +4266,10 @@ if test "$COMPILE_ENVIRONMENT"; then
   if test "$MOZ_ENABLE_GTK3"; then
     PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES)
     MOZ_GTK3_CFLAGS="-I${_topsrcdir}/widget/gtk/compat-gtk3 $MOZ_GTK3_CFLAGS"
+    dnl Contrary to MOZ_GTK2_LIBS, MOZ_GTK3_LIBS needs to be literally added to TK_LIBS instead
+    dnl of a make reference because of how TK_LIBS is mangled in toolkit/library/moz.build
+    dnl for GTK+3 builds.
+    TK_LIBS=$MOZ_GTK3_LIBS
   fi
   if test "$MOZ_ENABLE_GTK"; then
     if test "$MOZ_X11"; then

From 43e13298d11de2cc09729385179df0f94d976451 Mon Sep 17 00:00:00 2001
From: Ben Turner <bent.mozilla@gmail.com>
Date: Wed, 10 Sep 2014 20:34:41 -0700
Subject: [PATCH 048/109] Bug 1035454 - Don't send
 'Webapps:UnregisterForMessages' at xpcom-shutdown, r=fabrice.

---
 dom/apps/AppsServiceChild.jsm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dom/apps/AppsServiceChild.jsm b/dom/apps/AppsServiceChild.jsm
index 6d041c32b151..5c50652995de 100644
--- a/dom/apps/AppsServiceChild.jsm
+++ b/dom/apps/AppsServiceChild.jsm
@@ -131,9 +131,6 @@ this.DOMApplicationRegistry = {
     APPS_IPC_MSG_NAMES.forEach((aMsgName) => {
       this.cpmm.removeMessageListener(aMsgName, this);
     });
-
-    this.cpmm.sendAsyncMessage("Webapps:UnregisterForMessages",
-                               APPS_IPC_MSG_NAMES)
   },
 
   receiveMessage: function receiveMessage(aMessage) {

From 2c3997d15c577b0596c309f25b4c6345599fe483 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Thu, 11 Sep 2014 12:41:15 +0900
Subject: [PATCH 049/109] Bug 1059643 nsIMM32Handler should handle
 NOTIFY_IME_OF_MOUSE_BUTTON_EVENT r=emk

---
 widget/windows/WinIMEHandler.cpp  |   2 +
 widget/windows/nsIMM32Handler.cpp | 103 +++++++++++++++++-------------
 widget/windows/nsIMM32Handler.h   |   8 ++-
 3 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/widget/windows/WinIMEHandler.cpp b/widget/windows/WinIMEHandler.cpp
index 6c489e7064a4..35bbced25fb8 100644
--- a/widget/windows/WinIMEHandler.cpp
+++ b/widget/windows/WinIMEHandler.cpp
@@ -204,6 +204,8 @@ IMEHandler::NotifyIME(nsWindow* aWindow,
     case NOTIFY_IME_OF_COMPOSITION_UPDATE:
       nsIMM32Handler::OnUpdateComposition(aWindow);
       return NS_OK;
+    case NOTIFY_IME_OF_MOUSE_BUTTON_EVENT:
+      return nsIMM32Handler::OnMouseButtonEvent(aWindow, aIMENotification);
 #ifdef NS_ENABLE_TSF
     case NOTIFY_IME_OF_BLUR:
       // If a plugin gets focus while TSF has focus, we need to notify TSF of
diff --git a/widget/windows/nsIMM32Handler.cpp b/widget/windows/nsIMM32Handler.cpp
index 33a747b51d80..2fd5ac354994 100644
--- a/widget/windows/nsIMM32Handler.cpp
+++ b/widget/windows/nsIMM32Handler.cpp
@@ -142,7 +142,9 @@ nsIMM32Handler::GetKeyboardCodePage()
 nsIMEUpdatePreference
 nsIMM32Handler::GetIMEUpdatePreference()
 {
-  return nsIMEUpdatePreference(nsIMEUpdatePreference::NOTIFY_POSITION_CHANGE);
+  return nsIMEUpdatePreference(
+    nsIMEUpdatePreference::NOTIFY_POSITION_CHANGE |
+    nsIMEUpdatePreference::NOTIFY_MOUSE_BUTTON_EVENT_ON_CHAR);
 }
 
 // used for checking the lParam of WM_IME_COMPOSITION
@@ -303,18 +305,6 @@ nsIMM32Handler::ProcessMessage(nsWindow* aWindow, UINT msg,
 
   aResult.mResult = 0;
   switch (msg) {
-    case WM_LBUTTONDOWN:
-    case WM_MBUTTONDOWN:
-    case WM_RBUTTONDOWN: {
-      // We don't need to create the instance of the handler here.
-      if (!gIMM32Handler) {
-        return false;
-      }
-      return gIMM32Handler->OnMouseEvent(aWindow, lParam,
-                              msg == WM_LBUTTONDOWN ? IMEMOUSE_LDOWN :
-                              msg == WM_MBUTTONDOWN ? IMEMOUSE_MDOWN :
-                                                      IMEMOUSE_RDOWN, aResult);
-    }
     case WM_INPUTLANGCHANGE:
       return ProcessInputLangChangeMessage(aWindow, wParam, lParam, aResult);
     case WM_IME_STARTCOMPOSITION:
@@ -2045,37 +2035,60 @@ nsIMM32Handler::ResolveIMECaretPos(nsIWidget* aReferenceWidget,
     aOutRect.MoveBy(-aNewOriginWidget->WidgetToScreenOffset());
 }
 
-bool
-nsIMM32Handler::OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction,
-                             MSGResult& aResult)
+/* static */ nsresult
+nsIMM32Handler::OnMouseButtonEvent(nsWindow* aWindow,
+                                   const IMENotification& aIMENotification)
 {
-  aResult.mConsumed = false; // always call next wndprc
-
-  if (!sWM_MSIME_MOUSE || !mIsComposing ||
-      !ShouldDrawCompositionStringOurselves()) {
-    return false;
+  // We don't need to create the instance of the handler here.
+  if (!gIMM32Handler) {
+    return NS_OK;
   }
 
-  nsIntPoint cursor(LOWORD(lParam), HIWORD(lParam));
-  WidgetQueryContentEvent charAtPt(true, NS_QUERY_CHARACTER_AT_POINT, aWindow);
-  aWindow->InitEvent(charAtPt, &cursor);
-  aWindow->DispatchWindowEvent(&charAtPt);
-  if (!charAtPt.mSucceeded ||
-      charAtPt.mReply.mOffset == WidgetQueryContentEvent::NOT_FOUND ||
-      charAtPt.mReply.mOffset < mCompositionStart ||
-      charAtPt.mReply.mOffset >
-        mCompositionStart + mCompositionString.Length()) {
-    return false;
+  if (!sWM_MSIME_MOUSE || !IsComposingOnOurEditor() ||
+      !ShouldDrawCompositionStringOurselves()) {
+    return NS_OK;
+  }
+
+  // We need to handle only mousedown event.
+  if (aIMENotification.mMouseButtonEventData.mEventMessage !=
+        NS_MOUSE_BUTTON_DOWN) {
+    return NS_OK;
+  }
+
+  // If the character under the cursor is not in the composition string,
+  // we don't need to notify IME of it.
+  uint32_t compositionStart = gIMM32Handler->mCompositionStart;
+  uint32_t compositionEnd =
+    compositionStart + gIMM32Handler->mCompositionString.Length();
+  if (aIMENotification.mMouseButtonEventData.mOffset < compositionStart ||
+      aIMENotification.mMouseButtonEventData.mOffset >= compositionEnd) {
+    return NS_OK;
+  }
+
+  BYTE button;
+  switch (aIMENotification.mMouseButtonEventData.mButton) {
+    case WidgetMouseEventBase::eLeftButton:
+      button = IMEMOUSE_LDOWN;
+      break;
+    case WidgetMouseEventBase::eMiddleButton:
+      button = IMEMOUSE_MDOWN;
+      break;
+    case WidgetMouseEventBase::eRightButton:
+      button = IMEMOUSE_RDOWN;
+      break;
+    default:
+      return NS_OK;
   }
 
   // calcurate positioning and offset
   // char :            JCH1|JCH2|JCH3
   // offset:           0011 1122 2233
   // positioning:      2301 2301 2301
-  nsIntRect cursorInTopLevel, cursorRect(cursor, nsIntSize(0, 0));
-  ResolveIMECaretPos(aWindow, cursorRect,
-                     aWindow->GetTopLevelWindow(false), cursorInTopLevel);
-  int32_t cursorXInChar = cursorInTopLevel.x - charAtPt.mReply.mRect.x;
+  nsIntPoint cursorPos =
+    aIMENotification.mMouseButtonEventData.mCursorPos.AsIntPoint();
+  nsIntRect charRect =
+    aIMENotification.mMouseButtonEventData.mCharRect.AsIntRect();
+  int32_t cursorXInChar = cursorPos.x - charRect.x;
   // The event might hit to zero-width character, see bug 694913.
   // The reason might be:
   // * There are some zero-width characters are actually.
@@ -2084,26 +2097,30 @@ nsIMM32Handler::OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction,
   // We should assume that user clicked on right most of the zero-width
   // character in such case.
   int positioning = 1;
-  if (charAtPt.mReply.mRect.width > 0) {
-    positioning = cursorXInChar * 4 / charAtPt.mReply.mRect.width;
+  if (charRect.width > 0) {
+    positioning = cursorXInChar * 4 / charRect.width;
     positioning = (positioning + 2) % 4;
   }
 
-  int offset = charAtPt.mReply.mOffset - mCompositionStart;
+  int offset =
+    aIMENotification.mMouseButtonEventData.mOffset - compositionStart;
   if (positioning < 2) {
     offset++;
   }
 
   PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
-    ("IMM32: OnMouseEvent, x,y=%ld,%ld, offset=%ld, positioning=%ld\n",
-     cursor.x, cursor.y, offset, positioning));
+    ("IMM32: OnMouseButtonEvent, x,y=%ld,%ld, offset=%ld, positioning=%ld\n",
+     cursorPos.x, cursorPos.y, offset, positioning));
 
   // send MS_MSIME_MOUSE message to default IME window.
   HWND imeWnd = ::ImmGetDefaultIMEWnd(aWindow->GetWindowHandle());
   nsIMEContext IMEContext(aWindow->GetWindowHandle());
-  return ::SendMessageW(imeWnd, sWM_MSIME_MOUSE,
-                        MAKELONG(MAKEWORD(aAction, positioning), offset),
-                        (LPARAM) IMEContext.get()) == 1;
+  if (::SendMessageW(imeWnd, sWM_MSIME_MOUSE,
+                     MAKELONG(MAKEWORD(button, positioning), offset),
+                     (LPARAM) IMEContext.get()) == 1) {
+    return NS_SUCCESS_EVENT_CONSUMED;
+  }
+  return NS_OK;
 }
 
 /* static */ bool
diff --git a/widget/windows/nsIMM32Handler.h b/widget/windows/nsIMM32Handler.h
index 656a1bdde4a2..b3a054d44c04 100644
--- a/widget/windows/nsIMM32Handler.h
+++ b/widget/windows/nsIMM32Handler.h
@@ -110,6 +110,7 @@ protected:
 
 class nsIMM32Handler
 {
+  typedef mozilla::widget::IMENotification IMENotification;
   typedef mozilla::widget::MSGResult MSGResult;
 public:
   static void Initialize();
@@ -145,6 +146,11 @@ public:
 
   static nsIMEUpdatePreference GetIMEUpdatePreference();
 
+  // Returns NS_SUCCESS_EVENT_CONSUMED if the mouse button event is consumed by
+  // IME.  Otherwise, NS_OK.
+  static nsresult OnMouseButtonEvent(nsWindow* aWindow,
+                                     const IMENotification& aIMENotification);
+
 protected:
   static void EnsureHandlerInstance();
 
@@ -176,8 +182,6 @@ protected:
 
   // On*() methods return true if the caller of message handler shouldn't do
   // anything anymore.  Otherwise, false.
-  bool OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction,
-                    MSGResult& aResult);
   static bool OnKeyDownEvent(nsWindow* aWindow, WPARAM wParam, LPARAM lParam,
                              MSGResult& aResult);
 

From 2c80ff7fe91d55b5e5a68da07228a5a3e73d9746 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Thu, 11 Sep 2014 12:56:09 +0900
Subject: [PATCH 050/109] Bug 1062053 part.1 nsTextStore should use
 StaticRefPtr for storing COM objects r=jimm

---
 widget/tests/TestWinTSF.cpp    |   2 +
 widget/windows/nsTextStore.cpp | 105 ++++++++++++++++-----------------
 widget/windows/nsTextStore.h   |  28 +++++----
 3 files changed, 69 insertions(+), 66 deletions(-)

diff --git a/widget/tests/TestWinTSF.cpp b/widget/tests/TestWinTSF.cpp
index 14f4809009fd..db0701127a53 100644
--- a/widget/tests/TestWinTSF.cpp
+++ b/widget/tests/TestWinTSF.cpp
@@ -1476,6 +1476,8 @@ TestApp::Init(void)
   nsresult rv = baseWindow->GetMainWidget(getter_AddRefs(widget));
   NS_ENSURE_TRUE(widget, NS_ERROR_UNEXPECTED);
 
+  static_assert(false,
+    "GetNativeData() returns pointer to StaticRefPtr<>, fix here for it");
   ITfThreadMgr **threadMgr = reinterpret_cast<ITfThreadMgr**>(
       widget->GetNativeData(NS_NATIVE_TSF_THREAD_MGR));
   if (!threadMgr) {
diff --git a/widget/windows/nsTextStore.cpp b/widget/windows/nsTextStore.cpp
index 907a47185b1f..02505c881d5a 100644
--- a/widget/windows/nsTextStore.cpp
+++ b/widget/windows/nsTextStore.cpp
@@ -705,7 +705,7 @@ public:
   static TSFStaticSink* GetInstance()
   {
     if (!sInstance) {
-      NS_ADDREF(sInstance = new TSFStaticSink());
+      sInstance = new TSFStaticSink();
     }
     return sInstance;
   }
@@ -714,7 +714,7 @@ public:
   {
     if (sInstance) {
       sInstance->Destroy();
-      NS_RELEASE(sInstance);
+      sInstance = nullptr;
     }
   }
 
@@ -794,10 +794,10 @@ private:
   // i.e., IMM-IME or just a keyboard layout, this is empty.
   nsString mActiveTIPKeyboardDescription;
 
-  static TSFStaticSink* sInstance;
+  static StaticRefPtr<TSFStaticSink> sInstance;
 };
 
-TSFStaticSink* TSFStaticSink::sInstance = nullptr;
+StaticRefPtr<TSFStaticSink> TSFStaticSink::sInstance;
 
 TSFStaticSink::TSFStaticSink()
   : mIPProfileCookie(TF_INVALID_COOKIE)
@@ -1141,14 +1141,14 @@ TSFStaticSink::IsTIPCategoryKeyboard(REFCLSID aTextService, LANGID aLangID,
 /* nsTextStore                                                    */
 /******************************************************************/
 
-ITfThreadMgr*           nsTextStore::sTsfThreadMgr   = nullptr;
-ITfMessagePump*         nsTextStore::sMessagePump    = nullptr;
-ITfKeystrokeMgr*        nsTextStore::sKeystrokeMgr   = nullptr;
-ITfDisplayAttributeMgr* nsTextStore::sDisplayAttrMgr = nullptr;
-ITfCategoryMgr*         nsTextStore::sCategoryMgr    = nullptr;
-ITfDocumentMgr*         nsTextStore::sTsfDisabledDocumentMgr = nullptr;
-ITfContext*             nsTextStore::sTsfDisabledContext = nullptr;
-ITfInputProcessorProfiles* nsTextStore::sInputProcessorProfiles = nullptr;
+StaticRefPtr<ITfThreadMgr> nsTextStore::sThreadMgr;
+StaticRefPtr<ITfMessagePump> nsTextStore::sMessagePump;
+StaticRefPtr<ITfKeystrokeMgr> nsTextStore::sKeystrokeMgr;
+StaticRefPtr<ITfDisplayAttributeMgr> nsTextStore::sDisplayAttrMgr;
+StaticRefPtr<ITfCategoryMgr> nsTextStore::sCategoryMgr;
+StaticRefPtr<ITfDocumentMgr> nsTextStore::sDisabledDocumentMgr;
+StaticRefPtr<ITfContext> nsTextStore::sDisabledContext;
+StaticRefPtr<ITfInputProcessorProfiles> nsTextStore::sInputProcessorProfiles;
 DWORD         nsTextStore::sTsfClientId  = 0;
 StaticRefPtr<nsTextStore> nsTextStore::sEnabledTextStore;
 
@@ -1214,8 +1214,7 @@ nsTextStore::Init(nsWindowBase* aWidget)
   }
 
   // Create document manager
-  HRESULT hr = sTsfThreadMgr->CreateDocumentMgr(
-                                  getter_AddRefs(mDocumentMgr));
+  HRESULT hr = sThreadMgr->CreateDocumentMgr(getter_AddRefs(mDocumentMgr));
   if (FAILED(hr)) {
     PR_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF: 0x%p   nsTextStore::Init() FAILED to create DocumentMgr "
@@ -3931,11 +3930,11 @@ nsTextStore::OnFocusChange(bool aGotFocus,
          ("TSF:   nsTextStore::OnFocusChange(aGotFocus=%s, "
           "aFocusedWidget=0x%p, aContext={ mIMEState={ mEnabled=%s }, "
           "mHTMLInputType=\"%s\" }), "
-          "sTsfThreadMgr=0x%p, sEnabledTextStore=0x%p",
+          "sThreadMgr=0x%p, sEnabledTextStore=0x%p",
           GetBoolName(aGotFocus), aFocusedWidget,
           GetIMEEnabledName(aContext.mIMEState.mEnabled),
           NS_ConvertUTF16toUTF8(aContext.mHTMLInputType).get(),
-          sTsfThreadMgr, sEnabledTextStore));
+          sThreadMgr.get(), sEnabledTextStore.get()));
 
   if (NS_WARN_IF(!IsInTSFMode())) {
     return NS_ERROR_NOT_AVAILABLE;
@@ -3945,7 +3944,7 @@ nsTextStore::OnFocusChange(bool aGotFocus,
   if (ThinksHavingFocus()) {
     nsRefPtr<ITfDocumentMgr> prevFocusedDocumentMgr;
     DebugOnly<HRESULT> hr =
-      sTsfThreadMgr->AssociateFocus(
+      sThreadMgr->AssociateFocus(
         sEnabledTextStore->mWidget->GetWindowHandle(),
         nullptr, getter_AddRefs(prevFocusedDocumentMgr));
     NS_ASSERTION(SUCCEEDED(hr), "Disassociating focus failed");
@@ -3957,13 +3956,13 @@ nsTextStore::OnFocusChange(bool aGotFocus,
   // Release it now.
   if (sEnabledTextStore) {
     sEnabledTextStore->Destroy();
-    NS_RELEASE(sEnabledTextStore);
+    sEnabledTextStore = nullptr;
   }
 
   // If this is a notification of blur, move focus to the dummy document
   // manager.
   if (!aGotFocus || !aContext.mIMEState.IsEditable()) {
-    HRESULT hr = sTsfThreadMgr->SetFocus(sTsfDisabledDocumentMgr);
+    HRESULT hr = sThreadMgr->SetFocus(sDisabledDocumentMgr);
     if (NS_WARN_IF(FAILED(hr))) {
       PR_LOG(sTextStoreLog, PR_LOG_ERROR,
              ("TSF:   nsTextStore::OnFocusChange() FAILED due to "
@@ -3982,7 +3981,7 @@ nsTextStore::OnFocusChange(bool aGotFocus,
     // it causes memory leak.
     if (sEnabledTextStore) {
       sEnabledTextStore->Destroy();
-      NS_RELEASE(sEnabledTextStore);
+      sEnabledTextStore = nullptr;
     }
     return NS_ERROR_FAILURE;
   }
@@ -3997,7 +3996,7 @@ nsTextStore::CreateAndSetFocus(nsWindowBase* aFocusedWidget,
   // TSF might do something which causes that we need to access static methods
   // of nsTextStore.  At that time, sEnabledTextStore may be necessary.
   // So, we should set sEnabledTextStore directly.
-  NS_ADDREF(sEnabledTextStore = new nsTextStore());
+  sEnabledTextStore = new nsTextStore();
   if (NS_WARN_IF(!sEnabledTextStore->Init(aFocusedWidget))) {
     PR_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF:   nsTextStore::CreateAndSetFocus() FAILED due to "
@@ -4018,7 +4017,7 @@ nsTextStore::CreateAndSetFocus(nsWindowBase* aFocusedWidget,
       MarkContextAsKeyboardDisabled(topContext);
     }
   }
-  HRESULT hr = sTsfThreadMgr->SetFocus(sEnabledTextStore->mDocumentMgr);
+  HRESULT hr = sThreadMgr->SetFocus(sEnabledTextStore->mDocumentMgr);
   if (NS_WARN_IF(FAILED(hr))) {
     PR_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF:   nsTextStore::CreateAndSetFocus() FAILED due to "
@@ -4028,9 +4027,9 @@ nsTextStore::CreateAndSetFocus(nsWindowBase* aFocusedWidget,
   // Use AssociateFocus() for ensuring that any native focus event
   // never steal focus from our documentMgr.
   nsRefPtr<ITfDocumentMgr> prevFocusedDocumentMgr;
-  hr = sTsfThreadMgr->AssociateFocus(aFocusedWidget->GetWindowHandle(),
-                                     sEnabledTextStore->mDocumentMgr,
-                                     getter_AddRefs(prevFocusedDocumentMgr));
+  hr = sThreadMgr->AssociateFocus(aFocusedWidget->GetWindowHandle(),
+                                  sEnabledTextStore->mDocumentMgr,
+                                  getter_AddRefs(prevFocusedDocumentMgr));
   if (NS_WARN_IF(FAILED(hr))) {
     PR_LOG(sTextStoreLog, PR_LOG_ERROR,
            ("TSF:   nsTextStore::CreateAndSetFocus() FAILED due to "
@@ -4045,9 +4044,9 @@ nsTextStore::CreateAndSetFocus(nsWindowBase* aFocusedWidget,
 nsIMEUpdatePreference
 nsTextStore::GetIMEUpdatePreference()
 {
-  if (sTsfThreadMgr && sEnabledTextStore && sEnabledTextStore->mDocumentMgr) {
+  if (sThreadMgr && sEnabledTextStore && sEnabledTextStore->mDocumentMgr) {
     nsRefPtr<ITfDocumentMgr> docMgr;
-    sTsfThreadMgr->GetFocus(getter_AddRefs(docMgr));
+    sThreadMgr->GetFocus(getter_AddRefs(docMgr));
     if (docMgr == sEnabledTextStore->mDocumentMgr) {
       nsIMEUpdatePreference updatePreference(
         nsIMEUpdatePreference::NOTIFY_SELECTION_CHANGE |
@@ -4400,7 +4399,7 @@ nsTextStore::SetIMEOpenState(bool aState)
          ("TSF: nsTextStore::SetIMEOpenState(aState=%s)", GetBoolName(aState)));
 
   nsRefPtr<ITfCompartment> comp;
-  if (!GetCompartment(sTsfThreadMgr,
+  if (!GetCompartment(sThreadMgr,
                       GUID_COMPARTMENT_KEYBOARD_OPENCLOSE,
                       getter_AddRefs(comp))) {
     PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
@@ -4424,7 +4423,7 @@ bool
 nsTextStore::GetIMEOpenState(void)
 {
   nsRefPtr<ITfCompartment> comp;
-  if (!GetCompartment(sTsfThreadMgr,
+  if (!GetCompartment(sThreadMgr,
                       GUID_COMPARTMENT_KEYBOARD_OPENCLOSE,
                       getter_AddRefs(comp)))
     return false;
@@ -4449,7 +4448,7 @@ nsTextStore::SetInputContext(nsWindowBase* aWidget,
           "aContext.mIMEState.mEnabled=%s, aAction.mFocusChange=%s), "
           "sEnabledTextStore=0x%p, ThinksHavingFocus()=%s",
           aWidget, GetIMEEnabledName(aContext.mIMEState.mEnabled),
-          GetFocusChangeName(aAction.mFocusChange), sEnabledTextStore,
+          GetFocusChangeName(aAction.mFocusChange), sEnabledTextStore.get(),
           GetBoolName(ThinksHavingFocus())));
 
   NS_ENSURE_TRUE_VOID(IsInTSFMode());
@@ -4532,7 +4531,7 @@ nsTextStore::Initialize()
   PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF: nsTextStore::Initialize() is called..."));
 
-  if (sTsfThreadMgr) {
+  if (sThreadMgr) {
     PR_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED due to already initialized"));
     return;
@@ -4661,14 +4660,14 @@ nsTextStore::Initialize()
     return;
   }
 
-  inputProcessorProfiles.swap(sInputProcessorProfiles);
-  threadMgr.swap(sTsfThreadMgr);
-  messagePump.swap(sMessagePump);
-  keystrokeMgr.swap(sKeystrokeMgr);
-  displayAttributeMgr.swap(sDisplayAttrMgr);
-  categoryMgr.swap(sCategoryMgr);
-  disabledDocumentMgr.swap(sTsfDisabledDocumentMgr);
-  disabledContext.swap(sTsfDisabledContext);
+  sInputProcessorProfiles = inputProcessorProfiles;
+  sThreadMgr = threadMgr;
+  sMessagePump = messagePump;
+  sKeystrokeMgr = keystrokeMgr;
+  sDisplayAttrMgr = displayAttributeMgr;
+  sCategoryMgr = categoryMgr;
+  sDisabledDocumentMgr = disabledDocumentMgr;
+  sDisabledContext = disabledContext;
 
   sCreateNativeCaretForATOK =
     Preferences::GetBool("intl.tsf.hack.atok.create_native_caret", true);
@@ -4680,14 +4679,14 @@ nsTextStore::Initialize()
       "intl.tsf.hack.easy_changjei.do_not_return_no_layout_error", true);
 
   PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
-    ("TSF:   nsTextStore::Initialize(), sTsfThreadMgr=0x%p, "
+    ("TSF:   nsTextStore::Initialize(), sThreadMgr=0x%p, "
      "sTsfClientId=0x%08X, sDisplayAttrMgr=0x%p, "
-     "sCategoryMgr=0x%p, sTsfDisabledDocumentMgr=0x%p, sTsfDisabledContext=%p, "
+     "sCategoryMgr=0x%p, sDisabledDocumentMgr=0x%p, sDisabledContext=%p, "
      "sCreateNativeCaretForATOK=%s, "
      "sDoNotReturnNoLayoutErrorToFreeChangJie=%s, "
      "sDoNotReturnNoLayoutErrorToEasyChangjei=%s",
-     sTsfThreadMgr, sTsfClientId, sDisplayAttrMgr,
-     sCategoryMgr, sTsfDisabledDocumentMgr, sTsfDisabledContext,
+     sThreadMgr.get(), sTsfClientId, sDisplayAttrMgr.get(),
+     sCategoryMgr.get(), sDisabledDocumentMgr.get(), sDisabledContext.get(),
      GetBoolName(sCreateNativeCaretForATOK),
      GetBoolName(sDoNotReturnNoLayoutErrorToFreeChangJie),
      GetBoolName(sDoNotReturnNoLayoutErrorToEasyChangjei)));
@@ -4701,18 +4700,18 @@ nsTextStore::Terminate(void)
 
   TSFStaticSink::Shutdown();
 
-  NS_IF_RELEASE(sDisplayAttrMgr);
-  NS_IF_RELEASE(sCategoryMgr);
+  sDisplayAttrMgr = nullptr;
+  sCategoryMgr = nullptr;
   sEnabledTextStore = nullptr;
-  NS_IF_RELEASE(sTsfDisabledDocumentMgr);
-  NS_IF_RELEASE(sTsfDisabledContext);
-  NS_IF_RELEASE(sInputProcessorProfiles);
+  sDisabledDocumentMgr = nullptr;
+  sDisabledContext = nullptr;
+  sInputProcessorProfiles = nullptr;
   sTsfClientId = 0;
-  if (sTsfThreadMgr) {
-    sTsfThreadMgr->Deactivate();
-    NS_RELEASE(sTsfThreadMgr);
-    NS_RELEASE(sMessagePump);
-    NS_RELEASE(sKeystrokeMgr);
+  if (sThreadMgr) {
+    sThreadMgr->Deactivate();
+    sThreadMgr = nullptr;
+    sMessagePump = nullptr;
+    sKeystrokeMgr = nullptr;
   }
 }
 
diff --git a/widget/windows/nsTextStore.h b/widget/windows/nsTextStore.h
index d6782f3385a6..b3151abf269b 100644
--- a/widget/windows/nsTextStore.h
+++ b/widget/windows/nsTextStore.h
@@ -170,12 +170,13 @@ public:
 
   // Returns the address of the pointer so that the TSF automatic test can
   // replace the system object with a custom implementation for testing.
+  // XXX TSF doesn't work now.  Should we remove it?
   static void* GetNativeData(uint32_t aDataType)
   {
     switch (aDataType) {
       case NS_NATIVE_TSF_THREAD_MGR:
         Initialize(); // Apply any previous changes
-        return static_cast<void*>(&sTsfThreadMgr);
+        return static_cast<void*>(&sThreadMgr);
       case NS_NATIVE_TSF_CATEGORY_MGR:
         return static_cast<void*>(&sCategoryMgr);
       case NS_NATIVE_TSF_DISPLAY_ATTR_MGR:
@@ -192,7 +193,7 @@ public:
 
   static void* GetThreadManager()
   {
-    return static_cast<void*>(sTsfThreadMgr);
+    return static_cast<void*>(sThreadMgr);
   }
 
   static bool ThinksHavingFocus()
@@ -202,7 +203,7 @@ public:
 
   static bool IsInTSFMode()
   {
-    return sTsfThreadMgr != nullptr;
+    return sThreadMgr != nullptr;
   }
 
   static bool IsComposing()
@@ -739,15 +740,15 @@ protected:
   bool                         mNativeCaretIsCreated;
 
   // TSF thread manager object for the current application
-  static ITfThreadMgr*  sTsfThreadMgr;
-  // sMessagePump is QI'ed from sTsfThreadMgr
-  static ITfMessagePump* sMessagePump;
-  // sKeystrokeMgr is QI'ed from sTsfThreadMgr
-  static ITfKeystrokeMgr* sKeystrokeMgr;
+  static mozilla::StaticRefPtr<ITfThreadMgr> sThreadMgr;
+  // sMessagePump is QI'ed from sThreadMgr
+  static mozilla::StaticRefPtr<ITfMessagePump> sMessagePump;
+  // sKeystrokeMgr is QI'ed from sThreadMgr
+  static mozilla::StaticRefPtr<ITfKeystrokeMgr> sKeystrokeMgr;
   // TSF display attribute manager
-  static ITfDisplayAttributeMgr* sDisplayAttrMgr;
+  static mozilla::StaticRefPtr<ITfDisplayAttributeMgr> sDisplayAttrMgr;
   // TSF category manager
-  static ITfCategoryMgr* sCategoryMgr;
+  static mozilla::StaticRefPtr<ITfCategoryMgr> sCategoryMgr;
 
   // TSF client ID for the current application
   static DWORD          sTsfClientId;
@@ -758,10 +759,11 @@ protected:
   static mozilla::StaticRefPtr<nsTextStore> sEnabledTextStore;
 
   // For IME (keyboard) disabled state:
-  static ITfDocumentMgr* sTsfDisabledDocumentMgr;
-  static ITfContext* sTsfDisabledContext;
+  static mozilla::StaticRefPtr<ITfDocumentMgr> sDisabledDocumentMgr;
+  static mozilla::StaticRefPtr<ITfContext> sDisabledContext;
 
-  static ITfInputProcessorProfiles* sInputProcessorProfiles;
+  static mozilla::StaticRefPtr<ITfInputProcessorProfiles>
+    sInputProcessorProfiles;
 
   // Enables/Disables hack for specific TIP.
   static bool sCreateNativeCaretForATOK;

From 2108b341e9182a3003dc80513193b7f7928de9ec Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Thu, 11 Sep 2014 12:56:10 +0900
Subject: [PATCH 051/109] Bug 1062053 part.2 Rename nsTextStore::sTsfClientId
 to nsTextStore::sClientId r=jimm

---
 widget/windows/nsTextStore.cpp | 20 ++++++++++----------
 widget/windows/nsTextStore.h   |  5 +++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/widget/windows/nsTextStore.cpp b/widget/windows/nsTextStore.cpp
index 02505c881d5a..d5f2c21dfd0e 100644
--- a/widget/windows/nsTextStore.cpp
+++ b/widget/windows/nsTextStore.cpp
@@ -1149,8 +1149,8 @@ StaticRefPtr<ITfCategoryMgr> nsTextStore::sCategoryMgr;
 StaticRefPtr<ITfDocumentMgr> nsTextStore::sDisabledDocumentMgr;
 StaticRefPtr<ITfContext> nsTextStore::sDisabledContext;
 StaticRefPtr<ITfInputProcessorProfiles> nsTextStore::sInputProcessorProfiles;
-DWORD         nsTextStore::sTsfClientId  = 0;
 StaticRefPtr<nsTextStore> nsTextStore::sEnabledTextStore;
+DWORD nsTextStore::sClientId  = 0;
 
 bool nsTextStore::sCreateNativeCaretForATOK = false;
 bool nsTextStore::sDoNotReturnNoLayoutErrorToFreeChangJie = false;
@@ -1224,7 +1224,7 @@ nsTextStore::Init(nsWindowBase* aWidget)
   mWidget = aWidget;
 
   // Create context and add it to document manager
-  hr = mDocumentMgr->CreateContext(sTsfClientId, 0,
+  hr = mDocumentMgr->CreateContext(sClientId, 0,
                                    static_cast<ITextStoreACP*>(this),
                                    getter_AddRefs(mContext), &mEditCookie);
   if (FAILED(hr)) {
@@ -4415,7 +4415,7 @@ nsTextStore::SetIMEOpenState(bool aState)
          ("TSF:   nsTextStore::SetIMEOpenState(), setting "
           "0x%04X to GUID_COMPARTMENT_KEYBOARD_OPENCLOSE...",
           variant.lVal));
-  comp->SetValue(sTsfClientId, &variant);
+  comp->SetValue(sClientId, &variant);
 }
 
 // static
@@ -4491,7 +4491,7 @@ nsTextStore::MarkContextAsKeyboardDisabled(ITfContext* aContext)
          ("TSF: nsTextStore::MarkContextAsKeyboardDisabled(), setting "
           "to disable context 0x%p...",
           aContext));
-  comp->SetValue(sTsfClientId, &variant_int4_value1);
+  comp->SetValue(sClientId, &variant_int4_value1);
 }
 
 // static
@@ -4515,7 +4515,7 @@ nsTextStore::MarkContextAsEmpty(ITfContext* aContext)
   PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
          ("TSF: nsTextStore::MarkContextAsEmpty(), setting "
           "to mark empty context 0x%p...", aContext));
-  comp->SetValue(sTsfClientId, &variant_int4_value1);
+  comp->SetValue(sClientId, &variant_int4_value1);
 }
 
 // static
@@ -4595,7 +4595,7 @@ nsTextStore::Initialize()
     return;
   }
 
-  hr = threadMgr->Activate(&sTsfClientId);
+  hr = threadMgr->Activate(&sClientId);
   if (FAILED(hr)) {
     PR_LOG(sTextStoreLog, PR_LOG_ERROR,
       ("TSF:   nsTextStore::Initialize() FAILED to activate, hr=0x%08X", hr));
@@ -4635,7 +4635,7 @@ nsTextStore::Initialize()
 
   nsRefPtr<ITfContext> disabledContext;
   DWORD editCookie = 0;
-  hr = disabledDocumentMgr->CreateContext(sTsfClientId, 0, nullptr,
+  hr = disabledDocumentMgr->CreateContext(sClientId, 0, nullptr,
                                           getter_AddRefs(disabledContext),
                                           &editCookie);
   if (FAILED(hr) || !disabledContext) {
@@ -4680,12 +4680,12 @@ nsTextStore::Initialize()
 
   PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
     ("TSF:   nsTextStore::Initialize(), sThreadMgr=0x%p, "
-     "sTsfClientId=0x%08X, sDisplayAttrMgr=0x%p, "
+     "sClientId=0x%08X, sDisplayAttrMgr=0x%p, "
      "sCategoryMgr=0x%p, sDisabledDocumentMgr=0x%p, sDisabledContext=%p, "
      "sCreateNativeCaretForATOK=%s, "
      "sDoNotReturnNoLayoutErrorToFreeChangJie=%s, "
      "sDoNotReturnNoLayoutErrorToEasyChangjei=%s",
-     sThreadMgr.get(), sTsfClientId, sDisplayAttrMgr.get(),
+     sThreadMgr.get(), sClientId, sDisplayAttrMgr.get(),
      sCategoryMgr.get(), sDisabledDocumentMgr.get(), sDisabledContext.get(),
      GetBoolName(sCreateNativeCaretForATOK),
      GetBoolName(sDoNotReturnNoLayoutErrorToFreeChangJie),
@@ -4706,7 +4706,7 @@ nsTextStore::Terminate(void)
   sDisabledDocumentMgr = nullptr;
   sDisabledContext = nullptr;
   sInputProcessorProfiles = nullptr;
-  sTsfClientId = 0;
+  sClientId = 0;
   if (sThreadMgr) {
     sThreadMgr->Deactivate();
     sThreadMgr = nullptr;
diff --git a/widget/windows/nsTextStore.h b/widget/windows/nsTextStore.h
index b3151abf269b..a3357666e68b 100644
--- a/widget/windows/nsTextStore.h
+++ b/widget/windows/nsTextStore.h
@@ -750,8 +750,6 @@ protected:
   // TSF category manager
   static mozilla::StaticRefPtr<ITfCategoryMgr> sCategoryMgr;
 
-  // TSF client ID for the current application
-  static DWORD          sTsfClientId;
   // Current text store which is managing a keyboard enabled editor (i.e.,
   // editable editor).  Currently only ONE nsTextStore instance is ever used,
   // although Create is called when an editor is focused and Destroy called
@@ -765,6 +763,9 @@ protected:
   static mozilla::StaticRefPtr<ITfInputProcessorProfiles>
     sInputProcessorProfiles;
 
+  // TSF client ID for the current application
+  static DWORD sClientId;
+
   // Enables/Disables hack for specific TIP.
   static bool sCreateNativeCaretForATOK;
   static bool sDoNotReturnNoLayoutErrorToFreeChangJie;

From ba9a83adedce80e906f183c317455ba242487417 Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Thu, 11 Sep 2014 15:57:32 +1200
Subject: [PATCH 052/109] Bug 1062514 - Fix range handling for regular MP4 with
 b-frames; r=rillian

---
 .../media/libstagefright/MPEG4Extractor.cpp   | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
index ef77d2f0c5d9..56a261f4a615 100644
--- a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
@@ -3724,6 +3724,12 @@ status_t MPEG4Source::fragmentedRead(
     }
 }
 
+static int compositionOrder(MediaSource::Indice* const* indice0,
+        MediaSource::Indice* const* indice1)
+{
+  return (*indice0)->start_composition - (*indice1)->start_composition;
+}
+
 Vector<MediaSource::Indice> MPEG4Source::exportIndex()
 {
   Vector<Indice> index;
@@ -3748,12 +3754,31 @@ Vector<MediaSource::Indice> MPEG4Source::exportIndex()
       Indice indice;
       indice.start_offset = offset;
       indice.end_offset = offset + size;
-      indice.start_composition = (compositionTime * 1000000ll) / mTimescale,
+      indice.start_composition = (compositionTime * 1000000ll) / mTimescale;
+      // end_composition is overwritten everywhere except the last frame, where
+      // the presentation duration is equal to the sample duration.
       indice.end_composition = ((compositionTime + duration) * 1000000ll) /
               mTimescale;
       indice.sync = isSyncSample;
       index.add(indice);
   }
+
+  // Fix up composition durations so we don't end up with any unsightly gaps.
+  if (index.size() != 0) {
+      Indice* array = index.editArray();
+      Vector<Indice*> composition_order;
+      composition_order.reserve(index.size());
+      for (uint32_t i = 0; i < index.size(); i++) {
+          composition_order.add(&array[i]);
+      }
+
+      composition_order.sort(compositionOrder);
+      for (uint32_t i = 0; i + 1 < composition_order.size(); i++) {
+        composition_order[i]->end_composition =
+                composition_order[i + 1]->start_composition;
+      }
+  }
+
   return index;
 }
 

From 6047352c9126f335c32dd3b845997c3260b9a617 Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Thu, 11 Sep 2014 15:57:33 +1200
Subject: [PATCH 053/109] Bug 1061079 - Make BufferStream work for a moving
 window; r=edwin

---
 media/libstagefright/binding/BufferStream.cpp | 37 +++++++++++++++----
 media/libstagefright/binding/MoofParser.cpp   |  9 ++++-
 .../include/mp4_demuxer/BufferStream.h        | 13 +++++--
 .../binding/include/mp4_demuxer/MoofParser.h  |  3 +-
 .../binding/include/mp4_demuxer/mp4_demuxer.h |  2 +
 5 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/media/libstagefright/binding/BufferStream.cpp b/media/libstagefright/binding/BufferStream.cpp
index 80107b2a073d..6b78321b4bde 100644
--- a/media/libstagefright/binding/BufferStream.cpp
+++ b/media/libstagefright/binding/BufferStream.cpp
@@ -3,33 +3,56 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mp4_demuxer/BufferStream.h"
+#include "MediaResource.h"
 #include <algorithm>
 
+using namespace mozilla;
+
 namespace mp4_demuxer {
 
-BufferStream::BufferStream(const uint8_t* aData, size_t aLength)
-  : mData(aData), mLength(aLength)
+BufferStream::BufferStream()
+  : mStartOffset(0)
 {
-
 }
 
 /*virtual*/ bool
 BufferStream::ReadAt(int64_t aOffset, void* aData, size_t aLength,
                      size_t* aBytesRead)
 {
-  if (aOffset > mLength) {
+  if (aOffset < mStartOffset || aOffset > mStartOffset + mData.Length()) {
     return false;
   }
-  *aBytesRead = std::min(aLength, mLength - (size_t) aOffset);
-  memcpy(aData, mData + aOffset, *aBytesRead);
+  *aBytesRead =
+    std::min(aLength, size_t(mStartOffset + mData.Length() - aOffset));
+  memcpy(aData, &mData[aOffset - mStartOffset], *aBytesRead);
   return true;
 }
 
 /*virtual*/ bool
 BufferStream::Length(int64_t* aLength)
 {
-  *aLength = mLength;
+  *aLength = mStartOffset + mData.Length();
   return true;
 }
 
+/* virtual */ void
+BufferStream::DiscardBefore(int64_t aOffset)
+{
+  if (aOffset > mStartOffset) {
+    mData.RemoveElementsAt(0, aOffset - mStartOffset);
+    mStartOffset = aOffset;
+  }
+}
+
+void
+BufferStream::AppendBytes(const uint8_t* aData, size_t aLength)
+{
+  mData.AppendElements(aData, aLength);
+}
+
+MediaByteRange
+BufferStream::GetByteRange()
+{
+  return MediaByteRange(mStartOffset, mStartOffset + mData.Length());
+}
 }
diff --git a/media/libstagefright/binding/MoofParser.cpp b/media/libstagefright/binding/MoofParser.cpp
index a71dc3c7282e..520f3a183532 100644
--- a/media/libstagefright/binding/MoofParser.cpp
+++ b/media/libstagefright/binding/MoofParser.cpp
@@ -37,11 +37,16 @@ MoofParser::RebuildFragmentedIndex(const nsTArray<MediaByteRange>& aByteRanges)
 }
 
 Interval<Microseconds>
-MoofParser::GetCompositionRange()
+MoofParser::GetCompositionRange(const nsTArray<MediaByteRange>& aByteRanges)
 {
   Interval<Microseconds> compositionRange;
+  BoxContext context(mSource, aByteRanges);
   for (size_t i = 0; i < mMoofs.Length(); i++) {
-    compositionRange = compositionRange.Extents(mMoofs[i].mTimeRange);
+    Moof& moof = mMoofs[i];
+    Box box(&context, moof.mRange.mStart);
+    if (box.IsAvailable()) {
+      compositionRange = compositionRange.Extents(moof.mTimeRange);
+    }
   }
   return compositionRange;
 }
diff --git a/media/libstagefright/binding/include/mp4_demuxer/BufferStream.h b/media/libstagefright/binding/include/mp4_demuxer/BufferStream.h
index d8a9bb6307a1..e54a88135e3d 100644
--- a/media/libstagefright/binding/include/mp4_demuxer/BufferStream.h
+++ b/media/libstagefright/binding/include/mp4_demuxer/BufferStream.h
@@ -6,6 +6,7 @@
 #define BUFFER_STREAM_H_
 
 #include "mp4_demuxer/mp4_demuxer.h"
+#include "nsTArray.h"
 
 namespace mp4_demuxer {
 
@@ -15,15 +16,21 @@ public:
   /* BufferStream does not take ownership of aData nor does it make a copy.
    * Therefore BufferStream shouldn't get used after aData is destroyed.
    */
-  BufferStream(const uint8_t* aData, size_t aLength);
+  BufferStream();
 
   virtual bool ReadAt(int64_t aOffset, void* aData, size_t aLength,
                       size_t* aBytesRead) MOZ_OVERRIDE;
   virtual bool Length(int64_t* aLength) MOZ_OVERRIDE;
 
+  virtual void DiscardBefore(int64_t aOffset) MOZ_OVERRIDE;
+
+  void AppendBytes(const uint8_t* aData, size_t aLength);
+
+  mozilla::MediaByteRange GetByteRange();
+
 private:
-  const uint8_t* mData;
-  size_t mLength;
+  int64_t mStartOffset;
+  nsTArray<uint8_t> mData;
 };
 }
 
diff --git a/media/libstagefright/binding/include/mp4_demuxer/MoofParser.h b/media/libstagefright/binding/include/mp4_demuxer/MoofParser.h
index 1d06718a926f..629c0750ef6f 100644
--- a/media/libstagefright/binding/include/mp4_demuxer/MoofParser.h
+++ b/media/libstagefright/binding/include/mp4_demuxer/MoofParser.h
@@ -131,7 +131,8 @@ public:
   }
   void RebuildFragmentedIndex(
     const nsTArray<mozilla::MediaByteRange>& aByteRanges);
-  Interval<Microseconds> GetCompositionRange();
+  Interval<Microseconds> GetCompositionRange(
+    const nsTArray<mozilla::MediaByteRange>& aByteRanges);
   bool ReachedEnd();
   void ParseMoov(Box& aBox);
   void ParseTrak(Box& aBox);
diff --git a/media/libstagefright/binding/include/mp4_demuxer/mp4_demuxer.h b/media/libstagefright/binding/include/mp4_demuxer/mp4_demuxer.h
index dfa21243229e..dfdca6d1d4e3 100644
--- a/media/libstagefright/binding/include/mp4_demuxer/mp4_demuxer.h
+++ b/media/libstagefright/binding/include/mp4_demuxer/mp4_demuxer.h
@@ -28,6 +28,8 @@ public:
                       size_t* bytes_read) = 0;
   virtual bool Length(int64_t* size) = 0;
 
+  virtual void DiscardBefore(int64_t offset) {}
+
 protected:
   virtual ~Stream() {}
 };

From 8333148a723558e16022a8e8ee45497aada6de2e Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Thu, 11 Sep 2014 15:57:35 +1200
Subject: [PATCH 054/109] Bug 1061079 - Handle misaligned SourceBuffer appends
 for MP4; r=kinetik

---
 content/media/mediasource/SourceBuffer.cpp | 32 +++++++++++++---------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/content/media/mediasource/SourceBuffer.cpp b/content/media/mediasource/SourceBuffer.cpp
index c340739e4dd7..6da47875db51 100644
--- a/content/media/mediasource/SourceBuffer.cpp
+++ b/content/media/mediasource/SourceBuffer.cpp
@@ -202,7 +202,7 @@ private:
 
 class MP4ContainerParser : public ContainerParser {
 public:
-  MP4ContainerParser() : mTimescale(0) {}
+  MP4ContainerParser() {}
 
   bool IsInitSegmentPresent(const uint8_t* aData, uint32_t aLength)
   {
@@ -234,15 +234,21 @@ public:
   virtual bool ParseStartAndEndTimestamps(const uint8_t* aData, uint32_t aLength,
                                           double& aStart, double& aEnd)
   {
-    mp4_demuxer::MoofParser parser(new mp4_demuxer::BufferStream(aData, aLength), 0);
-    parser.mMdhd.mTimescale = mTimescale;
+    bool initSegment = IsInitSegmentPresent(aData, aLength);
+    if (initSegment) {
+      mStream = new mp4_demuxer::BufferStream();
+      mParser = new mp4_demuxer::MoofParser(mStream, 0);
+    } else if (!mStream || !mParser) {
+      return false;
+    }
 
+    mStream->AppendBytes(aData, aLength);
     nsTArray<MediaByteRange> byteRanges;
-    byteRanges.AppendElement(MediaByteRange(0, aLength));
-    parser.RebuildFragmentedIndex(byteRanges);
+    byteRanges.AppendElement(mStream->GetByteRange());
+    mParser->RebuildFragmentedIndex(byteRanges);
 
-    if (IsInitSegmentPresent(aData, aLength)) {
-      const MediaByteRange& range = parser.mInitRange;
+    if (initSegment) {
+      const MediaByteRange& range = mParser->mInitRange;
       MSE_DEBUG("MP4ContainerParser(%p)::ParseStartAndEndTimestamps: Stashed init of %u bytes.",
                 this, range.mEnd - range.mStart);
 
@@ -251,11 +257,10 @@ public:
                                   range.mEnd - range.mStart);
     }
 
-    // Persist the timescale for when it is absent in later chunks
-    mTimescale = parser.mMdhd.mTimescale;
-
     mp4_demuxer::Interval<mp4_demuxer::Microseconds> compositionRange =
-        parser.GetCompositionRange();
+      mParser->GetCompositionRange(byteRanges);
+
+    mStream->DiscardBefore(mParser->mOffset);
 
     if (compositionRange.IsNull()) {
       return false;
@@ -267,8 +272,9 @@ public:
     return true;
   }
 
-  private:
-    uint32_t mTimescale;
+private:
+  nsRefPtr<mp4_demuxer::BufferStream> mStream;
+  nsAutoPtr<mp4_demuxer::MoofParser> mParser;
 };
 
 

From ccaaf32a8765b0c3e880dab07df4cd1596470655 Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Tue, 9 Sep 2014 17:58:18 +1200
Subject: [PATCH 055/109] Bug 1062666 - Add a debug-only dump method to
 MediaSource for debugging issues with appended data.

---
 content/media/mediasource/MediaSource.cpp     | 19 +++++++++++++++++++
 content/media/mediasource/MediaSource.h       |  6 ++++++
 content/media/mediasource/ResourceQueue.h     | 18 +++++++++++++++++-
 content/media/mediasource/SourceBuffer.cpp    | 11 +++++++++++
 content/media/mediasource/SourceBuffer.h      |  4 ++++
 .../media/mediasource/SourceBufferDecoder.cpp |  1 +
 .../media/mediasource/SourceBufferList.cpp    | 10 ++++++++++
 content/media/mediasource/SourceBufferList.h  |  4 ++++
 .../media/mediasource/SourceBufferResource.h  |  6 ++++++
 content/media/mediasource/TrackBuffer.cpp     | 19 +++++++++++++++++++
 content/media/mediasource/TrackBuffer.h       |  4 ++++
 11 files changed, 101 insertions(+), 1 deletion(-)

diff --git a/content/media/mediasource/MediaSource.cpp b/content/media/mediasource/MediaSource.cpp
index d27891982aa1..f30e8b1827f1 100644
--- a/content/media/mediasource/MediaSource.cpp
+++ b/content/media/mediasource/MediaSource.cpp
@@ -28,6 +28,11 @@
 #include "nsThreadUtils.h"
 #include "prlog.h"
 
+#if defined(DEBUG)
+#include <sys/stat.h>
+#include <sys/types.h>
+#endif
+
 struct JSContext;
 class JSObject;
 
@@ -507,6 +512,20 @@ MediaSource::InitializationEvent()
   }
 }
 
+#if defined(DEBUG)
+void
+MediaSource::Dump(const char* aPath)
+{
+  char buf[255];
+  PR_snprintf(buf, sizeof(buf), "%s/mediasource-%p", aPath, this);
+  mkdir(buf, 0700);
+
+  if (mSourceBuffers) {
+    mSourceBuffers->Dump(buf);
+  }
+}
+#endif
+
 nsPIDOMWindow*
 MediaSource::GetParentObject() const
 {
diff --git a/content/media/mediasource/MediaSource.h b/content/media/mediasource/MediaSource.h
index e89b5f02b9cf..2f630eb6d6f2 100644
--- a/content/media/mediasource/MediaSource.h
+++ b/content/media/mediasource/MediaSource.h
@@ -98,6 +98,12 @@ public:
   // initialization.
   void QueueInitializationEvent();
 
+#if defined(DEBUG)
+  // Dump the contents of each SourceBuffer to a series of files under aPath.
+  // aPath must exist.  Debug only, invoke from your favourite debugger.
+  void Dump(const char* aPath);
+#endif
+
 private:
   ~MediaSource();
 
diff --git a/content/media/mediasource/ResourceQueue.h b/content/media/mediasource/ResourceQueue.h
index 070960d267aa..85564819c700 100644
--- a/content/media/mediasource/ResourceQueue.h
+++ b/content/media/mediasource/ResourceQueue.h
@@ -134,6 +134,23 @@ public:
     return size;
   }
 
+#if defined(DEBUG)
+  void Dump(const char* aPath) {
+    for (uint32_t i = 0; i < uint32_t(GetSize()); ++i) {
+      ResourceItem* item = ResourceAt(i);
+
+      char buf[255];
+      PR_snprintf(buf, sizeof(buf), "%s/%08u.bin", aPath, i);
+      FILE* fp = fopen(buf, "wb");
+      if (!fp) {
+        return;
+      }
+      fwrite(item->mData.Elements(), item->mData.Length(), 1, fp);
+      fclose(fp);
+    }
+  }
+#endif
+
 private:
   ResourceItem* ResourceAt(uint32_t aIndex) const {
     return static_cast<ResourceItem*>(ObjectAt(aIndex));
@@ -173,6 +190,5 @@ private:
   uint64_t mOffset;
 };
 
-
 } // namespace mozilla
 #endif /* MOZILLA_RESOURCEQUEUE_H_ */
diff --git a/content/media/mediasource/SourceBuffer.cpp b/content/media/mediasource/SourceBuffer.cpp
index 6da47875db51..fdf7917d902b 100644
--- a/content/media/mediasource/SourceBuffer.cpp
+++ b/content/media/mediasource/SourceBuffer.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* 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
@@ -687,6 +688,16 @@ SourceBuffer::Evict(double aStart, double aEnd)
   mTrackBuffer->EvictBefore(evictTime);
 }
 
+#if defined(DEBUG)
+void
+SourceBuffer::Dump(const char* aPath)
+{
+  if (mTrackBuffer) {
+    mTrackBuffer->Dump(aPath);
+  }
+}
+#endif
+
 NS_IMPL_CYCLE_COLLECTION_INHERITED(SourceBuffer, DOMEventTargetHelper,
                                    mMediaSource)
 
diff --git a/content/media/mediasource/SourceBuffer.h b/content/media/mediasource/SourceBuffer.h
index f2aa2d6de6a3..66044af54246 100644
--- a/content/media/mediasource/SourceBuffer.h
+++ b/content/media/mediasource/SourceBuffer.h
@@ -109,6 +109,10 @@ public:
   double GetBufferedStart();
   double GetBufferedEnd();
 
+#if defined(DEBUG)
+  void Dump(const char* aPath);
+#endif
+
 private:
   ~SourceBuffer();
 
diff --git a/content/media/mediasource/SourceBufferDecoder.cpp b/content/media/mediasource/SourceBufferDecoder.cpp
index c95e97e5a46a..a72465e5be4f 100644
--- a/content/media/mediasource/SourceBufferDecoder.cpp
+++ b/content/media/mediasource/SourceBufferDecoder.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* 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
diff --git a/content/media/mediasource/SourceBufferList.cpp b/content/media/mediasource/SourceBufferList.cpp
index d5a52f3a8671..9f8bf1802bfd 100644
--- a/content/media/mediasource/SourceBufferList.cpp
+++ b/content/media/mediasource/SourceBufferList.cpp
@@ -167,6 +167,16 @@ SourceBufferList::QueueAsyncSimpleEvent(const char* aName)
   NS_DispatchToMainThread(event);
 }
 
+#if defined(DEBUG)
+void
+SourceBufferList::Dump(const char* aPath)
+{
+  for (uint32_t i = 0; i < mSourceBuffers.Length(); ++i) {
+    mSourceBuffers[i]->Dump(aPath);
+  }
+}
+#endif
+
 SourceBufferList::SourceBufferList(MediaSource* aMediaSource)
   : DOMEventTargetHelper(aMediaSource->GetParentObject())
   , mMediaSource(aMediaSource)
diff --git a/content/media/mediasource/SourceBufferList.h b/content/media/mediasource/SourceBufferList.h
index 32d928400981..ca5087f2ea22 100644
--- a/content/media/mediasource/SourceBufferList.h
+++ b/content/media/mediasource/SourceBufferList.h
@@ -79,6 +79,10 @@ public:
   // Returns the highest end time of any of the Sourcebuffers.
   double GetHighestBufferedEndTime();
 
+#if defined(DEBUG)
+  void Dump(const char* aPath);
+#endif
+
 private:
   ~SourceBufferList();
 
diff --git a/content/media/mediasource/SourceBufferResource.h b/content/media/mediasource/SourceBufferResource.h
index 2231658bd9f3..3f640852ca47 100644
--- a/content/media/mediasource/SourceBufferResource.h
+++ b/content/media/mediasource/SourceBufferResource.h
@@ -120,6 +120,12 @@ public:
   // Remove data from resource before the given offset.
   void EvictBefore(uint64_t aOffset);
 
+#if defined(DEBUG)
+  void Dump(const char* aPath) {
+    mInputBuffer.Dump(aPath);
+  }
+#endif
+
 private:
   ~SourceBufferResource();
   nsresult SeekInternal(int64_t aOffset);
diff --git a/content/media/mediasource/TrackBuffer.cpp b/content/media/mediasource/TrackBuffer.cpp
index 1807bd3b0776..e672ddf67714 100644
--- a/content/media/mediasource/TrackBuffer.cpp
+++ b/content/media/mediasource/TrackBuffer.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* 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
@@ -349,4 +350,22 @@ TrackBuffer::Decoders()
   return mInitializedDecoders;
 }
 
+#if defined(DEBUG)
+void
+TrackBuffer::Dump(const char* aPath)
+{
+  char path[255];
+  PR_snprintf(path, sizeof(path), "%s/trackbuffer-%p", aPath, this);
+  mkdir(path, 0700);
+
+  for (uint32_t i = 0; i < mDecoders.Length(); ++i) {
+    char buf[255];
+    PR_snprintf(buf, sizeof(buf), "%s/reader-%p", path, mDecoders[i]->GetReader());
+    mkdir(buf, 0700);
+
+    mDecoders[i]->GetResource()->Dump(buf);
+  }
+}
+#endif
+
 } // namespace mozilla
diff --git a/content/media/mediasource/TrackBuffer.h b/content/media/mediasource/TrackBuffer.h
index ba37c973ae82..0e379ea61382 100644
--- a/content/media/mediasource/TrackBuffer.h
+++ b/content/media/mediasource/TrackBuffer.h
@@ -82,6 +82,10 @@ public:
   // TODO: Refactor to a cleaner interface between TrackBuffer and MediaSourceReader.
   const nsTArray<nsRefPtr<SourceBufferDecoder>>& Decoders();
 
+#if defined(DEBUG)
+  void Dump(const char* aPath);
+#endif
+
 private:
   ~TrackBuffer();
 

From a69549cef270cd9220b3a4e474ec0c7fccfdf1e9 Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Thu, 11 Sep 2014 16:42:00 +1200
Subject: [PATCH 056/109] Backed out changeset b3f02eb02208 (bug 1062666) due
 to build bustage

---
 content/media/mediasource/MediaSource.cpp     | 19 -------------------
 content/media/mediasource/MediaSource.h       |  6 ------
 content/media/mediasource/ResourceQueue.h     | 18 +-----------------
 content/media/mediasource/SourceBuffer.cpp    | 11 -----------
 content/media/mediasource/SourceBuffer.h      |  4 ----
 .../media/mediasource/SourceBufferDecoder.cpp |  1 -
 .../media/mediasource/SourceBufferList.cpp    | 10 ----------
 content/media/mediasource/SourceBufferList.h  |  4 ----
 .../media/mediasource/SourceBufferResource.h  |  6 ------
 content/media/mediasource/TrackBuffer.cpp     | 19 -------------------
 content/media/mediasource/TrackBuffer.h       |  4 ----
 11 files changed, 1 insertion(+), 101 deletions(-)

diff --git a/content/media/mediasource/MediaSource.cpp b/content/media/mediasource/MediaSource.cpp
index f30e8b1827f1..d27891982aa1 100644
--- a/content/media/mediasource/MediaSource.cpp
+++ b/content/media/mediasource/MediaSource.cpp
@@ -28,11 +28,6 @@
 #include "nsThreadUtils.h"
 #include "prlog.h"
 
-#if defined(DEBUG)
-#include <sys/stat.h>
-#include <sys/types.h>
-#endif
-
 struct JSContext;
 class JSObject;
 
@@ -512,20 +507,6 @@ MediaSource::InitializationEvent()
   }
 }
 
-#if defined(DEBUG)
-void
-MediaSource::Dump(const char* aPath)
-{
-  char buf[255];
-  PR_snprintf(buf, sizeof(buf), "%s/mediasource-%p", aPath, this);
-  mkdir(buf, 0700);
-
-  if (mSourceBuffers) {
-    mSourceBuffers->Dump(buf);
-  }
-}
-#endif
-
 nsPIDOMWindow*
 MediaSource::GetParentObject() const
 {
diff --git a/content/media/mediasource/MediaSource.h b/content/media/mediasource/MediaSource.h
index 2f630eb6d6f2..e89b5f02b9cf 100644
--- a/content/media/mediasource/MediaSource.h
+++ b/content/media/mediasource/MediaSource.h
@@ -98,12 +98,6 @@ public:
   // initialization.
   void QueueInitializationEvent();
 
-#if defined(DEBUG)
-  // Dump the contents of each SourceBuffer to a series of files under aPath.
-  // aPath must exist.  Debug only, invoke from your favourite debugger.
-  void Dump(const char* aPath);
-#endif
-
 private:
   ~MediaSource();
 
diff --git a/content/media/mediasource/ResourceQueue.h b/content/media/mediasource/ResourceQueue.h
index 85564819c700..070960d267aa 100644
--- a/content/media/mediasource/ResourceQueue.h
+++ b/content/media/mediasource/ResourceQueue.h
@@ -134,23 +134,6 @@ public:
     return size;
   }
 
-#if defined(DEBUG)
-  void Dump(const char* aPath) {
-    for (uint32_t i = 0; i < uint32_t(GetSize()); ++i) {
-      ResourceItem* item = ResourceAt(i);
-
-      char buf[255];
-      PR_snprintf(buf, sizeof(buf), "%s/%08u.bin", aPath, i);
-      FILE* fp = fopen(buf, "wb");
-      if (!fp) {
-        return;
-      }
-      fwrite(item->mData.Elements(), item->mData.Length(), 1, fp);
-      fclose(fp);
-    }
-  }
-#endif
-
 private:
   ResourceItem* ResourceAt(uint32_t aIndex) const {
     return static_cast<ResourceItem*>(ObjectAt(aIndex));
@@ -190,5 +173,6 @@ private:
   uint64_t mOffset;
 };
 
+
 } // namespace mozilla
 #endif /* MOZILLA_RESOURCEQUEUE_H_ */
diff --git a/content/media/mediasource/SourceBuffer.cpp b/content/media/mediasource/SourceBuffer.cpp
index fdf7917d902b..6da47875db51 100644
--- a/content/media/mediasource/SourceBuffer.cpp
+++ b/content/media/mediasource/SourceBuffer.cpp
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* 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
@@ -688,16 +687,6 @@ SourceBuffer::Evict(double aStart, double aEnd)
   mTrackBuffer->EvictBefore(evictTime);
 }
 
-#if defined(DEBUG)
-void
-SourceBuffer::Dump(const char* aPath)
-{
-  if (mTrackBuffer) {
-    mTrackBuffer->Dump(aPath);
-  }
-}
-#endif
-
 NS_IMPL_CYCLE_COLLECTION_INHERITED(SourceBuffer, DOMEventTargetHelper,
                                    mMediaSource)
 
diff --git a/content/media/mediasource/SourceBuffer.h b/content/media/mediasource/SourceBuffer.h
index 66044af54246..f2aa2d6de6a3 100644
--- a/content/media/mediasource/SourceBuffer.h
+++ b/content/media/mediasource/SourceBuffer.h
@@ -109,10 +109,6 @@ public:
   double GetBufferedStart();
   double GetBufferedEnd();
 
-#if defined(DEBUG)
-  void Dump(const char* aPath);
-#endif
-
 private:
   ~SourceBuffer();
 
diff --git a/content/media/mediasource/SourceBufferDecoder.cpp b/content/media/mediasource/SourceBufferDecoder.cpp
index a72465e5be4f..c95e97e5a46a 100644
--- a/content/media/mediasource/SourceBufferDecoder.cpp
+++ b/content/media/mediasource/SourceBufferDecoder.cpp
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* 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
diff --git a/content/media/mediasource/SourceBufferList.cpp b/content/media/mediasource/SourceBufferList.cpp
index 9f8bf1802bfd..d5a52f3a8671 100644
--- a/content/media/mediasource/SourceBufferList.cpp
+++ b/content/media/mediasource/SourceBufferList.cpp
@@ -167,16 +167,6 @@ SourceBufferList::QueueAsyncSimpleEvent(const char* aName)
   NS_DispatchToMainThread(event);
 }
 
-#if defined(DEBUG)
-void
-SourceBufferList::Dump(const char* aPath)
-{
-  for (uint32_t i = 0; i < mSourceBuffers.Length(); ++i) {
-    mSourceBuffers[i]->Dump(aPath);
-  }
-}
-#endif
-
 SourceBufferList::SourceBufferList(MediaSource* aMediaSource)
   : DOMEventTargetHelper(aMediaSource->GetParentObject())
   , mMediaSource(aMediaSource)
diff --git a/content/media/mediasource/SourceBufferList.h b/content/media/mediasource/SourceBufferList.h
index ca5087f2ea22..32d928400981 100644
--- a/content/media/mediasource/SourceBufferList.h
+++ b/content/media/mediasource/SourceBufferList.h
@@ -79,10 +79,6 @@ public:
   // Returns the highest end time of any of the Sourcebuffers.
   double GetHighestBufferedEndTime();
 
-#if defined(DEBUG)
-  void Dump(const char* aPath);
-#endif
-
 private:
   ~SourceBufferList();
 
diff --git a/content/media/mediasource/SourceBufferResource.h b/content/media/mediasource/SourceBufferResource.h
index 3f640852ca47..2231658bd9f3 100644
--- a/content/media/mediasource/SourceBufferResource.h
+++ b/content/media/mediasource/SourceBufferResource.h
@@ -120,12 +120,6 @@ public:
   // Remove data from resource before the given offset.
   void EvictBefore(uint64_t aOffset);
 
-#if defined(DEBUG)
-  void Dump(const char* aPath) {
-    mInputBuffer.Dump(aPath);
-  }
-#endif
-
 private:
   ~SourceBufferResource();
   nsresult SeekInternal(int64_t aOffset);
diff --git a/content/media/mediasource/TrackBuffer.cpp b/content/media/mediasource/TrackBuffer.cpp
index e672ddf67714..1807bd3b0776 100644
--- a/content/media/mediasource/TrackBuffer.cpp
+++ b/content/media/mediasource/TrackBuffer.cpp
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* 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
@@ -350,22 +349,4 @@ TrackBuffer::Decoders()
   return mInitializedDecoders;
 }
 
-#if defined(DEBUG)
-void
-TrackBuffer::Dump(const char* aPath)
-{
-  char path[255];
-  PR_snprintf(path, sizeof(path), "%s/trackbuffer-%p", aPath, this);
-  mkdir(path, 0700);
-
-  for (uint32_t i = 0; i < mDecoders.Length(); ++i) {
-    char buf[255];
-    PR_snprintf(buf, sizeof(buf), "%s/reader-%p", path, mDecoders[i]->GetReader());
-    mkdir(buf, 0700);
-
-    mDecoders[i]->GetResource()->Dump(buf);
-  }
-}
-#endif
-
 } // namespace mozilla
diff --git a/content/media/mediasource/TrackBuffer.h b/content/media/mediasource/TrackBuffer.h
index 0e379ea61382..ba37c973ae82 100644
--- a/content/media/mediasource/TrackBuffer.h
+++ b/content/media/mediasource/TrackBuffer.h
@@ -82,10 +82,6 @@ public:
   // TODO: Refactor to a cleaner interface between TrackBuffer and MediaSourceReader.
   const nsTArray<nsRefPtr<SourceBufferDecoder>>& Decoders();
 
-#if defined(DEBUG)
-  void Dump(const char* aPath);
-#endif
-
 private:
   ~TrackBuffer();
 

From a461a8bd9b4c3fb5e0237d83bb21041f2c4d8a54 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 10 Sep 2014 00:27:45 -0700
Subject: [PATCH 057/109] Bug 1065258 (part 1) - Inline
 TempDirMemoryFinishCallback(). r=jld.

--HG--
extra : rebase_source : 40f0ebd81d3e4061a4bfde932ef1e55cfd5d7332
---
 xpcom/base/nsMemoryInfoDumper.cpp | 147 +++++++++++++++---------------
 1 file changed, 72 insertions(+), 75 deletions(-)

diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
index bb3b4b416a21..6fcb795ac7cf 100644
--- a/xpcom/base/nsMemoryInfoDumper.cpp
+++ b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -593,7 +593,78 @@ public:
   {
   }
 
-  NS_IMETHOD Callback(nsISupports* aData);
+  NS_IMETHOD Callback(nsISupports* aData)
+  {
+    nsresult rv = DumpFooter(mrWriter);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    // The call to Finish() deallocates the memory allocated by mrWriter's first
+    // DUMP() call (within DumpProcessMemoryReportsToGZFileWriter()).  Because
+    // that memory was live while the memory reporters ran and thus measured by
+    // them -- by "heap-allocated" if nothing else -- we want DMD to see it as
+    // well.  So we deliberately don't call Finish() until after DMD finishes.
+    rv = mrWriter->Finish();
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    // Rename the memory reports file, now that we're done writing all the
+    // files. Its final name is "memory-report<-identifier>-<pid>.json.gz".
+
+    nsCOMPtr<nsIFile> mrFinalFile;
+    rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(mrFinalFile));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+  #ifdef ANDROID
+    rv = mrFinalFile->AppendNative(NS_LITERAL_CSTRING("memory-reports"));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+  #endif
+
+    rv = mrFinalFile->AppendNative(mrFilename);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    rv = mrFinalFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    nsAutoString mrActualFinalFilename;
+    rv = mrFinalFile->GetLeafName(mrActualFinalFilename);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    rv = mrTmpFile->MoveTo(/* directory */ nullptr, mrActualFinalFilename);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    // Write a message to the console.
+
+    nsCOMPtr<nsIConsoleService> cs =
+      do_GetService(NS_CONSOLESERVICE_CONTRACTID, &rv);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    nsString path;
+    mrTmpFile->GetPath(path);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+
+    nsString msg = NS_LITERAL_STRING("nsIMemoryInfoDumper dumped reports to ");
+    msg.Append(path);
+    return cs->LogStringMessage(msg.get());
+  }
 
 private:
   ~TempDirMemoryFinishCallback() {}
@@ -737,80 +808,6 @@ nsMemoryInfoDumper::DumpDMDToFile(FILE* aFile)
 }
 #endif  // MOZ_DMD
 
-NS_IMETHODIMP
-TempDirMemoryFinishCallback::Callback(nsISupports* aData)
-{
-  nsresult rv = DumpFooter(mrWriter);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  // The call to Finish() deallocates the memory allocated by mrWriter's first
-  // DUMP() call (within DumpProcessMemoryReportsToGZFileWriter()).  Because
-  // that memory was live while the memory reporters ran and thus measured by
-  // them -- by "heap-allocated" if nothing else -- we want DMD to see it as
-  // well.  So we deliberately don't call Finish() until after DMD finishes.
-  rv = mrWriter->Finish();
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  // Rename the memory reports file, now that we're done writing all the files.
-  // Its final name is "memory-report<-identifier>-<pid>.json.gz".
-
-  nsCOMPtr<nsIFile> mrFinalFile;
-  rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(mrFinalFile));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-#ifdef ANDROID
-  rv = mrFinalFile->AppendNative(NS_LITERAL_CSTRING("memory-reports"));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-#endif
-
-  rv = mrFinalFile->AppendNative(mrFilename);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  rv = mrFinalFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  nsAutoString mrActualFinalFilename;
-  rv = mrFinalFile->GetLeafName(mrActualFinalFilename);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  rv = mrTmpFile->MoveTo(/* directory */ nullptr, mrActualFinalFilename);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  // Write a message to the console.
-
-  nsCOMPtr<nsIConsoleService> cs =
-    do_GetService(NS_CONSOLESERVICE_CONTRACTID, &rv);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  nsString path;
-  mrTmpFile->GetPath(path);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  nsString msg = NS_LITERAL_STRING("nsIMemoryInfoDumper dumped reports to ");
-  msg.Append(path);
-  return cs->LogStringMessage(msg.get());
-}
-
 // This dumps the JSON footer and closes the file, and then calls the given
 // nsIFinishDumpingCallback.
 class FinishReportingCallback MOZ_FINAL : public nsIFinishReportingCallback

From 74321f14ac3cd49f2ba8e5667df240d91bd69a66 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 10 Sep 2014 00:30:17 -0700
Subject: [PATCH 058/109] Bug 1065258 (part 2) - Rename some variables. r=jld.

--HG--
extra : rebase_source : cd1ff03dbf8ad455529ba763c722cb1ec34162b1
---
 xpcom/base/nsMemoryInfoDumper.cpp | 98 ++++++++++++++++---------------
 1 file changed, 51 insertions(+), 47 deletions(-)

diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
index 6fcb795ac7cf..a7c05a09622c 100644
--- a/xpcom/base/nsMemoryInfoDumper.cpp
+++ b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -582,30 +582,31 @@ class TempDirMemoryFinishCallback MOZ_FINAL : public nsIFinishReportingCallback
 public:
   NS_DECL_ISUPPORTS
 
-  TempDirMemoryFinishCallback(nsGZFileWriter* aWriter,
-                              nsIFile* aTmpFile,
-                              const nsCString& aFilename,
+  TempDirMemoryFinishCallback(nsGZFileWriter* aReportsWriter,
+                              nsIFile* aReportsTmpFile,
+                              const nsCString& aReportsFinalFilename,
                               const nsString& aIdentifier)
-    : mrWriter(aWriter)
-    , mrTmpFile(aTmpFile)
-    , mrFilename(aFilename)
+    : mReportsWriter(aReportsWriter)
+    , mReportsTmpFile(aReportsTmpFile)
+    , mReportsFilename(aReportsFinalFilename)
     , mIdentifier(aIdentifier)
   {
   }
 
   NS_IMETHOD Callback(nsISupports* aData)
   {
-    nsresult rv = DumpFooter(mrWriter);
+    nsresult rv = DumpFooter(mReportsWriter);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
 
-    // The call to Finish() deallocates the memory allocated by mrWriter's first
-    // DUMP() call (within DumpProcessMemoryReportsToGZFileWriter()).  Because
-    // that memory was live while the memory reporters ran and thus measured by
-    // them -- by "heap-allocated" if nothing else -- we want DMD to see it as
-    // well.  So we deliberately don't call Finish() until after DMD finishes.
-    rv = mrWriter->Finish();
+    // The call to Finish() deallocates the memory allocated by mReportsWriter's
+    // first DUMP() call (within DumpProcessMemoryReportsToGZFileWriter()).
+    // Because that memory was live while the memory reporters ran and thus
+    // measured by them -- by "heap-allocated" if nothing else -- we want DMD to
+    // see it as well.  So we deliberately don't call Finish() until after DMD
+    // finishes.
+    rv = mReportsWriter->Finish();
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
@@ -613,36 +614,38 @@ public:
     // Rename the memory reports file, now that we're done writing all the
     // files. Its final name is "memory-report<-identifier>-<pid>.json.gz".
 
-    nsCOMPtr<nsIFile> mrFinalFile;
-    rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(mrFinalFile));
+    nsCOMPtr<nsIFile> reportsFinalFile;
+    rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR,
+                                getter_AddRefs(reportsFinalFile));
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
 
   #ifdef ANDROID
-    rv = mrFinalFile->AppendNative(NS_LITERAL_CSTRING("memory-reports"));
+    rv = reportsFinalFile->AppendNative(NS_LITERAL_CSTRING("memory-reports"));
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
   #endif
 
-    rv = mrFinalFile->AppendNative(mrFilename);
+    rv = reportsFinalFile->AppendNative(mReportsFilename);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
 
-    rv = mrFinalFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
+    rv = reportsFinalFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
 
-    nsAutoString mrActualFinalFilename;
-    rv = mrFinalFile->GetLeafName(mrActualFinalFilename);
+    nsAutoString reportsFinalFilename;
+    rv = reportsFinalFile->GetLeafName(reportsFinalFilename);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
 
-    rv = mrTmpFile->MoveTo(/* directory */ nullptr, mrActualFinalFilename);
+    rv = mReportsTmpFile->MoveTo(/* directory */ nullptr,
+                                 reportsFinalFilename);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
@@ -656,7 +659,7 @@ public:
     }
 
     nsString path;
-    mrTmpFile->GetPath(path);
+    mReportsTmpFile->GetPath(path);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
@@ -669,9 +672,9 @@ public:
 private:
   ~TempDirMemoryFinishCallback() {}
 
-  nsRefPtr<nsGZFileWriter> mrWriter;
-  nsCOMPtr<nsIFile> mrTmpFile;
-  nsCString mrFilename;
+  nsRefPtr<nsGZFileWriter> mReportsWriter;
+  nsCOMPtr<nsIFile> mReportsTmpFile;
+  nsCString mReportsFilename;
   nsString mIdentifier;
 };
 
@@ -696,38 +699,36 @@ nsMemoryInfoDumper::DumpMemoryInfoToTempDir(const nsAString& aIdentifier,
   // looking for memory report dumps to grab a file before we're finished
   // writing to it.
 
-  // Note that |mrFilename| is missing the "incomplete-" prefix; we'll tack
-  // that on in a moment.
-  nsCString mrFilename;
+  nsCString reportsFinalFilename;
   // The "unified" indicates that we merge the memory reports from all
   // processes and write out one file, rather than a separate file for
   // each process as was the case before bug 946407.  This is so that
   // the get_about_memory.py script in the B2G repository can
   // determine when it's done waiting for files to appear.
   MakeFilename("unified-memory-report", identifier, getpid(), "json.gz",
-               mrFilename);
+               reportsFinalFilename);
 
-  nsCOMPtr<nsIFile> mrTmpFile;
+  nsCOMPtr<nsIFile> reportsTmpFile;
   nsresult rv;
   // In Android case, this function will open a file named aFilename under
   // specific folder (/data/local/tmp/memory-reports). Otherwise, it will
   // open a file named aFilename under "NS_OS_TEMP_DIR".
   rv = nsDumpUtils::OpenTempFile(NS_LITERAL_CSTRING("incomplete-") +
-                                 mrFilename,
-                                 getter_AddRefs(mrTmpFile),
+                                 reportsFinalFilename,
+                                 getter_AddRefs(reportsTmpFile),
                                  NS_LITERAL_CSTRING("memory-reports"));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
-  nsRefPtr<nsGZFileWriter> mrWriter = new nsGZFileWriter();
-  rv = mrWriter->Init(mrTmpFile);
+  nsRefPtr<nsGZFileWriter> reportsWriter = new nsGZFileWriter();
+  rv = reportsWriter->Init(reportsTmpFile);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
   // Dump the memory reports to the file.
-  rv = DumpHeader(mrWriter);
+  rv = DumpHeader(reportsWriter);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -735,9 +736,11 @@ nsMemoryInfoDumper::DumpMemoryInfoToTempDir(const nsAString& aIdentifier,
   // Process reporters.
   nsCOMPtr<nsIMemoryReporterManager> mgr =
     do_GetService("@mozilla.org/memory-reporter-manager;1");
-  nsRefPtr<DumpReportCallback> dumpReport = new DumpReportCallback(mrWriter);
+  nsRefPtr<DumpReportCallback> dumpReport =
+    new DumpReportCallback(reportsWriter);
   nsRefPtr<nsIFinishReportingCallback> finishReport =
-    new TempDirMemoryFinishCallback(mrWriter, mrTmpFile, mrFilename, identifier);
+    new TempDirMemoryFinishCallback(reportsWriter, reportsTmpFile,
+                                    reportsFinalFilename, identifier);
   rv = mgr->GetReportsExtended(dumpReport, nullptr,
                                finishReport, nullptr,
                                aAnonymize,
@@ -860,25 +863,25 @@ nsMemoryInfoDumper::DumpMemoryReportsToNamedFile(
 
   // Create the file.
 
-  nsCOMPtr<nsIFile> mrFile;
-  nsresult rv = NS_NewLocalFile(aFilename, false, getter_AddRefs(mrFile));
+  nsCOMPtr<nsIFile> reportsFile;
+  nsresult rv = NS_NewLocalFile(aFilename, false, getter_AddRefs(reportsFile));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
-  mrFile->InitWithPath(aFilename);
+  reportsFile->InitWithPath(aFilename);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
   bool exists;
-  rv = mrFile->Exists(&exists);
+  rv = reportsFile->Exists(&exists);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
   if (!exists) {
-    rv = mrFile->Create(nsIFile::NORMAL_FILE_TYPE, 0644);
+    rv = reportsFile->Create(nsIFile::NORMAL_FILE_TYPE, 0644);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
@@ -886,13 +889,13 @@ nsMemoryInfoDumper::DumpMemoryReportsToNamedFile(
 
   // Write the memory reports to the file.
 
-  nsRefPtr<nsGZFileWriter> mrWriter = new nsGZFileWriter();
-  rv = mrWriter->Init(mrFile);
+  nsRefPtr<nsGZFileWriter> reportsWriter = new nsGZFileWriter();
+  rv = reportsWriter->Init(reportsFile);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
-  rv = DumpHeader(mrWriter);
+  rv = DumpHeader(reportsWriter);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -900,10 +903,11 @@ nsMemoryInfoDumper::DumpMemoryReportsToNamedFile(
   // Process reports and finish up.
   nsCOMPtr<nsIMemoryReporterManager> mgr =
     do_GetService("@mozilla.org/memory-reporter-manager;1");
-  nsRefPtr<DumpReportCallback> dumpReport = new DumpReportCallback(mrWriter);
+  nsRefPtr<DumpReportCallback> dumpReport =
+    new DumpReportCallback(reportsWriter);
   nsRefPtr<FinishReportingCallback> finishReporting =
     new FinishReportingCallback(aFinishDumping, aFinishDumpingData);
-  return mgr->GetReports(dumpReport, nullptr, finishReporting, mrWriter,
+  return mgr->GetReports(dumpReport, nullptr, finishReporting, reportsWriter,
                          aAnonymize);
 }
 

From 6108d5a9bfee6eb5d957f4baf52cea1f2aff6a13 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 10 Sep 2014 00:31:40 -0700
Subject: [PATCH 059/109] Bug 1065258 (part 3) - Remove
 TempDirMemoryFinishCallback::mIdentifier, which is dead. r=jld.

--HG--
extra : rebase_source : 7db3562208f78be05b855efcbee7f6182df8bf42
---
 xpcom/base/nsMemoryInfoDumper.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
index a7c05a09622c..e98cb978a004 100644
--- a/xpcom/base/nsMemoryInfoDumper.cpp
+++ b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -584,12 +584,10 @@ public:
 
   TempDirMemoryFinishCallback(nsGZFileWriter* aReportsWriter,
                               nsIFile* aReportsTmpFile,
-                              const nsCString& aReportsFinalFilename,
-                              const nsString& aIdentifier)
+                              const nsCString& aReportsFinalFilename)
     : mReportsWriter(aReportsWriter)
     , mReportsTmpFile(aReportsTmpFile)
     , mReportsFilename(aReportsFinalFilename)
-    , mIdentifier(aIdentifier)
   {
   }
 
@@ -675,7 +673,6 @@ private:
   nsRefPtr<nsGZFileWriter> mReportsWriter;
   nsCOMPtr<nsIFile> mReportsTmpFile;
   nsCString mReportsFilename;
-  nsString mIdentifier;
 };
 
 NS_IMPL_ISUPPORTS(TempDirMemoryFinishCallback, nsIFinishReportingCallback)
@@ -740,7 +737,7 @@ nsMemoryInfoDumper::DumpMemoryInfoToTempDir(const nsAString& aIdentifier,
     new DumpReportCallback(reportsWriter);
   nsRefPtr<nsIFinishReportingCallback> finishReport =
     new TempDirMemoryFinishCallback(reportsWriter, reportsTmpFile,
-                                    reportsFinalFilename, identifier);
+                                    reportsFinalFilename);
   rv = mgr->GetReportsExtended(dumpReport, nullptr,
                                finishReport, nullptr,
                                aAnonymize,

From 70c26f1e8b4db6e63313e286a3a704e2a6008088 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 10 Sep 2014 00:32:58 -0700
Subject: [PATCH 060/109] Bug 1065258 (part 4) - Move FinishReportingCallback
 earlier. r=jld.

--HG--
extra : rebase_source : e9c5cc0bf8297cfcef9fae1f0b7da5d03afc659c
---
 xpcom/base/nsMemoryInfoDumper.cpp | 82 +++++++++++++++----------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
index e98cb978a004..f4b7335c00f5 100644
--- a/xpcom/base/nsMemoryInfoDumper.cpp
+++ b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -577,6 +577,47 @@ DumpFooter(nsIGZFileWriter* aWriter)
   return NS_OK;
 }
 
+// This dumps the JSON footer and closes the file, and then calls the given
+// nsIFinishDumpingCallback.
+class FinishReportingCallback MOZ_FINAL : public nsIFinishReportingCallback
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  FinishReportingCallback(nsIFinishDumpingCallback* aFinishDumping,
+                          nsISupports* aFinishDumpingData)
+    : mFinishDumping(aFinishDumping)
+    , mFinishDumpingData(aFinishDumpingData)
+  {
+  }
+
+  NS_IMETHOD Callback(nsISupports* aData)
+  {
+    nsCOMPtr<nsIGZFileWriter> writer = do_QueryInterface(aData);
+    NS_ENSURE_TRUE(writer, NS_ERROR_FAILURE);
+
+    nsresult rv = DumpFooter(writer);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = writer->Finish();
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    if (!mFinishDumping) {
+      return NS_OK;
+    }
+
+    return mFinishDumping->Callback(mFinishDumpingData);
+  }
+
+private:
+  ~FinishReportingCallback() {}
+
+  nsCOMPtr<nsIFinishDumpingCallback> mFinishDumping;
+  nsCOMPtr<nsISupports> mFinishDumpingData;
+};
+
+NS_IMPL_ISUPPORTS(FinishReportingCallback, nsIFinishReportingCallback)
+
 class TempDirMemoryFinishCallback MOZ_FINAL : public nsIFinishReportingCallback
 {
 public:
@@ -808,47 +849,6 @@ nsMemoryInfoDumper::DumpDMDToFile(FILE* aFile)
 }
 #endif  // MOZ_DMD
 
-// This dumps the JSON footer and closes the file, and then calls the given
-// nsIFinishDumpingCallback.
-class FinishReportingCallback MOZ_FINAL : public nsIFinishReportingCallback
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  FinishReportingCallback(nsIFinishDumpingCallback* aFinishDumping,
-                          nsISupports* aFinishDumpingData)
-    : mFinishDumping(aFinishDumping)
-    , mFinishDumpingData(aFinishDumpingData)
-  {
-  }
-
-  NS_IMETHOD Callback(nsISupports* aData)
-  {
-    nsCOMPtr<nsIGZFileWriter> writer = do_QueryInterface(aData);
-    NS_ENSURE_TRUE(writer, NS_ERROR_FAILURE);
-
-    nsresult rv = DumpFooter(writer);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = writer->Finish();
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    if (!mFinishDumping) {
-      return NS_OK;
-    }
-
-    return mFinishDumping->Callback(mFinishDumpingData);
-  }
-
-private:
-  ~FinishReportingCallback() {}
-
-  nsCOMPtr<nsIFinishDumpingCallback> mFinishDumping;
-  nsCOMPtr<nsISupports> mFinishDumpingData;
-};
-
-NS_IMPL_ISUPPORTS(FinishReportingCallback, nsIFinishReportingCallback)
-
 NS_IMETHODIMP
 nsMemoryInfoDumper::DumpMemoryReportsToNamedFile(
   const nsAString& aFilename,

From fcdaede7d490a98a6564b6be08e1c6a830dddccf Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 10 Sep 2014 00:34:47 -0700
Subject: [PATCH 061/109] Bug 1065258 (part 5) - Make
 TempDirMemoryFinishCallback a nsIFinishDumpingCallback object. r=jld.

--HG--
extra : rebase_source : 0a16d0a6193c3de9ae7cc1c68991dbda24171dc7
---
 xpcom/base/nsMemoryInfoDumper.cpp | 71 ++++++++++++++-----------------
 1 file changed, 32 insertions(+), 39 deletions(-)

diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
index f4b7335c00f5..12590553491b 100644
--- a/xpcom/base/nsMemoryInfoDumper.cpp
+++ b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -584,22 +584,26 @@ class FinishReportingCallback MOZ_FINAL : public nsIFinishReportingCallback
 public:
   NS_DECL_ISUPPORTS
 
-  FinishReportingCallback(nsIFinishDumpingCallback* aFinishDumping,
+  FinishReportingCallback(nsGZFileWriter* aReportsWriter,
+                          nsIFinishDumpingCallback* aFinishDumping,
                           nsISupports* aFinishDumpingData)
-    : mFinishDumping(aFinishDumping)
+    : mReportsWriter(aReportsWriter)
+    , mFinishDumping(aFinishDumping)
     , mFinishDumpingData(aFinishDumpingData)
   {
   }
 
   NS_IMETHOD Callback(nsISupports* aData)
   {
-    nsCOMPtr<nsIGZFileWriter> writer = do_QueryInterface(aData);
-    NS_ENSURE_TRUE(writer, NS_ERROR_FAILURE);
-
-    nsresult rv = DumpFooter(writer);
+    nsresult rv = DumpFooter(mReportsWriter);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = writer->Finish();
+    // The call to Finish() deallocates the memory allocated by the first DUMP()
+    // call. Because that memory was live while the memory reporters ran and
+    // thus measured by them -- by "heap-allocated" if nothing else -- we want
+    // DMD to see it as well.  So we deliberately don't call Finish() until
+    // after DMD finishes.
+    rv = mReportsWriter->Finish();
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (!mFinishDumping) {
@@ -612,50 +616,33 @@ public:
 private:
   ~FinishReportingCallback() {}
 
+  nsRefPtr<nsGZFileWriter> mReportsWriter;
   nsCOMPtr<nsIFinishDumpingCallback> mFinishDumping;
   nsCOMPtr<nsISupports> mFinishDumpingData;
 };
 
 NS_IMPL_ISUPPORTS(FinishReportingCallback, nsIFinishReportingCallback)
 
-class TempDirMemoryFinishCallback MOZ_FINAL : public nsIFinishReportingCallback
+class TempDirMemoryFinishCallback MOZ_FINAL : public nsIFinishDumpingCallback
 {
 public:
   NS_DECL_ISUPPORTS
 
-  TempDirMemoryFinishCallback(nsGZFileWriter* aReportsWriter,
-                              nsIFile* aReportsTmpFile,
+  TempDirMemoryFinishCallback(nsIFile* aReportsTmpFile,
                               const nsCString& aReportsFinalFilename)
-    : mReportsWriter(aReportsWriter)
-    , mReportsTmpFile(aReportsTmpFile)
+    : mReportsTmpFile(aReportsTmpFile)
     , mReportsFilename(aReportsFinalFilename)
   {
   }
 
   NS_IMETHOD Callback(nsISupports* aData)
   {
-    nsresult rv = DumpFooter(mReportsWriter);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    // The call to Finish() deallocates the memory allocated by mReportsWriter's
-    // first DUMP() call (within DumpProcessMemoryReportsToGZFileWriter()).
-    // Because that memory was live while the memory reporters ran and thus
-    // measured by them -- by "heap-allocated" if nothing else -- we want DMD to
-    // see it as well.  So we deliberately don't call Finish() until after DMD
-    // finishes.
-    rv = mReportsWriter->Finish();
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
     // Rename the memory reports file, now that we're done writing all the
     // files. Its final name is "memory-report<-identifier>-<pid>.json.gz".
 
     nsCOMPtr<nsIFile> reportsFinalFile;
-    rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR,
-                                getter_AddRefs(reportsFinalFile));
+    nsresult rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR,
+                                         getter_AddRefs(reportsFinalFile));
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
@@ -711,12 +698,11 @@ public:
 private:
   ~TempDirMemoryFinishCallback() {}
 
-  nsRefPtr<nsGZFileWriter> mReportsWriter;
   nsCOMPtr<nsIFile> mReportsTmpFile;
   nsCString mReportsFilename;
 };
 
-NS_IMPL_ISUPPORTS(TempDirMemoryFinishCallback, nsIFinishReportingCallback)
+NS_IMPL_ISUPPORTS(TempDirMemoryFinishCallback, nsIFinishDumpingCallback)
 
 NS_IMETHODIMP
 nsMemoryInfoDumper::DumpMemoryInfoToTempDir(const nsAString& aIdentifier,
@@ -759,6 +745,9 @@ nsMemoryInfoDumper::DumpMemoryInfoToTempDir(const nsAString& aIdentifier,
     return rv;
   }
 
+  nsRefPtr<TempDirMemoryFinishCallback> finishDumping =
+    new TempDirMemoryFinishCallback(reportsTmpFile, reportsFinalFilename);
+
   nsRefPtr<nsGZFileWriter> reportsWriter = new nsGZFileWriter();
   rv = reportsWriter->Init(reportsTmpFile);
   if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -776,11 +765,10 @@ nsMemoryInfoDumper::DumpMemoryInfoToTempDir(const nsAString& aIdentifier,
     do_GetService("@mozilla.org/memory-reporter-manager;1");
   nsRefPtr<DumpReportCallback> dumpReport =
     new DumpReportCallback(reportsWriter);
-  nsRefPtr<nsIFinishReportingCallback> finishReport =
-    new TempDirMemoryFinishCallback(reportsWriter, reportsTmpFile,
-                                    reportsFinalFilename);
+  nsRefPtr<FinishReportingCallback> finishReporting =
+    new FinishReportingCallback(reportsWriter, finishDumping, nullptr);
   rv = mgr->GetReportsExtended(dumpReport, nullptr,
-                               finishReport, nullptr,
+                               finishReporting, nullptr,
                                aAnonymize,
                                aMinimizeMemoryUsage,
                                /* DMDident = */ identifier);
@@ -903,9 +891,14 @@ nsMemoryInfoDumper::DumpMemoryReportsToNamedFile(
   nsRefPtr<DumpReportCallback> dumpReport =
     new DumpReportCallback(reportsWriter);
   nsRefPtr<FinishReportingCallback> finishReporting =
-    new FinishReportingCallback(aFinishDumping, aFinishDumpingData);
-  return mgr->GetReports(dumpReport, nullptr, finishReporting, reportsWriter,
-                         aAnonymize);
+    new FinishReportingCallback(reportsWriter, aFinishDumping,
+                                aFinishDumpingData);
+  rv = mgr->GetReportsExtended(dumpReport, nullptr,
+                               finishReporting, nullptr,
+                               aAnonymize,
+                               /* minimizeMemoryUsage = */ false,
+                               /* DMDident = */ EmptyString());
+  return rv;
 }
 
 #undef DUMP

From 90e73486efb585aae166cc81b76b533817012387 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 10 Sep 2014 00:40:10 -0700
Subject: [PATCH 062/109] Bug 1065258 (part 6) - Factor out code shared by
 DumpMemoryReportsToNamedFile() and DumpMemoryInfoToTempDir(). r=jld.

--HG--
extra : rebase_source : 2f4c9f6da6202169ec480dcbf52047308c25b840
---
 xpcom/base/nsMemoryInfoDumper.cpp | 95 ++++++++++++++-----------------
 1 file changed, 43 insertions(+), 52 deletions(-)

diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
index 12590553491b..5ad1882bab32 100644
--- a/xpcom/base/nsMemoryInfoDumper.cpp
+++ b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -704,6 +704,43 @@ private:
 
 NS_IMPL_ISUPPORTS(TempDirMemoryFinishCallback, nsIFinishDumpingCallback)
 
+static nsresult
+DumpMemoryInfoToFile(
+  nsIFile* aReportsFile,
+  nsIFinishDumpingCallback* aFinishDumping,
+  nsISupports* aFinishDumpingData,
+  bool aAnonymize,
+  bool aMinimizeMemoryUsage,
+  nsAString& aDMDIdentifier)
+{
+  nsRefPtr<nsGZFileWriter> reportsWriter = new nsGZFileWriter();
+  nsresult rv = reportsWriter->Init(aReportsFile);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  // Dump the memory reports to the file.
+  rv = DumpHeader(reportsWriter);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  // Process reporters.
+  nsCOMPtr<nsIMemoryReporterManager> mgr =
+    do_GetService("@mozilla.org/memory-reporter-manager;1");
+  nsRefPtr<DumpReportCallback> dumpReport =
+    new DumpReportCallback(reportsWriter);
+  nsRefPtr<FinishReportingCallback> finishReporting =
+    new FinishReportingCallback(reportsWriter, aFinishDumping,
+                                aFinishDumpingData);
+  rv = mgr->GetReportsExtended(dumpReport, nullptr,
+                               finishReporting, nullptr,
+                               aAnonymize,
+                               aMinimizeMemoryUsage,
+                               aDMDIdentifier);
+  return rv;
+}
+
 NS_IMETHODIMP
 nsMemoryInfoDumper::DumpMemoryInfoToTempDir(const nsAString& aIdentifier,
                                             bool aAnonymize,
@@ -748,31 +785,8 @@ nsMemoryInfoDumper::DumpMemoryInfoToTempDir(const nsAString& aIdentifier,
   nsRefPtr<TempDirMemoryFinishCallback> finishDumping =
     new TempDirMemoryFinishCallback(reportsTmpFile, reportsFinalFilename);
 
-  nsRefPtr<nsGZFileWriter> reportsWriter = new nsGZFileWriter();
-  rv = reportsWriter->Init(reportsTmpFile);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  // Dump the memory reports to the file.
-  rv = DumpHeader(reportsWriter);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  // Process reporters.
-  nsCOMPtr<nsIMemoryReporterManager> mgr =
-    do_GetService("@mozilla.org/memory-reporter-manager;1");
-  nsRefPtr<DumpReportCallback> dumpReport =
-    new DumpReportCallback(reportsWriter);
-  nsRefPtr<FinishReportingCallback> finishReporting =
-    new FinishReportingCallback(reportsWriter, finishDumping, nullptr);
-  rv = mgr->GetReportsExtended(dumpReport, nullptr,
-                               finishReporting, nullptr,
-                               aAnonymize,
-                               aMinimizeMemoryUsage,
-                               /* DMDident = */ identifier);
-  return rv;
+  return DumpMemoryInfoToFile(reportsTmpFile, finishDumping, nullptr,
+                              aAnonymize, aMinimizeMemoryUsage, identifier);
 }
 
 #ifdef MOZ_DMD
@@ -872,33 +886,10 @@ nsMemoryInfoDumper::DumpMemoryReportsToNamedFile(
     }
   }
 
-  // Write the memory reports to the file.
-
-  nsRefPtr<nsGZFileWriter> reportsWriter = new nsGZFileWriter();
-  rv = reportsWriter->Init(reportsFile);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  rv = DumpHeader(reportsWriter);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  // Process reports and finish up.
-  nsCOMPtr<nsIMemoryReporterManager> mgr =
-    do_GetService("@mozilla.org/memory-reporter-manager;1");
-  nsRefPtr<DumpReportCallback> dumpReport =
-    new DumpReportCallback(reportsWriter);
-  nsRefPtr<FinishReportingCallback> finishReporting =
-    new FinishReportingCallback(reportsWriter, aFinishDumping,
-                                aFinishDumpingData);
-  rv = mgr->GetReportsExtended(dumpReport, nullptr,
-                               finishReporting, nullptr,
-                               aAnonymize,
-                               /* minimizeMemoryUsage = */ false,
-                               /* DMDident = */ EmptyString());
-  return rv;
+  nsString dmdIdent = EmptyString();
+  return DumpMemoryInfoToFile(reportsFile, aFinishDumping, aFinishDumpingData,
+                              aAnonymize, /* minimizeMemoryUsage = */ false,
+                              dmdIdent);
 }
 
 #undef DUMP

From 03c5fb0c7d2f505d6ba049e111c16354fa1585a9 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 10 Sep 2014 00:40:36 -0700
Subject: [PATCH 063/109] Bug 1065258 (part 7) - Move
 DumpMemoryReportsToNamedFile earlier. r=jld.

--HG--
extra : rebase_source : b9f6289c6ed0010997d1e21fd461a802d1895cf0
---
 xpcom/base/nsMemoryInfoDumper.cpp | 82 +++++++++++++++----------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
index 5ad1882bab32..49586c8375f2 100644
--- a/xpcom/base/nsMemoryInfoDumper.cpp
+++ b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -741,6 +741,47 @@ DumpMemoryInfoToFile(
   return rv;
 }
 
+NS_IMETHODIMP
+nsMemoryInfoDumper::DumpMemoryReportsToNamedFile(
+  const nsAString& aFilename,
+  nsIFinishDumpingCallback* aFinishDumping,
+  nsISupports* aFinishDumpingData,
+  bool aAnonymize)
+{
+  MOZ_ASSERT(!aFilename.IsEmpty());
+
+  // Create the file.
+
+  nsCOMPtr<nsIFile> reportsFile;
+  nsresult rv = NS_NewLocalFile(aFilename, false, getter_AddRefs(reportsFile));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  reportsFile->InitWithPath(aFilename);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  bool exists;
+  rv = reportsFile->Exists(&exists);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  if (!exists) {
+    rv = reportsFile->Create(nsIFile::NORMAL_FILE_TYPE, 0644);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+  }
+
+  nsString dmdIdent = EmptyString();
+  return DumpMemoryInfoToFile(reportsFile, aFinishDumping, aFinishDumpingData,
+                              aAnonymize, /* minimizeMemoryUsage = */ false,
+                              dmdIdent);
+}
+
 NS_IMETHODIMP
 nsMemoryInfoDumper::DumpMemoryInfoToTempDir(const nsAString& aIdentifier,
                                             bool aAnonymize,
@@ -851,45 +892,4 @@ nsMemoryInfoDumper::DumpDMDToFile(FILE* aFile)
 }
 #endif  // MOZ_DMD
 
-NS_IMETHODIMP
-nsMemoryInfoDumper::DumpMemoryReportsToNamedFile(
-  const nsAString& aFilename,
-  nsIFinishDumpingCallback* aFinishDumping,
-  nsISupports* aFinishDumpingData,
-  bool aAnonymize)
-{
-  MOZ_ASSERT(!aFilename.IsEmpty());
-
-  // Create the file.
-
-  nsCOMPtr<nsIFile> reportsFile;
-  nsresult rv = NS_NewLocalFile(aFilename, false, getter_AddRefs(reportsFile));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  reportsFile->InitWithPath(aFilename);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  bool exists;
-  rv = reportsFile->Exists(&exists);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  if (!exists) {
-    rv = reportsFile->Create(nsIFile::NORMAL_FILE_TYPE, 0644);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-  }
-
-  nsString dmdIdent = EmptyString();
-  return DumpMemoryInfoToFile(reportsFile, aFinishDumping, aFinishDumpingData,
-                              aAnonymize, /* minimizeMemoryUsage = */ false,
-                              dmdIdent);
-}
-
 #undef DUMP

From 0b66ceae913a6d47594c7b77f91ef7641271ddbf Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 10 Sep 2014 00:41:50 -0700
Subject: [PATCH 064/109] Bug 1065258 (part 8) - Rename
 TempDirMemoryFinishCallback. r=jld.

--HG--
extra : rebase_source : c478218da5d45e091156aa4dc9d64514f71d403d
---
 xpcom/base/nsMemoryInfoDumper.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
index 49586c8375f2..5e9b0ebb017c 100644
--- a/xpcom/base/nsMemoryInfoDumper.cpp
+++ b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -623,13 +623,13 @@ private:
 
 NS_IMPL_ISUPPORTS(FinishReportingCallback, nsIFinishReportingCallback)
 
-class TempDirMemoryFinishCallback MOZ_FINAL : public nsIFinishDumpingCallback
+class TempDirFinishCallback MOZ_FINAL : public nsIFinishDumpingCallback
 {
 public:
   NS_DECL_ISUPPORTS
 
-  TempDirMemoryFinishCallback(nsIFile* aReportsTmpFile,
-                              const nsCString& aReportsFinalFilename)
+  TempDirFinishCallback(nsIFile* aReportsTmpFile,
+                        const nsCString& aReportsFinalFilename)
     : mReportsTmpFile(aReportsTmpFile)
     , mReportsFilename(aReportsFinalFilename)
   {
@@ -696,13 +696,13 @@ public:
   }
 
 private:
-  ~TempDirMemoryFinishCallback() {}
+  ~TempDirFinishCallback() {}
 
   nsCOMPtr<nsIFile> mReportsTmpFile;
   nsCString mReportsFilename;
 };
 
-NS_IMPL_ISUPPORTS(TempDirMemoryFinishCallback, nsIFinishDumpingCallback)
+NS_IMPL_ISUPPORTS(TempDirFinishCallback, nsIFinishDumpingCallback)
 
 static nsresult
 DumpMemoryInfoToFile(
@@ -823,8 +823,8 @@ nsMemoryInfoDumper::DumpMemoryInfoToTempDir(const nsAString& aIdentifier,
     return rv;
   }
 
-  nsRefPtr<TempDirMemoryFinishCallback> finishDumping =
-    new TempDirMemoryFinishCallback(reportsTmpFile, reportsFinalFilename);
+  nsRefPtr<TempDirFinishCallback> finishDumping =
+    new TempDirFinishCallback(reportsTmpFile, reportsFinalFilename);
 
   return DumpMemoryInfoToFile(reportsTmpFile, finishDumping, nullptr,
                               aAnonymize, aMinimizeMemoryUsage, identifier);

From 803f42286282b724738ce09de0e1333ea64b6bdb Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 11 Sep 2014 01:24:17 -0400
Subject: [PATCH 065/109] Backed out changeset 5a952abc6c2f (bug 1035454) for
 Android debug M4 permafail.

--HG--
extra : rebase_source : 3e27fb16750f0df9bda5d83138bebf5932adc3fd
---
 dom/apps/AppsServiceChild.jsm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dom/apps/AppsServiceChild.jsm b/dom/apps/AppsServiceChild.jsm
index 5c50652995de..6d041c32b151 100644
--- a/dom/apps/AppsServiceChild.jsm
+++ b/dom/apps/AppsServiceChild.jsm
@@ -131,6 +131,9 @@ this.DOMApplicationRegistry = {
     APPS_IPC_MSG_NAMES.forEach((aMsgName) => {
       this.cpmm.removeMessageListener(aMsgName, this);
     });
+
+    this.cpmm.sendAsyncMessage("Webapps:UnregisterForMessages",
+                               APPS_IPC_MSG_NAMES)
   },
 
   receiveMessage: function receiveMessage(aMessage) {

From 92f6e200f6c0e1535a9bd318aa74ec2b8de45e86 Mon Sep 17 00:00:00 2001
From: Nick Lebedev <nicklebedev37@gmail.com>
Date: Wed, 10 Sep 2014 09:49:00 +0200
Subject: [PATCH 066/109] Bug 949008 - Rework accessing the treeManager to use
 private method which ensures that lock isn't held. r=kats

---
 gfx/layers/apz/src/AsyncPanZoomController.cpp | 34 +++++++++++--------
 gfx/layers/apz/src/AsyncPanZoomController.h   |  7 ++++
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp
index 6ea2ad74b7bb..d55fcac42f24 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -1280,7 +1280,7 @@ nsEventStatus AsyncPanZoomController::OnTouchEnd(const MultiTouchInput& aEvent)
     // Make a local copy of the tree manager pointer and check that it's not
     // null before calling DispatchFling(). This is necessary because Destroy(),
     // which nulls out mTreeManager, could be called concurrently.
-    if (APZCTreeManager* treeManagerLocal = mTreeManager) {
+    if (APZCTreeManager* treeManagerLocal = GetApzcTreeManager()) {
       treeManagerLocal->DispatchFling(this,
                                       flingVelocity,
                                       CurrentTouchBlock()->GetOverscrollHandoffChain(),
@@ -1452,8 +1452,7 @@ nsEventStatus AsyncPanZoomController::OnScaleEnd(const PinchGestureInput& aEvent
 bool
 AsyncPanZoomController::ConvertToGecko(const ScreenPoint& aPoint, CSSPoint* aOut)
 {
-  APZCTreeManager* treeManagerLocal = mTreeManager;
-  if (treeManagerLocal) {
+  if (APZCTreeManager* treeManagerLocal = GetApzcTreeManager()) {
     Matrix4x4 transformToGecko = treeManagerLocal->GetApzcToGeckoTransform(this);
     Point result = transformToGecko * Point(aPoint.x, aPoint.y);
     // NOTE: This isn't *quite* LayoutDevicePoint, we just don't have a name
@@ -1709,7 +1708,7 @@ static void TransformVector(const Matrix4x4& aTransform,
 
 void AsyncPanZoomController::ToGlobalScreenCoordinates(ScreenPoint* aVector,
                                                        const ScreenPoint& aAnchor) const {
-  if (APZCTreeManager* treeManagerLocal = mTreeManager) {
+  if (APZCTreeManager* treeManagerLocal = GetApzcTreeManager()) {
     Matrix4x4 transform = treeManagerLocal->GetScreenToApzcTransform(this);
     transform.Invert();
     TransformVector(transform, aVector, aAnchor);
@@ -1718,7 +1717,7 @@ void AsyncPanZoomController::ToGlobalScreenCoordinates(ScreenPoint* aVector,
 
 void AsyncPanZoomController::ToLocalScreenCoordinates(ScreenPoint* aVector,
                                                       const ScreenPoint& aAnchor) const {
-  if (APZCTreeManager* treeManagerLocal = mTreeManager) {
+  if (APZCTreeManager* treeManagerLocal = GetApzcTreeManager()) {
     Matrix4x4 transform = treeManagerLocal->GetScreenToApzcTransform(this);
     TransformVector(transform, aVector, aAnchor);
   }
@@ -1964,15 +1963,15 @@ bool AsyncPanZoomController::OverscrollBy(const CSSPoint& aOverscroll) {
 }
 
 nsRefPtr<const OverscrollHandoffChain> AsyncPanZoomController::BuildOverscrollHandoffChain() {
-  if (APZCTreeManager* treeManagerLocal = mTreeManager) {
+  if (APZCTreeManager* treeManagerLocal = GetApzcTreeManager()) {
     return treeManagerLocal->BuildOverscrollHandoffChain(this);
-  } else {
-    // This APZC IsDestroyed(). To avoid callers having to special-case this
-    // scenario, just build a 1-element chain containing ourselves.
-    OverscrollHandoffChain* result = new OverscrollHandoffChain;
-    result->Add(this);
-    return result;
   }
+
+  // This APZC IsDestroyed(). To avoid callers having to special-case this
+  // scenario, just build a 1-element chain containing ourselves.
+  OverscrollHandoffChain* result = new OverscrollHandoffChain;
+  result->Add(this);
+  return result;
 }
 
 void AsyncPanZoomController::AcceptFling(const ScreenPoint& aVelocity,
@@ -2001,13 +2000,13 @@ bool AsyncPanZoomController::AttemptFling(ScreenPoint aVelocity,
                 false /* do not allow overscroll */);
     return true;
   }
-  
+
   return false;
 }
 
 void AsyncPanZoomController::HandleFlingOverscroll(const ScreenPoint& aVelocity,
                                                    const nsRefPtr<const OverscrollHandoffChain>& aOverscrollHandoffChain) {
-  APZCTreeManager* treeManagerLocal = mTreeManager;
+  APZCTreeManager* treeManagerLocal = GetApzcTreeManager();
   if (!(treeManagerLocal && treeManagerLocal->DispatchFling(this,
                                                             aVelocity,
                                                             aOverscrollHandoffChain,
@@ -2056,7 +2055,7 @@ bool AsyncPanZoomController::CallDispatchScroll(const ScreenPoint& aStartPoint,
   // Make a local copy of the tree manager pointer and check if it's not
   // null before calling DispatchScroll(). This is necessary because
   // Destroy(), which nulls out mTreeManager, could be called concurrently.
-  APZCTreeManager* treeManagerLocal = mTreeManager;
+  APZCTreeManager* treeManagerLocal = GetApzcTreeManager();
   return treeManagerLocal
       && treeManagerLocal->DispatchScroll(this, aStartPoint, aEndPoint,
                                           aOverscrollHandoffChain,
@@ -2725,6 +2724,11 @@ const FrameMetrics& AsyncPanZoomController::GetFrameMetrics() const {
   return mFrameMetrics;
 }
 
+APZCTreeManager* AsyncPanZoomController::GetApzcTreeManager() const {
+  mMonitor.AssertNotCurrentThreadIn();
+  return mTreeManager;
+}
+
 void AsyncPanZoomController::ZoomToRect(CSSRect aRect) {
   if (!aRect.IsFinite()) {
     NS_WARNING("ZoomToRect got called with a non-finite rect; ignoring...\n");
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.h b/gfx/layers/apz/src/AsyncPanZoomController.h
index 335b8b9d3b01..f5f69d8a38ce 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.h
+++ b/gfx/layers/apz/src/AsyncPanZoomController.h
@@ -572,6 +572,13 @@ protected:
    */
   const FrameMetrics& GetFrameMetrics() const;
 
+  /**
+   * Gets the pointer to the apzc tree manager. All the access to tree manager
+   * should be made via this method and not via private variable since this method
+   * ensures that no lock is set.
+   */
+  APZCTreeManager* GetApzcTreeManager() const;
+
   /**
    * Timeout function for mozbrowserasyncscroll event. Because we throttle
    * mozbrowserasyncscroll events in some conditions, this function ensures

From 61056aa4db6ab4b8baf8d901625401aaeb977266 Mon Sep 17 00:00:00 2001
From: Bob Owen <bobowencode@gmail.com>
Date: Wed, 10 Sep 2014 12:36:17 +0100
Subject: [PATCH 067/109] Bug 1018988 - Set up a low integrity temp directory
 when using the Windows content sandbox. r=mrbkap r=tabraldes r=froydnj

---
 dom/ipc/ContentChild.cpp                      | 65 +++++++++++++++++++
 dom/ipc/ContentChild.h                        |  5 ++
 dom/ipc/ContentProcess.cpp                    |  3 +
 .../win/src/sandboxbroker/sandboxBroker.cpp   | 13 ++--
 xpcom/io/SpecialSystemDirectory.cpp           |  8 +++
 xpcom/io/SpecialSystemDirectory.h             |  3 +
 xpcom/io/nsDirectoryService.cpp               | 51 +++++++++++++++
 xpcom/io/nsDirectoryServiceAtomList.h         |  4 ++
 xpcom/io/nsDirectoryServiceDefs.h             |  4 ++
 9 files changed, 151 insertions(+), 5 deletions(-)

diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index cbbd8ef9fbe0..111af7153167 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -43,6 +43,7 @@
 #if defined(XP_WIN)
 #define TARGET_SANDBOX_EXPORTS
 #include "mozilla/sandboxTarget.h"
+#include "nsDirectoryServiceDefs.h"
 #elif defined(XP_LINUX)
 #include "mozilla/Sandbox.h"
 #endif
@@ -923,6 +924,69 @@ ContentChild::AllocPBackgroundChild(Transport* aTransport,
     return BackgroundChild::Alloc(aTransport, aOtherProcess);
 }
 
+#if defined(XP_WIN) && defined(MOZ_CONTENT_SANDBOX)
+static void
+SetUpSandboxEnvironment()
+{
+    // Set up a low integrity temp directory. This only makes sense if the
+    // delayed integrity level for the content process is INTEGRITY_LEVEL_LOW.
+    nsresult rv;
+    nsCOMPtr<nsIProperties> directoryService =
+        do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+        return;
+    }
+
+    nsCOMPtr<nsIFile> lowIntegrityTemp;
+    rv = directoryService->Get(NS_WIN_LOW_INTEGRITY_TEMP, NS_GET_IID(nsIFile),
+                               getter_AddRefs(lowIntegrityTemp));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+        return;
+    }
+
+    // Undefine returns a failure if the property is not already set.
+    unused << directoryService->Undefine(NS_OS_TEMP_DIR);
+    rv = directoryService->Set(NS_OS_TEMP_DIR, lowIntegrityTemp);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+        return;
+    }
+
+    // Set TEMP and TMP environment variables.
+    nsAutoString lowIntegrityTempPath;
+    rv = lowIntegrityTemp->GetPath(lowIntegrityTempPath);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+        return;
+    }
+
+    bool setOK = SetEnvironmentVariableW(L"TEMP", lowIntegrityTempPath.get());
+    NS_WARN_IF_FALSE(setOK, "Failed to set TEMP to low integrity temp path");
+    setOK = SetEnvironmentVariableW(L"TMP", lowIntegrityTempPath.get());
+    NS_WARN_IF_FALSE(setOK, "Failed to set TMP to low integrity temp path");
+}
+
+void
+ContentChild::CleanUpSandboxEnvironment()
+{
+    nsresult rv;
+    nsCOMPtr<nsIProperties> directoryService =
+        do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+        return;
+    }
+
+    nsCOMPtr<nsIFile> lowIntegrityTemp;
+    rv = directoryService->Get(NS_WIN_LOW_INTEGRITY_TEMP, NS_GET_IID(nsIFile),
+                               getter_AddRefs(lowIntegrityTemp));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+        return;
+    }
+
+    // Don't check the return value as the directory will only have been created
+    // if it has been used.
+    unused << lowIntegrityTemp->Remove(/* aRecursive */ true);
+}
+#endif
+
 bool
 ContentChild::RecvSetProcessSandbox()
 {
@@ -947,6 +1011,7 @@ ContentChild::RecvSetProcessSandbox()
     if (contentSandboxPref.EqualsLiteral("on")
         || contentSandboxPref.EqualsLiteral("warn")) {
         mozilla::SandboxTarget::Instance()->StartSandbox();
+        SetUpSandboxEnvironment();
     }
 #endif
 #endif
diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
index 6f529e7a4a80..c85ff9ab0794 100644
--- a/dom/ipc/ContentChild.h
+++ b/dom/ipc/ContentChild.h
@@ -118,6 +118,11 @@ public:
     AllocPImageBridgeChild(mozilla::ipc::Transport* aTransport,
                            base::ProcessId aOtherProcess) MOZ_OVERRIDE;
 
+#if defined(XP_WIN) && defined(MOZ_CONTENT_SANDBOX)
+    // Cleans up any resources used by the process when sandboxed.
+    void CleanUpSandboxEnvironment();
+#endif
+
     virtual bool RecvSetProcessSandbox() MOZ_OVERRIDE;
 
     PBackgroundChild*
diff --git a/dom/ipc/ContentProcess.cpp b/dom/ipc/ContentProcess.cpp
index bf8e190e63d1..c3037fcd1f53 100644
--- a/dom/ipc/ContentProcess.cpp
+++ b/dom/ipc/ContentProcess.cpp
@@ -34,6 +34,9 @@ ContentProcess::Init()
 void
 ContentProcess::CleanUp()
 {
+#if defined(XP_WIN) && defined(MOZ_CONTENT_SANDBOX)
+    mContent.CleanUpSandboxEnvironment();
+#endif
     mXREEmbed.Stop();
 }
 
diff --git a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
index 39ee19b9e3a6..f1c2d1843fcd 100644
--- a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
+++ b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
@@ -73,13 +73,16 @@ SandboxBroker::SetSecurityLevelForContentProcess(bool inWarnOnlyMode)
 
   auto result = mPolicy->SetJobLevel(sandbox::JOB_NONE, 0);
   bool ret = (sandbox::SBOX_ALL_OK == result);
-  result =
-    mPolicy->SetTokenLevel(sandbox::USER_RESTRICTED_SAME_ACCESS,
-                           sandbox::USER_RESTRICTED_SAME_ACCESS);
+
+  result = mPolicy->SetTokenLevel(sandbox::USER_RESTRICTED_SAME_ACCESS,
+                                  sandbox::USER_RESTRICTED_SAME_ACCESS);
   ret = ret && (sandbox::SBOX_ALL_OK == result);
-  result =
-    mPolicy->SetDelayedIntegrityLevel(sandbox::INTEGRITY_LEVEL_LOW);
+
+  // If the delayed integrity level is changed then SetUpSandboxEnvironment and
+  // CleanUpSandboxEnvironment in ContentChild should be changed or removed.
+  result = mPolicy->SetDelayedIntegrityLevel(sandbox::INTEGRITY_LEVEL_LOW);
   ret = ret && (sandbox::SBOX_ALL_OK == result);
+
   result = mPolicy->SetAlternateDesktop(true);
   ret = ret && (sandbox::SBOX_ALL_OK == result);
 
diff --git a/xpcom/io/SpecialSystemDirectory.cpp b/xpcom/io/SpecialSystemDirectory.cpp
index 939032f310ad..8bad192d9647 100644
--- a/xpcom/io/SpecialSystemDirectory.cpp
+++ b/xpcom/io/SpecialSystemDirectory.cpp
@@ -751,6 +751,14 @@ GetSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory,
       }
       return rv;
     }
+#if defined(MOZ_CONTENT_SANDBOX)
+    case Win_LocalAppdataLow: {
+      // This should only really fail on versions pre-Vista, in which case this
+      // shouldn't have been used in the first place.
+      GUID localAppDataLowGuid = FOLDERID_LocalAppDataLow;
+      return GetKnownFolder(&localAppDataLowGuid, aFile);
+    }
+#endif
     case Win_Documents: {
       return GetLibrarySaveToPath(CSIDL_MYDOCUMENTS,
                                   FOLDERID_DocumentsLibrary,
diff --git a/xpcom/io/SpecialSystemDirectory.h b/xpcom/io/SpecialSystemDirectory.h
index 9142f2278ee1..dd3d88379580 100644
--- a/xpcom/io/SpecialSystemDirectory.h
+++ b/xpcom/io/SpecialSystemDirectory.h
@@ -79,6 +79,9 @@ enum SystemDirectories {
   Win_Pictures              =   233,
   Win_Music                 =   234,
   Win_Videos                =   235,
+#if defined(MOZ_CONTENT_SANDBOX)
+  Win_LocalAppdataLow       =   236,
+#endif
 
   Unix_LocalDirectory       =   301,
   Unix_LibDirectory         =   302,
diff --git a/xpcom/io/nsDirectoryService.cpp b/xpcom/io/nsDirectoryService.cpp
index c1e231d51df5..a7c3d3222602 100644
--- a/xpcom/io/nsDirectoryService.cpp
+++ b/xpcom/io/nsDirectoryService.cpp
@@ -24,6 +24,10 @@
 #include <shlobj.h>
 #include <stdlib.h>
 #include <stdio.h>
+
+#if defined(MOZ_CONTENT_SANDBOX)
+#include "nsIUUIDGenerator.h"
+#endif
 #elif defined(XP_UNIX)
 #include <unistd.h>
 #include <stdlib.h>
@@ -499,6 +503,47 @@ nsDirectoryService::UnregisterProvider(nsIDirectoryServiceProvider* aProv)
   return NS_OK;
 }
 
+#if defined(MOZ_CONTENT_SANDBOX) && defined(XP_WIN)
+static nsresult
+GetLowIntegrityTemp(nsIFile** aLowIntegrityTemp)
+{
+  nsCOMPtr<nsIFile> localFile;
+  nsresult rv = GetSpecialSystemDirectory(Win_LocalAppdataLow,
+                                          getter_AddRefs(localFile));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  nsCOMPtr<nsIUUIDGenerator> uuidgen =
+    do_GetService("@mozilla.org/uuid-generator;1", &rv);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  nsID uuid;
+  rv = uuidgen->GenerateUUIDInPlace(&uuid);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  char uuidChars[NSID_LENGTH];
+  uuid.ToProvidedString(uuidChars);
+  rv = localFile->AppendNative(NS_LITERAL_CSTRING(MOZ_USER_DIR));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  rv = localFile->AppendNative(NS_LITERAL_CSTRING("MozTemp-")
+                               + nsDependentCString(uuidChars));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  localFile.forget(aLowIntegrityTemp);
+  return rv;
+}
+#endif
+
 // DO NOT ADD ANY LOCATIONS TO THIS FUNCTION UNTIL YOU TALK TO: dougt@netscape.com.
 // This is meant to be a place of xpcom or system specific file locations, not
 // application specific locations.  If you need the later, register a callback for
@@ -671,6 +716,12 @@ nsDirectoryService::GetFile(const char* aProp, bool* aPersistent,
     rv = GetSpecialSystemDirectory(Win_Appdata, getter_AddRefs(localFile));
   } else if (inAtom == nsDirectoryService::sLocalAppdata) {
     rv = GetSpecialSystemDirectory(Win_LocalAppdata, getter_AddRefs(localFile));
+#if defined(MOZ_CONTENT_SANDBOX)
+  } else if (inAtom == nsDirectoryService::sLocalAppdataLow) {
+    rv = GetSpecialSystemDirectory(Win_LocalAppdataLow, getter_AddRefs(localFile));
+  } else if (inAtom == nsDirectoryService::sLowIntegrityTemp) {
+    rv = GetLowIntegrityTemp(getter_AddRefs(localFile));
+#endif
   } else if (inAtom == nsDirectoryService::sPrinthood) {
     rv = GetSpecialSystemDirectory(Win_Printhood, getter_AddRefs(localFile));
   } else if (inAtom == nsDirectoryService::sWinCookiesDirectory) {
diff --git a/xpcom/io/nsDirectoryServiceAtomList.h b/xpcom/io/nsDirectoryServiceAtomList.h
index b6bf658631ab..d61446a525c2 100644
--- a/xpcom/io/nsDirectoryServiceAtomList.h
+++ b/xpcom/io/nsDirectoryServiceAtomList.h
@@ -71,6 +71,10 @@ DIR_ATOM(sCommon_Desktopdirectory, NS_WIN_COMMON_DESKTOP_DIRECTORY)
 DIR_ATOM(sCommon_AppData, NS_WIN_COMMON_APPDATA_DIR)
 DIR_ATOM(sAppdata, NS_WIN_APPDATA_DIR)
 DIR_ATOM(sLocalAppdata, NS_WIN_LOCAL_APPDATA_DIR)
+#if defined(MOZ_CONTENT_SANDBOX)
+DIR_ATOM(sLocalAppdataLow, NS_WIN_LOCAL_APPDATA_LOW_DIR)
+DIR_ATOM(sLowIntegrityTemp, NS_WIN_LOW_INTEGRITY_TEMP)
+#endif
 DIR_ATOM(sPrinthood, NS_WIN_PRINTHOOD)
 DIR_ATOM(sWinCookiesDirectory, NS_WIN_COOKIES_DIR)
 DIR_ATOM(sDefaultDownloadDirectory, NS_WIN_DEFAULT_DOWNLOAD_DIR)
diff --git a/xpcom/io/nsDirectoryServiceDefs.h b/xpcom/io/nsDirectoryServiceDefs.h
index 0c4a474f08f3..d0e3df51e344 100644
--- a/xpcom/io/nsDirectoryServiceDefs.h
+++ b/xpcom/io/nsDirectoryServiceDefs.h
@@ -120,6 +120,10 @@
   #define NS_WIN_COMMON_APPDATA_DIR           "CmAppData"
   #define NS_WIN_APPDATA_DIR                  "AppData"
   #define NS_WIN_LOCAL_APPDATA_DIR            "LocalAppData"
+#if defined(MOZ_CONTENT_SANDBOX)
+  #define NS_WIN_LOCAL_APPDATA_LOW_DIR        "LocalAppDataLow"
+  #define NS_WIN_LOW_INTEGRITY_TEMP           "LowTmpD"
+#endif
   #define NS_WIN_PRINTHOOD                    "PrntHd"
   #define NS_WIN_COOKIES_DIR                  "CookD"
   #define NS_WIN_DEFAULT_DOWNLOAD_DIR         "DfltDwnld"

From 8e9527554b10c86e80d5f28958aa51713debde0b Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@vfemail.net>
Date: Tue, 9 Sep 2014 23:41:00 +0200
Subject: [PATCH 068/109] Bug 1065241 - Unbreak build on non-SPS platforms
 after bug 1049258. r=mchang

---
 gfx/layers/composite/ContainerLayerComposite.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gfx/layers/composite/ContainerLayerComposite.cpp b/gfx/layers/composite/ContainerLayerComposite.cpp
index 60ab71690848..c03ace592e14 100644
--- a/gfx/layers/composite/ContainerLayerComposite.cpp
+++ b/gfx/layers/composite/ContainerLayerComposite.cpp
@@ -36,7 +36,9 @@
 #include "TextRenderer.h"               // for TextRenderer
 #include <vector>
 #include "GeckoProfiler.h"              // for GeckoProfiler
+#ifdef MOZ_ENABLE_PROFILER_SPS
 #include "ProfilerMarkers.h"            // for ProfilerMarkers
+#endif
 
 #define CULLING_LOG(...)
 // #define CULLING_LOG(...) printf_stderr("CULLING: " __VA_ARGS__)
@@ -117,6 +119,7 @@ static void DrawLayerInfo(const RenderTargetIntRect& aClipRect,
 
 static void PrintUniformityInfo(Layer* aLayer)
 {
+#ifdef MOZ_ENABLE_PROFILER_SPS
   if (!profiler_is_active()) {
     return;
   }
@@ -135,6 +138,7 @@ static void PrintUniformityInfo(Layer* aLayer)
   Point translation = transform.As2D().GetTranslation();
   LayerTranslationPayload* payload = new LayerTranslationPayload(aLayer, translation);
   PROFILER_MARKER_PAYLOAD("LayerTranslation", payload);
+#endif
 }
 
 /* all of the per-layer prepared data we need to maintain */

From 1ef04f1195a8d2a0a8609d38994ba528ea24f243 Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Tue, 9 Sep 2014 23:40:00 +0200
Subject: [PATCH 069/109] Bug 1065252 - Ignore Emacs .dir-locals.el. r=ted

Ignore Emacs's directory variable files .dir-locals.el in all directory.
It allows me to write ((c-mode . ((mode . c++)))) to view all .h files
in C++ mode especially for those .h files generated by IDL without
proper Emacs modeline.

DONTBUILD because NPOTB
---
 .gitignore | 3 +++
 .hgignore  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index acd30a47ed36..5d4dca0b1476 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,9 @@ ID
 # Vim swap files.
 .*.sw[a-z]
 
+# Emacs directory variable files.
+**/.dir-locals.el
+
 # User files that may appear at the root
 /.mozconfig*
 /mozconfig
diff --git a/.hgignore b/.hgignore
index 1fed800c1155..19916357f474 100644
--- a/.hgignore
+++ b/.hgignore
@@ -11,6 +11,9 @@
 ^\.sw.$
 .[^/]*\.sw.$
 
+# Emacs directory variable files.
+\.dir-locals\.el
+
 # User files that may appear at the root
 ^\.mozconfig
 ^mozconfig*

From a93950cbe35e66cf9cb901ac9e950b9be5570d90 Mon Sep 17 00:00:00 2001
From: Dave Hunt <dhunt@mozilla.com>
Date: Wed, 10 Sep 2014 06:15:00 +0200
Subject: [PATCH 070/109] Bug 1064976 - HTML structured log formatter raises
 UnboundLocalError. r=wlachance

---
 .../mozbase/mozlog/mozlog/structured/formatters/html/html.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mozbase/mozlog/mozlog/structured/formatters/html/html.py b/testing/mozbase/mozlog/mozlog/structured/formatters/html/html.py
index d4ad341effa1..e32e97438314 100755
--- a/testing/mozbase/mozlog/mozlog/structured/formatters/html/html.py
+++ b/testing/mozbase/mozlog/mozlog/structured/formatters/html/html.py
@@ -61,7 +61,7 @@ class HTMLFormatter(base.BaseFormatter):
         debug = data.get("extra", {})
         links_html = []
 
-        status = data["status"]
+        status = status_name = data["status"]
         expected = data.get("expected", status)
 
         if status != expected:

From 6b00feef66f7e14e0fa32f874aad1087fc5dc42b Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Thu, 11 Sep 2014 07:58:37 +0200
Subject: [PATCH 071/109] Bug 1065055: also define IS_{LITTLE,BIG}_ENDIAN
 according to BYTE_ORDER, r=njn

---
 js/src/jscpucfg.h | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/js/src/jscpucfg.h b/js/src/jscpucfg.h
index a7a00613bbe6..a641e523ba99 100644
--- a/js/src/jscpucfg.h
+++ b/js/src/jscpucfg.h
@@ -39,16 +39,36 @@
 #elif defined(JS_HAVE_ENDIAN_H)
 # include <endian.h>
 
-# if defined(__BYTE_ORDER)
-#  if __BYTE_ORDER == __LITTLE_ENDIAN
-#   define IS_LITTLE_ENDIAN 1
-#   undef  IS_BIG_ENDIAN
-#  elif __BYTE_ORDER == __BIG_ENDIAN
-#   undef  IS_LITTLE_ENDIAN
-#   define IS_BIG_ENDIAN 1
+/*
+ * Historically, OSes providing <endian.h> only defined
+ * __BYTE_ORDER to either __LITTLE_ENDIAN or __BIG_ENDIAN.
+ * The Austin group decided to standardise <endian.h> in
+ * POSIX around 2011, expecting it to provide a BYTE_ORDER
+ * #define set to either LITTLE_ENDIAN or BIG_ENDIAN. We
+ * should try to cope with both possibilities here.
+ */
+
+# if defined(__BYTE_ORDER) || defined(BYTE_ORDER)
+#  if defined(__BYTE_ORDER)
+#   if __BYTE_ORDER == __LITTLE_ENDIAN
+#    define IS_LITTLE_ENDIAN 1
+#    undef  IS_BIG_ENDIAN
+#   elif __BYTE_ORDER == __BIG_ENDIAN
+#    undef  IS_LITTLE_ENDIAN
+#    define IS_BIG_ENDIAN 1
+#   endif
+#  endif
+#  if defined(BYTE_ORDER)
+#   if BYTE_ORDER == LITTLE_ENDIAN
+#    define IS_LITTLE_ENDIAN 1
+#    undef  IS_BIG_ENDIAN
+#   elif BYTE_ORDER == BIG_ENDIAN
+#    undef  IS_LITTLE_ENDIAN
+#    define IS_BIG_ENDIAN 1
+#   endif
 #  endif
 # else /* !defined(__BYTE_ORDER) */
-#  error "endian.h does not define __BYTE_ORDER. Cannot determine endianness."
+#  error "endian.h does not define __BYTE_ORDER nor BYTE_ORDER. Cannot determine endianness."
 # endif
 
 /* BSDs */

From 95d0877f5c4b38dfd3bcd6b7e15135322942aa83 Mon Sep 17 00:00:00 2001
From: chiajung hung <chung@mozilla.com>
Date: Wed, 10 Sep 2014 23:04:00 +0200
Subject: [PATCH 072/109] Bug 1065759 - Fix a nit in
 CanvasRenderingContext2D::EnsureTarget. r=gwright

---
 dom/canvas/CanvasRenderingContext2D.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
index 94b5368c2503..909b7669ffe0 100644
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -991,9 +991,10 @@ CanvasRenderingContext2D::EnsureTarget(RenderingMode aRenderingMode)
         if (!mTarget) {
           mTarget = layerManager->CreateDrawTarget(size, format);
         }
-      } else
+      } else {
         mTarget = layerManager->CreateDrawTarget(size, format);
         mode = RenderingMode::SoftwareBackendMode;
+      }
      } else {
         mTarget = gfxPlatform::GetPlatform()->CreateOffscreenCanvasDrawTarget(size, format);
         mode = RenderingMode::SoftwareBackendMode;

From e2ae3f60c2f7c1f109947da8a8be75e671e4d5b1 Mon Sep 17 00:00:00 2001
From: "Roberto A. Vitillo" <rvitillo@mozilla.com>
Date: Wed, 10 Sep 2014 15:11:00 +0200
Subject: [PATCH 073/109] Bug 1045108 - Forcibly set the expiration version for
 outstanding probes. r=vladan

---
 toolkit/components/telemetry/Histograms.json | 630 +++++++++----------
 toolkit/components/telemetry/Telemetry.cpp   |   3 +-
 2 files changed, 317 insertions(+), 316 deletions(-)

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index b41f3bc1b50a..bd7a6fa4fb30 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -5,23 +5,23 @@
     "description": "has accessibility support been instantiated"
   },
   "A11Y_CONSUMERS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": 11,
     "description": "Accessibility client by enum id"
   },
   "A11Y_ISIMPLEDOM_USAGE_FLAG": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "flag",
     "description": "have the ISimpleDOM* accessibility interfaces been used"
   },
   "A11Y_IATABLE_USAGE_FLAG": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "flag",
     "description": "has the IAccessibleTable accessibility interface been used"
   },
   "A11Y_UPDATE_TIME": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 50,
@@ -57,14 +57,14 @@
     "description": "Application reputation query count (both local and remote)"
   },
   "AUDIOSTREAM_FIRST_OPEN_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": "50",
     "description": "The length of time (in milliseconds) for the first open of AudioStream."
   },
   "AUDIOSTREAM_LATER_OPEN_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": "50",
@@ -307,14 +307,14 @@
     "description": "Time spent sweeping slowest compartment SCC (ms)"
   },
   "GEOLOCATION_ACCURACY": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "linear",
     "high": "18000",
     "n_buckets": 200,
     "description": "Location accuracy"
   },
   "GEOLOCATION_ERROR": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Has seen location error"
   },
@@ -325,7 +325,7 @@
     "description": "Use of SpiderMonkey's deprecated language extensions in web content: ForEach, DestructuringForIn, LegacyGenerator, ExpressionClosure"
   },
   "TELEMETRY_PING": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -333,12 +333,12 @@
     "description": "Time taken to submit telemetry info (ms)"
   },
   "TELEMETRY_SUCCESS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "Successful telemetry submission"
   },
   "XUL_CACHE_DISABLED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "flag",
     "description": "XUL cache was disabled"
   },
@@ -509,7 +509,7 @@
   },
   "EARLY_GLUESTARTUP_READ_OPS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "100",
     "n_buckets": 12,
@@ -518,7 +518,7 @@
   },
   "EARLY_GLUESTARTUP_READ_TRANSFER": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "50 * 1024",
     "n_buckets": 12,
@@ -528,7 +528,7 @@
   },
   "GLUESTARTUP_READ_OPS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "linear",
     "high": "100",
     "n_buckets": 12,
@@ -537,7 +537,7 @@
   },
   "GLUESTARTUP_READ_TRANSFER": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "50 * 1024",
     "n_buckets": 12,
@@ -547,7 +547,7 @@
   },
   "EARLY_GLUESTARTUP_HARD_FAULTS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "100",
     "n_buckets": 12,
@@ -556,7 +556,7 @@
   },
   "GLUESTARTUP_HARD_FAULTS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "500",
     "n_buckets": 12,
@@ -565,7 +565,7 @@
     "cpp_guard": "XP_UNIX"
   },
   "PAGE_FAULTS_HARD": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "low": 8,
     "high": "64 * 1024",
@@ -591,7 +591,7 @@
     "description": "Time(ms) spent on reading family names from all fonts"
   },
   "DWRITEFONT_INITFONTLIST_TOTAL": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 10,
@@ -600,7 +600,7 @@
     "cpp_guard": "XP_WIN"
   },
   "DWRITEFONT_INITFONTLIST_INIT": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 10,
@@ -609,7 +609,7 @@
     "cpp_guard": "XP_WIN"
   },
   "DWRITEFONT_INITFONTLIST_GDI": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 10,
@@ -636,7 +636,7 @@
     "cpp_guard": "XP_WIN"
   },
   "DWRITEFONT_DELAYEDINITFONTLIST_GDI_TABLE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "gfxDWriteFontList::DelayedInitFontList GDI Table Access",
     "cpp_guard": "XP_WIN"
@@ -651,7 +651,7 @@
     "cpp_guard": "XP_WIN"
   },
   "DWRITEFONT_DELAYEDINITFONTLIST_ITERATE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 10,
@@ -700,7 +700,7 @@
     "description": "System font fallback script"
   },
   "GRADIENT_DURATION": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "50000000",
     "n_buckets": 20,
@@ -714,7 +714,7 @@
     "description": "Maximum retention time for the gradient cache. (ms)"
   },
   "STARTUP_CACHE_AGE_HOURS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 20,
@@ -723,7 +723,7 @@
   },
   "STARTUP_CACHE_INVALID": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Was the disk startup cache file detected as invalid"
   },
@@ -766,12 +766,12 @@
     "description": "system fallback font can't be used"
   },
   "SHUTDOWN_OK": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "Did the browser start after a successful shutdown"
   },
   "IMAGE_DECODE_LATENCY_US": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 50,
     "high": "5000000",
@@ -779,7 +779,7 @@
     "description": "Time spent decoding an image chunk (us)"
   },
   "IMAGE_DECODE_TIME": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "low": 50,
     "high": "50000000",
@@ -787,7 +787,7 @@
     "description": "Time spent decoding an image (us)"
   },
   "IMAGE_DECODE_ON_DRAW_LATENCY": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 50,
     "high": "50000000",
@@ -795,28 +795,28 @@
     "description": "Time from starting a decode to it showing up on the screen (us)"
   },
   "IMAGE_DECODE_CHUNKS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "500",
     "n_buckets": 50,
     "description": "Number of chunks per decode attempt"
   },
   "IMAGE_DECODE_COUNT": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "500",
     "n_buckets": 50,
     "description": "Decode count"
   },
   "IMAGE_MAX_DECODE_COUNT": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 100,
     "description": "Max decode count over all images"
   },
   "IMAGE_DECODE_SPEED_JPEG": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "low": 500,
     "high": "50000000",
@@ -824,7 +824,7 @@
     "description": "JPEG image decode speed (Kbytes/sec)"
   },
   "IMAGE_DECODE_SPEED_GIF": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 500,
     "high": "50000000",
@@ -832,7 +832,7 @@
     "description": "GIF image decode speed (Kbytes/sec)"
   },
   "IMAGE_DECODE_SPEED_PNG": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 500,
     "high": "50000000",
@@ -840,18 +840,18 @@
     "description": "PNG image decode speed (Kbytes/sec)"
   },
   "CANVAS_2D_USED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "2D canvas used"
   },
   "CANVAS_WEBGL_USED": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "WebGL canvas used"
   },
   "TOTAL_CONTENT_PAGE_LOAD_TIME": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 100,
     "high": "30000",
@@ -1432,28 +1432,28 @@
     "description": "SPDY: Settings IW (rounded to KB)"
   },
   "DISK_CACHE_CORRUPT_DETAILS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "enumerated",
     "n_values": 50,
     "description": "Why the HTTP disk cache was corrupted at startup"
   },
   "DISK_CACHE_REDUCTION_TRIAL": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Stores 1 if the cache would be clean with the disk cache corruption plan of Bug 105843"
   },
   "DISK_CACHE_REVALIDATION_SAFE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Stores 1 if the cache clean file was revalidated, or 0 if a non empty doom list prevented revalidation"
   },
   "DISK_CACHE_INVALIDATION_SUCCESS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Stores 1 if writing '0' to the cache clean file succeeded, and 0 if it failed."
   },
   "DISK_CACHE_REVALIDATION_SUCCESS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Stores 1 if writing '1' to the cache clean file succeeded, and 0 if it failed."
   },
@@ -1530,7 +1530,7 @@
     "description": "Time to search cache (ms)"
   },
   "CACHE_MEMORY_SEARCH_2": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 50,
@@ -1538,7 +1538,7 @@
     "description": "Time to search memory cache (ms)"
   },
   "CACHE_DISK_SEARCH_2": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 50,
@@ -1578,7 +1578,7 @@
     "description": "Time from submission to dispatch of SPDY transaction (ms)"
   },
   "HTTP_DISK_CACHE_OVERHEAD": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "32000000",
     "n_buckets": 100,
@@ -1605,7 +1605,7 @@
     "description": "Time spent waiting on the cache service lock on the main thread (ms)"
   },
   "DISK_CACHE_SMART_SIZE_USING_OLD_MAX": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Whether we are using the old default cache smart size"
   },
@@ -1680,7 +1680,7 @@
     "description": "Time spent waiting on the cache service lock (ms) on the main thread in NSDECOMPRESSINPUTSTREAMWRAPPER_RELEASE"
   },
   "CACHE_SERVICE_LOCK_WAIT_MAINTHREAD_NSEVICTDISKCACHEENTRIESEVENT_RUN": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10 * 1000",
     "n_buckets": 50,
@@ -1694,28 +1694,28 @@
     "description": "Time spent waiting on the cache service lock (ms) on the main thread in NSDOOMEVENT_RUN"
   },
   "CACHE_SERVICE_LOCK_WAIT_MAINTHREAD_NSDISKCACHESTREAMIO_WRITE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10 * 1000",
     "n_buckets": 50,
     "description": "Time spent waiting on the cache service lock (ms) on the main thread in NSDISKCACHESTREAMIO_WRITE"
   },
   "CACHE_SERVICE_LOCK_WAIT_MAINTHREAD_NSDISKCACHESTREAMIO_CLOSEOUTPUTSTREAM": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10 * 1000",
     "n_buckets": 50,
     "description": "Time spent waiting on the cache service lock (ms) on the main thread in NSDISKCACHESTREAMIO_CLOSEOUTPUTSTREAM"
   },
   "CACHE_SERVICE_LOCK_WAIT_MAINTHREAD_NSDISKCACHEDEVICEDEACTIVATEENTRYEVENT_RUN": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10 * 1000",
     "n_buckets": 50,
     "description": "Time spent waiting on the cache service lock (ms) on the main thread in NSDISKCACHEDEVICEDEACTIVATEENTRYEVENT_RUN"
   },
   "CACHE_SERVICE_LOCK_WAIT_MAINTHREAD_NSDISKCACHEBINDING_DESTRUCTOR": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10 * 1000",
     "n_buckets": 50,
@@ -2086,7 +2086,7 @@
     "description": "Time spent waiting on the cache service lock (ms) on the main thread in NSBLOCKONCACHETHREADEVENT_RUN"
   },
   "CACHE_SERVICE_LOCK_WAIT_MAINTHREAD_NSDISKCACHEMAP_REVALIDATION": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10 * 1000",
     "n_buckets": 50,
@@ -2306,52 +2306,52 @@
     "description": "How long it takes from the time Predict() is called to the time we figure out there's nothing to do"
   },
   "PREDICTOR_CLEANUP_DELTA": {
-      "expires_in_version": "never",
+      "expires_in_version": "40",
       "kind": "exponential",
       "high": "60000",
       "n_buckets": 50,
       "description": "How long between predictor db cleanups, in ms"
   },
   "PREDICTOR_CLEANUP_SUCCEEDED": {
-      "expires_in_version": "never",
+      "expires_in_version": "40",
       "kind": "boolean",
       "description": "Whether or not the predictor cleanup succeeded"
   },
   "PREDICTOR_CLEANUP_TIME": {
-      "expires_in_version": "never",
+      "expires_in_version": "40",
       "kind": "exponential",
       "high": "5000",
       "n_buckets": 10,
       "description": "How long it takes to run the predictor cleanup"
   },
   "PREDICTOR_CLEANUP_SCHEDULED": {
-      "expires_in_version": "never",
+      "expires_in_version": "40",
       "kind": "boolean",
       "description": "Whether or not we actually try the cleanup method when we think about it"
   },
   "PREDICTOR_LOAD_COUNT_IS_ZERO": {
-      "expires_in_version": "never",
+      "expires_in_version": "40",
       "kind": "linear",
       "high": "100",
       "n_buckets": 50,
       "description": "Number of times load count is zero"
   },
   "PREDICTOR_LOAD_COUNT_OVERFLOWS": {
-      "expires_in_version": "never",
+      "expires_in_version": "40",
       "kind": "linear",
       "high": "100",
       "n_buckets": 50,
       "description": "Number of times load count overflowed"
   },
   "PREDICTOR_STARTUP_COUNT_IS_ZERO": {
-      "expires_in_version": "never",
+      "expires_in_version": "40",
       "kind": "linear",
       "high": "100",
       "n_buckets": 50,
       "description": "Number of times startup count is zero"
   },
   "PREDICTOR_STARTUP_COUNT_OVERFLOWS": {
-      "expires_in_version": "never",
+      "expires_in_version": "40",
       "kind": "linear",
       "high": "100",
       "n_buckets": 50,
@@ -2383,7 +2383,7 @@
   },
   "FIND_PLUGINS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2391,7 +2391,7 @@
     "description": "Time spent scanning filesystem for plugins (ms)"
   },
   "CHECK_JAVA_ENABLED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2424,7 +2424,7 @@
     "description": "Value of dom.ipc.plugins.hangUITimeoutSecs plus time spent in Plugin Hang UI (ms)"
   },
   "PLUGIN_LOAD_METADATA": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "5000",
     "n_buckets": 20,
@@ -2452,7 +2452,7 @@
     "description": "A plugin object was successfully invoked as a function"
   },
   "MOZ_SQLITE_OPEN_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2460,7 +2460,7 @@
     "description": "Time spent on SQLite open() (ms)"
   },
   "MOZ_SQLITE_OPEN_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2468,7 +2468,7 @@
     "description": "Time spent on SQLite open() (ms)"
   },
   "MOZ_SQLITE_TRUNCATE_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2476,7 +2476,7 @@
     "description": "Time spent on SQLite truncate() (ms)"
   },
   "MOZ_SQLITE_TRUNCATE_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2484,7 +2484,7 @@
     "description": "Time spent on SQLite truncate() (ms)"
   },
   "MOZ_SQLITE_OTHER_READ_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2492,7 +2492,7 @@
     "description": "Time spent on SQLite read() (ms)"
   },
   "MOZ_SQLITE_OTHER_READ_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2500,7 +2500,7 @@
     "description": "Time spent on SQLite read() (ms)"
   },
   "MOZ_SQLITE_PLACES_READ_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2508,7 +2508,7 @@
     "description": "Time spent on SQLite read() (ms)"
   },
   "MOZ_SQLITE_PLACES_READ_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2524,7 +2524,7 @@
     "description": "Time spent on cookie DB open with readahead (ms)"
   },
   "MOZ_SQLITE_COOKIES_READ_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2532,7 +2532,7 @@
     "description": "Time spent on SQLite read() (ms)"
   },
   "MOZ_SQLITE_COOKIES_READ_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2540,7 +2540,7 @@
     "description": "Time spent on SQLite read() (ms)"
   },
   "MOZ_SQLITE_WEBAPPS_READ_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2548,7 +2548,7 @@
     "description": "Time spent on SQLite read() (ms)"
   },
   "MOZ_SQLITE_WEBAPPS_READ_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2556,7 +2556,7 @@
     "description": "Time spent on SQLite read() (ms)"
   },
   "MOZ_SQLITE_OTHER_WRITE_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2564,7 +2564,7 @@
     "description": "Time spent on SQLite write() (ms)"
   },
   "MOZ_SQLITE_OTHER_WRITE_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2572,7 +2572,7 @@
     "description": "Time spent on SQLite write() (ms)"
   },
   "MOZ_SQLITE_PLACES_WRITE_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2580,7 +2580,7 @@
     "description": "Time spent on SQLite write() (ms)"
   },
   "MOZ_SQLITE_PLACES_WRITE_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2588,7 +2588,7 @@
     "description": "Time spent on SQLite write() (ms)"
   },
   "MOZ_SQLITE_COOKIES_WRITE_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2596,7 +2596,7 @@
     "description": "Time spent on SQLite write() (ms)"
   },
   "MOZ_SQLITE_COOKIES_WRITE_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2604,7 +2604,7 @@
     "description": "Time spent on SQLite write() (ms)"
   },
   "MOZ_SQLITE_WEBAPPS_WRITE_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2612,7 +2612,7 @@
     "description": "Time spent on SQLite write() (ms)"
   },
   "MOZ_SQLITE_WEBAPPS_WRITE_MAIN_THREAD_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -2684,56 +2684,56 @@
     "description": "Time spent on SQLite fsync() (ms)"
   },
   "MOZ_SQLITE_OTHER_READ_B": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "linear",
     "high": "32768",
     "n_buckets": 3,
     "description": "SQLite read() (bytes)"
   },
   "MOZ_SQLITE_PLACES_READ_B": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "32768",
     "n_buckets": 3,
     "description": "SQLite read() (bytes)"
   },
   "MOZ_SQLITE_COOKIES_READ_B": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "32768",
     "n_buckets": 3,
     "description": "SQLite read() (bytes)"
   },
   "MOZ_SQLITE_WEBAPPS_READ_B": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "32768",
     "n_buckets": 3,
     "description": "SQLite read() (bytes)"
   },
   "MOZ_SQLITE_PLACES_WRITE_B": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "32768",
     "n_buckets": 3,
     "description": "SQLite write (bytes)"
   },
   "MOZ_SQLITE_COOKIES_WRITE_B": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "32768",
     "n_buckets": 3,
     "description": "SQLite write (bytes)"
   },
   "MOZ_SQLITE_WEBAPPS_WRITE_B": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "32768",
     "n_buckets": 3,
     "description": "SQLite write (bytes)"
   },
   "MOZ_SQLITE_OTHER_WRITE_B": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "linear",
     "high": "32768",
     "n_buckets": 3,
@@ -2741,7 +2741,7 @@
   },
   "MOZ_STORAGE_ASYNC_REQUESTS_MS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "32768",
     "n_buckets": 20,
@@ -2750,18 +2750,18 @@
   },
   "MOZ_STORAGE_ASYNC_REQUESTS_SUCCESS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "mozStorage async requests success"
   },
   "STARTUP_MEASUREMENT_ERRORS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": "mozilla::StartupTimeline::MAX_EVENT_ID",
     "description": "Flags errors in startup calculation()"
   },
   "NETWORK_DISK_CACHE_OPEN": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 10,
@@ -2825,7 +2825,7 @@
     "description": "Time spent (ms) during showdown deleting disk cache v2 for 'clear private data' option"
   },
   "NETWORK_DISK_CACHE_REVALIDATION": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 10,
@@ -2833,7 +2833,7 @@
     "description": "Total Time spent (ms) during disk cache revalidation"
   },
   "NETWORK_DISK_CACHE_STREAMIO_CLOSE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 10,
@@ -2841,7 +2841,7 @@
     "description": "Time spent in nsDiskCacheStreamIO::Close() on non-main thread (ms)"
   },
   "NETWORK_DISK_CACHE_STREAMIO_CLOSE_MAIN_THREAD": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 10,
@@ -2849,7 +2849,7 @@
     "description": "Time spent in nsDiskCacheStreamIO::Close() on the main thread (ms)"
   },
   "IDLE_NOTIFY_BACK_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "5000",
     "n_buckets": 10,
@@ -2857,14 +2857,14 @@
     "description": "Time spent checking for and notifying listeners that the user is back (ms)"
   },
   "IDLE_NOTIFY_BACK_LISTENERS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "100",
     "n_buckets": 20,
     "description": "Number of listeners notified that the user is back"
   },
   "IDLE_NOTIFY_IDLE_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "5000",
     "n_buckets": 10,
@@ -2872,7 +2872,7 @@
     "description": "Time spent checking for and notifying listeners that the user is idle (ms)"
   },
   "IDLE_NOTIFY_IDLE_LISTENERS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "100",
     "n_buckets": 20,
@@ -2912,7 +2912,7 @@
     "description": "Time spent loading PrefixSet from file (ms)"
   },
   "URLCLASSIFIER_PS_FALLOCATE_TIME": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "1000",
     "n_buckets": 10,
@@ -2943,7 +2943,7 @@
     "description": "Size of the completion cache in entries"
   },
   "URLCLASSIFIER_PS_FAILURE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Did UrlClassifier fail to construct the PrefixSet?"
   },
@@ -2975,7 +2975,7 @@
   },
   "PLACES_FOLDERS_COUNT": {
     "alert_emails": ["places-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "200",
     "n_buckets": 10,
@@ -3006,7 +3006,7 @@
     "description": "PLACES: Time to build the bookmarks tree"
   },
   "PLACES_BACKUPS_TOJSON_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "low": 50,
     "high": 2000,
@@ -3024,7 +3024,7 @@
     "description": "PLACES: Time to convert and write bookmarks.html"
   },
   "PLACES_BACKUPS_HASHING_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 50,
     "high": 2000,
@@ -3117,7 +3117,7 @@
     "cpp_guard": "ANDROID"
   },
   "FENNEC_FAVICONS_COUNT": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "2000",
     "n_buckets": 10,
@@ -3126,7 +3126,7 @@
     "description": "Number of favicons stored in the browser DB"
   },
   "FENNEC_THUMBNAILS_COUNT": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "2000",
     "n_buckets": 10,
@@ -3159,7 +3159,7 @@
   },
   "PLACES_DATABASE_JOURNALSIZE_MB": {
     "alert_emails": ["places-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "50",
     "n_buckets": 10,
@@ -3227,7 +3227,7 @@
     "description": "PLACES: Time to search the history library (ms)"
   },
   "PLACES_AUTOCOMPLETE_URLINLINE_DOMAIN_QUERY_TIME_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 50,
     "high": 2000,
@@ -3264,7 +3264,7 @@
   },
   "PLACES_ANNOS_BOOKMARKS_SIZE_KB": {
     "alert_emails": ["places-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 10,
     "high": "10000",
@@ -3283,7 +3283,7 @@
   },
   "PLACES_ANNOS_PAGES_SIZE_KB": {
     "alert_emails": ["places-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 10,
     "high": "10000",
@@ -3293,7 +3293,7 @@
   },
   "PLACES_FRECENCY_CALC_TIME_MS": {
     "alert_emails": ["places-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "100",
     "n_buckets": 10,
@@ -3301,36 +3301,36 @@
     "description": "PLACES: Time to calculate frecency of a page (ms)"
   },
   "UPDATER_BACKGROUND_CHECK_CODE_EXTERNAL": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": 50,
     "description": "Updater: externally initiated (typically by the application) background update check result code (see PING_BGUC_* constants defined in /toolkit/mozapps/update/nsUpdateService.js)"
   },
   "UPDATER_BACKGROUND_CHECK_CODE_NOTIFY": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "enumerated",
     "n_values": 50,
     "description": "Updater: timer initiated background update check result code (see PING_BGUC_* constants defined in /toolkit/mozapps/update/nsUpdateService.js)"
   },
   "UPDATER_INVALID_LASTUPDATETIME_EXTERNAL": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Updater: Whether the last update time is invalid when a background update check was externally requested (typically by the application)"
   },
   "UPDATER_INVALID_LASTUPDATETIME_NOTIFY": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Updater: Whether the last update time is invalid when a background update check was timer initiated"
   },
   "UPDATER_LAST_NOTIFY_INTERVAL_DAYS_EXTERNAL": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "n_buckets": 10,
     "high": "60",
     "description": "Updater: The interval in days between the previous and the current background update check when the check was externally requested (typically by the application)"
   },
   "UPDATER_LAST_NOTIFY_INTERVAL_DAYS_NOTIFY": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "n_buckets": 10,
     "high": "60",
@@ -3349,72 +3349,72 @@
     "description": "Updater: the status of the latest update performed"
   },
   "UPDATER_UPDATES_ENABLED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "Updater: Whether or not updates are enabled"
   },
   "UPDATER_UPDATES_METRO_ENABLED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "Updater: Whether or not Metro updates are enabled"
   },
   "UPDATER_UPDATES_AUTOMATIC": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Updater: Whether or not updates are automatic"
   },
   "UPDATER_SERVICE_ENABLED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "Updater: Whether or not the MozillaMaintenance service is enabled"
   },
   "UPDATER_SERVICE_ERROR_CODE": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": 100,
     "description": "Updater: 0=success else SERVICE_* error code defined in /toolkit/mozapps/update/common/errors.h"
   },
   "UPDATER_SERVICE_ERRORS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": 30,
     "description": "Updater: The number of MozillaMaintenance service errors that have occurred"
   },
   "UPDATER_SERVICE_INSTALLED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "Updater: Whether or not the MozillaMaintenance service is installed"
   },
   "UPDATER_SERVICE_MANUALLY_UNINSTALLED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "Updater: Whether or not someone manually uninstalled the service."
   },
   "UPDATER_STAGE_ENABLED": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Updater: Whether or not staging updates are enabled"
   },
   "UPDATER_HAS_PERMISSIONS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Updater: Whether or not the updater has permissions"
   },
   "UPDATER_WIZ_LAST_PAGE_CODE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "enumerated",
     "n_values": 25,
     "description": "Updater: The update wizard page displayed when the UI was closed (mapped in toolkit/mozapps/update/content/updates.js)"
   },
   "THUNDERBIRD_GLODA_SIZE_MB": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "1000",
     "n_buckets": 40,
     "description": "Gloda: size of global-messages-db.sqlite (MB)"
   },
   "THUNDERBIRD_CONVERSATIONS_TIME_TO_2ND_GLODA_QUERY_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 30,
@@ -3422,28 +3422,28 @@
     "description": "Conversations: time between the moment we click and the second gloda query returns (ms)"
   },
   "THUNDERBIRD_INDEXING_RATE_MSG_PER_S": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "100",
     "n_buckets": 20,
     "description": "Gloda: indexing rate (message/s)"
   },
   "FX_GESTURE_TAKE_SNAPSHOT_OF_PAGE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "1000",
     "n_buckets": "30",
     "description": "Firefox: Time taken to capture the page to a canvas, for reuse while swiping through history (ms)."
   },
   "FX_GESTURE_INSTALL_SNAPSHOT_OF_PAGE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "1000",
     "n_buckets": "30",
     "description": "Firefox: Time taken to store the image capture of the page to a canvas, for reuse while swiping through history (ms)."
   },
   "FX_GESTURE_COMPRESS_SNAPSHOT_OF_PAGE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "1000",
     "n_buckets": "30",
@@ -3451,7 +3451,7 @@
   },
   "FX_TAB_ANIM_OPEN_MS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -3459,7 +3459,7 @@
   },
   "FX_TAB_ANIM_CLOSE_MS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -3490,7 +3490,7 @@
     "description": "Average frame interval during any tab open/close animation (excluding tabstrip scroll)"
   },
   "FX_TAB_ANIM_ANY_FRAME_PAINT_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "500",
     "n_buckets": 30,
@@ -3498,28 +3498,28 @@
   },
   "FX_TAB_SWITCH_UPDATE_MS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "1000",
     "n_buckets": 20,
     "description": "Firefox: Time in ms spent updating UI in response to a tab switch"
   },
   "FX_TAB_SWITCH_TOTAL_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "1000",
     "n_buckets": 20,
     "description": "Firefox: Time in ms till a tab switch is complete including the first paint"
   },
   "FX_TAB_CLICK_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "1000",
     "n_buckets": 20,
     "description": "Firefox: Time in ms spent on switching tabs in response to a tab click"
   },
   "FX_IDENTITY_POPUP_OPEN_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "1000",
     "n_buckets": 10,
@@ -3527,7 +3527,7 @@
     "description": "Firefox: Time taken by the identity popup to open in milliseconds"
   },
   "FX_BOOKMARKS_TOOLBAR_INIT_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 50,
     "high": "5000",
@@ -3536,7 +3536,7 @@
     "description": "Firefox: Time to initialize the bookmarks toolbar view (ms)"
   },
   "FX_NEW_WINDOW_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 20,
@@ -3544,7 +3544,7 @@
     "description": "Firefox: Time taken to open a new browser window (ms)"
   },
   "FX_PAGE_LOAD_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 20,
@@ -3552,12 +3552,12 @@
     "description": "Firefox: Time taken to load a page (ms)"
   },
   "FX_TOTAL_TOP_VISITS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "Count the number of times a new top page was starting to load"
   },
   "FX_THUMBNAILS_CAPTURE_TIME_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "500",
     "n_buckets": 15,
@@ -3565,7 +3565,7 @@
     "description": "THUMBNAILS: Time (ms) it takes to capture a thumbnail"
   },
   "FX_THUMBNAILS_STORE_TIME_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "500",
     "n_buckets": 15,
@@ -3573,13 +3573,13 @@
     "description": "THUMBNAILS: Time (ms) it takes to store a thumbnail in the cache"
   },
   "FX_THUMBNAILS_HIT_OR_MISS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "THUMBNAILS: Thumbnail found"
   },
   "EVENTLOOP_UI_LAG_EXP_MS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 50,
     "high": "60000",
@@ -3588,7 +3588,7 @@
     "description": "Widget: Time it takes for the message before a UI message (ms)"
   },
   "FX_SESSION_RESTORE_STARTUP_INIT_SESSION_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 20,
@@ -3596,7 +3596,7 @@
     "description": "Session restore: Time it takes to prepare the data structures for restoring a session (ms)"
   },
   "FX_SESSION_RESTORE_STARTUP_ONLOAD_INITIAL_WINDOW_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 20,
@@ -3604,7 +3604,7 @@
     "description": "Session restore: Time it takes to finish restoration once we have first opened a window (ms)"
   },
   "FX_SESSION_RESTORE_COLLECT_ALL_WINDOWS_DATA_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 10,
@@ -3612,7 +3612,7 @@
     "description": "Session restore: Time to collect all window data (ms)"
   },
   "FX_SESSION_RESTORE_COLLECT_SINGLE_WINDOW_DATA_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 10,
@@ -3620,7 +3620,7 @@
     "description": "Session restore: Time to collect the data of a single window (ms)"
   },
   "FX_SESSION_RESTORE_COLLECT_COOKIES_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 10,
@@ -3628,7 +3628,7 @@
     "description": "Session restore: Time to collect cookies (ms)"
   },
   "FX_SESSION_RESTORE_COLLECT_DATA_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 10,
@@ -3636,7 +3636,7 @@
     "description": "Session restore: Time to collect all window and tab data (ms)"
   },
   "FX_SESSION_RESTORE_COLLECT_DATA_LONGEST_OP_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 10,
@@ -3644,7 +3644,7 @@
     "description": "Session restore: Duration of the longest uninterruptible operation while collecting all window and tab data (ms)"
   },
   "FX_SESSION_RESTORE_CONTENT_COLLECT_DATA_LONGEST_OP_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 10,
@@ -3653,7 +3653,7 @@
   },
   "FX_SESSION_RESTORE_SERIALIZE_DATA_MS": {
     "alert_emails": ["session-restore-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "1000",
     "n_buckets": 10,
@@ -3661,7 +3661,7 @@
     "description": "Session restore: Time to JSON serialize session data (ms)"
   },
   "FX_SESSION_RESTORE_SERIALIZE_DATA_LONGEST_OP_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "30000",
     "n_buckets": 10,
@@ -3669,7 +3669,7 @@
     "description": "Session restore: Duration of the longest uninterruptible operation while serializing session data (ms)"
   },
   "FX_SESSION_RESTORE_READ_FILE_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -3677,7 +3677,7 @@
     "description": "Session restore: Time to read the session data from the file on disk (ms)"
   },
   "FX_SESSION_RESTORE_SEND_SERIALIZED_STATE_LONGEST_OP_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -3685,7 +3685,7 @@
     "description": "Session restore: Time spent on the main thread sending the session data off the main thread for writing (ms)"
   },
   "FX_SESSION_RESTORE_WRITE_STATE_LONGEST_OP_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -3693,7 +3693,7 @@
     "description": "Session restore: Time spent on the main thread serializing, broadcasting and sending the session data for writing (ms)"
   },
   "FX_SESSION_RESTORE_WRITE_FILE_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -3701,7 +3701,7 @@
     "description": "Session restore: Time to write the session data to the file on disk (ms)"
   },
   "FX_SESSION_RESTORE_WRITE_FILE_LONGEST_OP_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -3709,7 +3709,7 @@
     "description": "Session restore: Duration of the longest uninterruptible operation while writing session data (ms)"
   },
   "FX_SESSION_RESTORE_FILE_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": 50000000,
     "n_buckets": 30,
@@ -3717,12 +3717,12 @@
     "description": "Session restore: The size of file sessionstore.js (bytes)"
   },
   "FX_SESSION_RESTORE_CORRUPT_FILE": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "Session restore: Whether the file read on startup contained parse-able JSON"
   },
   "FX_SESSION_RESTORE_RESTORE_WINDOW_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -3730,14 +3730,14 @@
     "description": "Session restore: Time spent blocking the main thread while restoring a window state (ms)"
   },
   "FX_SESSION_RESTORE_SESSION_LENGTH": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "365",
     "n_buckets": 15,
     "description": "Session restore: Days elapsed since the session was first started"
   },
   "FX_SESSION_RESTORE_EXTRACTING_STATISTICS_DURATION_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -3745,98 +3745,98 @@
     "description": "Session restore: Duration of the off main thread statistics extraction mechanism (ms)"
   },
   "FX_SESSION_RESTORE_TOTAL_OPEN_WINDOWS_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "50000000",
     "n_buckets": 30,
     "description": "Session restore: The subset of sessionrestore.js representing open windows (total size, in bytes)"
   },
   "FX_SESSION_RESTORE_TOTAL_CLOSED_WINDOWS_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "50000000",
     "n_buckets": 30,
     "description": "Session restore: The subset of sessionrestore.js representing closed windows (total size, in bytes)"
   },
   "FX_SESSION_RESTORE_TOTAL_CLOSED_TABS_IN_OPEN_WINDOWS_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "50000000",
     "n_buckets": 30,
     "description": "Sessionrestore: The subset of sesionstore.js representing closed tabs in open windows (total size, in bytes)"
   },
   "FX_SESSION_RESTORE_TOTAL_COOKIES_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "50000000",
     "n_buckets": 30,
     "description": "The subset of sessionstore.js dealing with cookies (total size, in bytes)"
   },
   "FX_SESSION_RESTORE_TOTAL_DOM_STORAGE_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "50000000",
     "n_buckets": 30,
     "description": "The subset of sessionstore.js dealing with DOM storage (total size, in bytes)"
   },
   "FX_SESSION_RESTORE_TOTAL_FORMDATA_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "50000000",
     "n_buckets": 30,
     "description": "The subset of sessionstore.js dealing with storing form data (total size, in bytes)"
   },
   "FX_SESSION_RESTORE_TOTAL_HISTORY_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "50000000",
     "n_buckets": 30,
     "description": "The subset of sessionstore.js dealing with storing history (total size, in bytes)"
   },
   "FX_SESSION_RESTORE_INDIVIDUAL_OPEN_WINDOWS_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "5000000",
     "n_buckets": 30,
     "description": "Session restore: The subset of sessionrestore.js representing open windows (item size, in bytes)"
   },
   "FX_SESSION_RESTORE_INDIVIDUAL_CLOSED_WINDOWS_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "5000000",
     "n_buckets": 30,
     "description": "Session restore: The subset of sessionrestore.js representing closed windows (item size, in bytes)"
   },
   "FX_SESSION_RESTORE_INDIVIDUAL_CLOSED_TABS_IN_OPEN_WINDOWS_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "5000000",
     "n_buckets": 30,
     "description": "Sessionrestore: The subset of sesionstore.js representing closed tabs in open windows (item size, in bytes)"
   },
   "FX_SESSION_RESTORE_INDIVIDUAL_COOKIES_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "50000000",
     "n_buckets": 30,
     "description": "The subset of sessionstore.js dealing with cookies (item size, in bytes)"
   },
   "FX_SESSION_RESTORE_INDIVIDUAL_DOM_STORAGE_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "5000000",
     "n_buckets": 30,
     "description": "The subset of sessionstore.js dealing with DOM storage (item size, in bytes)"
   },
   "FX_SESSION_RESTORE_INDIVIDUAL_FORMDATA_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "5000000",
     "n_buckets": 30,
     "description": "The subset of sessionstore.js dealing with storing form data (item size, in bytes)"
   },
   "FX_SESSION_RESTORE_INDIVIDUAL_HISTORY_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "5000000",
     "n_buckets": 30,
@@ -3848,33 +3848,33 @@
     "description": "Deleted or to-be-reused innerwindow which has had mutation event listeners."
   },
   "CHARSET_OVERRIDE_SITUATION": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": 8,
     "description": "Labeling status of top-level page when overriding charset (0: unlabeled file URL without detection, 1: unlabeled non-TLD-guessed non-file URL without detection, 2: unlabeled file URL with detection, 3: unlabeled non-file URL with detection, 4: labeled, 5: already overridden, 6: bug, 7: unlabeled with TLD guessing)"
   },
   "CHARSET_OVERRIDE_USED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "flag",
     "description": "Whether the character encoding menu was used to override an encoding in this session."
   },
   "DECODER_INSTANTIATED_HZ": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "flag",
     "description": "Whether the decoder for HZ has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_ISO2022CN": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for ISO-2022-CN has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_ISO2022KR": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for ISO-2022-KR has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_ISO2022JP": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "flag",
     "description": "Whether the decoder for ISO-2022-JP has been instantiated in this session."
   },
@@ -3889,149 +3889,149 @@
     "description": "Whether the decoder for T.61 has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_IBM850": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for IBM850 has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_IBM852": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for IBM852 has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_IBM855": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for IBM855 has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_IBM857": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "flag",
     "description": "Whether the decoder for IBM857 has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_IBM862": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for IBM862 has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_IBM866": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for IBM866 has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACGREEK": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACGREEK has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACICELANDIC": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACICELANDIC has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACCE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACCE has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACHEBREW": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACHEBREW has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACARABIC": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACARABIC has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACFARSI": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACFARSI has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACCROATIAN": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "flag",
     "description": "Whether the decoder for MACCROATIAN has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACCYRILLIC": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACCYRILLIC has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACROMANIAN": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACROMANIAN has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACTURKISH": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACTURKISH has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACDEVANAGARI": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACDEVANAGARI has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACGUJARATI": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACGUJARATI has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACGURMUKHI": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACGURMUKHI has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_ISOIR111": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for ISOIR111 has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_ARMSCII8": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "flag",
     "description": "Whether the decoder for ARMSCII8 has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_VISCII": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for VISCII has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_VIETTCVN5712": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for VIETTCVN5712 has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_VIETVPS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for VIETVPS has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_KOI8R": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "flag",
     "description": "Whether the decoder for KOI8R has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_KOI8U": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for KOI8U has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_ISO_8859_5": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "flag",
     "description": "Whether the decoder for ISO-8859-5 has been instantiated in this session."
   },
   "XUL_FOREGROUND_REFLOW_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
     "description": "XUL reflows in foreground windows (ms)"
   },
   "XUL_BACKGROUND_REFLOW_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4045,7 +4045,7 @@
     "description": "HTML reflows in foreground windows (ms)"
   },
   "HTML_BACKGROUND_REFLOW_MS_2": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 20,
@@ -4057,7 +4057,7 @@
     "description": "Long running reflow, interruptible or not"
   },
   "XUL_INITIAL_FRAME_CONSTRUCTION": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4069,7 +4069,7 @@
     "description": "Type of XMLHttpRequest, async or sync"
   },
   "DOM_TIMERS_FIRED_PER_NATIVE_TIMEOUT": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4077,7 +4077,7 @@
     "description": "DOM: Timer handlers called per native timer expiration"
   },
   "DOM_TIMERS_RECENTLY_SET": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4085,12 +4085,12 @@
     "description": "DOM: setTimeout/setInterval calls recently (last 30s or more)"
   },
   "DOM_RANGE_DETACHED": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "DOM: Ranges that are detached on destruction (bug 702948)"
   },
   "LOCALDOMSTORAGE_INIT_DATABASE_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4098,7 +4098,7 @@
     "description": "Time to open the localStorage database (ms)"
   },
   "LOCALDOMSTORAGE_SHUTDOWN_DATABASE_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4106,12 +4106,12 @@
     "description": "Time to flush and close the localStorage database (ms)"
   },
   "LOCALDOMSTORAGE_PRELOAD_PENDING_ON_FIRST_ACCESS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "True when we had to wait for a pending preload on first access to localStorage data, false otherwise"
   },
   "LOCALDOMSTORAGE_GETALLKEYS_BLOCKING_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4119,7 +4119,7 @@
     "description": "Time to block before we return a list of all keys in domain's LocalStorage (ms)"
   },
   "LOCALDOMSTORAGE_GETKEY_BLOCKING_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4127,7 +4127,7 @@
     "description": "Time to block before we return a key name in domain's LocalStorage (ms)"
   },
   "LOCALDOMSTORAGE_GETLENGTH_BLOCKING_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4135,7 +4135,7 @@
     "description": "Time to block before we return number of keys in domain's LocalStorage (ms)"
   },
   "LOCALDOMSTORAGE_GETVALUE_BLOCKING_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4143,7 +4143,7 @@
     "description": "Time to block before we return a value for a key in LocalStorage (ms)"
   },
   "LOCALDOMSTORAGE_SETVALUE_BLOCKING_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4151,7 +4151,7 @@
     "description": "Time to block before we set a single key's value in LocalStorage (ms)"
   },
   "LOCALDOMSTORAGE_REMOVEKEY_BLOCKING_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4159,7 +4159,7 @@
     "description": "Time to block before we remove a single key from LocalStorage (ms)"
   },
   "LOCALDOMSTORAGE_CLEAR_BLOCKING_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4167,7 +4167,7 @@
     "description": "Time to block before we clear LocalStorage for all domains (ms)"
   },
   "LOCALDOMSTORAGE_UNLOAD_BLOCKING_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4175,7 +4175,7 @@
     "description": "Time to fetch LocalStorage data before we can clean the cache (ms)"
   },
   "LOCALDOMSTORAGE_SESSIONONLY_PRELOAD_BLOCKING_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4183,7 +4183,7 @@
     "description": "Time to fetch LocalStorage data before we can expose them as session only data (ms)"
   },
   "LOCALDOMSTORAGE_KEY_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 1024,
     "high": "32768",
@@ -4192,7 +4192,7 @@
     "description": "DOM storage: size of keys stored in localStorage"
   },
   "LOCALDOMSTORAGE_VALUE_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 1024,
     "high": "32768",
@@ -4201,7 +4201,7 @@
     "description": "DOM storage: size of values stored in localStorage"
   },
   "SESSIONDOMSTORAGE_KEY_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 1024,
     "high": "32768",
@@ -4210,7 +4210,7 @@
     "description": "DOM storage: size of keys stored in sessionStorage"
   },
   "SESSIONDOMSTORAGE_VALUE_SIZE_BYTES": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 1024,
     "high": "32768",
@@ -4220,7 +4220,7 @@
   },
   "RANGE_CHECKSUM_ERRORS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4229,7 +4229,7 @@
   },
   "BUCKET_ORDER_ERRORS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4238,7 +4238,7 @@
   },
   "TOTAL_COUNT_HIGH_ERRORS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4247,7 +4247,7 @@
   },
   "TOTAL_COUNT_LOW_ERRORS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "3000",
     "n_buckets": 10,
@@ -4262,7 +4262,7 @@
     "description": "Number of telemetry pings evicted at startup"
   },
   "TELEMETRY_TEST_FLAG": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "flag",
     "description": "a testing histogram; not meant to be touched"
   },
@@ -4278,18 +4278,18 @@
     "description": "Whether the user is in safe mode (No, Yes, Forced)"
   },
   "NEWTAB_PAGE_ENABLED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "New tab page is enabled."
   },
   "NEWTAB_PAGE_PINNED_SITES_COUNT": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": 9,
     "description": "Number of pinned sites on the new tab page."
   },
   "NEWTAB_PAGE_BLOCKED_SITES_COUNT": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "100",
     "n_buckets": 10,
@@ -4308,7 +4308,7 @@
     "description": "Track click count on about:newtab tiles per index (0-8). For non-default row or column configurations all clicks into the '9' bucket."
   },
   "PANORAMA_INITIALIZATION_TIME_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 15,
@@ -4316,7 +4316,7 @@
     "description": "Time it takes to initialize Panorama (ms)"
   },
   "PANORAMA_GROUPS_COUNT": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "25",
     "n_buckets": 15,
@@ -4324,7 +4324,7 @@
     "description": "Number of groups in Panorama"
   },
   "PANORAMA_STACKED_GROUPS_COUNT": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "25",
     "n_buckets": 15,
@@ -4332,7 +4332,7 @@
     "description": "Number of stacked groups in Panorama"
   },
   "PANORAMA_MEDIAN_TABS_IN_GROUPS_COUNT": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "100",
     "n_buckets": 15,
@@ -4340,7 +4340,7 @@
     "description": "Median of tabs in groups in Panorama"
   },
   "BROWSERPROVIDER_XUL_IMPORT_TIME": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": 20,
     "high": "600000",
@@ -4350,7 +4350,7 @@
     "cpp_guard": "ANDROID"
   },
   "BROWSERPROVIDER_XUL_IMPORT_BOOKMARKS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "50000",
     "n_buckets": 20,
@@ -4359,7 +4359,7 @@
     "cpp_guard": "ANDROID"
   },
   "BROWSERPROVIDER_XUL_IMPORT_HISTORY": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "1000000",
     "n_buckets": 20,
@@ -4465,7 +4465,7 @@
     "description": "Security UI Telemetry"
   },
   "SEARCH_SERVICE_INIT_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "1000",
     "n_buckets": 15,
@@ -4479,7 +4479,7 @@
     "description": "search service has been initialized synchronously"
   },
   "SEARCH_SERVICE_BUILD_CACHE_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "1000",
     "n_buckets": 15,
@@ -4498,7 +4498,7 @@
   },
   "READ_SAVED_PING_SUCCESS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Successfully reading a saved ping file"
   },
@@ -4648,12 +4648,12 @@
     "description": "Size (in bytes) of the compressed crash store JSON file."
   },
   "PDF_VIEWER_USED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "How many times PDF Viewer was used"
   },
   "PDF_VIEWER_FALLBACK_SHOWN": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "How many times PDF Viewer fallback bar was shown"
   },
@@ -4663,19 +4663,19 @@
     "description": "How many times PDF Viewer print functionality was used"
   },
   "PDF_VIEWER_DOCUMENT_VERSION": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": 20,
     "description": "The PDF document version (1.1, 1.2, etc.)"
   },
   "PDF_VIEWER_DOCUMENT_GENERATOR": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": 30,
     "description": "The PDF document generator"
   },
   "PDF_VIEWER_DOCUMENT_SIZE_KB": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "low": "2",
     "high": "64 * 1024",
@@ -4694,7 +4694,7 @@
     "description": "A PDF document was embedded: true using OBJECT/EMBED and false using IFRAME"
   },
   "PDF_VIEWER_FORM": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "A PDF form expected: true for AcroForm and false for XFA"
   },
@@ -4705,34 +4705,34 @@
     "description": "The PDF document compression stream types used"
   },
   "PDF_VIEWER_TIME_TO_VIEW_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 50,
     "description": "Time spent to display first page in PDF Viewer (ms)"
   },
   "SHUMWAY_TIME_TO_VIEW_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "2 * 60 * 1000",
     "n_buckets": 50,
     "description": "Time spent to display first frame (ms)"
   },
   "SHUMWAY_PARSING_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "2 * 60 * 1000",
     "n_buckets": 50,
     "description": "Time spent to parse SWF file (ms)"
   },
   "SHUMWAY_SWF_INDEX_ON_PAGE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "enumerated",
     "n_values": 30,
     "description": "Index of the SWF on the page (0 - full page, 1 - first, 2 - second, etc.)"
   },
   "SHUMWAY_SWF_SIZE_KB": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": "1",
     "high": "256 * 1024",
@@ -4740,20 +4740,20 @@
     "description": "The SWF file size (KB)"
   },
   "SHUMWAY_SWF_VERSION": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "enumerated",
     "n_values": 30,
     "description": "The SWF file version"
   },
   "SHUMWAY_SWF_FRAME_RATE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "256",
     "n_buckets": "50",
     "description": "The SWF file frame rate"
   },
   "SHUMWAY_SWF_AREA": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "low": "256",
     "high": "16777216",
@@ -4761,30 +4761,30 @@
     "description": "The SWF file dimension: amount of pixels (width * height)"
   },
   "SHUMWAY_SWF_AVM2": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "The AVM2 is enabled in the SWF file"
   },
   "SHUMWAY_SWF_BANNER": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "enumerated",
     "n_values": 30,
     "description": "The well-known banner size"
   },
   "SHUMWAY_ERROR": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": 3,
     "description": "The Shumway reported error: 0 - unknown, 1 - AVM1, 2 - AVM2)"
   },
   "SHUMWAY_FEATURE_USED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": 700,
     "description": "The Shumway feature is used during movie execution"
   },
   "SHUMWAY_FALLBACK": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "The Shumway was selected to fallback to the Flash (false - by heuristics, true - by user)"
   },
@@ -4821,7 +4821,7 @@
     "description": "Count the number of times the user clicked 'allow' on the hidden-plugin infobar."
   },
   "POPUP_NOTIFICATION_MAINACTION_TRIGGERED_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "low": 25,
     "high": "80 * 25",
@@ -5578,7 +5578,7 @@
     "description": "The time (in milliseconds) that it took a 'stopTrace' request to go round trip."
   },
   "COOKIES_3RDPARTY_NUM_SITES_ACCEPTED": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "low": "5",
     "high": "145",
@@ -5586,7 +5586,7 @@
     "description": "The number of distinct pairs (first-party site, third-party site attempting to set cookie) for which the third-party cookie has been accepted. Sites are considered identical if they have the same eTLD + 1. Measures are normalized per 24h."
   },
   "COOKIES_3RDPARTY_NUM_SITES_BLOCKED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "linear",
     "low": "5",
     "high": "145",
@@ -5594,7 +5594,7 @@
     "description": "The number of distinct pairs (first-party site, third-party site attempting to set cookie) for which the third-party cookie has been rejected. Sites are considered identical if they have the same eTLD + 1. Measures are normalized per 24h."
   },
   "COOKIES_3RDPARTY_NUM_ATTEMPTS_ACCEPTED": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "low": "10",
     "high": "500",
@@ -5602,7 +5602,7 @@
     "description": "The total number of distinct attempts by third-party sites to place cookies which have been accepted.  Measures are normalized per 24h."
   },
   "COOKIES_3RDPARTY_NUM_ATTEMPTS_BLOCKED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "linear",
     "low": "10",
     "high": "500",
@@ -6094,7 +6094,7 @@
     "description": "The module used for the NTLM protocol (Windows_API, Kerberos, Samba_auth or Generic) and whether or not the authentication was used to connect to a proxy server. This data is collected only once per session (at first NTLM authentification) ; fixed version."
   },
   "FX_THUMBNAILS_BG_QUEUE_SIZE_ON_CAPTURE": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": 100,
     "n_buckets": 15,
@@ -6102,7 +6102,7 @@
     "description": "BACKGROUND THUMBNAILS: Size of capture queue when a capture request is received"
   },
   "FX_THUMBNAILS_BG_CAPTURE_QUEUE_TIME_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": 300000,
     "n_buckets": 20,
@@ -6110,7 +6110,7 @@
     "description": "BACKGROUND THUMBNAILS: Time the capture request spent in the queue before being serviced (ms)"
   },
   "FX_THUMBNAILS_BG_CAPTURE_SERVICE_TIME_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": 30000,
     "n_buckets": 20,
@@ -6118,13 +6118,13 @@
     "description": "BACKGROUND THUMBNAILS: Time the capture took once it started and successfully completed (ms)"
   },
   "FX_THUMBNAILS_BG_CAPTURE_DONE_REASON_2": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": 10,
     "description": "BACKGROUND THUMBNAILS: Reason the capture completed (see TEL_CAPTURE_DONE_* constants in BackgroundPageThumbs.jsm)"
   },
   "FX_THUMBNAILS_BG_CAPTURE_PAGE_LOAD_TIME_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": 60000,
     "n_buckets": 20,
@@ -6132,7 +6132,7 @@
     "description": "BACKGROUND THUMBNAILS: Time the capture's page load took (ms)"
   },
   "FX_THUMBNAILS_BG_CAPTURE_CANVAS_DRAW_TIME_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": 500,
     "n_buckets": 15,
@@ -6192,19 +6192,19 @@
     "description": "Final status of the CacheFileInputStream (0=ok, 1=other error, 2=out of memory, 3=disk full, 4=file corrupted, 5=file not found, 6=binding aborted)"
   },
   "SQLITEBRIDGE_PROVIDER_PASSWORDS_LOCKED": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "enumerated",
     "n_values": "10",
     "description": "The number of errors using the PasswordsProvider due to a locked DB."
   },
   "SQLITEBRIDGE_PROVIDER_FORMS_LOCKED": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "enumerated",
     "n_values": "10",
     "description": "The number of errors using the FormHistoryProvider due to a locked DB."
   },
   "SQLITEBRIDGE_PROVIDER_HOME_LOCKED": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "enumerated",
     "n_values": "10",
     "description": "The number of errors using the HomeProvider due to a locked DB."
@@ -6342,7 +6342,7 @@
     "description": "Status of OCSP stapling on this handshake (1=present, good; 2=none; 3=present, expired; 4=present, other error)"
   },
   "SSL_OCSP_MAY_FETCH": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "enumerated",
     "n_values": 8,
     "description": "For non-stapling cases, is OCSP fetching a possibility? (0=yes, 1=no because missing/invalid OCSP URI, 2=no because fetching disabled, 3=no because both)"
@@ -6369,7 +6369,7 @@
     "description": "Is OCSP required when the cert has an OCSP URI? (pref security.OCSP.require)"
   },
   "OSFILE_WORKER_LAUNCH_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "description": "The duration between the instant the first message is sent to OS.File and the moment the OS.File worker starts executing JavaScript, in milliseconds",
     "high": "5000",
@@ -6377,7 +6377,7 @@
     "extended_statistics_ok": true
   },
   "OSFILE_WORKER_READY_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "description": "The duration between the instant the first message is sent to OS.File and the moment the OS.File worker has finished executing its startup JavaScript and is ready to receive requests, in milliseconds",
     "high": "5000",
@@ -6385,7 +6385,7 @@
     "extended_statistics_ok": true
   },
   "OSFILE_WRITEATOMIC_JANK_MS": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "description": "The duration during which the main thread is blocked during a call to OS.File.writeAtomic, in milliseconds",
     "high": "5000",
@@ -6431,41 +6431,41 @@
     "description": "Certificate pinning test results by host for Mozilla operational sites"
   },
   "WEAVE_CONFIGURED": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "If any version of Firefox Sync is configured for this device"
   },
   "WEAVE_CONFIGURED_MASTER_PASSWORD": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "If both Firefox Sync and Master Password are configured for this device"
   },
   "WEAVE_START_COUNT": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 10,
     "description": "The number of times a sync started in this session"
   },
   "WEAVE_COMPLETE_SUCCESS_COUNT": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 10,
     "description": "The number of times a sync successfully completed in this session"
   },
   "WEAVE_CUSTOM_LEGACY_SERVER_CONFIGURATION": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "Whether legacy Sync is configured to use a custom server"
   },
   "WEAVE_CUSTOM_FXA_SERVER_CONFIGURATION": {
-    "expires_in_version": "never",
+    "expires_in_version": "default",
     "kind": "boolean",
     "description": "Whether FxA Sync is configured to use a custom authentication server"
   },
   "WEAVE_CUSTOM_TOKEN_SERVER_CONFIGURATION": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Whether FxA Sync is configured to use a custom token server"
   },
@@ -6507,19 +6507,19 @@
     "description": "Algorithms used with WebCrypto (see table in WebCryptoTask.cpp)"
   },
   "MASTER_PASSWORD_ENABLED": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "flag",
     "description": "If a master-password is enabled for this profile"
   },
   "FENNEC_TILES_CACHE_HIT": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "13",
     "n_buckets": 12,
     "description": "Cache hits on the tile-info metadata database"
   },
   "DISPLAY_SCALING_OSX" : {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "500",
     "n_buckets": "100",
@@ -6527,7 +6527,7 @@
     "cpp_guard": "XP_MACOSX"
   },
   "DISPLAY_SCALING_MSWIN" : {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "500",
     "n_buckets": "100",
@@ -6535,7 +6535,7 @@
     "cpp_guard": "XP_WIN"
   },
   "DISPLAY_SCALING_LINUX" : {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "linear",
     "high": "500",
     "n_buckets": "100",
@@ -6543,24 +6543,24 @@
     "cpp_guard": "XP_LINUX"
   },
   "SOCIAL_SIDEBAR_STATE": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "boolean",
     "description": "Social Sidebar state 0: closed, 1: opened.  Toggling between providers will result in a higher opened rate."
   },
   "SOCIAL_TOOLBAR_BUTTONS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "enumerated",
     "n_values": 3,
     "description": "Social toolbar button has been used (0:share, 1:status, 2:bookmark)"
   },
   "SOCIAL_PANEL_CLICKS": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "enumerated",
     "n_values": 4,
     "description": "Social content has been interacted with (0:share, 1:status, 2:bookmark, 3: sidebar)"
   },
   "SOCIAL_SIDEBAR_OPEN_DURATION": {
-    "expires_in_version": "never",
+    "expires_in_version": "40",
     "kind": "exponential",
     "high": "10000000",
     "n_buckets": 10,
diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
index bea32fab3e94..8a111b29e9ba 100644
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -714,7 +714,8 @@ bool
 IsExpired(const char *expiration){
   static Version current_version = Version(MOZ_APP_VERSION);
   MOZ_ASSERT(expiration);
-  return strcmp(expiration, "never") && (mozilla::Version(expiration) <= current_version);
+  return strcmp(expiration, "never") && strcmp(expiration, "default") &&
+    (mozilla::Version(expiration) <= current_version);
 }
 
 bool

From ea078996ccf483c0993fc6e6c1ef369e3b4f9b60 Mon Sep 17 00:00:00 2001
From: Cervantes Yu <cyu@mozilla.com>
Date: Mon, 1 Sep 2014 17:34:17 +0800
Subject: [PATCH 074/109] Bug 991035: Don't prepend ccache twice in building
 NSPR. r=ted

--HG--
extra : rebase_source : 95a4b5bd9d35b7cfc50da2fa4d14400f31f6d3f5
---
 configure.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configure.in b/configure.in
index 0af7bee73dde..8fda52efd7de 100644
--- a/configure.in
+++ b/configure.in
@@ -9119,6 +9119,11 @@ if test -n "$_WRAP_MALLOC"; then
     _SUBDIR_CONFIG_ARGS="`echo $_SUBDIR_CONFIG_ARGS | sed -e 's/--enable-wrap-malloc *//'`"
 fi
 
+if test -n "$MOZ_USING_CCACHE"; then
+    # Avoid double prepending ccache by omitting --with-ccache in building NSPR.
+    _SUBDIR_CONFIG_ARGS="`echo $_SUBDIR_CONFIG_ARGS | sed -e 's/--with-ccache\S* *//'`"
+fi
+
 MOZ_SUBCONFIGURE_NSPR()
 
 dnl ========================================================

From 2bd49aaa2a84abc2c35875b9581cfcef7095f4b3 Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Thu, 4 Sep 2014 16:54:00 +0100
Subject: [PATCH 075/109] Bug 1055595 - Part 1: Simplify Adapter (r=lucasr)

---
 mobile/android/base/tabs/TabsListLayout.java | 233 ++++++++++---------
 1 file changed, 120 insertions(+), 113 deletions(-)

diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index dfe653895064..4fe33791a590 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -36,7 +36,8 @@ import android.widget.BaseAdapter;
 import android.widget.Button;
 
 class TabsListLayout extends TwoWayView
-                     implements TabsLayout {
+                     implements TabsLayout,
+                                Tabs.OnTabsChangedListener {
     private static final String LOGTAG = "Gecko" + TabsListLayout.class.getSimpleName();
 
     private Context mContext;
@@ -98,14 +99,14 @@ class TabsListLayout extends TwoWayView
     public void show() {
         setVisibility(View.VISIBLE);
         Tabs.getInstance().refreshThumbnails();
-        Tabs.registerOnTabsChangedListener(mTabsAdapter);
-        mTabsAdapter.refreshTabsData();
+        Tabs.registerOnTabsChangedListener(this);
+        refreshTabsData();
     }
 
     @Override
     public void hide() {
         setVisibility(View.GONE);
-        Tabs.unregisterOnTabsChangedListener(mTabsAdapter);
+        Tabs.unregisterOnTabsChangedListener(this);
         GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Tab:Screenshot:Cancel",""));
         mTabsAdapter.clear();
     }
@@ -119,10 +120,79 @@ class TabsListLayout extends TwoWayView
         mTabsPanel.autoHidePanel();
     }
 
+    @Override
+    public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
+        switch (msg) {
+            case ADDED:
+                // Refresh the list to make sure the new tab is added in the right position.
+                refreshTabsData();
+                break;
 
+            case CLOSED:
+               if (tab.isPrivate() == mIsPrivate && mTabsAdapter.getCount() > 0) {
+                   if (mTabsAdapter.removeTab(tab)) {
+                       int selected = mTabsAdapter.getPositionForTab(Tabs.getInstance().getSelectedTab());
+                       updateSelectedStyle(selected);
+                   }
+               }
+               break;
+
+            case SELECTED:
+                // Update the selected position, then fall through...
+                updateSelectedPosition();
+            case UNSELECTED:
+                // We just need to update the style for the unselected tab...
+            case THUMBNAIL:
+            case TITLE:
+            case RECORDING_CHANGE:
+                View view = getChildAt(mTabsAdapter.getPositionForTab(tab) - getFirstVisiblePosition());
+                if (view == null)
+                    return;
+
+                TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
+                assignValues(item, tab);
+                break;
+        }
+    }
+
+    // Updates the selected position in the list so that it will be scrolled to the right place.
+    private void updateSelectedPosition() {
+        int selected = mTabsAdapter.getPositionForTab(Tabs.getInstance().getSelectedTab());
+        updateSelectedStyle(selected);
+
+        if (selected != -1) {
+            setSelection(selected);
+        }
+    }
+
+    /**
+     * Updates the selected/unselected style for the tabs.
+     *
+     * @param selected position of the selected tab
+     */
+    private void updateSelectedStyle(int selected) {
+        for (int i = 0; i < mTabsAdapter.getCount(); i++) {
+            setItemChecked(i, (i == selected));
+        }
+    }
+
+    private void refreshTabsData() {
+        // Store a different copy of the tabs, so that we don't have to worry about
+        // accidentally updating it on the wrong thread.
+        ArrayList<Tab> tabData = new ArrayList<Tab>();
+
+        Iterable<Tab> allTabs = Tabs.getInstance().getTabsInOrder();
+        for (Tab tab : allTabs) {
+            if (tab.isPrivate() == mIsPrivate)
+                tabData.add(tab);
+        }
+
+        mTabsAdapter.setTabs(tabData);
+        updateSelectedPosition();
+    }
 
     // Adapter to bind tabs into a list
-    private class TabsAdapter extends BaseAdapter implements Tabs.OnTabsChangedListener {
+    private class TabsAdapter extends BaseAdapter {
         private Context mContext;
         private ArrayList<Tab> mTabs;
         private LayoutInflater mInflater;
@@ -142,70 +212,17 @@ class TabsListLayout extends TwoWayView
             };
         }
 
-        @Override
-        public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
-            switch (msg) {
-                case ADDED:
-                    // Refresh the list to make sure the new tab is added in the right position.
-                    refreshTabsData();
-                    break;
-
-                case CLOSED:
-                    removeTab(tab);
-                    break;
-
-                case SELECTED:
-                    // Update the selected position, then fall through...
-                    updateSelectedPosition();
-                case UNSELECTED:
-                    // We just need to update the style for the unselected tab...
-                case THUMBNAIL:
-                case TITLE:
-                case RECORDING_CHANGE:
-                    View view = TabsListLayout.this.getChildAt(getPositionForTab(tab) - TabsListLayout.this.getFirstVisiblePosition());
-                    if (view == null)
-                        return;
-
-                    TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
-                    assignValues(item, tab);
-                    break;
-            }
-        }
-
-        private void refreshTabsData() {
-            // Store a different copy of the tabs, so that we don't have to worry about
-            // accidentally updating it on the wrong thread.
-            mTabs = new ArrayList<Tab>();
-
-            Iterable<Tab> tabs = Tabs.getInstance().getTabsInOrder();
-            for (Tab tab : tabs) {
-                if (tab.isPrivate() == mIsPrivate)
-                    mTabs.add(tab);
-            }
-
+        public void setTabs (ArrayList<Tab> tabs) {
+            mTabs = tabs;
             notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
-            updateSelectedPosition();
         }
 
-        // Updates the selected position in the list so that it will be scrolled to the right place.
-        private void updateSelectedPosition() {
-            int selected = getPositionForTab(Tabs.getInstance().getSelectedTab());
-            updateSelectedStyle(selected);
-
-            if (selected != -1) {
-                TabsListLayout.this.setSelection(selected);
-            }
-        }
-
-        /**
-         * Updates the selected/unselected style for the tabs.
-         *
-         * @param selected position of the selected tab
-         */
-        private void updateSelectedStyle(int selected) {
-            for (int i = 0; i < getCount(); i++) {
-                TabsListLayout.this.setItemChecked(i, (i == selected));
+        public boolean removeTab (Tab tab) {
+            boolean tabRemoved = mTabs.remove(tab);
+            if (tabRemoved) {
+                notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
             }
+            return tabRemoved;
         }
 
         public void clear() {
@@ -235,54 +252,6 @@ class TabsListLayout extends TwoWayView
             return mTabs.indexOf(tab);
         }
 
-        private void removeTab(Tab tab) {
-            if (tab.isPrivate() == mIsPrivate && mTabs != null) {
-                mTabs.remove(tab);
-                notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
-
-                int selected = getPositionForTab(Tabs.getInstance().getSelectedTab());
-                updateSelectedStyle(selected);
-            }
-        }
-
-        private void assignValues(TabsLayoutItemView item, Tab tab) {
-            if (item == null || tab == null)
-                return;
-
-            item.id = tab.getId();
-
-            Drawable thumbnailImage = tab.getThumbnail();
-            if (thumbnailImage != null) {
-                item.thumbnail.setImageDrawable(thumbnailImage);
-            } else {
-                item.thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
-            }
-            if (item.thumbnailWrapper != null) {
-                item.thumbnailWrapper.setRecording(tab.isRecording());
-            }
-            item.title.setText(tab.getDisplayTitle());
-            item.close.setTag(item);
-        }
-
-        private void resetTransforms(View view) {
-            ViewHelper.setAlpha(view, 1);
-
-            if (isVertical()) {
-                ViewHelper.setTranslationX(view, 0);
-            } else {
-                ViewHelper.setTranslationY(view, 0);
-            }
-
-            // We only need to reset the height or width after individual tab close animations.
-            if (mOriginalSize != 0) {
-                if (isVertical()) {
-                    ViewHelper.setHeight(view, mOriginalSize);
-                } else {
-                    ViewHelper.setWidth(view, mOriginalSize);
-                }
-            }
-        }
-
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             TabsLayoutItemView item;
@@ -306,6 +275,44 @@ class TabsListLayout extends TwoWayView
         }
     }
 
+    private void assignValues(TabsLayoutItemView item, Tab tab) {
+        if (item == null || tab == null)
+            return;
+
+        item.id = tab.getId();
+
+        Drawable thumbnailImage = tab.getThumbnail();
+        if (thumbnailImage != null) {
+            item.thumbnail.setImageDrawable(thumbnailImage);
+        } else {
+            item.thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
+        }
+        if (item.thumbnailWrapper != null) {
+            item.thumbnailWrapper.setRecording(tab.isRecording());
+        }
+        item.title.setText(tab.getDisplayTitle());
+        item.close.setTag(item);
+    }
+
+    private void resetTransforms(View view) {
+        ViewHelper.setAlpha(view, 1);
+
+        if (isVertical()) {
+            ViewHelper.setTranslationX(view, 0);
+        } else {
+            ViewHelper.setTranslationY(view, 0);
+        }
+
+        // We only need to reset the height or width after individual tab close animations.
+        if (mOriginalSize != 0) {
+            if (isVertical()) {
+                ViewHelper.setHeight(view, mOriginalSize);
+            } else {
+                ViewHelper.setWidth(view, mOriginalSize);
+            }
+        }
+    }
+
     private boolean isVertical() {
         return (getOrientation().compareTo(TwoWayView.Orientation.VERTICAL) == 0);
     }

From e1bf6195a09c077ac53a067701ba35941f5ac2eb Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Thu, 4 Sep 2014 16:54:01 +0100
Subject: [PATCH 076/109] Bug 1055595 - Part 2: move code from layout to item
 view (r=lucasr)

---
 .../android/base/tabs/TabsLayoutItemView.java | 23 ++++++++++++-
 mobile/android/base/tabs/TabsListLayout.java  | 32 ++++---------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/mobile/android/base/tabs/TabsLayoutItemView.java b/mobile/android/base/tabs/TabsLayoutItemView.java
index 715d46347cf8..6cd13dc82678 100644
--- a/mobile/android/base/tabs/TabsLayoutItemView.java
+++ b/mobile/android/base/tabs/TabsLayoutItemView.java
@@ -5,8 +5,10 @@
 package org.mozilla.gecko.tabs;
 
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.widget.TabThumbnailWrapper;
 
+import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
@@ -28,4 +30,23 @@ public class TabsLayoutItemView {
         close = (ImageButton) view.findViewById(R.id.close);
         thumbnailWrapper = (TabThumbnailWrapper) view.findViewById(R.id.wrapper);
     }
-}
\ No newline at end of file
+
+    protected void assignValues(Tab tab) {
+        if (tab == null)
+            return;
+
+        id = tab.getId();
+
+        Drawable thumbnailImage = tab.getThumbnail();
+        if (thumbnailImage != null) {
+            thumbnail.setImageDrawable(thumbnailImage);
+        } else {
+            thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
+        }
+        if (thumbnailWrapper != null) {
+            thumbnailWrapper.setRecording(tab.isRecording());
+        }
+        title.setText(tab.getDisplayTitle());
+        close.setTag(this);
+    }
+}
diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index 4fe33791a590..2dfce428893b 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -9,22 +9,21 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.mozilla.gecko.AboutPages;
+import org.mozilla.gecko.animation.PropertyAnimator.Property;
+import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
-import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.tabs.TabsPanel.TabsLayout;
-import org.mozilla.gecko.animation.PropertyAnimator;
-import org.mozilla.gecko.animation.PropertyAnimator.Property;
-import org.mozilla.gecko.animation.ViewHelper;
+import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.widget.TwoWayView;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -150,7 +149,7 @@ class TabsListLayout extends TwoWayView
                     return;
 
                 TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
-                assignValues(item, tab);
+                item.assignValues(tab);
                 break;
         }
     }
@@ -269,31 +268,12 @@ class TabsListLayout extends TwoWayView
             }
 
             Tab tab = mTabs.get(position);
-            assignValues(item, tab);
+            item.assignValues(tab);
 
             return convertView;
         }
     }
 
-    private void assignValues(TabsLayoutItemView item, Tab tab) {
-        if (item == null || tab == null)
-            return;
-
-        item.id = tab.getId();
-
-        Drawable thumbnailImage = tab.getThumbnail();
-        if (thumbnailImage != null) {
-            item.thumbnail.setImageDrawable(thumbnailImage);
-        } else {
-            item.thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
-        }
-        if (item.thumbnailWrapper != null) {
-            item.thumbnailWrapper.setRecording(tab.isRecording());
-        }
-        item.title.setText(tab.getDisplayTitle());
-        item.close.setTag(item);
-    }
-
     private void resetTransforms(View view) {
         ViewHelper.setAlpha(view, 1);
 

From 2bcc6dcc13e70b2704fe851d2f5dc3a0aad8d221 Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Thu, 4 Sep 2014 16:54:01 +0100
Subject: [PATCH 077/109] Bug 1055595 - Part 3: introduce newView/bindView
 constructs in to adapter (r=lucasr)

---
 mobile/android/base/tabs/TabsListLayout.java | 36 ++++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index 2dfce428893b..55007117bd23 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -253,25 +253,39 @@ class TabsListLayout extends TwoWayView
 
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
-            TabsLayoutItemView item;
-
+            final View view;
             if (convertView == null) {
-                convertView = mInflater.inflate(R.layout.tabs_row, null);
-                item = new TabsLayoutItemView(convertView);
-                item.close.setOnClickListener(mOnCloseClickListener);
-                convertView.setTag(item);
+                view = newView(position, parent);
             } else {
-                item = (TabsLayoutItemView) convertView.getTag();
+                view = convertView;
+
                 // If we're recycling this view, there's a chance it was transformed during
                 // the close animation. Remove any of those properties.
-                resetTransforms(convertView);
+                resetTransforms(view);
             }
 
-            Tab tab = mTabs.get(position);
-            item.assignValues(tab);
+            final Tab tab = mTabs.get(position);
+            bindView(view, tab);
 
-            return convertView;
+            return view;
         }
+
+        View newView(int position, ViewGroup parent) {
+            final View view = mInflater.inflate(R.layout.tabs_row, parent, false);
+
+            final TabsLayoutItemView item = new TabsLayoutItemView(view);
+            item.close.setOnClickListener(mOnCloseClickListener);
+
+            view.setTag(item);
+            return view;
+        }
+
+        void bindView(View view, Tab tab) {
+            TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
+            item.assignValues(tab);
+        }
+
+
     }
 
     private void resetTransforms(View view) {

From a804ea7ae31cdb888f8d3c149a36783d19293525 Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Thu, 4 Sep 2014 16:54:01 +0100
Subject: [PATCH 078/109] Bug 1055595 - Part 4: rename and extract adapter,
 make abstract and create concrete implementation within the list view 
 (r=lucasr)

---
 mobile/android/base/moz.build                |   1 +
 mobile/android/base/tabs/TabsListLayout.java | 147 ++++++-------------
 2 files changed, 44 insertions(+), 104 deletions(-)

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 8dbb606940f5..3bfc7167ba73 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -392,6 +392,7 @@ gbjar.sources += [
     'tabs/RemoteTabsSetupPanel.java',
     'tabs/RemoteTabsVerificationPanel.java',
     'tabs/TabCurve.java',
+    'tabs/TabsLayoutAdapter.java',
     'tabs/TabsLayoutItemView.java',
     'tabs/TabsListLayout.java',
     'tabs/TabsPanel.java',
diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index 55007117bd23..136c54fc9d38 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -16,6 +16,7 @@ import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.tabs.TabsLayoutAdapter;
 import org.mozilla.gecko.tabs.TabsPanel.TabsLayout;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.util.ThreadUtils;
@@ -25,13 +26,11 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
 import android.util.AttributeSet;
-import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
-import android.view.ViewConfiguration;
 import android.view.ViewGroup;
-import android.widget.BaseAdapter;
+import android.view.ViewConfiguration;
 import android.widget.Button;
 
 class TabsListLayout extends TwoWayView
@@ -44,7 +43,7 @@ class TabsListLayout extends TwoWayView
 
     final private boolean mIsPrivate;
 
-    private TabsAdapter mTabsAdapter;
+    private TabsLayoutAdapter mTabsAdapter;
 
     private List<View> mPendingClosedTabs;
     private int mCloseAnimationCount;
@@ -72,7 +71,7 @@ class TabsListLayout extends TwoWayView
         mIsPrivate = (a.getInt(R.styleable.TabsTray_tabs, 0x0) == 1);
         a.recycle();
 
-        mTabsAdapter = new TabsAdapter(mContext);
+        mTabsAdapter = new TabsListLayoutAdapter(mContext);
         setAdapter(mTabsAdapter);
 
         mSwipeListener = new TabSwipeGestureListener();
@@ -89,6 +88,44 @@ class TabsListLayout extends TwoWayView
         });
     }
 
+    private class TabsListLayoutAdapter extends TabsLayoutAdapter {
+        private Button.OnClickListener mOnClickListener;
+        public TabsListLayoutAdapter (Context context) {
+            super(context);
+
+            mOnClickListener = new Button.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    TabsLayoutItemView tab = (TabsLayoutItemView) v.getTag();
+                    final int pos = (isVertical() ? tab.info.getWidth() : 0 - tab.info.getHeight());
+                    animateClose(tab.info, pos);
+                }
+            };
+        }
+
+        @Override
+        public View newView(int position, ViewGroup parent) {
+            View view = super.newView(position, parent);
+
+            // This is nasty and once we change TabsLayoutItemView to an actual view
+            // we can get rid of it.
+            TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
+            item.close.setOnClickListener(mOnClickListener);
+
+            return view;
+        }
+
+        @Override
+        public void bindView(View view, Tab tab) {
+            super.bindView(view, tab);
+
+            // If we're recycling this view, there's a chance it was transformed during
+            // the close animation. Remove any of those properties.
+            TabsListLayout.this.resetTransforms(view);
+        }
+
+    }
+
     @Override
     public void setTabsPanel(TabsPanel panel) {
         mTabsPanel = panel;
@@ -190,105 +227,7 @@ class TabsListLayout extends TwoWayView
         updateSelectedPosition();
     }
 
-    // Adapter to bind tabs into a list
-    private class TabsAdapter extends BaseAdapter {
-        private Context mContext;
-        private ArrayList<Tab> mTabs;
-        private LayoutInflater mInflater;
-        private Button.OnClickListener mOnCloseClickListener;
-
-        public TabsAdapter(Context context) {
-            mContext = context;
-            mInflater = LayoutInflater.from(mContext);
-
-            mOnCloseClickListener = new Button.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    TabsLayoutItemView tab = (TabsLayoutItemView) v.getTag();
-                    final int pos = (isVertical() ? tab.info.getWidth() : 0 - tab.info.getHeight());
-                    animateClose(tab.info, pos);
-                }
-            };
-        }
-
-        public void setTabs (ArrayList<Tab> tabs) {
-            mTabs = tabs;
-            notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
-        }
-
-        public boolean removeTab (Tab tab) {
-            boolean tabRemoved = mTabs.remove(tab);
-            if (tabRemoved) {
-                notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
-            }
-            return tabRemoved;
-        }
-
-        public void clear() {
-            mTabs = null;
-            notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
-        }
-
-        @Override
-        public int getCount() {
-            return (mTabs == null ? 0 : mTabs.size());
-        }
-
-        @Override
-        public Tab getItem(int position) {
-            return mTabs.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        private int getPositionForTab(Tab tab) {
-            if (mTabs == null || tab == null)
-                return -1;
-
-            return mTabs.indexOf(tab);
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            final View view;
-            if (convertView == null) {
-                view = newView(position, parent);
-            } else {
-                view = convertView;
-
-                // If we're recycling this view, there's a chance it was transformed during
-                // the close animation. Remove any of those properties.
-                resetTransforms(view);
-            }
-
-            final Tab tab = mTabs.get(position);
-            bindView(view, tab);
-
-            return view;
-        }
-
-        View newView(int position, ViewGroup parent) {
-            final View view = mInflater.inflate(R.layout.tabs_row, parent, false);
-
-            final TabsLayoutItemView item = new TabsLayoutItemView(view);
-            item.close.setOnClickListener(mOnCloseClickListener);
-
-            view.setTag(item);
-            return view;
-        }
-
-        void bindView(View view, Tab tab) {
-            TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
-            item.assignValues(tab);
-        }
-
-
-    }
-
-    private void resetTransforms(View view) {
+    public void resetTransforms(View view) {
         ViewHelper.setAlpha(view, 1);
 
         if (isVertical()) {

From c80bc461575ed523b763e0dafb2458660a1e8ebe Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Thu, 4 Sep 2014 18:29:19 +0100
Subject: [PATCH 079/109] Backout bug 1055595, build failures (r=backout)

---
 mobile/android/base/moz.build                 |   1 -
 .../android/base/tabs/TabsLayoutItemView.java |  23 +-
 mobile/android/base/tabs/TabsListLayout.java  | 316 +++++++++++-------
 3 files changed, 189 insertions(+), 151 deletions(-)

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 3bfc7167ba73..8dbb606940f5 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -392,7 +392,6 @@ gbjar.sources += [
     'tabs/RemoteTabsSetupPanel.java',
     'tabs/RemoteTabsVerificationPanel.java',
     'tabs/TabCurve.java',
-    'tabs/TabsLayoutAdapter.java',
     'tabs/TabsLayoutItemView.java',
     'tabs/TabsListLayout.java',
     'tabs/TabsPanel.java',
diff --git a/mobile/android/base/tabs/TabsLayoutItemView.java b/mobile/android/base/tabs/TabsLayoutItemView.java
index 6cd13dc82678..715d46347cf8 100644
--- a/mobile/android/base/tabs/TabsLayoutItemView.java
+++ b/mobile/android/base/tabs/TabsLayoutItemView.java
@@ -5,10 +5,8 @@
 package org.mozilla.gecko.tabs;
 
 import org.mozilla.gecko.R;
-import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.widget.TabThumbnailWrapper;
 
-import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
@@ -30,23 +28,4 @@ public class TabsLayoutItemView {
         close = (ImageButton) view.findViewById(R.id.close);
         thumbnailWrapper = (TabThumbnailWrapper) view.findViewById(R.id.wrapper);
     }
-
-    protected void assignValues(Tab tab) {
-        if (tab == null)
-            return;
-
-        id = tab.getId();
-
-        Drawable thumbnailImage = tab.getThumbnail();
-        if (thumbnailImage != null) {
-            thumbnail.setImageDrawable(thumbnailImage);
-        } else {
-            thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
-        }
-        if (thumbnailWrapper != null) {
-            thumbnailWrapper.setRecording(tab.isRecording());
-        }
-        title.setText(tab.getDisplayTitle());
-        close.setTag(this);
-    }
-}
+}
\ No newline at end of file
diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index 136c54fc9d38..dfe653895064 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -9,33 +9,34 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.mozilla.gecko.AboutPages;
-import org.mozilla.gecko.animation.PropertyAnimator.Property;
-import org.mozilla.gecko.animation.PropertyAnimator;
-import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
-import org.mozilla.gecko.tabs.TabsLayoutAdapter;
-import org.mozilla.gecko.tabs.TabsPanel.TabsLayout;
 import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.tabs.TabsPanel.TabsLayout;
+import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.PropertyAnimator.Property;
+import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.widget.TwoWayView;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
 import android.widget.Button;
 
 class TabsListLayout extends TwoWayView
-                     implements TabsLayout,
-                                Tabs.OnTabsChangedListener {
+                     implements TabsLayout {
     private static final String LOGTAG = "Gecko" + TabsListLayout.class.getSimpleName();
 
     private Context mContext;
@@ -43,7 +44,7 @@ class TabsListLayout extends TwoWayView
 
     final private boolean mIsPrivate;
 
-    private TabsLayoutAdapter mTabsAdapter;
+    private TabsAdapter mTabsAdapter;
 
     private List<View> mPendingClosedTabs;
     private int mCloseAnimationCount;
@@ -71,7 +72,7 @@ class TabsListLayout extends TwoWayView
         mIsPrivate = (a.getInt(R.styleable.TabsTray_tabs, 0x0) == 1);
         a.recycle();
 
-        mTabsAdapter = new TabsListLayoutAdapter(mContext);
+        mTabsAdapter = new TabsAdapter(mContext);
         setAdapter(mTabsAdapter);
 
         mSwipeListener = new TabSwipeGestureListener();
@@ -88,44 +89,6 @@ class TabsListLayout extends TwoWayView
         });
     }
 
-    private class TabsListLayoutAdapter extends TabsLayoutAdapter {
-        private Button.OnClickListener mOnClickListener;
-        public TabsListLayoutAdapter (Context context) {
-            super(context);
-
-            mOnClickListener = new Button.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    TabsLayoutItemView tab = (TabsLayoutItemView) v.getTag();
-                    final int pos = (isVertical() ? tab.info.getWidth() : 0 - tab.info.getHeight());
-                    animateClose(tab.info, pos);
-                }
-            };
-        }
-
-        @Override
-        public View newView(int position, ViewGroup parent) {
-            View view = super.newView(position, parent);
-
-            // This is nasty and once we change TabsLayoutItemView to an actual view
-            // we can get rid of it.
-            TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
-            item.close.setOnClickListener(mOnClickListener);
-
-            return view;
-        }
-
-        @Override
-        public void bindView(View view, Tab tab) {
-            super.bindView(view, tab);
-
-            // If we're recycling this view, there's a chance it was transformed during
-            // the close animation. Remove any of those properties.
-            TabsListLayout.this.resetTransforms(view);
-        }
-
-    }
-
     @Override
     public void setTabsPanel(TabsPanel panel) {
         mTabsPanel = panel;
@@ -135,14 +98,14 @@ class TabsListLayout extends TwoWayView
     public void show() {
         setVisibility(View.VISIBLE);
         Tabs.getInstance().refreshThumbnails();
-        Tabs.registerOnTabsChangedListener(this);
-        refreshTabsData();
+        Tabs.registerOnTabsChangedListener(mTabsAdapter);
+        mTabsAdapter.refreshTabsData();
     }
 
     @Override
     public void hide() {
         setVisibility(View.GONE);
-        Tabs.unregisterOnTabsChangedListener(this);
+        Tabs.unregisterOnTabsChangedListener(mTabsAdapter);
         GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Tab:Screenshot:Cancel",""));
         mTabsAdapter.clear();
     }
@@ -156,94 +119,191 @@ class TabsListLayout extends TwoWayView
         mTabsPanel.autoHidePanel();
     }
 
-    @Override
-    public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
-        switch (msg) {
-            case ADDED:
-                // Refresh the list to make sure the new tab is added in the right position.
-                refreshTabsData();
-                break;
 
-            case CLOSED:
-               if (tab.isPrivate() == mIsPrivate && mTabsAdapter.getCount() > 0) {
-                   if (mTabsAdapter.removeTab(tab)) {
-                       int selected = mTabsAdapter.getPositionForTab(Tabs.getInstance().getSelectedTab());
-                       updateSelectedStyle(selected);
-                   }
-               }
-               break;
 
-            case SELECTED:
-                // Update the selected position, then fall through...
-                updateSelectedPosition();
-            case UNSELECTED:
-                // We just need to update the style for the unselected tab...
-            case THUMBNAIL:
-            case TITLE:
-            case RECORDING_CHANGE:
-                View view = getChildAt(mTabsAdapter.getPositionForTab(tab) - getFirstVisiblePosition());
-                if (view == null)
-                    return;
+    // Adapter to bind tabs into a list
+    private class TabsAdapter extends BaseAdapter implements Tabs.OnTabsChangedListener {
+        private Context mContext;
+        private ArrayList<Tab> mTabs;
+        private LayoutInflater mInflater;
+        private Button.OnClickListener mOnCloseClickListener;
 
-                TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
-                item.assignValues(tab);
-                break;
-        }
-    }
+        public TabsAdapter(Context context) {
+            mContext = context;
+            mInflater = LayoutInflater.from(mContext);
 
-    // Updates the selected position in the list so that it will be scrolled to the right place.
-    private void updateSelectedPosition() {
-        int selected = mTabsAdapter.getPositionForTab(Tabs.getInstance().getSelectedTab());
-        updateSelectedStyle(selected);
-
-        if (selected != -1) {
-            setSelection(selected);
-        }
-    }
-
-    /**
-     * Updates the selected/unselected style for the tabs.
-     *
-     * @param selected position of the selected tab
-     */
-    private void updateSelectedStyle(int selected) {
-        for (int i = 0; i < mTabsAdapter.getCount(); i++) {
-            setItemChecked(i, (i == selected));
-        }
-    }
-
-    private void refreshTabsData() {
-        // Store a different copy of the tabs, so that we don't have to worry about
-        // accidentally updating it on the wrong thread.
-        ArrayList<Tab> tabData = new ArrayList<Tab>();
-
-        Iterable<Tab> allTabs = Tabs.getInstance().getTabsInOrder();
-        for (Tab tab : allTabs) {
-            if (tab.isPrivate() == mIsPrivate)
-                tabData.add(tab);
+            mOnCloseClickListener = new Button.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    TabsLayoutItemView tab = (TabsLayoutItemView) v.getTag();
+                    final int pos = (isVertical() ? tab.info.getWidth() : 0 - tab.info.getHeight());
+                    animateClose(tab.info, pos);
+                }
+            };
         }
 
-        mTabsAdapter.setTabs(tabData);
-        updateSelectedPosition();
-    }
+        @Override
+        public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
+            switch (msg) {
+                case ADDED:
+                    // Refresh the list to make sure the new tab is added in the right position.
+                    refreshTabsData();
+                    break;
 
-    public void resetTransforms(View view) {
-        ViewHelper.setAlpha(view, 1);
+                case CLOSED:
+                    removeTab(tab);
+                    break;
 
-        if (isVertical()) {
-            ViewHelper.setTranslationX(view, 0);
-        } else {
-            ViewHelper.setTranslationY(view, 0);
-        }
+                case SELECTED:
+                    // Update the selected position, then fall through...
+                    updateSelectedPosition();
+                case UNSELECTED:
+                    // We just need to update the style for the unselected tab...
+                case THUMBNAIL:
+                case TITLE:
+                case RECORDING_CHANGE:
+                    View view = TabsListLayout.this.getChildAt(getPositionForTab(tab) - TabsListLayout.this.getFirstVisiblePosition());
+                    if (view == null)
+                        return;
 
-        // We only need to reset the height or width after individual tab close animations.
-        if (mOriginalSize != 0) {
-            if (isVertical()) {
-                ViewHelper.setHeight(view, mOriginalSize);
-            } else {
-                ViewHelper.setWidth(view, mOriginalSize);
+                    TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
+                    assignValues(item, tab);
+                    break;
             }
         }
+
+        private void refreshTabsData() {
+            // Store a different copy of the tabs, so that we don't have to worry about
+            // accidentally updating it on the wrong thread.
+            mTabs = new ArrayList<Tab>();
+
+            Iterable<Tab> tabs = Tabs.getInstance().getTabsInOrder();
+            for (Tab tab : tabs) {
+                if (tab.isPrivate() == mIsPrivate)
+                    mTabs.add(tab);
+            }
+
+            notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
+            updateSelectedPosition();
+        }
+
+        // Updates the selected position in the list so that it will be scrolled to the right place.
+        private void updateSelectedPosition() {
+            int selected = getPositionForTab(Tabs.getInstance().getSelectedTab());
+            updateSelectedStyle(selected);
+
+            if (selected != -1) {
+                TabsListLayout.this.setSelection(selected);
+            }
+        }
+
+        /**
+         * Updates the selected/unselected style for the tabs.
+         *
+         * @param selected position of the selected tab
+         */
+        private void updateSelectedStyle(int selected) {
+            for (int i = 0; i < getCount(); i++) {
+                TabsListLayout.this.setItemChecked(i, (i == selected));
+            }
+        }
+
+        public void clear() {
+            mTabs = null;
+            notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
+        }
+
+        @Override
+        public int getCount() {
+            return (mTabs == null ? 0 : mTabs.size());
+        }
+
+        @Override
+        public Tab getItem(int position) {
+            return mTabs.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        private int getPositionForTab(Tab tab) {
+            if (mTabs == null || tab == null)
+                return -1;
+
+            return mTabs.indexOf(tab);
+        }
+
+        private void removeTab(Tab tab) {
+            if (tab.isPrivate() == mIsPrivate && mTabs != null) {
+                mTabs.remove(tab);
+                notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
+
+                int selected = getPositionForTab(Tabs.getInstance().getSelectedTab());
+                updateSelectedStyle(selected);
+            }
+        }
+
+        private void assignValues(TabsLayoutItemView item, Tab tab) {
+            if (item == null || tab == null)
+                return;
+
+            item.id = tab.getId();
+
+            Drawable thumbnailImage = tab.getThumbnail();
+            if (thumbnailImage != null) {
+                item.thumbnail.setImageDrawable(thumbnailImage);
+            } else {
+                item.thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
+            }
+            if (item.thumbnailWrapper != null) {
+                item.thumbnailWrapper.setRecording(tab.isRecording());
+            }
+            item.title.setText(tab.getDisplayTitle());
+            item.close.setTag(item);
+        }
+
+        private void resetTransforms(View view) {
+            ViewHelper.setAlpha(view, 1);
+
+            if (isVertical()) {
+                ViewHelper.setTranslationX(view, 0);
+            } else {
+                ViewHelper.setTranslationY(view, 0);
+            }
+
+            // We only need to reset the height or width after individual tab close animations.
+            if (mOriginalSize != 0) {
+                if (isVertical()) {
+                    ViewHelper.setHeight(view, mOriginalSize);
+                } else {
+                    ViewHelper.setWidth(view, mOriginalSize);
+                }
+            }
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            TabsLayoutItemView item;
+
+            if (convertView == null) {
+                convertView = mInflater.inflate(R.layout.tabs_row, null);
+                item = new TabsLayoutItemView(convertView);
+                item.close.setOnClickListener(mOnCloseClickListener);
+                convertView.setTag(item);
+            } else {
+                item = (TabsLayoutItemView) convertView.getTag();
+                // If we're recycling this view, there's a chance it was transformed during
+                // the close animation. Remove any of those properties.
+                resetTransforms(convertView);
+            }
+
+            Tab tab = mTabs.get(position);
+            assignValues(item, tab);
+
+            return convertView;
+        }
     }
 
     private boolean isVertical() {

From 40ca757e3d7209b577ca7e57fc51cf22d9863e92 Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Fri, 5 Sep 2014 09:28:24 +0100
Subject: [PATCH 080/109] Bug 1055595 - Part 1: Simplify adapter (r=lucasr)

---
 mobile/android/base/tabs/TabsListLayout.java | 233 ++++++++++---------
 1 file changed, 120 insertions(+), 113 deletions(-)

diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index dfe653895064..4fe33791a590 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -36,7 +36,8 @@ import android.widget.BaseAdapter;
 import android.widget.Button;
 
 class TabsListLayout extends TwoWayView
-                     implements TabsLayout {
+                     implements TabsLayout,
+                                Tabs.OnTabsChangedListener {
     private static final String LOGTAG = "Gecko" + TabsListLayout.class.getSimpleName();
 
     private Context mContext;
@@ -98,14 +99,14 @@ class TabsListLayout extends TwoWayView
     public void show() {
         setVisibility(View.VISIBLE);
         Tabs.getInstance().refreshThumbnails();
-        Tabs.registerOnTabsChangedListener(mTabsAdapter);
-        mTabsAdapter.refreshTabsData();
+        Tabs.registerOnTabsChangedListener(this);
+        refreshTabsData();
     }
 
     @Override
     public void hide() {
         setVisibility(View.GONE);
-        Tabs.unregisterOnTabsChangedListener(mTabsAdapter);
+        Tabs.unregisterOnTabsChangedListener(this);
         GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Tab:Screenshot:Cancel",""));
         mTabsAdapter.clear();
     }
@@ -119,10 +120,79 @@ class TabsListLayout extends TwoWayView
         mTabsPanel.autoHidePanel();
     }
 
+    @Override
+    public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
+        switch (msg) {
+            case ADDED:
+                // Refresh the list to make sure the new tab is added in the right position.
+                refreshTabsData();
+                break;
 
+            case CLOSED:
+               if (tab.isPrivate() == mIsPrivate && mTabsAdapter.getCount() > 0) {
+                   if (mTabsAdapter.removeTab(tab)) {
+                       int selected = mTabsAdapter.getPositionForTab(Tabs.getInstance().getSelectedTab());
+                       updateSelectedStyle(selected);
+                   }
+               }
+               break;
+
+            case SELECTED:
+                // Update the selected position, then fall through...
+                updateSelectedPosition();
+            case UNSELECTED:
+                // We just need to update the style for the unselected tab...
+            case THUMBNAIL:
+            case TITLE:
+            case RECORDING_CHANGE:
+                View view = getChildAt(mTabsAdapter.getPositionForTab(tab) - getFirstVisiblePosition());
+                if (view == null)
+                    return;
+
+                TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
+                assignValues(item, tab);
+                break;
+        }
+    }
+
+    // Updates the selected position in the list so that it will be scrolled to the right place.
+    private void updateSelectedPosition() {
+        int selected = mTabsAdapter.getPositionForTab(Tabs.getInstance().getSelectedTab());
+        updateSelectedStyle(selected);
+
+        if (selected != -1) {
+            setSelection(selected);
+        }
+    }
+
+    /**
+     * Updates the selected/unselected style for the tabs.
+     *
+     * @param selected position of the selected tab
+     */
+    private void updateSelectedStyle(int selected) {
+        for (int i = 0; i < mTabsAdapter.getCount(); i++) {
+            setItemChecked(i, (i == selected));
+        }
+    }
+
+    private void refreshTabsData() {
+        // Store a different copy of the tabs, so that we don't have to worry about
+        // accidentally updating it on the wrong thread.
+        ArrayList<Tab> tabData = new ArrayList<Tab>();
+
+        Iterable<Tab> allTabs = Tabs.getInstance().getTabsInOrder();
+        for (Tab tab : allTabs) {
+            if (tab.isPrivate() == mIsPrivate)
+                tabData.add(tab);
+        }
+
+        mTabsAdapter.setTabs(tabData);
+        updateSelectedPosition();
+    }
 
     // Adapter to bind tabs into a list
-    private class TabsAdapter extends BaseAdapter implements Tabs.OnTabsChangedListener {
+    private class TabsAdapter extends BaseAdapter {
         private Context mContext;
         private ArrayList<Tab> mTabs;
         private LayoutInflater mInflater;
@@ -142,70 +212,17 @@ class TabsListLayout extends TwoWayView
             };
         }
 
-        @Override
-        public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
-            switch (msg) {
-                case ADDED:
-                    // Refresh the list to make sure the new tab is added in the right position.
-                    refreshTabsData();
-                    break;
-
-                case CLOSED:
-                    removeTab(tab);
-                    break;
-
-                case SELECTED:
-                    // Update the selected position, then fall through...
-                    updateSelectedPosition();
-                case UNSELECTED:
-                    // We just need to update the style for the unselected tab...
-                case THUMBNAIL:
-                case TITLE:
-                case RECORDING_CHANGE:
-                    View view = TabsListLayout.this.getChildAt(getPositionForTab(tab) - TabsListLayout.this.getFirstVisiblePosition());
-                    if (view == null)
-                        return;
-
-                    TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
-                    assignValues(item, tab);
-                    break;
-            }
-        }
-
-        private void refreshTabsData() {
-            // Store a different copy of the tabs, so that we don't have to worry about
-            // accidentally updating it on the wrong thread.
-            mTabs = new ArrayList<Tab>();
-
-            Iterable<Tab> tabs = Tabs.getInstance().getTabsInOrder();
-            for (Tab tab : tabs) {
-                if (tab.isPrivate() == mIsPrivate)
-                    mTabs.add(tab);
-            }
-
+        public void setTabs (ArrayList<Tab> tabs) {
+            mTabs = tabs;
             notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
-            updateSelectedPosition();
         }
 
-        // Updates the selected position in the list so that it will be scrolled to the right place.
-        private void updateSelectedPosition() {
-            int selected = getPositionForTab(Tabs.getInstance().getSelectedTab());
-            updateSelectedStyle(selected);
-
-            if (selected != -1) {
-                TabsListLayout.this.setSelection(selected);
-            }
-        }
-
-        /**
-         * Updates the selected/unselected style for the tabs.
-         *
-         * @param selected position of the selected tab
-         */
-        private void updateSelectedStyle(int selected) {
-            for (int i = 0; i < getCount(); i++) {
-                TabsListLayout.this.setItemChecked(i, (i == selected));
+        public boolean removeTab (Tab tab) {
+            boolean tabRemoved = mTabs.remove(tab);
+            if (tabRemoved) {
+                notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
             }
+            return tabRemoved;
         }
 
         public void clear() {
@@ -235,54 +252,6 @@ class TabsListLayout extends TwoWayView
             return mTabs.indexOf(tab);
         }
 
-        private void removeTab(Tab tab) {
-            if (tab.isPrivate() == mIsPrivate && mTabs != null) {
-                mTabs.remove(tab);
-                notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
-
-                int selected = getPositionForTab(Tabs.getInstance().getSelectedTab());
-                updateSelectedStyle(selected);
-            }
-        }
-
-        private void assignValues(TabsLayoutItemView item, Tab tab) {
-            if (item == null || tab == null)
-                return;
-
-            item.id = tab.getId();
-
-            Drawable thumbnailImage = tab.getThumbnail();
-            if (thumbnailImage != null) {
-                item.thumbnail.setImageDrawable(thumbnailImage);
-            } else {
-                item.thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
-            }
-            if (item.thumbnailWrapper != null) {
-                item.thumbnailWrapper.setRecording(tab.isRecording());
-            }
-            item.title.setText(tab.getDisplayTitle());
-            item.close.setTag(item);
-        }
-
-        private void resetTransforms(View view) {
-            ViewHelper.setAlpha(view, 1);
-
-            if (isVertical()) {
-                ViewHelper.setTranslationX(view, 0);
-            } else {
-                ViewHelper.setTranslationY(view, 0);
-            }
-
-            // We only need to reset the height or width after individual tab close animations.
-            if (mOriginalSize != 0) {
-                if (isVertical()) {
-                    ViewHelper.setHeight(view, mOriginalSize);
-                } else {
-                    ViewHelper.setWidth(view, mOriginalSize);
-                }
-            }
-        }
-
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             TabsLayoutItemView item;
@@ -306,6 +275,44 @@ class TabsListLayout extends TwoWayView
         }
     }
 
+    private void assignValues(TabsLayoutItemView item, Tab tab) {
+        if (item == null || tab == null)
+            return;
+
+        item.id = tab.getId();
+
+        Drawable thumbnailImage = tab.getThumbnail();
+        if (thumbnailImage != null) {
+            item.thumbnail.setImageDrawable(thumbnailImage);
+        } else {
+            item.thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
+        }
+        if (item.thumbnailWrapper != null) {
+            item.thumbnailWrapper.setRecording(tab.isRecording());
+        }
+        item.title.setText(tab.getDisplayTitle());
+        item.close.setTag(item);
+    }
+
+    private void resetTransforms(View view) {
+        ViewHelper.setAlpha(view, 1);
+
+        if (isVertical()) {
+            ViewHelper.setTranslationX(view, 0);
+        } else {
+            ViewHelper.setTranslationY(view, 0);
+        }
+
+        // We only need to reset the height or width after individual tab close animations.
+        if (mOriginalSize != 0) {
+            if (isVertical()) {
+                ViewHelper.setHeight(view, mOriginalSize);
+            } else {
+                ViewHelper.setWidth(view, mOriginalSize);
+            }
+        }
+    }
+
     private boolean isVertical() {
         return (getOrientation().compareTo(TwoWayView.Orientation.VERTICAL) == 0);
     }

From aae7fd22984c1fee12b6f9fdb0dc655e58a297be Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Fri, 5 Sep 2014 09:28:24 +0100
Subject: [PATCH 081/109] Bug 1055595 - Part 2: move code from layout to item
 view (r=lucasr)

---
 .../android/base/tabs/TabsLayoutItemView.java | 23 ++++++++++++-
 mobile/android/base/tabs/TabsListLayout.java  | 32 ++++---------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/mobile/android/base/tabs/TabsLayoutItemView.java b/mobile/android/base/tabs/TabsLayoutItemView.java
index 715d46347cf8..6cd13dc82678 100644
--- a/mobile/android/base/tabs/TabsLayoutItemView.java
+++ b/mobile/android/base/tabs/TabsLayoutItemView.java
@@ -5,8 +5,10 @@
 package org.mozilla.gecko.tabs;
 
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.widget.TabThumbnailWrapper;
 
+import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
@@ -28,4 +30,23 @@ public class TabsLayoutItemView {
         close = (ImageButton) view.findViewById(R.id.close);
         thumbnailWrapper = (TabThumbnailWrapper) view.findViewById(R.id.wrapper);
     }
-}
\ No newline at end of file
+
+    protected void assignValues(Tab tab) {
+        if (tab == null)
+            return;
+
+        id = tab.getId();
+
+        Drawable thumbnailImage = tab.getThumbnail();
+        if (thumbnailImage != null) {
+            thumbnail.setImageDrawable(thumbnailImage);
+        } else {
+            thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
+        }
+        if (thumbnailWrapper != null) {
+            thumbnailWrapper.setRecording(tab.isRecording());
+        }
+        title.setText(tab.getDisplayTitle());
+        close.setTag(this);
+    }
+}
diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index 4fe33791a590..2dfce428893b 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -9,22 +9,21 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.mozilla.gecko.AboutPages;
+import org.mozilla.gecko.animation.PropertyAnimator.Property;
+import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
-import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.tabs.TabsPanel.TabsLayout;
-import org.mozilla.gecko.animation.PropertyAnimator;
-import org.mozilla.gecko.animation.PropertyAnimator.Property;
-import org.mozilla.gecko.animation.ViewHelper;
+import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.widget.TwoWayView;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -150,7 +149,7 @@ class TabsListLayout extends TwoWayView
                     return;
 
                 TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
-                assignValues(item, tab);
+                item.assignValues(tab);
                 break;
         }
     }
@@ -269,31 +268,12 @@ class TabsListLayout extends TwoWayView
             }
 
             Tab tab = mTabs.get(position);
-            assignValues(item, tab);
+            item.assignValues(tab);
 
             return convertView;
         }
     }
 
-    private void assignValues(TabsLayoutItemView item, Tab tab) {
-        if (item == null || tab == null)
-            return;
-
-        item.id = tab.getId();
-
-        Drawable thumbnailImage = tab.getThumbnail();
-        if (thumbnailImage != null) {
-            item.thumbnail.setImageDrawable(thumbnailImage);
-        } else {
-            item.thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
-        }
-        if (item.thumbnailWrapper != null) {
-            item.thumbnailWrapper.setRecording(tab.isRecording());
-        }
-        item.title.setText(tab.getDisplayTitle());
-        item.close.setTag(item);
-    }
-
     private void resetTransforms(View view) {
         ViewHelper.setAlpha(view, 1);
 

From 71983060f5a811f405a9f4fe533d19b2c9d0d981 Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Fri, 5 Sep 2014 09:28:24 +0100
Subject: [PATCH 082/109] Bug 1055595 - Part 3: introduce newView/bindView
 constructs in to adapter (r=lucasr)

---
 mobile/android/base/tabs/TabsListLayout.java | 36 ++++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index 2dfce428893b..55007117bd23 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -253,25 +253,39 @@ class TabsListLayout extends TwoWayView
 
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
-            TabsLayoutItemView item;
-
+            final View view;
             if (convertView == null) {
-                convertView = mInflater.inflate(R.layout.tabs_row, null);
-                item = new TabsLayoutItemView(convertView);
-                item.close.setOnClickListener(mOnCloseClickListener);
-                convertView.setTag(item);
+                view = newView(position, parent);
             } else {
-                item = (TabsLayoutItemView) convertView.getTag();
+                view = convertView;
+
                 // If we're recycling this view, there's a chance it was transformed during
                 // the close animation. Remove any of those properties.
-                resetTransforms(convertView);
+                resetTransforms(view);
             }
 
-            Tab tab = mTabs.get(position);
-            item.assignValues(tab);
+            final Tab tab = mTabs.get(position);
+            bindView(view, tab);
 
-            return convertView;
+            return view;
         }
+
+        View newView(int position, ViewGroup parent) {
+            final View view = mInflater.inflate(R.layout.tabs_row, parent, false);
+
+            final TabsLayoutItemView item = new TabsLayoutItemView(view);
+            item.close.setOnClickListener(mOnCloseClickListener);
+
+            view.setTag(item);
+            return view;
+        }
+
+        void bindView(View view, Tab tab) {
+            TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
+            item.assignValues(tab);
+        }
+
+
     }
 
     private void resetTransforms(View view) {

From 53ee3821ed5a0fd946d23417762e723a250369a2 Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Fri, 5 Sep 2014 09:28:25 +0100
Subject: [PATCH 083/109] Bug 1055595 - Part 4: rename and extract adapter,
 make abstract and create concrete implementation within the list view 
 (r=lucasr)

---
 mobile/android/base/moz.build                 |   1 +
 .../android/base/tabs/TabsLayoutAdapter.java  |  94 +++++++++++
 mobile/android/base/tabs/TabsListLayout.java  | 147 +++++-------------
 3 files changed, 138 insertions(+), 104 deletions(-)
 create mode 100644 mobile/android/base/tabs/TabsLayoutAdapter.java

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 8dbb606940f5..3bfc7167ba73 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -392,6 +392,7 @@ gbjar.sources += [
     'tabs/RemoteTabsSetupPanel.java',
     'tabs/RemoteTabsVerificationPanel.java',
     'tabs/TabCurve.java',
+    'tabs/TabsLayoutAdapter.java',
     'tabs/TabsLayoutItemView.java',
     'tabs/TabsListLayout.java',
     'tabs/TabsPanel.java',
diff --git a/mobile/android/base/tabs/TabsLayoutAdapter.java b/mobile/android/base/tabs/TabsLayoutAdapter.java
new file mode 100644
index 000000000000..6baaefdfa6d5
--- /dev/null
+++ b/mobile/android/base/tabs/TabsLayoutAdapter.java
@@ -0,0 +1,94 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+/* 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/. */
+
+package org.mozilla.gecko.tabs;
+
+import java.util.ArrayList;
+
+import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.R;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+
+// Adapter to bind tabs into a list
+public class TabsLayoutAdapter extends BaseAdapter {
+    private Context mContext;
+    private ArrayList<Tab> mTabs;
+    private LayoutInflater mInflater;
+
+    public TabsLayoutAdapter (Context context) {
+        mContext = context;
+        mInflater = LayoutInflater.from(mContext);
+    }
+
+    final void setTabs (ArrayList<Tab> tabs) {
+        mTabs = tabs;
+        notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
+    }
+
+    final boolean removeTab (Tab tab) {
+        boolean tabRemoved = mTabs.remove(tab);
+        if (tabRemoved) {
+            notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
+        }
+        return tabRemoved;
+    }
+
+    final void clear() {
+        mTabs = null;
+        notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
+    }
+
+    @Override
+    public int getCount() {
+        return (mTabs == null ? 0 : mTabs.size());
+    }
+
+    @Override
+    public Tab getItem(int position) {
+        return mTabs.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    final int getPositionForTab(Tab tab) {
+        if (mTabs == null || tab == null)
+            return -1;
+
+        return mTabs.indexOf(tab);
+    }
+
+    @Override
+    final public View getView(int position, View convertView, ViewGroup parent) {
+        final View view;
+        if (convertView == null) {
+            view = newView(position, parent);
+        } else {
+            view = convertView;
+        }
+        final Tab tab = mTabs.get(position);
+        bindView(view, tab);
+        return view;
+    }
+
+    View newView(int position, ViewGroup parent) {
+        final View view = mInflater.inflate(R.layout.tabs_row, parent, false);
+        final TabsLayoutItemView item = new TabsLayoutItemView(view);
+        view.setTag(item);
+        return view;
+    }
+
+    void bindView(View view, Tab tab) {
+        TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
+        item.assignValues(tab);
+    }
+}
\ No newline at end of file
diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index 55007117bd23..136c54fc9d38 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -16,6 +16,7 @@ import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.tabs.TabsLayoutAdapter;
 import org.mozilla.gecko.tabs.TabsPanel.TabsLayout;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.util.ThreadUtils;
@@ -25,13 +26,11 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
 import android.util.AttributeSet;
-import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
-import android.view.ViewConfiguration;
 import android.view.ViewGroup;
-import android.widget.BaseAdapter;
+import android.view.ViewConfiguration;
 import android.widget.Button;
 
 class TabsListLayout extends TwoWayView
@@ -44,7 +43,7 @@ class TabsListLayout extends TwoWayView
 
     final private boolean mIsPrivate;
 
-    private TabsAdapter mTabsAdapter;
+    private TabsLayoutAdapter mTabsAdapter;
 
     private List<View> mPendingClosedTabs;
     private int mCloseAnimationCount;
@@ -72,7 +71,7 @@ class TabsListLayout extends TwoWayView
         mIsPrivate = (a.getInt(R.styleable.TabsTray_tabs, 0x0) == 1);
         a.recycle();
 
-        mTabsAdapter = new TabsAdapter(mContext);
+        mTabsAdapter = new TabsListLayoutAdapter(mContext);
         setAdapter(mTabsAdapter);
 
         mSwipeListener = new TabSwipeGestureListener();
@@ -89,6 +88,44 @@ class TabsListLayout extends TwoWayView
         });
     }
 
+    private class TabsListLayoutAdapter extends TabsLayoutAdapter {
+        private Button.OnClickListener mOnClickListener;
+        public TabsListLayoutAdapter (Context context) {
+            super(context);
+
+            mOnClickListener = new Button.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    TabsLayoutItemView tab = (TabsLayoutItemView) v.getTag();
+                    final int pos = (isVertical() ? tab.info.getWidth() : 0 - tab.info.getHeight());
+                    animateClose(tab.info, pos);
+                }
+            };
+        }
+
+        @Override
+        public View newView(int position, ViewGroup parent) {
+            View view = super.newView(position, parent);
+
+            // This is nasty and once we change TabsLayoutItemView to an actual view
+            // we can get rid of it.
+            TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
+            item.close.setOnClickListener(mOnClickListener);
+
+            return view;
+        }
+
+        @Override
+        public void bindView(View view, Tab tab) {
+            super.bindView(view, tab);
+
+            // If we're recycling this view, there's a chance it was transformed during
+            // the close animation. Remove any of those properties.
+            TabsListLayout.this.resetTransforms(view);
+        }
+
+    }
+
     @Override
     public void setTabsPanel(TabsPanel panel) {
         mTabsPanel = panel;
@@ -190,105 +227,7 @@ class TabsListLayout extends TwoWayView
         updateSelectedPosition();
     }
 
-    // Adapter to bind tabs into a list
-    private class TabsAdapter extends BaseAdapter {
-        private Context mContext;
-        private ArrayList<Tab> mTabs;
-        private LayoutInflater mInflater;
-        private Button.OnClickListener mOnCloseClickListener;
-
-        public TabsAdapter(Context context) {
-            mContext = context;
-            mInflater = LayoutInflater.from(mContext);
-
-            mOnCloseClickListener = new Button.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    TabsLayoutItemView tab = (TabsLayoutItemView) v.getTag();
-                    final int pos = (isVertical() ? tab.info.getWidth() : 0 - tab.info.getHeight());
-                    animateClose(tab.info, pos);
-                }
-            };
-        }
-
-        public void setTabs (ArrayList<Tab> tabs) {
-            mTabs = tabs;
-            notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
-        }
-
-        public boolean removeTab (Tab tab) {
-            boolean tabRemoved = mTabs.remove(tab);
-            if (tabRemoved) {
-                notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
-            }
-            return tabRemoved;
-        }
-
-        public void clear() {
-            mTabs = null;
-            notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
-        }
-
-        @Override
-        public int getCount() {
-            return (mTabs == null ? 0 : mTabs.size());
-        }
-
-        @Override
-        public Tab getItem(int position) {
-            return mTabs.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        private int getPositionForTab(Tab tab) {
-            if (mTabs == null || tab == null)
-                return -1;
-
-            return mTabs.indexOf(tab);
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            final View view;
-            if (convertView == null) {
-                view = newView(position, parent);
-            } else {
-                view = convertView;
-
-                // If we're recycling this view, there's a chance it was transformed during
-                // the close animation. Remove any of those properties.
-                resetTransforms(view);
-            }
-
-            final Tab tab = mTabs.get(position);
-            bindView(view, tab);
-
-            return view;
-        }
-
-        View newView(int position, ViewGroup parent) {
-            final View view = mInflater.inflate(R.layout.tabs_row, parent, false);
-
-            final TabsLayoutItemView item = new TabsLayoutItemView(view);
-            item.close.setOnClickListener(mOnCloseClickListener);
-
-            view.setTag(item);
-            return view;
-        }
-
-        void bindView(View view, Tab tab) {
-            TabsLayoutItemView item = (TabsLayoutItemView) view.getTag();
-            item.assignValues(tab);
-        }
-
-
-    }
-
-    private void resetTransforms(View view) {
+    public void resetTransforms(View view) {
         ViewHelper.setAlpha(view, 1);
 
         if (isVertical()) {

From 55ca8ea289596e29437e160b3fba56426a8835f6 Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Fri, 5 Sep 2014 16:52:44 +0100
Subject: [PATCH 084/109] Bug 1060345: Create a way of dynamically inflating
 the correct tab layout (r=lucasr)

---
 mobile/android/base/BrowserApp.java               |  2 ++
 .../layout-large-land-v11/tabs_panel.xml          | 15 ++++++++-------
 .../base/resources/layout/private_tabs_panel.xml  | 13 +++++++------
 .../android/base/resources/layout/tabs_panel.xml  | 15 ++++++++-------
 mobile/android/base/tabs/TabsPanel.java           |  4 ++++
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 8d9de5c630ab..89f503eebf10 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -237,6 +237,8 @@ public class BrowserApp extends GeckoApp
         final View view;
         if (BrowserToolbar.class.getName().equals(name)) {
             view = BrowserToolbar.create(context, attrs);
+        } else if (TabsPanel.TabsLayout.class.getName().equals(name)) {
+            view = TabsPanel.createTabsLayout(context, attrs);
         } else {
             view = super.onCreateView(name, context, attrs);
         }
diff --git a/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml b/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
index b356fc971010..4b05034e3330 100644
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
+++ b/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
@@ -32,13 +32,14 @@
           android:layout_height="0dip"
           android:layout_weight="1.0">
 
-        <org.mozilla.gecko.tabs.TabsListLayout android:id="@+id/normal_tabs"
-                                               style="@style/TabsList"
-                                               android:layout_width="match_parent"
-                                               android:layout_height="match_parent"
-                                               android:choiceMode="singleChoice"
-                                               android:visibility="gone"
-                                               gecko:tabs="tabs_normal"/>
+        <view class="org.mozilla.gecko.tabs.TabsPanel$TabsLayout"
+              android:id="@+id/normal_tabs"
+              style="@style/TabsList"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:choiceMode="singleChoice"
+              android:visibility="gone"
+              gecko:tabs="tabs_normal"/>
 
         <org.mozilla.gecko.tabs.PrivateTabsPanel
                 android:id="@+id/private_tabs_panel"
diff --git a/mobile/android/base/resources/layout/private_tabs_panel.xml b/mobile/android/base/resources/layout/private_tabs_panel.xml
index 73197ca7a786..83f05c367a80 100644
--- a/mobile/android/base/resources/layout/private_tabs_panel.xml
+++ b/mobile/android/base/resources/layout/private_tabs_panel.xml
@@ -47,11 +47,12 @@
 
     <!-- Note: for an unknown reason, scrolling in the TabsListLayout
          does not work unless it is laid out after the empty view. -->
-    <org.mozilla.gecko.tabs.TabsListLayout android:id="@+id/private_tabs_tray"
-                                           style="@style/TabsList"
-                                           android:layout_width="match_parent"
-                                           android:layout_height="match_parent"
-                                           android:choiceMode="singleChoice"
-                                           gecko:tabs="tabs_private"/>
+    <view class="org.mozilla.gecko.tabs.TabsPanel$TabsLayout"
+          android:id="@+id/private_tabs_tray"
+          style="@style/TabsList"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:choiceMode="singleChoice"
+          gecko:tabs="tabs_private"/>
 
 </merge>
diff --git a/mobile/android/base/resources/layout/tabs_panel.xml b/mobile/android/base/resources/layout/tabs_panel.xml
index 80a7b3cca19d..691c4e15a1dd 100644
--- a/mobile/android/base/resources/layout/tabs_panel.xml
+++ b/mobile/android/base/resources/layout/tabs_panel.xml
@@ -31,13 +31,14 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content">
 
-        <org.mozilla.gecko.tabs.TabsListLayout android:id="@+id/normal_tabs"
-                                               style="@style/TabsList"
-                                               android:layout_width="match_parent"
-                                               android:layout_height="match_parent"
-                                               android:choiceMode="singleChoice"
-                                               android:visibility="gone"
-                                               gecko:tabs="tabs_normal"/>
+        <view class="org.mozilla.gecko.tabs.TabsPanel$TabsLayout"
+              android:id="@+id/normal_tabs"
+              style="@style/TabsList"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:choiceMode="singleChoice"
+              android:visibility="gone"
+              gecko:tabs="tabs_normal"/>
 
         <org.mozilla.gecko.tabs.PrivateTabsPanel
                 android:id="@+id/private_tabs_panel"
diff --git a/mobile/android/base/tabs/TabsPanel.java b/mobile/android/base/tabs/TabsPanel.java
index 689257a2aad8..ef16e27245de 100644
--- a/mobile/android/base/tabs/TabsPanel.java
+++ b/mobile/android/base/tabs/TabsPanel.java
@@ -65,6 +65,10 @@ public class TabsPanel extends LinearLayout
         public void setEmptyView(View view);
     }
 
+    public static View createTabsLayout(final Context context, final AttributeSet attrs) {
+       return new TabsListLayout(context, attrs);
+    }
+
     public static interface TabsLayoutChangeListener {
         public void onTabsLayoutChange(int width, int height);
     }

From 682aed7c644d7b3466f0f23a90bc65120bbbfa6f Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Tue, 9 Sep 2014 02:59:00 +0200
Subject: [PATCH 085/109] Bug 1064774 - Prevent script actor from breaking
 debugger protocol on unavailable resources. r=past

---
 toolkit/devtools/server/actors/script.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js
index c1dfd37264cb..4b4e1945d43b 100644
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -5348,7 +5348,14 @@ function fetch(aURL, aOptions={ loadFromCache: true }) {
       channel.loadFlags = aOptions.loadFromCache
         ? channel.LOAD_FROM_CACHE
         : channel.LOAD_BYPASS_CACHE;
-      channel.asyncOpen(streamListener, null);
+      try {
+        channel.asyncOpen(streamListener, null);
+      } catch(e) {
+        deferred.reject(new Error("Request failed for '"
+                                  + url
+                                  + "': "
+                                  + e.message));
+      }
       break;
   }
 

From 0e9f5d4c95c32035f522351a94474e01fe2f64a5 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Tue, 9 Sep 2014 13:45:18 +0100
Subject: [PATCH 086/109] Bug 1014987 - Introduce the new tab strip views
 (r=mcomella)

---
 mobile/android/base/moz.build                 |   3 +
 .../color/new_tablet_tab_strip_item_title.xml |  14 ++
 .../drawable/new_tablet_tab_strip_divider.xml |  17 ++
 .../drawable/new_tablet_tab_strip_item_bg.xml |  52 +++++
 .../base/resources/layout/tab_strip_item.xml  |  12 +
 .../resources/layout/tab_strip_item_view.xml  |  31 +++
 .../android/base/resources/values/dimens.xml  |   3 +
 mobile/android/base/tabs/TabStripAdapter.java |  96 ++++++++
 .../android/base/tabs/TabStripItemView.java   | 193 ++++++++++++++++
 mobile/android/base/tabs/TabStripView.java    | 208 ++++++++++++++++++
 10 files changed, 629 insertions(+)
 create mode 100644 mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml
 create mode 100644 mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml
 create mode 100644 mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml
 create mode 100644 mobile/android/base/resources/layout/tab_strip_item.xml
 create mode 100644 mobile/android/base/resources/layout/tab_strip_item_view.xml
 create mode 100644 mobile/android/base/tabs/TabStripAdapter.java
 create mode 100644 mobile/android/base/tabs/TabStripItemView.java
 create mode 100644 mobile/android/base/tabs/TabStripView.java

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 413a59bf76e0..bff521ca1df3 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -397,6 +397,9 @@ gbjar.sources += [
     'tabs/TabsLayoutItemView.java',
     'tabs/TabsListLayout.java',
     'tabs/TabsPanel.java',
+    'tabs/TabStripAdapter.java',
+    'tabs/TabStripItemView.java',
+    'tabs/TabStripView.java',
     'TabsAccessor.java',
     'Telemetry.java',
     'TelemetryContract.java',
diff --git a/mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml b/mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml
new file mode 100644
index 000000000000..132ebd90e287
--- /dev/null
+++ b/mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+	      xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+    <item android:state_checked="true"
+          gecko:state_private="true"
+          android:color="@color/text_color_primary_inverse"/>
+
+    <item android:state_checked="true"
+          android:color="@color/text_color_primary"/>
+
+    <item android:color="@color/text_color_tertiary_inverse"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml b/mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml
new file mode 100644
index 000000000000..5a16545da91e
--- /dev/null
+++ b/mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <gradient
+        android:startColor="#D1D5DA"
+        android:endColor="@android:color/transparent"
+        android:angle="90"/>
+
+    <size android:width="1dp"
+          android:height="32dp"/>
+
+</shape>
diff --git a/mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml b/mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml
new file mode 100644
index 000000000000..245be5f7b03e
--- /dev/null
+++ b/mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+	      xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+    <item android:state_pressed="true"
+          android:state_checked="true"
+          gecko:state_private="true">
+        <shape>
+            <solid android:color="@color/highlight_nav_pb" />
+        </shape>
+    </item>
+
+    <item android:state_checked="true"
+          gecko:state_private="true">
+        <shape>
+            <solid android:color="@color/background_private" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true"
+          gecko:state_private="true">
+        <shape>
+            <solid android:color="@color/highlight_dark_focused" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true"
+          android:state_checked="true">
+        <shape>
+            <solid android:color="@color/highlight_nav" />
+        </shape>
+    </item>
+
+    <item android:state_checked="true">
+        <shape>
+            <solid android:color="@color/background_normal" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/highlight_dark" />
+        </shape>
+    </item>
+
+    <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/layout/tab_strip_item.xml b/mobile/android/base/resources/layout/tab_strip_item.xml
new file mode 100644
index 000000000000..1f617d4fd645
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_strip_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<org.mozilla.gecko.tabs.TabStripItemView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="@dimen/new_tablet_tab_strip_item_width"
+    android:layout_height="match_parent"
+    android:background="@drawable/new_tablet_tab_strip_item_bg"
+    android:paddingLeft="28dp"
+    android:paddingRight="15dp"/>
diff --git a/mobile/android/base/resources/layout/tab_strip_item_view.xml b/mobile/android/base/resources/layout/tab_strip_item_view.xml
new file mode 100644
index 000000000000..58e0149c2362
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_strip_item_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <org.mozilla.gecko.widget.ThemedTextView
+        android:id="@+id/title"
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1.0"
+        android:layout_marginRight="-5dp"
+        android:gravity="center_vertical"
+        android:textSize="14sp"
+        android:ellipsize="end"
+        android:textColor="@color/new_tablet_tab_strip_item_title"
+        android:maxLines="1"
+        android:duplicateParentState="true"/>
+
+    <org.mozilla.gecko.widget.ThemedImageButton
+        android:id="@+id/close"
+        android:layout_width="40dip"
+        android:layout_height="match_parent"
+        android:background="@android:color/transparent"
+        android:scaleType="center"
+        android:contentDescription="@string/close_tab"
+        android:src="@drawable/tab_close"
+        android:duplicateParentState="true"/>
+
+</merge>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index e345435a71f1..970f95ddf31a 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -15,6 +15,9 @@
     <dimen name="browser_toolbar_favicon_size">25.33dip</dimen>
     <dimen name="browser_toolbar_shadow_size">2dp</dimen>
 
+    <dimen name="new_tablet_tab_strip_item_width">250dp</dimen>
+    <dimen name="new_tablet_tab_strip_item_margin">-30dp</dimen>
+
     <!-- Dimensions used by Favicons and FaviconView -->
     <dimen name="favicon_size_small">16dp</dimen>
     <dimen name="favicon_size_large">32dp</dimen>
diff --git a/mobile/android/base/tabs/TabStripAdapter.java b/mobile/android/base/tabs/TabStripAdapter.java
new file mode 100644
index 000000000000..c40a28f03167
--- /dev/null
+++ b/mobile/android/base/tabs/TabStripAdapter.java
@@ -0,0 +1,96 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+/* 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/. */
+
+package org.mozilla.gecko.tabs;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.Tabs;
+
+class TabStripAdapter extends BaseAdapter {
+    private static final String LOGTAG = "GeckoTabStripAdapter";
+
+    private final Context context;
+    private List<Tab> tabs;
+
+    public TabStripAdapter(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public Tab getItem(int position) {
+        return (tabs != null ? tabs.get(position) : null);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        final Tab tab = getItem(position);
+        return (tab != null ? tab.getId() : -1);
+    }
+
+    @Override
+    public boolean hasStableIds() {
+        return true;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        final TabStripItemView item;
+        if (convertView == null) {
+            item = (TabStripItemView)
+                    LayoutInflater.from(context).inflate(R.layout.tab_strip_item, parent, false);
+        } else {
+            item = (TabStripItemView) convertView;
+        }
+
+        final Tab tab = tabs.get(position);
+        item.updateFromTab(tab);
+
+        return item;
+    }
+
+    @Override
+    public int getCount() {
+        return (tabs != null ? tabs.size() : 0);
+    }
+
+    int getPositionForTab(Tab tab) {
+        if (tabs == null || tab == null) {
+            return -1;
+        }
+
+        return tabs.indexOf(tab);
+    }
+
+    void removeTab(Tab tab) {
+        if (tabs == null) {
+            return;
+        }
+
+        tabs.remove(tab);
+        notifyDataSetChanged();
+    }
+
+    void refresh(List<Tab> tabs) {
+        // The list of tabs is guaranteed to be non-null.
+        // See TabStripView.refreshTabs().
+        this.tabs = tabs;
+        notifyDataSetChanged();
+    }
+
+    void clear() {
+        tabs = null;
+        notifyDataSetInvalidated();
+    }
+}
\ No newline at end of file
diff --git a/mobile/android/base/tabs/TabStripItemView.java b/mobile/android/base/tabs/TabStripItemView.java
new file mode 100644
index 000000000000..59d4e3880679
--- /dev/null
+++ b/mobile/android/base/tabs/TabStripItemView.java
@@ -0,0 +1,193 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+/* 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/. */
+
+package org.mozilla.gecko.tabs;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Region;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Checkable;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.widget.ThemedImageButton;
+import org.mozilla.gecko.widget.ThemedLinearLayout;
+import org.mozilla.gecko.widget.ThemedTextView;
+
+public class TabStripItemView extends ThemedLinearLayout
+                              implements Checkable {
+    private static final String LOGTAG = "GeckoTabStripItem";
+
+    private static final int[] STATE_CHECKED = {
+        android.R.attr.state_checked
+    };
+
+    private int id = -1;
+    private boolean checked;
+
+    private final ThemedTextView titleView;
+    private final ThemedImageButton closeView;
+
+    private final Paint tabPaint;
+    private final Path tabShape;
+    private final Region tabRegion;
+    private final Region tabClipRegion;
+
+    public TabStripItemView(Context context) {
+        this(context, null);
+    }
+
+    public TabStripItemView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setOrientation(HORIZONTAL);
+
+        tabShape = new Path();
+        tabRegion = new Region();
+        tabClipRegion = new Region();
+
+        tabPaint = new Paint();
+        tabPaint.setAntiAlias(true);
+        tabPaint.setColor(0xFFFF0000);
+        tabPaint.setStrokeWidth(0.0f);
+        tabPaint.setXfermode(new PorterDuffXfermode(Mode.DST_IN));
+
+        LayoutInflater.from(context).inflate(R.layout.tab_strip_item_view, this);
+        setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (id < 0) {
+                    throw new IllegalStateException("Invalid tab id:" + id);
+                }
+
+                Tabs.getInstance().selectTab(id);
+            }
+        });
+
+        titleView = (ThemedTextView) findViewById(R.id.title);
+
+        closeView = (ThemedImageButton) findViewById(R.id.close);
+        closeView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (id < 0) {
+                    throw new IllegalStateException("Invalid tab id:" + id);
+                }
+
+                final Tabs tabs = Tabs.getInstance();
+                tabs.closeTab(tabs.getTab(id), true);
+            }
+        });
+    }
+
+    @Override
+    protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
+        super.onSizeChanged(width, height, oldWidth, oldHeight);
+
+        tabShape.reset();
+
+        final int curveWidth = TabCurve.getWidthForHeight(height);
+
+        tabShape.moveTo(0, height);
+        TabCurve.drawFromBottom(tabShape, 0, height, TabCurve.Direction.RIGHT);
+        tabShape.lineTo(width - curveWidth, 0);
+
+        TabCurve.drawFromTop(tabShape, width - curveWidth, height, TabCurve.Direction.RIGHT);
+        tabShape.lineTo(0, height);
+
+        tabClipRegion.set(0, 0, width, height);
+        tabRegion.setPath(tabShape, tabClipRegion);
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        final int saveCount = canvas.saveLayer(0, 0,
+                                               getWidth(), getHeight(), null,
+                                               Canvas.MATRIX_SAVE_FLAG |
+                                               Canvas.CLIP_SAVE_FLAG |
+                                               Canvas.HAS_ALPHA_LAYER_SAVE_FLAG |
+                                               Canvas.FULL_COLOR_LAYER_SAVE_FLAG |
+                                               Canvas.CLIP_TO_LAYER_SAVE_FLAG);
+
+        super.draw(canvas);
+
+        canvas.drawPath(tabShape, tabPaint);
+
+        canvas.restoreToCount(saveCount);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        final int action = event.getActionMasked();
+        final int x = (int) event.getX();
+        final int y = (int) event.getY();
+
+        // Let motion events through if they're off the tab shape bounds.
+        if (action == MotionEvent.ACTION_DOWN && !tabRegion.contains(x, y)) {
+            return false;
+        }
+
+        return super.onTouchEvent(event);
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+        if (checked) {
+            mergeDrawableStates(drawableState, STATE_CHECKED);
+        }
+
+        return drawableState;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return checked;
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        if (this.checked == checked) {
+            return;
+        }
+
+        this.checked = checked;
+        refreshDrawableState();
+    }
+
+    @Override
+    public void toggle() {
+        setChecked(!checked);
+    }
+
+    @Override
+    public void setPressed(boolean pressed) {
+        super.setPressed(pressed);
+
+        // The surrounding tab strip dividers need to be hidden
+        // when a tab item enters pressed state.
+        View parent = (View) getParent();
+        parent.invalidate();
+    }
+
+    void updateFromTab(Tab tab) {
+        if (tab == null) {
+            return;
+        }
+
+        id = tab.getId();
+        titleView.setText(tab.getDisplayTitle());
+        setPrivateMode(tab.isPrivate());
+    }
+}
diff --git a/mobile/android/base/tabs/TabStripView.java b/mobile/android/base/tabs/TabStripView.java
new file mode 100644
index 000000000000..4f9ea556d790
--- /dev/null
+++ b/mobile/android/base/tabs/TabStripView.java
@@ -0,0 +1,208 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+/* 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/. */
+
+package org.mozilla.gecko.tabs;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.widget.TwoWayView;
+
+public class TabStripView extends TwoWayView {
+    private static final String LOGTAG = "GeckoTabStrip";
+
+    private final TabStripAdapter adapter;
+    private final TabsListener tabsListener;
+
+    private final Drawable divider;
+
+    private boolean isPrivate;
+
+    public TabStripView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        setOrientation(Orientation.HORIZONTAL);
+        setChoiceMode(ChoiceMode.SINGLE);
+        setItemsCanFocus(true);
+        setChildrenDrawingOrderEnabled(true);
+        setWillNotDraw(false);
+
+        final Resources resources = getResources();
+
+        divider = resources.getDrawable(R.drawable.new_tablet_tab_strip_divider);
+
+        final int itemMargin =
+                resources.getDimensionPixelSize(R.dimen.new_tablet_tab_strip_item_margin);
+        setItemMargin(itemMargin);
+
+        tabsListener = new TabsListener();
+
+        adapter = new TabStripAdapter(context);
+        setAdapter(adapter);
+    }
+
+    private View getViewForTab(Tab tab) {
+        final int position = adapter.getPositionForTab(tab);
+        return getChildAt(position - getFirstVisiblePosition());
+    }
+
+    private int getPositionForSelectedTab() {
+        return adapter.getPositionForTab(Tabs.getInstance().getSelectedTab());
+    }
+
+    private void updateSelectedStyle(int selected) {
+        setItemChecked(selected, true);
+    }
+
+    private void updateSelectedPosition() {
+        final int selected = getPositionForSelectedTab();
+        if (selected != -1) {
+            updateSelectedStyle(selected);
+        }
+    }
+
+    private int getCheckedIndex(int childCount) {
+        final int checkedIndex = getCheckedItemPosition() - getFirstVisiblePosition();
+        if (checkedIndex < 0 || checkedIndex > childCount - 1) {
+            return INVALID_POSITION;
+        }
+
+        return checkedIndex;
+    }
+
+    private void refreshTabs() {
+        // Store a different copy of the tabs, so that we don't have
+        // to worry about accidentally updating it on the wrong thread.
+        final List<Tab> tabs = new ArrayList<Tab>();
+
+        for (Tab tab : Tabs.getInstance().getTabsInOrder()) {
+            if (tab.isPrivate() == isPrivate) {
+                tabs.add(tab);
+            }
+        }
+
+        adapter.refresh(tabs);
+        updateSelectedPosition();
+    }
+
+    private void removeTab(Tab tab) {
+        adapter.removeTab(tab);
+        updateSelectedPosition();
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        Tabs.registerOnTabsChangedListener(tabsListener);
+        refreshTabs();
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        Tabs.unregisterOnTabsChangedListener(tabsListener);
+        adapter.clear();
+    }
+
+    @Override
+    protected int getChildDrawingOrder(int childCount, int i) {
+        final int checkedIndex = getCheckedIndex(childCount);
+        if (checkedIndex == INVALID_POSITION) {
+            return i;
+        }
+
+        // Always draw the currently selected tab on top of all
+        // other child views so that its curve is fully visible.
+        if (i == childCount - 1) {
+            return checkedIndex;
+        } else if (checkedIndex <= i) {
+            return i + 1;
+        } else {
+            return i;
+        }
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        super.draw(canvas);
+
+        final int bottom = getHeight() - getPaddingBottom();
+        final int top = bottom - divider.getIntrinsicHeight();
+
+        final int dividerWidth = divider.getIntrinsicWidth();
+        final int itemMargin = getItemMargin();
+
+        final int childCount = getChildCount();
+        final int checkedIndex = getCheckedIndex(childCount);
+
+        for (int i = 1; i < childCount; i++) {
+            final View child = getChildAt(i);
+
+            final boolean pressed = (child.isPressed() || getChildAt(i - 1).isPressed());
+            final boolean checked = (i == checkedIndex || i == checkedIndex + 1);
+
+            // Don't draw dividers for around checked or pressed items
+            // so that they are not drawn on top of the tab curves.
+            if (pressed || checked) {
+                continue;
+            }
+
+            final int left = child.getLeft() - (itemMargin / 2) - dividerWidth;
+            final int right = left + dividerWidth;
+
+            divider.setBounds(left, top, right, bottom);
+            divider.draw(canvas);
+        }
+    }
+
+    private class TabsListener implements Tabs.OnTabsChangedListener {
+        @Override
+        public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
+            switch (msg) {
+                case RESTORED:
+                case ADDED:
+                    // Refresh the list to make sure the new tab is
+                    // added in the right position.
+                    refreshTabs();
+                    break;
+
+                case CLOSED:
+                    removeTab(tab);
+                    break;
+
+                case SELECTED:
+                    // Update the selected position, then fall through...
+                    if (tab.isPrivate() != isPrivate) {
+                        isPrivate = tab.isPrivate();
+                        refreshTabs();
+                    } else {
+                        updateSelectedPosition();
+                    }
+                case UNSELECTED:
+                    // We just need to update the style for the unselected tab...
+                case TITLE:
+                case RECORDING_CHANGE:
+                    final TabStripItemView item = (TabStripItemView) getViewForTab(tab);
+                    if (item != null) {
+                        item.updateFromTab(tab);
+                    }
+                    break;
+            }
+        }
+    }
+}
\ No newline at end of file

From cedd5da6fed18956b4d5337c95f12d6377a5d10c Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Tue, 9 Sep 2014 13:45:19 +0100
Subject: [PATCH 087/109] Bug 1014987 - Add tab strip to layout on new tablet
 UI (r=mcomella)

---
 mobile/android/base/BrowserApp.java                   |  4 ++++
 mobile/android/base/resources/layout/gecko_app.xml    |  9 +++++++++
 .../base/resources/layout/new_tablet_tab_strip.xml    | 11 +++++++++++
 mobile/android/base/resources/values/dimens.xml       |  1 +
 4 files changed, 25 insertions(+)
 create mode 100644 mobile/android/base/resources/layout/new_tablet_tab_strip.xml

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 89f503eebf10..bdfba5451c26 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -541,6 +541,10 @@ public class BrowserApp extends GeckoApp
             Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.INTENT);
         }
 
+        if (NewTabletUI.isEnabled(this)) {
+            findViewById(R.id.new_tablet_tab_strip).setVisibility(View.VISIBLE);
+        }
+
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideOnTouchListener());
         ((GeckoApp.MainLayout) mMainLayout).setMotionEventInterceptor(new MotionEventInterceptor() {
             @Override
diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
index a55ae1a729ff..793f9de7c9c7 100644
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -22,6 +22,7 @@
         <RelativeLayout android:id="@+id/gecko_layout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:layout_below="@+id/new_tablet_tab_strip"
                         android:layout_above="@+id/find_in_page">
 
             <include layout="@layout/shared_ui_components"/>
@@ -76,6 +77,7 @@
         <org.mozilla.gecko.widget.GeckoViewFlipper android:id="@id/browser_actionbar"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/browser_toolbar_height"
+                android:layout_below="@+id/new_tablet_tab_strip"
                 android:clickable="true"
                 android:focusable="true">
 
@@ -104,6 +106,13 @@
                                                        android:background="@null"
                                                        android:visibility="gone" />
 
+        <ViewStub android:id="@+id/new_tablet_tab_strip"
+                  android:inflatedId="@id/new_tablet_tab_strip"
+                  android:layout="@layout/new_tablet_tab_strip"
+                  android:layout_width="match_parent"
+                  android:layout_height="@dimen/new_tablet_tab_strip_height"
+                  android:visibility="gone"/>
+
     </view>
 
     <ViewStub android:id="@+id/toast_stub"
diff --git a/mobile/android/base/resources/layout/new_tablet_tab_strip.xml b/mobile/android/base/resources/layout/new_tablet_tab_strip.xml
new file mode 100644
index 000000000000..f2dd283f9883
--- /dev/null
+++ b/mobile/android/base/resources/layout/new_tablet_tab_strip.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<org.mozilla.gecko.tabs.TabStripView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="8dp"
+    android:background="@color/background_tabs"/>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index 970f95ddf31a..6d12e371d696 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -15,6 +15,7 @@
     <dimen name="browser_toolbar_favicon_size">25.33dip</dimen>
     <dimen name="browser_toolbar_shadow_size">2dp</dimen>
 
+    <dimen name="new_tablet_tab_strip_height">48dp</dimen>
     <dimen name="new_tablet_tab_strip_item_width">250dp</dimen>
     <dimen name="new_tablet_tab_strip_item_margin">-30dp</dimen>
 

From c3cf5229af7102de67bf2f26046f92a38a5637b8 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Tue, 9 Sep 2014 17:17:03 +0100
Subject: [PATCH 088/109] Backout bug 1014987, reftest failures (r=backout)

---
 mobile/android/base/BrowserApp.java           |   4 -
 mobile/android/base/moz.build                 |   3 -
 .../color/new_tablet_tab_strip_item_title.xml |  14 --
 .../drawable/new_tablet_tab_strip_divider.xml |  17 --
 .../drawable/new_tablet_tab_strip_item_bg.xml |  52 -----
 .../base/resources/layout/gecko_app.xml       |   9 -
 .../resources/layout/new_tablet_tab_strip.xml |  11 -
 .../base/resources/layout/tab_strip_item.xml  |  12 -
 .../resources/layout/tab_strip_item_view.xml  |  31 ---
 .../android/base/resources/values/dimens.xml  |   4 -
 mobile/android/base/tabs/TabStripAdapter.java |  96 --------
 .../android/base/tabs/TabStripItemView.java   | 193 ----------------
 mobile/android/base/tabs/TabStripView.java    | 208 ------------------
 13 files changed, 654 deletions(-)
 delete mode 100644 mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml
 delete mode 100644 mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml
 delete mode 100644 mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml
 delete mode 100644 mobile/android/base/resources/layout/new_tablet_tab_strip.xml
 delete mode 100644 mobile/android/base/resources/layout/tab_strip_item.xml
 delete mode 100644 mobile/android/base/resources/layout/tab_strip_item_view.xml
 delete mode 100644 mobile/android/base/tabs/TabStripAdapter.java
 delete mode 100644 mobile/android/base/tabs/TabStripItemView.java
 delete mode 100644 mobile/android/base/tabs/TabStripView.java

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index bdfba5451c26..89f503eebf10 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -541,10 +541,6 @@ public class BrowserApp extends GeckoApp
             Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.INTENT);
         }
 
-        if (NewTabletUI.isEnabled(this)) {
-            findViewById(R.id.new_tablet_tab_strip).setVisibility(View.VISIBLE);
-        }
-
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideOnTouchListener());
         ((GeckoApp.MainLayout) mMainLayout).setMotionEventInterceptor(new MotionEventInterceptor() {
             @Override
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index bff521ca1df3..413a59bf76e0 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -397,9 +397,6 @@ gbjar.sources += [
     'tabs/TabsLayoutItemView.java',
     'tabs/TabsListLayout.java',
     'tabs/TabsPanel.java',
-    'tabs/TabStripAdapter.java',
-    'tabs/TabStripItemView.java',
-    'tabs/TabStripView.java',
     'TabsAccessor.java',
     'Telemetry.java',
     'TelemetryContract.java',
diff --git a/mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml b/mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml
deleted file mode 100644
index 132ebd90e287..000000000000
--- a/mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-	      xmlns:gecko="http://schemas.android.com/apk/res-auto">
-
-    <item android:state_checked="true"
-          gecko:state_private="true"
-          android:color="@color/text_color_primary_inverse"/>
-
-    <item android:state_checked="true"
-          android:color="@color/text_color_primary"/>
-
-    <item android:color="@color/text_color_tertiary_inverse"/>
-
-</selector>
diff --git a/mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml b/mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml
deleted file mode 100644
index 5a16545da91e..000000000000
--- a/mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-
-    <gradient
-        android:startColor="#D1D5DA"
-        android:endColor="@android:color/transparent"
-        android:angle="90"/>
-
-    <size android:width="1dp"
-          android:height="32dp"/>
-
-</shape>
diff --git a/mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml b/mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml
deleted file mode 100644
index 245be5f7b03e..000000000000
--- a/mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-	      xmlns:gecko="http://schemas.android.com/apk/res-auto">
-
-    <item android:state_pressed="true"
-          android:state_checked="true"
-          gecko:state_private="true">
-        <shape>
-            <solid android:color="@color/highlight_nav_pb" />
-        </shape>
-    </item>
-
-    <item android:state_checked="true"
-          gecko:state_private="true">
-        <shape>
-            <solid android:color="@color/background_private" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true"
-          gecko:state_private="true">
-        <shape>
-            <solid android:color="@color/highlight_dark_focused" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true"
-          android:state_checked="true">
-        <shape>
-            <solid android:color="@color/highlight_nav" />
-        </shape>
-    </item>
-
-    <item android:state_checked="true">
-        <shape>
-            <solid android:color="@color/background_normal" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <solid android:color="@color/highlight_dark" />
-        </shape>
-    </item>
-
-    <item android:drawable="@android:color/transparent"/>
-
-</selector>
diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
index 793f9de7c9c7..a55ae1a729ff 100644
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -22,7 +22,6 @@
         <RelativeLayout android:id="@+id/gecko_layout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_below="@+id/new_tablet_tab_strip"
                         android:layout_above="@+id/find_in_page">
 
             <include layout="@layout/shared_ui_components"/>
@@ -77,7 +76,6 @@
         <org.mozilla.gecko.widget.GeckoViewFlipper android:id="@id/browser_actionbar"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/browser_toolbar_height"
-                android:layout_below="@+id/new_tablet_tab_strip"
                 android:clickable="true"
                 android:focusable="true">
 
@@ -106,13 +104,6 @@
                                                        android:background="@null"
                                                        android:visibility="gone" />
 
-        <ViewStub android:id="@+id/new_tablet_tab_strip"
-                  android:inflatedId="@id/new_tablet_tab_strip"
-                  android:layout="@layout/new_tablet_tab_strip"
-                  android:layout_width="match_parent"
-                  android:layout_height="@dimen/new_tablet_tab_strip_height"
-                  android:visibility="gone"/>
-
     </view>
 
     <ViewStub android:id="@+id/toast_stub"
diff --git a/mobile/android/base/resources/layout/new_tablet_tab_strip.xml b/mobile/android/base/resources/layout/new_tablet_tab_strip.xml
deleted file mode 100644
index f2dd283f9883..000000000000
--- a/mobile/android/base/resources/layout/new_tablet_tab_strip.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-
-<org.mozilla.gecko.tabs.TabStripView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="8dp"
-    android:background="@color/background_tabs"/>
diff --git a/mobile/android/base/resources/layout/tab_strip_item.xml b/mobile/android/base/resources/layout/tab_strip_item.xml
deleted file mode 100644
index 1f617d4fd645..000000000000
--- a/mobile/android/base/resources/layout/tab_strip_item.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-
-<org.mozilla.gecko.tabs.TabStripItemView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/new_tablet_tab_strip_item_width"
-    android:layout_height="match_parent"
-    android:background="@drawable/new_tablet_tab_strip_item_bg"
-    android:paddingLeft="28dp"
-    android:paddingRight="15dp"/>
diff --git a/mobile/android/base/resources/layout/tab_strip_item_view.xml b/mobile/android/base/resources/layout/tab_strip_item_view.xml
deleted file mode 100644
index 58e0149c2362..000000000000
--- a/mobile/android/base/resources/layout/tab_strip_item_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <org.mozilla.gecko.widget.ThemedTextView
-        android:id="@+id/title"
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        android:layout_weight="1.0"
-        android:layout_marginRight="-5dp"
-        android:gravity="center_vertical"
-        android:textSize="14sp"
-        android:ellipsize="end"
-        android:textColor="@color/new_tablet_tab_strip_item_title"
-        android:maxLines="1"
-        android:duplicateParentState="true"/>
-
-    <org.mozilla.gecko.widget.ThemedImageButton
-        android:id="@+id/close"
-        android:layout_width="40dip"
-        android:layout_height="match_parent"
-        android:background="@android:color/transparent"
-        android:scaleType="center"
-        android:contentDescription="@string/close_tab"
-        android:src="@drawable/tab_close"
-        android:duplicateParentState="true"/>
-
-</merge>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index 6d12e371d696..e345435a71f1 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -15,10 +15,6 @@
     <dimen name="browser_toolbar_favicon_size">25.33dip</dimen>
     <dimen name="browser_toolbar_shadow_size">2dp</dimen>
 
-    <dimen name="new_tablet_tab_strip_height">48dp</dimen>
-    <dimen name="new_tablet_tab_strip_item_width">250dp</dimen>
-    <dimen name="new_tablet_tab_strip_item_margin">-30dp</dimen>
-
     <!-- Dimensions used by Favicons and FaviconView -->
     <dimen name="favicon_size_small">16dp</dimen>
     <dimen name="favicon_size_large">32dp</dimen>
diff --git a/mobile/android/base/tabs/TabStripAdapter.java b/mobile/android/base/tabs/TabStripAdapter.java
deleted file mode 100644
index c40a28f03167..000000000000
--- a/mobile/android/base/tabs/TabStripAdapter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
-/* 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/. */
-
-package org.mozilla.gecko.tabs;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.mozilla.gecko.R;
-import org.mozilla.gecko.Tab;
-import org.mozilla.gecko.Tabs;
-
-class TabStripAdapter extends BaseAdapter {
-    private static final String LOGTAG = "GeckoTabStripAdapter";
-
-    private final Context context;
-    private List<Tab> tabs;
-
-    public TabStripAdapter(Context context) {
-        this.context = context;
-    }
-
-    @Override
-    public Tab getItem(int position) {
-        return (tabs != null ? tabs.get(position) : null);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        final Tab tab = getItem(position);
-        return (tab != null ? tab.getId() : -1);
-    }
-
-    @Override
-    public boolean hasStableIds() {
-        return true;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        final TabStripItemView item;
-        if (convertView == null) {
-            item = (TabStripItemView)
-                    LayoutInflater.from(context).inflate(R.layout.tab_strip_item, parent, false);
-        } else {
-            item = (TabStripItemView) convertView;
-        }
-
-        final Tab tab = tabs.get(position);
-        item.updateFromTab(tab);
-
-        return item;
-    }
-
-    @Override
-    public int getCount() {
-        return (tabs != null ? tabs.size() : 0);
-    }
-
-    int getPositionForTab(Tab tab) {
-        if (tabs == null || tab == null) {
-            return -1;
-        }
-
-        return tabs.indexOf(tab);
-    }
-
-    void removeTab(Tab tab) {
-        if (tabs == null) {
-            return;
-        }
-
-        tabs.remove(tab);
-        notifyDataSetChanged();
-    }
-
-    void refresh(List<Tab> tabs) {
-        // The list of tabs is guaranteed to be non-null.
-        // See TabStripView.refreshTabs().
-        this.tabs = tabs;
-        notifyDataSetChanged();
-    }
-
-    void clear() {
-        tabs = null;
-        notifyDataSetInvalidated();
-    }
-}
\ No newline at end of file
diff --git a/mobile/android/base/tabs/TabStripItemView.java b/mobile/android/base/tabs/TabStripItemView.java
deleted file mode 100644
index 59d4e3880679..000000000000
--- a/mobile/android/base/tabs/TabStripItemView.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
-/* 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/. */
-
-package org.mozilla.gecko.tabs;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.PorterDuff.Mode;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Region;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.Checkable;
-
-import org.mozilla.gecko.R;
-import org.mozilla.gecko.Tab;
-import org.mozilla.gecko.Tabs;
-import org.mozilla.gecko.widget.ThemedImageButton;
-import org.mozilla.gecko.widget.ThemedLinearLayout;
-import org.mozilla.gecko.widget.ThemedTextView;
-
-public class TabStripItemView extends ThemedLinearLayout
-                              implements Checkable {
-    private static final String LOGTAG = "GeckoTabStripItem";
-
-    private static final int[] STATE_CHECKED = {
-        android.R.attr.state_checked
-    };
-
-    private int id = -1;
-    private boolean checked;
-
-    private final ThemedTextView titleView;
-    private final ThemedImageButton closeView;
-
-    private final Paint tabPaint;
-    private final Path tabShape;
-    private final Region tabRegion;
-    private final Region tabClipRegion;
-
-    public TabStripItemView(Context context) {
-        this(context, null);
-    }
-
-    public TabStripItemView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        setOrientation(HORIZONTAL);
-
-        tabShape = new Path();
-        tabRegion = new Region();
-        tabClipRegion = new Region();
-
-        tabPaint = new Paint();
-        tabPaint.setAntiAlias(true);
-        tabPaint.setColor(0xFFFF0000);
-        tabPaint.setStrokeWidth(0.0f);
-        tabPaint.setXfermode(new PorterDuffXfermode(Mode.DST_IN));
-
-        LayoutInflater.from(context).inflate(R.layout.tab_strip_item_view, this);
-        setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (id < 0) {
-                    throw new IllegalStateException("Invalid tab id:" + id);
-                }
-
-                Tabs.getInstance().selectTab(id);
-            }
-        });
-
-        titleView = (ThemedTextView) findViewById(R.id.title);
-
-        closeView = (ThemedImageButton) findViewById(R.id.close);
-        closeView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (id < 0) {
-                    throw new IllegalStateException("Invalid tab id:" + id);
-                }
-
-                final Tabs tabs = Tabs.getInstance();
-                tabs.closeTab(tabs.getTab(id), true);
-            }
-        });
-    }
-
-    @Override
-    protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
-        super.onSizeChanged(width, height, oldWidth, oldHeight);
-
-        tabShape.reset();
-
-        final int curveWidth = TabCurve.getWidthForHeight(height);
-
-        tabShape.moveTo(0, height);
-        TabCurve.drawFromBottom(tabShape, 0, height, TabCurve.Direction.RIGHT);
-        tabShape.lineTo(width - curveWidth, 0);
-
-        TabCurve.drawFromTop(tabShape, width - curveWidth, height, TabCurve.Direction.RIGHT);
-        tabShape.lineTo(0, height);
-
-        tabClipRegion.set(0, 0, width, height);
-        tabRegion.setPath(tabShape, tabClipRegion);
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        final int saveCount = canvas.saveLayer(0, 0,
-                                               getWidth(), getHeight(), null,
-                                               Canvas.MATRIX_SAVE_FLAG |
-                                               Canvas.CLIP_SAVE_FLAG |
-                                               Canvas.HAS_ALPHA_LAYER_SAVE_FLAG |
-                                               Canvas.FULL_COLOR_LAYER_SAVE_FLAG |
-                                               Canvas.CLIP_TO_LAYER_SAVE_FLAG);
-
-        super.draw(canvas);
-
-        canvas.drawPath(tabShape, tabPaint);
-
-        canvas.restoreToCount(saveCount);
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        final int action = event.getActionMasked();
-        final int x = (int) event.getX();
-        final int y = (int) event.getY();
-
-        // Let motion events through if they're off the tab shape bounds.
-        if (action == MotionEvent.ACTION_DOWN && !tabRegion.contains(x, y)) {
-            return false;
-        }
-
-        return super.onTouchEvent(event);
-    }
-
-    @Override
-    public int[] onCreateDrawableState(int extraSpace) {
-        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
-
-        if (checked) {
-            mergeDrawableStates(drawableState, STATE_CHECKED);
-        }
-
-        return drawableState;
-    }
-
-    @Override
-    public boolean isChecked() {
-        return checked;
-    }
-
-    @Override
-    public void setChecked(boolean checked) {
-        if (this.checked == checked) {
-            return;
-        }
-
-        this.checked = checked;
-        refreshDrawableState();
-    }
-
-    @Override
-    public void toggle() {
-        setChecked(!checked);
-    }
-
-    @Override
-    public void setPressed(boolean pressed) {
-        super.setPressed(pressed);
-
-        // The surrounding tab strip dividers need to be hidden
-        // when a tab item enters pressed state.
-        View parent = (View) getParent();
-        parent.invalidate();
-    }
-
-    void updateFromTab(Tab tab) {
-        if (tab == null) {
-            return;
-        }
-
-        id = tab.getId();
-        titleView.setText(tab.getDisplayTitle());
-        setPrivateMode(tab.isPrivate());
-    }
-}
diff --git a/mobile/android/base/tabs/TabStripView.java b/mobile/android/base/tabs/TabStripView.java
deleted file mode 100644
index 4f9ea556d790..000000000000
--- a/mobile/android/base/tabs/TabStripView.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
-/* 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/. */
-
-package org.mozilla.gecko.tabs;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.mozilla.gecko.R;
-import org.mozilla.gecko.Tab;
-import org.mozilla.gecko.Tabs;
-import org.mozilla.gecko.widget.TwoWayView;
-
-public class TabStripView extends TwoWayView {
-    private static final String LOGTAG = "GeckoTabStrip";
-
-    private final TabStripAdapter adapter;
-    private final TabsListener tabsListener;
-
-    private final Drawable divider;
-
-    private boolean isPrivate;
-
-    public TabStripView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        setOrientation(Orientation.HORIZONTAL);
-        setChoiceMode(ChoiceMode.SINGLE);
-        setItemsCanFocus(true);
-        setChildrenDrawingOrderEnabled(true);
-        setWillNotDraw(false);
-
-        final Resources resources = getResources();
-
-        divider = resources.getDrawable(R.drawable.new_tablet_tab_strip_divider);
-
-        final int itemMargin =
-                resources.getDimensionPixelSize(R.dimen.new_tablet_tab_strip_item_margin);
-        setItemMargin(itemMargin);
-
-        tabsListener = new TabsListener();
-
-        adapter = new TabStripAdapter(context);
-        setAdapter(adapter);
-    }
-
-    private View getViewForTab(Tab tab) {
-        final int position = adapter.getPositionForTab(tab);
-        return getChildAt(position - getFirstVisiblePosition());
-    }
-
-    private int getPositionForSelectedTab() {
-        return adapter.getPositionForTab(Tabs.getInstance().getSelectedTab());
-    }
-
-    private void updateSelectedStyle(int selected) {
-        setItemChecked(selected, true);
-    }
-
-    private void updateSelectedPosition() {
-        final int selected = getPositionForSelectedTab();
-        if (selected != -1) {
-            updateSelectedStyle(selected);
-        }
-    }
-
-    private int getCheckedIndex(int childCount) {
-        final int checkedIndex = getCheckedItemPosition() - getFirstVisiblePosition();
-        if (checkedIndex < 0 || checkedIndex > childCount - 1) {
-            return INVALID_POSITION;
-        }
-
-        return checkedIndex;
-    }
-
-    private void refreshTabs() {
-        // Store a different copy of the tabs, so that we don't have
-        // to worry about accidentally updating it on the wrong thread.
-        final List<Tab> tabs = new ArrayList<Tab>();
-
-        for (Tab tab : Tabs.getInstance().getTabsInOrder()) {
-            if (tab.isPrivate() == isPrivate) {
-                tabs.add(tab);
-            }
-        }
-
-        adapter.refresh(tabs);
-        updateSelectedPosition();
-    }
-
-    private void removeTab(Tab tab) {
-        adapter.removeTab(tab);
-        updateSelectedPosition();
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-
-        Tabs.registerOnTabsChangedListener(tabsListener);
-        refreshTabs();
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-
-        Tabs.unregisterOnTabsChangedListener(tabsListener);
-        adapter.clear();
-    }
-
-    @Override
-    protected int getChildDrawingOrder(int childCount, int i) {
-        final int checkedIndex = getCheckedIndex(childCount);
-        if (checkedIndex == INVALID_POSITION) {
-            return i;
-        }
-
-        // Always draw the currently selected tab on top of all
-        // other child views so that its curve is fully visible.
-        if (i == childCount - 1) {
-            return checkedIndex;
-        } else if (checkedIndex <= i) {
-            return i + 1;
-        } else {
-            return i;
-        }
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        super.draw(canvas);
-
-        final int bottom = getHeight() - getPaddingBottom();
-        final int top = bottom - divider.getIntrinsicHeight();
-
-        final int dividerWidth = divider.getIntrinsicWidth();
-        final int itemMargin = getItemMargin();
-
-        final int childCount = getChildCount();
-        final int checkedIndex = getCheckedIndex(childCount);
-
-        for (int i = 1; i < childCount; i++) {
-            final View child = getChildAt(i);
-
-            final boolean pressed = (child.isPressed() || getChildAt(i - 1).isPressed());
-            final boolean checked = (i == checkedIndex || i == checkedIndex + 1);
-
-            // Don't draw dividers for around checked or pressed items
-            // so that they are not drawn on top of the tab curves.
-            if (pressed || checked) {
-                continue;
-            }
-
-            final int left = child.getLeft() - (itemMargin / 2) - dividerWidth;
-            final int right = left + dividerWidth;
-
-            divider.setBounds(left, top, right, bottom);
-            divider.draw(canvas);
-        }
-    }
-
-    private class TabsListener implements Tabs.OnTabsChangedListener {
-        @Override
-        public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
-            switch (msg) {
-                case RESTORED:
-                case ADDED:
-                    // Refresh the list to make sure the new tab is
-                    // added in the right position.
-                    refreshTabs();
-                    break;
-
-                case CLOSED:
-                    removeTab(tab);
-                    break;
-
-                case SELECTED:
-                    // Update the selected position, then fall through...
-                    if (tab.isPrivate() != isPrivate) {
-                        isPrivate = tab.isPrivate();
-                        refreshTabs();
-                    } else {
-                        updateSelectedPosition();
-                    }
-                case UNSELECTED:
-                    // We just need to update the style for the unselected tab...
-                case TITLE:
-                case RECORDING_CHANGE:
-                    final TabStripItemView item = (TabStripItemView) getViewForTab(tab);
-                    if (item != null) {
-                        item.updateFromTab(tab);
-                    }
-                    break;
-            }
-        }
-    }
-}
\ No newline at end of file

From d8074ed590d65c34dde37452ba906de83070048d Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Thu, 11 Sep 2014 15:44:54 +0900
Subject: [PATCH 089/109] Bug 1065261 - SectionCaret might not appears if
 2.25dppx or higher. r=mtseng

---
 layout/style/ua.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/style/ua.css b/layout/style/ua.css
index 735f417b98fa..7ae492a54d1f 100644
--- a/layout/style/ua.css
+++ b/layout/style/ua.css
@@ -363,7 +363,7 @@ div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right.tilt {
 
 @media (min-resolution: 2.25dppx) {
   div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret,
-  div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left
+  div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left,
   div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right {
     background-image: url("resource://gre/res/text_caret@2.25x.png");
   }

From 8220bc573c82dd26e9f8b4b9b8517da3f06ad770 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 07:48:09 +0100
Subject: [PATCH 090/109] Bug 1064056, part 1 - Convert
 nsRenderingContext::AutoPushTranslation consumers to use
 gfxContext::SetMatrix()/Multiply(). r=Bas

---
 gfx/src/nsRenderingContext.h         | 13 -------------
 layout/base/nsPresShell.cpp          | 17 +++++++++++------
 layout/generic/nsFrameSetFrame.cpp   | 11 +++++++++--
 layout/generic/nsObjectFrame.cpp     | 24 +++++++++++++++++++++---
 layout/svg/nsSVGIntegrationUtils.cpp | 11 ++++++++++-
 layout/tables/nsTableCellFrame.cpp   | 12 ++++++++++--
 layout/tables/nsTableFrame.cpp       | 10 +++++++++-
 7 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index 679a73a2d99f..0ff3fb76fad4 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -60,19 +60,6 @@ public:
     void Translate(const nsPoint& aPt);
     void Scale(float aSx, float aSy);
 
-    class AutoPushTranslation {
-        nsRenderingContext* mCtx;
-    public:
-        AutoPushTranslation(nsRenderingContext* aCtx, const nsPoint& aPt)
-            : mCtx(aCtx) {
-            mCtx->PushState();
-            mCtx->Translate(aPt);
-        }
-        ~AutoPushTranslation() {
-            mCtx->PopState();
-        }
-    };
-
     // Shapes
 
     void DrawLine(const nsPoint& aStartPt, const nsPoint& aEndPt);
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index f5f79c1bc646..a92d49398cd5 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -5118,11 +5118,15 @@ PresShell::PaintRangePaintInfo(nsTArray<nsAutoPtr<RangePaintInfo> >* aItems,
     rc->SetClip(region);
   }
 
+  gfxMatrix initialTM = ctx->CurrentMatrix();
+
   if (resize)
-    rc->Scale(scale, scale);
+    initialTM.Scale(scale, scale);
 
   // translate so that points are relative to the surface area
-  rc->Translate(-aArea.TopLeft());
+  gfxPoint surfaceOffset =
+    nsLayoutUtils::PointToGfxPoint(-aArea.TopLeft(), pc->AppUnitsPerDevPixel());
+  initialTM.Translate(surfaceOffset);
 
   // temporarily hide the selection so that text is drawn normally. If a
   // selection is being rendered, use that, otherwise use the presshell's
@@ -5142,10 +5146,11 @@ PresShell::PaintRangePaintInfo(nsTArray<nsAutoPtr<RangePaintInfo> >* aItems,
   for (int32_t i = 0; i < count; i++) {
     RangePaintInfo* rangeInfo = (*aItems)[i];
     // the display lists paint relative to the offset from the reference
-    // frame, so translate the rendering context
-    nsRenderingContext::AutoPushTranslation
-      translate(rc, rangeInfo->mRootOffset);
-
+    // frame, so account for that translation too:
+    gfxPoint rootOffset =
+      nsLayoutUtils::PointToGfxPoint(rangeInfo->mRootOffset,
+                                     pc->AppUnitsPerDevPixel());
+    ctx->SetMatrix(initialTM.Translate(rootOffset));
     aArea.MoveBy(-rangeInfo->mRootOffset.x, -rangeInfo->mRootOffset.y);
     nsRegion visible(aArea);
     rangeInfo->mList.PaintRoot(&rangeInfo->mBuilder, rc, nsDisplayList::PAINT_DEFAULT);
diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp
index f6af69d2ef31..16e356c989a7 100644
--- a/layout/generic/nsFrameSetFrame.cpp
+++ b/layout/generic/nsFrameSetFrame.cpp
@@ -7,6 +7,7 @@
 
 #include "nsFrameSetFrame.h"
 
+#include "gfxContext.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Likely.h"
 
@@ -14,6 +15,7 @@
 #include "nsAttrValueInlines.h"
 #include "nsLeafFrame.h"
 #include "nsContainerFrame.h"
+#include "nsLayoutUtils.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsGkAtoms.h"
@@ -1516,8 +1518,13 @@ void nsHTMLFramesetBorderFrame::PaintBorder(nsRenderingContext& aRenderingContex
     LookAndFeel::GetColor(LookAndFeel::eColorID_Widget3DShadow,
                           NS_RGB(128,128,128));
 
-  nsRenderingContext::AutoPushTranslation
-    translate(&aRenderingContext, aPt);
+  gfxContext* ctx = aRenderingContext.ThebesContext();
+
+  gfxPoint toRefFrame =
+    nsLayoutUtils::PointToGfxPoint(aPt, PresContext()->AppUnitsPerDevPixel());
+
+  gfxContextMatrixAutoSaveRestore autoSR(ctx);
+  ctx->SetMatrix(ctx->CurrentMatrix().Translate(toRefFrame));
 
   nscoord widthInPixels = nsPresContext::AppUnitsToIntCSSPixels(mWidth);
   nscoord pixelWidth    = nsPresContext::CSSPixelsToAppUnits(1);
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index e6af65493038..80afc41caa7c 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -9,6 +9,7 @@
 #include "nsObjectFrame.h"
 
 #include "gfx2DGlue.h"
+#include "gfxMatrix.h"
 #include "mozilla/BasicEvents.h"
 #ifdef XP_WIN
 // This is needed for DoublePassRenderingEvent.
@@ -832,9 +833,18 @@ nsObjectFrame::DidReflow(nsPresContext*            aPresContext,
 nsObjectFrame::PaintPrintPlugin(nsIFrame* aFrame, nsRenderingContext* aCtx,
                                 const nsRect& aDirtyRect, nsPoint aPt)
 {
+  gfxContext* ctx = aCtx->ThebesContext();
+
+  // Translate the context:
   nsPoint pt = aPt + aFrame->GetContentRectRelativeToSelf().TopLeft();
-  nsRenderingContext::AutoPushTranslation translate(aCtx, pt);
+  gfxPoint devPixelPt =
+    nsLayoutUtils::PointToGfxPoint(pt, aFrame->PresContext()->AppUnitsPerDevPixel());
+
+  gfxContextMatrixAutoSaveRestore autoSR(ctx);
+  ctx->SetMatrix(ctx->CurrentMatrix().Translate(devPixelPt));
+
   // FIXME - Bug 385435: Doesn't aDirtyRect need translating too?
+
   static_cast<nsObjectFrame*>(aFrame)->PrintPlugin(*aCtx, aDirtyRect);
 }
 
@@ -1676,9 +1686,17 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
 
       nativeDrawing.EndNativeDrawing();
     } else {
+      gfxContext* ctx = aRenderingContext.ThebesContext();
+
+      // Translate the context:
+      gfxPoint devPixelPt =
+        nsLayoutUtils::PointToGfxPoint(aPluginRect.TopLeft(),
+                                       PresContext()->AppUnitsPerDevPixel());
+
+      gfxContextMatrixAutoSaveRestore autoSR(ctx);
+      ctx->SetMatrix(ctx->CurrentMatrix().Translate(devPixelPt));
+
       // FIXME - Bug 385435: Doesn't aDirtyRect need translating too?
-      nsRenderingContext::AutoPushTranslation
-        translate(&aRenderingContext, aPluginRect.TopLeft());
 
       // this rect is used only in the CoreGraphics drawing model
       gfxRect tmpRect(0, 0, 0, 0);
diff --git a/layout/svg/nsSVGIntegrationUtils.cpp b/layout/svg/nsSVGIntegrationUtils.cpp
index ef6748c02846..aaa21a74eb7a 100644
--- a/layout/svg/nsSVGIntegrationUtils.cpp
+++ b/layout/svg/nsSVGIntegrationUtils.cpp
@@ -386,7 +386,16 @@ public:
   {
     BasicLayerManager* basic = static_cast<BasicLayerManager*>(mLayerManager);
     basic->SetTarget(aContext->ThebesContext());
-    nsRenderingContext::AutoPushTranslation push(aContext, -mOffset);
+
+    gfxContext* ctx = aContext->ThebesContext();
+
+    gfxPoint devPixelOffset =
+      nsLayoutUtils::PointToGfxPoint(-mOffset,
+                                     aTarget->PresContext()->AppUnitsPerDevPixel());
+
+    gfxContextMatrixAutoSaveRestore autoSR(ctx);
+    ctx->SetMatrix(ctx->CurrentMatrix().Translate(devPixelOffset));
+
     mLayerManager->EndTransaction(FrameLayerBuilder::DrawThebesLayer, mBuilder);
   }
 
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index d88b60eb9312..d191fba510d6 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -317,8 +317,16 @@ nsTableCellFrame::DecorateForSelection(nsRenderingContext& aRenderingContext,
         //compare bordercolor to ((nsStyleColor *)myColor)->mBackgroundColor)
         bordercolor = EnsureDifferentColors(bordercolor,
                                             StyleBackground()->mBackgroundColor);
-        nsRenderingContext::AutoPushTranslation
-            translate(&aRenderingContext, aPt);
+
+        gfxContext* ctx = aRenderingContext.ThebesContext();
+
+        gfxPoint devPixelOffset =
+          nsLayoutUtils::PointToGfxPoint(aPt,
+                                         PresContext()->AppUnitsPerDevPixel());
+
+        gfxContextMatrixAutoSaveRestore autoSR(ctx);
+        ctx->SetMatrix(ctx->CurrentMatrix().Translate(devPixelOffset));
+
         nscoord onePixel = nsPresContext::CSSPixelsToAppUnits(1);
 
         aRenderingContext.SetColor(bordercolor);
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index 822c5cc0aab9..7906b83a62a2 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -1375,9 +1375,17 @@ nsTableFrame::PaintTableBorderBackground(nsRenderingContext& aRenderingContext,
                                   aDirtyRect, rect, mStyleContext, skipSides);
     }
     else {
+      gfxContext* ctx = aRenderingContext.ThebesContext();
+
+      gfxPoint devPixelOffset =
+        nsLayoutUtils::PointToGfxPoint(aPt,
+                                       PresContext()->AppUnitsPerDevPixel());
+
       // XXX we should probably get rid of this translation at some stage
       // But that would mean modifying PaintBCBorders, ugh
-      nsRenderingContext::AutoPushTranslation translate(&aRenderingContext, aPt);
+      gfxContextMatrixAutoSaveRestore autoSR(ctx);
+      ctx->SetMatrix(ctx->CurrentMatrix().Translate(devPixelOffset));
+
       PaintBCBorders(aRenderingContext, aDirtyRect - aPt);
     }
   }

From 13482abf5a47c64ad865a4cbec44104ea39abe99 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 07:48:10 +0100
Subject: [PATCH 091/109] Bug 1064056, part 2 - Convert
 nsRenderingContext::Translate() consumers to use
 gfxContext::SetMatrix()/Multiply(). r=Bas

---
 gfx/src/nsRenderingContext.cpp       |  6 ------
 gfx/src/nsRenderingContext.h         |  1 -
 layout/base/nsCSSRendering.cpp       |  8 ++++++--
 layout/base/nsLayoutUtils.cpp        |  6 +++++-
 layout/base/nsPresShell.cpp          |  6 +++++-
 layout/generic/nsImageFrame.cpp      | 12 ++++++++++--
 layout/svg/nsSVGIntegrationUtils.cpp |  7 +++++--
 7 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index 254f07cf3df4..e087fe2be697 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -170,12 +170,6 @@ nsRenderingContext::SetColor(nscolor aColor)
     mThebes->SetColor(gfxRGBA(aColor));
 }
 
-void
-nsRenderingContext::Translate(const nsPoint& aPt)
-{
-    mThebes->Translate(gfxPoint(FROM_TWIPS(aPt.x), FROM_TWIPS(aPt.y)));
-}
-
 void
 nsRenderingContext::Scale(float aSx, float aSy)
 {
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index 0ff3fb76fad4..e0f2628cdd75 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -57,7 +57,6 @@ public:
     void SetClip(const nsIntRegion& aRegion);
     void SetLineStyle(nsLineStyle aLineStyle);
     void SetColor(nscolor aColor);
-    void Translate(const nsPoint& aPt);
     void Scale(float aSx, float aSy);
 
     // Shapes
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index dc87dc2a3f44..a92a01b53cef 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -1309,8 +1309,12 @@ nsCSSRendering::PaintBoxShadowOuter(nsPresContext* aPresContext,
       gfxContextMatrixAutoSaveRestore save(shadowContext);
       nsRefPtr<nsRenderingContext> wrapperCtx = new nsRenderingContext();
       wrapperCtx->Init(aPresContext->DeviceContext(), shadowContext);
-      wrapperCtx->Translate(nsPoint(shadowItem->mXOffset,
-                                    shadowItem->mYOffset));
+      gfxPoint devPixelOffset =
+        nsLayoutUtils::PointToGfxPoint(nsPoint(shadowItem->mXOffset,
+                                               shadowItem->mYOffset),
+                                       aPresContext->AppUnitsPerDevPixel());
+      wrapperCtx->ThebesContext()->SetMatrix(
+        wrapperCtx->ThebesContext()->CurrentMatrix().Translate(devPixelOffset));
 
       nsRect nativeRect;
       nativeRect.IntersectRect(frameRect, aDirtyRect);
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index b71c837ae3a1..58ce6964b19a 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -2865,7 +2865,11 @@ nsLayoutUtils::PaintFrame(nsRenderingContext* aRenderingContext, nsIFrame* aFram
       nsPoint pos = rootScrollableFrame->GetScrollPosition();
       visibleRegion.MoveBy(-pos);
       if (aRenderingContext) {
-        aRenderingContext->Translate(pos);
+        gfxPoint devPixelOffset =
+          nsLayoutUtils::PointToGfxPoint(pos,
+                                         presContext->AppUnitsPerDevPixel());
+        aRenderingContext->ThebesContext()->SetMatrix(
+          aRenderingContext->ThebesContext()->CurrentMatrix().Translate(devPixelOffset));
       }
     }
     builder.SetIgnoreScrollFrame(rootScrollFrame);
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index a92d49398cd5..7848851e1a08 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -9969,7 +9969,11 @@ void ReflowCountMgr::PaintCount(const char*     aName,
       (IndiReflowCounter *)PL_HashTableLookup(mIndiFrameCounts, key);
     if (counter != nullptr && counter->mName.EqualsASCII(aName)) {
       aRenderingContext->PushState();
-      aRenderingContext->Translate(aOffset);
+      gfxPoint devPixelOffset =
+        nsLayoutUtils::PointToGfxPoint(aOffset,
+                                       aPresContext->AppUnitsPerDevPixel());
+      aRenderingContext->ThebesContext()->SetMatrix(
+        aRenderingContext->ThebesContext()->CurrentMatrix().Translate(devPixelOffset));
       nsFont font(eFamily_serif, NS_FONT_STYLE_NORMAL,
                   NS_FONT_WEIGHT_NORMAL, NS_FONT_STRETCH_NORMAL, 0,
                   nsPresContext::CSSPixelsToAppUnits(11));
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 99f4598ac07f..4765ee0884d7 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1299,7 +1299,11 @@ static void PaintDebugImageMap(nsIFrame* aFrame, nsRenderingContext* aCtx,
 
   aCtx->SetColor(NS_RGB(0, 0, 0));
   aCtx->PushState();
-  aCtx->Translate(inner.TopLeft());
+  gfxPoint devPixelOffset =
+    nsLayoutUtils::PointToGfxPoint(inner.TopLeft(),
+                                   aFrame->PresContext()->AppUnitsPerDevPixel());
+  aCtx->ThebesContext()->SetMatrix(
+    aCtx->ThebesContext()->CurrentMatrix().Translate(devPixelOffset));
   f->GetImageMap()->Draw(aFrame, *aCtx);
   aCtx->PopState();
 }
@@ -1469,7 +1473,11 @@ nsImageFrame::PaintImage(nsRenderingContext& aRenderingContext, nsPoint aPt,
   nsImageMap* map = GetImageMap();
   if (nullptr != map) {
     aRenderingContext.PushState();
-    aRenderingContext.Translate(inner.TopLeft());
+    gfxPoint devPixelOffset =
+      nsLayoutUtils::PointToGfxPoint(inner.TopLeft(),
+                                     PresContext()->AppUnitsPerDevPixel());
+    aRenderingContext.ThebesContext()->SetMatrix(
+      aRenderingContext.ThebesContext()->CurrentMatrix().Translate(devPixelOffset));
     aRenderingContext.SetColor(NS_RGB(255, 255, 255));
     aRenderingContext.SetLineStyle(nsLineStyle_kSolid);
     map->Draw(this, aRenderingContext);
diff --git a/layout/svg/nsSVGIntegrationUtils.cpp b/layout/svg/nsSVGIntegrationUtils.cpp
index aaa21a74eb7a..6970d10c683d 100644
--- a/layout/svg/nsSVGIntegrationUtils.cpp
+++ b/layout/svg/nsSVGIntegrationUtils.cpp
@@ -503,7 +503,10 @@ nsSVGIntegrationUtils::PaintFramesWithEffects(nsRenderingContext* aCtx,
   NS_ASSERTION(hasSVGLayout || offsetToBoundingBox == offsetToUserSpace,
                "For non-SVG frames there shouldn't be any additional offset");
 
-  aCtx->Translate(offsetToUserSpace);
+  gfxPoint devPixelOffsetToUserSpace =
+    nsLayoutUtils::PointToGfxPoint(offsetToUserSpace,
+                                   aFrame->PresContext()->AppUnitsPerDevPixel());
+  gfx->SetMatrix(gfx->CurrentMatrix().Translate(devPixelOffsetToUserSpace));
 
   gfxMatrix cssPxToDevPxMatrix = GetCSSPxToDevPxMatrix(aFrame);
 
@@ -538,7 +541,7 @@ nsSVGIntegrationUtils::PaintFramesWithEffects(nsRenderingContext* aCtx,
   } else {
     gfx->SetMatrix(matrixAutoSaveRestore.Matrix());
     aLayerManager->EndTransaction(FrameLayerBuilder::DrawThebesLayer, aBuilder);
-    aCtx->Translate(offsetToUserSpace);
+    gfx->SetMatrix(gfx->CurrentMatrix().Translate(devPixelOffsetToUserSpace));
   }
 
   if (clipPathFrame && isTrivialClip) {

From ab93c9d06491d2e5bfba4a335c438b40f3bbe506 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 07:48:10 +0100
Subject: [PATCH 092/109] Bug 1064056, part 3 - Convert
 nsRenderingContext::Scale() consumers to use
 gfxContext::SetMatrix()/Multiply(). r=Bas

---
 gfx/src/nsDeviceContext.cpp    | 3 ++-
 gfx/src/nsRenderingContext.cpp | 6 ------
 gfx/src/nsRenderingContext.h   | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/gfx/src/nsDeviceContext.cpp b/gfx/src/nsDeviceContext.cpp
index effca7cad9da..708f10f2d64d 100644
--- a/gfx/src/nsDeviceContext.cpp
+++ b/gfx/src/nsDeviceContext.cpp
@@ -405,7 +405,8 @@ nsDeviceContext::CreateRenderingContext()
 
     pContext->Init(this, dt);
     pContext->ThebesContext()->SetFlag(gfxContext::FLAG_DISABLE_SNAPPING);
-    pContext->Scale(mPrintingScale, mPrintingScale);
+    pContext->ThebesContext()->SetMatrix(gfxMatrix::Scaling(mPrintingScale,
+                                                            mPrintingScale));
 
     return pContext.forget();
 }
diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index e087fe2be697..bb563a288eef 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -170,12 +170,6 @@ nsRenderingContext::SetColor(nscolor aColor)
     mThebes->SetColor(gfxRGBA(aColor));
 }
 
-void
-nsRenderingContext::Scale(float aSx, float aSy)
-{
-    mThebes->Scale(aSx, aSy);
-}
-
 //
 // shapes
 //
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index e0f2628cdd75..d1c860fadad4 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -57,7 +57,6 @@ public:
     void SetClip(const nsIntRegion& aRegion);
     void SetLineStyle(nsLineStyle aLineStyle);
     void SetColor(nscolor aColor);
-    void Scale(float aSx, float aSy);
 
     // Shapes
 

From e7cd8ba24774abdd1c17a2d0deda28677cd34ede Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 07:48:10 +0100
Subject: [PATCH 093/109] Bug 1064082 - Get rid of nsRenderingContext's
 PushState and PopState methods. r=Bas

---
 gfx/src/nsRenderingContext.cpp          | 12 ------------
 gfx/src/nsRenderingContext.h            |  2 --
 layout/base/nsDisplayList.cpp           |  4 ++--
 layout/base/nsPresShell.cpp             |  4 ++--
 layout/forms/nsComboboxControlFrame.cpp |  4 ++--
 layout/forms/nsFieldSetFrame.cpp        | 12 ++++++------
 layout/generic/nsImageFrame.cpp         | 16 ++++++++--------
 layout/generic/nsPageFrame.cpp          |  4 ++--
 layout/svg/SVGTextFrame.cpp             |  4 ++--
 layout/svg/nsSVGOuterSVGFrame.cpp       |  4 ++--
 layout/svg/nsSVGPathGeometryFrame.cpp   |  4 ++--
 layout/xul/nsGroupBoxFrame.cpp          | 12 ++++++------
 layout/xul/tree/nsTreeBodyFrame.cpp     |  8 ++++----
 13 files changed, 38 insertions(+), 52 deletions(-)

diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index bb563a288eef..97b08bff0b86 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -85,18 +85,6 @@ nsRenderingContext::Init(nsDeviceContext* aContext,
 // graphics state
 //
 
-void
-nsRenderingContext::PushState()
-{
-    mThebes->Save();
-}
-
-void
-nsRenderingContext::PopState()
-{
-    mThebes->Restore();
-}
-
 void
 nsRenderingContext::IntersectClip(const nsRect& aRect)
 {
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index d1c860fadad4..c9bd33e91265 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -51,8 +51,6 @@ public:
 
     // Graphics state
 
-    void PushState(void);
-    void PopState(void);
     void IntersectClip(const nsRect& aRect);
     void SetClip(const nsIntRegion& aRegion);
     void SetLineStyle(nsLineStyle aLineStyle);
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 6e1fceb35354..26c6199cbe88 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -3031,11 +3031,11 @@ nsDisplayBoxShadowInner::Paint(nsDisplayListBuilder* aBuilder,
     js::ProfileEntry::Category::GRAPHICS);
 
   for (uint32_t i = 0; i < rects.Length(); ++i) {
-    aCtx->PushState();
+    aCtx->ThebesContext()->Save();
     aCtx->IntersectClip(rects[i]);
     nsCSSRendering::PaintBoxShadowInner(presContext, *aCtx, mFrame,
                                         borderRect, rects[i]);
-    aCtx->PopState();
+    aCtx->ThebesContext()->Restore();
   }
 }
 
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 7848851e1a08..b46c41af0784 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -9968,7 +9968,7 @@ void ReflowCountMgr::PaintCount(const char*     aName,
     IndiReflowCounter * counter =
       (IndiReflowCounter *)PL_HashTableLookup(mIndiFrameCounts, key);
     if (counter != nullptr && counter->mName.EqualsASCII(aName)) {
-      aRenderingContext->PushState();
+      aRenderingContext->ThebesContext()->Save();
       gfxPoint devPixelOffset =
         nsLayoutUtils::PointToGfxPoint(aOffset,
                                        aPresContext->AppUnitsPerDevPixel());
@@ -10022,7 +10022,7 @@ void ReflowCountMgr::PaintCount(const char*     aName,
       aRenderingContext->SetColor(color);
       aRenderingContext->DrawString(buf, strlen(buf), x,y);
 
-      aRenderingContext->PopState();
+      aRenderingContext->ThebesContext()->Restore();
     }
   }
 }
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index aa0ee53ef443..bbbdadc4da2f 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -1494,7 +1494,7 @@ void nsComboboxControlFrame::PaintFocus(nsRenderingContext& aRenderingContext,
   if (eventStates.HasState(NS_EVENT_STATE_DISABLED) || sFocused != this)
     return;
 
-  aRenderingContext.PushState();
+  aRenderingContext.ThebesContext()->Save();
   nsRect clipRect = mDisplayFrame->GetRect() + aPt;
   aRenderingContext.IntersectClip(clipRect);
 
@@ -1518,7 +1518,7 @@ void nsComboboxControlFrame::PaintFocus(nsRenderingContext& aRenderingContext,
   aRenderingContext.DrawLine(clipRect.BottomRight(), clipRect.BottomLeft());
   aRenderingContext.DrawLine(clipRect.BottomLeft(), clipRect.TopLeft());
 
-  aRenderingContext.PopState();
+  aRenderingContext.ThebesContext()->Restore();
 }
 
 //---------------------------------------------------------
diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index 8fd40285705b..0a8ed8bd2d84 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -219,12 +219,12 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     clipRect.width = legendRect.x - rect.x;
     clipRect.height = topBorder;
 
-    aRenderingContext.PushState();
+    aRenderingContext.ThebesContext()->Save();
     aRenderingContext.IntersectClip(clipRect);
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
                                 aDirtyRect, rect, mStyleContext);
 
-    aRenderingContext.PopState();
+    aRenderingContext.ThebesContext()->Restore();
 
 
     // draw right side
@@ -233,12 +233,12 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     clipRect.width = rect.XMost() - legendRect.XMost();
     clipRect.height = topBorder;
 
-    aRenderingContext.PushState();
+    aRenderingContext.ThebesContext()->Save();
     aRenderingContext.IntersectClip(clipRect);
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
                                 aDirtyRect, rect, mStyleContext);
 
-    aRenderingContext.PopState();
+    aRenderingContext.ThebesContext()->Restore();
 
     
     // draw bottom
@@ -246,12 +246,12 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     clipRect.y += topBorder;
     clipRect.height = mRect.height - (yoff + topBorder);
     
-    aRenderingContext.PushState();
+    aRenderingContext.ThebesContext()->Save();
     aRenderingContext.IntersectClip(clipRect);
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
                                 aDirtyRect, rect, mStyleContext);
 
-    aRenderingContext.PopState();
+    aRenderingContext.ThebesContext()->Restore();
   } else {
 
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 4765ee0884d7..9b8e08c77c36 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1219,7 +1219,7 @@ nsImageFrame::DisplayAltFeedback(nsRenderingContext& aRenderingContext,
   }
 
   // Clip so we don't render outside the inner rect
-  aRenderingContext.PushState();
+  aRenderingContext.ThebesContext()->Save();
   aRenderingContext.IntersectClip(inner);
 
   // Check if we should display image placeholders
@@ -1262,11 +1262,11 @@ nsImageFrame::DisplayAltFeedback(nsRenderingContext& aRenderingContext,
                          inner.XMost() - size : inner.x;
       nscoord twoPX = nsPresContext::CSSPixelsToAppUnits(2);
       aRenderingContext.DrawRect(iconXPos, inner.y,size,size);
-      aRenderingContext.PushState();
+      aRenderingContext.ThebesContext()->Save();
       aRenderingContext.SetColor(NS_RGB(0xFF,0,0));
       aRenderingContext.FillEllipse(size/2 + iconXPos, size/2 + inner.y,
                                     size/2 - twoPX, size/2 - twoPX);
-      aRenderingContext.PopState();
+      aRenderingContext.ThebesContext()->Restore();
     }
 
     // Reduce the inner rect by the width of the icon, and leave an
@@ -1288,7 +1288,7 @@ nsImageFrame::DisplayAltFeedback(nsRenderingContext& aRenderingContext,
     }
   }
 
-  aRenderingContext.PopState();
+  aRenderingContext.ThebesContext()->Restore();
 }
 
 #ifdef DEBUG
@@ -1298,14 +1298,14 @@ static void PaintDebugImageMap(nsIFrame* aFrame, nsRenderingContext* aCtx,
   nsRect inner = f->GetInnerArea() + aPt;
 
   aCtx->SetColor(NS_RGB(0, 0, 0));
-  aCtx->PushState();
+  aCtx->ThebesContext()->Save();
   gfxPoint devPixelOffset =
     nsLayoutUtils::PointToGfxPoint(inner.TopLeft(),
                                    aFrame->PresContext()->AppUnitsPerDevPixel());
   aCtx->ThebesContext()->SetMatrix(
     aCtx->ThebesContext()->CurrentMatrix().Translate(devPixelOffset));
   f->GetImageMap()->Draw(aFrame, *aCtx);
-  aCtx->PopState();
+  aCtx->ThebesContext()->Restore();
 }
 #endif
 
@@ -1472,7 +1472,7 @@ nsImageFrame::PaintImage(nsRenderingContext& aRenderingContext, nsPoint aPt,
 
   nsImageMap* map = GetImageMap();
   if (nullptr != map) {
-    aRenderingContext.PushState();
+    aRenderingContext.ThebesContext()->Save();
     gfxPoint devPixelOffset =
       nsLayoutUtils::PointToGfxPoint(inner.TopLeft(),
                                      PresContext()->AppUnitsPerDevPixel());
@@ -1484,7 +1484,7 @@ nsImageFrame::PaintImage(nsRenderingContext& aRenderingContext, nsPoint aPt,
     aRenderingContext.SetColor(NS_RGB(0, 0, 0));
     aRenderingContext.SetLineStyle(nsLineStyle_kDotted);
     map->Draw(this, aRenderingContext);
-    aRenderingContext.PopState();
+    aRenderingContext.ThebesContext()->Restore();
   }
 }
 
diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index 5dc0f99b9746..d0805cd1fd77 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -373,11 +373,11 @@ nsPageFrame::DrawHeaderFooter(nsRenderingContext& aRenderingContext,
     }
 
     // set up new clip and draw the text
-    aRenderingContext.PushState();
+    aRenderingContext.ThebesContext()->Save();
     aRenderingContext.SetColor(NS_RGB(0,0,0));
     aRenderingContext.IntersectClip(aRect);
     nsLayoutUtils::DrawString(this, &aRenderingContext, str.get(), str.Length(), nsPoint(x, y + aAscent));
-    aRenderingContext.PopState();
+    aRenderingContext.ThebesContext()->Restore();
   }
 }
 
diff --git a/layout/svg/SVGTextFrame.cpp b/layout/svg/SVGTextFrame.cpp
index 7b87a2a6f046..5a236cb80834 100644
--- a/layout/svg/SVGTextFrame.cpp
+++ b/layout/svg/SVGTextFrame.cpp
@@ -3147,9 +3147,9 @@ nsDisplaySVGText::Paint(nsDisplayListBuilder* aBuilder,
   gfxMatrix tm = nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(mFrame) *
                    gfxMatrix::Translation(devPixelOffset);
 
-  aCtx->PushState();
+  aCtx->ThebesContext()->Save();
   static_cast<SVGTextFrame*>(mFrame)->PaintSVG(aCtx, tm);
-  aCtx->PopState();
+  aCtx->ThebesContext()->Restore();
 }
 
 // ---------------------------------------------------------------------
diff --git a/layout/svg/nsSVGOuterSVGFrame.cpp b/layout/svg/nsSVGOuterSVGFrame.cpp
index 35b42b7b2936..afcb32a03404 100644
--- a/layout/svg/nsSVGOuterSVGFrame.cpp
+++ b/layout/svg/nsSVGOuterSVGFrame.cpp
@@ -610,13 +610,13 @@ nsDisplayOuterSVG::Paint(nsDisplayListBuilder* aBuilder,
   gfxPoint devPixelOffset =
     nsLayoutUtils::PointToGfxPoint(viewportRect.TopLeft(), appUnitsPerDevPixel);
 
-  aContext->PushState();
+  aContext->ThebesContext()->Save();
   // We include the offset of our frame and a scale from device pixels to user
   // units (i.e. CSS px) in the matrix that we pass to our children):
   gfxMatrix tm = nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(mFrame) *
                    gfxMatrix::Translation(devPixelOffset);
   nsSVGUtils::PaintFrameWithEffects(mFrame, aContext, tm, &contentAreaDirtyRect);
-  aContext->PopState();
+  aContext->ThebesContext()->Restore();
 
   NS_ASSERTION(!aContext->ThebesContext()->HasError(), "Cairo in error state");
 
diff --git a/layout/svg/nsSVGPathGeometryFrame.cpp b/layout/svg/nsSVGPathGeometryFrame.cpp
index d70ab8d8d7bf..cd736083eb98 100644
--- a/layout/svg/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/nsSVGPathGeometryFrame.cpp
@@ -107,11 +107,11 @@ nsDisplaySVGPathGeometry::Paint(nsDisplayListBuilder* aBuilder,
   gfxPoint devPixelOffset =
     nsLayoutUtils::PointToGfxPoint(offset, appUnitsPerDevPixel);
 
-  aCtx->PushState();
+  aCtx->ThebesContext()->Save();
   gfxMatrix tm = nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(mFrame) *
                    gfxMatrix::Translation(devPixelOffset);
   static_cast<nsSVGPathGeometryFrame*>(mFrame)->PaintSVG(aCtx, tm);
-  aCtx->PopState();
+  aCtx->ThebesContext()->Restore();
 }
 
 //----------------------------------------------------------------------
diff --git a/layout/xul/nsGroupBoxFrame.cpp b/layout/xul/nsGroupBoxFrame.cpp
index 08acf0b30e31..808fa0dfe500 100644
--- a/layout/xul/nsGroupBoxFrame.cpp
+++ b/layout/xul/nsGroupBoxFrame.cpp
@@ -161,12 +161,12 @@ nsGroupBoxFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     clipRect.width = groupRect.x - rect.x;
     clipRect.height = border.top;
 
-    aRenderingContext.PushState();
+    aRenderingContext.ThebesContext()->Save();
     aRenderingContext.IntersectClip(clipRect);
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
                                 aDirtyRect, rect, mStyleContext, skipSides);
 
-    aRenderingContext.PopState();
+    aRenderingContext.ThebesContext()->Restore();
 
 
     // draw right side
@@ -175,12 +175,12 @@ nsGroupBoxFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     clipRect.width = rect.XMost() - groupRect.XMost();
     clipRect.height = border.top;
 
-    aRenderingContext.PushState();
+    aRenderingContext.ThebesContext()->Save();
     aRenderingContext.IntersectClip(clipRect);
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
                                 aDirtyRect, rect, mStyleContext, skipSides);
 
-    aRenderingContext.PopState();
+    aRenderingContext.ThebesContext()->Restore();
 
     
   
@@ -190,12 +190,12 @@ nsGroupBoxFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
     clipRect.y += border.top;
     clipRect.height = mRect.height - (yoff + border.top);
   
-    aRenderingContext.PushState();
+    aRenderingContext.ThebesContext()->Save();
     aRenderingContext.IntersectClip(clipRect);
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
                                 aDirtyRect, rect, mStyleContext, skipSides);
 
-    aRenderingContext.PopState();
+    aRenderingContext.ThebesContext()->Restore();
     
   } else {
     nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
diff --git a/layout/xul/tree/nsTreeBodyFrame.cpp b/layout/xul/tree/nsTreeBodyFrame.cpp
index 6e4cb154e96b..152e32dd064a 100644
--- a/layout/xul/tree/nsTreeBodyFrame.cpp
+++ b/layout/xul/tree/nsTreeBodyFrame.cpp
@@ -2816,7 +2816,7 @@ nsTreeBodyFrame::PaintTreeBody(nsRenderingContext& aRenderingContext,
 {
   // Update our available height and our page count.
   CalcInnerBox();
-  aRenderingContext.PushState();
+  aRenderingContext.ThebesContext()->Save();
   aRenderingContext.IntersectClip(mInnerBox + aPt);
   int32_t oldPageCount = mPageLength;
   if (!mHasFixedRowCount)
@@ -2875,7 +2875,7 @@ nsTreeBodyFrame::PaintTreeBody(nsRenderingContext& aRenderingContext,
       PaintDropFeedback(feedbackRect, PresContext(), aRenderingContext, aDirtyRect, aPt);
     }
   }
-  aRenderingContext.PopState();
+  aRenderingContext.ThebesContext()->Restore();
 }
 
 
@@ -3195,7 +3195,7 @@ nsTreeBodyFrame::PaintCell(int32_t              aRowIndex,
       twistyContext->StyleMargin()->GetMargin(twistyMargin);
       twistyRect.Inflate(twistyMargin);
 
-      aRenderingContext.PushState();
+      aRenderingContext.ThebesContext()->Save();
 
       const nsStyleBorder* borderStyle = lineContext->StyleBorder();
       nscolor color;
@@ -3244,7 +3244,7 @@ nsTreeBodyFrame::PaintCell(int32_t              aRowIndex,
         srcX -= mIndentation;
       }
 
-      aRenderingContext.PopState();
+      aRenderingContext.ThebesContext()->Restore();
     }
 
     // Always leave space for the twisty.

From 8b4aaabb6597e21b2909a8670d633c9588f59ae6 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@vfemail.net>
Date: Tue, 9 Sep 2014 23:56:00 +0200
Subject: [PATCH 094/109] Bug 1065251 - Unbreak build on non-SPS platforms
 after bug 1050376. r=bgirard

---
 docshell/base/nsDocShell.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index d1f5ed42dd35..bdafbfb1df86 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -91,7 +91,9 @@
 #include "nsSHistory.h"
 #include "nsDocShellEditorData.h"
 #include "GeckoProfiler.h"
+#ifdef MOZ_ENABLE_PROFILER_SPS
 #include "ProfilerMarkers.h"
+#endif
 
 // Helper Classes
 #include "nsError.h"
@@ -2800,6 +2802,7 @@ unsigned long nsDocShell::gProfileTimelineRecordingsCount = 0;
 NS_IMETHODIMP
 nsDocShell::SetRecordProfileTimelineMarkers(bool aValue)
 {
+#ifdef MOZ_ENABLE_PROFILER_SPS
   bool currentValue;
   GetRecordProfileTimelineMarkers(&currentValue);
   if (currentValue != aValue) {
@@ -2814,6 +2817,9 @@ nsDocShell::SetRecordProfileTimelineMarkers(bool aValue)
   }
 
   return NS_OK;
+#else
+  return NS_ERROR_FAILURE;
+#endif
 }
 
 NS_IMETHODIMP
@@ -2827,6 +2833,7 @@ nsresult
 nsDocShell::PopProfileTimelineMarkers(JSContext* aCx,
                           JS::MutableHandle<JS::Value> aProfileTimelineMarkers)
 {
+#ifdef MOZ_ENABLE_PROFILER_SPS
   // Looping over all markers gathered so far at the docShell level, whenever a
   // START marker is found, look for the corresponding END marker and build a
   // {name,start,end} JS object.
@@ -2881,6 +2888,9 @@ nsDocShell::PopProfileTimelineMarkers(JSContext* aCx,
   ClearProfileTimelineMarkers();
 
   return NS_OK;
+#else
+  return NS_ERROR_FAILURE;
+#endif
 }
 
 float
@@ -2893,6 +2903,7 @@ void
 nsDocShell::AddProfileTimelineMarker(const char* aName,
                                      TracingMetadata aMetaData)
 {
+#ifdef MOZ_ENABLE_PROFILER_SPS
   if (!mProfileTimelineStartTime.IsNull()) {
     float delta = GetProfileTimelineDelta();
     ProfilerMarkerTracing* payload = new ProfilerMarkerTracing("Timeline",
@@ -2900,6 +2911,7 @@ nsDocShell::AddProfileTimelineMarker(const char* aName,
     mProfileTimelineMarkers.AppendElement(
       new InternalProfileTimelineMarker(aName, payload, delta));
   }
+#endif
 }
 
 void
@@ -2907,6 +2919,7 @@ nsDocShell::AddProfileTimelineMarker(const char* aName,
                                      ProfilerBacktrace* aCause,
                                      TracingMetadata aMetaData)
 {
+#ifdef MOZ_ENABLE_PROFILER_SPS
   if (!mProfileTimelineStartTime.IsNull()) {
     float delta = GetProfileTimelineDelta();
     ProfilerMarkerTracing* payload = new ProfilerMarkerTracing("Timeline",
@@ -2915,16 +2928,19 @@ nsDocShell::AddProfileTimelineMarker(const char* aName,
     mProfileTimelineMarkers.AppendElement(
       new InternalProfileTimelineMarker(aName, payload, delta));
   }
+#endif
 }
 
 void
 nsDocShell::ClearProfileTimelineMarkers()
 {
+#ifdef MOZ_ENABLE_PROFILER_SPS
   for (uint32_t i = 0; i < mProfileTimelineMarkers.Length(); ++i) {
     delete mProfileTimelineMarkers[i]->mPayload;
     mProfileTimelineMarkers[i]->mPayload = nullptr;
   }
   mProfileTimelineMarkers.Clear();
+#endif
 }
 
 nsIDOMStorageManager*

From 617eff590a2654dc233d0054fe6ebfe5f35b6fdf Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Wed, 10 Sep 2014 12:46:18 +0200
Subject: [PATCH 095/109] Bug 1064886: add "Enable E10S" checkbox to
 preferences, r=felipe

--HG--
extra : rebase_source : 34139fb9f2074b73b4cb5e6dcbad7357fff9149d
---
 .../components/preferences/in-content/main.js | 40 +++++++++++++++++++
 .../preferences/in-content/main.xul           | 11 +++++
 .../preferences/in-content/moz.build          |  2 +-
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
index 132e7ad092ec..7c516bf62723 100644
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -88,12 +88,52 @@ var gMainPane = {
     setEventListener("chooseFolder", "command",
                      gMainPane.chooseFolder);
 
+#ifdef E10S_TESTING_ONLY
+    setEventListener("e10sAutoStart", "command",
+                     gMainPane.enableE10SChange);
+    let e10sCheckbox = document.getElementById("e10sAutoStart");
+    let e10sPref = document.getElementById("browser.tabs.remote.autostart");
+    e10sCheckbox.checked = e10sPref.value;
+#endif
+
     // Notify observers that the UI is now ready
     Components.classes["@mozilla.org/observer-service;1"]
               .getService(Components.interfaces.nsIObserverService)
               .notifyObservers(window, "main-pane-loaded", null);
   },
 
+#ifdef E10S_TESTING_ONLY
+  enableE10SChange: function ()
+  {
+    let e10sCheckbox = document.getElementById("e10sAutoStart");
+    let e10sPref = document.getElementById("browser.tabs.remote.autostart");
+
+    const Cc = Components.classes, Ci = Components.interfaces;
+    let brandName = document.getElementById("bundleBrand").getString("brandShortName");
+    let bundle = document.getElementById("bundlePreferences");
+    let msg = bundle.getFormattedString(e10sCheckbox.checked ?
+                                        "featureEnableRequiresRestart" : "featureDisableRequiresRestart",
+                                        [brandName]);
+    let title = bundle.getFormattedString("shouldRestartTitle", [brandName]);
+    let shouldProceed = Services.prompt.confirm(window, title, msg)
+    if (shouldProceed) {
+      let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
+                         .createInstance(Ci.nsISupportsPRBool);
+      Services.obs.notifyObservers(cancelQuit, "quit-application-requested",
+                                   "restart");
+      shouldProceed = !cancelQuit.data;
+
+      if (shouldProceed) {
+        e10sPref.value = e10sCheckbox.checked;
+        Services.startup.quit(Ci.nsIAppStartup.eAttemptQuit |  Ci.nsIAppStartup.eRestart);
+      }
+    }
+
+    // Revert the checkbox in case we didn't quit
+    e10sCheckbox.checked = e10sPref.value;
+  },
+#endif
+
   // HOME PAGE
 
   /*
diff --git a/browser/components/preferences/in-content/main.xul b/browser/components/preferences/in-content/main.xul
index d1c393e9fe6a..06989b1f6a40 100644
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -9,6 +9,12 @@
 
 <preferences id="mainPreferences">
 
+#ifdef E10S_TESTING_ONLY
+    <preference id="browser.tabs.remote.autostart"
+                name="browser.tabs.remote.autostart"
+                type="bool"/>
+#endif
+
     <!-- Startup -->
     <preference id="browser.startup.page"
                 name="browser.startup.page"
@@ -108,6 +114,11 @@
           hidden="true">
   <caption><label>&startup.label;</label></caption>
 
+#ifdef E10S_TESTING_ONLY
+  <checkbox id="e10sAutoStart"
+            label="Enable E10S (multi-process)"/>
+#endif
+
 #ifdef HAVE_SHELL_SERVICE
   <vbox id="defaultBrowserBox">
     <hbox align="center">
diff --git a/browser/components/preferences/in-content/moz.build b/browser/components/preferences/in-content/moz.build
index 46a2a0b171d4..5a6a1a9f2aab 100644
--- a/browser/components/preferences/in-content/moz.build
+++ b/browser/components/preferences/in-content/moz.build
@@ -4,7 +4,7 @@
 # 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/.
 
-for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
+for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME', 'E10S_TESTING_ONLY'):
     DEFINES[var] = CONFIG[var]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'cocoa'):

From 4d135723d8be40c8657145beb6af80fbb2f971ff Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Wed, 10 Sep 2014 13:53:10 +0200
Subject: [PATCH 096/109] Bug 1064885: add prompt to encourage Nightly users to
 enable e10s, r=felipe

--HG--
extra : rebase_source : cf288b2d3b80c540bcc0ba4d2e2caae8b7a95925
---
 browser/components/nsBrowserGlue.js  |  58 ++++++++++++++++++++++++++-
 browser/themes/linux/jar.mn          |   3 ++
 browser/themes/linux/moz.build       |   4 +-
 browser/themes/osx/jar.mn            |   3 ++
 browser/themes/osx/moz.build         |   4 +-
 browser/themes/shared/e10s-64@2x.png | Bin 0 -> 20737 bytes
 browser/themes/windows/jar.mn        |   6 +++
 browser/themes/windows/moz.build     |   4 +-
 testing/profiles/prefs_general.js    |   3 ++
 9 files changed, 81 insertions(+), 4 deletions(-)
 create mode 100644 browser/themes/shared/e10s-64@2x.png

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 5002aff126e3..bb11ad388bed 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -2263,6 +2263,22 @@ let E10SUINotification = {
       if (!activationNoticeShown) {
         this._showE10sActivatedNotice();
       }
+    } else {
+      let e10sPromptShownCount = 0;
+      try {
+        e10sPromptShownCount = Services.prefs.getIntPref("browser.displayedE10SPrompt");
+      } catch(e) {}
+
+      if (!Services.appinfo.inSafeMode && e10sPromptShownCount < 5) {
+        Services.tm.mainThread.dispatch(() => {
+          try {
+            this._showE10SPrompt();
+            Services.prefs.setIntPref("browser.displayedE10SPrompt", e10sPromptShownCount + 1);
+          } catch (ex) {
+            Cu.reportError("Failed to show e10s prompt: " + ex);
+          }
+        }, Ci.nsIThread.DISPATCH_NORMAL);
+      }
     }
   },
 
@@ -2287,7 +2303,47 @@ let E10SUINotification = {
     nb.appendNotification(message, "e10s-activated-noticed",
                           null, nb.PRIORITY_WARNING_MEDIUM, buttons);
 
-  }
+  },
+
+  _showE10SPrompt: function BG__showE10SPrompt() {
+    let win = RecentWindow.getMostRecentBrowserWindow();
+    if (!win)
+      return;
+
+    let browser = win.gBrowser.selectedBrowser;
+
+    let promptMessage = "Would you like to help us test multiprocess Nightly (e10s)? You can also enable e10s in Nightly preferences.";
+    let mainAction = {
+      label: "Enable and Restart",
+      accessKey: "E",
+      callback: function () {
+        Services.prefs.setBoolPref("browser.tabs.remote.autostart", true);
+        Services.prefs.setBoolPref("browser.enabledE10SFromPrompt", true);
+        // Restart the app
+        let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].createInstance(Ci.nsISupportsPRBool);
+        Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
+        if (cancelQuit.data)
+          return; // somebody canceled our quit request
+        Services.startup.quit(Services.startup.eAttemptQuit | Services.startup.eRestart);
+      }
+    };
+    let secondaryActions = [
+      {
+        label: "No thanks",
+        accessKey: "N",
+        callback: function () {
+          Services.prefs.setIntPref("browser.displayedE10SPrompt", 5);
+        }
+      }
+    ];
+    let options = {
+      popupIconURL: "chrome://browser/skin/e10s-64@2x.png",
+      learnMoreURL: "https://wiki.mozilla.org/Electrolysis",
+      persistWhileVisible: true
+    };
+
+    win.PopupNotifications.show(browser, "enable_e10s", promptMessage, null, mainAction, secondaryActions, options);
+  },
 };
 #endif
 
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index bc1a7d6be285..6c80ecc5dd41 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -383,3 +383,6 @@ browser.jar:
   skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png   (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
   skin/classic/browser/devtools/tooltip/arrow-vertical-light.png   (../shared/devtools/tooltip/arrow-vertical-light.png)
   skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png   (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
+#ifdef E10S_TESTING_ONLY
+  skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
+#endif
diff --git a/browser/themes/linux/moz.build b/browser/themes/linux/moz.build
index 6a7af20adda0..492ddbe2bb9f 100644
--- a/browser/themes/linux/moz.build
+++ b/browser/themes/linux/moz.build
@@ -6,4 +6,6 @@
 
 DIRS += ['communicator']
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY']
+
+JAR_MANIFESTS += ['jar.mn']
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 307a58cb5189..12179c219d75 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -542,6 +542,9 @@ browser.jar:
   skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png   (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
   skin/classic/browser/devtools/tooltip/arrow-vertical-light.png   (../shared/devtools/tooltip/arrow-vertical-light.png)
   skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png   (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
+#ifdef E10S_TESTING_ONLY
+  skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
+#endif
 
 % override chrome://browser/skin/toolbarbutton-dropmarker.png              chrome://browser/skin/lion/toolbarbutton-dropmarker.png                 os=Darwin osversion>=10.7
 % override chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png     chrome://browser/skin/lion/tabbrowser/alltabs-box-bkgnd-icon.png        os=Darwin osversion>=10.7
diff --git a/browser/themes/osx/moz.build b/browser/themes/osx/moz.build
index 6a7af20adda0..492ddbe2bb9f 100644
--- a/browser/themes/osx/moz.build
+++ b/browser/themes/osx/moz.build
@@ -6,4 +6,6 @@
 
 DIRS += ['communicator']
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY']
+
+JAR_MANIFESTS += ['jar.mn']
diff --git a/browser/themes/shared/e10s-64@2x.png b/browser/themes/shared/e10s-64@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dc243865cfb412f03aa372d30fa769fd3fd5eac
GIT binary patch
literal 20737
zcmeI4c|4Te+rV#23`vqS2@O#cW=4ZCWEo`1*cFu+V=&nnTh?SLYh)?1C6qNvL`a@U
zQ<O<4OC@9}A*3wtJ=Ih5^gPec?|nb-pEIAB%ek-XI_LhL>pJJU&*yV@*2qA61E&Bd
z000|wbu>-D?@-zggbn=Ntb(V2UmWf_mR<m`elzWd2}r*L1pxFOl9>hB0;i85xVgyS
z?c8jMGJY=Zpf&&~tNOX)2~I>Z%$Ddta@{XFRo5sABiZd2JuHVq;M_HcjwGFvo<!4=
z24;klP6S0eQB@UAWj_q)z=cT0!~9&FUA-`V`$fO`#eg!c87>O@rb2ewFRD)K5N3fh
zf@!#U5@B*Oa?%8ZEE1-mD1(%fQ&5nVg2^I~C^!NMNA8nGDq>J53<3fB@ex(w1SMrp
zJ9~_Y=7AsGfq(56btIGBF>tuAudj^nJ{dPp2RKquQ4x-ih0DrHgBsFa{;p)apR}vj
z&hJkC^rK1iB6yPA$s{*d7|k!<*3Fx|UsROV(a+D1`*Lyr*^#T)4|X6$xF6mfj+8;b
z|H;UX@YBZK+tc~m(Ci3sqBGHj=t}ki?U4Uy=kDl6cJp#{`<E_%UjEmP!8yU<e)j#3
z<8^WQ$F9A|T0S6xA4vbv(#y=>od`D}dbxRf5{Ozp;H~WZr@JSU?0-$pUp&#S{Oj0>
zex!dfqh0xK_AL~?&yX^BuNVzaBA)E#Y3AnUtnxj|jQ&Ij)6n=9RWJ!0o<MS?ag|ht
z|8Dea#(()EYU0U66)+-Yr4eZ9eMmD|B!(80$h`<zFfQqweAoQV2hPooWbgl{50o@Q
z5&UNcI*^mc$STnLpws-_2be*2cryOK@<Ojm=f{qKv3K)y!IM=;E_eqb+}+hd8UCx0
zPV;A6VKm&F-8{iz5mojn!~dz7&gxsNVRT)+$aq%*QCCw1Y>*+5>@arrD5QccT0vSC
zZ>J!QLdYvh<H06rg1v&QEgprGw^KxagNVb?oBz$VrW?VVmM=eC+x;(H)0zLxwV@{o
zT<h@8bUL)r|8Kka2RDD~N{8eHMyNks<bv`0Z8b9`di=HZ&kN3^Z>y3!-qVXn%enoc
ze<t0}W$foFMYH*qyBIuyww|dFXemLoQ-=Sg_1Ca|TK+I2{a+{WyMH?KfA7QBk?8uL
z66(9FZ(9HE#LLZ|?2Gp#syl!&@!w_pcfWr%{JjHZIBf@TCjE6PzPJ8$hW?D%zt5;L
zZDGTJ(EyGN|7{kK%J9Fn{p$I<z6EVooxQ*5E65_i4;)GR{lk?0^6#dW|JjuO^6#d<
zEX`d>WEI&Tz5UiqXGL3mzb_1?V4*-%k(ZO(C#MYmz4><wBa$D{*+P>9X0R76E|Ice
z(tk7h{mMUDTK=mg-IX7f-zST1Q~x%X-&?_w0jyTwKg*TBPV>)X_<t6D-O~TFV|sUt
zPUvZ@DKl`biHKf-fs3BTnlb~|nuzEX7`W(ZtSK{at%-<Ufq{#j#+ot%*P4jv6&Sea
zX{;$TaIJ}mUV(v&p2nIo1J{~}=oJ{a=xMAeGjOemh+ct#i=M`sG6UC|i0Bm<xaeuD
zDKl`biHKf-fs3BTnlb~|nuzEX7`W(ZtSK{at%-<Ufq{#j#+ot%*P4jv6&SeaX{;$T
zaIJ}mUV(v&p2nIo1J{~}=oJ{a=xMAeGjOemh+ct#i=M`sG6UC|i0Bm<xaeuDDKl`b
ziHKf-fs3BTnlb~|nuzEX7`W(ZtSK{at%-<Ufq{#j#+vef#KrmR1wf)J_|~5<_<G;q
z{f1ib)j$|Q#{>reC&j^63{L~V;wtz(1_0g&02sFc0L%pd*y@&Keg6OeK#g@Z)y@1~
zOj-q8;Ok0JtuCsq{nEdGioF@ZVkvh5bscGmv-QCRiah<}Fz>YV1Lm?sN7VYOpW|)a
zBQyg;V>&b|C3c)RlL%E9EYdW#iQDe|06|SC`j8cD?(1!SxU1fGRj10@f%TGbfy2q1
z;K9Qoj~2Y=%(@r*y@E&kyr#60O|E-<4y&*}g#)(BGdcILUdL~~8~I=S;ql;<QV;yy
z`1ts`&<+;0C&8IREX8NF3zH83uQDA`MG5nDPaKuP3@~F?%K14XvfTx{DIS6cAjaY6
zTryv5-+_-!B&C;>O&q&sw&z+=EjMsTJI|P)4B@F+nxT|`n3(t)4C8s?m(>apsVjFD
z)K<;s+ZNeWR5bozbT;g=1UA>`vo#e3k2{d(DXpRQHC@iBT@VVb$;r#x+3F!!fdk)@
z42P-na78trQjFgT$t8H+?yCo`=Nu9Rr(yNun;3W&^~n>Xn{ld5<C%Dgj@h2kS&~Y&
zp;ukMcpAlfJXz8-zI+Q)LF1>+gQd`+Ls_F0E@5Zcv1c%X+;2Q@lR?*oR1)*u-YQt=
zdSI!}=luz9w4l$Ua#dcNtWjM25Q0*v{VWV{1wsQ=;5~YcD$S>wU*DCY@P?l=TEFRm
zxhyx}ywS+vc+O->u~1H*#7gg(6%G+r@FoQ!n-E+qTTY}1OSDQ4vH-8#(bt<_L)-Sp
z;-Mwp8x{NRnf30<TYTJSp~{udm!c;wpWU%O3>Mhe)m5cUMTzjo1R3+Nrcs7vBUK%H
zKQ0Ciw0Ru6Qd~R%FCbM`SWH^P4~4l_A9a9^n5woTxNaFqpph+OWo2dk${iU`9Y5)q
zn=9QpUfy0=l6ft5HxoqUs@WdJq_!*FQw!z2cl>AN0mpSfnwV~Rd$#K8xXHC=Qjjpk
zSVZ5GC+FBjZjM!T9}nOKjsSO$O7VyIPT${ZeVKHm{N;Q3$b>KYyM`qBW0a2jy^g5M
z$jCSi@GytE96s(pe6h`LMl8GIaOJv*p8QkUcUFU}l1(I1^qlvkc-|kH-sm$mP+wM8
z7XSzDumHWcZpjZN9h6ywo0|)zER5B*+ug7fNz}QrFxl$`zSg<`115pc@R#p*`SyEv
zdleN`9=e~z49MX&56}98dT7za2MG?3)8(E}sW;XG^UOfW@%od+r1W*M)4|ybJoPOR
zz*nK=^a79Q%aEd?m5V&gPy!h0_kfQ`;I98@=5Ai>M?^vs=uO?cYa@rqAGJ};ceMev
zc=VeyqLfNYEM!kYuvK?&pvsgKe+)9VLLb7^48|QBpyplI|HpfunBf5D*v(9c7AX-{
zBp21>by;p<p*9n+)Wp7{Ml%0c{$2&#d694gB=^?CfC5~GJ#*+0DgJG-6@{HCgxGCV
z)HcAeY-vM(e?K1pzSdk@_Vs;omApXchrMO8TpG|w5y4h`A$3ujiV6U7b^tkzje|_U
zWc|WGKs05zbFT^iy-Fz$v|!H|S-5cGOB(RX1qiJVSP%tXrO8;G6z!OmqEsFjUVVd(
zM`yN&78MP$hZgQNfsKxL6{|)eT|v_quXC6lUR!iD`GnkjN{V6vCPPiXYd?Z(E3i~+
zAvHj$oSdj0I5~lwYFu4e(97>kRLL$k!|S~AA0Xd8Cf<y&&>K6cWh`uGIj?XqO(wI_
zcWPk$jowMA#=&y)6$>!kUcP_sZRNlrLfN7<#ujRw>D8{dw6r+exSc!7keijcRvKtc
z1Rx^gp11Y&NQpz}NuN4@Drz;8*qbrnH?*ODV(tW(&jicVLjyx(OvT{TVartUFxbaj
zBS$3G@#*~gm)_YOh3lA^T>LPjV2X8&nr@2}34>h-Zd}ENKUoK+wCqxFBR?10T(d`I
zv`Mr?z9SZ5<InWQr_LK3ALwus_O6GZq7l=B+E$4U=eW1Rk@%}%+JOts@$za-$>q0M
zL0#*)*?F)~t8PUqiYnI)ut)EcqI8~Ek9huU*K7ZVJqgXTOL*&dxyhGpE8ab@lg)CL
zuiHj=)Ex_K5!Y7od(Na!wVPSIv+tsQt;3@W(>f@D{kcb8_E<HY=c_Hdan0=E=C}h@
zd&_Fx$Q$zoECsKcr4l_JLyQvbd%9U^Da0RhNlbS|M{H)G)_Wp&X&_)qD4+BKl{H#*
zf~xkCMPDX2isoJ*j*U>!lc(e}S@U(S+d8|qyW6(}B*KF=ce<R8WAARJ>@nPQG*k9G
zMhSsCUp1m{<LKz99ul(JdbHYgxg`eP;OA*-YFcI_QPWb&3-RvbF_D4qjlLJ4oRyGi
z;DAig6B=FkTGgf#_OQ1zH#fHlyiY$H8`vP&(VHUk;t`aB!dAa51<r^tC)DZlr!~01
z+q<aWVkN<s<kVfZY<}=yjH2&{V~0|Q2}{8tB-uHLkzV3ui9luHg?y81($Sau6wzo%
zdcoskm3D2_K`PlFJa410kbN&sDcVz;=G-q9wAsmSJB$*@udr}d4+!{rJe4?RYPf&S
zDZ8WkXex1c3lzsz;gG)Tq5X|A9kDlwVkE6xBMT%NeTM1PRsY$M$812g`G)-x<%i^$
z_Bb)kkvCzXmZ=eb${!Mmivm>C{j9941SS}mSwU~k?v`H+Z0KJMJbvAN$HaU!G_t9{
zMA8i{DAO`Dy(3vKU;2=$X2;Ah#n2$%q(3e$F4|mrzl4>KjvW)xTT0gimT54k3-M1g
z;Vd9w4Gj&g#X0UApOUdmT^EZqO^|7{kiuvhb4514wi+XUITq`&BcD$+QHMgio#E=i
z;IH8Y1qFhw9=l@IO&?q-XR+|F*m+U^OH$k01K0;G(OW^U_imD?Dk4o(L)H4WsfDRW
z!=Bz-xFI6vIz|^AQ3A0C@)Cw;7qy^-`?3vF{l0^lRruye(~R`=N`pcwbZ;l_#6~qq
zt@HxL$jHdRX}`cUQo8Td(7sTl%y}3W@bT?=LzNv6R-X~i+qEBA!EJ{YsN7Mv9Z|J9
z=3Uwl5k3IMd-fwZ_|HU2YEWH8h4CiVTrwc4UKJChJvTHVe(1>M4xxlrYQD+Xk#L@Y
z?oj|hw9wY;!Z21i>*=NiJIgEtSY^@nrZ>|ys=Q~<fLn-i?DYJMQoN=p7a&+~(-fu{
z27{G%7bCfDG)@Vm@I$4)PGH3yWVeC4SIK3G^#DvYEOFjf%#Su<?98VYc8Ln|VAYKI
zqK0Rx?QitPAX?7i6P9k@kJ%b>(7Y?s24P_XjlAoi5Fz{}-zL_>a+<xecXBSdv);Vs
zr7Q;<MGV4rdTPW|vD+_#g^If9EI+{=)qLET&uuRs=U#}2{jkHm*B_JFcLaX?qoJXp
zLqT5tVbuxui)3#A3*qBjr>!i!QS5vhJ47VpraTThP2^~9Ox3*(qL)6UW)qdqablc<
zY~=tlS3Z6Ebdi{@mmKaT7P443x<0BoxAbUr@K}D@@h>NxoSdGIk<)i_Nk;hy0l>MU
zq9t&1RuxWY#7YJQCJ&lEXALR+$a+*jK)~m%r{ZC0)Tz12VZNzlGA2l+rN-^EQk<q}
z892g=8<jua-G;;A{0phqx;wYy(s_)^&K8<TmW$~I=u?lWu$9&5hcN-6tvf=N?zgnG
zRD(<Sg-8}GB#CGViE7@EsPoptGIi@FEN8RoR_-Wp5lpb6<tNLj(APe72dlFDGEgFS
zQMhD-LaQV(Qc;miL9#$s?aFe*X)v8uWI3LfTd!7Xg&{fEBk{>rDqCaj^OMr&AtK=)
zCM<zh4~olb$GIZ$m%z;h&HU8Yh}pf<4>*XrEvD-^I=dK=-1!W8GF6XvvJ}>&#6HCF
zP>!?MLql)Z`K=cU7I$OkONYU<=_sup_)=vj+uQZ*nHlu>Na^kkYOS-P;W^mcSA1H?
za|VTJo3Sh9Y_Ie6!|GGS98a8hk@eVq9TrkFa#1or`-&fUlPUVU_H88y4q7Mf;yrs)
z`Rn8j>)wW-uW3h*9I=ZZYH?YgRXY!a^O#BT`|Bn#x7m5J<bP6-dj`!GZKAEqFFQMD
z3c=z?_}cEPI@5t*k!GM}?7B1j0z0C?ceFioUpI*1@yN(XtoWA}ms5`Yyg8HD&1b{G
zDRtW&u52+uaE(d?H~LpkwRbGLI5|xm1(!~jQtduC7%u1AuDIFQ<cLMT$xo3S2#%f7
zDWqB-yXD+_DK#}UtjgK-rsaY6`|tYI1~(%vnC%%(6w`g?z08I&h!Q;fjDzi=nBUt(
z?c*dDmmq2<Yc?l402CErY%44fyl0mbQ}i+ukSm|n5}Z@~6D+UWG&!sDT<xAPFXju1
zaut7q;F8ZY2+%YRx2>o-XHpb@V?ojoW}fuQ_x=0#Zrls3;XKKd;qa!Wrbu`69g&R3
zGNR!UJ6}zVmetR{Fh${<AQ9Mynx&3KbtoP}tmo}ZrhHn4GHG8$L^Lnu@R;d_HG;L9
zRo#47e0=;WxW3C!QN~))qh}7}b(<CVv17$}$Bx~we|%Ww%e%b1^o)!fsqZq*;Y7zD
zvRK3kg-JwjxMntfTyHF%<GBctmn&8G;}eaI%ME#XLmR+Zdg_Sc<Br;VR`X2&yWVu<
zHq}oL_m&5eD5=ucAYw}F%|~A?r$cTY$vLtCuqoBpF;U#tvnio<`K+d`>Fo-_<-$wS
zw&3F3F_;MB<E$5mI}nm)PzY~<wrbCmB<lRpH8{9>-@N!x=0Ins2@k7!_B-{%TdkT>
zqOFszsAd%S8)g#4hHsy4T3HF^1lk?4gXZI}nHI)dWJEUOpYNH?+QP+lP&h%mIBIT-
zw|eLdM!}eG7F;c(03+XkO=-GM`ul}sR;`G(p3lIV-GBf+0AXdGu_!Y}Lq+54i9AA-
zOa-oHn;X3)2l=#)8z)mF^Zl=y#@>53{B+RkrAu{?^hJFiZ!-BxvDIBgPP~euW)3M`
zUnb4#zHNn#d`5ku$%_!gU=(tm5F28fZtq)vZkHgpg6cw_*X}!W&yTM5Jb#`FJ`s5j
z_wOnZe{^Ef{RnZung_e$#{<8pH2Y{@#|F033G0|onX;<;JwQF~=sq=FujKpTQdRKs
z7t<q0j&u@?MucXAn0ITkSS(M`w)ulep9DngmK__Nx{A!Lyha{bn(aw>VgKktV%zBK
zN%@Qo4=a~;+_&|RZ1o69hYcy&S*m;($#Bc+2h-ZUuK#4I=3rCu>0)tUzr_Zlik_#t
zbvr}xP>QzFc*v)`9gqFr<wlL5<m4oUgoKcQnoL^p9|$gc=&o>{T5aRxI&^%1_ocWF
z;O^7e(T;3s2(wU(_^~K`extJKR$HWodDnfwXihY$tN3s=I90tdayX|<jQ99C%J3Jv
zePf;rCFX~BLvr&Yup$pU`pR3U9olO?)K08uQE%EDJ$lq$kpD_NhA(z6)5D;p3X4ZO
zDKo>#o#d3AG4*2w8SNJJC+B>(Z{MDB>(;HB=GUK}@q3<9Q>)NXvrNs0<VGw8s{G;6
zmp6p?q7<?+o1Og`Tn2=CdwVYyExaEu8W7{0zhU|g!iU*Osf0z_N`S=$R<g9HV(4|$
z4%d}---a6&=3SDeg$B3}ZtE90dHJMyZGgL6&4Grg!?1j^c&o?F11%dH=3hA709TC}
z!_3Ugv5I5&<}9!IN9?}Z$fE{PkG}jdNi5>c^k-@p$|t-TZ{J%<9K5r-@)Ztd@Cjev
zYE+U&u|=vlSdnW%j3e<9%?Lgba=H|SiHdTo;y)apKONzSI=S>PWv`)=i%W`?Od9uj
zz<g7VCuRPGW_D2#w{FtXWr>D3WU%{{g_W7KMrUO()V6Nnj38NAS!oC-6q?0du(eD*
zLb<kQRLB54CD@Cj-Z?vjc8QJcNH187a4Ne!QlbVknmJkj!md}Zyg)eAgfqRMqRp;z
zceHJ-*`9th?+k6^_oKI1Hx8#BmEmMNeZ<f(0sSIx937trR`h=$^izk>V1b8+j!0Oh
zc0(g8!iUiQT*2ds>-nY7DR`)Z1mDBBg+r)jhjmUxOhvjZrEzh}6&A6^d_)l-(4NrR
z61V;IXm-fTy<;*8gonwJ8mZIVu3Nbxb5rdfSauljU^6SF%DcRmkHilpu_M0}_ItDn
zS>wcbLFAcZZ9e+A$I5D!)7qkmV0<3cl-!~^q;>hFTjTPTVM?0yo7u%rSy{qQ$H?)P
zy~%j!9!S{JXU~!e(8%jj2e(CXfcbH~fTa2s?ds0g;x+(QfE;cOiz6lN?d@juDgL`-
zf#DQHg+&S8(ed3%$BD_FN@C3F<rtY-Ornlp*T6v5%-3Z($x9YuPry(lM&cpZGq7+h
zB-i?C(aHT_(p|gvIjg_Uw<B<}qIKnVX{q%7Ca<qUhdEbDc#N)n7T0}&mF%x++;-C)
z9sA+-Xx3)en%9w(K$RU?DnYf5LLo<}ekA{}JHs51W`sy2Uf76_xUJP=D)#PYZp+jJ
z>xRHZS|zeBp*7F&$~&bCA6_BnfZ>*SKV@Mat!X%PC}7@U$>rrOe{jE4GEBOXr-Z?D
zKEKFBzH=PfF?&EmL!)7m<CWX)_>_aKjjHF=A{t#@xYtsKMS~j~E!c?z#)c3N!d$|`
z!btJ+y4F(s;Pz7&ZxX#AH$GK2)o?LpE4-m|X!_N*efBz4!gF6)I%aG75|5S%iiW3x
zQ3$kpbWDxj+SY9yvaEo@t*@%CF5LZ<`wC%%_5?>AyQv@$hglzSZz)L5=gw@q(g%u6
z-DI?mnCy-E`u$rVtkIj7nT5F7x!F$ZDc-cyw2-2Bo*Al{Yku&u!sq>q^1#opqqOxe
z%8GkST+)->!_3tUJol6Uk9yYayZ9(B{G6ejkCbKQ+nR&$dU6(ZOtZee9+^fVK6`xd
z6<UysEhV}WsSa7byGN)Te5MDV8(!^L`50xHq2Q+C0Y;%@)@U52lHlKZa~i(xXpBOH
zh1By4I%2~4$tw%jjdvdN?lMnn0MF&D%b;`K3ZCfro#5(IWuTn<T({2wtXo(2btrpf
zi|MwOAG<ws6I`Q8z~i3rYn=)&M4zZ{&bgCTDiN)&n{<44cuBd~>o|o0zfWU@*(x1l
zWX#Ec04;T%*pn)4F+@w-6pw2uA~xmS0h5LyU#J<|1qAe(Y>aNS%VF%=#Ra^@pO`E;
ziza?-wXL{{hgK)6?n9&BT~ZBM(dtlLT{;Wa6k|pb$(d4HWGV0VV9!9pj4mgOs`H$q
zj@hxQOH4g8ce~oR`}+JckZgkBIxQq1Fr$@ce7R`6@l;n&1$nG<r+r6OkQ}A5eT-Uo
z@GD08&H#84H|M7;4vw(W0c~cub9<LFxDA2_Q@3{}o>54nSm7jb5zYAE*Y_f}y7tvf
zzXfkzUxH81z&^!!EL7L{g-~@H?BFNl?PKj*;tp&F56gs-J2xIGv3MHr+|prrFZO|w
zrS|gc=pv4sqCMG^;l3oX{R#-g$8p*z+G`rt6JRl4kee$KjLz!u@8JpM2?LMfR8#co
zgSxGJT~xqI)2$WC9uN>9Ui`jScrHqoNle!ysm*TuCe<LoslV2na^&byFYpm_db;n~
zgO)!w<-nrfJoz+6UEt>83Jm)4X)H-@y?w%$vs+K4w6-2jn~weH1qJl>IkY<u`DabM
ze;*f6Kak|I)RvIQ8@ev^z{E{gZ&{y)9w^HO8*^adOW)mQzPuvlLqkl?f+He#BZZi4
z^nD6$8lRW42~3STtbe9QAZG=ohBMrd2LPp|rT1sf_Q{XOG9@#Mgo}i~J)sT=0XFlK
zy&mS~{u!)u-~%opeU}52Ede=TzMlClQ|QgAs%;xKY-j_^<6YrB*c^kL2~4p>^g&}j
ze&Bf7Iwl050{~!A7O?kxn_nr*Ru^7<M9Ey*09eqQNb&FB*Fu`6gqC1YXuxI{P;<-W
zCI3=yN3c(H$0!w>drlNQyX@uHGVtNSo+}`68}prJVPVOnm2hIb{<p@tF6(u@V+$n!
zcQf_!Ym}z$%&rfZpB$6Lov*%STXEyG2Twq<$$@TfgKqBw=3VY6f#nW&v@$w<N+YjC
z*auMC3-~?6+qt`+>-O%Kk%~)r373<XZvl@!7ns$ib51}A?mX-c8FqnMtIw{Psv=*!
zdIi%*F*)no_Q<^46}lk<kauS8xz1tJ{9pWm{`7H`1>o<~Tp6oki=_Q0g}Pb>nq^p<
Gu>S#vBZtfY

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 87ac313b224e..55fab3d0c6b6 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -420,6 +420,9 @@ browser.jar:
         skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png   (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
         skin/classic/browser/devtools/tooltip/arrow-vertical-light.png   (../shared/devtools/tooltip/arrow-vertical-light.png)
         skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png   (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
+#ifdef E10S_TESTING_ONLY
+        skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
+#endif
 
 #ifdef XP_WIN
 browser.jar:
@@ -841,6 +844,9 @@ browser.jar:
         skin/classic/aero/browser/devtools/tooltip/arrow-horizontal-light@2x.png   (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-vertical-light.png   (../shared/devtools/tooltip/arrow-vertical-light.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-vertical-light@2x.png   (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
+#ifdef E10S_TESTING_ONLY
+        skin/classic/aero/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
+#endif
 
 % override chrome://browser/skin/Toolbar.png               chrome://browser/skin/Toolbar-aero.png                  os=WINNT osversion=6
 % override chrome://browser/skin/Toolbar.png               chrome://browser/skin/Toolbar-aero.png                  os=WINNT osversion=6.1
diff --git a/browser/themes/windows/moz.build b/browser/themes/windows/moz.build
index 6a7af20adda0..492ddbe2bb9f 100644
--- a/browser/themes/windows/moz.build
+++ b/browser/themes/windows/moz.build
@@ -6,4 +6,6 @@
 
 DIRS += ['communicator']
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY']
+
+JAR_MANIFESTS += ['jar.mn']
diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js
index 641f1319a97c..dcdd7914643a 100644
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -250,3 +250,6 @@ user_pref("loop.throttled", false);
 // Ensure UITour won't hit the network
 user_pref("browser.uitour.pinnedTabUrl", "http://%(server)s/uitour-dummy/pinnedTab");
 user_pref("browser.uitour.url", "http://%(server)s/uitour-dummy/tour");
+
+// Don't prompt about e10s
+user_pref("browser.displayedE10SPrompt", 5);

From b152f5ef201269ebf4bd266462542dd2138ba828 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Wed, 10 Sep 2014 16:06:10 +0100
Subject: [PATCH 097/109] Backout bug 1053252, no need for different package
 name (r=backout)

---
 mobile/android/branding/nightly/configure.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mobile/android/branding/nightly/configure.sh b/mobile/android/branding/nightly/configure.sh
index 2da058e9382b..95f2a36158ce 100644
--- a/mobile/android/branding/nightly/configure.sh
+++ b/mobile/android/branding/nightly/configure.sh
@@ -2,7 +2,6 @@
 # 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/.
 
-ANDROID_PACKAGE_NAME=org.mozilla.fennec_larch
-MOZ_APP_DISPLAYNAME=Larch Nightly
+MOZ_APP_DISPLAYNAME=Nightly
 MOZ_UPDATER=1
 MOZ_ANDROID_ANR_REPORTER=1

From 8245382a912eb2cf3d19066910c2ece366d1fb91 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Wed, 10 Sep 2014 21:28:58 +0100
Subject: [PATCH 098/109] Bug 1014987 - Introduce the new tab strip views
 (r=mcomella)

---
 mobile/android/base/moz.build                 |   3 +
 .../color/new_tablet_tab_strip_item_title.xml |  14 ++
 .../drawable/new_tablet_tab_strip_divider.xml |  17 ++
 .../drawable/new_tablet_tab_strip_item_bg.xml |  52 +++++
 .../base/resources/layout/tab_strip_item.xml  |  14 ++
 .../resources/layout/tab_strip_item_view.xml  |  31 +++
 .../android/base/resources/values/dimens.xml  |   3 +
 mobile/android/base/tabs/TabStripAdapter.java |  96 ++++++++
 .../android/base/tabs/TabStripItemView.java   | 193 ++++++++++++++++
 mobile/android/base/tabs/TabStripView.java    | 208 ++++++++++++++++++
 10 files changed, 631 insertions(+)
 create mode 100644 mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml
 create mode 100644 mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml
 create mode 100644 mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml
 create mode 100644 mobile/android/base/resources/layout/tab_strip_item.xml
 create mode 100644 mobile/android/base/resources/layout/tab_strip_item_view.xml
 create mode 100644 mobile/android/base/tabs/TabStripAdapter.java
 create mode 100644 mobile/android/base/tabs/TabStripItemView.java
 create mode 100644 mobile/android/base/tabs/TabStripView.java

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index de9ec5b136a3..bc952e893e92 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -403,6 +403,9 @@ gbjar.sources += [
     'tabs/TabsLayoutItemView.java',
     'tabs/TabsListLayout.java',
     'tabs/TabsPanel.java',
+    'tabs/TabStripAdapter.java',
+    'tabs/TabStripItemView.java',
+    'tabs/TabStripView.java',
     'TabsAccessor.java',
     'Telemetry.java',
     'TelemetryContract.java',
diff --git a/mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml b/mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml
new file mode 100644
index 000000000000..132ebd90e287
--- /dev/null
+++ b/mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+	      xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+    <item android:state_checked="true"
+          gecko:state_private="true"
+          android:color="@color/text_color_primary_inverse"/>
+
+    <item android:state_checked="true"
+          android:color="@color/text_color_primary"/>
+
+    <item android:color="@color/text_color_tertiary_inverse"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml b/mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml
new file mode 100644
index 000000000000..5a16545da91e
--- /dev/null
+++ b/mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <gradient
+        android:startColor="#D1D5DA"
+        android:endColor="@android:color/transparent"
+        android:angle="90"/>
+
+    <size android:width="1dp"
+          android:height="32dp"/>
+
+</shape>
diff --git a/mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml b/mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml
new file mode 100644
index 000000000000..245be5f7b03e
--- /dev/null
+++ b/mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+	      xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+    <item android:state_pressed="true"
+          android:state_checked="true"
+          gecko:state_private="true">
+        <shape>
+            <solid android:color="@color/highlight_nav_pb" />
+        </shape>
+    </item>
+
+    <item android:state_checked="true"
+          gecko:state_private="true">
+        <shape>
+            <solid android:color="@color/background_private" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true"
+          gecko:state_private="true">
+        <shape>
+            <solid android:color="@color/highlight_dark_focused" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true"
+          android:state_checked="true">
+        <shape>
+            <solid android:color="@color/highlight_nav" />
+        </shape>
+    </item>
+
+    <item android:state_checked="true">
+        <shape>
+            <solid android:color="@color/background_normal" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/highlight_dark" />
+        </shape>
+    </item>
+
+    <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/layout/tab_strip_item.xml b/mobile/android/base/resources/layout/tab_strip_item.xml
new file mode 100644
index 000000000000..71087dda28aa
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_strip_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<!-- The paddings are asymmetric here to compensate the padding around the
+     the close button within the TabStripItemView -->
+<org.mozilla.gecko.tabs.TabStripItemView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="@dimen/new_tablet_tab_strip_item_width"
+    android:layout_height="match_parent"
+    android:background="@drawable/new_tablet_tab_strip_item_bg"
+    android:paddingLeft="28dp"
+    android:paddingRight="15dp"/>
diff --git a/mobile/android/base/resources/layout/tab_strip_item_view.xml b/mobile/android/base/resources/layout/tab_strip_item_view.xml
new file mode 100644
index 000000000000..58e0149c2362
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_strip_item_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <org.mozilla.gecko.widget.ThemedTextView
+        android:id="@+id/title"
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1.0"
+        android:layout_marginRight="-5dp"
+        android:gravity="center_vertical"
+        android:textSize="14sp"
+        android:ellipsize="end"
+        android:textColor="@color/new_tablet_tab_strip_item_title"
+        android:maxLines="1"
+        android:duplicateParentState="true"/>
+
+    <org.mozilla.gecko.widget.ThemedImageButton
+        android:id="@+id/close"
+        android:layout_width="40dip"
+        android:layout_height="match_parent"
+        android:background="@android:color/transparent"
+        android:scaleType="center"
+        android:contentDescription="@string/close_tab"
+        android:src="@drawable/tab_close"
+        android:duplicateParentState="true"/>
+
+</merge>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index e345435a71f1..970f95ddf31a 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -15,6 +15,9 @@
     <dimen name="browser_toolbar_favicon_size">25.33dip</dimen>
     <dimen name="browser_toolbar_shadow_size">2dp</dimen>
 
+    <dimen name="new_tablet_tab_strip_item_width">250dp</dimen>
+    <dimen name="new_tablet_tab_strip_item_margin">-30dp</dimen>
+
     <!-- Dimensions used by Favicons and FaviconView -->
     <dimen name="favicon_size_small">16dp</dimen>
     <dimen name="favicon_size_large">32dp</dimen>
diff --git a/mobile/android/base/tabs/TabStripAdapter.java b/mobile/android/base/tabs/TabStripAdapter.java
new file mode 100644
index 000000000000..c40a28f03167
--- /dev/null
+++ b/mobile/android/base/tabs/TabStripAdapter.java
@@ -0,0 +1,96 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+/* 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/. */
+
+package org.mozilla.gecko.tabs;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.Tabs;
+
+class TabStripAdapter extends BaseAdapter {
+    private static final String LOGTAG = "GeckoTabStripAdapter";
+
+    private final Context context;
+    private List<Tab> tabs;
+
+    public TabStripAdapter(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public Tab getItem(int position) {
+        return (tabs != null ? tabs.get(position) : null);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        final Tab tab = getItem(position);
+        return (tab != null ? tab.getId() : -1);
+    }
+
+    @Override
+    public boolean hasStableIds() {
+        return true;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        final TabStripItemView item;
+        if (convertView == null) {
+            item = (TabStripItemView)
+                    LayoutInflater.from(context).inflate(R.layout.tab_strip_item, parent, false);
+        } else {
+            item = (TabStripItemView) convertView;
+        }
+
+        final Tab tab = tabs.get(position);
+        item.updateFromTab(tab);
+
+        return item;
+    }
+
+    @Override
+    public int getCount() {
+        return (tabs != null ? tabs.size() : 0);
+    }
+
+    int getPositionForTab(Tab tab) {
+        if (tabs == null || tab == null) {
+            return -1;
+        }
+
+        return tabs.indexOf(tab);
+    }
+
+    void removeTab(Tab tab) {
+        if (tabs == null) {
+            return;
+        }
+
+        tabs.remove(tab);
+        notifyDataSetChanged();
+    }
+
+    void refresh(List<Tab> tabs) {
+        // The list of tabs is guaranteed to be non-null.
+        // See TabStripView.refreshTabs().
+        this.tabs = tabs;
+        notifyDataSetChanged();
+    }
+
+    void clear() {
+        tabs = null;
+        notifyDataSetInvalidated();
+    }
+}
\ No newline at end of file
diff --git a/mobile/android/base/tabs/TabStripItemView.java b/mobile/android/base/tabs/TabStripItemView.java
new file mode 100644
index 000000000000..59d4e3880679
--- /dev/null
+++ b/mobile/android/base/tabs/TabStripItemView.java
@@ -0,0 +1,193 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+/* 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/. */
+
+package org.mozilla.gecko.tabs;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Region;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Checkable;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.widget.ThemedImageButton;
+import org.mozilla.gecko.widget.ThemedLinearLayout;
+import org.mozilla.gecko.widget.ThemedTextView;
+
+public class TabStripItemView extends ThemedLinearLayout
+                              implements Checkable {
+    private static final String LOGTAG = "GeckoTabStripItem";
+
+    private static final int[] STATE_CHECKED = {
+        android.R.attr.state_checked
+    };
+
+    private int id = -1;
+    private boolean checked;
+
+    private final ThemedTextView titleView;
+    private final ThemedImageButton closeView;
+
+    private final Paint tabPaint;
+    private final Path tabShape;
+    private final Region tabRegion;
+    private final Region tabClipRegion;
+
+    public TabStripItemView(Context context) {
+        this(context, null);
+    }
+
+    public TabStripItemView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setOrientation(HORIZONTAL);
+
+        tabShape = new Path();
+        tabRegion = new Region();
+        tabClipRegion = new Region();
+
+        tabPaint = new Paint();
+        tabPaint.setAntiAlias(true);
+        tabPaint.setColor(0xFFFF0000);
+        tabPaint.setStrokeWidth(0.0f);
+        tabPaint.setXfermode(new PorterDuffXfermode(Mode.DST_IN));
+
+        LayoutInflater.from(context).inflate(R.layout.tab_strip_item_view, this);
+        setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (id < 0) {
+                    throw new IllegalStateException("Invalid tab id:" + id);
+                }
+
+                Tabs.getInstance().selectTab(id);
+            }
+        });
+
+        titleView = (ThemedTextView) findViewById(R.id.title);
+
+        closeView = (ThemedImageButton) findViewById(R.id.close);
+        closeView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (id < 0) {
+                    throw new IllegalStateException("Invalid tab id:" + id);
+                }
+
+                final Tabs tabs = Tabs.getInstance();
+                tabs.closeTab(tabs.getTab(id), true);
+            }
+        });
+    }
+
+    @Override
+    protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
+        super.onSizeChanged(width, height, oldWidth, oldHeight);
+
+        tabShape.reset();
+
+        final int curveWidth = TabCurve.getWidthForHeight(height);
+
+        tabShape.moveTo(0, height);
+        TabCurve.drawFromBottom(tabShape, 0, height, TabCurve.Direction.RIGHT);
+        tabShape.lineTo(width - curveWidth, 0);
+
+        TabCurve.drawFromTop(tabShape, width - curveWidth, height, TabCurve.Direction.RIGHT);
+        tabShape.lineTo(0, height);
+
+        tabClipRegion.set(0, 0, width, height);
+        tabRegion.setPath(tabShape, tabClipRegion);
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        final int saveCount = canvas.saveLayer(0, 0,
+                                               getWidth(), getHeight(), null,
+                                               Canvas.MATRIX_SAVE_FLAG |
+                                               Canvas.CLIP_SAVE_FLAG |
+                                               Canvas.HAS_ALPHA_LAYER_SAVE_FLAG |
+                                               Canvas.FULL_COLOR_LAYER_SAVE_FLAG |
+                                               Canvas.CLIP_TO_LAYER_SAVE_FLAG);
+
+        super.draw(canvas);
+
+        canvas.drawPath(tabShape, tabPaint);
+
+        canvas.restoreToCount(saveCount);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        final int action = event.getActionMasked();
+        final int x = (int) event.getX();
+        final int y = (int) event.getY();
+
+        // Let motion events through if they're off the tab shape bounds.
+        if (action == MotionEvent.ACTION_DOWN && !tabRegion.contains(x, y)) {
+            return false;
+        }
+
+        return super.onTouchEvent(event);
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+        if (checked) {
+            mergeDrawableStates(drawableState, STATE_CHECKED);
+        }
+
+        return drawableState;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return checked;
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        if (this.checked == checked) {
+            return;
+        }
+
+        this.checked = checked;
+        refreshDrawableState();
+    }
+
+    @Override
+    public void toggle() {
+        setChecked(!checked);
+    }
+
+    @Override
+    public void setPressed(boolean pressed) {
+        super.setPressed(pressed);
+
+        // The surrounding tab strip dividers need to be hidden
+        // when a tab item enters pressed state.
+        View parent = (View) getParent();
+        parent.invalidate();
+    }
+
+    void updateFromTab(Tab tab) {
+        if (tab == null) {
+            return;
+        }
+
+        id = tab.getId();
+        titleView.setText(tab.getDisplayTitle());
+        setPrivateMode(tab.isPrivate());
+    }
+}
diff --git a/mobile/android/base/tabs/TabStripView.java b/mobile/android/base/tabs/TabStripView.java
new file mode 100644
index 000000000000..4f9ea556d790
--- /dev/null
+++ b/mobile/android/base/tabs/TabStripView.java
@@ -0,0 +1,208 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+/* 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/. */
+
+package org.mozilla.gecko.tabs;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.widget.TwoWayView;
+
+public class TabStripView extends TwoWayView {
+    private static final String LOGTAG = "GeckoTabStrip";
+
+    private final TabStripAdapter adapter;
+    private final TabsListener tabsListener;
+
+    private final Drawable divider;
+
+    private boolean isPrivate;
+
+    public TabStripView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        setOrientation(Orientation.HORIZONTAL);
+        setChoiceMode(ChoiceMode.SINGLE);
+        setItemsCanFocus(true);
+        setChildrenDrawingOrderEnabled(true);
+        setWillNotDraw(false);
+
+        final Resources resources = getResources();
+
+        divider = resources.getDrawable(R.drawable.new_tablet_tab_strip_divider);
+
+        final int itemMargin =
+                resources.getDimensionPixelSize(R.dimen.new_tablet_tab_strip_item_margin);
+        setItemMargin(itemMargin);
+
+        tabsListener = new TabsListener();
+
+        adapter = new TabStripAdapter(context);
+        setAdapter(adapter);
+    }
+
+    private View getViewForTab(Tab tab) {
+        final int position = adapter.getPositionForTab(tab);
+        return getChildAt(position - getFirstVisiblePosition());
+    }
+
+    private int getPositionForSelectedTab() {
+        return adapter.getPositionForTab(Tabs.getInstance().getSelectedTab());
+    }
+
+    private void updateSelectedStyle(int selected) {
+        setItemChecked(selected, true);
+    }
+
+    private void updateSelectedPosition() {
+        final int selected = getPositionForSelectedTab();
+        if (selected != -1) {
+            updateSelectedStyle(selected);
+        }
+    }
+
+    private int getCheckedIndex(int childCount) {
+        final int checkedIndex = getCheckedItemPosition() - getFirstVisiblePosition();
+        if (checkedIndex < 0 || checkedIndex > childCount - 1) {
+            return INVALID_POSITION;
+        }
+
+        return checkedIndex;
+    }
+
+    private void refreshTabs() {
+        // Store a different copy of the tabs, so that we don't have
+        // to worry about accidentally updating it on the wrong thread.
+        final List<Tab> tabs = new ArrayList<Tab>();
+
+        for (Tab tab : Tabs.getInstance().getTabsInOrder()) {
+            if (tab.isPrivate() == isPrivate) {
+                tabs.add(tab);
+            }
+        }
+
+        adapter.refresh(tabs);
+        updateSelectedPosition();
+    }
+
+    private void removeTab(Tab tab) {
+        adapter.removeTab(tab);
+        updateSelectedPosition();
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        Tabs.registerOnTabsChangedListener(tabsListener);
+        refreshTabs();
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        Tabs.unregisterOnTabsChangedListener(tabsListener);
+        adapter.clear();
+    }
+
+    @Override
+    protected int getChildDrawingOrder(int childCount, int i) {
+        final int checkedIndex = getCheckedIndex(childCount);
+        if (checkedIndex == INVALID_POSITION) {
+            return i;
+        }
+
+        // Always draw the currently selected tab on top of all
+        // other child views so that its curve is fully visible.
+        if (i == childCount - 1) {
+            return checkedIndex;
+        } else if (checkedIndex <= i) {
+            return i + 1;
+        } else {
+            return i;
+        }
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        super.draw(canvas);
+
+        final int bottom = getHeight() - getPaddingBottom();
+        final int top = bottom - divider.getIntrinsicHeight();
+
+        final int dividerWidth = divider.getIntrinsicWidth();
+        final int itemMargin = getItemMargin();
+
+        final int childCount = getChildCount();
+        final int checkedIndex = getCheckedIndex(childCount);
+
+        for (int i = 1; i < childCount; i++) {
+            final View child = getChildAt(i);
+
+            final boolean pressed = (child.isPressed() || getChildAt(i - 1).isPressed());
+            final boolean checked = (i == checkedIndex || i == checkedIndex + 1);
+
+            // Don't draw dividers for around checked or pressed items
+            // so that they are not drawn on top of the tab curves.
+            if (pressed || checked) {
+                continue;
+            }
+
+            final int left = child.getLeft() - (itemMargin / 2) - dividerWidth;
+            final int right = left + dividerWidth;
+
+            divider.setBounds(left, top, right, bottom);
+            divider.draw(canvas);
+        }
+    }
+
+    private class TabsListener implements Tabs.OnTabsChangedListener {
+        @Override
+        public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
+            switch (msg) {
+                case RESTORED:
+                case ADDED:
+                    // Refresh the list to make sure the new tab is
+                    // added in the right position.
+                    refreshTabs();
+                    break;
+
+                case CLOSED:
+                    removeTab(tab);
+                    break;
+
+                case SELECTED:
+                    // Update the selected position, then fall through...
+                    if (tab.isPrivate() != isPrivate) {
+                        isPrivate = tab.isPrivate();
+                        refreshTabs();
+                    } else {
+                        updateSelectedPosition();
+                    }
+                case UNSELECTED:
+                    // We just need to update the style for the unselected tab...
+                case TITLE:
+                case RECORDING_CHANGE:
+                    final TabStripItemView item = (TabStripItemView) getViewForTab(tab);
+                    if (item != null) {
+                        item.updateFromTab(tab);
+                    }
+                    break;
+            }
+        }
+    }
+}
\ No newline at end of file

From bed094b946aefbd2ef05cc1dfac41ece41572c7a Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Wed, 10 Sep 2014 21:28:58 +0100
Subject: [PATCH 099/109] Bug 1014987 - Add tab strip to layout on new tablet
 UI (r=mcomella)

---
 mobile/android/base/BrowserApp.java           | 50 +++++++++++--------
 .../base/resources/layout/gecko_app.xml       | 48 ++++++++++++------
 .../resources/layout/new_tablet_tab_strip.xml | 11 ++++
 .../android/base/resources/values/dimens.xml  |  1 +
 4 files changed, 72 insertions(+), 38 deletions(-)
 create mode 100644 mobile/android/base/resources/layout/new_tablet_tab_strip.xml

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 7d22181ffd6d..61843c612864 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -158,7 +158,8 @@ public class BrowserApp extends GeckoApp
     private BrowserSearch mBrowserSearch;
     private View mBrowserSearchContainer;
 
-    public ViewFlipper mViewFlipper;
+    public ViewGroup mBrowserChrome;
+    public ViewFlipper mActionBarFlipper;
     public ActionModeCompatView mActionBar;
     private BrowserToolbar mBrowserToolbar;
     private ToolbarProgressView mProgressView;
@@ -343,7 +344,7 @@ public class BrowserApp extends GeckoApp
             switch (keyCode) {
                 case KeyEvent.KEYCODE_BUTTON_Y:
                     // Toggle/focus the address bar on gamepad-y button.
-                    if (mViewFlipper.getVisibility() == View.VISIBLE) {
+                    if (mBrowserChrome.getVisibility() == View.VISIBLE) {
                         if (mDynamicToolbar.isEnabled() && !isHomePagerVisible()) {
                             mDynamicToolbar.setVisible(false, VisibilityTransition.ANIMATE);
                             if (mLayerView != null) {
@@ -528,7 +529,8 @@ public class BrowserApp extends GeckoApp
 
         final Context appContext = getApplicationContext();
 
-        mViewFlipper = (ViewFlipper) findViewById(R.id.browser_actionbar);
+        mBrowserChrome = (ViewGroup) findViewById(R.id.browser_chrome);
+        mActionBarFlipper = (ViewFlipper) findViewById(R.id.browser_actionbar);
         mActionBar = (ActionModeCompatView) findViewById(R.id.actionbar);
 
         mBrowserToolbar = (BrowserToolbar) findViewById(R.id.browser_toolbar);
@@ -541,6 +543,10 @@ public class BrowserApp extends GeckoApp
             Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.INTENT);
         }
 
+        if (NewTabletUI.isEnabled(this)) {
+            findViewById(R.id.new_tablet_tab_strip).setVisibility(View.VISIBLE);
+        }
+
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideOnTouchListener());
         ((GeckoApp.MainLayout) mMainLayout).setMotionEventInterceptor(new MotionEventInterceptor() {
             @Override
@@ -836,7 +842,7 @@ public class BrowserApp extends GeckoApp
                 mLayerView.setOnMetricsChangedListener(this);
             }
             setToolbarMargin(0);
-            mHomePagerContainer.setPadding(0, mViewFlipper.getHeight(), 0, 0);
+            mHomePagerContainer.setPadding(0, mBrowserChrome.getHeight(), 0, 0);
         } else {
             // Immediately show the toolbar when disabling the dynamic
             // toolbar.
@@ -844,8 +850,8 @@ public class BrowserApp extends GeckoApp
                 mLayerView.setOnMetricsChangedListener(null);
             }
             mHomePagerContainer.setPadding(0, 0, 0, 0);
-            if (mViewFlipper != null) {
-                ViewHelper.setTranslationY(mViewFlipper, 0);
+            if (mBrowserChrome != null) {
+                ViewHelper.setTranslationY(mBrowserChrome, 0);
             }
         }
 
@@ -1114,7 +1120,7 @@ public class BrowserApp extends GeckoApp
 
     @Override
     public void onMetricsChanged(ImmutableViewportMetrics aMetrics) {
-        if (isHomePagerVisible() || mViewFlipper == null) {
+        if (isHomePagerVisible() || mBrowserChrome == null) {
             return;
         }
 
@@ -1123,7 +1129,7 @@ public class BrowserApp extends GeckoApp
         if (aMetrics.getPageHeight() <= aMetrics.getHeight()) {
             if (mDynamicToolbarCanScroll) {
                 mDynamicToolbarCanScroll = false;
-                if (mViewFlipper.getVisibility() != View.VISIBLE) {
+                if (mBrowserChrome.getVisibility() != View.VISIBLE) {
                     ThreadUtils.postToUiThread(new Runnable() {
                         public void run() {
                             mDynamicToolbar.setVisible(true, VisibilityTransition.ANIMATE);
@@ -1135,13 +1141,13 @@ public class BrowserApp extends GeckoApp
             mDynamicToolbarCanScroll = true;
         }
 
-        final View toolbarLayout = mViewFlipper;
+        final View browserChrome = mBrowserChrome;
         final ToolbarProgressView progressView = mProgressView;
         final int marginTop = Math.round(aMetrics.marginTop);
         ThreadUtils.postToUiThread(new Runnable() {
             public void run() {
-                final float translationY = marginTop - toolbarLayout.getHeight();
-                ViewHelper.setTranslationY(toolbarLayout, translationY);
+                final float translationY = marginTop - browserChrome.getHeight();
+                ViewHelper.setTranslationY(browserChrome, translationY);
                 ViewHelper.setTranslationY(progressView, translationY);
 
                 if (mDoorHangerPopup.isShowing()) {
@@ -1178,8 +1184,8 @@ public class BrowserApp extends GeckoApp
         ThreadUtils.assertOnUiThread();
 
         int height = 0;
-        if (mViewFlipper != null) {
-            height = mViewFlipper.getHeight();
+        if (mBrowserChrome != null) {
+            height = mBrowserChrome.getHeight();
         }
 
         if (!mDynamicToolbar.isEnabled() || isHomePagerVisible()) {
@@ -1212,9 +1218,9 @@ public class BrowserApp extends GeckoApp
             @Override
             public void run() {
                 if (aShow) {
-                    mViewFlipper.setVisibility(View.VISIBLE);
+                    mBrowserChrome.setVisibility(View.VISIBLE);
                 } else {
-                    mViewFlipper.setVisibility(View.GONE);
+                    mBrowserChrome.setVisibility(View.GONE);
                     if (hasTabsSideBar()) {
                         hideTabs();
                     }
@@ -1230,8 +1236,8 @@ public class BrowserApp extends GeckoApp
         ThreadUtils.postToUiThread(new Runnable() {
             @Override
             public void run() {
-                mViewFlipper.setVisibility(View.VISIBLE);
-                mViewFlipper.requestFocusFromTouch();
+                mBrowserChrome.setVisibility(View.VISIBLE);
+                mActionBarFlipper.requestFocusFromTouch();
             }
         });
     }
@@ -2479,7 +2485,7 @@ public class BrowserApp extends GeckoApp
             @Override
             public void run() {
                 if (fullscreen) {
-                    mViewFlipper.setVisibility(View.GONE);
+                    mBrowserChrome.setVisibility(View.GONE);
                     if (mDynamicToolbar.isEnabled()) {
                         mDynamicToolbar.setVisible(false, VisibilityTransition.IMMEDIATE);
                         mLayerView.getLayerMarginsAnimator().setMaxMargins(0, 0, 0, 0);
@@ -2487,7 +2493,7 @@ public class BrowserApp extends GeckoApp
                         setToolbarMargin(0);
                     }
                 } else {
-                    mViewFlipper.setVisibility(View.VISIBLE);
+                    mBrowserChrome.setVisibility(View.VISIBLE);
                     if (mDynamicToolbar.isEnabled()) {
                         mDynamicToolbar.setVisible(true, VisibilityTransition.IMMEDIATE);
                         mLayerView.getLayerMarginsAnimator().setMaxMargins(0, mToolbarHeight, 0, 0);
@@ -3043,12 +3049,12 @@ public class BrowserApp extends GeckoApp
     public void startActionModeCompat(final ActionModeCompat.Callback callback) {
         // If actionMode is null, we're not currently showing one. Flip to the action mode view
         if (mActionMode == null) {
-            mViewFlipper.showNext();
+            mActionBarFlipper.showNext();
             LayerMarginsAnimator margins = mLayerView.getLayerMarginsAnimator();
 
             // If the toolbar is dynamic and not currently showing, just slide it in
             if (mDynamicToolbar.isEnabled() && !margins.areMarginsShown()) {
-                margins.setMaxMargins(0, mViewFlipper.getHeight(), 0, 0);
+                margins.setMaxMargins(0, mBrowserChrome.getHeight(), 0, 0);
                 mDynamicToolbar.setVisible(true, VisibilityTransition.ANIMATE);
                 mShowActionModeEndAnimation = true;
             } else {
@@ -3079,7 +3085,7 @@ public class BrowserApp extends GeckoApp
         mActionMode = null;
         mDynamicToolbar.setPinned(false, PinReason.ACTION_MODE);
 
-        mViewFlipper.showPrevious();
+        mActionBarFlipper.showPrevious();
 
         // Only slide the urlbar out if it was hidden when the action mode started
         // Don't animate hiding it so that there's no flash as we switch back to url mode
diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
index a55ae1a729ff..ea3a951a2c3d 100644
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -22,6 +22,7 @@
         <RelativeLayout android:id="@+id/gecko_layout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:layout_below="@+id/new_tablet_tab_strip"
                         android:layout_above="@+id/find_in_page">
 
             <include layout="@layout/shared_ui_components"/>
@@ -63,7 +64,7 @@
         <FrameLayout android:id="@+id/search_container"
                      android:layout_width="match_parent"
                      android:layout_height="match_parent"
-                     android:layout_below="@+id/browser_actionbar"
+                     android:layout_below="@+id/browser_chrome"
                      android:background="@android:color/white"
                      android:visibility="invisible"/>
 
@@ -73,33 +74,48 @@
              the root view, BrowserToolbar should be specified as low in the
              view hierarchy as possible. -->
 
-        <org.mozilla.gecko.widget.GeckoViewFlipper android:id="@id/browser_actionbar"
+        <LinearLayout android:id="@id/browser_chrome"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:orientation="vertical">
+
+            <ViewStub android:id="@+id/new_tablet_tab_strip"
+                      android:inflatedId="@id/new_tablet_tab_strip"
+                      android:layout="@layout/new_tablet_tab_strip"
+                      android:layout_width="match_parent"
+                      android:layout_height="@dimen/new_tablet_tab_strip_height"
+                      android:visibility="gone"/>
+
+            <org.mozilla.gecko.widget.GeckoViewFlipper
+                android:id="@+id/browser_actionbar"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/browser_toolbar_height"
                 android:clickable="true"
                 android:focusable="true">
 
-            <org.mozilla.gecko.toolbar.BrowserToolbar
-                android:id="@+id/browser_toolbar"
-                style="@style/BrowserToolbar"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/browser_toolbar_height"
-                android:clickable="true"
-                android:focusable="true"
-                android:background="@drawable/url_bar_bg"/>
+                <org.mozilla.gecko.toolbar.BrowserToolbar
+                    android:id="@+id/browser_toolbar"
+                    style="@style/BrowserToolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/browser_toolbar_height"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="@drawable/url_bar_bg"/>
 
-            <org.mozilla.gecko.ActionModeCompatView android:id="@+id/actionbar"
-                                                    android:layout_height="match_parent"
-                                                    android:layout_width="match_parent"
-                                                    style="@style/GeckoActionBar"/>
+                <org.mozilla.gecko.ActionModeCompatView android:id="@+id/actionbar"
+                                                        android:layout_height="match_parent"
+                                                        android:layout_width="match_parent"
+                                                        style="@style/GeckoActionBar"/>
 
-        </org.mozilla.gecko.widget.GeckoViewFlipper>
+            </org.mozilla.gecko.widget.GeckoViewFlipper>
+
+        </LinearLayout>
 
         <org.mozilla.gecko.toolbar.ToolbarProgressView android:id="@+id/progress"
                                                        android:layout_width="match_parent"
                                                        android:layout_height="14dp"
                                                        android:layout_marginTop="-8dp"
-                                                       android:layout_below="@id/browser_actionbar"
+                                                       android:layout_below="@id/browser_chrome"
                                                        android:src="@drawable/progress"
                                                        android:background="@null"
                                                        android:visibility="gone" />
diff --git a/mobile/android/base/resources/layout/new_tablet_tab_strip.xml b/mobile/android/base/resources/layout/new_tablet_tab_strip.xml
new file mode 100644
index 000000000000..f2dd283f9883
--- /dev/null
+++ b/mobile/android/base/resources/layout/new_tablet_tab_strip.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<org.mozilla.gecko.tabs.TabStripView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="8dp"
+    android:background="@color/background_tabs"/>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index 970f95ddf31a..6d12e371d696 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -15,6 +15,7 @@
     <dimen name="browser_toolbar_favicon_size">25.33dip</dimen>
     <dimen name="browser_toolbar_shadow_size">2dp</dimen>
 
+    <dimen name="new_tablet_tab_strip_height">48dp</dimen>
     <dimen name="new_tablet_tab_strip_item_width">250dp</dimen>
     <dimen name="new_tablet_tab_strip_item_margin">-30dp</dimen>
 

From 0373fede673d62eb290a782534b2b462c76bd24e Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@lucasr.org>
Date: Wed, 10 Sep 2014 23:31:15 +0100
Subject: [PATCH 100/109] Bug 1065663 - Use correct layout param for TwoWayView
 in tabs_item_cell (r=mcomella)

---
 mobile/android/base/resources/layout/tabs_item_cell.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/base/resources/layout/tabs_item_cell.xml b/mobile/android/base/resources/layout/tabs_item_cell.xml
index 115ce4f3515f..c37a2d1b11af 100644
--- a/mobile/android/base/resources/layout/tabs_item_cell.xml
+++ b/mobile/android/base/resources/layout/tabs_item_cell.xml
@@ -7,7 +7,7 @@
                                  style="@style/TabsItem"
                                  android:focusable="true"
                                  android:id="@+id/info"
-                                 android:layout_width="match_parent"
+                                 android:layout_width="wrap_content"
                                  android:layout_height="wrap_content"
                                  android:paddingTop="6dip"
                                  android:paddingBottom="6dip"

From f19655c2c9adb9d74afe730f598e05686aa70b9e Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@lucasr.org>
Date: Thu, 11 Sep 2014 00:27:01 +0100
Subject: [PATCH 101/109] Bug 1014987 - Gracefully handle out-of-bounds
 positions in TabsStripAdapter (r=mcomella)

---
 mobile/android/base/tabs/TabStripAdapter.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/tabs/TabStripAdapter.java b/mobile/android/base/tabs/TabStripAdapter.java
index c40a28f03167..8778aac3126b 100644
--- a/mobile/android/base/tabs/TabStripAdapter.java
+++ b/mobile/android/base/tabs/TabStripAdapter.java
@@ -30,7 +30,9 @@ class TabStripAdapter extends BaseAdapter {
 
     @Override
     public Tab getItem(int position) {
-        return (tabs != null ? tabs.get(position) : null);
+        return (tabs != null &&
+                position >= 0 &&
+                position < tabs.size() ? tabs.get(position) : null);
     }
 
     @Override

From 5c44f008f61f6691097d67d20271f1f79843d462 Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <benj@benj.me>
Date: Thu, 11 Sep 2014 08:50:10 +0200
Subject: [PATCH 102/109] Bug 1051860: Optimize SimdValueX4 codegen for
 float32x4 with unpcklps; r=sunfish

--HG--
extra : rebase_source : 30cec4448afa60e5be2a8e12f01daf95fffc94e3
---
 js/src/jit/LIR-Common.h                       | 19 -------
 js/src/jit/LOpcodes.h                         |  1 -
 js/src/jit/Lowering.cpp                       | 11 ----
 js/src/jit/Lowering.h                         |  1 -
 js/src/jit/arm/CodeGenerator-arm.h            |  1 -
 js/src/jit/arm/Lowering-arm.cpp               |  6 +++
 js/src/jit/arm/Lowering-arm.h                 |  1 +
 .../jit/shared/CodeGenerator-x86-shared.cpp   | 52 ++++++++++---------
 js/src/jit/shared/CodeGenerator-x86-shared.h  |  3 +-
 js/src/jit/shared/LIR-x86-shared.h            | 41 +++++++++++++++
 js/src/jit/shared/Lowering-x86-shared.cpp     | 18 +++++++
 js/src/jit/shared/Lowering-x86-shared.h       |  1 +
 js/src/jit/x64/LOpcodes-x64.h                 |  2 +
 js/src/jit/x86/LOpcodes-x86.h                 |  2 +
 14 files changed, 100 insertions(+), 59 deletions(-)

diff --git a/js/src/jit/LIR-Common.h b/js/src/jit/LIR-Common.h
index 14241c7cef93..87310fff569c 100644
--- a/js/src/jit/LIR-Common.h
+++ b/js/src/jit/LIR-Common.h
@@ -128,25 +128,6 @@ class LMoveGroup : public LInstructionHelper<0, 0, 0>
     }
 };
 
-// Constructs a SIMD value with 4 components (e.g. int32x4, float32x4).
-class LSimdValueX4 : public LInstructionHelper<1, 4, 0>
-{
-  public:
-    LIR_HEADER(SimdValueX4)
-    LSimdValueX4(const LAllocation &x, const LAllocation &y,
-                 const LAllocation &z, const LAllocation &w)
-    {
-        setOperand(0, x);
-        setOperand(1, y);
-        setOperand(2, z);
-        setOperand(3, w);
-    }
-
-    MSimdValueX4 *mir() const {
-        return mir_->toSimdValueX4();
-    }
-};
-
 // Constructs a SIMD value with 4 equal components (e.g. int32x4, float32x4).
 class LSimdSplatX4 : public LInstructionHelper<1, 1, 0>
 {
diff --git a/js/src/jit/LOpcodes.h b/js/src/jit/LOpcodes.h
index ec62d0f71491..726b3df53b24 100644
--- a/js/src/jit/LOpcodes.h
+++ b/js/src/jit/LOpcodes.h
@@ -16,7 +16,6 @@
     _(Pointer)                      \
     _(Double)                       \
     _(Float32)                      \
-    _(SimdValueX4)                  \
     _(SimdSplatX4)                  \
     _(Int32x4)                      \
     _(Float32x4)                    \
diff --git a/js/src/jit/Lowering.cpp b/js/src/jit/Lowering.cpp
index 278b4b32b20e..607f12177c3f 100644
--- a/js/src/jit/Lowering.cpp
+++ b/js/src/jit/Lowering.cpp
@@ -3686,17 +3686,6 @@ LIRGenerator::visitRecompileCheck(MRecompileCheck *ins)
     return assignSafepoint(lir, ins);
 }
 
-bool
-LIRGenerator::visitSimdValueX4(MSimdValueX4 *ins)
-{
-    LAllocation x = useRegisterAtStart(ins->getOperand(0));
-    LAllocation y = useRegisterAtStart(ins->getOperand(1));
-    LAllocation z = useRegisterAtStart(ins->getOperand(2));
-    LAllocation w = useRegisterAtStart(ins->getOperand(3));
-
-    return define(new(alloc()) LSimdValueX4(x, y, z, w), ins);
-}
-
 bool
 LIRGenerator::visitSimdConstant(MSimdConstant *ins)
 {
diff --git a/js/src/jit/Lowering.h b/js/src/jit/Lowering.h
index ff71270b9a02..3f1d30a7e98b 100644
--- a/js/src/jit/Lowering.h
+++ b/js/src/jit/Lowering.h
@@ -273,7 +273,6 @@ class LIRGenerator : public LIRGeneratorSpecific
     bool visitSimdBinaryComp(MSimdBinaryComp *ins);
     bool visitSimdBinaryArith(MSimdBinaryArith *ins);
     bool visitSimdBinaryBitwise(MSimdBinaryBitwise *ins);
-    bool visitSimdValueX4(MSimdValueX4 *ins);
     bool visitSimdConstant(MSimdConstant *ins);
     bool visitPhi(MPhi *ins);
     bool visitBeta(MBeta *ins);
diff --git a/js/src/jit/arm/CodeGenerator-arm.h b/js/src/jit/arm/CodeGenerator-arm.h
index d730b5331d22..76ad584bff5e 100644
--- a/js/src/jit/arm/CodeGenerator-arm.h
+++ b/js/src/jit/arm/CodeGenerator-arm.h
@@ -229,7 +229,6 @@ class CodeGeneratorARM : public CodeGeneratorShared
 
   public:
     // Unimplemented SIMD instructions
-    bool visitSimdValueX4(LSimdValueX4 *lir) { MOZ_CRASH("NYI"); }
     bool visitSimdSplatX4(LSimdSplatX4 *lir) { MOZ_CRASH("NYI"); }
     bool visitInt32x4(LInt32x4 *ins) { MOZ_CRASH("NYI"); }
     bool visitFloat32x4(LFloat32x4 *ins) { MOZ_CRASH("NYI"); }
diff --git a/js/src/jit/arm/Lowering-arm.cpp b/js/src/jit/arm/Lowering-arm.cpp
index 498543335c63..467d0508a227 100644
--- a/js/src/jit/arm/Lowering-arm.cpp
+++ b/js/src/jit/arm/Lowering-arm.cpp
@@ -561,4 +561,10 @@ LIRGeneratorARM::visitSimdSplatX4(MSimdSplatX4 *ins)
     MOZ_CRASH("NYI");
 }
 
+bool
+LIRGeneratorARM::visitSimdValueX4(MSimdValueX4 *ins)
+{
+    MOZ_CRASH("NYI");
+}
+
 //__aeabi_uidiv
diff --git a/js/src/jit/arm/Lowering-arm.h b/js/src/jit/arm/Lowering-arm.h
index 94d466633f5c..b618f95f8dee 100644
--- a/js/src/jit/arm/Lowering-arm.h
+++ b/js/src/jit/arm/Lowering-arm.h
@@ -93,6 +93,7 @@ class LIRGeneratorARM : public LIRGeneratorShared
     bool visitForkJoinGetSlice(MForkJoinGetSlice *ins);
     bool visitSimdTernaryBitwise(MSimdTernaryBitwise *ins);
     bool visitSimdSplatX4(MSimdSplatX4 *ins);
+    bool visitSimdValueX4(MSimdValueX4 *ins);
 };
 
 typedef LIRGeneratorARM LIRGeneratorSpecific;
diff --git a/js/src/jit/shared/CodeGenerator-x86-shared.cpp b/js/src/jit/shared/CodeGenerator-x86-shared.cpp
index 5ea3a54d9479..9d68544397c8 100644
--- a/js/src/jit/shared/CodeGenerator-x86-shared.cpp
+++ b/js/src/jit/shared/CodeGenerator-x86-shared.cpp
@@ -2119,40 +2119,42 @@ CodeGeneratorX86Shared::visitFloat32x4(LFloat32x4 *ins)
 }
 
 bool
-CodeGeneratorX86Shared::visitSimdValueX4(LSimdValueX4 *ins)
+CodeGeneratorX86Shared::visitSimdValueInt32x4(LSimdValueInt32x4 *ins)
 {
-    FloatRegister output = ToFloatRegister(ins->output());
-
     MSimdValueX4 *mir = ins->mir();
-    JS_ASSERT(IsSimdType(mir->type()));
-    JS_STATIC_ASSERT(sizeof(float) == sizeof(int32_t));
+    MOZ_ASSERT(mir->type() == MIRType_Int32x4);
 
-    masm.reserveStack(Simd128DataSize);
     // TODO see bug 1051860 for possible optimizations.
-    switch (mir->type()) {
-      case MIRType_Int32x4: {
-        for (size_t i = 0; i < 4; ++i) {
-            Register r = ToRegister(ins->getOperand(i));
-            masm.store32(r, Address(StackPointer, i * sizeof(int32_t)));
-        }
-        masm.loadAlignedInt32x4(Address(StackPointer, 0), output);
-        break;
-      }
-      case MIRType_Float32x4: {
-        for (size_t i = 0; i < 4; ++i) {
-            FloatRegister r = ToFloatRegister(ins->getOperand(i));
-            masm.storeFloat32(r, Address(StackPointer, i * sizeof(float)));
-        }
-        masm.loadAlignedFloat32x4(Address(StackPointer, 0), output);
-        break;
-      }
-      default: MOZ_CRASH("Unknown SIMD kind");
+    masm.reserveStack(Simd128DataSize);
+    for (size_t i = 0; i < 4; ++i) {
+        Register r = ToRegister(ins->getOperand(i));
+        masm.store32(r, Address(StackPointer, i * sizeof(int32_t)));
     }
-
+    masm.loadAlignedInt32x4(Address(StackPointer, 0), ToFloatRegister(ins->output()));
     masm.freeStack(Simd128DataSize);
     return true;
 }
 
+bool
+CodeGeneratorX86Shared::visitSimdValueFloat32x4(LSimdValueFloat32x4 *ins)
+{
+    MSimdValueX4 *mir = ins->mir();
+    MOZ_ASSERT(mir->type() == MIRType_Float32x4);
+
+    FloatRegister output = ToFloatRegister(ins->output());
+    FloatRegister r0 = ToFloatRegister(ins->getOperand(0));
+    MOZ_ASSERT(r0 == output); // defineReuseInput(0)
+
+    FloatRegister r1 = ToFloatRegister(ins->getTemp(0));
+    FloatRegister r2 = ToFloatRegister(ins->getOperand(2));
+    FloatRegister r3 = ToFloatRegister(ins->getOperand(3));
+
+    masm.unpcklps(r3, r1);
+    masm.unpcklps(r2, r0);
+    masm.unpcklps(r1, r0);
+    return true;
+}
+
 bool
 CodeGeneratorX86Shared::visitSimdSplatX4(LSimdSplatX4 *ins)
 {
diff --git a/js/src/jit/shared/CodeGenerator-x86-shared.h b/js/src/jit/shared/CodeGenerator-x86-shared.h
index 46fa417f4cee..f0e1cd1e89d0 100644
--- a/js/src/jit/shared/CodeGenerator-x86-shared.h
+++ b/js/src/jit/shared/CodeGenerator-x86-shared.h
@@ -206,7 +206,8 @@ class CodeGeneratorX86Shared : public CodeGeneratorShared
     bool visitNegF(LNegF *lir);
 
     // SIMD operators
-    bool visitSimdValueX4(LSimdValueX4 *lir);
+    bool visitSimdValueInt32x4(LSimdValueInt32x4 *lir);
+    bool visitSimdValueFloat32x4(LSimdValueFloat32x4 *lir);
     bool visitSimdSplatX4(LSimdSplatX4 *lir);
     bool visitInt32x4(LInt32x4 *ins);
     bool visitFloat32x4(LFloat32x4 *ins);
diff --git a/js/src/jit/shared/LIR-x86-shared.h b/js/src/jit/shared/LIR-x86-shared.h
index e6593f9584f4..ff6b8146007d 100644
--- a/js/src/jit/shared/LIR-x86-shared.h
+++ b/js/src/jit/shared/LIR-x86-shared.h
@@ -320,6 +320,47 @@ class LMulI : public LBinaryMath<0, 1>
     }
 };
 
+// Constructs an int32x4 SIMD value.
+class LSimdValueInt32x4 : public LInstructionHelper<1, 4, 0>
+{
+  public:
+    LIR_HEADER(SimdValueInt32x4)
+    LSimdValueInt32x4(const LAllocation &x, const LAllocation &y,
+                      const LAllocation &z, const LAllocation &w)
+    {
+        setOperand(0, x);
+        setOperand(1, y);
+        setOperand(2, z);
+        setOperand(3, w);
+    }
+
+    MSimdValueX4 *mir() const {
+        return mir_->toSimdValueX4();
+    }
+};
+
+// Constructs a float32x4 SIMD value, optimized for x86 family
+class LSimdValueFloat32x4 : public LInstructionHelper<1, 4, 1>
+{
+  public:
+    LIR_HEADER(SimdValueFloat32x4)
+    LSimdValueFloat32x4(const LAllocation &x, const LAllocation &y,
+                        const LAllocation &z, const LAllocation &w,
+                        const LDefinition &copyY)
+    {
+        setOperand(0, x);
+        setOperand(1, y);
+        setOperand(2, z);
+        setOperand(3, w);
+
+        setTemp(0, copyY);
+    }
+
+    MSimdValueX4 *mir() const {
+        return mir_->toSimdValueX4();
+    }
+};
+
 } // namespace jit
 } // namespace js
 
diff --git a/js/src/jit/shared/Lowering-x86-shared.cpp b/js/src/jit/shared/Lowering-x86-shared.cpp
index a718b9b6b933..ada867b25a65 100644
--- a/js/src/jit/shared/Lowering-x86-shared.cpp
+++ b/js/src/jit/shared/Lowering-x86-shared.cpp
@@ -347,3 +347,21 @@ LIRGeneratorX86Shared::visitSimdSplatX4(MSimdSplatX4 *ins)
         MOZ_CRASH("Unknown SIMD kind");
     }
 }
+
+
+bool
+LIRGeneratorX86Shared::visitSimdValueX4(MSimdValueX4 *ins)
+{
+    LAllocation x = useRegisterAtStart(ins->getOperand(0));
+    LAllocation y = useRegisterAtStart(ins->getOperand(1));
+    LAllocation z = useRegisterAtStart(ins->getOperand(2));
+    LAllocation w = useRegisterAtStart(ins->getOperand(3));
+
+    LDefinition copyY = tempCopy(ins->getOperand(1), 1);
+
+    if (ins->type() == MIRType_Float32x4)
+        return defineReuseInput(new (alloc()) LSimdValueFloat32x4(x, y, z, w, copyY), ins, 0);
+
+    MOZ_ASSERT(ins->type() == MIRType_Int32x4);
+    return define(new(alloc()) LSimdValueInt32x4(x, y, z, w), ins);
+}
diff --git a/js/src/jit/shared/Lowering-x86-shared.h b/js/src/jit/shared/Lowering-x86-shared.h
index 1b0aa4cef6e2..02f8688be39e 100644
--- a/js/src/jit/shared/Lowering-x86-shared.h
+++ b/js/src/jit/shared/Lowering-x86-shared.h
@@ -50,6 +50,7 @@ class LIRGeneratorX86Shared : public LIRGeneratorShared
     bool visitForkJoinGetSlice(MForkJoinGetSlice *ins);
     bool visitSimdTernaryBitwise(MSimdTernaryBitwise *ins);
     bool visitSimdSplatX4(MSimdSplatX4 *ins);
+    bool visitSimdValueX4(MSimdValueX4 *ins);
 };
 
 } // namespace jit
diff --git a/js/src/jit/x64/LOpcodes-x64.h b/js/src/jit/x64/LOpcodes-x64.h
index 2fe6354653b4..5dd72392f845 100644
--- a/js/src/jit/x64/LOpcodes-x64.h
+++ b/js/src/jit/x64/LOpcodes-x64.h
@@ -20,6 +20,8 @@
     _(AsmJSUInt32ToDouble)          \
     _(AsmJSUInt32ToFloat32)         \
     _(AsmJSLoadFuncPtr)             \
+    _(SimdValueInt32x4)             \
+    _(SimdValueFloat32x4)           \
     _(UDivOrMod)
 
 #endif /* jit_x64_LOpcodes_x64_h */
diff --git a/js/src/jit/x86/LOpcodes-x86.h b/js/src/jit/x86/LOpcodes-x86.h
index 0d8abb06f04d..dde30c0bc0c6 100644
--- a/js/src/jit/x86/LOpcodes-x86.h
+++ b/js/src/jit/x86/LOpcodes-x86.h
@@ -21,6 +21,8 @@
     _(AsmJSUInt32ToDouble)      \
     _(AsmJSUInt32ToFloat32)     \
     _(AsmJSLoadFuncPtr)         \
+    _(SimdValueInt32x4)         \
+    _(SimdValueFloat32x4)       \
     _(UDivOrMod)
 
 #endif /* jit_x86_LOpcodes_x86_h */

From 23129a5ddc2002a3fbea9277463af8b79bac205b Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <benj@benj.me>
Date: Thu, 11 Sep 2014 08:50:49 +0200
Subject: [PATCH 103/109] Bug 1051860: Optimize SimdValueX4 codegen for int32x4
 when SSE4.1 is available; r=sunfish

--HG--
extra : rebase_source : 3feb3d19834f6c356bb114ee8b19a283467dff34
---
 js/src/jit/shared/Assembler-x86-shared.h      | 10 ++++----
 js/src/jit/shared/BaseAssembler-x86-shared.h  | 24 ++++++++++---------
 .../jit/shared/CodeGenerator-x86-shared.cpp   | 13 ++++++++--
 js/src/jit/x86/MacroAssembler-x86.h           |  4 ++--
 4 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/js/src/jit/shared/Assembler-x86-shared.h b/js/src/jit/shared/Assembler-x86-shared.h
index 8acc2b2b67c9..46639adf2351 100644
--- a/js/src/jit/shared/Assembler-x86-shared.h
+++ b/js/src/jit/shared/Assembler-x86-shared.h
@@ -1411,18 +1411,18 @@ class AssemblerX86Shared : public AssemblerShared
         JS_ASSERT(HasSSE2());
         masm.unpcklps_rr(src.code(), dest.code());
     }
-    void pinsrd(Register src, FloatRegister dest) {
+    void pinsrd(unsigned lane, Register src, FloatRegister dest) {
         JS_ASSERT(HasSSE2());
-        masm.pinsrd_rr(src.code(), dest.code());
+        masm.pinsrd_irr(lane, src.code(), dest.code());
     }
-    void pinsrd(const Operand &src, FloatRegister dest) {
+    void pinsrd(unsigned lane, const Operand &src, FloatRegister dest) {
         JS_ASSERT(HasSSE2());
         switch (src.kind()) {
           case Operand::REG:
-            masm.pinsrd_rr(src.reg(), dest.code());
+            masm.pinsrd_irr(lane, src.reg(), dest.code());
             break;
           case Operand::MEM_REG_DISP:
-            masm.pinsrd_mr(src.disp(), src.base(), dest.code());
+            masm.pinsrd_imr(lane, src.disp(), src.base(), dest.code());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
diff --git a/js/src/jit/shared/BaseAssembler-x86-shared.h b/js/src/jit/shared/BaseAssembler-x86-shared.h
index 5ca53ffb192e..d35720396ff5 100644
--- a/js/src/jit/shared/BaseAssembler-x86-shared.h
+++ b/js/src/jit/shared/BaseAssembler-x86-shared.h
@@ -348,7 +348,7 @@ private:
         OP3_ROUNDSS_VsdWsd  = 0x0A,
         OP3_ROUNDSD_VsdWsd  = 0x0B,
         OP3_PTEST_VdVd      = 0x17,
-        OP3_PINSRD_VsdWsd   = 0x22
+        OP3_PINSRD_VdqEdIb  = 0x22
     } ThreeByteOpcodeID;
 
     typedef enum {
@@ -3562,23 +3562,25 @@ public:
         m_formatter.immediate8(mode); // modes are the same for roundsd and roundss
     }
 
-    void pinsrd_rr(RegisterID src, XMMRegisterID dst)
+    void pinsrd_irr(unsigned lane, RegisterID src, XMMRegisterID dst)
     {
-        spew("pinsrd     $1, %s, %s",
-             nameIReg(src), nameFPReg(dst));
+        MOZ_ASSERT(lane < 4);
+        spew("pinsrd     $%u, %s, %s",
+             lane, nameIReg(src), nameFPReg(dst));
         m_formatter.prefix(PRE_SSE_66);
-        m_formatter.threeByteOp(OP3_PINSRD_VsdWsd, ESCAPE_PINSRD, (RegisterID)dst, (RegisterID)src);
-        m_formatter.immediate8(0x01); // the $1
+        m_formatter.threeByteOp(OP3_PINSRD_VdqEdIb, ESCAPE_PINSRD, (RegisterID)dst, (RegisterID)src);
+        m_formatter.immediate8(uint8_t(lane));
     }
 
-    void pinsrd_mr(int offset, RegisterID base, XMMRegisterID dst)
+    void pinsrd_imr(unsigned lane, int offset, RegisterID base, XMMRegisterID dst)
     {
-        spew("pinsrd     $1, %s0x%x(%s), %s",
-             PRETTY_PRINT_OFFSET(offset),
+        MOZ_ASSERT(lane < 4);
+        spew("pinsrd     $%u, %s0x%x(%s), %s",
+             lane, PRETTY_PRINT_OFFSET(offset),
              nameIReg(base), nameFPReg(dst));
         m_formatter.prefix(PRE_SSE_66);
-        m_formatter.threeByteOp(OP3_PINSRD_VsdWsd, ESCAPE_PINSRD, (RegisterID)dst, base, offset);
-        m_formatter.immediate8(0x01); // the $1
+        m_formatter.threeByteOp(OP3_PINSRD_VdqEdIb, ESCAPE_PINSRD, (RegisterID)dst, base, offset);
+        m_formatter.immediate8(uint8_t(lane));
     }
 
     void minsd_rr(XMMRegisterID src, XMMRegisterID dst)
diff --git a/js/src/jit/shared/CodeGenerator-x86-shared.cpp b/js/src/jit/shared/CodeGenerator-x86-shared.cpp
index 9d68544397c8..d0eb7d5399b7 100644
--- a/js/src/jit/shared/CodeGenerator-x86-shared.cpp
+++ b/js/src/jit/shared/CodeGenerator-x86-shared.cpp
@@ -2124,13 +2124,22 @@ CodeGeneratorX86Shared::visitSimdValueInt32x4(LSimdValueInt32x4 *ins)
     MSimdValueX4 *mir = ins->mir();
     MOZ_ASSERT(mir->type() == MIRType_Int32x4);
 
-    // TODO see bug 1051860 for possible optimizations.
+    FloatRegister output = ToFloatRegister(ins->output());
+    if (AssemblerX86Shared::HasSSE41()) {
+        masm.movd(ToRegister(ins->getOperand(0)), output);
+        for (size_t i = 1; i < 4; ++i) {
+            Register r = ToRegister(ins->getOperand(i));
+            masm.pinsrd(i, r, output);
+        }
+        return true;
+    }
+
     masm.reserveStack(Simd128DataSize);
     for (size_t i = 0; i < 4; ++i) {
         Register r = ToRegister(ins->getOperand(i));
         masm.store32(r, Address(StackPointer, i * sizeof(int32_t)));
     }
-    masm.loadAlignedInt32x4(Address(StackPointer, 0), ToFloatRegister(ins->output()));
+    masm.loadAlignedInt32x4(Address(StackPointer, 0), output);
     masm.freeStack(Simd128DataSize);
     return true;
 }
diff --git a/js/src/jit/x86/MacroAssembler-x86.h b/js/src/jit/x86/MacroAssembler-x86.h
index 6ab8afc1c53d..152de502c3cd 100644
--- a/js/src/jit/x86/MacroAssembler-x86.h
+++ b/js/src/jit/x86/MacroAssembler-x86.h
@@ -856,7 +856,7 @@ class MacroAssemblerX86 : public MacroAssemblerX86Shared
         JS_ASSERT(dest != ScratchDoubleReg);
         if (Assembler::HasSSE41()) {
             movd(src.payloadReg(), dest);
-            pinsrd(src.typeReg(), dest);
+            pinsrd(1, src.typeReg(), dest);
         } else {
             movd(src.payloadReg(), dest);
             movd(src.typeReg(), ScratchDoubleReg);
@@ -870,7 +870,7 @@ class MacroAssemblerX86 : public MacroAssemblerX86Shared
             movl(payload, scratch);
             movd(scratch, dest);
             movl(type, scratch);
-            pinsrd(scratch, dest);
+            pinsrd(1, scratch, dest);
         } else {
             movl(payload, scratch);
             movd(scratch, dest);

From 93e59c8bd570980bd92667f9cb1b1c55b7570c39 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 07:57:38 +0100
Subject: [PATCH 104/109] Bug 1064084, part 1 - Convert all consumers of
 gfxContext::Translate() to use gfxContext::SetMatrix()/Multiply(). r=Bas

---
 .../webrtc/MediaEngineTabVideoSource.cpp      |  6 ++--
 dom/canvas/CanvasRenderingContext2D.cpp       |  7 ++--
 dom/plugins/base/nsPluginInstanceOwner.cpp    |  3 +-
 gfx/layers/basic/BasicThebesLayer.cpp         |  2 +-
 .../client/SimpleTiledContentClient.cpp       |  5 +--
 gfx/layers/client/TiledContentClient.cpp      | 11 ++++---
 gfx/layers/d3d10/ReadbackManagerD3D10.cpp     |  3 +-
 gfx/layers/d3d10/ThebesLayerD3D10.cpp         |  3 +-
 gfx/layers/d3d9/ThebesLayerD3D9.cpp           |  4 +--
 gfx/thebes/gfxBlur.cpp                        |  2 +-
 gfx/thebes/gfxContext.cpp                     |  7 ----
 gfx/thebes/gfxContext.h                       |  6 ----
 gfx/thebes/gfxFont.cpp                        |  5 +--
 gfx/thebes/gfxFontMissingGlyphs.cpp           |  4 +--
 gfx/thebes/gfxWindowsNativeDrawing.cpp        |  3 +-
 layout/base/FrameLayerBuilder.cpp             | 10 +++---
 layout/base/nsCSSRendering.cpp                |  3 +-
 layout/base/nsPresShell.cpp                   |  9 +++---
 layout/generic/nsCanvasFrame.cpp              |  3 +-
 layout/generic/nsObjectFrame.cpp              |  3 +-
 layout/mathml/nsMathMLChar.cpp                | 18 ++++++-----
 layout/svg/nsFilterInstance.cpp               | 32 ++++++++-----------
 widget/android/AndroidBridge.cpp              |  6 ++--
 23 files changed, 77 insertions(+), 78 deletions(-)

diff --git a/content/media/webrtc/MediaEngineTabVideoSource.cpp b/content/media/webrtc/MediaEngineTabVideoSource.cpp
index 7bd5cd995c34..e63895afe5be 100644
--- a/content/media/webrtc/MediaEngineTabVideoSource.cpp
+++ b/content/media/webrtc/MediaEngineTabVideoSource.cpp
@@ -307,9 +307,9 @@ MediaEngineTabVideoSource::Draw() {
     return;
   }
   nsRefPtr<gfxContext> context = new gfxContext(dt);
-  gfxPoint pt(0, 0);
-  context->Translate(pt);
-  context->Scale(scale * size.width / srcW, scale * size.height / srcH);
+  context->SetMatrix(
+    context->CurrentMatrix().Scale(scale * size.width / srcW,
+                                   scale * size.height / srcH));
   rv = presShell->RenderDocument(r, renderDocFlags, bgColor, context);
 
   NS_ENSURE_SUCCESS_VOID(rv);
diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
index 909b7669ffe0..35e1a4d40b56 100644
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -3520,9 +3520,10 @@ CanvasRenderingContext2D::DrawDirectlyToCanvas(
   src.Scale(scale.width, scale.height);
 
   nsRefPtr<gfxContext> context = new gfxContext(tempTarget);
-  context->SetMatrix(contextMatrix);
-  context->Scale(1.0 / contextScale.width, 1.0 / contextScale.height);
-  context->Translate(gfxPoint(dest.x - src.x, dest.y - src.y));
+  context->SetMatrix(contextMatrix.
+                       Scale(1.0 / contextScale.width,
+                             1.0 / contextScale.height).
+                       Translate(dest.x - src.x, dest.y - src.y));
 
   // FLAG_CLAMP is added for increased performance, since we never tile here.
   uint32_t modifiedFlags = image.mDrawingFlags | imgIContainer::FLAG_CLAMP;
diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp
index c32c55c346e0..23b1ee43f07e 100644
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -2172,7 +2172,8 @@ void nsPluginInstanceOwner::Paint(gfxContext* aContext,
 
   // Renderer::Draw() draws a rectangle with top-left at the aContext origin.
   gfxContextAutoSaveRestore autoSR(aContext);
-  aContext->Translate(pluginRect.TopLeft());
+  aContext->SetMatrix(
+    aContext->CurrentMatrix().Translate(pluginRect.TopLeft()));
 
   Renderer renderer(window, this, pluginSize, pluginDirtyRect);
 
diff --git a/gfx/layers/basic/BasicThebesLayer.cpp b/gfx/layers/basic/BasicThebesLayer.cpp
index f50ad896d844..6db2bd7006d1 100644
--- a/gfx/layers/basic/BasicThebesLayer.cpp
+++ b/gfx/layers/basic/BasicThebesLayer.cpp
@@ -209,7 +209,7 @@ BasicThebesLayer::Validate(LayerManager::DrawThebesLayerCallback aCallback,
     if (ctx) {
       NS_ASSERTION(GetEffectiveOpacity() == 1.0, "Should only read back opaque layers");
       NS_ASSERTION(!GetMaskLayer(), "Should only read back layers without masks");
-      ctx->Translate(gfxPoint(offset.x, offset.y));
+      ctx->SetMatrix(ctx->CurrentMatrix().Translate(offset.x, offset.y));
       mContentClient->DrawTo(this, ctx->GetDrawTarget(), 1.0,
                              CompositionOpForOp(ctx->CurrentOperator()),
                              nullptr, nullptr);
diff --git a/gfx/layers/client/SimpleTiledContentClient.cpp b/gfx/layers/client/SimpleTiledContentClient.cpp
index f15e5658fbd2..23e86d9c93f9 100644
--- a/gfx/layers/client/SimpleTiledContentClient.cpp
+++ b/gfx/layers/client/SimpleTiledContentClient.cpp
@@ -163,8 +163,9 @@ SimpleTiledLayerBuffer::ValidateTile(SimpleTiledLayerTile aTile,
   // do the drawing
   RefPtr<gfxContext> ctxt = new gfxContext(drawTarget);
 
-  ctxt->Scale(mResolution, mResolution);
-  ctxt->Translate(gfxPoint(-aTileOrigin.x, -aTileOrigin.y));
+  ctxt->SetMatrix(
+    ctxt->CurrentMatrix().Scale(mResolution, mResolution).
+                          Translate(-aTileOrigin.x, -aTileOrigin.y));
 
   mCallback(mThebesLayer, ctxt,
             drawRegion,
diff --git a/gfx/layers/client/TiledContentClient.cpp b/gfx/layers/client/TiledContentClient.cpp
index bc852c3622d7..6e974dc52605 100644
--- a/gfx/layers/client/TiledContentClient.cpp
+++ b/gfx/layers/client/TiledContentClient.cpp
@@ -929,8 +929,9 @@ ClientTiledLayerBuffer::PaintThebes(const nsIntRegion& aNewValidRegion,
       mSinglePaintBufferOffset = nsIntPoint(bounds.x, bounds.y);
     }
     ctxt->NewPath();
-    ctxt->Scale(mResolution, mResolution);
-    ctxt->Translate(gfxPoint(-bounds.x, -bounds.y));
+    ctxt->SetMatrix(
+      ctxt->CurrentMatrix().Scale(mResolution, mResolution).
+                            Translate(-bounds.x, -bounds.y));
 #ifdef GFX_TILEDLAYER_PREF_WARNINGS
     if (PR_IntervalNow() - start > 3) {
       printf_stderr("Slow alloc %i\n", PR_IntervalNow() - start);
@@ -1300,8 +1301,10 @@ ClientTiledLayerBuffer::ValidateTile(TileClient aTile,
 
     ctxt->NewPath();
     ctxt->Clip(gfxRect(bounds.x, bounds.y, bounds.width, bounds.height));
-    ctxt->Translate(gfxPoint(-unscaledTileOrigin.x, -unscaledTileOrigin.y));
-    ctxt->Scale(mResolution, mResolution);
+    ctxt->SetMatrix(
+      ctxt->CurrentMatrix().Translate(-unscaledTileOrigin.x,
+                                      -unscaledTileOrigin.y).
+                            Scale(mResolution, mResolution));
     mCallback(mThebesLayer, ctxt,
               tileRegion.GetBounds(),
               DrawRegionClip::CLIP_NONE,
diff --git a/gfx/layers/d3d10/ReadbackManagerD3D10.cpp b/gfx/layers/d3d10/ReadbackManagerD3D10.cpp
index 78a05f3ca167..c8e32d8b3625 100644
--- a/gfx/layers/d3d10/ReadbackManagerD3D10.cpp
+++ b/gfx/layers/d3d10/ReadbackManagerD3D10.cpp
@@ -80,7 +80,8 @@ public:
                                              update->mSequenceCounter);
 
     if (ctx) {
-      ctx->Translate(gfxPoint(offset.x, offset.y));
+      ctx->SetMatrix(
+        ctx->CurrentMatrix().Translate(offset.x, offset.y));
       ctx->SetSource(sourceSurface, gfxPoint(mTask->mOrigin.x,
                                              mTask->mOrigin.y));
       ctx->Paint();
diff --git a/gfx/layers/d3d10/ThebesLayerD3D10.cpp b/gfx/layers/d3d10/ThebesLayerD3D10.cpp
index 3b7b2578043d..3b4d8b5132f2 100644
--- a/gfx/layers/d3d10/ThebesLayerD3D10.cpp
+++ b/gfx/layers/d3d10/ThebesLayerD3D10.cpp
@@ -396,7 +396,8 @@ ThebesLayerD3D10::DrawRegion(nsIntRegion &aRegion, SurfaceMode aMode)
 
   nsRefPtr<gfxContext> context = new gfxContext(mDrawTarget);
 
-  context->Translate(gfxPoint(-visibleRect.x, -visibleRect.y));
+  context->SetMatrix(
+    context->CurrentMatrix().Translate(-visibleRect.x, -visibleRect.y));
   if (aMode == SurfaceMode::SURFACE_SINGLE_CHANNEL_ALPHA) {
     nsIntRegionRectIterator iter(aRegion);
     const nsIntRect *iterRect;
diff --git a/gfx/layers/d3d9/ThebesLayerD3D9.cpp b/gfx/layers/d3d9/ThebesLayerD3D9.cpp
index b657aae9d12b..35c02b0989c8 100644
--- a/gfx/layers/d3d9/ThebesLayerD3D9.cpp
+++ b/gfx/layers/d3d9/ThebesLayerD3D9.cpp
@@ -535,7 +535,7 @@ ThebesLayerD3D9::DrawRegion(nsIntRegion &aRegion, SurfaceMode aMode,
 
   nsRefPtr<gfxContext> context = new gfxContext(dt);
 
-  context->Translate(gfxPoint(-bounds.x, -bounds.y));
+  context->SetMatrix(context->CurrentMatrix().Translate(-bounds.x, -bounds.y));
   LayerManagerD3D9::CallbackInfo cbInfo = mD3DManager->GetCallbackInfo();
   cbInfo.Callback(this, context, aRegion, DrawRegionClip::CLIP_NONE, nsIntRegion(), cbInfo.CallbackData);
 
@@ -548,7 +548,7 @@ ThebesLayerD3D9::DrawRegion(nsIntRegion &aRegion, SurfaceMode aMode,
         update.mLayer->GetSink()->BeginUpdate(update.mUpdateRect + offset,
                                               update.mSequenceCounter);
     if (ctx) {
-      ctx->Translate(gfxPoint(offset.x, offset.y));
+      ctx->SetMatrix(ctx->CurrentMatrix().Translate(offset.x, offset.y));
       ctx->SetSource(destinationSurface, gfxPoint(bounds.x, bounds.y));
       ctx->Paint();
       update.mLayer->GetSink()->EndUpdate(ctx, update.mUpdateRect + offset);
diff --git a/gfx/thebes/gfxBlur.cpp b/gfx/thebes/gfxBlur.cpp
index 046ce0b5b985..9119f01e68c7 100644
--- a/gfx/thebes/gfxBlur.cpp
+++ b/gfx/thebes/gfxBlur.cpp
@@ -75,7 +75,7 @@ gfxAlphaBoxBlur::Init(const gfxRect& aRect,
     gfxPoint topleft(irect.TopLeft().x, irect.TopLeft().y);
 
     mContext = new gfxContext(dt);
-    mContext->Translate(-topleft);
+    mContext->SetMatrix(gfxMatrix::Translation(-topleft));
 
     return mContext;
 }
diff --git a/gfx/thebes/gfxContext.cpp b/gfx/thebes/gfxContext.cpp
index 1f76b575e4e4..26ca6e4be7df 100644
--- a/gfx/thebes/gfxContext.cpp
+++ b/gfx/thebes/gfxContext.cpp
@@ -430,13 +430,6 @@ gfxContext::DrawSurface(gfxASurface *surface, const gfxSize& size)
 }
 
 // transform stuff
-void
-gfxContext::Translate(const gfxPoint& pt)
-{
-  Matrix newMatrix = mTransform;
-  ChangeTransform(newMatrix.PreTranslate(Float(pt.x), Float(pt.y)));
-}
-
 void
 gfxContext::Scale(gfxFloat x, gfxFloat y)
 {
diff --git a/gfx/thebes/gfxContext.h b/gfx/thebes/gfxContext.h
index 5758c2cbbb4a..c20ac42b9791 100644
--- a/gfx/thebes/gfxContext.h
+++ b/gfx/thebes/gfxContext.h
@@ -239,12 +239,6 @@ public:
      ** Transformation Matrix manipulation
      **/
 
-    /**
-     * Adds a translation to the current matrix. This translation takes place
-     * before the previously set transformations.
-     */
-    void Translate(const gfxPoint& pt);
-
     /**
      * Adds a scale to the current matrix. This scaling takes place before the
      * previously set transformations.
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
index a15d1b430ea1..e097520dce6c 100644
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -3577,8 +3577,9 @@ gfxFont::RenderSVGGlyph(gfxContext *aContext, gfxPoint aPoint, DrawMode aDrawMod
         GetAdjustedSize() / GetFontEntry()->UnitsPerEm();
     gfxContextMatrixAutoSaveRestore matrixRestore(aContext);
 
-    aContext->Translate(gfxPoint(aPoint.x, aPoint.y));
-    aContext->Scale(devUnitsPerSVGUnit, devUnitsPerSVGUnit);
+    aContext->SetMatrix(
+      aContext->CurrentMatrix().Translate(aPoint.x, aPoint.y).
+                                Scale(devUnitsPerSVGUnit, devUnitsPerSVGUnit));
 
     aContextPaint->InitStrokeGeometry(aContext, devUnitsPerSVGUnit);
 
diff --git a/gfx/thebes/gfxFontMissingGlyphs.cpp b/gfx/thebes/gfxFontMissingGlyphs.cpp
index 03d96db32a84..9fe76334eafb 100644
--- a/gfx/thebes/gfxFontMissingGlyphs.cpp
+++ b/gfx/thebes/gfxFontMissingGlyphs.cpp
@@ -214,13 +214,13 @@ gfxFontMissingGlyphs::DrawMissingGlyph(gfxContext    *aContext,
     gfxFloat halfGap = HEX_CHAR_GAP / 2.0;
     gfxFloat top = -(MINIFONT_HEIGHT + halfGap);
     aContext->SetDeviceColor(currentColor);
-    aContext->Translate(center);
     // We always want integer scaling, otherwise the "bitmap" glyphs will look
     // even uglier than usual when zoomed
     int32_t scale =
         std::max<int32_t>(1, nsDeviceContext::AppUnitsPerCSSPixel() /
                              aAppUnitsPerDevPixel);
-    aContext->Scale(gfxFloat(scale), gfxFloat(scale));
+    aContext->SetMatrix(
+      aContext->CurrentMatrix().Translate(center).Scale(scale, scale));
     if (aChar < 0x10000) {
         if (aRect.Width() >= 2 * (MINIFONT_WIDTH + HEX_CHAR_GAP) &&
             aRect.Height() >= 2 * MINIFONT_HEIGHT + HEX_CHAR_GAP) {
diff --git a/gfx/thebes/gfxWindowsNativeDrawing.cpp b/gfx/thebes/gfxWindowsNativeDrawing.cpp
index ffc082d8a091..fc041a5d937a 100644
--- a/gfx/thebes/gfxWindowsNativeDrawing.cpp
+++ b/gfx/thebes/gfxWindowsNativeDrawing.cpp
@@ -271,7 +271,8 @@ gfxWindowsNativeDrawing::PaintToContext()
                                 gfxImageFormat::ARGB32);
 
         mContext->Save();
-        mContext->Translate(mNativeRect.TopLeft());
+        mContext->SetMatrix(
+          mContext->CurrentMatrix().Translate(mNativeRect.TopLeft()));
         mContext->NewPath();
         mContext->Rectangle(gfxRect(gfxPoint(0.0, 0.0), mNativeRect.Size()));
 
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 9530f2246fe7..b688bd6686a7 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -4469,8 +4469,9 @@ FrameLayerBuilder::DrawThebesLayer(ThebesLayer* aLayer,
       // Apply the residual transform if it has been enabled, to ensure that
       // snapping when we draw into aContext exactly matches the ideal transform.
       // See above for why this is OK.
-      aContext->Translate(aLayer->GetResidualTranslation() - gfxPoint(offset.x, offset.y));
-      aContext->Scale(userData->mXScale, userData->mYScale);
+      aContext->SetMatrix(
+        aContext->CurrentMatrix().Translate(aLayer->GetResidualTranslation() - gfxPoint(offset.x, offset.y)).
+                                  Scale(userData->mXScale, userData->mYScale));
 
       layerBuilder->PaintItems(entry->mItems, *iterRect, aContext, rc,
                                builder, presContext,
@@ -4481,8 +4482,9 @@ FrameLayerBuilder::DrawThebesLayer(ThebesLayer* aLayer,
     // Apply the residual transform if it has been enabled, to ensure that
     // snapping when we draw into aContext exactly matches the ideal transform.
     // See above for why this is OK.
-    aContext->Translate(aLayer->GetResidualTranslation() - gfxPoint(offset.x, offset.y));
-    aContext->Scale(userData->mXScale, userData->mYScale);
+    aContext->SetMatrix(
+      aContext->CurrentMatrix().Translate(aLayer->GetResidualTranslation() - gfxPoint(offset.x, offset.y)).
+                                Scale(userData->mXScale,userData->mYScale));
 
     layerBuilder->PaintItems(entry->mItems, aRegionToDraw.GetBounds(), aContext, rc,
                              builder, presContext,
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index a92a01b53cef..c61bc22dbaac 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -2593,7 +2593,8 @@ nsCSSRendering::PaintGradient(nsPresContext* aPresContext,
                                          gradientStart, gradientEnd, &edgeColor)) {
         ctx->SetColor(edgeColor);
       } else {
-        ctx->Translate(tileRect.TopLeft());
+        ctx->SetMatrix(
+          ctx->CurrentMatrix().Copy().Translate(tileRect.TopLeft()));
         ctx->SetPattern(gradientPattern);
       }
       ctx->Fill();
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index b46c41af0784..a5c9203c8a54 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -4785,12 +4785,13 @@ PresShell::RenderDocument(const nsRect& aRect, uint32_t aFlags,
     }
   }
 
-  aThebesContext->Translate(gfxPoint(-nsPresContext::AppUnitsToFloatCSSPixels(aRect.x),
-                                     -nsPresContext::AppUnitsToFloatCSSPixels(aRect.y)));
-
   nsDeviceContext* devCtx = mPresContext->DeviceContext();
+
+  gfxPoint offset(-nsPresContext::AppUnitsToFloatCSSPixels(aRect.x),
+                  -nsPresContext::AppUnitsToFloatCSSPixels(aRect.y));
   gfxFloat scale = gfxFloat(devCtx->AppUnitsPerDevPixel())/nsPresContext::AppUnitsPerCSSPixel();
-  aThebesContext->Scale(scale, scale);
+  aThebesContext->SetMatrix(
+    aThebesContext->CurrentMatrix().Translate(offset).Scale(scale, scale));
 
   // Since canvas APIs use floats to set up their matrices, we may have
   // some slight inaccuracy here. Adjust matrix components that are
diff --git a/layout/generic/nsCanvasFrame.cpp b/layout/generic/nsCanvasFrame.cpp
index 5547312d60ac..03dc5dd083d7 100644
--- a/layout/generic/nsCanvasFrame.cpp
+++ b/layout/generic/nsCanvasFrame.cpp
@@ -293,7 +293,8 @@ nsDisplayCanvasBackgroundImage::Paint(nsDisplayListBuilder* aBuilder,
     dt = destDT->CreateSimilarDrawTarget(IntSize(ceil(destRect.width), ceil(destRect.height)), SurfaceFormat::B8G8R8A8);
     if (dt) {
       nsRefPtr<gfxContext> ctx = new gfxContext(dt);
-      ctx->Translate(-gfxPoint(destRect.x, destRect.y));
+      ctx->SetMatrix(
+        ctx->CurrentMatrix().Translate(-destRect.x, -destRect.y));
       context = new nsRenderingContext();
       context->Init(aCtx->DeviceContext(), ctx);
     }
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 80afc41caa7c..5865e53ceb52 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1641,7 +1641,8 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
       ctx->Rectangle(nativeClipRect);
       ctx->Clip();
       gfxPoint offset(contentPixels.x, contentPixels.y);
-      ctx->Translate(offset);
+      ctx->SetMatrix(
+        ctx->CurrentMatrix().Translate(offset));
 
       gfxQuartzNativeDrawing nativeDrawing(ctx, nativeClipRect - offset);
 
diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp
index e03f42db46d7..5f2c1ada2507 100644
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -2028,16 +2028,18 @@ nsMathMLChar::ApplyTransforms(gfxContext* aThebesContext,
   // apply the transforms
   if (mMirrored) {
     nsPoint pt = r.TopRight();
-    aThebesContext->
-      Translate(gfxPoint(NSAppUnitsToFloatPixels(pt.x, aAppUnitsPerGfxUnit),
-                         NSAppUnitsToFloatPixels(pt.y, aAppUnitsPerGfxUnit)));
-    aThebesContext->Scale(-mScaleX, mScaleY);
+    gfxPoint devPixelOffset(NSAppUnitsToFloatPixels(pt.x, aAppUnitsPerGfxUnit),
+                            NSAppUnitsToFloatPixels(pt.y, aAppUnitsPerGfxUnit));
+    aThebesContext->SetMatrix(
+      aThebesContext->CurrentMatrix().Translate(devPixelOffset).
+                                      Scale(-mScaleX, mScaleY));
   } else {
     nsPoint pt = r.TopLeft();
-    aThebesContext->
-      Translate(gfxPoint(NSAppUnitsToFloatPixels(pt.x, aAppUnitsPerGfxUnit),
-                         NSAppUnitsToFloatPixels(pt.y, aAppUnitsPerGfxUnit)));
-    aThebesContext->Scale(mScaleX, mScaleY);
+    gfxPoint devPixelOffset(NSAppUnitsToFloatPixels(pt.x, aAppUnitsPerGfxUnit),
+                            NSAppUnitsToFloatPixels(pt.y, aAppUnitsPerGfxUnit));
+    aThebesContext->SetMatrix(
+      aThebesContext->CurrentMatrix().Translate(devPixelOffset).
+                                      Scale(mScaleX, mScaleY));
   }
 
   // update the bounding rectangle.
diff --git a/layout/svg/nsFilterInstance.cpp b/layout/svg/nsFilterInstance.cpp
index c1802d308e9f..acd69ba2de42 100644
--- a/layout/svg/nsFilterInstance.cpp
+++ b/layout/svg/nsFilterInstance.cpp
@@ -296,23 +296,17 @@ nsFilterInstance::BuildSourcePaint(SourceInfo *aSource,
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  nsRefPtr<gfxContext> ctx = new gfxContext(offscreenDT);
-  ctx->Translate(-neededRect.TopLeft());
-
-  nsRefPtr<nsRenderingContext> tmpCtx(new nsRenderingContext());
-  tmpCtx->Init(mTargetFrame->PresContext()->DeviceContext(), ctx);
-
   gfxMatrix deviceToFilterSpace = GetFilterSpaceToDeviceSpaceTransform();
   if (!deviceToFilterSpace.Invert()) {
     return NS_ERROR_FAILURE;
   }
-  gfxContext *gfx = tmpCtx->ThebesContext();
-  gfx->Multiply(deviceToFilterSpace);
-
-  gfx->Save();
 
   if (!mPaintTransform.IsSingular()) {
-    gfx->Multiply(mPaintTransform);
+    nsRefPtr<gfxContext> gfx = new gfxContext(offscreenDT);
+    gfx->Save();
+    gfx->Multiply(mPaintTransform *
+                  deviceToFilterSpace *
+                  gfxMatrix::Translation(-neededRect.TopLeft()));
     gfx->Rectangle(FilterSpaceToUserSpace(neededRect));
     if ((aSource == &mFillPaint &&
          nsSVGUtils::SetupCairoFillPaint(mTargetFrame, gfx)) ||
@@ -320,8 +314,8 @@ nsFilterInstance::BuildSourcePaint(SourceInfo *aSource,
          nsSVGUtils::SetupCairoStrokePaint(mTargetFrame, gfx))) {
       gfx->Fill();
     }
+    gfx->Restore();
   }
-  gfx->Restore();
 
 
   aSource->mSourceSurface = offscreenDT->Snapshot();
@@ -362,12 +356,6 @@ nsFilterInstance::BuildSourceImage(DrawTarget* aTargetDT)
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  nsRefPtr<gfxContext> ctx = new gfxContext(offscreenDT);
-  ctx->Translate(-neededRect.TopLeft());
-
-  nsRefPtr<nsRenderingContext> tmpCtx(new nsRenderingContext());
-  tmpCtx->Init(mTargetFrame->PresContext()->DeviceContext(), ctx);
-
   gfxRect r = FilterSpaceToUserSpace(neededRect);
   r.RoundOut();
   nsIntRect dirty;
@@ -389,7 +377,13 @@ nsFilterInstance::BuildSourceImage(DrawTarget* aTargetDT)
   if (!deviceToFilterSpace.Invert()) {
     return NS_ERROR_FAILURE;
   }
-  tmpCtx->ThebesContext()->Multiply(deviceToFilterSpace);
+  nsRefPtr<gfxContext> ctx = new gfxContext(offscreenDT);
+  ctx->SetMatrix(
+    ctx->CurrentMatrix().Translate(-neededRect.TopLeft()).
+                         PreMultiply(deviceToFilterSpace));
+
+  nsRefPtr<nsRenderingContext> tmpCtx(new nsRenderingContext());
+  tmpCtx->Init(mTargetFrame->PresContext()->DeviceContext(), ctx);
   mPaintCallback->Paint(tmpCtx, mTargetFrame, mPaintTransform, &dirty);
 
   mSourceGraphic.mSourceSurface = offscreenDT->Snapshot();
diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp
index f2a2647e72df..3c799f5652b6 100644
--- a/widget/android/AndroidBridge.cpp
+++ b/widget/android/AndroidBridge.cpp
@@ -1857,9 +1857,9 @@ nsresult AndroidBridge::CaptureThumbnail(nsIDOMWindow *window, int32_t bufW, int
         return NS_ERROR_FAILURE;
     }
     nsRefPtr<gfxContext> context = new gfxContext(dt);
-    gfxPoint pt(0, 0);
-    context->Translate(pt);
-    context->Scale(scale * bufW / srcW, scale * bufH / srcH);
+    context->SetMatrix(
+      context->CurrentMatrix().Scale(scale * bufW / srcW,
+                                     scale * bufH / srcH));
     rv = presShell->RenderDocument(r, renderDocFlags, bgColor, context);
     if (is24bit) {
         gfxUtils::ConvertBGRAtoRGBA(data, stride * bufH);

From 99fd7ba00e3ff7f8c53eab4c54bf8ee5c2c99a0f Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 07:57:38 +0100
Subject: [PATCH 105/109] Bug 1064084, part 2 - Convert all consumers of
 gfxContext::Scale() to use gfxContext::SetMatrix()/Multiply(). r=Bas

---
 dom/canvas/CanvasRenderingContext2D.cpp | 2 +-
 gfx/thebes/gfxContext.cpp               | 7 -------
 gfx/thebes/gfxContext.h                 | 6 ------
 image/src/VectorImage.cpp               | 7 ++++---
 widget/cocoa/nsNativeThemeCocoa.mm      | 3 ++-
 5 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
index 35e1a4d40b56..e090bfc0ec83 100644
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -3725,7 +3725,7 @@ CanvasRenderingContext2D::DrawWindow(nsGlobalWindow& window, double x,
     }
 
     thebes = new gfxContext(drawDT);
-    thebes->Scale(matrix._11, matrix._22);
+    thebes->SetMatrix(gfxMatrix::Scaling(matrix._11, matrix._22));
   }
 
   nsCOMPtr<nsIPresShell> shell = presContext->PresShell();
diff --git a/gfx/thebes/gfxContext.cpp b/gfx/thebes/gfxContext.cpp
index 26ca6e4be7df..d57edd7890d3 100644
--- a/gfx/thebes/gfxContext.cpp
+++ b/gfx/thebes/gfxContext.cpp
@@ -430,13 +430,6 @@ gfxContext::DrawSurface(gfxASurface *surface, const gfxSize& size)
 }
 
 // transform stuff
-void
-gfxContext::Scale(gfxFloat x, gfxFloat y)
-{
-  Matrix newMatrix = mTransform;
-  ChangeTransform(newMatrix.PreScale(Float(x), Float(y)));
-}
-
 void
 gfxContext::Rotate(gfxFloat angle)
 {
diff --git a/gfx/thebes/gfxContext.h b/gfx/thebes/gfxContext.h
index c20ac42b9791..60679c0b827b 100644
--- a/gfx/thebes/gfxContext.h
+++ b/gfx/thebes/gfxContext.h
@@ -239,12 +239,6 @@ public:
      ** Transformation Matrix manipulation
      **/
 
-    /**
-     * Adds a scale to the current matrix. This scaling takes place before the
-     * previously set transformations.
-     */
-    void Scale(gfxFloat x, gfxFloat y);
-
     /**
      * Adds a rotation around the origin to the current matrix. This rotation
      * takes place before the previously set transformations.
diff --git a/image/src/VectorImage.cpp b/image/src/VectorImage.cpp
index d36252bdb39a..a22b53e635e5 100644
--- a/image/src/VectorImage.cpp
+++ b/image/src/VectorImage.cpp
@@ -288,9 +288,10 @@ SVGDrawingCallback::operator()(gfxContext* aContext,
   if (!matrix.Invert()) {
     return false;
   }
-  aContext->Multiply(matrix);
-  aContext->Scale(double(mSize.width) / mViewport.width,
-                  double(mSize.height) / mViewport.height);
+  aContext->SetMatrix(
+    aContext->CurrentMatrix().PreMultiply(matrix).
+                              Scale(double(mSize.width) / mViewport.width,
+                                    double(mSize.height) / mViewport.height));
 
   nsPresContext* presContext = presShell->GetPresContext();
   MOZ_ASSERT(presContext, "pres shell w/out pres context");
diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index 3baea7ac552a..438ac4267c7d 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -2253,7 +2253,8 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext,
     // Use high-resolution drawing.
     nativeWidgetRect.ScaleInverse(2.0f);
     nativeDirtyRect.ScaleInverse(2.0f);
-    thebesCtx->Scale(2.0f, 2.0f);
+    thebesCtx->SetMatrix(
+      thebesCtx->CurrentMatrix().Scale(2.0f, 2.0f));
   }
 
   gfxQuartzNativeDrawing nativeDrawing(thebesCtx, nativeDirtyRect);

From d4d2f025b9d09495cfcc3f903589e74a60e57e11 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 07:57:38 +0100
Subject: [PATCH 106/109] Bug 1064084, part 3 - Convert all consumers of
 gfxContext::Rotate() to use gfxContext::SetMatrix()/Multiply(). r=Bas

---
 gfx/thebes/gfxContext.cpp | 7 -------
 gfx/thebes/gfxContext.h   | 8 --------
 2 files changed, 15 deletions(-)

diff --git a/gfx/thebes/gfxContext.cpp b/gfx/thebes/gfxContext.cpp
index d57edd7890d3..4c4bc3d48611 100644
--- a/gfx/thebes/gfxContext.cpp
+++ b/gfx/thebes/gfxContext.cpp
@@ -430,13 +430,6 @@ gfxContext::DrawSurface(gfxASurface *surface, const gfxSize& size)
 }
 
 // transform stuff
-void
-gfxContext::Rotate(gfxFloat angle)
-{
-  Matrix rotation = Matrix::Rotation(Float(angle));
-  ChangeTransform(rotation * mTransform);
-}
-
 void
 gfxContext::Multiply(const gfxMatrix& matrix)
 {
diff --git a/gfx/thebes/gfxContext.h b/gfx/thebes/gfxContext.h
index 60679c0b827b..c6b237f619f2 100644
--- a/gfx/thebes/gfxContext.h
+++ b/gfx/thebes/gfxContext.h
@@ -239,14 +239,6 @@ public:
      ** Transformation Matrix manipulation
      **/
 
-    /**
-     * Adds a rotation around the origin to the current matrix. This rotation
-     * takes place before the previously set transformations.
-     *
-     * @param angle The angle in radians.
-     */
-    void Rotate(gfxFloat angle);
-
     /**
      * Post-multiplies 'other' onto the current CTM, i.e. this
      * matrix's transformation will take place before the previously set

From 2a0767dbda46de60abd16d78dfd29c7a28f47950 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 07:57:39 +0100
Subject: [PATCH 107/109] Bug 1064084, part 4 - Convert all consumers of
 gfxContext::IdentityMatrix() to use gfxContext::SetMatrix(). r=Bas

---
 gfx/layers/basic/BasicLayerManager.cpp | 2 +-
 gfx/src/nsRenderingContext.cpp         | 6 +++---
 gfx/thebes/gfxContext.cpp              | 8 +-------
 gfx/thebes/gfxContext.h                | 5 -----
 gfx/thebes/gfxFont.cpp                 | 2 +-
 gfx/thebes/gfxUtils.cpp                | 2 +-
 layout/base/nsCSSRendering.cpp         | 4 ++--
 layout/generic/nsObjectFrame.cpp       | 2 +-
 layout/svg/nsSVGMaskFrame.cpp          | 2 +-
 layout/svg/nsSVGPathGeometryFrame.cpp  | 4 ++--
 widget/gtk/nsNativeThemeGTK.cpp        | 9 +++++----
 11 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/gfx/layers/basic/BasicLayerManager.cpp b/gfx/layers/basic/BasicLayerManager.cpp
index 77df4c80364a..0a2266700290 100644
--- a/gfx/layers/basic/BasicLayerManager.cpp
+++ b/gfx/layers/basic/BasicLayerManager.cpp
@@ -69,7 +69,7 @@ ClipToContain(gfxContext* aContext, const nsIntRect& aRect)
   deviceRect.RoundOut();
 
   gfxMatrix currentMatrix = aContext->CurrentMatrix();
-  aContext->IdentityMatrix();
+  aContext->SetMatrix(gfxMatrix());
   aContext->NewPath();
   aContext->Rectangle(deviceRect);
   aContext->Clip();
diff --git a/gfx/src/nsRenderingContext.cpp b/gfx/src/nsRenderingContext.cpp
index 97b08bff0b86..246e11e0f2e1 100644
--- a/gfx/src/nsRenderingContext.cpp
+++ b/gfx/src/nsRenderingContext.cpp
@@ -112,7 +112,7 @@ nsRenderingContext::SetClip(const nsIntRegion& aRegion)
     // an existing clip.
 
     gfxMatrix mat = mThebes->CurrentMatrix();
-    mThebes->IdentityMatrix();
+    mThebes->SetMatrix(gfxMatrix());
 
     mThebes->ResetClip();
 
@@ -185,7 +185,7 @@ nsRenderingContext::DrawLine(nscoord aX0, nscoord aY0,
         p0.Round();
         p1.Round();
 
-        mThebes->IdentityMatrix();
+        mThebes->SetMatrix(gfxMatrix());
 
         mThebes->NewPath();
 
@@ -308,7 +308,7 @@ nsRenderingContext::FillRect(const nsRect& aRect)
         if (!ConditionRect(r))
             return;
 
-        mThebes->IdentityMatrix();
+        mThebes->SetMatrix(gfxMatrix());
         mThebes->NewPath();
 
         mThebes->Rectangle(r, true);
diff --git a/gfx/thebes/gfxContext.cpp b/gfx/thebes/gfxContext.cpp
index 4c4bc3d48611..f445afceaefe 100644
--- a/gfx/thebes/gfxContext.cpp
+++ b/gfx/thebes/gfxContext.cpp
@@ -450,12 +450,6 @@ gfxContext::SetMatrix(const gfxMatrix& matrix)
   ChangeTransform(ToMatrix(matrix));
 }
 
-void
-gfxContext::IdentityMatrix()
-{
-  ChangeTransform(Matrix());
-}
-
 gfxMatrix
 gfxContext::CurrentMatrix() const
 {
@@ -1072,7 +1066,7 @@ static gfxRect
 GetRoundOutDeviceClipExtents(gfxContext* aCtx)
 {
   gfxContextMatrixAutoSaveRestore save(aCtx);
-  aCtx->IdentityMatrix();
+  aCtx->SetMatrix(gfxMatrix());
   gfxRect r = aCtx->GetClipExtents();
   r.RoundOut();
   return r;
diff --git a/gfx/thebes/gfxContext.h b/gfx/thebes/gfxContext.h
index c6b237f619f2..aa4c8828f635 100644
--- a/gfx/thebes/gfxContext.h
+++ b/gfx/thebes/gfxContext.h
@@ -257,11 +257,6 @@ public:
      */
     void SetMatrix(const gfxMatrix& matrix);
 
-    /**
-     * Sets the transformation matrix to the identity matrix.
-     */
-    void IdentityMatrix();
-
     /**
      * Returns the current transformation matrix.
      */
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
index e097520dce6c..a2ce0e57a096 100644
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -4362,7 +4362,7 @@ gfxFont::SetupGlyphExtents(gfxContext *aContext, uint32_t aGlyphID, bool aNeedTi
                            gfxGlyphExtents *aExtents)
 {
     gfxContextMatrixAutoSaveRestore matrixRestore(aContext);
-    aContext->IdentityMatrix();
+    aContext->SetMatrix(gfxMatrix());
 
     gfxRect svgBounds;
     if (mFontEntry->TryGetSVGData(this) && mFontEntry->HasSVGGlyph(aGlyphID) &&
diff --git a/gfx/thebes/gfxUtils.cpp b/gfx/thebes/gfxUtils.cpp
index 585c4fce8151..30c279cf69d9 100644
--- a/gfx/thebes/gfxUtils.cpp
+++ b/gfx/thebes/gfxUtils.cpp
@@ -450,7 +450,7 @@ struct MOZ_STACK_CLASS AutoCairoPixmanBugWorkaround
         // Clip the rounded-out-to-device-pixels bounds of the
         // transformed fill area. This is the area for the group we
         // want to push.
-        mContext->IdentityMatrix();
+        mContext->SetMatrix(gfxMatrix());
         gfxRect bounds = currentMatrix.TransformBounds(aFill);
         bounds.RoundOut();
         mContext->Clip(bounds);
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index c61bc22dbaac..2f78e7064e4e 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -5030,7 +5030,7 @@ nsContextBoxBlur::DoPaint()
   gfxContextMatrixAutoSaveRestore saveMatrix(mDestinationCtx);
 
   if (mPreTransformed) {
-    mDestinationCtx->IdentityMatrix();
+    mDestinationCtx->SetMatrix(gfxMatrix());
   }
 
   blur.Paint(mDestinationCtx);
@@ -5095,7 +5095,7 @@ nsContextBoxBlur::BlurRectangle(gfxContext* aDestinationCtx,
   if (!transform.HasNonAxisAlignedTransform() && transform._11 > 0.0 && transform._22 > 0.0) {
     scaleX = transform._11;
     scaleY = transform._22;
-    aDestinationCtx->IdentityMatrix();
+    aDestinationCtx->SetMatrix(gfxMatrix());
   } else {
     transform = gfxMatrix();
   }
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 5865e53ceb52..90f0f5edb892 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1731,7 +1731,7 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
 
     if (ctx->UserToDevicePixelSnapped(frameGfxRect, false)) {
       dirtyGfxRect = ctx->UserToDevice(dirtyGfxRect);
-      ctx->IdentityMatrix();
+      ctx->SetMatrix(gfxMatrix());
     }
     dirtyGfxRect.RoundOut();
 
diff --git a/layout/svg/nsSVGMaskFrame.cpp b/layout/svg/nsSVGMaskFrame.cpp
index fb129936e2dc..ab3c1fe830bc 100644
--- a/layout/svg/nsSVGMaskFrame.cpp
+++ b/layout/svg/nsSVGMaskFrame.cpp
@@ -200,7 +200,7 @@ nsSVGMaskFrame::GetMaskForMaskedFrame(gfxContext* aContext,
   // and maskArea) is important for performance.
   aContext->Save();
   nsSVGUtils::SetClipRect(aContext, aMatrix, maskArea);
-  aContext->IdentityMatrix();
+  aContext->SetMatrix(gfxMatrix());
   gfxRect maskSurfaceRect = aContext->GetClipExtents();
   maskSurfaceRect.RoundOut();
   aContext->Restore();
diff --git a/layout/svg/nsSVGPathGeometryFrame.cpp b/layout/svg/nsSVGPathGeometryFrame.cpp
index cd736083eb98..3a8426487afa 100644
--- a/layout/svg/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/nsSVGPathGeometryFrame.cpp
@@ -466,7 +466,7 @@ nsSVGPathGeometryFrame::GetBBoxContribution(const Matrix &aToBBoxUserspace,
   nsRefPtr<gfxContext> tmpCtx = new gfxContext(tmpDT);
 
   GeneratePath(tmpCtx, aToBBoxUserspace);
-  tmpCtx->IdentityMatrix();
+  tmpCtx->SetMatrix(gfxMatrix());
 
   // Be careful when replacing the following logic to get the fill and stroke
   // extents independently (instead of computing the stroke extents from the
@@ -703,7 +703,7 @@ nsSVGPathGeometryFrame::GeneratePath(gfxContext* aContext,
                                      const Matrix &aTransform)
 {
   if (aTransform.IsSingular()) {
-    aContext->IdentityMatrix();
+    aContext->SetMatrix(gfxMatrix());
     aContext->NewPath();
     return;
   }
diff --git a/widget/gtk/nsNativeThemeGTK.cpp b/widget/gtk/nsNativeThemeGTK.cpp
index 62018e57b50b..782862ae3800 100644
--- a/widget/gtk/nsNativeThemeGTK.cpp
+++ b/widget/gtk/nsNativeThemeGTK.cpp
@@ -838,11 +838,12 @@ nsNativeThemeGTK::DrawWidgetBackground(nsRenderingContext* aContext,
 
   // translate everything so (0,0) is the top left of the drawingRect
   gfxContextAutoSaveRestore autoSR(ctx);
-  if (snapXY) {
-    // Rects are in device coords.
-    ctx->IdentityMatrix(); 
+  gfxMatrix tm;
+  if (!snapXY) { // else rects are in device coords
+    tm = ctx->CurrentMatrix();
   }
-  ctx->Translate(rect.TopLeft() + gfxPoint(drawingRect.x, drawingRect.y));
+  tm.Translate(rect.TopLeft() + gfxPoint(drawingRect.x, drawingRect.y));
+  ctx->SetMatrix(tm);
 
   NS_ASSERTION(!IsWidgetTypeDisabled(mDisabledWidgetTypes, aWidgetType),
                "Trying to render an unsafe widget!");

From 53f8ce1ac637a3e0e7bdb0b890dd0fd519e09401 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 11 Sep 2014 07:57:39 +0100
Subject: [PATCH 108/109] Bug 1064084, part 5 - Convert all consumers of
 gfxContext::NudgeCurrentMatrixToIntegers()/MultiplyAndNudgeToIntegers() to
 use gfxContext::SetMatrix(). r=Bas

---
 gfx/thebes/gfxContext.cpp             | 16 ----------------
 gfx/thebes/gfxContext.h               | 13 -------------
 layout/base/nsPresShell.cpp           | 14 ++++++++------
 layout/svg/nsSVGPathGeometryFrame.cpp |  4 +++-
 4 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/gfx/thebes/gfxContext.cpp b/gfx/thebes/gfxContext.cpp
index f445afceaefe..bec3be227b1e 100644
--- a/gfx/thebes/gfxContext.cpp
+++ b/gfx/thebes/gfxContext.cpp
@@ -436,14 +436,6 @@ gfxContext::Multiply(const gfxMatrix& matrix)
   ChangeTransform(ToMatrix(matrix) * mTransform);
 }
 
-void
-gfxContext::MultiplyAndNudgeToIntegers(const gfxMatrix& matrix)
-{
-  Matrix transform = ToMatrix(matrix) * mTransform;
-  transform.NudgeToIntegers();
-  ChangeTransform(transform);
-}
-
 void
 gfxContext::SetMatrix(const gfxMatrix& matrix)
 {
@@ -456,14 +448,6 @@ gfxContext::CurrentMatrix() const
   return ThebesMatrix(mTransform);
 }
 
-void
-gfxContext::NudgeCurrentMatrixToIntegers()
-{
-  gfxMatrix matrix = ThebesMatrix(mTransform);
-  matrix.NudgeToIntegers();
-  ChangeTransform(ToMatrix(matrix));
-}
-
 gfxPoint
 gfxContext::DeviceToUser(const gfxPoint& point) const
 {
diff --git a/gfx/thebes/gfxContext.h b/gfx/thebes/gfxContext.h
index aa4c8828f635..4701ccb4f88a 100644
--- a/gfx/thebes/gfxContext.h
+++ b/gfx/thebes/gfxContext.h
@@ -245,12 +245,6 @@ public:
      * transformations.
      */
     void Multiply(const gfxMatrix& other);
-    /**
-     * As "Multiply", but also nudges any entries in the resulting matrix that
-     * are close to an integer to that integer, to correct for
-     * compounded rounding errors.
-     */
-    void MultiplyAndNudgeToIntegers(const gfxMatrix& other);
 
     /**
      * Replaces the current transformation matrix with matrix.
@@ -262,13 +256,6 @@ public:
      */
     gfxMatrix CurrentMatrix() const;
 
-    /**
-     * Snap components of the current matrix that are close to integers
-     * to integers. In particular, components that are integral when
-     * converted to single precision are set to those integers.
-     */
-    void NudgeCurrentMatrixToIntegers();
-
     /**
      * Converts a point from device to user coordinates using the inverse
      * transformation matrix.
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index a5c9203c8a54..31d062b00f2c 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -4790,13 +4790,15 @@ PresShell::RenderDocument(const nsRect& aRect, uint32_t aFlags,
   gfxPoint offset(-nsPresContext::AppUnitsToFloatCSSPixels(aRect.x),
                   -nsPresContext::AppUnitsToFloatCSSPixels(aRect.y));
   gfxFloat scale = gfxFloat(devCtx->AppUnitsPerDevPixel())/nsPresContext::AppUnitsPerCSSPixel();
-  aThebesContext->SetMatrix(
-    aThebesContext->CurrentMatrix().Translate(offset).Scale(scale, scale));
 
-  // Since canvas APIs use floats to set up their matrices, we may have
-  // some slight inaccuracy here. Adjust matrix components that are
-  // integers up to the accuracy of floats to be those integers.
-  aThebesContext->NudgeCurrentMatrixToIntegers();
+  // Since canvas APIs use floats to set up their matrices, we may have some
+  // slight rounding errors here.  We use NudgeToIntegers() here to adjust
+  // matrix components that are integers up to the accuracy of floats to be
+  // those integers.
+  gfxMatrix newTM = aThebesContext->CurrentMatrix().Translate(offset).
+                                                    Scale(scale, scale).
+                                                    NudgeToIntegers();
+  aThebesContext->SetMatrix(newTM);
 
   AutoSaveRestoreRenderingState _(this);
 
diff --git a/layout/svg/nsSVGPathGeometryFrame.cpp b/layout/svg/nsSVGPathGeometryFrame.cpp
index 3a8426487afa..915edfae2eb8 100644
--- a/layout/svg/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/nsSVGPathGeometryFrame.cpp
@@ -708,7 +708,9 @@ nsSVGPathGeometryFrame::GeneratePath(gfxContext* aContext,
     return;
   }
 
-  aContext->MultiplyAndNudgeToIntegers(ThebesMatrix(aTransform));
+  aContext->SetMatrix(
+    aContext->CurrentMatrix().PreMultiply(ThebesMatrix(aTransform)).
+                              NudgeToIntegers());
 
   // Hack to let SVGPathData::ConstructPath know if we have square caps:
   const nsStyleSVG* style = StyleSVG();

From 42250f187dfe995ab6c4e221af5aed645132c04b Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Thu, 11 Sep 2014 14:11:25 +0100
Subject: [PATCH 109/109] Bug 1065454 - Disable new tablet UI by default
 (r=mcomella, a=merge)

---
 mobile/android/base/NewTabletUI.java                      | 3 +--
 mobile/android/base/resources/xml/preferences_display.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/NewTabletUI.java b/mobile/android/base/NewTabletUI.java
index a468c38d7334..887034a809b0 100644
--- a/mobile/android/base/NewTabletUI.java
+++ b/mobile/android/base/NewTabletUI.java
@@ -11,9 +11,8 @@ import org.mozilla.gecko.preferences.GeckoPreferences;
 import org.mozilla.gecko.util.HardwareUtils;
 
 public class NewTabletUI {
-    // XXX: Change default value to false before merging to m-c.
     // This value should be in sync with preferences_display.xml.
-    private static final boolean DEFAULT = true;
+    private static final boolean DEFAULT = false;
 
     private static Boolean sNewTabletUI;
 
diff --git a/mobile/android/base/resources/xml/preferences_display.xml b/mobile/android/base/resources/xml/preferences_display.xml
index 88f6fd21d871..ad4009b45fa1 100644
--- a/mobile/android/base/resources/xml/preferences_display.xml
+++ b/mobile/android/base/resources/xml/preferences_display.xml
@@ -29,7 +29,7 @@
          because this is just a temporary development toggle. -->
     <CheckBoxPreference android:key="android.not_a_preference.new_tablet_ui"
                         android:title="Enable new tablet UI"
-                        android:defaultValue="true" />
+                        android:defaultValue="false" />
 
     <PreferenceCategory android:title="@string/pref_category_advanced">