236192 2022-02-05 16:28:29 -0800 RenderLayer: Simplify RenderElement::paint() calls 2022-02-08 01:54:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 236186 90738 236194 1 zimmermann zimmermann bfulgham changseok esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr rbuis simon.fraser webkit-bug-importer zalan oldest_to_newest 1837822 0 zimmermann 2022-02-05 16:28:29 -0800 RenderLayer: Simplify RenderElement::paint() calls. Introduce "paintOffsetForRenderer(fragment, localPaintingInfo)" inline helper returning: toLayoutPoint(fragment.layerBounds.location() - rendererLocation() + localPaintingInfo.subpixelOffset) Avoid repeating this formula in various places in RenderLayer - unify it. 1837869 1 451033 zimmermann 2022-02-06 03:12:07 -0800 Created attachment 451033 Patch, v1 1837870 2 zimmermann 2022-02-06 03:12:24 -0800 Will submit to EWS, once 236186 landed. 1837881 3 zimmermann 2022-02-06 04:42:39 -0800 The failed builds are expected, the patch went to EWS too early... 1838090 4 451084 zimmermann 2022-02-07 05:58:13 -0800 Created attachment 451084 Patch, v2 1838566 5 zimmermann 2022-02-08 01:49:15 -0800 Thanks Simon for checking! 1838569 6 zimmermann 2022-02-08 01:53:20 -0800 Committed r289360 (246948@trunk): <https://commits.webkit.org/246948@trunk> 1838570 7 webkit-bug-importer 2022-02-08 01:54:17 -0800 <rdar://problem/88618973> 451033 2022-02-06 03:12:07 -0800 2022-02-07 05:58:08 -0800 Patch, v1 bug-236192-20220206031206.patch text/plain 7429 zimmermann U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGNhZjNlOTIwYTY3NTgw Njg5ZDI0MzY4Y2EzMjFkN2U3ZTI2YjczMC4uZWEyMTk1Y2NhNjM5ZTZkNDU1NjBlMmVkZmEyZDIy MWQ5ZTExNWJmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIyLTAyLTA2ICBOaWtv bGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbmRl ckxheWVyOiBTaW1wbGlmeSBSZW5kZXJFbGVtZW50OjpwYWludCgpIGNhbGxzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYxOTIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnRyb2R1Y2UgInBhaW50T2Zm c2V0Rm9yUmVuZGVyZXIoZnJhZ21lbnQsIGxvY2FsUGFpbnRpbmdJbmZvKSIgaW5saW5lIGhlbHBl cjoKKyAgICAgICAgcmV0dXJuIHRvTGF5b3V0UG9pbnQoZnJhZ21lbnQubGF5ZXJCb3VuZHMubG9j YXRpb24oKSAtIHJlbmRlcmVyTG9jYXRpb24oKSArIGxvY2FsUGFpbnRpbmdJbmZvLnN1YnBpeGVs T2Zmc2V0KQorCisgICAgICAgIEF2b2lkIHJlcGVhdGluZyB0aGlzIGZvcm11bGEgaW4gdmFyaW91 cyBwbGFjZXMgaW4gUmVuZGVyTGF5ZXIgLSB1bmlmeSBpdC4KKworICAgICAgICBDb3ZlcmVkIGJ5 IGV4aXN0aW5nIHRlc3RzLCBubyBjaGFuZ2UgaW4gYmVoYXZpb3VyLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpw YWludEJhY2tncm91bmRGb3JGcmFnbWVudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXI6OnBhaW50Rm9yZWdyb3VuZEZvckZyYWdtZW50c1dpdGhQaGFzZSk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllcjo6cGFpbnRPdXRsaW5lRm9yRnJhZ21lbnRzKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyOjpwYWludE1hc2tGb3JGcmFnbWVudHMpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50Q2hpbGRDbGlwcGluZ01hc2tGb3JGcmFnbWVudHMpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmZsb3dDb250cm9sc0ZvckZy YWdtZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y29sbGVjdEV2ZW50UmVn aW9uRm9yRnJhZ21lbnRzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludE9mZnNldEZvclJlbmRlcmVyIGNvbnN0 KToKKwogMjAyMi0wMi0wMyAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AaWdhbGlh LmNvbT4KIAogICAgICAgICBbTEJTRV0gSGFuZGxlIFJlbmRlclNWR1NoYXBlIGluIFNWR1JlbmRl clN1cHBvcnQ6OmFwcGx5U3Ryb2tlU3R5bGVUb0NvbnRleHQoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggNzdhOGEyNzgxMjkyNWE1YTQ2NzJjNjVkZjk4Y2Y3 YWRiMjk2ZmRlNy4uMTc2YzhhZDg5YmM4NTZjZDAxMGQyMmVlYWRiMmJlOGVjMDAwZTY2MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0zNzY2LDcgKzM3NjYs NyBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludEJhY2tncm91bmRGb3JGcmFnbWVudHMoY29uc3Qg TGF5ZXJGcmFnbWVudHMmIGxheWVyRnJhZ21lbgogICAgICAgICAvLyBQYWludCB0aGUgYmFja2dy b3VuZC4KICAgICAgICAgLy8gRklYTUU6IEV2ZW50dWFsbHkgd2Ugd2lsbCBjb2xsZWN0IHRoZSBy ZWdpb24gZnJvbSB0aGUgZnJhZ21lbnQgaXRzZWxmIGluc3RlYWQgb2YganVzdCBmcm9tIHRoZSBw YWludCBpbmZvLgogICAgICAgICBQYWludEluZm8gcGFpbnRJbmZvKGNvbnRleHQsIGZyYWdtZW50 LmJhY2tncm91bmRSZWN0LnJlY3QoKSwgUGFpbnRQaGFzZTo6QmxvY2tCYWNrZ3JvdW5kLCBwYWlu dEJlaGF2aW9yLCBzdWJ0cmVlUGFpbnRSb290Rm9yUmVuZGVyZXIsIG51bGxwdHIsIG51bGxwdHIs ICZsb2NhbFBhaW50aW5nSW5mby5yb290TGF5ZXItPnJlbmRlcmVyKCksIHRoaXMpOwotICAgICAg ICByZW5kZXJlcigpLnBhaW50KHBhaW50SW5mbywgdG9MYXlvdXRQb2ludChmcmFnbWVudC5sYXll ckJvdW5kcy5sb2NhdGlvbigpIC0gcmVuZGVyQm94TG9jYXRpb24oKSArIGxvY2FsUGFpbnRpbmdJ bmZvLnN1YnBpeGVsT2Zmc2V0KSk7CisgICAgICAgIHJlbmRlcmVyKCkucGFpbnQocGFpbnRJbmZv LCBwYWludE9mZnNldEZvclJlbmRlcmVyKGZyYWdtZW50LCBsb2NhbFBhaW50aW5nSW5mbykpOwog ICAgIH0KIH0KIApAQCAtMzg0OCw3ICszODQ4LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRG b3JlZ3JvdW5kRm9yRnJhZ21lbnRzV2l0aFBoYXNlKFBhaW50UGhhc2UgcGhhc2UsIGNvbnN0IEwK ICAgICAgICAgUGFpbnRJbmZvIHBhaW50SW5mbyhjb250ZXh0LCBmcmFnbWVudC5mb3JlZ3JvdW5k UmVjdC5yZWN0KCksIHBoYXNlLCBwYWludEJlaGF2aW9yLCBzdWJ0cmVlUGFpbnRSb290Rm9yUmVu ZGVyZXIsIG51bGxwdHIsIG51bGxwdHIsICZsb2NhbFBhaW50aW5nSW5mby5yb290TGF5ZXItPnJl bmRlcmVyKCksIHRoaXMsIGxvY2FsUGFpbnRpbmdJbmZvLnJlcXVpcmVTZWN1cml0eU9yaWdpbkFj Y2Vzc0ZvcldpZGdldHMpOwogICAgICAgICBpZiAocGhhc2UgPT0gUGFpbnRQaGFzZTo6Rm9yZWdy b3VuZCkKICAgICAgICAgICAgIHBhaW50SW5mby5vdmVybGFwVGVzdFJlcXVlc3RzID0gbG9jYWxQ YWludGluZ0luZm8ub3ZlcmxhcFRlc3RSZXF1ZXN0czsKLSAgICAgICAgcmVuZGVyZXIoKS5wYWlu dChwYWludEluZm8sIHRvTGF5b3V0UG9pbnQoZnJhZ21lbnQubGF5ZXJCb3VuZHMubG9jYXRpb24o KSAtIHJlbmRlckJveExvY2F0aW9uKCkgKyBsb2NhbFBhaW50aW5nSW5mby5zdWJwaXhlbE9mZnNl dCkpOworICAgICAgICByZW5kZXJlcigpLnBhaW50KHBhaW50SW5mbywgcGFpbnRPZmZzZXRGb3JS ZW5kZXJlcihmcmFnbWVudCwgbG9jYWxQYWludGluZ0luZm8pKTsKICAgICB9CiB9CiAKQEAgLTM4 NjYsNyArMzg2Niw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50T3V0bGluZUZvckZyYWdtZW50 cyhjb25zdCBMYXllckZyYWdtZW50cyYgbGF5ZXJGcmFnbWVudHMsCiAgICAgICAgIEV2ZW50UmVn aW9uQ29udGV4dFN0YXRlU2F2ZXIgZXZlbnRSZWdpb25TdGF0ZVNhdmVyKGxvY2FsUGFpbnRpbmdJ bmZvLmV2ZW50UmVnaW9uQ29udGV4dCk7CiAKICAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBz dGF0ZVNhdmVyLCBldmVudFJlZ2lvblN0YXRlU2F2ZXIsIGxvY2FsUGFpbnRpbmdJbmZvLCBwYWlu dEJlaGF2aW9yLCBmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdCwgRG9Ob3RJbmNsdWRlU2VsZkZvckJv cmRlclJhZGl1cyk7Ci0gICAgICAgIHJlbmRlcmVyKCkucGFpbnQocGFpbnRJbmZvLCB0b0xheW91 dFBvaW50KGZyYWdtZW50LmxheWVyQm91bmRzLmxvY2F0aW9uKCkgLSByZW5kZXJCb3hMb2NhdGlv bigpICsgbG9jYWxQYWludGluZ0luZm8uc3VicGl4ZWxPZmZzZXQpKTsKKyAgICAgICAgcmVuZGVy ZXIoKS5wYWludChwYWludEluZm8sIHBhaW50T2Zmc2V0Rm9yUmVuZGVyZXIoZnJhZ21lbnQsIGxv Y2FsUGFpbnRpbmdJbmZvKSk7CiAgICAgfQogfQogCkBAIC0zODg2LDcgKzM4ODYsNyBAQCB2b2lk IFJlbmRlckxheWVyOjpwYWludE1hc2tGb3JGcmFnbWVudHMoY29uc3QgTGF5ZXJGcmFnbWVudHMm IGxheWVyRnJhZ21lbnRzLCBHcgogICAgICAgICAvLyBQYWludCB0aGUgbWFzay4KICAgICAgICAg Ly8gRklYTUU6IEV2ZW50dWFsbHkgd2Ugd2lsbCBjb2xsZWN0IHRoZSByZWdpb24gZnJvbSB0aGUg ZnJhZ21lbnQgaXRzZWxmIGluc3RlYWQgb2YganVzdCBmcm9tIHRoZSBwYWludCBpbmZvLgogICAg ICAgICBQYWludEluZm8gcGFpbnRJbmZvKGNvbnRleHQsIGZyYWdtZW50LmJhY2tncm91bmRSZWN0 LnJlY3QoKSwgUGFpbnRQaGFzZTo6TWFzaywgcGFpbnRCZWhhdmlvciwgc3VidHJlZVBhaW50Um9v dEZvclJlbmRlcmVyLCBudWxscHRyLCBudWxscHRyLCAmbG9jYWxQYWludGluZ0luZm8ucm9vdExh eWVyLT5yZW5kZXJlcigpLCB0aGlzKTsKLSAgICAgICAgcmVuZGVyZXIoKS5wYWludChwYWludElu Zm8sIHRvTGF5b3V0UG9pbnQoZnJhZ21lbnQubGF5ZXJCb3VuZHMubG9jYXRpb24oKSAtIHJlbmRl ckJveExvY2F0aW9uKCkgKyBsb2NhbFBhaW50aW5nSW5mby5zdWJwaXhlbE9mZnNldCkpOworICAg ICAgICByZW5kZXJlcigpLnBhaW50KHBhaW50SW5mbywgcGFpbnRPZmZzZXRGb3JSZW5kZXJlcihm cmFnbWVudCwgbG9jYWxQYWludGluZ0luZm8pKTsKICAgICB9CiB9CiAKQEAgLTM5MDQsNyArMzkw NCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50Q2hpbGRDbGlwcGluZ01hc2tGb3JGcmFnbWVu dHMoY29uc3QgTGF5ZXJGcmFnbWVudHMmIGxheWVyCiAKICAgICAgICAgLy8gUGFpbnQgdGhlIGNs aXBwZWQgbWFzay4KICAgICAgICAgUGFpbnRJbmZvIHBhaW50SW5mbyhjb250ZXh0LCBmcmFnbWVu dC5iYWNrZ3JvdW5kUmVjdC5yZWN0KCksIFBhaW50UGhhc2U6OkNsaXBwaW5nTWFzaywgcGFpbnRC ZWhhdmlvciwgc3VidHJlZVBhaW50Um9vdEZvclJlbmRlcmVyLCBudWxscHRyLCBudWxscHRyLCAm bG9jYWxQYWludGluZ0luZm8ucm9vdExheWVyLT5yZW5kZXJlcigpLCB0aGlzKTsKLSAgICAgICAg cmVuZGVyZXIoKS5wYWludChwYWludEluZm8sIHRvTGF5b3V0UG9pbnQoZnJhZ21lbnQubGF5ZXJC b3VuZHMubG9jYXRpb24oKSAtIHJlbmRlckJveExvY2F0aW9uKCkgKyBsb2NhbFBhaW50aW5nSW5m by5zdWJwaXhlbE9mZnNldCkpOworICAgICAgICByZW5kZXJlcigpLnBhaW50KHBhaW50SW5mbywg cGFpbnRPZmZzZXRGb3JSZW5kZXJlcihmcmFnbWVudCwgbG9jYWxQYWludGluZ0luZm8pKTsKICAg ICB9CiB9CiAKQEAgLTM5MjAsNyArMzkyMCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50T3Zl cmZsb3dDb250cm9sc0ZvckZyYWdtZW50cyhjb25zdCBMYXllckZyYWdtZW50cyYgbGF5ZXJGCiAg ICAgICAgIEV2ZW50UmVnaW9uQ29udGV4dFN0YXRlU2F2ZXIgZXZlbnRSZWdpb25TdGF0ZVNhdmVy KGxvY2FsUGFpbnRpbmdJbmZvLmV2ZW50UmVnaW9uQ29udGV4dCk7CiAKICAgICAgICAgY2xpcFRv UmVjdChjb250ZXh0LCBzdGF0ZVNhdmVyLCBldmVudFJlZ2lvblN0YXRlU2F2ZXIsIGxvY2FsUGFp bnRpbmdJbmZvLCB7IH0sIGZyYWdtZW50LmJhY2tncm91bmRSZWN0KTsKLSAgICAgICAgbV9zY3Jv bGxhYmxlQXJlYS0+cGFpbnRPdmVyZmxvd0NvbnRyb2xzKGNvbnRleHQsIHJvdW5kZWRJbnRQb2lu dCh0b0xheW91dFBvaW50KGZyYWdtZW50LmxheWVyQm91bmRzLmxvY2F0aW9uKCkgLSByZW5kZXJC b3hMb2NhdGlvbigpICsgbG9jYWxQYWludGluZ0luZm8uc3VicGl4ZWxPZmZzZXQpKSwgc25hcHBl ZEludFJlY3QoZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QucmVjdCgpKSwgdHJ1ZSk7CisgICAgICAg IG1fc2Nyb2xsYWJsZUFyZWEtPnBhaW50T3ZlcmZsb3dDb250cm9scyhjb250ZXh0LCByb3VuZGVk SW50UG9pbnQocGFpbnRPZmZzZXRGb3JSZW5kZXJlcihmcmFnbWVudCwgbG9jYWxQYWludGluZ0lu Zm8pKSwgc25hcHBlZEludFJlY3QoZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QucmVjdCgpKSwgdHJ1 ZSk7CiAgICAgfQogfQogCkBAIC0zOTMxLDcgKzM5MzEsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpj b2xsZWN0RXZlbnRSZWdpb25Gb3JGcmFnbWVudHMoY29uc3QgTGF5ZXJGcmFnbWVudHMmIGxheWVy RnJhZwogICAgIGZvciAoY29uc3QgYXV0byYgZnJhZ21lbnQgOiBsYXllckZyYWdtZW50cykgewog ICAgICAgICBQYWludEluZm8gcGFpbnRJbmZvKGNvbnRleHQsIGZyYWdtZW50LmZvcmVncm91bmRS ZWN0LnJlY3QoKSwgUGFpbnRQaGFzZTo6RXZlbnRSZWdpb24sIHBhaW50QmVoYXZpb3IpOwogICAg ICAgICBwYWludEluZm8uZXZlbnRSZWdpb25Db250ZXh0ID0gbG9jYWxQYWludGluZ0luZm8uZXZl bnRSZWdpb25Db250ZXh0OwotICAgICAgICByZW5kZXJlcigpLnBhaW50KHBhaW50SW5mbywgdG9M YXlvdXRQb2ludChmcmFnbWVudC5sYXllckJvdW5kcy5sb2NhdGlvbigpIC0gcmVuZGVyQm94TG9j YXRpb24oKSArIGxvY2FsUGFpbnRpbmdJbmZvLnN1YnBpeGVsT2Zmc2V0KSk7CisgICAgICAgIHJl bmRlcmVyKCkucGFpbnQocGFpbnRJbmZvLCBwYWludE9mZnNldEZvclJlbmRlcmVyKGZyYWdtZW50 LCBsb2NhbFBhaW50aW5nSW5mbykpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuaAppbmRleCBlNWU1ZWM5NDg0ZDYxY2E3ZDk5ZWFlNWVmNWQ0ZTY1ODJkYzll YmU1Li5lNTIyMWY0YmJmM2VhNGM1NGM3NDA5ODRhZjMxNTRlMDBlNDMzZWRiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtOTE0LDYgKzkxNCwxMSBAQCBwcml2YXRl OgogICAgICAgICBFdmVudFJlZ2lvbkNvbnRleHQqIGV2ZW50UmVnaW9uQ29udGV4dCB7IG51bGxw dHIgfTsKICAgICB9OwogCisgICAgTGF5b3V0UG9pbnQgcGFpbnRPZmZzZXRGb3JSZW5kZXJlcihj b25zdCBMYXllckZyYWdtZW50JiBmcmFnbWVudCwgY29uc3QgTGF5ZXJQYWludGluZ0luZm8mIHBh aW50aW5nSW5mbykgY29uc3QKKyAgICB7CisgICAgICAgIHJldHVybiB0b0xheW91dFBvaW50KGZy YWdtZW50LmxheWVyQm91bmRzLmxvY2F0aW9uKCkgLSByZW5kZXJlckxvY2F0aW9uKCkgKyBwYWlu dGluZ0luZm8uc3VicGl4ZWxPZmZzZXQpOworICAgIH0KKwogICAgIC8vIENvbXB1dGUsIGNhY2hl IGFuZCByZXR1cm4gY2xpcCByZWN0cyBjb21wdXRlZCB3aXRoIHRoZSBnaXZlbiBsYXllciBhcyB0 aGUgcm9vdC4KICAgICBSZWY8Q2xpcFJlY3RzPiB1cGRhdGVDbGlwUmVjdHMoY29uc3QgQ2xpcFJl Y3RzQ29udGV4dCYpOwogICAgIC8vIENvbXB1dGUgYW5kIHJldHVybiB0aGUgY2xpcCByZWN0cy4g SWYgdXNlQ2FjaGVkIGlzIHRydWUsIHdpbGwgdXNlZCBwcmV2aW91c2x5IGNvbXB1dGVkIGNsaXAg cmVjdHMgb24gYW5jZXN0b3JzCg== 451084 2022-02-07 05:58:13 -0800 2022-02-07 13:26:18 -0800 Patch, v2 bug-236192-20220207055811.patch text/plain 7426 zimmermann U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MjEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQzNjNhM2FhNzE5NGVi MDQ1MmZhM2UwMzdjZGI1YTkzMjcyNDI0ZC4uOWRkMzdmZjg5OTI0YWI5YTQ4ZTM4Y2M2YzZhNjlj ZTEyNzIzODI1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIyLTAyLTA3ICBOaWtv bGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbmRl ckxheWVyOiBTaW1wbGlmeSBSZW5kZXJFbGVtZW50OjpwYWludCgpIGNhbGxzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYxOTIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnRyb2R1Y2UgInBhaW50T2Zm c2V0Rm9yUmVuZGVyZXIoZnJhZ21lbnQsIGxvY2FsUGFpbnRpbmdJbmZvKSIgaW5saW5lIGhlbHBl cjoKKyAgICAgICAgcmV0dXJuIHRvTGF5b3V0UG9pbnQoZnJhZ21lbnQubGF5ZXJCb3VuZHMubG9j YXRpb24oKSAtIHJlbmRlcmVyTG9jYXRpb24oKSArIGxvY2FsUGFpbnRpbmdJbmZvLnN1YnBpeGVs T2Zmc2V0KQorCisgICAgICAgIEF2b2lkIHJlcGVhdGluZyB0aGlzIGZvcm11bGEgaW4gdmFyaW91 cyBwbGFjZXMgaW4gUmVuZGVyTGF5ZXIgLSB1bmlmeSBpdC4KKworICAgICAgICBDb3ZlcmVkIGJ5 IGV4aXN0aW5nIHRlc3RzLCBubyBjaGFuZ2UgaW4gYmVoYXZpb3VyLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpw YWludEJhY2tncm91bmRGb3JGcmFnbWVudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXI6OnBhaW50Rm9yZWdyb3VuZEZvckZyYWdtZW50c1dpdGhQaGFzZSk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllcjo6cGFpbnRPdXRsaW5lRm9yRnJhZ21lbnRzKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyOjpwYWludE1hc2tGb3JGcmFnbWVudHMpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50Q2hpbGRDbGlwcGluZ01hc2tGb3JGcmFnbWVudHMpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmZsb3dDb250cm9sc0ZvckZy YWdtZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y29sbGVjdEV2ZW50UmVn aW9uRm9yRnJhZ21lbnRzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludE9mZnNldEZvclJlbmRlcmVyIGNvbnN0 KToKKwogMjAyMi0wMi0wNyAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AaWdhbGlh LmNvbT4KIAogICAgICAgICBbTEJTRV0gR2VuZXJhbGl6ZSBSZW5kZXJMYXllcjo6cmVuZGVyQm94 TG9jYXRpb24oKSwgYWRkaW5nIHN1cHBvcnQgZm9yIFNWRyBsYXllcnMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDEwMThkNTg0YzNhNTNmZmY0ZWRiNWE0NzBl MDJlNDU0M2I1ZjBkNmMuLmRmMzVlYzEzZTQ2YWU2MzhjZGJjOGJiMTM1NjQzM2YwYTE2MjMwMDgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMzc5Niw3ICsz Nzk2LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRCYWNrZ3JvdW5kRm9yRnJhZ21lbnRzKGNv bnN0IExheWVyRnJhZ21lbnRzJiBsYXllckZyYWdtZW4KICAgICAgICAgLy8gUGFpbnQgdGhlIGJh Y2tncm91bmQuCiAgICAgICAgIC8vIEZJWE1FOiBFdmVudHVhbGx5IHdlIHdpbGwgY29sbGVjdCB0 aGUgcmVnaW9uIGZyb20gdGhlIGZyYWdtZW50IGl0c2VsZiBpbnN0ZWFkIG9mIGp1c3QgZnJvbSB0 aGUgcGFpbnQgaW5mby4KICAgICAgICAgUGFpbnRJbmZvIHBhaW50SW5mbyhjb250ZXh0LCBmcmFn bWVudC5iYWNrZ3JvdW5kUmVjdC5yZWN0KCksIFBhaW50UGhhc2U6OkJsb2NrQmFja2dyb3VuZCwg cGFpbnRCZWhhdmlvciwgc3VidHJlZVBhaW50Um9vdEZvclJlbmRlcmVyLCBudWxscHRyLCBudWxs cHRyLCAmbG9jYWxQYWludGluZ0luZm8ucm9vdExheWVyLT5yZW5kZXJlcigpLCB0aGlzKTsKLSAg ICAgICAgcmVuZGVyZXIoKS5wYWludChwYWludEluZm8sIHRvTGF5b3V0UG9pbnQoZnJhZ21lbnQu bGF5ZXJCb3VuZHMubG9jYXRpb24oKSAtIHJlbmRlcmVyTG9jYXRpb24oKSArIGxvY2FsUGFpbnRp bmdJbmZvLnN1YnBpeGVsT2Zmc2V0KSk7CisgICAgICAgIHJlbmRlcmVyKCkucGFpbnQocGFpbnRJ bmZvLCBwYWludE9mZnNldEZvclJlbmRlcmVyKGZyYWdtZW50LCBsb2NhbFBhaW50aW5nSW5mbykp OwogICAgIH0KIH0KIApAQCAtMzg5MSw3ICszODkxLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFp bnRGb3JlZ3JvdW5kRm9yRnJhZ21lbnRzV2l0aFBoYXNlKFBhaW50UGhhc2UgcGhhc2UsIGNvbnN0 IEwKICAgICAgICAgUGFpbnRJbmZvIHBhaW50SW5mbyhjb250ZXh0LCBmcmFnbWVudC5mb3JlZ3Jv dW5kUmVjdC5yZWN0KCksIHBoYXNlLCBwYWludEJlaGF2aW9yLCBzdWJ0cmVlUGFpbnRSb290Rm9y UmVuZGVyZXIsIG51bGxwdHIsIG51bGxwdHIsICZsb2NhbFBhaW50aW5nSW5mby5yb290TGF5ZXIt PnJlbmRlcmVyKCksIHRoaXMsIGxvY2FsUGFpbnRpbmdJbmZvLnJlcXVpcmVTZWN1cml0eU9yaWdp bkFjY2Vzc0ZvcldpZGdldHMpOwogICAgICAgICBpZiAocGhhc2UgPT0gUGFpbnRQaGFzZTo6Rm9y ZWdyb3VuZCkKICAgICAgICAgICAgIHBhaW50SW5mby5vdmVybGFwVGVzdFJlcXVlc3RzID0gbG9j YWxQYWludGluZ0luZm8ub3ZlcmxhcFRlc3RSZXF1ZXN0czsKLSAgICAgICAgcmVuZGVyZXIoKS5w YWludChwYWludEluZm8sIHRvTGF5b3V0UG9pbnQoZnJhZ21lbnQubGF5ZXJCb3VuZHMubG9jYXRp b24oKSAtIHJlbmRlcmVyTG9jYXRpb24oKSArIGxvY2FsUGFpbnRpbmdJbmZvLnN1YnBpeGVsT2Zm c2V0KSk7CisgICAgICAgIHJlbmRlcmVyKCkucGFpbnQocGFpbnRJbmZvLCBwYWludE9mZnNldEZv clJlbmRlcmVyKGZyYWdtZW50LCBsb2NhbFBhaW50aW5nSW5mbykpOwogICAgIH0KIH0KIApAQCAt MzkwOSw3ICszOTA5LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRPdXRsaW5lRm9yRnJhZ21l bnRzKGNvbnN0IExheWVyRnJhZ21lbnRzJiBsYXllckZyYWdtZW50cywKICAgICAgICAgRXZlbnRS ZWdpb25Db250ZXh0U3RhdGVTYXZlciBldmVudFJlZ2lvblN0YXRlU2F2ZXIobG9jYWxQYWludGlu Z0luZm8uZXZlbnRSZWdpb25Db250ZXh0KTsKIAogICAgICAgICBjbGlwVG9SZWN0KGNvbnRleHQs IHN0YXRlU2F2ZXIsIGV2ZW50UmVnaW9uU3RhdGVTYXZlciwgbG9jYWxQYWludGluZ0luZm8sIHBh aW50QmVoYXZpb3IsIGZyYWdtZW50LmJhY2tncm91bmRSZWN0LCBEb05vdEluY2x1ZGVTZWxmRm9y Qm9yZGVyUmFkaXVzKTsKLSAgICAgICAgcmVuZGVyZXIoKS5wYWludChwYWludEluZm8sIHRvTGF5 b3V0UG9pbnQoZnJhZ21lbnQubGF5ZXJCb3VuZHMubG9jYXRpb24oKSAtIHJlbmRlcmVyTG9jYXRp b24oKSArIGxvY2FsUGFpbnRpbmdJbmZvLnN1YnBpeGVsT2Zmc2V0KSk7CisgICAgICAgIHJlbmRl cmVyKCkucGFpbnQocGFpbnRJbmZvLCBwYWludE9mZnNldEZvclJlbmRlcmVyKGZyYWdtZW50LCBs b2NhbFBhaW50aW5nSW5mbykpOwogICAgIH0KIH0KIApAQCAtMzkyOSw3ICszOTI5LDcgQEAgdm9p ZCBSZW5kZXJMYXllcjo6cGFpbnRNYXNrRm9yRnJhZ21lbnRzKGNvbnN0IExheWVyRnJhZ21lbnRz JiBsYXllckZyYWdtZW50cywgR3IKICAgICAgICAgLy8gUGFpbnQgdGhlIG1hc2suCiAgICAgICAg IC8vIEZJWE1FOiBFdmVudHVhbGx5IHdlIHdpbGwgY29sbGVjdCB0aGUgcmVnaW9uIGZyb20gdGhl IGZyYWdtZW50IGl0c2VsZiBpbnN0ZWFkIG9mIGp1c3QgZnJvbSB0aGUgcGFpbnQgaW5mby4KICAg ICAgICAgUGFpbnRJbmZvIHBhaW50SW5mbyhjb250ZXh0LCBmcmFnbWVudC5iYWNrZ3JvdW5kUmVj dC5yZWN0KCksIFBhaW50UGhhc2U6Ok1hc2ssIHBhaW50QmVoYXZpb3IsIHN1YnRyZWVQYWludFJv b3RGb3JSZW5kZXJlciwgbnVsbHB0ciwgbnVsbHB0ciwgJmxvY2FsUGFpbnRpbmdJbmZvLnJvb3RM YXllci0+cmVuZGVyZXIoKSwgdGhpcyk7Ci0gICAgICAgIHJlbmRlcmVyKCkucGFpbnQocGFpbnRJ bmZvLCB0b0xheW91dFBvaW50KGZyYWdtZW50LmxheWVyQm91bmRzLmxvY2F0aW9uKCkgLSByZW5k ZXJlckxvY2F0aW9uKCkgKyBsb2NhbFBhaW50aW5nSW5mby5zdWJwaXhlbE9mZnNldCkpOworICAg ICAgICByZW5kZXJlcigpLnBhaW50KHBhaW50SW5mbywgcGFpbnRPZmZzZXRGb3JSZW5kZXJlcihm cmFnbWVudCwgbG9jYWxQYWludGluZ0luZm8pKTsKICAgICB9CiB9CiAKQEAgLTM5NDcsNyArMzk0 Nyw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50Q2hpbGRDbGlwcGluZ01hc2tGb3JGcmFnbWVu dHMoY29uc3QgTGF5ZXJGcmFnbWVudHMmIGxheWVyCiAKICAgICAgICAgLy8gUGFpbnQgdGhlIGNs aXBwZWQgbWFzay4KICAgICAgICAgUGFpbnRJbmZvIHBhaW50SW5mbyhjb250ZXh0LCBmcmFnbWVu dC5iYWNrZ3JvdW5kUmVjdC5yZWN0KCksIFBhaW50UGhhc2U6OkNsaXBwaW5nTWFzaywgcGFpbnRC ZWhhdmlvciwgc3VidHJlZVBhaW50Um9vdEZvclJlbmRlcmVyLCBudWxscHRyLCBudWxscHRyLCAm bG9jYWxQYWludGluZ0luZm8ucm9vdExheWVyLT5yZW5kZXJlcigpLCB0aGlzKTsKLSAgICAgICAg cmVuZGVyZXIoKS5wYWludChwYWludEluZm8sIHRvTGF5b3V0UG9pbnQoZnJhZ21lbnQubGF5ZXJC b3VuZHMubG9jYXRpb24oKSAtIHJlbmRlcmVyTG9jYXRpb24oKSArIGxvY2FsUGFpbnRpbmdJbmZv LnN1YnBpeGVsT2Zmc2V0KSk7CisgICAgICAgIHJlbmRlcmVyKCkucGFpbnQocGFpbnRJbmZvLCBw YWludE9mZnNldEZvclJlbmRlcmVyKGZyYWdtZW50LCBsb2NhbFBhaW50aW5nSW5mbykpOwogICAg IH0KIH0KIApAQCAtMzk2Myw3ICszOTYzLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRPdmVy Zmxvd0NvbnRyb2xzRm9yRnJhZ21lbnRzKGNvbnN0IExheWVyRnJhZ21lbnRzJiBsYXllckYKICAg ICAgICAgRXZlbnRSZWdpb25Db250ZXh0U3RhdGVTYXZlciBldmVudFJlZ2lvblN0YXRlU2F2ZXIo bG9jYWxQYWludGluZ0luZm8uZXZlbnRSZWdpb25Db250ZXh0KTsKIAogICAgICAgICBjbGlwVG9S ZWN0KGNvbnRleHQsIHN0YXRlU2F2ZXIsIGV2ZW50UmVnaW9uU3RhdGVTYXZlciwgbG9jYWxQYWlu dGluZ0luZm8sIHsgfSwgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QpOwotICAgICAgICBtX3Njcm9s bGFibGVBcmVhLT5wYWludE92ZXJmbG93Q29udHJvbHMoY29udGV4dCwgcm91bmRlZEludFBvaW50 KHRvTGF5b3V0UG9pbnQoZnJhZ21lbnQubGF5ZXJCb3VuZHMubG9jYXRpb24oKSAtIHJlbmRlcmVy TG9jYXRpb24oKSArIGxvY2FsUGFpbnRpbmdJbmZvLnN1YnBpeGVsT2Zmc2V0KSksIHNuYXBwZWRJ bnRSZWN0KGZyYWdtZW50LmJhY2tncm91bmRSZWN0LnJlY3QoKSksIHRydWUpOworICAgICAgICBt X3Njcm9sbGFibGVBcmVhLT5wYWludE92ZXJmbG93Q29udHJvbHMoY29udGV4dCwgcm91bmRlZElu dFBvaW50KHBhaW50T2Zmc2V0Rm9yUmVuZGVyZXIoZnJhZ21lbnQsIGxvY2FsUGFpbnRpbmdJbmZv KSksIHNuYXBwZWRJbnRSZWN0KGZyYWdtZW50LmJhY2tncm91bmRSZWN0LnJlY3QoKSksIHRydWUp OwogICAgIH0KIH0KIApAQCAtMzk3NCw3ICszOTc0LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6Y29s bGVjdEV2ZW50UmVnaW9uRm9yRnJhZ21lbnRzKGNvbnN0IExheWVyRnJhZ21lbnRzJiBsYXllckZy YWcKICAgICBmb3IgKGNvbnN0IGF1dG8mIGZyYWdtZW50IDogbGF5ZXJGcmFnbWVudHMpIHsKICAg ICAgICAgUGFpbnRJbmZvIHBhaW50SW5mbyhjb250ZXh0LCBmcmFnbWVudC5mb3JlZ3JvdW5kUmVj dC5yZWN0KCksIFBhaW50UGhhc2U6OkV2ZW50UmVnaW9uLCBwYWludEJlaGF2aW9yKTsKICAgICAg ICAgcGFpbnRJbmZvLmV2ZW50UmVnaW9uQ29udGV4dCA9IGxvY2FsUGFpbnRpbmdJbmZvLmV2ZW50 UmVnaW9uQ29udGV4dDsKLSAgICAgICAgcmVuZGVyZXIoKS5wYWludChwYWludEluZm8sIHRvTGF5 b3V0UG9pbnQoZnJhZ21lbnQubGF5ZXJCb3VuZHMubG9jYXRpb24oKSAtIHJlbmRlcmVyTG9jYXRp b24oKSArIGxvY2FsUGFpbnRpbmdJbmZvLnN1YnBpeGVsT2Zmc2V0KSk7CisgICAgICAgIHJlbmRl cmVyKCkucGFpbnQocGFpbnRJbmZvLCBwYWludE9mZnNldEZvclJlbmRlcmVyKGZyYWdtZW50LCBs b2NhbFBhaW50aW5nSW5mbykpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuaAppbmRleCA3Njk1ZTc4YmVlNjVlZjVmYWFmMGU5YzhlNTQ2YzhjYTA2MzFiZDg3 Li5hYTI5ZmZlOTlkMTQ2OTBjMzMxNjJmZDU0MmRlMTY0NTVkMmNjYjlhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtOTE1LDYgKzkxNSwxMSBAQCBwcml2YXRlOgog ICAgICAgICBFdmVudFJlZ2lvbkNvbnRleHQqIGV2ZW50UmVnaW9uQ29udGV4dCB7IG51bGxwdHIg fTsKICAgICB9OwogCisgICAgTGF5b3V0UG9pbnQgcGFpbnRPZmZzZXRGb3JSZW5kZXJlcihjb25z dCBMYXllckZyYWdtZW50JiBmcmFnbWVudCwgY29uc3QgTGF5ZXJQYWludGluZ0luZm8mIHBhaW50 aW5nSW5mbykgY29uc3QKKyAgICB7CisgICAgICAgIHJldHVybiB0b0xheW91dFBvaW50KGZyYWdt ZW50LmxheWVyQm91bmRzLmxvY2F0aW9uKCkgLSByZW5kZXJlckxvY2F0aW9uKCkgKyBwYWludGlu Z0luZm8uc3VicGl4ZWxPZmZzZXQpOworICAgIH0KKwogICAgIC8vIENvbXB1dGUsIGNhY2hlIGFu ZCByZXR1cm4gY2xpcCByZWN0cyBjb21wdXRlZCB3aXRoIHRoZSBnaXZlbiBsYXllciBhcyB0aGUg cm9vdC4KICAgICBSZWY8Q2xpcFJlY3RzPiB1cGRhdGVDbGlwUmVjdHMoY29uc3QgQ2xpcFJlY3Rz Q29udGV4dCYpOwogICAgIC8vIENvbXB1dGUgYW5kIHJldHVybiB0aGUgY2xpcCByZWN0cy4gSWYg dXNlQ2FjaGVkIGlzIHRydWUsIHdpbGwgdXNlZCBwcmV2aW91c2x5IGNvbXB1dGVkIGNsaXAgcmVj dHMgb24gYW5jZXN0b3JzCg==