1098970 - [lollipop] Porting NativeWindow from LL to gonk

Status: RESOLVED FIXED

(Firefox OS Graveyard :: GonkIntegration, defect)

Description

[Peter Chang[:pchang]]

Create this bug to upgrade the NativeWindow from LL to gonk

Comment 1

[Peter Chang[:pchang]]

Boris, please evaluate the difference of NativeWindow between LL and KK

Comment 2

[Boris Chiou [:boris]]

Attachment: libhardware diff (b2g-l branch)

Comment 3

[Boris Chiou [:boris]]

Attachment: framework/native diff (b2g-l branch)

Comment 4

[Boris Chiou [:boris]]

Attachment: framework/native diff (b2g-l branch)

Comment 5

[Boris Chiou [:boris]]

Attachment: libhardware diff (b2g-l branch)

Comment 6

[Boris Chiou [:boris]]

Attachment: [WIP] Part 1: Add new LL native files (v1)

Comment 7

[Boris Chiou [:boris]]

Attachment: [WIP] Part 2: Rename files (v1)

Add the "Gonk" prefix & "LL" suffix, and collect all BufferQueue related
files on Lollipop in one directory.

Comment 8

[Sotaro Ikeda [:sotaro]]

FYI, 

The following is Diagrams of ANativewWindow on Lollipop.
https://github.com/sotaroikeda/android-diagrams/blob/master/graphics/ANativeWindow_5.0.pdf?raw=true

Diagrams of ANativewWindow on JB and KK are in the following.
https://github.com/sotaroikeda/android-diagrams/wiki/Android-Diagrams

Comment 9

[Boris Chiou [:boris]]

(In reply to Sotaro Ikeda [:sotaro] from comment #8)
> FYI, 
> 
> The following is Diagrams of ANativewWindow on Lollipop.
> https://github.com/sotaroikeda/android-diagrams/blob/master/graphics/
> ANativeWindow_5.0.pdf?raw=true
> 
> Diagrams of ANativewWindow on JB and KK are in the following.
> https://github.com/sotaroikeda/android-diagrams/wiki/Android-Diagrams

Thanks, Sotaro. It's a good reference to compare LL with KK.

Comment 10

[Boris Chiou [:boris]]

Attachment: [WIP] Part 3: Fix naming problems (v0.1, under development...)

Fix class naming by adding "Gonk" prefix, and rename Surface &
BufferItemConsumer.

BTW, fix the file mode (remove the execution permission of some
files)

Too many things... This patch is just a backup.

Comment 11

[Boris Chiou [:boris]]

Attachment: [WIP] Part 2: Rename files (v1.1)

Add the "Gonk" prefix & "LL" suffix, and collect all BufferQueue related
files on Lollipop in one directory.

Add new IGonkGraphicBufferConsumer.h to control the version.

Comment 12

[Boris Chiou [:boris]]

Attachment: [WIP] Part 3: Fix naming problems and buffer allocation (v0.2, under development)

1. Fix class naming by adding "Gonk" prefix, and rename Surface &
   BufferItemConsumer.
2. Revise the buffer allocation
3. BTW, fix the file mode (remove the execution permission of some
   files)

Comment 13

[Boris Chiou [:boris]]

Attachment: Part 0: Turn on camera (v1)

Turn on camera and decoder config

Comment 14

[Boris Chiou [:boris]]

Attachment: [WIP] Part 3: Fix naming problems and buffer allocation (v0.3, under development)

1. Fix class naming by adding "Gonk" prefix, and rename Surface &
   BufferItemConsumer.
2. Revise the buffer allocation in GonkNativeWindow(Client)LL.cpp
3. BTW, fix the file mode (remove the execution permission of some
   files)

There are still many compilation errors after renaming. I will fix them
tomorrow.

Comment 15

[Boris Chiou [:boris]]

Attachment: [WIP] Part 3: Fix naming problems and buffer allocation (v0.4)

1. Fix class naming by adding "Gonk" prefix, and rename Surface &
   BufferItemConsumer.
2. Revise the buffer allocation
3. BTW, fix the file mode (remove the execution permission of some
   files)

Comment 16

[Boris Chiou [:boris]]

Attachment: [WIP] Part 2: Rename files (v1.2)

1. Add the "Gonk" prefix & "LL" suffix, and collect all BufferQueue related
   files on Lollipop in one directory.
2. Add new IGonkGraphicBufferConsumer.h to control the version.

Comment 17

[Boris Chiou [:boris]]

Attachment: [WIP] Part 3: Fix naming problems and buffer allocation (v1)

1. Fix class naming by adding "Gonk" prefix, and rename Surface &
   BufferItemConsumer.
2. Revise the buffer allocation
3. BTW, fix the file mode (remove the execution permission of some
   files)

Comment 18

[Boris Chiou [:boris]]

Attachment: [WIP] Part 4: Fix the usage of GonkNativeWindow in OmxDecoder (v1)

Use new APIs for GonkNativeWindowLL.

Comment 19

[Boris Chiou [:boris]]

Attachment: [WIP] Part 3: Fix naming problems and buffer allocation (v1.1)

1. Fix class naming by adding "Gonk" prefix, and rename Surface &
   BufferItemConsumer.
2. Revise the buffer allocation
3. BTW, fix the file mode (remove the execution permission of some
   files)

Comment 20

[Boris Chiou [:boris]]

Attachment: [WIP] Part 3: Fix naming problems and buffer allocation (v1.2)

1. Fix class naming by adding "Gonk" prefix, and rename Surface &
   BufferItemConsumer.
2. Revise the buffer allocation
3. BTW, fix the file mode (remove the execution permission of some
   files)

Comment 21

[Boris Chiou [:boris]]

Attachment: [WIP] Part 4: Fix the usage of GonkNativeWindow in Omx (v1.1)

Use new APIs for GonkNativeWindowLL.

Comment 22

[Boris Chiou [:boris]]

Attachment: Part 5: Turn on omx decoder (v1)

Comment 23

[Boris Chiou [:boris]]

Attachment: [WIP] Part 4: Fix the usage of GonkNativeWindow in Omx (v1.2)

Use new APIs for GonkNativeWindowLL.

Comment 24

[Wenyuan Chi [:wchi]]

Attachment: To workarond NativeWindow linking issue which is casued by symbol visibility.

Comment 25

[Boris Chiou [:boris]]

Attachment: [WIP] Part 3: Fix naming problems and buffer allocation (v2)

1. Fix class naming by adding "Gonk" prefix, and rename Surface &
   BufferItemConsumer.
2. Revise the buffer allocation
3. BTW, fix the file mode (remove the execution permission of some
   files)

rebased.

Comment 26

[Boris Chiou [:boris]]

Attachment: [WIP] Part 4: Fix the usage of GonkNativeWindow in Omx (v2)

Use new APIs for GonkNativeWindowLL.

rebased.

Comment 27

[Boris Chiou [:boris]]

Attachment: [WIP] Part 5: Fix link errors casued by symbol visibility. (v1)

We got some link errors:
ex.
/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/../lib/gcc/arm-linux-androideabi/4.8/../../../../arm-linux-androideabi/bin/ld:
error:
/objdir-gecko/toolkit/library/../../widget/gonk/nativewindow/GonkBufferQueueProducer.o:
requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC

Use the workaround to fix these problems.

Comment 28

[Boris Chiou [:boris]]

(In reply to Boris Chiou [:boris] from comment #27)
> Created attachment 8536408 [details] [diff] [review]
> [WIP] Part 5: Fix link errors casued by symbol visibility. (v1)
> 
> We got some link errors:
> ex.
> /prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/../lib/gcc/arm-linux-androideabi/4.8/../../../../arm-linux-androideabi/bin/ld: error: /objdir-gecko/toolkit/library/../../widget/gonk/nativewindow/GonkBufferQueueProducer.o: requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC
> 
> /prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/../lib/gcc/arm-linux-androideabi/4.8/../../../../arm-linux-androideabi/bin/ld: error: /objdir-gecko/toolkit/library/../../widget/gonk/nativewindow/GonkNativeWindowClientLL.o: requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC
>
> /prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/../lib/gcc/arm-linux-androideabi/4.8/../../../../arm-linux-androideabi/bin/ld: error: hidden symbol '_ZN7android5FenceD1Ev' is not defined locally
>
> Use the workaround to fix these problems.

Hi, Michael
After adding these files from aosp, we got some link errors which may be caused by the symbol visibility. So the part 5 (Attachment 8536408 [details] [diff]) use a workaround method to make it to be built successfully. Do you have any other possible good idea to fix this linking problem?
Thank you.

Comment 29

[Michael Wu [:mwu]]

I need all of the errors to debug something like this.

Comment 30

[Boris Chiou [:boris]]

Attachment: link_errors.txt

Comment 31

[Boris Chiou [:boris]]

(In reply to Michael Wu [:mwu] from comment #29)
> I need all of the errors to debug something like this.

OK, Please check attachment 8536919 [details]. I copy the linking part into the text file. Thanks.

Comment 32

[Boris Chiou [:boris]]

Attachment: Part 1: Add new LL native files (v2)

Copied from aosp/framework/native/gui.

Comment 33

[Boris Chiou [:boris]]

Attachment: Part 2: Rename files (v2)

1. Add the "Gonk" prefix & "LL" suffix, and collect all BufferQueue related
   files on Lollipop in one directory.
2. Add new IGonkGraphicBufferConsumer.h to control the version.

Comment 34

[Boris Chiou [:boris]]

Attachment: Part 3: Fix naming problems and buffer allocation (v3)

1. Fix class naming by adding "Gonk" prefix, and rename Surface &
   BufferItemConsumer.
2. Revise the buffer allocation
3. BTW, fix the file mode (remove the execution permission of some
   files)

Comment 35

[Boris Chiou [:boris]]

Attachment: Part 4: Fix the usage of GonkNativeWindow in Omx (v3)

Use new APIs for GonkNativeWindowLL.

Comment 36

[Boris Chiou [:boris]]

Attachment: Part 6: Turn on omx decoder (v1)

Comment 37

[Boris Chiou [:boris]]

Attachment: Part 2: Rename files (v3)

1. Add the "Gonk" prefix & "LL" suffix, and collect all BufferQueue related
   files on Lollipop in one directory.
2. Add new IGonkGraphicBufferConsumer.h to control the version.

Comment 38

[Boris Chiou [:boris]]

Attachment: Part 3: Fix naming problems and buffer allocation (v4)

1. Fix class naming by adding "Gonk" prefix, and rename Surface &
   BufferItemConsumer.
2. Revise the buffer allocation
3. BTW, fix the file mode (remove the execution permission of some
   files)

Comment 39

[Michael Wu [:mwu]]

Comment on attachment 8536976 [details] [diff] [review]
Part 1: Add new LL native files (v2)

Sotaro owns this.

Comment 40

[Sotaro Ikeda [:sotaro]]

Boris Chiou, how can I try doing Lollipop build? Before doing review, I want to try the build.

Comment 41

[Boris Chiou [:boris]]

(In reply to Sotaro Ikeda [:sotaro] from comment #40)
> Boris Chiou, how can I try doing Lollipop build? Before doing review, I want
> to try the build.

Sure, just follow the steps:

1. git clone https://github.com/Seinlin/B2G -b b2g-5.0
2. cd B2G
3. BRANCH=b2g-l ./config.sh nexus-5-l
4. ./build.sh

Note:
After you run the build.sh, it will apply some temporary patches to avoid build break from "B2G/patches/all-hammerhead/gecko".

Comment 42

[Kai-Chih Hu [:khu]]

+ this one, based on the comment I got from Peter: 
"We should include this bug into 2.2 because it's part of work for L porting. And this patch is necessary to enable the camera/video for v 2.2 with L."

Comment 43

[Boris Chiou [:boris]]

Attachment: link_errors on gui/IProducerListener

Comment 44

[Boris Chiou [:boris]]

(In reply to Boris Chiou [:boris] from comment #43)
> Created attachment 8537692 [details]
> link_errors on gui/IProducerListener

It looks like we can not see the IProcuderListener in GonkNativeWindowClientLL.cpp.

Comment 45

[Boris Chiou [:boris]]

Attachment: Part 5: Fix link errors casued by symbol visibility. (v2)

Use the NO_VISIBILITY_FLAGS flag to fix the hidden symbol visibility.

Comment 46

[Boris Chiou [:boris]]

(In reply to Boris Chiou [:boris] from comment #45)
> Created attachment 8537743 [details] [diff] [review]
> Part 5: Fix link errors casued by symbol visibility. (v2)
> 
> Use the NO_VISIBILITY_FLAGS flag to fix the hidden symbol visibility.

Use this flag to fix the link errors:
Reference: Bug 1001320

Comment 47

[Boris Chiou [:boris]]

Attachment: Part 5: Fix link errors casued by symbol visibility. (v3)

Use the NO_VISIBILITY_FLAGS flag to fix the hidden symbol visibility and
some warnings.

Comment 48

[Boris Chiou [:boris]]

(In reply to Boris Chiou [:boris] from comment #47)
> Created attachment 8537748 [details] [diff] [review]
> Part 5: Fix link errors casued by symbol visibility. (v3)
> 
> Use the NO_VISIBILITY_FLAGS flag to fix the hidden symbol visibility and
> some warnings.

Use NO_VISIBILITY_FLAGS to fix the link errors:
Reference: Bug 1001320

Comment 49

[Sotaro Ikeda [:sotaro]]

Comment on attachment 8536976 [details] [diff] [review]
Part 1: Add new LL native files (v2)

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

Files are added under widget/gonk/nativewindow/LL/ It seems not consistent with other patches like "/widget/gonk/nativewindow/GonkBufferQueueLL/". Can you update the patch as to be consistent?

And this patch seems to add file that do not need moficiation for gonk. One example is "Surface.cpp". I want to prevent to add such files.

Comment 50

[Sotaro Ikeda [:sotaro]]

Comment on attachment 8537030 [details] [diff] [review]
Part 2: Rename files (v3)

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

This patch remove current implementation and create new file. It lose git history info. Can you move/re-name a file as not to lose the git history? Bug 959505 Comment 22 is similar comment for KK.

Comment 51

[Boris Chiou [:boris]]

Attachment: Part 1: Add new LL native files (v3)

Copied from aosp/framework/native/gui.

Comment 52

[Boris Chiou [:boris]]

Attachment: Part 2: Rename files (v4)

Add the "Gonk" prefix & "LL" suffix, and collect all BufferQueue
related files on Lollipop in one directory.

Comment 53

[Boris Chiou [:boris]]

Attachment: Part 3: Add new files for Nativewindow (v1)

1. Copied Surface.* and rename them as GonkNativeWindowClientLL.*
2. Copied BufferItemConsumer.* and rename them as GonkNativeWindowLL.*
3. Add new IGonkGraphicBufferConsumer.h to control the version
4. Fix the file mode for some JB files (remove execute permission)

Comment 54

[Boris Chiou [:boris]]

Attachment: Part 4: Fix naming problems and buffer allocation (v5)

1. Fix class naming by adding "Gonk" prefix, and rename Surface
   & BufferItemConsumer.
2. Revise the buffer allocation

Comment 55

[Boris Chiou [:boris]]

Attachment: Part 5: Fix link errors casued by symbol visibility (v4)

Use the NO_VISIBILITY_FLAGS flag to fix the hidden symbol visibility and
some warnings.

Comment 56

[Boris Chiou [:boris]]

Attachment: Part 6: Fix the usage of GonkNativeWindow in Omx (v4)

Use new APIs for GonkNativeWindowLL.

Comment 57

[Boris Chiou [:boris]]

Attachment: Part 7: Turn on omx decoder (v2)

Comment 58

[Boris Chiou [:boris]]

(In reply to Sotaro Ikeda [:sotaro PTO Dec/24-Jan/6] from comment #49)
> Comment on attachment 8536976 [details] [diff] [review]
> Part 1: Add new LL native files (v2)
> 
> Review of attachment 8536976 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> Files are added under widget/gonk/nativewindow/LL/ It seems not consistent
> with other patches like "/widget/gonk/nativewindow/GonkBufferQueueLL/". Can
> you update the patch as to be consistent?
> 
> And this patch seems to add file that do not need moficiation for gonk. One
> example is "Surface.cpp". I want to prevent to add such files.

OK, I copied into "/widget/gonk/nativewindow/GonkBufferQueueLL/" directly and didn't copy the Surface.* and BufferItemConsumer.* in this patch.

Comment 59

[Boris Chiou [:boris]]

(In reply to Sotaro Ikeda [:sotaro PTO Dec/24-Jan/6] from comment #50)
> Comment on attachment 8537030 [details] [diff] [review]
> Part 2: Rename files (v3)
> 
> Review of attachment 8537030 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> This patch remove current implementation and create new file. It lose git
> history info. Can you move/re-name a file as not to lose the git history?
> Bug 959505 Comment 22 is similar comment for KK.

How about the newer part 2? In part 2, I only "git mv" these files so you can see the git history.

In conclusion:
Part 1: only copy these files from aosp (except for Surface and BufferItemConsumer)
Part 2: only rename these files in part 1
Part 3: copy Surface and BufferItemConsumer and rename their filenames as
        GonkNativeWindowClientLL and GonkNativeWindowLL
Part 4: Fix class names and the allocator
Part 5: Fix hidden symbol link errors
Part 6: Use new APIs in the omx decoder
Part 7: Turn on the omx decoder

Comment 60

[Sotaro Ikeda [:sotaro]]

Comment on attachment 8538304 [details] [diff] [review]
Part 5: Fix link errors casued by symbol visibility (v4)

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

From Bug 961264 Comment 15, isn't "NO_VISIBILITY_FLAGS = True' enough to fix the link problem?

Comment 61

[Sotaro Ikeda [:sotaro]]

(In reply to Boris Chiou [:boris] from comment #59)
> (In reply to Sotaro Ikeda [:sotaro PTO Dec/24-Jan/6] from comment #50)
> > Comment on attachment 8537030 [details] [diff] [review]
> > Part 2: Rename files (v3)
> > 
> > Review of attachment 8537030 [details] [diff] [review]:
> > -----------------------------------------------------------------
> > 
> > This patch remove current implementation and create new file. It lose git
> > history info. Can you move/re-name a file as not to lose the git history?
> > Bug 959505 Comment 22 is similar comment for KK.
> 
> How about the newer part 2? In part 2, I only "git mv" these files so you
> can see the git history.

Thanks, it is good!

Comment 62

[Sotaro Ikeda [:sotaro]]

Boris, GonkNativeWindow is also used for Camera and WebRTC. Is there a bug for them?

Comment 63

[Boris Chiou [:boris]]

(In reply to Sotaro Ikeda [:sotaro PTO Dec/24-Jan/6] from comment #62)
> Boris, GonkNativeWindow is also used for Camera and WebRTC. Is there a bug
> for them?

Yes, for camera: Bug 1107300. They have to cherry-pick my patches to work. (We already verified these patches on camera.)

Unfortunately, I don't know which bug is about WebRTC right now. Maybe we should create a new one.

Comment 64

[Boris Chiou [:boris]]

Attachment: Part 4: Fix naming problems and buffer allocation (v6)

1. Fix class naming by adding "Gonk" prefix, and rename Surface
   & BufferItemConsumer.
2. Revise the buffer allocation

Comment 65

[Boris Chiou [:boris]]

Attachment: Part 5: Fix link errors casued by symbol visibility (v5)

Use the NO_VISIBILITY_FLAGS flag to fix the hidden symbol visibility and
some warnings.

Comment 66

[Boris Chiou [:boris]]

(In reply to Sotaro Ikeda [:sotaro PTO Dec/24-Jan/6] from comment #60)
> Comment on attachment 8538304 [details] [diff] [review]
> Part 5: Fix link errors casued by symbol visibility (v4)
> 
> Review of attachment 8538304 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> From Bug 961264 Comment 15, isn't "NO_VISIBILITY_FLAGS = True' enough to fix
> the link problem?

Yes, you are right. I uploaded a new patch to remove the redundant code. Thanks.

Comment 67

[Boris Chiou [:boris]]

Attachment: Part 7: Turn on omx decoder (v3)

rebased.

Comment 68

[Sotaro Ikeda [:sotaro]]

Comment on attachment 8539913 [details] [diff] [review]
Part 7: Turn on omx decoder (v3)

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

Change to "configure.in" needs build peers review+. mwu seems correct person for it.

Comment 69

[Sotaro Ikeda [:sotaro]]

And before check-in, please check if the change does not break other b2g(ICS,JB,KK) builds by using tryserver.

Comment 70

[Boris Chiou [:boris]]

(In reply to Sotaro Ikeda [:sotaro PTO Dec/24-Jan/6] from comment #69)
> And before check-in, please check if the change does not break other
> b2g(ICS,JB,KK) builds by using tryserver.

Sure, I will upload to try server to check this. Thanks.

Comment 71

[Boris Chiou [:boris]]

(In reply to Sotaro Ikeda [:sotaro PTO Dec/24-Jan/6] from comment #68)
> Comment on attachment 8539913 [details] [diff] [review]
> Part 7: Turn on omx decoder (v3)
> 
> Review of attachment 8539913 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> Change to "configure.in" needs build peers review+. mwu seems correct person
> for it.

OK, I also send a review request to mwu. Thanks for your review.

Comment 72

[Boris Chiou [:boris]]

(In reply to Boris Chiou [:boris] from comment #70)
> (In reply to Sotaro Ikeda [:sotaro PTO Dec/24-Jan/6] from comment #69)
> > And before check-in, please check if the change does not break other
> > b2g(ICS,JB,KK) builds by using tryserver.
> 
> Sure, I will upload to try server to check this. Thanks.

Try server
https://treeherder.mozilla.org/#/jobs?repo=try&revision=98191551229f

Comment 73

[Boris Chiou [:boris]]

Attachment: Part 4: Fix naming problems and buffer allocation (v7, carry sotaro's r+)

1. Fix class naming by adding "Gonk" prefix, and rename Surface
   & BufferItemConsumer.
2. Revise the buffer allocation

Fix JB build error

Comment 74

[Boris Chiou [:boris]]

(In reply to Boris Chiou [:boris] from comment #72)
> (In reply to Boris Chiou [:boris] from comment #70)
> > (In reply to Sotaro Ikeda [:sotaro PTO Dec/24-Jan/6] from comment #69)
> > > And before check-in, please check if the change does not break other
> > > b2g(ICS,JB,KK) builds by using tryserver.
> > 
> > Sure, I will upload to try server to check this. Thanks.
> 
> Try server
> https://treeherder.mozilla.org/#/jobs?repo=try&revision=98191551229f

try server
https://treeherder.mozilla.org/#/jobs?repo=try&revision=22842fffcb40

Comment 75

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/integration/b2g-inbound/rev/b8ecf0c5376f
https://hg.mozilla.org/integration/b2g-inbound/rev/6b38930f9b8d
https://hg.mozilla.org/integration/b2g-inbound/rev/0e3d56a06b45
https://hg.mozilla.org/integration/b2g-inbound/rev/849ac120d398
https://hg.mozilla.org/integration/b2g-inbound/rev/c85328d6565a
https://hg.mozilla.org/integration/b2g-inbound/rev/7e39cc7d3cf6
https://hg.mozilla.org/integration/b2g-inbound/rev/51dbdc8d2104

Comment 76

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/b8ecf0c5376f
https://hg.mozilla.org/mozilla-central/rev/6b38930f9b8d
https://hg.mozilla.org/mozilla-central/rev/0e3d56a06b45
https://hg.mozilla.org/mozilla-central/rev/849ac120d398
https://hg.mozilla.org/mozilla-central/rev/c85328d6565a
https://hg.mozilla.org/mozilla-central/rev/7e39cc7d3cf6
https://hg.mozilla.org/mozilla-central/rev/51dbdc8d2104