216031 2020-09-01 03:19:00 -0700 EventRegion paint should respect layer's foreground and background painting phases 2020-09-01 10:48:43 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned changseok esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr simon.fraser oldest_to_newest 1684423 0 koivisto 2020-09-01 03:19:00 -0700 We are currently painting event region for the box background to the foreground layer. 1684424 1 koivisto 2020-09-01 03:19:26 -0700 <rdar://problem/67282372> 1684427 2 407668 koivisto 2020-09-01 03:31:25 -0700 Created attachment 407668 patch 1684499 3 407668 simon.fraser 2020-09-01 09:35:14 -0700 Comment on attachment 407668 patch View in context: https://bugs.webkit.org/attachment.cgi?id=407668&action=review > Source/WebCore/rendering/RenderBlock.cpp:1140 > + if (paintInfo.eventRegionContext) > + paintInfoForChild.paintBehavior.add(PaintBehavior::EventRegionIncludeBackground); This is pretty weird. I wish event region painting followed normal painting more closely. > Source/WebCore/rendering/RenderLayer.cpp:4654 > + paintBehavior = paintBehavior & PaintBehavior::CompositedOverflowScrollContent; I know you moved this and I added it in r262337 but I don't understand it. 1684502 4 407668 simon.fraser 2020-09-01 09:37:56 -0700 Comment on attachment 407668 patch View in context: https://bugs.webkit.org/attachment.cgi?id=407668&action=review >> Source/WebCore/rendering/RenderBlock.cpp:1140 >> + paintInfoForChild.paintBehavior.add(PaintBehavior::EventRegionIncludeBackground); > > This is pretty weird. I wish event region painting followed normal painting more closely. Maybe leave it alone so I can decipher it without too many history jumps. 1684507 5 koivisto 2020-09-01 09:41:31 -0700 > > Source/WebCore/rendering/RenderBlock.cpp:1140 > > + if (paintInfo.eventRegionContext) > > + paintInfoForChild.paintBehavior.add(PaintBehavior::EventRegionIncludeBackground); > > This is pretty weird. I wish event region painting followed normal painting > more closely. It basically just does the same thing the code next to it does with paint phases: newPhase = (newPhase == PaintPhase::ChildBlockBackgrounds) ? PaintPhase::ChildBlockBackground : newPhase; (ChildBlockBackgrounds vs ChildBlockBackground is bit subtle) > I know you moved this and I added it in r262337 but I don't understand it. I suppose the other flags are not relevant for event regions? 1684541 6 ews-feeder 2020-09-01 10:48:42 -0700 Committed r266403: <https://trac.webkit.org/changeset/266403> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407668. 407668 2020-09-01 03:31:25 -0700 2020-09-01 10:48:43 -0700 patch foreground-layer-event-region.patch text/plain 15525 koivisto ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiYjJlZWFjZTVlNmIuLmY5NmFhMjkyYTUxNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBA CisyMDIwLTA5LTAxICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAg ICBFdmVudFJlZ2lvbiBwYWludCBzaG91bGQgcmVzcGVjdCBsYXllcidzIGZvcmVncm91bmQgYW5k IGJhY2tncm91bmQgcGFpbnRpbmcgcGhhc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYwMzEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY3Mjgy MzcyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog ZWRpdGluZy9lZGl0YWJsZS1yZWdpb24vdGV4dC1maWVsZC1pbnNpZGUtY29tcG9zaXRlZC1uZWdh dGl2ZS16LWluZGV4LWxheWVyLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L3Njcm9sbGlu Zy9tYWMvbmVnYXRpdmUtei1pbmRleC1vdmVyZmxvdy1zY3JvbGwtZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBmYXN0L3Njcm9sbGluZy9tYWMvbmVnYXRpdmUtei1pbmRleC1vdmVyZmxv dy1zY3JvbGwuaHRtbDogQWRkZWQuCisgICAgICAgICogcG9pbnRlcmV2ZW50cy9pb3MvdG91Y2gt YWN0aW9uLW5vbmUtcmVsYXRpdmUtaW5zaWRlLWNvbXBvc2l0ZWQtbmVnYXRpdmUtei1pbmRleC1s YXllci1leHBlY3RlZC50eHQ6CisgICAgICAgICogcG9pbnRlcmV2ZW50cy9pb3MvdG91Y2gtYWN0 aW9uLXJlZ2lvbi1iYWNraW5nLXNoYXJpbmctZXhwZWN0ZWQudHh0OgorCiAyMDIwLTA4LTMwICBU aW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB1 bnVzZWQgZWRpdGFibGUgaW1hZ2UgY29kZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGlu Zy9lZGl0YWJsZS1yZWdpb24vdGV4dC1maWVsZC1pbnNpZGUtY29tcG9zaXRlZC1uZWdhdGl2ZS16 LWluZGV4LWxheWVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2VkaXRpbmcvZWRpdGFibGUt cmVnaW9uL3RleHQtZmllbGQtaW5zaWRlLWNvbXBvc2l0ZWQtbmVnYXRpdmUtei1pbmRleC1sYXll ci1leHBlY3RlZC50eHQKaW5kZXggZjE1M2FkNzIwYjRmLi4xYmI3YzE0OTg4ODEgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2VkaXRpbmcvZWRpdGFibGUtcmVnaW9uL3RleHQtZmllbGQtaW5zaWRl LWNvbXBvc2l0ZWQtbmVnYXRpdmUtei1pbmRleC1sYXllci1leHBlY3RlZC50eHQKKysrIGIvTGF5 b3V0VGVzdHMvZWRpdGluZy9lZGl0YWJsZS1yZWdpb24vdGV4dC1maWVsZC1pbnNpZGUtY29tcG9z aXRlZC1uZWdhdGl2ZS16LWluZGV4LWxheWVyLWV4cGVjdGVkLnR4dApAQCAtMTcsOSArMTcsNiBA QAogICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkKICAgICAgICAgICAoZXZlbnQgcmVnaW9uCiAg ICAgICAgICAgICAocmVjdCAoMCwwKSB3aWR0aD04MDAgaGVpZ2h0PTQ2KQotICAgICAgICAgIChl ZGl0YWJsZSByZWdpb24KLSAgICAgICAgICAgIChyZWN0ICgxMCwxMCkgd2lkdGg9MTM4IGhlaWdo dD0yMikKLSAgICAgICAgICApCiAgICAgICAgICAgKQogICAgICAgICAgIChjaGlsZHJlbiAyCiAg ICAgICAgICAgICAoR3JhcGhpY3NMYXllcgpAQCAtMjksNyArMjYsNyBAQAogICAgICAgICAgICAg ICAoYm91bmRzIDgwMC4wMCA2MDAuMDApCiAgICAgICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkK ICAgICAgICAgICAgICAgKGV2ZW50IHJlZ2lvbgotICAgICAgICAgICAgICAgIChyZWN0ICgwLDAp IHdpZHRoPTgwMCBoZWlnaHQ9NDYpCisgICAgICAgICAgICAgICAgKHJlY3QgKDgsOCkgd2lkdGg9 Nzg0IGhlaWdodD0yNSkKICAgICAgICAgICAgICAgKGVkaXRhYmxlIHJlZ2lvbgogICAgICAgICAg ICAgICAgIChyZWN0ICgxMCwxMCkgd2lkdGg9MTM4IGhlaWdodD0yMikKICAgICAgICAgICAgICAg KQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL25lZ2F0aXZlLXot aW5kZXgtb3ZlcmZsb3ctc2Nyb2xsLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qvc2Ny b2xsaW5nL21hYy9uZWdhdGl2ZS16LWluZGV4LW92ZXJmbG93LXNjcm9sbC1leHBlY3RlZC50eHQK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi4zZjZjMWZiMTNmNDkKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvbmVnYXRpdmUt ei1pbmRleC1vdmVyZmxvdy1zY3JvbGwtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOTEgQEAKKyhH cmFwaGljc0xheWVyCisgIChhbmNob3IgMC4wMCAwLjAwKQorICAoYm91bmRzIDgwMC4wMCA2MDAu MDApCisgIChjaGlsZHJlbiAxCisgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgIChib3VuZHMgODAw LjAwIDYwMC4wMCkKKyAgICAgIChjb250ZW50c09wYXF1ZSAxKQorICAgICAgKGNoaWxkcmVuIDEK KyAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAoYm91bmRzIDgwMC4wMCA2MDAuMDAp CisgICAgICAgICAgKGV2ZW50IHJlZ2lvbgorICAgICAgICAgICAgKHJlY3QgKDAsMCkgd2lkdGg9 ODAwIGhlaWdodD0xMykKKyAgICAgICAgICApCisgICAgICAgICAgKGNoaWxkcmVuIDIKKyAgICAg ICAgICAgIChHcmFwaGljc0xheWVyCisgICAgICAgICAgICAgIChwb3NpdGlvbiA4LjAwIDEwLjAw KQorICAgICAgICAgICAgICAoYm91bmRzIDc5Mi4wMCA0MDIuMDApCisgICAgICAgICAgICAgIChk cmF3c0NvbnRlbnQgMSkKKyAgICAgICAgICAgICAgKGV2ZW50IHJlZ2lvbgorICAgICAgICAgICAg ICAgIChyZWN0ICgwLDApIHdpZHRoPTgwMiBoZWlnaHQ9NDAyKQorICAgICAgICAgICAgICApCisg ICAgICAgICAgICAgIChjaGlsZHJlbiAyCisgICAgICAgICAgICAgICAgKEdyYXBoaWNzTGF5ZXIK KyAgICAgICAgICAgICAgICAgIChwb3NpdGlvbiA2MS4wMCA2MS4wMCkKKyAgICAgICAgICAgICAg ICAgIChib3VuZHMgNTAwLjAwIDcwMC4wMCkKKyAgICAgICAgICAgICAgICAgIChkcmF3c0NvbnRl bnQgMSkKKyAgICAgICAgICAgICAgICAgIChldmVudCByZWdpb24KKyAgICAgICAgICAgICAgICAg ICAgKHJlY3QgKDAsMCkgd2lkdGg9NTAwIGhlaWdodD03MDApCisgICAgICAgICAgICAgICAgICAp CisgICAgICAgICAgICAgICAgICAoY2hpbGRyZW4gMgorICAgICAgICAgICAgICAgICAgICAoR3Jh cGhpY3NMYXllcgorICAgICAgICAgICAgICAgICAgICAgIChvZmZzZXRGcm9tUmVuZGVyZXIgd2lk dGg9MzAgaGVpZ2h0PTMwKQorICAgICAgICAgICAgICAgICAgICAgIChwb3NpdGlvbiAzMC4wMCAz MC4wMCkKKyAgICAgICAgICAgICAgICAgICAgICAoYm91bmRzIDQyNS4wMCA2MjUuMDApCisgICAg ICAgICAgICAgICAgICAgICAgKGV2ZW50IHJlZ2lvbgorICAgICAgICAgICAgICAgICAgICAgICAg KHJlY3QgKDAsMCkgd2lkdGg9NDI1IGhlaWdodD02MjUpCisgICAgICAgICAgICAgICAgICAgICAg KQorICAgICAgICAgICAgICAgICAgICAgIChjaGlsZHJlbiAxCisgICAgICAgICAgICAgICAgICAg ICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAgICAgICAgICAgICAgICAgICAob2Zmc2V0RnJv bVJlbmRlcmVyIHdpZHRoPTMwIGhlaWdodD0zMCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg KGFuY2hvciAwLjAwIDAuMDApCisgICAgICAgICAgICAgICAgICAgICAgICAgIChib3VuZHMgNDI1 LjAwIDEwMDQwLjAwKQorICAgICAgICAgICAgICAgICAgICAgICAgICAoZHJhd3NDb250ZW50IDEp CisgICAgICAgICAgICAgICAgICAgICAgICAgIChldmVudCByZWdpb24KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAocmVjdCAoMCwwKSB3aWR0aD00MjUgaGVpZ2h0PTEwMDQwKQorICAgICAg ICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICAgICAgICAgICAgICApCisgICAgICAg ICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICAgICAg ICAgIChHcmFwaGljc0xheWVyCisgICAgICAgICAgICAgICAgICAgICAgKHBvc2l0aW9uIDMwLjAw IDMwLjAwKQorICAgICAgICAgICAgICAgICAgICAgIChib3VuZHMgNDQwLjAwIDY0MC4wMCkKKyAg ICAgICAgICAgICAgICAgICAgICAoY2hpbGRyZW4gMworICAgICAgICAgICAgICAgICAgICAgICAg KEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgKHBvc2l0aW9uIDAuMDAg NjI1LjAwKQorICAgICAgICAgICAgICAgICAgICAgICAgICAoYm91bmRzIDQyNS4wMCAxNS4wMCkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgKGRyYXdzQ29udGVudCAxKQorICAgICAgICAgICAg ICAgICAgICAgICAgKQorICAgICAgICAgICAgICAgICAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgKHBvc2l0aW9uIDQyNS4wMCAwLjAwKQorICAgICAgICAg ICAgICAgICAgICAgICAgICAoYm91bmRzIDE1LjAwIDYyNS4wMCkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgKGRyYXdzQ29udGVudCAxKQorICAgICAgICAgICAgICAgICAgICAgICAgKQorICAg ICAgICAgICAgICAgICAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgKHBvc2l0aW9uIDQyNS4wMCA2MjUuMDApCisgICAgICAgICAgICAgICAgICAgICAgICAg IChib3VuZHMgMTUuMDAgMTUuMDApCisgICAgICAgICAgICAgICAgICAgICAgICAgIChkcmF3c0Nv bnRlbnQgMSkKKyAgICAgICAgICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAgICAgICAgICAg ICApCisgICAgICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAgICAgICAgICkKKyAgICAgICAg ICAgICAgICApCisgICAgICAgICAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAgICAg ICAgIChib3VuZHMgNzkyLjAwIDQwMi4wMCkKKyAgICAgICAgICAgICAgICAgIChkcmF3c0NvbnRl bnQgMSkKKyAgICAgICAgICAgICAgICAgIChldmVudCByZWdpb24KKyAgICAgICAgICAgICAgICAg ICAgKHJlY3QgKDEsMSkgd2lkdGg9MjAwIGhlaWdodD0yMDApCisgICAgICAgICAgICAgICAgICAp CisgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICApCisgICAgICAgICAgICApCisgICAg ICAgICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAgICAgICAoYm91bmRzIDgwMC4wMCA2MDAu MDApCisgICAgICAgICAgICApCisgICAgICAgICAgKQorICAgICAgICApCisgICAgICApCisgICAg KQorICApCispCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9u ZWdhdGl2ZS16LWluZGV4LW92ZXJmbG93LXNjcm9sbC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9z Y3JvbGxpbmcvbWFjL25lZ2F0aXZlLXotaW5kZXgtb3ZlcmZsb3ctc2Nyb2xsLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5mZDJmZmRjMmQxNmQKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvbmVnYXRpdmUtei1pbmRl eC1vdmVyZmxvdy1zY3JvbGwuaHRtbApAQCAtMCwwICsxLDYyIEBACis8IURPQ1RZUEUgaHRtbD4g PCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBpbnRlcm5hbDpBc3luY092ZXJmbG93U2Nyb2xsaW5n RW5hYmxlZD10cnVlIF0gLS0+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KK3dpbmRvdy5vbmxv YWQgPSAoKSA9PiB7CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0UnVu bmVyLmR1bXBBc1RleHQoKTsKKworICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICBy ZXN1bHRzLmlubmVyVGV4dCA9IGludGVybmFscy5sYXllclRyZWVBc1RleHQoZG9jdW1lbnQsIGlu dGVybmFscy5MQVlFUl9UUkVFX0lOQ0xVREVTX0VWRU5UX1JFR0lPTik7Cit9Cis8L3NjcmlwdD4K KzxzdHlsZT4KKy5jb250YWluZXIgeworICAgIHBvc2l0aW9uOiBmaXhlZDsKKyAgICB0b3A6IDEw cHg7CisgICAgaGVpZ2h0OiA0MDBweDsKKyAgICB3aWR0aDogMTAwJTsKKyAgICBib3JkZXI6IDFw eCBzb2xpZCBibHVlOworICAgIHotaW5kZXg6IC0xMDsKK30KKworLmJveCB7CisgICAgd2lkdGg6 IDIwMHB4OworICAgIGhlaWdodDogMjAwcHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgw LCAxMjgsIDAsIDAuMik7Cit9CisKKy5zY3JvbGxlciB7CisgICAgcG9zaXRpb246IGFic29sdXRl OworICAgIHRvcDogMTBweDsKKyAgICBsZWZ0OiAxMHB4OworICAgIHotaW5kZXg6IC0xOworICAg IG1hcmdpbjogNTBweDsKKyAgICB3aWR0aDogNDAwcHg7CisgICAgaGVpZ2h0OiA2MDBweDsKKyAg ICBvdmVyZmxvdzogc2Nyb2xsOworICAgIGJvcmRlcjogMzBweCBzb2xpZCByZ2JhKDAsIDAsIDEy OCwgMC41KTsKKyAgICBwYWRkaW5nOiAyMHB4OworICAgIGxpbmUtaGVpZ2h0OiAxLjVlbTsKK30K KworLnNjcm9sbGVyLWNvbnRlbnQgeworICAgIHdpZHRoOiA0MDBweDsKKyAgICBoZWlnaHQ6IDEw MDAwcHg7CisgICAgYmFja2dyb3VuZDogcmVwZWF0aW5nLWxpbmVhci1ncmFkaWVudCh3aGl0ZSwg c2lsdmVyIDEwMHB4KTsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwcmUgaWQ9cmVz dWx0cz48L3ByZT4KKzxkaXYgY2xhc3M9ImNvbnRhaW5lciI+Cis8ZGl2IGNsYXNzPSJib3giPgor Cis8L2Rpdj4KKzxkaXYgY2xhc3M9InNjcm9sbGVyIj4KKzxkaXYgY2xhc3M9InNjcm9sbGVyLWNv bnRlbnQiPjwvZGl2PgorPC9kaXY+Cis8L2Rpdj4KKworPC9ib2R5PgorPC9odG1sPgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvcG9pbnRlcmV2ZW50cy9pb3MvdG91Y2gtYWN0aW9uLW5vbmUtcmVs YXRpdmUtaW5zaWRlLWNvbXBvc2l0ZWQtbmVnYXRpdmUtei1pbmRleC1sYXllci1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9wb2ludGVyZXZlbnRzL2lvcy90b3VjaC1hY3Rpb24tbm9uZS1yZWxh dGl2ZS1pbnNpZGUtY29tcG9zaXRlZC1uZWdhdGl2ZS16LWluZGV4LWxheWVyLWV4cGVjdGVkLnR4 dAppbmRleCA5NjJlYWRjN2VlMDAuLjcxMmU4MjJmMTg1ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvcG9pbnRlcmV2ZW50cy9pb3MvdG91Y2gtYWN0aW9uLW5vbmUtcmVsYXRpdmUtaW5zaWRlLWNv bXBvc2l0ZWQtbmVnYXRpdmUtei1pbmRleC1sYXllci1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvcG9pbnRlcmV2ZW50cy9pb3MvdG91Y2gtYWN0aW9uLW5vbmUtcmVsYXRpdmUtaW5zaWRl LWNvbXBvc2l0ZWQtbmVnYXRpdmUtei1pbmRleC1sYXllci1leHBlY3RlZC50eHQKQEAgLTI1LDcg KzI1LDcgQEAKICAgICAgICAgICAgICAgKGJvdW5kcyA4MDAuMDAgNjAwLjAwKQogICAgICAgICAg ICAgICAoZHJhd3NDb250ZW50IDEpCiAgICAgICAgICAgICAgIChldmVudCByZWdpb24KLSAgICAg ICAgICAgICAgICAocmVjdCAoMCwwKSB3aWR0aD04MDAgaGVpZ2h0PTEyMykKKyAgICAgICAgICAg ICAgICAocmVjdCAoOCw4KSB3aWR0aD03ODQgaGVpZ2h0PTEwMikKICAgICAgICAgICAgICAgICAo dG91Y2gtYWN0aW9uCiAgICAgICAgICAgICAgICAgICAobm9uZSAgICAgICAgICAgICAgICAgIAog ICAgICAgICAgICAgICAgICAgICAocmVjdCAoOCw4KSB3aWR0aD0xMDIgaGVpZ2h0PTEwMikKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BvaW50ZXJldmVudHMvaW9zL3RvdWNoLWFjdGlvbi1yZWdp b24tYmFja2luZy1zaGFyaW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BvaW50ZXJldmVu dHMvaW9zL3RvdWNoLWFjdGlvbi1yZWdpb24tYmFja2luZy1zaGFyaW5nLWV4cGVjdGVkLnR4dApp bmRleCA0MTcwNDBkMzMzMDguLmNlYWNiZWMzMjE5NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv cG9pbnRlcmV2ZW50cy9pb3MvdG91Y2gtYWN0aW9uLXJlZ2lvbi1iYWNraW5nLXNoYXJpbmctZXhw ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3BvaW50ZXJldmVudHMvaW9zL3RvdWNoLWFjdGlv bi1yZWdpb24tYmFja2luZy1zaGFyaW5nLWV4cGVjdGVkLnR4dApAQCAtMTMsNyArMTMsNyBAQAog ICAgICAgICAgIChwb3NpdGlvbiA4LjAwIDEzLjAwKQogICAgICAgICAgIChib3VuZHMgMjAwLjAw IDIwMC4wMCkKICAgICAgICAgICAoZXZlbnQgcmVnaW9uCi0gICAgICAgICAgICAocmVjdCAoMCww KSB3aWR0aD01MDAgaGVpZ2h0PTUwMCkKKyAgICAgICAgICAgIChyZWN0ICgwLDApIHdpZHRoPTIw MCBoZWlnaHQ9MjAwKQogICAgICAgICAgICkKICAgICAgICAgICAoY2hpbGRyZW4gMQogICAgICAg ICAgICAgKEdyYXBoaWNzTGF5ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxODQ5MWJhZjU2ZGMuLjhhNDRjMDAz N2EyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDIwLTA5LTAxICBBbnR0aSBLb2l2 aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBFdmVudFJlZ2lvbiBwYWludCBzaG91 bGQgcmVzcGVjdCBsYXllcidzIGZvcmVncm91bmQgYW5kIGJhY2tncm91bmQgcGFpbnRpbmcgcGhh c2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYw MzEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY3MjgyMzcyPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGFyZSBjdXJyZW50bHkgcGFpbnRpbmcg ZXZlbnQgcmVnaW9uIGZvciB0aGUgYm94IGJhY2tncm91bmQgdG8gdGhlIGZvcmVncm91bmQgbGF5 ZXIsIHdoaWNoIGNhbiBjYXVzZQorICAgICAgICBmb3JlZ3JvdW5kIGxheWVyIHRvIHdyb25nbHkg Y2F0Y2ggc2Nyb2xsIGV2ZW50cy4gU2ltaWxhcmx5IHdlIGFyZSB1bm5lY2Vzc2FyaWx5IHBhaW50 aW5nIGZvcmVncm91bmQgZm9yCisgICAgICAgIGxheWVycyB0aGF0IGRvbid0IG5lZWQgaXQuCisK KyAgICAgICAgVGVzdDogZmFzdC9zY3JvbGxpbmcvbWFjL25lZ2F0aXZlLXotaW5kZXgtb3ZlcmZs b3ctc2Nyb2xsLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9QYWludFBoYXNlLmg6CisKKyAg ICAgICAgQWRkIHR3byBuZXcgZXZlbnQgcmVnaW9uIHNwZWNpZmljIFBhaW50QmVoYXZpb3JzIGZv ciBmb3JlZ3JvdW5kIGFuZCBiYWNrZ3JvdW5kIHBhaW50LiBUaGlzIGVzc2VudGlhbGx5IGR1cGxp Y2F0ZXMKKyAgICAgICAgZm9yZWdyb3VuZC9iYWNrZ3JvdW5kIFBhaW50UGhhc2VzIGJ1dCBzaW5j ZSBldmVudCByZWdpb24gcGFpbnQgaXMgaXRzZWxmIGEgcGFpbnQgcGhhc2Ugd2UgY2FuJ3QgdXNl IHRob3NlLgorICAgICAgICBUaGlzIHNob3VsZCBiZSByZWNvbmNpbGVkIGF0IHNvbWUgcG9pbnQu CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQmxvY2s6OnBhaW50Q29udGVudHMpOgorCisgICAgICAgIEFkZCB0aGUgYmFja2dy b3VuZCBmbGFnIHdoZW4gcGFpbnRpbmcgY29udGVudHMgYXMgdGhlIGRlc2NlbmRhbnQgYmFja2dy b3VuZHMgYXJlIHBhcnQgb2YgdGhlIGxheWVyIGZvcmVncm91bmQuCisKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJsb2NrOjpwYWludE9iamVjdCk6CisKKyAgICAgICAgUmVzcGVjdCB0aGUgbmV3 IGZsYWdzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludExheWVyQ29udGVudHMpOgorCisgICAgICAgIFNl dHVwIHRoZSBmbGFncyBiYXNlZCBvbiB3aGF0IHdlIGFyZSBzdXBwb3NlZCB0byBiZSBwYWludGlu ZyBvbiB0aGlzIGxheWVyLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y29sbGVj dEV2ZW50UmVnaW9uRm9yRnJhZ21lbnRzKToKKworICAgICAgICBGbGFnIGZpbHRlcmluZyBtb3Zl cyB0byBwYWludExheWVyQ29udGVudHMuCisKIDIwMjAtMDgtMzAgIFdlbnNvbiBIc2llaCAgPHdl bnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBTdHlsZVJhcmVOb25Jbmhlcml0 ZWREYXRhOjptYXNrIGFuZCBTdHlsZUJhY2tncm91bmREYXRhOjpiYWNrZ3JvdW5kIERhdGFSZWZz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUGFpbnRQaGFzZS5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1BhaW50UGhhc2UuaAppbmRleCA1ZWViM2RhYWNjYzcuLjBl NzY4NGEzNzY4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1BhaW50UGhh c2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUGFpbnRQaGFzZS5oCkBAIC02OSw2 ICs2OSw4IEBAIGVudW0gY2xhc3MgUGFpbnRCZWhhdmlvciA6IHVpbnQxNl90IHsKICAgICBUaWxl Rmlyc3RQYWludCAgICAgICAgICAgICAgICAgICAgICA9IDEgPDwgMTEsCiAgICAgQ29tcG9zaXRl ZE92ZXJmbG93U2Nyb2xsQ29udGVudCAgICAgPSAxIDw8IDEyLAogICAgIEFubm90YXRlTGlua3Mg ICAgICAgICAgICAgICAgICAgICAgID0gMSA8PCAxMywgLy8gQ29sbGVjdCBhbGwgcmVuZGVyZXJz IHdpdGggbGlua3MgdG8gYW5ub3RhdGUgdGhlaXIgVVJMcyAoZS5nLiBQREZzKQorICAgIEV2ZW50 UmVnaW9uSW5jbHVkZUZvcmVncm91bmQgICAgICAgID0gMSA8PCAxNCwgLy8gRklYTUU6IEV2ZW50 IHJlZ2lvbiBwYWludGluZyBzaG91bGQgdXNlIHBhaW50IHBoYXNlcy4KKyAgICBFdmVudFJlZ2lv bkluY2x1ZGVCYWNrZ3JvdW5kICAgICAgICA9IDEgPDwgMTUsCiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCA2 YjUzY2JhODVjOGUuLjhlMTQzYzYzMjM3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suY3BwCkBAIC0xMTM2LDYgKzExMzYsOSBAQCB2b2lkIFJlbmRlckJsb2NrOjpwYWlu dENvbnRlbnRzKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRP ZgogICAgICAgICBwYWludEluZm9Gb3JDaGlsZC5waGFzZSA9IG5ld1BoYXNlOwogICAgICAgICBw YWludEluZm9Gb3JDaGlsZC51cGRhdGVTdWJ0cmVlUGFpbnRSb290Rm9yQ2hpbGRyZW4odGhpcyk7 CiAKKyAgICAgICAgaWYgKHBhaW50SW5mby5ldmVudFJlZ2lvbkNvbnRleHQpCisgICAgICAgICAg ICBwYWludEluZm9Gb3JDaGlsZC5wYWludEJlaGF2aW9yLmFkZChQYWludEJlaGF2aW9yOjpFdmVu dFJlZ2lvbkluY2x1ZGVCYWNrZ3JvdW5kKTsKKwogICAgICAgICAvLyBGSVhNRTogUGFpbnQtdGlt ZSBwYWdpbmF0aW9uIGlzIG9ic29sZXRlIGFuZCBpcyBub3cgb25seSB1c2VkIGJ5IGVtYmVkZGVk IFdlYlZpZXdzIGluc2lkZSBBcHBLaXQKICAgICAgICAgLy8gTlNWaWV3cy4gRG8gbm90IGFkZCBh bnkgbW9yZSBjb2RlIGZvciB0aGlzLgogICAgICAgICBib29sIHVzZVByaW50UmVjdCA9ICF2aWV3 KCkucHJpbnRSZWN0KCkuaXNFbXB0eSgpOwpAQCAtMTI0OSwxMiArMTI1MiwxNSBAQCB2b2lkIFJl bmRlckJsb2NrOjpwYWludE9iamVjdChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0 UG9pbnQmIHBhaW50T2ZmcwogICAgIGlmIChwYWludFBoYXNlID09IFBhaW50UGhhc2U6OkV2ZW50 UmVnaW9uKSB7CiAgICAgICAgIGF1dG8gYm9yZGVyUmVjdCA9IExheW91dFJlY3QocGFpbnRPZmZz ZXQsIHNpemUoKSk7CiAKLSAgICAgICAgaWYgKHZpc2libGVUb0hpdFRlc3RpbmcoKSkgeworICAg ICAgICBpZiAocGFpbnRJbmZvLnBhaW50QmVoYXZpb3IuY29udGFpbnMoUGFpbnRCZWhhdmlvcjo6 RXZlbnRSZWdpb25JbmNsdWRlQmFja2dyb3VuZCkgJiYgdmlzaWJsZVRvSGl0VGVzdGluZygpKSB7 CiAgICAgICAgICAgICBhdXRvIGJvcmRlclJlZ2lvbiA9IGFwcHJveGltYXRlQXNSZWdpb24oc3R5 bGUoKS5nZXRSb3VuZGVkQm9yZGVyRm9yKGJvcmRlclJlY3QpKTsKICAgICAgICAgICAgIExPR19X SVRIX1NUUkVBTShFdmVudFJlZ2lvbnMsIHN0cmVhbSA8PCAiUmVuZGVyQmxvY2sgIiA8PCAqdGhp cyA8PCAiIHVuaXRpbmcgcmVnaW9uICIgPDwgYm9yZGVyUmVnaW9uKTsKICAgICAgICAgICAgIHBh aW50SW5mby5ldmVudFJlZ2lvbkNvbnRleHQtPnVuaXRlKGJvcmRlclJlZ2lvbiwgc3R5bGUoKSwg aXNUZXh0Q29udHJvbCgpICYmIGRvd25jYXN0PFJlbmRlclRleHRDb250cm9sPigqdGhpcykudGV4 dEZvcm1Db250cm9sRWxlbWVudCgpLmlzSW5uZXJUZXh0RWxlbWVudEVkaXRhYmxlKCkpOwogICAg ICAgICB9CiAKKyAgICAgICAgaWYgKCFwYWludEluZm8ucGFpbnRCZWhhdmlvci5jb250YWlucyhQ YWludEJlaGF2aW9yOjpFdmVudFJlZ2lvbkluY2x1ZGVGb3JlZ3JvdW5kKSkKKyAgICAgICAgICAg IHJldHVybjsKKwogICAgICAgICBib29sIG5lZWRzVHJhdmVyc2VEZXNjZW5kYW50cyA9IGhhc1Zp c3VhbE92ZXJmbG93KCkgfHwgY29udGFpbnNGbG9hdHMoKSB8fCAhcGFpbnRJbmZvLmV2ZW50UmVn aW9uQ29udGV4dC0+Y29udGFpbnMoZW5jbG9zaW5nSW50UmVjdChib3JkZXJSZWN0KSkgfHwgdmll dygpLm5lZWRzRXZlbnRSZWdpb25VcGRhdGVGb3JOb25Db21wb3NpdGVkRnJhbWUoKTsKICAgICAg ICAgTE9HX1dJVEhfU1RSRUFNKEV2ZW50UmVnaW9ucywgc3RyZWFtIDw8ICJSZW5kZXJCbG9jayAi IDw8ICp0aGlzIDw8ICIgbmVlZHNUcmF2ZXJzZURlc2NlbmRhbnRzIGZvciBldmVudCByZWdpb246 IGhhc1Zpc3VhbE92ZXJmbG93OiAiIDw8IGhhc1Zpc3VhbE92ZXJmbG93KCkgPDwgIiBjb250YWlu c0Zsb2F0czogIgogICAgICAgICAgICAgPDwgY29udGFpbnNGbG9hdHMoKSA8PCAgIiBib3JkZXIg Ym94IGlzIG91dHNpZGUgY3VycmVudCByZWdpb246ICIgPDwgIXBhaW50SW5mby5ldmVudFJlZ2lv bkNvbnRleHQtPmNvbnRhaW5zKGVuY2xvc2luZ0ludFJlY3QoYm9yZGVyUmVjdCkpIDw8ICIgbmVl ZHNFdmVudFJlZ2lvblVwZGF0ZUZvck5vbkNvbXBvc2l0ZWRGcmFtZToiIDw8IHZpZXcoKS5uZWVk c0V2ZW50UmVnaW9uVXBkYXRlRm9yTm9uQ29tcG9zaXRlZEZyYW1lKCkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggZmQwMmI1MWExMjZhLi5mZTIzNWE5M2Fj ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtNDY1MCw2 ICs0NjUwLDE0IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50cyhHcmFwaGlj c0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRpCiAgICAgICAgIGlmIChpc1BhaW50 aW5nT3ZlcmZsb3dDb250ZW50cykKICAgICAgICAgICAgIHBhaW50QmVoYXZpb3IuYWRkKFBhaW50 QmVoYXZpb3I6OkNvbXBvc2l0ZWRPdmVyZmxvd1Njcm9sbENvbnRlbnQpOwogCisgICAgICAgIGlm IChpc0NvbGxlY3RpbmdFdmVudFJlZ2lvbikgeworICAgICAgICAgICAgcGFpbnRCZWhhdmlvciA9 IHBhaW50QmVoYXZpb3IgJiBQYWludEJlaGF2aW9yOjpDb21wb3NpdGVkT3ZlcmZsb3dTY3JvbGxD b250ZW50OworICAgICAgICAgICAgaWYgKGlzUGFpbnRpbmdDb21wb3NpdGVkRm9yZWdyb3VuZCkK KyAgICAgICAgICAgICAgICBwYWludEJlaGF2aW9yLmFkZChQYWludEJlaGF2aW9yOjpFdmVudFJl Z2lvbkluY2x1ZGVGb3JlZ3JvdW5kKTsKKyAgICAgICAgICAgIGlmIChpc1BhaW50aW5nQ29tcG9z aXRlZEJhY2tncm91bmQpCisgICAgICAgICAgICAgICAgcGFpbnRCZWhhdmlvci5hZGQoUGFpbnRC ZWhhdmlvcjo6RXZlbnRSZWdpb25JbmNsdWRlQmFja2dyb3VuZCk7CisgICAgICAgIH0KKwogICAg ICAgICByZXR1cm4gcGFpbnRCZWhhdmlvcjsKICAgICB9KCk7CiAKQEAgLTUyMDcsNyArNTIxNSw3 IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNvbGxlY3RFdmVudFJlZ2lvbkZvckZyYWdtZW50cyhjb25z dCBMYXllckZyYWdtZW50cyYgbGF5ZXJGcmFnCiAgICAgQVNTRVJUKGxvY2FsUGFpbnRpbmdJbmZv LmV2ZW50UmVnaW9uQ29udGV4dCk7CiAKICAgICBmb3IgKGNvbnN0IGF1dG8mIGZyYWdtZW50IDog bGF5ZXJGcmFnbWVudHMpIHsKLSAgICAgICAgUGFpbnRJbmZvIHBhaW50SW5mbyhjb250ZXh0LCBm cmFnbWVudC5mb3JlZ3JvdW5kUmVjdC5yZWN0KCksIFBhaW50UGhhc2U6OkV2ZW50UmVnaW9uLCBw YWludEJlaGF2aW9yICYgT3B0aW9uU2V0PFBhaW50QmVoYXZpb3I+IHsgUGFpbnRCZWhhdmlvcjo6 Q29tcG9zaXRlZE92ZXJmbG93U2Nyb2xsQ29udGVudCB9KTsKKyAgICAgICAgUGFpbnRJbmZvIHBh aW50SW5mbyhjb250ZXh0LCBmcmFnbWVudC5mb3JlZ3JvdW5kUmVjdC5yZWN0KCksIFBhaW50UGhh c2U6OkV2ZW50UmVnaW9uLCBwYWludEJlaGF2aW9yKTsKICAgICAgICAgcGFpbnRJbmZvLmV2ZW50 UmVnaW9uQ29udGV4dCA9IGxvY2FsUGFpbnRpbmdJbmZvLmV2ZW50UmVnaW9uQ29udGV4dDsKICAg ICAgICAgcmVuZGVyZXIoKS5wYWludChwYWludEluZm8sIHRvTGF5b3V0UG9pbnQoZnJhZ21lbnQu bGF5ZXJCb3VuZHMubG9jYXRpb24oKSAtIHJlbmRlckJveExvY2F0aW9uKCkgKyBsb2NhbFBhaW50 aW5nSW5mby5zdWJwaXhlbE9mZnNldCkpOwogICAgIH0KQEAgLTcxMzIsNiArNzE0MCw4IEBAIFRl eHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMsIFBhaW50QmVoYXZpb3IgYmVoYXZp b3IpCiAgICAgY2FzZSBQYWludEJlaGF2aW9yOjpUaWxlRmlyc3RQYWludDogdHMgPDwgIlRpbGVG aXJzdFBhaW50IjsgYnJlYWs7CiAgICAgY2FzZSBQYWludEJlaGF2aW9yOjpDb21wb3NpdGVkT3Zl cmZsb3dTY3JvbGxDb250ZW50OiB0cyA8PCAiQ29tcG9zaXRlZE92ZXJmbG93U2Nyb2xsQ29udGVu dCI7IGJyZWFrOwogICAgIGNhc2UgUGFpbnRCZWhhdmlvcjo6QW5ub3RhdGVMaW5rczogdHMgPDwg IkFubm90YXRlTGlua3MiOyBicmVhazsKKyAgICBjYXNlIFBhaW50QmVoYXZpb3I6OkV2ZW50UmVn aW9uSW5jbHVkZUZvcmVncm91bmQ6IHRzIDw8ICJFdmVudFJlZ2lvbkluY2x1ZGVGb3JlZ3JvdW5k IjsgYnJlYWs7CisgICAgY2FzZSBQYWludEJlaGF2aW9yOjpFdmVudFJlZ2lvbkluY2x1ZGVCYWNr Z3JvdW5kOiB0cyA8PCAiRXZlbnRSZWdpb25JbmNsdWRlQmFja2dyb3VuZCI7IGJyZWFrOwogICAg IH0KIAogICAgIHJldHVybiB0czsK