1386825 - Remove MOZ_B2G

Status: RESOLVED FIXED

(Core :: General, enhancement)

Description

[Eric Rahm [:erahm]]

Remove all references to MOZ_B2G.

Comment 1

[Eric Rahm [:erahm]]

Attachment: Part 1: Remove MOZ_B2G from dom

MozReview-Commit-ID: 1zzP2r01B7U

Comment 2

[Eric Rahm [:erahm]]

Attachment: Part 2: Remove MOZ_B2G from toolkit

MozReview-Commit-ID: Ji3MoFKLVI4

Comment 3

[Eric Rahm [:erahm]]

Attachment: Part 4: Remove remaining instances of MOZ_B2G

Nathan, these are the remaining instances of MOZ_B2G. I didn't split it up for sanity's sake.

Comment 4

[Eric Rahm [:erahm]]

Attachment: Part 5: Remove MOZ_B2G from configure

MozReview-Commit-ID: Cg5gljpECwo

Comment 5

[Eric Rahm [:erahm]]

Attachment: Part 3: Remove MOZ_B2G from libpref

Nathan can you look at this? bsemedberg is out for a few weeks.

Comment 6

[Eric Rahm [:erahm]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=f54cdc616c29044cd3055a252228c8ee86ec9bf3

Comment 7

[Eric Rahm [:erahm]]

Attachment: Part 6: Remove FxAccountsManager now that MOZ_B2G is removed

Mark, it looks like you reviewed the bug that added this code. AFAICT
FxAccountsManager is only used when MOZ_B2G is defined and I'm removing that in
this bug so it seems to make sense to remove FxAccountsManager as well.

MozReview-Commit-ID: 8ldrMrPqhsV

Comment 8

[Mark Hammond [:markh] [:mhammond]]

Comment on attachment 8893152 [details] [diff] [review]
Part 6: Remove FxAccountsManager now that MOZ_B2G is removed

Review of attachment 8893152 [details] [diff] [review]:
-----------------------------------------------------------------

LGTM, but note there's a reference in services/fxaccounts/moz.build that needs to be removed.

Comment 9

[Eric Rahm [:erahm]]

(In reply to Mark Hammond [:markh] from comment #8)
> Comment on attachment 8893152 [details] [diff] [review]
> Part 6: Remove FxAccountsManager now that MOZ_B2G is removed
> 
> Review of attachment 8893152 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> LGTM, but note there's a reference in services/fxaccounts/moz.build that
> needs to be removed.

Thanks for the quick review! That reference was removed in part 4 which lead me to add this patch.

Comment 10

[Nathan Froyd [:froydnj]]

Comment on attachment 8893097 [details] [diff] [review]
Part 4: Remove remaining instances of MOZ_B2G

Review of attachment 8893097 [details] [diff] [review]:
-----------------------------------------------------------------

::: gfx/gl/GLLibraryEGL.h
@@ +493,5 @@
>          return nullptr;
>      }
>      void UnsetCachedCurrentContext() {}
>      void SetCachedCurrentContext(EGLContext aCtx) { }
>      bool CachedCurrentContextMatches() { return true; }

Might want to file a followup gfx bug about removing these functions and all callers, since the functions are useless now.

Comment 11

[Ben Kelly [:bkelly, not reviewing]]

Comment on attachment 8893089 [details] [diff] [review]
Part 1: Remove MOZ_B2G from dom

Review of attachment 8893089 [details] [diff] [review]:
-----------------------------------------------------------------

r=me with comments addressed.

::: dom/media/AudioStream.cpp
@@ -342,5 @@
>  
> -  if (params.stream_type == CUBEB_STREAM_TYPE_MAX) {
> -    return NS_ERROR_INVALID_ARG;
> -  }
> -#endif

Just to verify, you are are removing this code which currently builds for non-b2g android because the type is never CUBEB_STREAM_TYPE_MAX now?

::: dom/webidl/Window.webidl
@@ -333,5 @@
>  
> -#ifdef MOZ_B2G
> -           attribute EventHandler onmoztimechange;
> -           attribute EventHandler onmoznetworkupload;
> -           attribute EventHandler onmoznetworkdownload;

You need to remove these from nsGkAtomList as well, I believe:

http://searchfox.org/mozilla-central/source/dom/base/nsGkAtomList.h#930
http://searchfox.org/mozilla-central/source/dom/base/nsGkAtomList.h#933
http://searchfox.org/mozilla-central/source/dom/base/nsGkAtomList.h#934

They exist in the servo code as well, but I don't think we need to change that here.

Comment 12

[Eric Rahm [:erahm]]

(In reply to Ben Kelly [:bkelly] from comment #11)
> Comment on attachment 8893089 [details] [diff] [review]
> Part 1: Remove MOZ_B2G from dom
> 
> Review of attachment 8893089 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> r=me with comments addressed.
> 
> ::: dom/media/AudioStream.cpp
> @@ -342,5 @@
> >  
> > -  if (params.stream_type == CUBEB_STREAM_TYPE_MAX) {
> > -    return NS_ERROR_INVALID_ARG;
> > -  }
> > -#endif
> 
> Just to verify, you are are removing this code which currently builds for
> non-b2g android because the type is never CUBEB_STREAM_TYPE_MAX now?

Correct.

> ::: dom/webidl/Window.webidl
> @@ -333,5 @@
> >  
> > -#ifdef MOZ_B2G
> > -           attribute EventHandler onmoztimechange;
> > -           attribute EventHandler onmoznetworkupload;
> > -           attribute EventHandler onmoznetworkdownload;
> 
> You need to remove these from nsGkAtomList as well, I believe:
> 
> http://searchfox.org/mozilla-central/source/dom/base/nsGkAtomList.h#930
> http://searchfox.org/mozilla-central/source/dom/base/nsGkAtomList.h#933
> http://searchfox.org/mozilla-central/source/dom/base/nsGkAtomList.h#934
> 
> They exist in the servo code as well, but I don't think we need to change
> that here.

Thanks for pointing those out, I'll update it before landing.

Comment 13

[Eric Rahm [:erahm]]

(In reply to Nathan Froyd [:froydnj] from comment #10)
> Comment on attachment 8893097 [details] [diff] [review]
> Part 4: Remove remaining instances of MOZ_B2G
> 
> Review of attachment 8893097 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: gfx/gl/GLLibraryEGL.h
> @@ +493,5 @@
> >          return nullptr;
> >      }
> >      void UnsetCachedCurrentContext() {}
> >      void SetCachedCurrentContext(EGLContext aCtx) { }
> >      bool CachedCurrentContextMatches() { return true; }
> 
> Might want to file a followup gfx bug about removing these functions and all
> callers, since the functions are useless now.

Filed bug 1388531.

Comment 14

[Eric Rahm [:erahm]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/b81d58941a44e3ddff4dfd1ef2de1dc3d9b4cabb
Bug 1386825 - Part 1: Remove MOZ_B2G from dom. r=bkelly

https://hg.mozilla.org/integration/mozilla-inbound/rev/b5a05897e1aabaeb436648da86b04e884a48f619
Bug 1386825 - Part 2: Remove MOZ_B2G from toolkit. r=froydnj

https://hg.mozilla.org/integration/mozilla-inbound/rev/2d59ecb2c335032e52afefe2d9ff1f4885710043
Bug 1386825 - Part 3: Remove MOZ_B2G from libpref. r=froydnj

https://hg.mozilla.org/integration/mozilla-inbound/rev/789551f8cfcf39b07a158ac027179b151d6d8a9b
Bug 1386825 - Part 4: Remove remaining instances of MOZ_B2G. r=froydnj

https://hg.mozilla.org/integration/mozilla-inbound/rev/d86804ebc81d75d3cdb9983a29dddcbeae6a2d3f
Bug 1386825 - Part 5: Remove MOZ_B2G from configure. r=glandium

https://hg.mozilla.org/integration/mozilla-inbound/rev/c80bcb046052ce8b25cbacb18d8f7ccfad206a94
Bug 1386825 - Part 6: Remove FxAccountsManager now that MOZ_B2G is removed. r=markh

Comment 15

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/b81d58941a44
https://hg.mozilla.org/mozilla-central/rev/b5a05897e1aa
https://hg.mozilla.org/mozilla-central/rev/2d59ecb2c335
https://hg.mozilla.org/mozilla-central/rev/789551f8cfcf
https://hg.mozilla.org/mozilla-central/rev/d86804ebc81d
https://hg.mozilla.org/mozilla-central/rev/c80bcb046052