Closed Bug 914544 Opened 11 years ago Closed 11 years ago

Update GonkDisplayJB to support JB MR1

Categories

(Core Graveyard :: Widget: Gonk, defect)

All
Gonk (Firefox OS)
defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED
mozilla26

People

(Reporter: vlin, Assigned: vlin)

Details

Attachments

(1 file, 1 obsolete file)

      No description provided.
Component: General → Widget: Gonk
Product: Boot2Gecko → Core
Hardware: ARM → All
Target Milestone: --- → mozilla25
Attached patch bug-914544-fix.patch (obsolete) — Splinter Review
This patch is to make GonkDisplayJB support JB MR1 by ANDROID_VERSION.
Attachment #802152 - Flags: review?(mwu)
Comment on attachment 802152 [details] [diff] [review]
bug-914544-fix.patch

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

::: widget/gonk/libdisplay/GonkDisplayJB.cpp
@@ +231,5 @@
>      mList->hwLayers[1].visibleRegionScreen.numRects = 1;
>      mList->hwLayers[1].visibleRegionScreen.rects = &mList->hwLayers[1].sourceCrop;
>      mList->hwLayers[1].acquireFenceFd = fence;
>      mList->hwLayers[1].releaseFenceFd = -1;
> +#if ANDROID_VERSION == 18

I would prefer ANDROID_VERSION >= 17

::: widget/gonk/libdisplay/moz.build
@@ +25,5 @@
>          'FramebufferSurface.cpp',
>          'GraphicBufferAlloc.cpp',
>          'GonkDisplayJB.cpp',
>      ]
> +elif CONFIG['ANDROID_VERSION'] == '17':

Can we combine this check with the previous check?
(In reply to Michael Wu [:mwu] from comment #2)
> Comment on attachment 802152 [details] [diff] [review]
> bug-914544-fix.patch
> 
> Review of attachment 802152 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: widget/gonk/libdisplay/GonkDisplayJB.cpp
> @@ +231,5 @@
> >      mList->hwLayers[1].visibleRegionScreen.numRects = 1;
> >      mList->hwLayers[1].visibleRegionScreen.rects = &mList->hwLayers[1].sourceCrop;
> >      mList->hwLayers[1].acquireFenceFd = fence;
> >      mList->hwLayers[1].releaseFenceFd = -1;
> > +#if ANDROID_VERSION == 18
> 
> I would prefer ANDROID_VERSION >= 17
> 
> ::: widget/gonk/libdisplay/moz.build
> @@ +25,5 @@
> >          'FramebufferSurface.cpp',
> >          'GraphicBufferAlloc.cpp',
> >          'GonkDisplayJB.cpp',
> >      ]
> > +elif CONFIG['ANDROID_VERSION'] == '17':
> 
> Can we combine this check with the previous check?

Well, I'm about to remove GraphicBufferAlloc.cpp from ANDROID_VERSION 18 in Bug 914554.
So they were different cases.
Update the latest patch for review.
Attachment #802152 - Attachment is obsolete: true
Attachment #802152 - Flags: review?(mwu)
Attachment #803466 - Flags: review?(mwu)
Attachment #803466 - Flags: review?(mwu) → review+
Keywords: checkin-needed
Target Milestone: mozilla25 → ---
https://hg.mozilla.org/integration/b2g-inbound/rev/c75276c71126

Please use your full name in the hg commit information (bonus points for using it in bugzilla as well).
Keywords: checkin-needed
https://hg.mozilla.org/mozilla-central/rev/c75276c71126
Status: NEW → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla26
Comment on attachment 803466 [details] [diff] [review]
bug-914544-fix.patch

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

::: widget/gonk/libdisplay/moz.build
@@ +19,5 @@
>  CPP_SOURCES += [
>      'BootAnimation.cpp',
>  ]
>  
> +if CONFIG['ANDROID_VERSION'] >= '17':

Does this really work correctly with strings?
Product: Core → Core Graveyard
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: