Commit Graph

18639 Commits

Author SHA1 Message Date
Wes Kocher
7190595504 Merge m-c to inbound, a=merge
--HG--
extra : commitid : Lb4DnLIVzwj
2015-12-30 17:42:15 -08:00
Mark Finkle
fd91e397b8 Bug 1044289 - Update PromptService.js to handle stuff from nsPrompter.js r=margaret 2015-12-30 14:59:45 -05:00
Mark Finkle
c0aa972139 Bug 1044289 - Stop packaging Desktop versions of Mobile components r=margaret 2015-12-30 14:59:41 -05:00
Mark Finkle
4d2b0bfd70 Bug 1044289 - Stop trying to package files that do not exist r=margaret 2015-12-30 14:59:34 -05:00
Margaret Leibovic
d518830bd1 Bug 1235061 - Create histogram probe to measure how often users have zoomed view enabled/disabled. r=mfinkle p=vladan
--HG--
extra : commitid : KD4RdbOwTZO
extra : rebase_source : 43607b5dfce37c495578fdd62e39802061fd5577
extra : amend_source : 80b97e3d2fa0de7c39fe55665b24ae9918eb78e8
2015-12-24 13:58:21 -05:00
Carsten "Tomcat" Book
aa5ce3db49 merge mozilla-inbound to mozilla-central a=merge 2015-12-30 12:00:03 +01:00
Mark Finkle
944e87f142 Bug 1235637 - Provide a simple way to update history without needing a cursor r=rnewman 2015-12-29 20:50:46 -05:00
Michael Comella
2f6563fecf Bug 1177781 - Set all lint errors as warnings. r=nalexander
See added comment for motivations.

--HG--
extra : commitid : 9B5v4k8TBAA
extra : rebase_source : 0f6b509a015a59b325bd53c595822d2483fc24c4
2015-12-28 12:26:36 -08:00
Michael Comella
68a6898e72 Bug 1177781 - Move lint config to mobile/android/app/base. r=nalexander
Since the build files moved to m/a/app/, it wasn't being used anymore.

--HG--
rename : mobile/android/base/lint.xml => mobile/android/app/base/lint.xml
extra : commitid : InQMFW7Fyh
extra : rebase_source : 7e17dd6c96d3b995743bd9606da52638640f756e
2015-12-28 12:22:04 -08:00
Michael Comella
b8755fbfbd Bug 1222234 - Backout 68a879c220d8 for regressions.
See bug 1222234 comment 10.

--HG--
extra : commitid : KCLHYifthb5
2015-12-29 10:57:14 -08:00
Jim Chen
6c1127a81a Bug 1235341 - Don't request rendering until compositor is created; r=me
Simple patch. Don't call into the compositor to request a rendering
until the compositor has been created.
2015-12-28 17:41:45 -05:00
Olli Pettay
2b2b2cc690 Bug 1155730, implement History.scrollRestoration r=jst 2015-12-26 12:59:09 +02:00
Ryan VanderMeulen
9a3523097f Merge fx-team to m-c. a=merge 2015-12-25 20:33:39 -05:00
Swaroop Rao
11121f64f0 Bug 1226209 - Update order of "Clear private data" checkboxes so that default unchecked boxes are at the bottom. r=nalexander
--HG--
extra : commitid : CUu1vTWgwtb
2015-12-24 12:51:43 -05:00
Andrzej Hunt
e75301e387 Bug 1233602 - Don't depend on search suggestions to show search history r=liuche
--HG--
extra : commitid : GxZDqk413Ta
2015-12-17 17:14:27 -08:00
Alex Johnson
bfda9ac10e Bug 1223586 - Hid web content and the home pager before making browser search visible. r=mcomella
--HG--
extra : commitid : 2tSc64476Ta
2015-11-24 16:42:26 -05:00
Jim Chen
ac9893acc0 Bug 1233812 - Remove obsolete methods in GeckoAppShell; r=snorp
These methods were from the XUL Fennec days and are obsolete.
2015-12-23 22:03:35 -05:00
Jim Chen
e7f1a2326e Bug 1229403 - Use existing states if possible when initializing GeckoView; r=snorp
This patch changes onAttachedToWindow in GeckoView, so that if we have
states that have been restored, we use those states for initialization
instead of creating new states (e.g. opening a new nsWindow). Because
the GLController instance is associated with the nsWindow instance, we
need to keep the GLController instance as part of our saved states. This
patch also adds a reattach method to GeckoView.Window, because
GeckoEditable needs to be notified when its target View changes.
2015-12-23 22:03:35 -05:00
Jim Chen
5ef527b62e Bug 1229403 - Implement save and restoring GeckoView states; r=snorp
This patch adds an implementation of onSaveInstanceState and
onRestoreInstanceState to GeckoView, so that when GeckoView is destroyed
and later recreated, we would properly save and restore necessary states
and JNI associations. The patch also fixes onDetachedFromWindow, so that
we keep the nsWindow if we saved states, and close the nsWindow if we
did not save states.
2015-12-23 22:03:35 -05:00
Jim Chen
134c3f510a Bug 1229403 - Add GeckoView.StateBinder to keep states across GeckoView instances; r=snorp
As GeckoViews get destroyed and recreated, we want to carry its states
across. In particular, we want to keep a reference to our GLController
instance, and keep the association with the native nsWindow instance.
2015-12-23 22:03:35 -05:00
Jim Chen
3dc603713a Bug 1232456 - Create EGL surface through widget; r=snorp
This patch makes GLContextProviderEGL create EGL surfaces through
nsWindow/nsIWidget on Android. nsWindow then calls GLController in Java
to actually create the surface.
2015-12-23 22:03:34 -05:00
Jim Chen
61ae086c99 Bug 1227706 - Remove unused GLController calls and events; r=snorp
Remove GLController calls and events in GeckoAppShell and GeckoEvent
that were made obsolete by the new native calls.
2015-12-23 22:03:34 -05:00
Jim Chen
325ee148ee Bug 1227706 - Let GeckoView manage GLController instances; r=snorp
GLController instances are associated with a particular nsWindow, rather
than a particular View. Therefore, we need to let GeckoView manage
GLController instances, as part of GeckoView's handling of saving and
restoring states.
2015-12-23 22:03:34 -05:00
Jim Chen
43d7399cf2 Bug 1227706 - Add native methods to GLController; r=snorp
One nsWindow will have one corresponding GLController, and using native
GLController methods instead of GeckoEvents lets us control the
compositor for each nsWindow separately.
2015-12-23 22:03:34 -05:00
Jim Chen
ffdf60106d Bug 1227706 - Rename nsWindow::Natives to nsWindow::GeckoViewSupport; r=snorp
GeckoViewSupport better reflects the purpose of the class and will match
the GLControllerSupport class that another patch is adding. This patch
also changes the way GeckoViewSupport is constructed in order to be more
encapsulating.
2015-12-23 22:03:34 -05:00
Jim Chen
009677f91f Bug 1227706 - Make EGL initialization static; r=snorp
GLController will no longer be a singleton, but we should keep
initializing EGL only once, so this patch makes EGL initialization
static.
2015-12-23 22:03:34 -05:00
Jim Chen
490941e8d3 Bug 1227728 - Properly order queued native calls; r=snorp
Right now, code that queues native calls through GeckoThread can
encounter a race condition, after the GeckoThread state changes but
before we flush the existing queued calls.  In that case, the new call
will be made before existing queued calls are made, and the order of
calls is disrupted. This patch moves flushing existing calls to before
the state changes, to avoid this race condition.
2015-12-23 22:03:33 -05:00
Jim Chen
94b3e4800e Bug 1227727 - Remove geckoConnected method in LayerView; r=snorp
Right now LayerView depends on geckoConnected being called by GeckoApp
or GeckoView during its initialization. However, we can get rid of it
and let LayerView handle the task itself. As part of this change, screen
depth overriding is moved to native code in nsAppShell.
2015-12-23 22:03:33 -05:00
Jim Chen
b869447037 Bug 1227727 - Destroy LayerView in GeckoView; r=snorp
Right now, we destroy LayerView as part of GeckoApp, but we should do it
from inside GeckoView.
2015-12-23 22:03:33 -05:00
Jim Chen
df400b3573 Bug 1227719 - Autogenerate LayerRenderer.Frame; r=snorp
This patch adds auto-generated bindings for LayerRenderer.Frame, and
uses the new bindings in nsWindow, in place of the old manual bindings
in AndroidJavaWrappers.
2015-12-23 22:03:33 -05:00
Wes Kocher
1f00d8d838 Backed out 4 changesets (bug 1218996) for talos svg failures CLOSED TREE
Backed out changeset ba750628c4f3 (bug 1218996)
Backed out changeset 2205cce34824 (bug 1218996)
Backed out changeset 9410cbc0545e (bug 1218996)
Backed out changeset 7839222071ac (bug 1218996)

--HG--
extra : commitid : Ju4TBTVoAIr
2015-12-23 11:09:05 -08:00
Olivier Yiptong
6070b36fc1 Bug 1218996 - Fuse aboutNewTabService and RemoteNewTabLocation and return resource URLS r=marcosc,oyiptong
--HG--
extra : rebase_source : 15564dee02ae241c7f563ba7e362c5c2e0f37ded
2015-12-21 16:14:29 -05:00
Carsten "Tomcat" Book
719ce6825c merge mozilla-inbound to mozilla-central a=merge 2015-12-23 12:00:09 +01:00
Mark Capella
81e809bbaf Bug 1233709 - Action bar overflow menu sometimes appears with only one item, r=mcomella 2015-12-22 21:47:50 -05:00
Michael Comella
7129df93f8 Bug 1232773 - Call Adjust.onPause/onResume. r=mfinkle
--HG--
extra : commitid : CkePbvprGrW
extra : rebase_source : 1b7dc91a174838239f7fdbc16a268262cd061848
2015-12-22 14:29:51 -08:00
Michael Comella
96ea9c62d8 Bug 1233614 - Remove MOZ_INSTALL_TRACKING branch around Adjust usage. r=mfinkle
We already take care of this in AdjustConstants where we return
StubAdjustHelper if MOZ_INSTALL_TRACKING is not defined.

However, the one downside to this is that we touch SharedPreferences on the
main thread in onCreate even if Adjust is disabled. However, our release and
beta users already have this problem (since Adjust is enabled) so who cares if
our Nightly and Aurora users also have this problem.

--HG--
extra : commitid : 23AwrEm4oaZ
extra : rebase_source : d1b1aa228878d18ef01091b0c5b693972237e3c8
2015-12-22 09:47:08 -08:00
Michael Comella
76182d7de7 Bug 1233614 - Adjust.setEnabled before upload can occur. r=mfinkle
See the added comment for motivations.

--HG--
extra : commitid : CxIUmGoVbSl
extra : rebase_source : 4bdaf53ef2ba87709fdd236c3217d72186c3ad69
2015-12-22 09:45:49 -08:00
Michael Comella
5e922a0ccb Bug 1233614 - Remove health report flags in favor of Adjust.setEnabled. r=mfinkle
--HG--
extra : commitid : 9FWaV9LQv9b
extra : rebase_source : f38e885e907a8250766683d44c4a5faa3b901dd9
2015-12-22 09:05:28 -08:00
Margaret Leibovic
72e76f303f Bug 1234238 - Restore FFB theme. r=sebastian
--HG--
extra : commitid : FODpzH00bto
extra : rebase_source : b2849c8bed9e123c33a8c209515e31fe9fb9a584
2015-12-21 17:09:05 -05:00
Mark Finkle
e98309db11 Bug 935190 - Try to show cached pages when Fennec is offline r=sebastian 2015-12-22 14:28:49 -05:00
Mark Finkle
dc103b9bc7 Bug 1234453 - More complete save.1 UI Telemetry probes r=margaret 2015-12-22 09:32:13 -05:00
Mark Finkle
6b02f47b5b Bug 1234449 - Cleanup reader telemetry r=margaret 2015-12-22 09:32:10 -05:00
Mark Finkle
6e8b5669d6 Bug 1234449 - Cleanup import telemetry r=margaret 2015-12-22 09:32:07 -05:00
Mark Finkle
0969383180 Bug 1234449 - Cleanup homescreen telemetry r=margaret 2015-12-22 09:32:04 -05:00
Carsten "Tomcat" Book
8dfa44c1a4 Merge mozilla-central to fx-team 2015-12-22 12:28:35 +01:00
Carsten "Tomcat" Book
069e2428a4 merge fx-team to mozilla-central a=merge 2015-12-22 11:42:20 +01:00
Wes Kocher
ff9fee15f4 Backed out changeset 050fbc311d98 (bug 1232632) for android build bustage 2015-12-21 13:06:49 -08:00
Sebastian Kaspari
445ddd60b5 Bug 1232632 - Restricted profiles: Hide 'Clear private data' if needed. r=margaret
--HG--
extra : commitid : Cut33kSG4cZ
extra : rebase_source : 0192090f4a3f36b5911bed03d7cb8afe00c1565d
2015-12-21 16:33:36 +01:00
Sebastian Kaspari
43744ef829 Bug 1232632 - Restricted profiles: Hide 'Clear private data' if needed. r=margaret
--HG--
extra : commitid : 908SwiMfx19
extra : rebase_source : 46c24aa8e897cd130b4892581ae19141a82d9cbe
extra : histedit_source : 5a71f14ea6d1cfb382695fabde021beecf0b801c
2015-12-21 16:33:36 +01:00
Carsten "Tomcat" Book
aaad85ab2f Merge mozilla-central to b2g-inbound 2015-12-21 12:01:32 +01:00