This is not a refactor as code is already structured in a way that allows it to be moved into separate files. No logic will change. Code will just be moved.
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/14eadaf794449e31e443c09272cb6d6da655666d commit 14eadaf794449e31e443c09272cb6d6da655666d Author: David Reveman <reveman@chromium.org> Date: Thu May 10 22:10:14 2018 vm_tools: add sommelier header. Add header in preparation for split into multiple files. Also removes the version header in favor of using sommelier.h. No changes in logic. BUG= chromium:841106 TEST=builds TBR=smbarber@chromium.org Change-Id: Ie10956000f755af87bedad8cc06bacba54fb8c85 Reviewed-on: https://chromium-review.googlesource.com/1051051 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/14eadaf794449e31e443c09272cb6d6da655666d/vm_tools/sommelier/sommelier.c [add] https://crrev.com/14eadaf794449e31e443c09272cb6d6da655666d/vm_tools/sommelier/sommelier.h [delete] https://crrev.com/901e383b22f98cff8a723982879dba54ba0b90a1/vm_tools/sommelier/version.h
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/f09bf0d66e1a0239f599348d13534f28b7b4c6eb commit f09bf0d66e1a0239f599348d13534f28b7b4c6eb Author: David Reveman <reveman@chromium.org> Date: Fri May 18 17:05:25 2018 vm_tools: sommelier: Add README.md file. This adds a markdown README file with more details about sommelier. BUG= chromium:841106 TEST=None Change-Id: I76866490641fbd094016bc5eb284a7ce38352097 Reviewed-on: https://chromium-review.googlesource.com/1064017 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org> [delete] https://crrev.com/4da77457e3cbac2f7b935d13c3cb0e7338d2724d/vm_tools/sommelier/README [add] https://crrev.com/f09bf0d66e1a0239f599348d13534f28b7b4c6eb/vm_tools/sommelier/README.md
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/66cce16ab74bdd4fab3922c5d23a36ee9d7f79a0 commit 66cce16ab74bdd4fab3922c5d23a36ee9d7f79a0 Author: David Reveman <reveman@chromium.org> Date: Sat May 19 16:23:17 2018 vm_tools: sommelier: require version 6 of aura shell Require version 6 or don't use aura shell. This removes a bunch of unnecessary complexity that is not really needed as latest dev-channel release of chrome supports version 6. BUG= chromium:841106 TEST=None Change-Id: I186fdba965e2271fc5cc57a4d639ca5974a0dc3b Reviewed-on: https://chromium-review.googlesource.com/1066890 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/66cce16ab74bdd4fab3922c5d23a36ee9d7f79a0/vm_tools/sommelier/sommelier.c
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/6ac61415b2ba6b0e809fb75b849cfe99a59ed4ac commit 6ac61415b2ba6b0e809fb75b849cfe99a59ed4ac Author: David Reveman <reveman@chromium.org> Date: Tue May 22 07:21:28 2018 vm_tools: sommelier: remove old xwl prefix Use 'sl' prefix instead of xwl throughout the code. This is short enough to keep the code easy to read without causing any naming conflicts. struct xwl is also changing name to sl_context as part of this change. This effectively does: s/struct xwl/struct sl_context/ s/xwl_/sl_/ s/xwl/ctx/ No change to logic. BUG= chromium:841106 TEST=emerge-tatl termina_container_tools TBR=smbarber@chromium.org Change-Id: I8abe5c67f14c858f6961da77f83bb695e8e16b08 Reviewed-on: https://chromium-review.googlesource.com/1067090 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/6ac61415b2ba6b0e809fb75b849cfe99a59ed4ac/vm_tools/sommelier/sommelier.c
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/6da6765e24fccffda814845cc7f677dc4d6fb350 commit 6da6765e24fccffda814845cc7f677dc4d6fb350 Author: David Reveman <reveman@chromium.org> Date: Wed May 23 01:45:46 2018 vm_tools: sommelier: extract gtk-shell code into .c file Move code that implements gtk-shell interface into its own .c file. No change to logic. BUG= chromium:841106 TEST=emerge-tatl termina_container_tools Change-Id: Ifa537ac681286443700b7c4d0386396586c31c7b Reviewed-on: https://chromium-review.googlesource.com/1067091 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [add] https://crrev.com/6da6765e24fccffda814845cc7f677dc4d6fb350/vm_tools/sommelier/sommelier-gtk-shell.c [modify] https://crrev.com/6da6765e24fccffda814845cc7f677dc4d6fb350/vm_tools/sommelier/sommelier.c [modify] https://crrev.com/6da6765e24fccffda814845cc7f677dc4d6fb350/vm_tools/sommelier/sommelier.h [modify] https://crrev.com/6da6765e24fccffda814845cc7f677dc4d6fb350/vm_tools/sommelier/sommelier.gyp
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/6b6ed7a1430f63a32b35327a4e53f9a6141d61c6 commit 6b6ed7a1430f63a32b35327a4e53f9a6141d61c6 Author: David Reveman <reveman@chromium.org> Date: Wed May 23 08:25:51 2018 vm_tools: sommelier: implement viewporter interface This allows applications to delegate scaling and cropping to the host compositor. This is useful for efficient video playback. It also allows sommelier to run on top of another sommelier instance without losing proper scaling support. This is useful for debugging purposes. BUG= chromium:841106 TEST=weston-scale works as expected Change-Id: Ic02478db2d3548c7b1bddedb17efaf674b0f8271 Reviewed-on: https://chromium-review.googlesource.com/1067155 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/6b6ed7a1430f63a32b35327a4e53f9a6141d61c6/vm_tools/sommelier/sommelier.c [modify] https://crrev.com/6b6ed7a1430f63a32b35327a4e53f9a6141d61c6/vm_tools/sommelier/sommelier.h [modify] https://crrev.com/6b6ed7a1430f63a32b35327a4e53f9a6141d61c6/vm_tools/sommelier/sommelier.gyp [add] https://crrev.com/6b6ed7a1430f63a32b35327a4e53f9a6141d61c6/vm_tools/sommelier/sommelier-viewporter.c
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/c84d5eb47d411f1706c1b1d5a1ab4a1962aa8fd4 commit c84d5eb47d411f1706c1b1d5a1ab4a1962aa8fd4 Author: David Reveman <reveman@chromium.org> Date: Thu May 24 22:44:34 2018 vm_tools: sommelier: fix rename mistake These variables were renamed by mistake. It never caused any harm but let's fix it as old names made more sense. BUG= chromium:841106 TEST=emerge-tatl vm_guest_tools termina_container_tools TBR=smbarber@chromium.org Change-Id: Idee9bd379af7c8f44bff7d21a2059c6735f3d523 Reviewed-on: https://chromium-review.googlesource.com/1070513 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@google.com> [modify] https://crrev.com/c84d5eb47d411f1706c1b1d5a1ab4a1962aa8fd4/vm_tools/sommelier/sommelier.c [modify] https://crrev.com/c84d5eb47d411f1706c1b1d5a1ab4a1962aa8fd4/vm_tools/sommelier/sommelier.h
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/e8b27ea584f642817924dfa1d73ae22032e9b660 commit e8b27ea584f642817924dfa1d73ae22032e9b660 Author: David Reveman <reveman@chromium.org> Date: Wed May 30 08:02:42 2018 vm_tools: sommelier: extract drm code into .c file Move code that implements wl_drm interface into its own .c file. This also makes wl_drm implementation use it's own linux_dmabuf instance and not make assumptions about formats supported by the host compositor. BUG= chromium:841106 TEST=emerge-tatl termina_container_tools Change-Id: Ib6d8ece37dd8572ff275ed58996c61798d2f6526 Reviewed-on: https://chromium-review.googlesource.com/1075611 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/e8b27ea584f642817924dfa1d73ae22032e9b660/vm_tools/sommelier/sommelier.c [modify] https://crrev.com/e8b27ea584f642817924dfa1d73ae22032e9b660/vm_tools/sommelier/sommelier.h [add] https://crrev.com/e8b27ea584f642817924dfa1d73ae22032e9b660/vm_tools/sommelier/sommelier-drm.c [modify] https://crrev.com/e8b27ea584f642817924dfa1d73ae22032e9b660/vm_tools/sommelier/sommelier.gyp
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/1743ec57635966bb0785c245281248a22ddebab8 commit 1743ec57635966bb0785c245281248a22ddebab8 Author: David Reveman <reveman@chromium.org> Date: Wed May 30 19:49:55 2018 vm_tools: sommelier: extract seat code into .c file Move code that implements seat interface into its own .c file. No change to logic. BUG= chromium:841106 TEST=emerge-tatl termina_container_tools Change-Id: I2268994e17871e8b61af9955366b4493806809c8 Reviewed-on: https://chromium-review.googlesource.com/1076348 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/1743ec57635966bb0785c245281248a22ddebab8/vm_tools/sommelier/sommelier.c [add] https://crrev.com/1743ec57635966bb0785c245281248a22ddebab8/vm_tools/sommelier/sommelier-seat.c [modify] https://crrev.com/1743ec57635966bb0785c245281248a22ddebab8/vm_tools/sommelier/sommelier.h [modify] https://crrev.com/1743ec57635966bb0785c245281248a22ddebab8/vm_tools/sommelier/sommelier.gyp
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/c7f92ec53b108b2630941c73373a4e4b8b4d5d74 commit c7f92ec53b108b2630941c73373a4e4b8b4d5d74 Author: David Reveman <reveman@chromium.org> Date: Wed May 30 19:49:54 2018 vm_tools: sommelier: extract xdg-shell code into .c file Move code that implements xdg-shell interface into its own .c file. No change to logic. BUG= chromium:841106 TEST=emerge-tatl termina_container_tools Change-Id: I539a9f451f9d1e5b3d0d9a7a61566b847c52363a Reviewed-on: https://chromium-review.googlesource.com/1076489 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/c7f92ec53b108b2630941c73373a4e4b8b4d5d74/vm_tools/sommelier/sommelier.c [modify] https://crrev.com/c7f92ec53b108b2630941c73373a4e4b8b4d5d74/vm_tools/sommelier/sommelier.h [modify] https://crrev.com/c7f92ec53b108b2630941c73373a4e4b8b4d5d74/vm_tools/sommelier/sommelier.gyp [add] https://crrev.com/c7f92ec53b108b2630941c73373a4e4b8b4d5d74/vm_tools/sommelier/sommelier-xdg-shell.c
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/9fca3a673f3dc42f1bba66993a1b23e569ede705 commit 9fca3a673f3dc42f1bba66993a1b23e569ede705 Author: David Reveman <reveman@chromium.org> Date: Wed May 30 19:49:54 2018 vm_tools: sommelier: extract data-device-manager code into .c file Move code that implements data-device-manager interface into its own .c file. No change to logic. BUG= chromium:841106 TEST=emerge-tatl termina_container_tools Change-Id: I3824230f56958268a3fd71dc285e4b0dbc153306 Reviewed-on: https://chromium-review.googlesource.com/1076490 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/9fca3a673f3dc42f1bba66993a1b23e569ede705/vm_tools/sommelier/sommelier.c [modify] https://crrev.com/9fca3a673f3dc42f1bba66993a1b23e569ede705/vm_tools/sommelier/sommelier.h [modify] https://crrev.com/9fca3a673f3dc42f1bba66993a1b23e569ede705/vm_tools/sommelier/sommelier.gyp [add] https://crrev.com/9fca3a673f3dc42f1bba66993a1b23e569ede705/vm_tools/sommelier/sommelier-data-device-manager.c
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/33f8283fba893d9261a08eba87198bdd6945cd4e commit 33f8283fba893d9261a08eba87198bdd6945cd4e Author: David Reveman <reveman@chromium.org> Date: Wed May 30 19:49:55 2018 vm_tools: sommelier: extract output code into .c file Move code that implements output interface into its own .c file. No change to logic. BUG= chromium:841106 TEST=emerge-tatl termina_container_tools Change-Id: I4765b63f53653e2adb17aea5bd84578b08e58ce2 Reviewed-on: https://chromium-review.googlesource.com/1076491 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/33f8283fba893d9261a08eba87198bdd6945cd4e/vm_tools/sommelier/sommelier.c [add] https://crrev.com/33f8283fba893d9261a08eba87198bdd6945cd4e/vm_tools/sommelier/sommelier-output.c [modify] https://crrev.com/33f8283fba893d9261a08eba87198bdd6945cd4e/vm_tools/sommelier/sommelier.gyp [modify] https://crrev.com/33f8283fba893d9261a08eba87198bdd6945cd4e/vm_tools/sommelier/sommelier.h
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/68bf03a88f0c5d61b19487e3ee1d6f9fcaf55a67 commit 68bf03a88f0c5d61b19487e3ee1d6f9fcaf55a67 Author: David Reveman <reveman@chromium.org> Date: Wed May 30 19:49:56 2018 vm_tools: sommelier: extract subcompositor code into .c file Move code that implements subcompositor interface into its own .c file. No change to logic. BUG= chromium:841106 TEST=emerge-tatl termina_container_tools Change-Id: I0421929c0ba54dab15fc9254186eb795bd4d433b Reviewed-on: https://chromium-review.googlesource.com/1076587 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/68bf03a88f0c5d61b19487e3ee1d6f9fcaf55a67/vm_tools/sommelier/sommelier.c [modify] https://crrev.com/68bf03a88f0c5d61b19487e3ee1d6f9fcaf55a67/vm_tools/sommelier/sommelier.h [add] https://crrev.com/68bf03a88f0c5d61b19487e3ee1d6f9fcaf55a67/vm_tools/sommelier/sommelier-subcompositor.c [modify] https://crrev.com/68bf03a88f0c5d61b19487e3ee1d6f9fcaf55a67/vm_tools/sommelier/sommelier.gyp
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/1b641ee4ac79e0d2199c3112e634c1ba578cd57c commit 1b641ee4ac79e0d2199c3112e634c1ba578cd57c Author: David Reveman <reveman@chromium.org> Date: Wed May 30 19:49:56 2018 vm_tools: sommelier: extract shell code into .c file Move code that implements shell interface into its own .c file. No change to logic. BUG= chromium:841106 TEST=emerge-tatl termina_container_tools Change-Id: I3a7f81f91bdf7b136a53af3e2135820522c638f3 Reviewed-on: https://chromium-review.googlesource.com/1076528 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/1b641ee4ac79e0d2199c3112e634c1ba578cd57c/vm_tools/sommelier/sommelier.c [modify] https://crrev.com/1b641ee4ac79e0d2199c3112e634c1ba578cd57c/vm_tools/sommelier/sommelier.h [modify] https://crrev.com/1b641ee4ac79e0d2199c3112e634c1ba578cd57c/vm_tools/sommelier/sommelier.gyp [add] https://crrev.com/1b641ee4ac79e0d2199c3112e634c1ba578cd57c/vm_tools/sommelier/sommelier-shell.c
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/d10f0b3b1d071a75d61d6057a0d4cb29f8bbfdde commit d10f0b3b1d071a75d61d6057a0d4cb29f8bbfdde Author: David Reveman <reveman@chromium.org> Date: Wed May 30 19:49:57 2018 vm_tools: sommelier: extract shm code into .c file Move code that implements shm interface into its own .c file. No change to logic. BUG= chromium:841106 TEST=emerge-tatl termina_container_tools Change-Id: I4de4873da9ff6d05c3a68ab60410810247745ce8 Reviewed-on: https://chromium-review.googlesource.com/1076588 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/d10f0b3b1d071a75d61d6057a0d4cb29f8bbfdde/vm_tools/sommelier/sommelier.c [add] https://crrev.com/d10f0b3b1d071a75d61d6057a0d4cb29f8bbfdde/vm_tools/sommelier/sommelier-shm.c [modify] https://crrev.com/d10f0b3b1d071a75d61d6057a0d4cb29f8bbfdde/vm_tools/sommelier/sommelier.h [modify] https://crrev.com/d10f0b3b1d071a75d61d6057a0d4cb29f8bbfdde/vm_tools/sommelier/sommelier.gyp
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/8023b4ee3dfaf9c768998cb4453cca4fd25f3d44 commit 8023b4ee3dfaf9c768998cb4453cca4fd25f3d44 Author: David Reveman <reveman@chromium.org> Date: Wed May 30 19:49:58 2018 vm_tools: sommelier: extract compositor code into .c file Move code that implements compositor interface into its own .c file. No change to logic. BUG= chromium:841106 TEST=emerge-tatl termina_container_tools Change-Id: Ida1bb46f31101429c5f0ea091bf16c49e9926cc5 Reviewed-on: https://chromium-review.googlesource.com/1076589 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/8023b4ee3dfaf9c768998cb4453cca4fd25f3d44/vm_tools/sommelier/sommelier.c [add] https://crrev.com/8023b4ee3dfaf9c768998cb4453cca4fd25f3d44/vm_tools/sommelier/sommelier-compositor.c [modify] https://crrev.com/8023b4ee3dfaf9c768998cb4453cca4fd25f3d44/vm_tools/sommelier/sommelier.gyp [modify] https://crrev.com/8023b4ee3dfaf9c768998cb4453cca4fd25f3d44/vm_tools/sommelier/sommelier.h
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/08d8a20a8e591fbd8bfc28bdd53f2ae3cc4847d4 commit 08d8a20a8e591fbd8bfc28bdd53f2ae3cc4847d4 Author: David Reveman <reveman@chromium.org> Date: Thu May 31 23:22:45 2018 vm_tools: sommelier: use correct wl_drm version This changed by accident to 1 instead of 2 when drm code was extracted into it's own .c file. BUG= chromium:841106 TEST=xwayland dmabuf support works again Change-Id: I852b88824406acb33f20f2bb223f55596e8c311f Reviewed-on: https://chromium-review.googlesource.com/1079844 Commit-Ready: David Reveman <reveman@chromium.org> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/08d8a20a8e591fbd8bfc28bdd53f2ae3cc4847d4/vm_tools/sommelier/sommelier-drm.c
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/c40656e180d7b4d00435bb72c5c0e53bd137eb5d commit c40656e180d7b4d00435bb72c5c0e53bd137eb5d Author: David Reveman <reveman@chromium.org> Date: Thu Jun 21 23:31:29 2018 vm_tools: sommelier: extract display code into .c file Move code that implements display interface into its own .c file. No change to logic. BUG= chromium:841106 TEST=emerge-tatl termina_container_tools Change-Id: Idf1419cba26e270566b03569580bc089d592d19b Reviewed-on: https://chromium-review.googlesource.com/1107837 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: David Reveman <reveman@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/c40656e180d7b4d00435bb72c5c0e53bd137eb5d/vm_tools/sommelier/sommelier.c [add] https://crrev.com/c40656e180d7b4d00435bb72c5c0e53bd137eb5d/vm_tools/sommelier/sommelier-display.c [modify] https://crrev.com/c40656e180d7b4d00435bb72c5c0e53bd137eb5d/vm_tools/sommelier/sommelier.h [modify] https://crrev.com/c40656e180d7b4d00435bb72c5c0e53bd137eb5d/vm_tools/sommelier/sommelier.gyp
Comment 1 by bugdroid1@chromium.org
, May 10 2018