Closed Bug 1277234 Opened 4 years ago Closed 4 years ago

Rename key name VolumeUp to AudioVolumeUp

Categories

(Firefox OS Graveyard :: General, defect)

ARM
Gonk (Firefox OS)
defect
Not set

Tracking

(firefox49 fixed)

RESOLVED FIXED
Tracking Status
firefox49 --- fixed

People

(Reporter: gwagner, Unassigned)

References

Details

Attachments

(2 files, 3 obsolete files)

No description provided.
Blocks: 1272578, 1245091
Mulet builds are currently broken because of gecko/widget/NativeKeyToDOMKeyName.h:1015:25: error: 'KEY_NAME_INDEX_AudioVolumeDown' was not declared in this scope
Attached patch patch (obsolete) — Splinter Review
Attached patch patch (obsolete) — Splinter Review
Attachment #8758699 - Attachment is obsolete: true
Attached patch patch (obsolete) — Splinter Review
Attachment #8758700 - Attachment is obsolete: true
Alberto, can you take care of the gaia pieces?
Flags: needinfo?(apastor)
Attachment #8758710 - Flags: review?(masayuki)
Comment on attachment 8758710 [details] [diff] [review]
patch

>diff --git a/widget/NativeKeyToDOMKeyName.h b/widget/NativeKeyToDOMKeyName.h
>--- a/widget/NativeKeyToDOMKeyName.h
>+++ b/widget/NativeKeyToDOMKeyName.h
>@@ -1010,35 +1010,35 @@ KEY_MAP_QT      (AudioBassBoostUp, Qt::K
> 
> // AudioVolumeDown
> KEY_MAP_WIN               (AudioVolumeDown, VK_VOLUME_DOWN)
> KEY_MAP_WIN_CMD           (AudioVolumeDown, APPCOMMAND_VOLUME_DOWN)
> KEY_MAP_COCOA             (AudioVolumeDown, kVK_VolumeDown)
> KEY_MAP_GTK               (AudioVolumeDown, GDK_AudioLowerVolume)
> KEY_MAP_QT                (AudioVolumeDown, Qt::Key_VolumeDown)
> KEY_MAP_ANDROID_EXCEPT_B2G(AudioVolumeDown, AKEYCODE_VOLUME_DOWN)
>-KEY_MAP_B2G               (VolumeDown,      AKEYCODE_VOLUME_DOWN)
>+KEY_MAP_B2G               (AudioVolumeDown, AKEYCODE_VOLUME_DOWN)

Instead of using KEY_MAP_B2G with KEY_MAP_ANDROID_EXCEPT_B2G, just use KEY_MAP_ANDROID which defines a map for both Firefox for Android and B2G.

> // AudioVolumeUp
> KEY_MAP_WIN               (AudioVolumeUp, VK_VOLUME_UP)
> KEY_MAP_WIN_CMD           (AudioVolumeUp, APPCOMMAND_VOLUME_UP)
> KEY_MAP_COCOA             (AudioVolumeUp, kVK_VolumeUp)
> KEY_MAP_GTK               (AudioVolumeUp, GDK_AudioRaiseVolume)
> KEY_MAP_QT                (AudioVolumeUp, Qt::Key_VolumeUp)
> KEY_MAP_ANDROID_EXCEPT_B2G(AudioVolumeUp, AKEYCODE_VOLUME_UP)
>-KEY_MAP_B2G               (VolumeUp,      AKEYCODE_VOLUME_UP)
>+KEY_MAP_B2G               (AudioVolumeUp, AKEYCODE_VOLUME_UP)

Same.

> // AudioVolumeMute
> KEY_MAP_WIN               (AudioVolumeMute, VK_VOLUME_MUTE)
> KEY_MAP_WIN_CMD           (AudioVolumeMute, APPCOMMAND_VOLUME_MUTE)
> KEY_MAP_COCOA             (AudioVolumeMute, kVK_Mute)
> KEY_MAP_GTK               (AudioVolumeMute, GDK_AudioMute)
> KEY_MAP_QT                (AudioVolumeMute, Qt::Key_VolumeMute)
> KEY_MAP_ANDROID_EXCEPT_B2G(AudioVolumeMute, AKEYCODE_VOLUME_MUTE)
>-KEY_MAP_B2G               (VolumeMute,      AKEYCODE_VOLUME_MUTE)
>+KEY_MAP_B2G               (AudioVolumeMute, AKEYCODE_VOLUME_MUTE)

Same.

With those changes, r=masayuki.

Thank you for your work!
Attachment #8758710 - Flags: review?(masayuki) → review+
Attached patch patchSplinter Review
Fix review comments.
Attachment #8758710 - Attachment is obsolete: true
Attachment #8759126 - Flags: review+
That's the only change gaia needs, I think.
Is there any way you can verify if that's correct? Thanks!
Flags: needinfo?(apastor) → needinfo?(anygregor)
Pushed by gwagner@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/17fd76ee110c
Rename key name VolumeUp to AudioVolumeUp. r=masayuki
https://hg.mozilla.org/mozilla-central/rev/17fd76ee110c
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Flags: needinfo?(anygregor)
You need to log in before you can comment on or make changes to this bug.