293880 2025-06-01 12:59:24 -0700 [Cleanup] Move hasIntrinsicAspectRatio from RenderObject to RenderBox 2025-06-02 07:30:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan koivisto webkit-bug-importer oldest_to_newest 2121010 0 zalan 2025-06-01 12:59:24 -0700 ssia 2121012 1 475443 zalan 2025-06-01 13:02:11 -0700 Created attachment 475443 [fast-cq]Patch 2121108 2 ews-feeder 2025-06-02 07:29:39 -0700 Committed 295683@main (65f2475d5071): <https://commits.webkit.org/295683@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 475443. 2121109 3 webkit-bug-importer 2025-06-02 07:30:14 -0700 <rdar://problem/152430656> 475443 2025-06-01 13:02:11 -0700 2025-06-02 07:29:39 -0700 [fast-cq]Patch bug-293880-20250601130211.patch text/plain 15361 zalan RnJvbSA0YmM2MjM3ZDYxMTMxMzAzNTJiMjAyYWY0NDY2ZGJlYmI3YzU1MTc0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMSBKdW4gMjAyNSAxMjo1OTo0MCAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtDbGVhbnVw XSBNb3ZlIGhhc0ludHJpbnNpY0FzcGVjdFJhdGlvIGZyb20gUmVuZGVyT2JqZWN0IHRvCiBSZW5k ZXJCb3ggaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5Mzg4MAoKUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgppbnRyaW5zaWMtcmF0aW8gZG9lcyBub3QgYXBwbHkg dG8gaW5saW5lIGJveGVzIG9yIHRleHQgY29udGVudC4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwOgooV2ViQ29yZTo6TGF5 b3V0SW50ZWdyYXRpb246OmNhblVzZUZvckZsZXhMYXlvdXRXaXRoUmVhc29uKToKKiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgooV2ViQ29yZTo6UmVuZGVyQmxvY2s6 OmRpcnR5Rm9yTGF5b3V0RnJvbVBlcmNlbnRhZ2VIZWlnaHREZXNjZW5kYW50cyk6IERlbGV0ZWQu IC0+IG1vdmVkIHRvIFJlbmRlckJsb2NrRmxvdy4KCiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmg6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5jcHA6CihXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmRpcnR5Rm9yTGF5b3V0RnJvbVBlcmNl bnRhZ2VIZWlnaHREZXNjZW5kYW50cyk6CihXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OnNoaWZ0 Rm9yQWxpZ25Db250ZW50KToKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93Lmg6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oOgooV2ViQ29yZTo6 UmVuZGVyQm94OjpoYXNJbnRyaW5zaWNBc3BlY3RSYXRpbyBjb25zdCk6CiogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgooV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpoYXNJ bnRyaW5zaWNBc3BlY3RSYXRpbyBjb25zdCk6IERlbGV0ZWQuCiogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcDoKKFdlYkNvcmU6OlJlbmRlclJlcGxhY2VkOjpwYWlu dCk6Ci0tLQogLi4uL2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwIHwg IDIgKy0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgICAgICB8IDQw IC0tLS0tLS0tLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaCAgICAg ICAgfCA2OSArKysrKysrKy0tLS0tLS0tLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2tGbG93LmNwcCAgfCAzMyArKysrKysrKy0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuaCAgICB8ICAyICsKIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guaCAgICAgICAgICB8ICAyICsKIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJPYmplY3QuaCAgICAgICB8ICAxIC0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJS ZXBsYWNlZC5jcHAgICB8ICAyICstCiA4IGZpbGVzIGNoYW5nZWQsIDY4IGluc2VydGlvbnMoKyks IDgzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcAppbmRleCAxZmQy MWI5ZDI2ODUuLjE4YTI4YmMxY2I1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcApA QCAtMTkzLDcgKzE5Myw3IEBAIHN0YXRpYyBPcHRpb25TZXQ8QXZvaWRhbmNlUmVhc29uPiBjYW5V c2VGb3JGbGV4TGF5b3V0V2l0aFJlYXNvbihjb25zdCBSZW5kZXJGbGV4CiAgICAgICAgIGlmICht YXlIYXZlU2Nyb2xsYmFyT3JTY3JvbGxhYmxlT3ZlcmZsb3coZmxleEl0ZW1TdHlsZSkpCiAgICAg ICAgICAgICBBRERfUkVBU09OX0FORF9SRVRVUk5fSUZfTkVFREVEKEZsZXhJdGVtSGFzVW5zdXBw b3J0ZWRPdmVyZmxvdywgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwogCi0gICAgICAgIGlmIChm bGV4SXRlbS5oYXNJbnRyaW5zaWNBc3BlY3RSYXRpbygpIHx8IGZsZXhJdGVtU3R5bGUuaGFzQXNw ZWN0UmF0aW8oKSkKKyAgICAgICAgaWYgKChpczxSZW5kZXJCb3g+KGZsZXhJdGVtKSAmJiBkb3du Y2FzdDxSZW5kZXJCb3g+KGZsZXhJdGVtKS5oYXNJbnRyaW5zaWNBc3BlY3RSYXRpbygpKSB8fCBm bGV4SXRlbVN0eWxlLmhhc0FzcGVjdFJhdGlvKCkpCiAgICAgICAgICAgICBBRERfUkVBU09OX0FO RF9SRVRVUk5fSUZfTkVFREVEKEZsZXhJdGVtSGFzQXNwZWN0UmF0aW8sIHJlYXNvbnMsIGluY2x1 ZGVSZWFzb25zKTsKIAogICAgICAgICBhdXRvIGFsaWduVmFsdWUgPSBmbGV4SXRlbVN0eWxlLmFs aWduU2VsZigpLnBvc2l0aW9uKCkgIT0gSXRlbVBvc2l0aW9uOjpBdXRvID8gZmxleEl0ZW1TdHls ZS5hbGlnblNlbGYoKS5wb3NpdGlvbigpIDogZmxleEJveFN0eWxlLmFsaWduSXRlbXMoKS5wb3Np dGlvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggZmI1 ZDgyZDIyYmQ5Li41MjE1NDlkNGRhMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcApAQCAtNzkyLDQ2ICs3OTIsNiBAQCB2b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVC bG9ja0NoaWxkRGlydHlCaXRzQmVmb3JlTGF5b3V0KFJlbGF5b3V0Q2hpbGRyZW4gcmVsYXlvdQog ICAgICAgICBjaGlsZC5zZXROZWVkc1ByZWZlcnJlZFdpZHRoc1VwZGF0ZShNYXJrT25seVRoaXMp OwogfQogCi12b2lkIFJlbmRlckJsb2NrOjpkaXJ0eUZvckxheW91dEZyb21QZXJjZW50YWdlSGVp Z2h0RGVzY2VuZGFudHMoKQotewotICAgIGlmICghcGVyY2VudEhlaWdodERlc2NlbmRhbnRzTWFw KQotICAgICAgICByZXR1cm47Ci0KLSAgICBhdXRvKiBkZXNjZW5kYW50cyA9IHBlcmNlbnRIZWln aHREZXNjZW5kYW50c01hcC0+Z2V0KCp0aGlzKTsKLSAgICBpZiAoIWRlc2NlbmRhbnRzKQotICAg ICAgICByZXR1cm47Ci0KLSAgICBmb3IgKGF1dG8mIGRlc2NlbmRhbnQgOiAqZGVzY2VuZGFudHMp IHsKLSAgICAgICAgLy8gTGV0J3Mgbm90IGRpcnR5IHRoZSBoZWlnaHQgcGVyZWNlbnRhZ2UgZGVz Y2VuZGFudCB3aGVuIGl0IGhhcyBhbiBhYnNvbHV0ZWx5IHBvc2l0aW9uZWQgY29udGFpbmluZyBi bG9jayBhbmNlc3Rvci4gV2Ugc2hvdWxkIGJlIGFibGUgdG8gZGlydHkgc3VjaCBib3hlcyB0aHJv dWdoIHRoZSByZWd1bGFyIGludmFsaWRhdGlvbiBsb2dpYy4KLSAgICAgICAgYm9vbCBkZXNjZW5k YW50TmVlZHNMYXlvdXQgPSB0cnVlOwotICAgICAgICBmb3IgKGF1dG8qIGFuY2VzdG9yID0gZGVz Y2VuZGFudC5jb250YWluaW5nQmxvY2soKTsgYW5jZXN0b3IgJiYgYW5jZXN0b3IgIT0gdGhpczsg YW5jZXN0b3IgPSBhbmNlc3Rvci0+Y29udGFpbmluZ0Jsb2NrKCkpIHsKLSAgICAgICAgICAgIGlm IChhbmNlc3Rvci0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpIHsKLSAgICAgICAgICAgICAgICBk ZXNjZW5kYW50TmVlZHNMYXlvdXQgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAg ICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgICBpZiAoIWRlc2NlbmRhbnROZWVkc0xheW91 dCkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgIENoZWNrZWRQdHI8UmVuZGVyRWxl bWVudD4gcmVuZGVyZXIgPSAmZGVzY2VuZGFudDsKLSAgICAgICAgd2hpbGUgKHJlbmRlcmVyICE9 IHRoaXMpIHsKLSAgICAgICAgICAgIGlmIChyZW5kZXJlci0+bm9ybWFsQ2hpbGROZWVkc0xheW91 dCgpKQotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgcmVuZGVyZXItPnNldENo aWxkTmVlZHNMYXlvdXQoTWFya09ubHlUaGlzKTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAg Ly8gSWYgdGhlIHdpZHRoIG9mIGFuIGltYWdlIGlzIGFmZmVjdGVkIGJ5IHRoZSBoZWlnaHQgb2Yg YSBjaGlsZCAoZS5nLiwgYW4gaW1hZ2Ugd2l0aCBhbiBhc3BlY3QgcmF0aW8pLAotICAgICAgICAg ICAgLy8gdGhlbiB3ZSBoYXZlIHRvIGRpcnR5IHByZWZlcnJlZCB3aWR0aHMsIHNpbmNlIGV2ZW4g ZW5jbG9zaW5nIGJsb2NrcyBjYW4gYmVjb21lIGRpcnR5IGFzIGEgcmVzdWx0LgotICAgICAgICAg ICAgLy8gKEEgaG9yaXpvbnRhbCBmbGV4Ym94IHRoYXQgY29udGFpbnMgYW4gaW5saW5lIGltYWdl IHdyYXBwZWQgaW4gYW4gYW5vbnltb3VzIGJsb2NrIGZvciBleGFtcGxlLikKLSAgICAgICAgICAg IGlmIChyZW5kZXJlci0+aGFzSW50cmluc2ljQXNwZWN0UmF0aW8oKSB8fCByZW5kZXJlci0+c3R5 bGUoKS5oYXNBc3BlY3RSYXRpbygpKQotICAgICAgICAgICAgICAgIHJlbmRlcmVyLT5zZXROZWVk c1ByZWZlcnJlZFdpZHRoc1VwZGF0ZSgpOwotICAgICAgICAgICAgcmVuZGVyZXIgPSByZW5kZXJl ci0+Y29udGFpbmVyKCk7Ci0gICAgICAgICAgICBBU1NFUlQocmVuZGVyZXIpOwotICAgICAgICAg ICAgaWYgKCFyZW5kZXJlcikKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotICAg IH0KLX0KLQogdm9pZCBSZW5kZXJCbG9jazo6c2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXQoKQog ewogICAgIEFTU0VSVCghY2hpbGRyZW5JbmxpbmUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5oCmluZGV4IDY4YzYzNjRkZWFkZi4uZTczMTRmZDFkNjhhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaApAQCAtNTgsNiArNTgsMTEgQEAgY2xhc3MgUmVu ZGVyQmxvY2sgOiBwdWJsaWMgUmVuZGVyQm94IHsKICAgICBXVEZfT1ZFUlJJREVfREVMRVRFX0ZP Ul9DSEVDS0VEX1BUUihSZW5kZXJCbG9jayk7CiBwdWJsaWM6CiAgICAgZnJpZW5kIGNsYXNzIExp bmVMYXlvdXRTdGF0ZTsKKyAgICAvLyBGSVhNRTogVGhpcyBpcyB0ZW1wb3JhcnkgdG8gYWxsb3cg dXMgdG8gbW92ZSBjb2RlIGZyb20gUmVuZGVyQmxvY2sgaW50byBSZW5kZXJCbG9ja0Zsb3cgdGhh dCBhY2Nlc3NlcyBtZW1iZXIgdmFyaWFibGVzIHRoYXQgd2UgaGF2ZW4ndCBtb3ZlZCBvdXQgb2YK KyAgICAvLyBSZW5kZXJCbG9jayB5ZXQuCisgICAgZnJpZW5kIGNsYXNzIFJlbmRlckJsb2NrRmxv dzsKKyAgICAvLyBGSVhNRS1CTE9DS0ZMT1c6IFJlbW92ZSB0aGlzIHdoZW4gdGhlIGxpbmUgbGF5 b3V0IHN0dWZmIGhhcyBhbGwgbW92ZWQgb3V0IG9mIFJlbmRlckJsb2NrCisgICAgZnJpZW5kIGNs YXNzIExpbmVCcmVha2VyOwogICAgIHZpcnR1YWwgflJlbmRlckJsb2NrKCk7CiAKIHByb3RlY3Rl ZDoKQEAgLTI1NSw2ICsyNjAsMjcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIGNhblBl cmZvcm1TaW1wbGlmaWVkTGF5b3V0KCkgY29uc3Q7CiAKKyAgICBMYXlvdXRVbml0IG9mZnNldEZy b21Mb2dpY2FsVG9wT2ZGaXJzdFBhZ2UoKSBjb25zdCBvdmVycmlkZTsKKyAgICBSZW5kZXJGcmFn bWVudENvbnRhaW5lciogZnJhZ21lbnRBdEJsb2NrT2Zmc2V0KExheW91dFVuaXQpIGNvbnN0Owor CisgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVPdmVyZmxvdyhMYXlvdXRVbml0IG9sZENsaWVudEFm dGVyRWRnZSwgYm9vbCByZWNvbXB1dGVGbG9hdHMgPSBmYWxzZSk7CisgICAgdm9pZCBjbGVhckxh eW91dE92ZXJmbG93KCk7CisKKyAgICAvLyBBZGp1c3QgZnJvbSBwYWludGluZyBvZmZzZXRzIHRv IHRoZSBsb2NhbCBjb29yZHMgb2YgdGhpcyByZW5kZXJlcgorICAgIHZvaWQgb2Zmc2V0Rm9yQ29u dGVudHMoTGF5b3V0UG9pbnQmKSBjb25zdDsKKworICAgIGVudW0gRmllbGRzZXRGaW5kTGVnZW5k T3B0aW9uIHsgRmllbGRzZXRJZ25vcmVGbG9hdGluZ09yT3V0T2ZGbG93LCBGaWVsZHNldEluY2x1 ZGVGbG9hdGluZ09yT3V0T2ZGbG93IH07CisgICAgUmVuZGVyQm94KiBmaW5kRmllbGRzZXRMZWdl bmQoRmllbGRzZXRGaW5kTGVnZW5kT3B0aW9uID0gRmllbGRzZXRJZ25vcmVGbG9hdGluZ09yT3V0 T2ZGbG93KSBjb25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0RXhjbHVkZWRDaGlsZHJlbihS ZWxheW91dENoaWxkcmVuKTsKKyAgICB2aXJ0dWFsIGJvb2wgY29tcHV0ZVByZWZlcnJlZFdpZHRo c0ZvckV4Y2x1ZGVkQ2hpbGRyZW4oTGF5b3V0VW5pdCYsIExheW91dFVuaXQmKSBjb25zdDsKKwor ICAgIHZvaWQgYWRqdXN0Qm9yZGVyQm94UmVjdEZvclBhaW50aW5nKExheW91dFJlY3QmKSBvdmVy cmlkZTsKKyAgICBMYXlvdXRSZWN0IHBhaW50UmVjdFRvQ2xpcE91dEZyb21Cb3JkZXIoY29uc3Qg TGF5b3V0UmVjdCYpIG92ZXJyaWRlOworICAgIGJvb2wgaXNOb25SZXBsYWNlZEF0b21pY0lubGlu ZSgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIGlzSW5saW5lKCkgJiYgaXNSZXBsYWNlZE9yQXRvbWlj SW5saW5lKCk7IH0KKworICAgIHZvaWQgYm91bmRpbmdSZWN0cyhWZWN0b3I8TGF5b3V0UmVjdD4m LCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQpIGNvbnN0IG92ZXJyaWRlOwor ICAgIHZvaWQgYWJzb2x1dGVRdWFkcyhWZWN0b3I8RmxvYXRRdWFkPiYsIGJvb2wqIHdhc0ZpeGVk KSBjb25zdCBvdmVycmlkZTsKKwogcHJvdGVjdGVkOgogICAgIFJlbmRlckZyYWdtZW50ZWRGbG93 KiBsb2NhdGVFbmNsb3NpbmdGcmFnbWVudGVkRmxvdygpIGNvbnN0IG92ZXJyaWRlOwogICAgIGJv b2wgZXN0YWJsaXNoZXNJbmRlcGVuZGVudEZvcm1hdHRpbmdDb250ZXh0SWdub3JpbmdEaXNwbGF5 VHlwZShjb25zdCBSZW5kZXJTdHlsZSYpIGNvbnN0OwpAQCAtMzA1LDI2ICszMzEsNiBAQCBwcm90 ZWN0ZWQ6CiAKICAgICBTdHJpbmcgZGVidWdEZXNjcmlwdGlvbigpIGNvbnN0IG92ZXJyaWRlOwog Ci1wdWJsaWM6Ci0gICAgdmlydHVhbCB2b2lkIGNvbXB1dGVPdmVyZmxvdyhMYXlvdXRVbml0IG9s ZENsaWVudEFmdGVyRWRnZSwgYm9vbCByZWNvbXB1dGVGbG9hdHMgPSBmYWxzZSk7Ci0gICAgdm9p ZCBjbGVhckxheW91dE92ZXJmbG93KCk7Ci0gICAgCi0gICAgLy8gQWRqdXN0IGZyb20gcGFpbnRp bmcgb2Zmc2V0cyB0byB0aGUgbG9jYWwgY29vcmRzIG9mIHRoaXMgcmVuZGVyZXIKLSAgICB2b2lk IG9mZnNldEZvckNvbnRlbnRzKExheW91dFBvaW50JikgY29uc3Q7Ci0KLSAgICBlbnVtIEZpZWxk c2V0RmluZExlZ2VuZE9wdGlvbiB7IEZpZWxkc2V0SWdub3JlRmxvYXRpbmdPck91dE9mRmxvdywg RmllbGRzZXRJbmNsdWRlRmxvYXRpbmdPck91dE9mRmxvdyB9OwotICAgIFJlbmRlckJveCogZmlu ZEZpZWxkc2V0TGVnZW5kKEZpZWxkc2V0RmluZExlZ2VuZE9wdGlvbiA9IEZpZWxkc2V0SWdub3Jl RmxvYXRpbmdPck91dE9mRmxvdykgY29uc3Q7Ci0gICAgdmlydHVhbCB2b2lkIGxheW91dEV4Y2x1 ZGVkQ2hpbGRyZW4oUmVsYXlvdXRDaGlsZHJlbik7Ci0gICAgdmlydHVhbCBib29sIGNvbXB1dGVQ cmVmZXJyZWRXaWR0aHNGb3JFeGNsdWRlZENoaWxkcmVuKExheW91dFVuaXQmLCBMYXlvdXRVbml0 JikgY29uc3Q7Ci0gICAgCi0gICAgdm9pZCBhZGp1c3RCb3JkZXJCb3hSZWN0Rm9yUGFpbnRpbmco TGF5b3V0UmVjdCYpIG92ZXJyaWRlOwotICAgIExheW91dFJlY3QgcGFpbnRSZWN0VG9DbGlwT3V0 RnJvbUJvcmRlcihjb25zdCBMYXlvdXRSZWN0Jikgb3ZlcnJpZGU7Ci0gICAgYm9vbCBpc05vblJl cGxhY2VkQXRvbWljSW5saW5lKCkgY29uc3QgZmluYWwgeyByZXR1cm4gaXNJbmxpbmUoKSAmJiBp c1JlcGxhY2VkT3JBdG9taWNJbmxpbmUoKTsgfQotICAgIAotICAgIHZvaWQgYm91bmRpbmdSZWN0 cyhWZWN0b3I8TGF5b3V0UmVjdD4mLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZz ZXQpIGNvbnN0IG92ZXJyaWRlOwotICAgIHZvaWQgYWJzb2x1dGVRdWFkcyhWZWN0b3I8RmxvYXRR dWFkPiYsIGJvb2wqIHdhc0ZpeGVkKSBjb25zdCBvdmVycmlkZTsKLQotcHJvdGVjdGVkOgogICAg IHZpcnR1YWwgYm9vbCBpc1BvaW50SW5PdmVyZmxvd0NvbnRyb2woSGl0VGVzdFJlc3VsdCYsIGNv bnN0IExheW91dFBvaW50JiBsb2NhdGlvbkluQ29udGFpbmVyLCBjb25zdCBMYXlvdXRQb2ludCYg YWNjdW11bGF0ZWRPZmZzZXQpOwogCiAgICAgdmlydHVhbCB2b2lkIGFkZE92ZXJmbG93RnJvbUNo aWxkcmVuKCk7CkBAIC0zNTAsNiArMzU2LDEwIEBAIHByb3RlY3RlZDoKIAogICAgIHZpcnR1YWwg dm9pZCBjb21wdXRlQ2hpbGRJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKFJlbmRlckJveCYsIExheW91 dFVuaXQmIG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4UHJlZmVycmVk TG9naWNhbFdpZHRoKSBjb25zdDsKIAorICAgIFJlbmRlckJsb2NrUmFyZURhdGEmIGVuc3VyZUJs b2NrUmFyZURhdGEoKTsKKyAgICBSZW5kZXJCbG9ja1JhcmVEYXRhKiBnZXRCbG9ja1JhcmVEYXRh KCkgY29uc3Q7CisgICAgYm9vbCByZWNvbXB1dGVMb2dpY2FsV2lkdGgoKTsKKwogcHJpdmF0ZToK ICAgICBzdGF0aWMgUmVuZGVyUHRyPFJlbmRlckJsb2NrPiBjcmVhdGVBbm9ueW1vdXNCbG9ja1dp dGhTdHlsZShEb2N1bWVudCYsIGNvbnN0IFJlbmRlclN0eWxlJik7CiAKQEAgLTQyNSwyNSArNDM1 LDYgQEAgcHJpdmF0ZToKICAgICBib29sIHBhZGRpbmdCb3hMb2dpY2FIZWlnaHRDaGFuZ2VkKGNv bnN0IFJlbmRlclN0eWxlJiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlKTsK ICAgICBib29sIHNjcm9sbGJhcldpZHRoRGlkQ2hhbmdlKGNvbnN0IFJlbmRlclN0eWxlJiwgY29u c3QgUmVuZGVyU3R5bGUmLCBTY3JvbGxiYXJPcmllbnRhdGlvbik7CiAKLXByb3RlY3RlZDoKLSAg ICB2b2lkIGRpcnR5Rm9yTGF5b3V0RnJvbVBlcmNlbnRhZ2VIZWlnaHREZXNjZW5kYW50cygpOwot Ci0gICAgUmVuZGVyQmxvY2tSYXJlRGF0YSYgZW5zdXJlQmxvY2tSYXJlRGF0YSgpOwotICAgIFJl bmRlckJsb2NrUmFyZURhdGEqIGdldEJsb2NrUmFyZURhdGEoKSBjb25zdDsKLQotcHJvdGVjdGVk OgotICAgIGJvb2wgcmVjb21wdXRlTG9naWNhbFdpZHRoKCk7Ci0gICAgCi1wdWJsaWM6Ci0gICAg TGF5b3V0VW5pdCBvZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdlKCkgY29uc3Qgb3ZlcnJp ZGU7Ci0gICAgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGZyYWdtZW50QXRCbG9ja09mZnNldChM YXlvdXRVbml0KSBjb25zdDsKLQotICAgIC8vIEZJWE1FOiBUaGlzIGlzIHRlbXBvcmFyeSB0byBh bGxvdyB1cyB0byBtb3ZlIGNvZGUgZnJvbSBSZW5kZXJCbG9jayBpbnRvIFJlbmRlckJsb2NrRmxv dyB0aGF0IGFjY2Vzc2VzIG1lbWJlciB2YXJpYWJsZXMgdGhhdCB3ZSBoYXZlbid0IG1vdmVkIG91 dCBvZgotICAgIC8vIFJlbmRlckJsb2NrIHlldC4KLSAgICBmcmllbmQgY2xhc3MgUmVuZGVyQmxv Y2tGbG93OwotICAgIC8vIEZJWE1FLUJMT0NLRkxPVzogUmVtb3ZlIHRoaXMgd2hlbiB0aGUgbGlu ZSBsYXlvdXQgc3R1ZmYgaGFzIGFsbCBtb3ZlZCBvdXQgb2YgUmVuZGVyQmxvY2sKLSAgICBmcmll bmQgY2xhc3MgTGluZUJyZWFrZXI7Ci0KIHByaXZhdGU6CiAgICAgLy8gVXNlZCB0byBzdG9yZSBz dGF0ZSBiZXR3ZWVuIHN0eWxlV2lsbENoYW5nZSBhbmQgc3R5bGVEaWRDaGFuZ2UKICAgICBzdGF0 aWMgYm9vbCBzX2NhblByb3BhZ2F0ZUZsb2F0SW50b1NpYmxpbmc7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4IGMyYjVlNzFkNDExYy4uMGNiYjZi YTM5NDExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNw cApAQCAtNjkyLDcgKzY5MiwzOCBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6bGF5b3V0QmxvY2so UmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENoaWxkcmVuLCBMYXlvdXRVbml0CiAgICAgY2xlYXJO ZWVkc0xheW91dCgpOwogfQogCi1pbmxpbmUgTGF5b3V0VW5pdCBSZW5kZXJCbG9ja0Zsb3c6OnNo aWZ0Rm9yQWxpZ25Db250ZW50KExheW91dFVuaXQgaW50cmluc2ljTG9naWNhbEhlaWdodCwgTGF5 b3V0VW5pdCYgcmVwYWludExvZ2ljYWxUb3AsIExheW91dFVuaXQmIHJlcGFpbnRMb2dpY2FsQm90 dG9tKQordm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmRpcnR5Rm9yTGF5b3V0RnJvbVBlcmNlbnRhZ2VI ZWlnaHREZXNjZW5kYW50cygpCit7CisgICAgYXV0byogZGVzY2VuZGFudHMgPSBwZXJjZW50SGVp Z2h0RGVzY2VuZGFudHMoKTsKKyAgICBpZiAoIWRlc2NlbmRhbnRzKQorICAgICAgICByZXR1cm47 CisKKyAgICBmb3IgKGF1dG8mIGRlc2NlbmRhbnQgOiAqZGVzY2VuZGFudHMpIHsKKyAgICAgICAg Ly8gTGV0J3Mgbm90IGRpcnR5IHRoZSBoZWlnaHQgcGVyZWNlbnRhZ2UgZGVzY2VuZGFudCB3aGVu IGl0IGhhcyBhbiBhYnNvbHV0ZWx5IHBvc2l0aW9uZWQgY29udGFpbmluZyBibG9jayBhbmNlc3Rv ci4gV2Ugc2hvdWxkIGJlIGFibGUgdG8gZGlydHkgc3VjaCBib3hlcyB0aHJvdWdoIHRoZSByZWd1 bGFyIGludmFsaWRhdGlvbiBsb2dpYy4KKyAgICAgICAgYm9vbCBkZXNjZW5kYW50TmVlZHNMYXlv dXQgPSB0cnVlOworICAgICAgICBmb3IgKGF1dG8qIGFuY2VzdG9yID0gZGVzY2VuZGFudC5jb250 YWluaW5nQmxvY2soKTsgYW5jZXN0b3IgJiYgYW5jZXN0b3IgIT0gdGhpczsgYW5jZXN0b3IgPSBh bmNlc3Rvci0+Y29udGFpbmluZ0Jsb2NrKCkpIHsKKyAgICAgICAgICAgIGlmIChhbmNlc3Rvci0+ aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpIHsKKyAgICAgICAgICAgICAgICBkZXNjZW5kYW50TmVl ZHNMYXlvdXQgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0K KyAgICAgICAgfQorICAgICAgICBpZiAoIWRlc2NlbmRhbnROZWVkc0xheW91dCkKKyAgICAgICAg ICAgIGNvbnRpbnVlOworCisgICAgICAgIGZvciAoQ2hlY2tlZFB0cjxSZW5kZXJFbGVtZW50PiBy ZW5kZXJlciA9ICZkZXNjZW5kYW50OyByZW5kZXJlciAmJiByZW5kZXJlciAhPSB0aGlzICYmICFy ZW5kZXJlci0+bm9ybWFsQ2hpbGROZWVkc0xheW91dCgpOyByZW5kZXJlciA9IHJlbmRlcmVyLT5j b250YWluZXIoKSkgeworICAgICAgICAgICAgcmVuZGVyZXItPnNldENoaWxkTmVlZHNMYXlvdXQo TWFya09ubHlUaGlzKTsKKyAgICAgICAgICAgIGlmIChDaGVja2VkUHRyIHJlbmRlckJveCA9IGR5 bmFtaWNEb3duY2FzdDxSZW5kZXJCb3g+KHJlbmRlcmVyKSkgeworICAgICAgICAgICAgICAgIC8v IElmIHRoZSB3aWR0aCBvZiBhbiBpbWFnZSBpcyBhZmZlY3RlZCBieSB0aGUgaGVpZ2h0IG9mIGEg Y2hpbGQgKGUuZy4sIGFuIGltYWdlIHdpdGggYW4gYXNwZWN0IHJhdGlvKSwKKyAgICAgICAgICAg ICAgICAvLyB0aGVuIHdlIGhhdmUgdG8gZGlydHkgcHJlZmVycmVkIHdpZHRocywgc2luY2UgZXZl biBlbmNsb3NpbmcgYmxvY2tzIGNhbiBiZWNvbWUgZGlydHkgYXMgYSByZXN1bHQuCisgICAgICAg ICAgICAgICAgLy8gKEEgaG9yaXpvbnRhbCBmbGV4Ym94IHRoYXQgY29udGFpbnMgYW4gaW5saW5l IGltYWdlIHdyYXBwZWQgaW4gYW4gYW5vbnltb3VzIGJsb2NrIGZvciBleGFtcGxlLikKKyAgICAg ICAgICAgICAgICBpZiAocmVuZGVyQm94LT5oYXNJbnRyaW5zaWNBc3BlY3RSYXRpbygpIHx8IHJl bmRlckJveC0+c3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQorICAgICAgICAgICAgICAgICAgICBy ZW5kZXJCb3gtPnNldE5lZWRzUHJlZmVycmVkV2lkdGhzVXBkYXRlKCk7CisgICAgICAgICAgICB9 CisgICAgICAgIH0KKyAgICB9Cit9CisKK0xheW91dFVuaXQgUmVuZGVyQmxvY2tGbG93OjpzaGlm dEZvckFsaWduQ29udGVudChMYXlvdXRVbml0IGludHJpbnNpY0xvZ2ljYWxIZWlnaHQsIExheW91 dFVuaXQmIHJlcGFpbnRMb2dpY2FsVG9wLCBMYXlvdXRVbml0JiByZXBhaW50TG9naWNhbEJvdHRv bSkKIHsKICAgICBhdXRvJiBhbGlnbm1lbnQgPSBzdHlsZSgpLmFsaWduQ29udGVudCgpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgKaW5kZXggMjNmYmVhYjRi OTZjLi4wNjRhYzJmMmE3MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9ja0Zsb3cuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tGbG93LmgKQEAgLTUzMyw2ICs1MzMsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgYWRqdXN0VGV4 dEJveFRyaW1BZnRlckxheW91dCgpOwogICAgIHN0ZDo6cGFpcjxmbG9hdCwgZmxvYXQ+IGlubGlu ZUNvbnRlbnRUb3BBbmRCb3R0b21JbmNsdWRpbmdJbmtPdmVyZmxvdygpIGNvbnN0OwogCisgICAg dm9pZCBkaXJ0eUZvckxheW91dEZyb21QZXJjZW50YWdlSGVpZ2h0RGVzY2VuZGFudHMoKTsKKwog I2lmIEVOQUJMRShURVhUX0FVVE9TSVpJTkcpCiAgICAgaW50IG1fd2lkdGhGb3JUZXh0QXV0b3Np emluZzsKICAgICB1bnNpZ25lZCBtX2xpbmVDb3VudEZvclRleHRBdXRvc2l6aW5nIDogMjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCBlOGM5NTM5NDFhZDIuLjNmMTIxMjI2 ZDcwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtNjI0LDYgKzYyNCw4 IEBAIHB1YmxpYzoKIAogICAgIGlubGluZSBib29sIGJhY2tncm91bmRJc0tub3duVG9CZU9ic2N1 cmVkKGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCk7CiAKKyAgICB2aXJ0dWFsIGJvb2wg aGFzSW50cmluc2ljQXNwZWN0UmF0aW8oKSBjb25zdCB7IHJldHVybiBpc1JlcGxhY2VkT3JBdG9t aWNJbmxpbmUoKSAmJiAoaXNJbWFnZSgpIHx8IGlzUmVuZGVyVmlkZW8oKSB8fCBpc1JlbmRlckhU TUxDYW52YXMoKSB8fCBpc1JlbmRlclZpZXdUcmFuc2l0aW9uQ2FwdHVyZSgpKTsgfQorCiBwcm90 ZWN0ZWQ6CiAgICAgUmVuZGVyQm94KFR5cGUsIEVsZW1lbnQmLCBSZW5kZXJTdHlsZSYmLCBPcHRp b25TZXQ8VHlwZUZsYWc+ID0geyB9LCBUeXBlU3BlY2lmaWNGbGFncyA9IHsgfSk7CiAgICAgUmVu ZGVyQm94KFR5cGUsIERvY3VtZW50JiwgUmVuZGVyU3R5bGUmJiwgT3B0aW9uU2V0PFR5cGVGbGFn PiA9IHsgfSwgVHlwZVNwZWNpZmljRmxhZ3MgPSB7IH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5oCmluZGV4IGRiMDJjNWQxZmYzYy4uNzYxYWY1ZWVmNmYxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC02NTEsNyArNjUxLDYgQEAgcHVi bGljOgogICAgIC8vIHJlc3Qgb2YgdGhlIHJlbmRlcmluZyB0cmVlIHdpbGwgbW92ZSB0byBhIHNp bWlsYXIgbW9kZWwuCiAgICAgdmlydHVhbCBib29sIG5vZGVBdEZsb2F0UG9pbnQoY29uc3QgSGl0 VGVzdFJlcXVlc3QmLCBIaXRUZXN0UmVzdWx0JiwgY29uc3QgRmxvYXRQb2ludCYgcG9pbnRJblBh cmVudCwgSGl0VGVzdEFjdGlvbik7CiAKLSAgICB2aXJ0dWFsIGJvb2wgaGFzSW50cmluc2ljQXNw ZWN0UmF0aW8oKSBjb25zdCB7IHJldHVybiBpc1JlcGxhY2VkT3JBdG9taWNJbmxpbmUoKSAmJiAo aXNJbWFnZSgpIHx8IGlzUmVuZGVyVmlkZW8oKSB8fCBpc1JlbmRlckhUTUxDYW52YXMoKSB8fCBp c1JlbmRlclZpZXdUcmFuc2l0aW9uQ2FwdHVyZSgpKTsgfQogICAgIGJvb2wgaXNBbm9ueW1vdXMo KSBjb25zdCB7IHJldHVybiBtX3R5cGVGbGFncy5jb250YWlucyhUeXBlRmxhZzo6SXNBbm9ueW1v dXMpOyB9CiAKICAgICBib29sIGlzRmxvYXRpbmcoKSBjb25zdCB7IHJldHVybiBtX3N0YXRlQml0 ZmllbGRzLmhhc0ZsYWcoU3RhdGVGbGFnOjpGbG9hdGluZyk7IH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IDJkNGJiN2NhYWY5Yy4uYTA3YjIzYWZi N2FkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKQEAg LTU2NSw3ICs1NjUsNyBAQCB2b2lkIFJlbmRlclJlcGxhY2VkOjpjb21wdXRlSW50cmluc2ljUmF0 aW9JbmZvcm1hdGlvbihGbG9hdFNpemUmIGludHJpbnNpY1NpemUsCiAgICAgICAgICAgICByZXR1 cm47CiAgICAgfQogICAgIC8vIEZpZ3VyZSBvdXQgaWYgd2UgbmVlZCB0byBjb21wdXRlIGFuIGlu dHJpbnNpYyByYXRpby4KLSAgICBpZiAoIVJlbmRlck9iamVjdDo6aGFzSW50cmluc2ljQXNwZWN0 UmF0aW8oKSAmJiAhaXNSZW5kZXJPckxlZ2FjeVJlbmRlclNWR1Jvb3QoKSkKKyAgICBpZiAoIVJl bmRlckJveDo6aGFzSW50cmluc2ljQXNwZWN0UmF0aW8oKSAmJiAhaXNSZW5kZXJPckxlZ2FjeVJl bmRlclNWR1Jvb3QoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gQWZ0ZXIgc3VwcG9ydGlu ZyBjb250YWluLWludHJpbnNpYy1zaXplLCB0aGUgaW50cmluc2ljU2l6ZSBvZiBzaXplIGNvbnRh aW5tZW50IGlzIG5vdCBhbHdheXMgZW1wdHkuCg==