208538 2020-03-03 14:28:58 -0800 Web Inspector: the background of the navigation items in the tab bar doesn't match when unfocusing the window 2020-03-03 15:55:18 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes timothy webkit-bug-importer oldest_to_newest 1625256 0 hi 2020-03-03 14:28:58 -0800 # STEPS TO REPRODUCE: 1. inspect any page 2. undock/detach Web Inspector 3. move focus to a different window, but make sure that you can still see the Web Inspector window => the background of the space before/after the tab bar is a different color than the tabs themselves, even though the background colors match when focused 1625258 1 392332 hi 2020-03-03 14:37:07 -0800 Created attachment 392332 Patch 1625292 2 392332 commit-queue 2020-03-03 15:54:23 -0800 Comment on attachment 392332 Patch Clearing flags on attachment: 392332 Committed r257810: <https://trac.webkit.org/changeset/257810> 1625293 3 commit-queue 2020-03-03 15:54:25 -0800 All reviewed patches have been landed. Closing bug. 1625297 4 webkit-bug-importer 2020-03-03 15:55:18 -0800 <rdar://problem/60017370> 392332 2020-03-03 14:37:07 -0800 2020-03-03 15:54:23 -0800 Patch 208538.diff text/plain 12814 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJjYWI5ZmU2ZmZiLi5hNWQzZWQwZWY5OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMjAtMDMtMDMgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHRo ZSBiYWNrZ3JvdW5kIG9mIHRoZSBuYXZpZ2F0aW9uIGl0ZW1zIGluIHRoZSB0YWIgYmFyIGRvZXNu J3QgbWF0Y2ggd2hlbiB1bmZvY3VzaW5nIHRoZSB3aW5kb3cKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODUzOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIu Y3NzOgorICAgICAgICAoYm9keVtkaXI9bHRyXTpub3QoLmRvY2tlZCkgLnRhYi1iYXIgPiAudGFi cyA+IC5pdGVtOm50aC1jaGlsZChuICsgMyBvZiA6bm90KC5oaWRkZW4pKSwgYm9keVtkaXI9bHRy XTpub3QoLmRvY2tlZCkgLnRhYi1iYXIgPiAudGFiczpub3QoLmhpZGUtYm9yZGVyLXN0YXJ0KSA+ IC5pdGVtOm50aC1jaGlsZCgyIG9mIDpub3QoLmhpZGRlbikpLCBib2R5W2Rpcj1sdHJdOm5vdCgu ZG9ja2VkKSAudGFiLWJhciA+IC50YWJzLmRyYWdnaW5nLXRhYiA+IC5pdGVtLnNlbGVjdGVkLCBi b2R5W2Rpcj1ydGxdOm5vdCguZG9ja2VkKSAudGFiLWJhciA+IC50YWJzOm5vdCguaGlkZS1ib3Jk ZXItZW5kKSA+IC5pdGVtOm50aC1sYXN0LWNoaWxkKDEgb2YgOm5vdCguaGlkZGVuKSkpOiBBZGRl ZC4KKyAgICAgICAgKGJvZHlbZGlyPWx0cl06bm90KC5kb2NrZWQpIC50YWItYmFyID4gLnRhYnM6 bm90KC5oaWRlLWJvcmRlci1lbmQpID4gLml0ZW06bnRoLWxhc3QtY2hpbGQoMSBvZiA6bm90KC5o aWRkZW4pKSwgYm9keVtkaXI9cnRsXTpub3QoLmRvY2tlZCkgLnRhYi1iYXIgPiAudGFicyA+IC5p dGVtOm50aC1jaGlsZChuICsgMyBvZiA6bm90KC5oaWRkZW4pKSwgYm9keVtkaXI9cnRsXTpub3Qo LmRvY2tlZCkgLnRhYi1iYXIgPiAudGFiczpub3QoLmhpZGUtYm9yZGVyLXN0YXJ0KSA+IC5pdGVt Om50aC1jaGlsZCgyIG9mIDpub3QoLmhpZGRlbikpLCBib2R5W2Rpcj1ydGxdOm5vdCguZG9ja2Vk KSAudGFiLWJhciA+IC50YWJzLmRyYWdnaW5nLXRhYiA+IC5pdGVtLnNlbGVjdGVkKTogQWRkZWQu CisgICAgICAgIChib2R5W2Rpcj1sdHJdOm5vdCguZG9ja2VkKSAudGFiLWJhciA+IC50YWJzID4g Lml0ZW06bm90KDpmaXJzdC1jaGlsZCksIGJvZHlbZGlyPWx0cl06bm90KC5kb2NrZWQpIC50YWIt YmFyID4gLnRhYnM6bm90KC5oaWRlLWJvcmRlci1zdGFydCkgPiAuaXRlbTpmaXJzdC1jaGlsZCwg Ym9keVtkaXI9bHRyXTpub3QoLmRvY2tlZCkgLnRhYi1iYXIgPiAudGFicy5kcmFnZ2luZy10YWIg PiAuaXRlbS5zZWxlY3RlZCwgYm9keVtkaXI9cnRsXTpub3QoLmRvY2tlZCkgLnRhYi1iYXIgPiAu dGFiczpub3QoLmhpZGUtYm9yZGVyLWVuZCkgPiAuaXRlbTpsYXN0LWNoaWxkKTogRGVsZXRlZC4K KyAgICAgICAgKGJvZHlbZGlyPWx0cl06bm90KC5kb2NrZWQpIC50YWItYmFyID4gLnRhYnM6bm90 KC5oaWRlLWJvcmRlci1lbmQpID4gLml0ZW06bGFzdC1jaGlsZCwgYm9keVtkaXI9cnRsXTpub3Qo LmRvY2tlZCkgLnRhYi1iYXIgPiAudGFicyA+IC5pdGVtOm5vdCg6Zmlyc3QtY2hpbGQpLCBib2R5 W2Rpcj1ydGxdOm5vdCguZG9ja2VkKSAudGFiLWJhciA+IC50YWJzOm5vdCguaGlkZS1ib3JkZXIt c3RhcnQpID4gLml0ZW06Zmlyc3QtY2hpbGQsIGJvZHlbZGlyPXJ0bF06bm90KC5kb2NrZWQpIC50 YWItYmFyID4gLnRhYnMuZHJhZ2dpbmctdGFiID4gLml0ZW0uc2VsZWN0ZWQpOiBEZWxldGVkLgor ICAgICAgICBVc2UgYG50aC1jaGlsZGAgYW5kIGBudGgtbGFzdC1jaGlsZGAgaW5zdGVhZCBvZiBg OmZpcnN0LWNoaWxkYCBhbmQgYDpsYXN0LWNoaWxkYCBub3cgdGhhdAorICAgICAgICB0aGVyZSBh cmUgYC5mbGV4aWJsZS1zcGFjZWAgZWxlbWVudHMgYWxvbmdzaWRlIHRhYiBiYXIgaXRlbXMuCisK KyAgICAgICAgKEBtZWRpYSAocHJlZmVycy1jb2xvci1zY2hlbWU6IGRhcmspIC50YWItYmFyKToK KyAgICAgICAgKEBtZWRpYSAocHJlZmVycy1jb2xvci1zY2hlbWU6IGRhcmspIGJvZHk6bm90KC5k b2NrZWQpIC50YWItYmFyKTogQWRkZWQuCisgICAgICAgIChAbWVkaWEgKHByZWZlcnMtY29sb3It c2NoZW1lOiBkYXJrKSBib2R5LmRvY2tlZCAudGFiLWJhcik6IEFkZGVkLgorICAgICAgICAoQG1l ZGlhIChwcmVmZXJzLWNvbG9yLXNjaGVtZTogZGFyaykgYm9keTpub3QoLmRvY2tlZCk6bWF0Y2hl cygud2luZG93LWluYWN0aXZlLCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkgLnRhYi1iYXIpOiBB ZGRlZC4KKyAgICAgICAgKEBtZWRpYSAocHJlZmVycy1jb2xvci1zY2hlbWU6IGRhcmspIGJvZHk6 bWF0Y2hlcygud2luZG93LWluYWN0aXZlLCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkgLnRhYi1i YXIpOiBEZWxldGVkLgorICAgICAgICBFbnN1cmUgY29tcGxldGVseSBzZXBhcmF0ZSBzdHlsZXMg Zm9yIGBiYWNrZ3JvdW5kLWNvbG9yYCBhbmQgYGJhY2tncm91bmQtaW1hZ2VgIHdoZW4gYC5kb2Nr ZWRgCisgICAgICAgIHZzIHdoZW4gYDpub3QoLmRvY2tlZClgIHNvIHRoYXQgdGhleSBkb24ndCAi YmxlZWQiIGludG8gZWFjaG90aGVyLgorCisgICAgICAgIChib2R5Om5vdCguZG9ja2VkKTptYXRj aGVzKC53aW5kb3ctaW5hY3RpdmUsIC53aW5kb3ctZG9ja2VkLWluYWN0aXZlKSAudGFiLWJhcik6 CisgICAgICAgIChib2R5LmRvY2tlZDptYXRjaGVzKC53aW5kb3ctaW5hY3RpdmUsIC53aW5kb3ct ZG9ja2VkLWluYWN0aXZlKSAudGFiLWJhcik6CisgICAgICAgICgudGFiLWJhciA+IC5uYXZpZ2F0 aW9uLWJhciA+IC5pdGVtLmdyb3VwID4gLml0ZW0pOgorICAgICAgICAoLnRhYi1iYXIgPiAubmF2 aWdhdGlvbi1iYXIgPiAuaXRlbS5ncm91cCA+IC5pdGVtOm50aC1jaGlsZCgxIG9mIDpub3QoLmhp ZGRlbikpKToKKyAgICAgICAgKC50YWItYmFyID4gLm5hdmlnYXRpb24tYmFyID4gLml0ZW0uZ3Jv dXAgPiAuaXRlbTpudGgtbGFzdC1jaGlsZCgxIG9mIDpub3QoLmhpZGRlbikpKToKKyAgICAgICAg KGJvZHk6bm90KC5kb2NrZWQpOm1hdGNoZXMoLndpbmRvdy1pbmFjdGl2ZSwgLndpbmRvdy1kb2Nr ZWQtaW5hY3RpdmUpIC50YWItYmFyID4gLnRhYnMgPiAuaXRlbSk6CisgICAgICAgIChib2R5Om5v dCguZG9ja2VkKTptYXRjaGVzKC53aW5kb3ctaW5hY3RpdmUsIC53aW5kb3ctZG9ja2VkLWluYWN0 aXZlKSAudGFiLWJhciA+IC50YWJzID4gLml0ZW06bm90KC5kaXNhYmxlZCkuc2VsZWN0ZWQpOgor ICAgICAgICAoLnRhYi1iYXIgPiAudGFicy5zdGF0aWMtbGF5b3V0ID4gOm1hdGNoZXMoLmZsZXhp YmxlLXNwYWNlLCAuaXRlbSkpOgorICAgICAgICAoLnRhYi1iYXIgPiAudGFicy5hbmltYXRpbmcu aW5zZXJ0aW5nLXRhYiA+IC5pdGVtLmJlaW5nLWluc2VydGVkKToKKyAgICAgICAgKGJvZHk6bm90 KC5kb2NrZWQpOm1hdGNoZXMoLndpbmRvdy1pbmFjdGl2ZSwgLndpbmRvdy1kb2NrZWQtaW5hY3Rp dmUpIC50YWItYmFyID4gLnRhYnMuZHJhZ2dpbmctdGFiID4gLml0ZW06bm90KC5kaXNhYmxlZCku c2VsZWN0ZWQsIGJvZHk6bm90KC5kb2NrZWQpOm1hdGNoZXMoLndpbmRvdy1pbmFjdGl2ZSwgLndp bmRvdy1kb2NrZWQtaW5hY3RpdmUpIC50YWItYmFyID4gLnRhYnMuc3RhdGljLWxheW91dDpub3Qo LmFuaW1hdGluZy5pbnNlcnRpbmctdGFiKTpub3QoLmRyYWdnaW5nLXRhYikgPiAuaXRlbTpudGgt bGFzdC1jaGlsZCgxIG9mIDpub3QoLnBpbm5lZCkpLCBib2R5Om5vdCguZG9ja2VkKTptYXRjaGVz KC53aW5kb3ctaW5hY3RpdmUsIC53aW5kb3ctZG9ja2VkLWluYWN0aXZlKSAudGFiLWJhciA+IC50 YWJzLmFuaW1hdGluZy5jbG9zaW5nLXRhYiA+IC5pdGVtOm5vdCguZGlzYWJsZWQpLnNlbGVjdGVk KToKKyAgICAgICAgKEBtZWRpYSAocHJlZmVycy1jb2xvci1zY2hlbWU6IGRhcmspIGJvZHk6bm90 KC5kb2NrZWQpIC50YWItYmFyID4gLnRhYnMgPiAuaXRlbTpub3QoLmRpc2FibGVkKS5zZWxlY3Rl ZCk6CisgICAgICAgIChAbWVkaWEgKHByZWZlcnMtY29sb3Itc2NoZW1lOiBkYXJrKSBib2R5Om5v dCguZG9ja2VkKSAudGFiLWJhciA+IC50YWJzOm5vdCguYW5pbWF0aW5nKSA+IC5pdGVtOm5vdCgu c2VsZWN0ZWQsIC5kaXNhYmxlZCk6aG92ZXIpOgorICAgICAgICAoQG1lZGlhIChwcmVmZXJzLWNv bG9yLXNjaGVtZTogZGFyaykgYm9keTpub3QoLmRvY2tlZCk6bWF0Y2hlcygud2luZG93LWluYWN0 aXZlLCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkgLnRhYi1iYXIgPiAudGFicyA+IC5pdGVtKToK KyAgICAgICAgKEBtZWRpYSAocHJlZmVycy1jb2xvci1zY2hlbWU6IGRhcmspIGJvZHk6bm90KC5k b2NrZWQpOm1hdGNoZXMoLndpbmRvdy1pbmFjdGl2ZSwgLndpbmRvdy1kb2NrZWQtaW5hY3RpdmUp IC50YWItYmFyID4gLnRhYnMgPiAuaXRlbTpub3QoLmRpc2FibGVkKS5zZWxlY3RlZCk6CisgICAg ICAgIERyaXZlLWJ5OiByZW1vdmUgYXMgbWFueSBgIWltcG9ydGFudGAgYXMgcG9zc2libGUgdG8g bWFrZSBmdXR1cmUgbW9kaWZpY2F0aW9uIHNpbXBsZXIuCisKIDIwMjAtMDMtMDMgIEpvbiBEYXZp cyAgPGpvbmRAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZWQgb2xkIHJhc3RlciBpY29ucyBm b3Igb2JqZWN0IHR5cGVzIGFuZCByZXNvdXJjZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJhci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIuY3NzCmluZGV4IDUwM2QzM2YxMTdjLi5l NzEyMGEzNzM1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGFiQmFyLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UYWJCYXIuY3NzCkBAIC00NywxMiArNDcsMTIgQEAgYm9keTpub3QoLmRvY2tl ZCkgLnRhYi1iYXIgewogfQogCiBib2R5Om5vdCguZG9ja2VkKTptYXRjaGVzKC53aW5kb3ctaW5h Y3RpdmUsIC53aW5kb3ctZG9ja2VkLWluYWN0aXZlKSAudGFiLWJhciB7Ci0gICAgYmFja2dyb3Vu ZC1pbWFnZTogbm9uZSAhaW1wb3J0YW50OwotICAgIGJhY2tncm91bmQtY29sb3I6IHZhcigtLXRh Yi1pdGVtLWV4dHJhLWxpZ2h0LWJvcmRlci1jb2xvcikgIWltcG9ydGFudDsKKyAgICBiYWNrZ3Jv dW5kLWltYWdlOiBub25lOworICAgIGJhY2tncm91bmQtY29sb3I6IHZhcigtLXRhYi1pdGVtLWV4 dHJhLWxpZ2h0LWJvcmRlci1jb2xvcik7CiB9CiAKIGJvZHkuZG9ja2VkOm1hdGNoZXMoLndpbmRv dy1pbmFjdGl2ZSwgLndpbmRvdy1kb2NrZWQtaW5hY3RpdmUpIC50YWItYmFyIHsKLSAgICBiYWNr Z3JvdW5kLWNvbG9yOiB2YXIoLS1iYWNrZ3JvdW5kLWNvbG9yLXVuZm9jdXNlZCkgIWltcG9ydGFu dDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1iYWNrZ3JvdW5kLWNvbG9yLXVuZm9jdXNl ZCk7CiB9CiAKIC50YWItYmFyID4gLmJvcmRlciB7CkBAIC04NiwxNyArODYsMTcgQEAgYm9keTpt YXRjaGVzKC53aW5kb3ctaW5hY3RpdmUsIC53aW5kb3ctZG9ja2VkLWluYWN0aXZlKSAudGFiLWJh ciA+IC5ib3JkZXIgewogfQogCiAudGFiLWJhciA+IC5uYXZpZ2F0aW9uLWJhciA+IC5pdGVtLmdy b3VwID4gLml0ZW0gewotICAgIHdpZHRoOiBhdXRvICFpbXBvcnRhbnQ7Ci0gICAgbWFyZ2luOiAw IDRweCAhaW1wb3J0YW50OwotICAgIHBhZGRpbmc6IDAgIWltcG9ydGFudDsKKyAgICB3aWR0aDog YXV0bzsKKyAgICBtYXJnaW46IDAgNHB4OworICAgIHBhZGRpbmc6IDA7CiB9CiAKIC50YWItYmFy ID4gLm5hdmlnYXRpb24tYmFyID4gLml0ZW0uZ3JvdXAgPiAuaXRlbTpudGgtY2hpbGQoMSBvZiA6 bm90KC5oaWRkZW4pKSB7Ci0gICAgLXdlYmtpdC1tYXJnaW4tc3RhcnQ6IDhweCAhaW1wb3J0YW50 OworICAgIC13ZWJraXQtbWFyZ2luLXN0YXJ0OiA4cHg7CiB9CiAKIC50YWItYmFyID4gLm5hdmln YXRpb24tYmFyID4gLml0ZW0uZ3JvdXAgPiAuaXRlbTpudGgtbGFzdC1jaGlsZCgxIG9mIDpub3Qo LmhpZGRlbikpIHsKLSAgICAtd2Via2l0LW1hcmdpbi1lbmQ6IDhweCAhaW1wb3J0YW50OworICAg IC13ZWJraXQtbWFyZ2luLWVuZDogOHB4OwogfQogCiAudGFiLWJhciA+IC5uYXZpZ2F0aW9uLWJh ciAuaXRlbS5kaXZpZGVyIHsKQEAgLTE3MCwxNiArMTcwLDE2IEBAIGJvZHkuZG9ja2VkIC50YWIt YmFyID4gLnRhYnMgPiAuaXRlbSB7CiAgICAgZmxleDogaW5pdGlhbDsKIH0KIAotYm9keVtkaXI9 bHRyXTpub3QoLmRvY2tlZCkgLnRhYi1iYXIgPiAudGFicyA+IC5pdGVtOm5vdCg6Zmlyc3QtY2hp bGQpLAotYm9keVtkaXI9bHRyXTpub3QoLmRvY2tlZCkgLnRhYi1iYXIgPiAudGFiczpub3QoLmhp ZGUtYm9yZGVyLXN0YXJ0KSA+IC5pdGVtOmZpcnN0LWNoaWxkLAorYm9keVtkaXI9bHRyXTpub3Qo LmRvY2tlZCkgLnRhYi1iYXIgPiAudGFicyA+IC5pdGVtOm50aC1jaGlsZChuICsgMyBvZiA6bm90 KC5oaWRkZW4pKSwKK2JvZHlbZGlyPWx0cl06bm90KC5kb2NrZWQpIC50YWItYmFyID4gLnRhYnM6 bm90KC5oaWRlLWJvcmRlci1zdGFydCkgPiAuaXRlbTpudGgtY2hpbGQoMiBvZiA6bm90KC5oaWRk ZW4pKSwKIGJvZHlbZGlyPWx0cl06bm90KC5kb2NrZWQpIC50YWItYmFyID4gLnRhYnMuZHJhZ2dp bmctdGFiID4gLml0ZW0uc2VsZWN0ZWQsCi1ib2R5W2Rpcj1ydGxdOm5vdCguZG9ja2VkKSAudGFi LWJhciA+IC50YWJzOm5vdCguaGlkZS1ib3JkZXItZW5kKSA+IC5pdGVtOmxhc3QtY2hpbGQgewor Ym9keVtkaXI9cnRsXTpub3QoLmRvY2tlZCkgLnRhYi1iYXIgPiAudGFiczpub3QoLmhpZGUtYm9y ZGVyLWVuZCkgPiAuaXRlbTpudGgtbGFzdC1jaGlsZCgxIG9mIDpub3QoLmhpZGRlbikpIHsKICAg ICBib3JkZXItbGVmdDogdmFyKC0tdGFiLWl0ZW0tbWVkaXVtLWJvcmRlci1zdHlsZSk7CiB9CiAK LWJvZHlbZGlyPWx0cl06bm90KC5kb2NrZWQpIC50YWItYmFyID4gLnRhYnM6bm90KC5oaWRlLWJv cmRlci1lbmQpID4gLml0ZW06bGFzdC1jaGlsZCwKLWJvZHlbZGlyPXJ0bF06bm90KC5kb2NrZWQp IC50YWItYmFyID4gLnRhYnMgPiAuaXRlbTpub3QoOmZpcnN0LWNoaWxkKSwKLWJvZHlbZGlyPXJ0 bF06bm90KC5kb2NrZWQpIC50YWItYmFyID4gLnRhYnM6bm90KC5oaWRlLWJvcmRlci1zdGFydCkg PiAuaXRlbTpmaXJzdC1jaGlsZCwKK2JvZHlbZGlyPWx0cl06bm90KC5kb2NrZWQpIC50YWItYmFy ID4gLnRhYnM6bm90KC5oaWRlLWJvcmRlci1lbmQpID4gLml0ZW06bnRoLWxhc3QtY2hpbGQoMSBv ZiA6bm90KC5oaWRkZW4pKSwKK2JvZHlbZGlyPXJ0bF06bm90KC5kb2NrZWQpIC50YWItYmFyID4g LnRhYnMgPiAuaXRlbTpudGgtY2hpbGQobiArIDMgb2YgOm5vdCguaGlkZGVuKSksCitib2R5W2Rp cj1ydGxdOm5vdCguZG9ja2VkKSAudGFiLWJhciA+IC50YWJzOm5vdCguaGlkZS1ib3JkZXItc3Rh cnQpID4gLml0ZW06bnRoLWNoaWxkKDIgb2YgOm5vdCguaGlkZGVuKSksCiBib2R5W2Rpcj1ydGxd Om5vdCguZG9ja2VkKSAudGFiLWJhciA+IC50YWJzLmRyYWdnaW5nLXRhYiA+IC5pdGVtLnNlbGVj dGVkIHsKICAgICBib3JkZXItcmlnaHQ6IHZhcigtLXRhYi1pdGVtLW1lZGl1bS1ib3JkZXItc3R5 bGUpOwogfQpAQCAtMjMyLDE1ICsyMzIsMTUgQEAgYm9keTpub3QoLmRvY2tlZCk6bWF0Y2hlcygu d2luZG93LWluYWN0aXZlLCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkgLnRhYi1iYXIgPgogICAg IGJvcmRlci1yaWdodC1jb2xvcjogdmFyKC0tdGFiLWl0ZW0tbGlnaHQtYm9yZGVyLWNvbG9yKSAh aW1wb3J0YW50OwogICAgIGJvcmRlci1sZWZ0LWNvbG9yOiB2YXIoLS10YWItaXRlbS1saWdodC1i b3JkZXItY29sb3IpICFpbXBvcnRhbnQ7CiAKLSAgICBiYWNrZ3JvdW5kLWltYWdlOiBub25lICFp bXBvcnRhbnQ7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogdmFyKC0tdGFiLWl0ZW0tZXh0cmEtbGln aHQtYm9yZGVyLWNvbG9yKSAhaW1wb3J0YW50OworICAgIGJhY2tncm91bmQtaW1hZ2U6IG5vbmU7 CisgICAgYmFja2dyb3VuZC1jb2xvcjogdmFyKC0tdGFiLWl0ZW0tZXh0cmEtbGlnaHQtYm9yZGVy LWNvbG9yKTsKIAogICAgIHRyYW5zaXRpb246IG5vbmU7CiB9CiAKIGJvZHk6bm90KC5kb2NrZWQp Om1hdGNoZXMoLndpbmRvdy1pbmFjdGl2ZSwgLndpbmRvdy1kb2NrZWQtaW5hY3RpdmUpIC50YWIt YmFyID4gLnRhYnMgPiAuaXRlbTpub3QoLmRpc2FibGVkKS5zZWxlY3RlZCB7Ci0gICAgYmFja2dy b3VuZC1pbWFnZTogbm9uZSAhaW1wb3J0YW50OwotICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgw LCAwJSwgOTYlKSAhaW1wb3J0YW50OworICAgIGJhY2tncm91bmQtaW1hZ2U6IG5vbmU7CisgICAg YmFja2dyb3VuZC1jb2xvcjogaHNsKDAsIDAlLCA5NiUpOwogfQogCiBib2R5LmRvY2tlZCAudGFi LWJhciA+IC50YWJzID4gLml0ZW06bm90KC5kaXNhYmxlZCk6bWF0Y2hlcyguc2VsZWN0ZWQsIDpo b3ZlcikgewpAQCAtMzM0LDcgKzMzNCw3IEBAIGJvZHk6bWF0Y2hlcygud2luZG93LWluYWN0aXZl LCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkgLnRhYi1iYXIgPiAudGFicyA+IC5pdGVtCiB9CiAK IC50YWItYmFyID4gLnRhYnMuc3RhdGljLWxheW91dCA+IDptYXRjaGVzKC5mbGV4aWJsZS1zcGFj ZSwgLml0ZW0pIHsKLSAgICBwb3NpdGlvbjogYWJzb2x1dGUgIWltcG9ydGFudDsKKyAgICBwb3Np dGlvbjogYWJzb2x1dGU7CiAgICAgdG9wOiAwOwogfQogCkBAIC0zNTIsOCArMzUyLDcgQEAgYm9k eTptYXRjaGVzKC53aW5kb3ctaW5hY3RpdmUsIC53aW5kb3ctZG9ja2VkLWluYWN0aXZlKSAudGFi LWJhciA+IC50YWJzID4gLml0ZW0KIAogLnRhYi1iYXIgPiAudGFicy5hbmltYXRpbmcuaW5zZXJ0 aW5nLXRhYiA+IC5pdGVtLmJlaW5nLWluc2VydGVkIHsKICAgICB6LWluZGV4OiAyOwotICAgIG1p bi13aWR0aDogMCAhaW1wb3J0YW50OwotICAgIHBhZGRpbmc6IDAgIWltcG9ydGFudDsKKyAgICBw YWRkaW5nOiAwOwogfQogCiBib2R5Om5vdCguZG9ja2VkKSAudGFiLWJhciA+IC50YWJzLmRyYWdn aW5nLXRhYiA+IC5pdGVtOm5vdCguZGlzYWJsZWQpLnNlbGVjdGVkLApAQCAtMzY1LDcgKzM2NCw3 IEBAIGJvZHk6bm90KC5kb2NrZWQpIC50YWItYmFyID4gLnRhYnMuYW5pbWF0aW5nLmNsb3Npbmct dGFiID4gLml0ZW06bm90KC5kaXNhYmxlZCkuCiBib2R5Om5vdCguZG9ja2VkKTptYXRjaGVzKC53 aW5kb3ctaW5hY3RpdmUsIC53aW5kb3ctZG9ja2VkLWluYWN0aXZlKSAudGFiLWJhciA+IC50YWJz LmRyYWdnaW5nLXRhYiA+IC5pdGVtOm5vdCguZGlzYWJsZWQpLnNlbGVjdGVkLAogYm9keTpub3Qo LmRvY2tlZCk6bWF0Y2hlcygud2luZG93LWluYWN0aXZlLCAud2luZG93LWRvY2tlZC1pbmFjdGl2 ZSkgLnRhYi1iYXIgPiAudGFicy5zdGF0aWMtbGF5b3V0Om5vdCguYW5pbWF0aW5nLmluc2VydGlu Zy10YWIpOm5vdCguZHJhZ2dpbmctdGFiKSA+IC5pdGVtOm50aC1sYXN0LWNoaWxkKDEgb2YgOm5v dCgucGlubmVkKSksCiBib2R5Om5vdCguZG9ja2VkKTptYXRjaGVzKC53aW5kb3ctaW5hY3RpdmUs IC53aW5kb3ctZG9ja2VkLWluYWN0aXZlKSAudGFiLWJhciA+IC50YWJzLmFuaW1hdGluZy5jbG9z aW5nLXRhYiA+IC5pdGVtOm5vdCguZGlzYWJsZWQpLnNlbGVjdGVkIHsKLSAgICBib3JkZXItcmln aHQtY29sb3I6IHZhcigtLXRhYi1pdGVtLWxpZ2h0LWJvcmRlci1jb2xvcikgIWltcG9ydGFudDsK KyAgICBib3JkZXItcmlnaHQtY29sb3I6IHZhcigtLXRhYi1pdGVtLWxpZ2h0LWJvcmRlci1jb2xv cik7CiB9CiAKIC50YWItYmFyID4gLnRhYnMuZHJhZ2dpbmctdGFiID4gLml0ZW06bm90KC5kaXNh YmxlZCkuc2VsZWN0ZWQgewpAQCAtMzc1LDggKzM3NCw2IEBAIGJvZHk6bm90KC5kb2NrZWQpOm1h dGNoZXMoLndpbmRvdy1pbmFjdGl2ZSwgLndpbmRvdy1kb2NrZWQtaW5hY3RpdmUpIC50YWItYmFy ID4KIAogQG1lZGlhIChwcmVmZXJzLWNvbG9yLXNjaGVtZTogZGFyaykgewogICAgIC50YWItYmFy IHsKLSAgICAgICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwg aHNsKDAsIDAlLCAxMiUpLCBoc2woMCwgMCUsIDEwJSkpICFpbXBvcnRhbnQ7Ci0KICAgICAgICAg LS10YWItaXRlbS1ib3JkZXItY29sb3I6IGhzbCgwLCAwJSwgMzYlKTsKIAogICAgICAgICAvKiBG SVhNRTogPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE4OTc2OT4gRGFyayBNb2RlOiB1c2Ugc2VtYW50 aWMgY29sb3IgbmFtZXMgKi8KQEAgLTM4Niw2ICszODMsMTQgQEAgYm9keTpub3QoLmRvY2tlZCk6 bWF0Y2hlcygud2luZG93LWluYWN0aXZlLCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkgLnRhYi1i YXIgPgogICAgICAgICAtLXRhYi1pdGVtLWV4dHJhLWxpZ2h0LWJvcmRlci1jb2xvcjogdmFyKC0t dGFiLWl0ZW0tYm9yZGVyLWNvbG9yKTsKICAgICB9CiAKKyAgICBib2R5Om5vdCguZG9ja2VkKSAu dGFiLWJhciB7CisgICAgICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBi b3R0b20sIGhzbCgwLCAwJSwgMTIlKSwgaHNsKDAsIDAlLCAxMCUpKTsKKyAgICB9CisKKyAgICBi b2R5LmRvY2tlZCAudGFiLWJhciB7CisgICAgICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgwLCAw JSwgMTAlKTsKKyAgICB9CisKICAgICBib2R5LmRvY2tlZC5ib3R0b20gLnRhYi1iYXIgPiAuYm9y ZGVyLnRvcCB7CiAgICAgICAgIGZpbHRlcjogYnJpZ2h0bmVzcygxMjAlKTsKICAgICB9CkBAIC0z OTUsMTEgKzQwMCwxMSBAQCBib2R5Om5vdCguZG9ja2VkKTptYXRjaGVzKC53aW5kb3ctaW5hY3Rp dmUsIC53aW5kb3ctZG9ja2VkLWluYWN0aXZlKSAudGFiLWJhciA+CiAgICAgfQogCiAgICAgYm9k eTpub3QoLmRvY2tlZCkgLnRhYi1iYXIgPiAudGFicyA+IC5pdGVtOm5vdCguZGlzYWJsZWQpLnNl bGVjdGVkIHsKLSAgICAgICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJv dHRvbSwgaHNsKDAsIDAlLCAyMyUpLCBoc2woMCwgMCUsIDIxJSkpICFpbXBvcnRhbnQ7CisgICAg ICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIGhzbCgwLCAw JSwgMjMlKSwgaHNsKDAsIDAlLCAyMSUpKTsKICAgICB9CiAKICAgICBib2R5Om5vdCguZG9ja2Vk KSAudGFiLWJhciA+IC50YWJzOm5vdCguYW5pbWF0aW5nKSA+IC5pdGVtOm5vdCguc2VsZWN0ZWQs IC5kaXNhYmxlZCk6aG92ZXIgewotICAgICAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3Jh ZGllbnQodG8gYm90dG9tLCBoc2woMCwgMCUsIDExJSksIGhzbCgwLCAwJSwgOSUpKSAhaW1wb3J0 YW50OworICAgICAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9t LCBoc2woMCwgMCUsIDExJSksIGhzbCgwLCAwJSwgOSUpKTsKICAgICB9CiAKICAgICBib2R5LmRv Y2tlZCAudGFiLWJhciA+IC50YWJzOm5vdCguYW5pbWF0aW5nKSA+IC5pdGVtOm5vdCguc2VsZWN0 ZWQsIC5kaXNhYmxlZCk6aG92ZXIgewpAQCAtNDIyLDE5ICs0MjcsMTkgQEAgYm9keTpub3QoLmRv Y2tlZCk6bWF0Y2hlcygud2luZG93LWluYWN0aXZlLCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkg LnRhYi1iYXIgPgogICAgICAgICBvcGFjaXR5OiAwLjY7CiAgICAgfQogCi0gICAgYm9keTptYXRj aGVzKC53aW5kb3ctaW5hY3RpdmUsIC53aW5kb3ctZG9ja2VkLWluYWN0aXZlKSAudGFiLWJhciB7 CisgICAgYm9keTpub3QoLmRvY2tlZCk6bWF0Y2hlcygud2luZG93LWluYWN0aXZlLCAud2luZG93 LWRvY2tlZC1pbmFjdGl2ZSkgLnRhYi1iYXIgewogICAgICAgICAtLXRhYi1pdGVtLWJvcmRlci1j b2xvcjogaHNsKDAsIDAlLCAzNCUpOwogCi0gICAgICAgIGJhY2tncm91bmQtaW1hZ2U6IG5vbmUg IWltcG9ydGFudDsKLSAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDAsIDAlLCAxMyUpICFp bXBvcnRhbnQ7CisgICAgICAgIGJhY2tncm91bmQtaW1hZ2U6IG5vbmU7CisgICAgICAgIGJhY2tn cm91bmQtY29sb3I6IGhzbCgwLCAwJSwgMTMlKTsKICAgICB9CiAKICAgICBib2R5Om5vdCguZG9j a2VkKTptYXRjaGVzKC53aW5kb3ctaW5hY3RpdmUsIC53aW5kb3ctZG9ja2VkLWluYWN0aXZlKSAu dGFiLWJhciA+IC50YWJzID4gLml0ZW0gewotICAgICAgICBiYWNrZ3JvdW5kLWltYWdlOiBub25l ICFpbXBvcnRhbnQ7Ci0gICAgICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgwLCAwJSwgMTMlKSAh aW1wb3J0YW50OworICAgICAgICBiYWNrZ3JvdW5kLWltYWdlOiBub25lOworICAgICAgICBiYWNr Z3JvdW5kLWNvbG9yOiBoc2woMCwgMCUsIDEzJSk7CiAgICAgfQogCiAgICAgYm9keTpub3QoLmRv Y2tlZCk6bWF0Y2hlcygud2luZG93LWluYWN0aXZlLCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkg LnRhYi1iYXIgPiAudGFicyA+IC5pdGVtOm5vdCguZGlzYWJsZWQpLnNlbGVjdGVkIHsKLSAgICAg ICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDAsIDAlLCAxOSUpICFpbXBvcnRhbnQ7CisgICAgICAg IGJhY2tncm91bmQtY29sb3I6IGhzbCgwLCAwJSwgMTklKTsKICAgICB9CiB9Cg==