Closed Bug 1474034 Opened Last year Closed 10 months ago

Use consistent prefixes for POD struct members in gfx/vr/external_api/moz_external_vr.h

Categories

(Core :: WebVR, enhancement)

59 Branch
enhancement
Not set

Tracking

()

RESOLVED FIXED
mozilla66
Tracking Status
firefox66 --- fixed

People

(Reporter: kip, Assigned: thomasmo)

Details

Attachments

(2 files)

Due to much refactoring, the members of structs defined in moz_external_vr have inconsistent prefixing.

Some are prefixed with "m" while others are simply camelCase.

I would suggest for simple POD structs that we drop the prefix and use camelCase.
Assignee: kgilbert → thomasmo
This change updates the structs VRDisplayState, VRLayer_2D_Content, and VRLayer_Stereo_Immersive to
not have 'm' prefix for its members.
Attachment #9033002 - Flags: checkin?(kgilbert)
Pushed by kgilbert@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/87fae5f294b8
Use consistent prefixes for POD struct members in gfx/vr/external_api/moz_external_vr.h r=kip
Attachment #9033002 - Flags: checkin?(kgilbert) → checkin+

Backed out changeset 87fae5f294b8 (Bug 1474034) for VRDisplayHost.cpp build bustages.

Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&revision=87fae5f294b84221e4260b8c03b5883d365b9144&selectedJob=220385789

Backout link: https://hg.mozilla.org/integration/autoland/rev/600572209eb7a9c656c4f3bc19aba10422d525f7

Failure log: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=220385813&repo=autoland&lineNumber=17781
https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=220385805&repo=autoland&lineNumber=19061

[task 2019-01-07T19:15:36.343Z] 19:15:36 INFO - make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/gfx/vr'
[task 2019-01-07T19:15:36.350Z] 19:15:36 INFO - /builds/worker/workspace/build/src/sccache2/sccache /builds/worker/workspace/build/src/clang/bin/clang++ --target=aarch64-linux-android -o VRDisplayHost.o -c -I/builds/worker/workspace/build/src/obj-firefox/dist/stl_wrappers -I/builds/worker/workspace/build/src/obj-firefox/dist/system_wrappers -include /builds/worker/workspace/build/src/config/gcc_hidden.h -DNDEBUG=1 -DTRIMMED=1 -DOS_POSIX=1 -DOS_LINUX=1 -DSTATIC_EXPORTABLE_JS_API -DMOZ_HAS_MOZGLUE -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -I/builds/worker/workspace/build/src/gfx/vr -I/builds/worker/workspace/build/src/obj-firefox/gfx/vr -I/builds/worker/workspace/build/src/dom/base -I/builds/worker/workspace/build/src/gfx/layers/d3d11 -I/builds/worker/workspace/build/src/gfx/thebes -I/builds/worker/workspace/build/src/widget/android -I/builds/worker/workspace/build/src/obj-firefox/ipc/ipdl/ipdlheaders -I/builds/worker/workspace/build/src/ipc/chromium/src -I/builds/worker/workspace/build/src/ipc/glue -I/builds/worker/workspace/build/src/obj-firefox/dist/include -I/builds/worker/workspace/build/src/obj-firefox/dist/include/nspr -I/builds/worker/workspace/build/src/obj-firefox/dist/include/nss -fPIC -DMOZILLA_CLIENT -include /builds/worker/workspace/build/src/obj-firefox/mozilla-config.h -Qunused-arguments -isystem /builds/worker/workspace/build/src/android-ndk/sysroot/usr/include/aarch64-linux-android -isystem /builds/worker/workspace/build/src/android-ndk/sysroot/usr/include -gcc-toolchain /builds/worker/workspace/build/src/android-ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64 -D__ANDROID_API_=21 -fstack-protector-strong -Qunused-arguments -Wall -Wbitfield-enum-conversion -Wempty-body -Wignored-qualifiers -Woverloaded-virtual -Wpointer-arith -Wshadow-field-in-constructor-modified -Wsign-compare -Wtype-limits -Wunreachable-code -Wunreachable-code-return -Wwrite-strings -Wno-invalid-offsetof -Wclass-varargs -Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis -Wc++1z-compat -Wc++2a-compat -Wcomma -Wimplicit-fallthrough -Werror=non-literal-null-conversion -Wstring-conversion -Wtautological-overlap-compare -Wtautological-unsigned-enum-zero-compare -Wtautological-unsigned-zero-compare -Wno-inline-new-delete -Wno-error=deprecated-declarations -Wno-error=array-bounds -Wno-error=return-std-move -Wno-error=atomic-alignment -Wformat -Wformat-security -Wno-gnu-zero-variadic-macro-arguments -Wno-unknown-warning-option -Wno-return-type-c-linkage -fno-sized-deallocation -fno-short-enums -fno-exceptions -I/builds/worker/workspace/build/src/android-ndk/sources/cxx-stl/llvm-libc++/include -I/builds/worker/workspace/build/src/android-ndk/sources/android/support/include -I/builds/worker/workspace/build/src/android-ndk/sources/cxx-stl/llvm-libc++abi/include -fstack-protector-strong -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -fno-math-errno -pipe -g -Oz -mno-outline -fno-omit-frame-pointer -funwind-tables -Werror -I/builds/worker/workspace/build/src/obj-firefox/dist/include/cairo -I/builds/worker/workspace/build/src/obj-firefox/dist/include/cairo -MD -MP -MF .deps/VRDisplayHost.o.pp /builds/worker/workspace/build/src/gfx/vr/VRDisplayHost.cpp
[task 2019-01-07T19:15:36.350Z] 19:15:36 ERROR - /builds/worker/workspace/build/src/gfx/vr/VRDisplayHost.cpp:192:34: error: no member named 'lastSubmittedFrameId' in 'mozilla::gfx::VRDisplayState'; did you mean 'mLastSubmittedFrameId'?
[task 2019-01-07T19:15:36.350Z] 19:15:36 INFO - mDisplayInfo.mDisplayState.lastSubmittedFrameId < mLastStartedFrame &&
[task 2019-01-07T19:15:36.350Z] 19:15:36 INFO - ^~~~~~~~~~~~~~~~~~~~
[task 2019-01-07T19:15:36.350Z] 19:15:36 INFO - mLastSubmittedFrameId
[task 2019-01-07T19:15:36.350Z] 19:15:36 INFO - /builds/worker/workspace/build/src/obj-firefox/dist/include/moz_external_vr.h:275:12: note: 'mLastSubmittedFrameId' declared here
[task 2019-01-07T19:15:36.350Z] 19:15:36 INFO - uint64_t mLastSubmittedFrameId;
[task 2019-01-07T19:15:36.350Z] 19:15:36 INFO - ^
[task 2019-01-07T19:15:36.350Z] 19:15:36 ERROR - /builds/worker/workspace/build/src/gfx/vr/VRDisplayHost.cpp:335:38: error: no member named 'lastSubmittedFrameId' in 'mozilla::gfx::VRDisplayState'; did you mean 'mLastSubmittedFrameId'?
[task 2019-01-07T19:15:36.350Z] 19:15:36 INFO - mDisplayInfo.mDisplayState.lastSubmittedFrameId) {
[task 2019-01-07T19:15:36.350Z] 19:15:36 INFO - ^~~~~~~~~~~~~~~~~~~~
[task 2019-01-07T19:15:36.350Z] 19:15:36 INFO - mLastSubmittedFrameId
[task 2019-01-07T19:15:36.350Z] 19:15:36 INFO - /builds/worker/workspace/build/src/obj-firefox/dist/include/moz_external_vr.h:275:12: note: 'mLastSubmittedFrameId' declared here
[task 2019-01-07T19:15:36.351Z] 19:15:36 INFO - uint64_t mLastSubmittedFrameId;
[task 2019-01-07T19:15:36.351Z] 19:15:36 INFO - ^
[task 2019-01-07T19:15:36.351Z] 19:15:36 INFO - 2 errors generated.
[task 2019-01-07T19:15:36.351Z] 19:15:36 INFO - /builds/worker/workspace/build/src/config/rules.mk:1119: recipe for target 'VRDisplayHost.o' failed
[task 2019-01-07T19:15:36.351Z] 19:15:36 ERROR - make[4]: *** [VRDisplayHost.o] Error 1
[task 2019-01-07T19:15:36.352Z] 19:15:36 INFO - make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/gfx/vr'
[task 2019-01-07T19:15:36.352Z] 19:15:36 INFO - /builds/worker/workspace/build/src/config/recurse.mk:74: recipe for target 'gfx/vr/target' failed
[task 2019-01-07T19:15:36.353Z] 19:15:36 ERROR - make[3]: *** [gfx/vr/target] Error 2
[task 2019-01-07T19:15:36.353Z] 19:15:36 INFO - make[3]: *** Waiting for unfinished jobs....

Flags: needinfo?(thomasmo)

Looks like rebase stomped on most of my changes.
Will update before EoD.

This change updates the structs VRDisplayState, VRLayer_2D_Content, and VRLayer_Stereo_Immersive to not have 'm' prefix for its members.
Flags: needinfo?(thomasmo)
Attachment #9035199 - Flags: checkin?(kgilbert)

:kip , could you please review the patch?

Flags: needinfo?(kgilbert)

(In reply to Narcis Beleuzu [:NarcisB] from comment #6)

:kip , could you please review the patch?

Done. This looks good.

Flags: needinfo?(kgilbert)
Pushed by nbeleuzu@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/68dc096dab03
Use consistent prefixes for POD struct members in gfx/vr/external_api/moz_external_vr.h r=kip

Comment on attachment 9035199 [details]
Bug 1474034 - Use consistent prefixes for POD struct members in gfx/vr/external_api/moz_external_vr.h

In the future, please just use the checkin-needed keyword when a patch is ready to land. It works better with the automated bug marking tools we use.

Attachment #9035199 - Flags: checkin?(kgilbert) → checkin+

Got it--thanks :RyanVM!

Status: NEW → RESOLVED
Closed: 10 months ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla66
You need to log in before you can comment on or make changes to this bug.