152856 2016-01-07 13:58:11 -0800 Use wavy offset for decoration painting when line style is TextDecorationStyleWavy. 2016-01-07 15:33:25 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1153563 0 zalan 2016-01-07 13:58:11 -0800 SSIA. 1153564 1 268483 zalan 2016-01-07 14:00:06 -0800 Created attachment 268483 Patch 1153573 2 268483 simon.fraser 2016-01-07 14:08:33 -0800 Comment on attachment 268483 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268483&action=review > Source/WebCore/rendering/TextDecorationPainter.cpp:334 > + FloatPoint start(localOrigin.x(), localOrigin.y() + offset + wavyOffset); > + FloatPoint end(localOrigin.x() + m_width, localOrigin.y() + offset + wavyOffset); Minor pref for localOrigin + FloatSize(...) > Source/WebCore/rendering/TextDecorationPainter.cpp:339 > + FloatPoint start(localOrigin.x(), localOrigin.y() - wavyOffset); Minor pref for localOrigin - FloatSize(0, wavyOffset) here 1153627 3 268496 zalan 2016-01-07 14:46:58 -0800 Created attachment 268496 Patch 1153646 4 268496 commit-queue 2016-01-07 15:33:22 -0800 Comment on attachment 268496 Patch Clearing flags on attachment: 268496 Committed r194736: <http://trac.webkit.org/changeset/194736> 1153647 5 commit-queue 2016-01-07 15:33:25 -0800 All reviewed patches have been landed. Closing bug. 268483 2016-01-07 14:00:06 -0800 2016-01-07 14:46:54 -0800 Patch bug-152856-20160107135933.patch text/plain 4560 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RkZWM0OGQ2M2U0MjIx YjA0OTU1MzU4YjI3ZWU0ZDU2NjUxZmU5NS4uZjI1ZjQ2N2MzNjA5NzZiODRmNmY1OTY3NWJlODBj ZTJmNjMyZTFhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTAxLTA3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHdhdnkgb2Zmc2V0IGZv ciBkZWNvcmF0aW9uIHBhaW50aW5nIHdoZW4gbGluZSBzdHlsZSBpcyBUZXh0RGVjb3JhdGlvblN0 eWxlV2F2eS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1Mjg1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1RleHRE ZWNvcmF0aW9uUGFpbnRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0RGVjb3JhdGlvblBh aW50ZXI6OnBhaW50VGV4dERlY29yYXRpb24pOgorCiAyMDE2LTAxLTA2ICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgRmxvYXQgd2l0aCBtZWRpYSBxdWVyeSBwb3Np dGlvbmVkIGluY29ycmVjdGx5IGFmdGVyIHdpbmRvdyByZXNpemUuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9UZXh0RGVjb3JhdGlvblBhaW50ZXIuY3BwCmluZGV4IGZjOTIzOTZi MjI5NGU4MzQ2NWU5NjBlOTExZjA1NmYxYThkMmQyM2MuLjc1MTk5MWJmNGU2YjkwNTMzMjZkNTE3 Y2M1NzZiZWNiNjBlOTBjYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9U ZXh0RGVjb3JhdGlvblBhaW50ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9U ZXh0RGVjb3JhdGlvblBhaW50ZXIuY3BwCkBAIC0yNjksOSArMjY5LDkgQEAgdm9pZCBUZXh0RGVj b3JhdGlvblBhaW50ZXI6OnBhaW50VGV4dERlY29yYXRpb24oY29uc3QgVGV4dFJ1biYgdGV4dFJ1 biwgY29uc3QgRmwKICAgICAgICAgbV9jb250ZXh0LnNldFN0cm9rZUNvbG9yKGNvbG9yKTsKICAg ICAgICAgbV9jb250ZXh0LnNldFN0cm9rZVN0eWxlKHN0cm9rZVN0eWxlKTsKIAotICAgICAgICBp ZiAoc3R5bGUgPT0gVGV4dERlY29yYXRpb25TdHlsZVdhdnkpIHsKKyAgICAgICAgaWYgKHN0eWxl ID09IFRleHREZWNvcmF0aW9uU3R5bGVXYXZ5KQogICAgICAgICAgICAgc3Ryb2tlV2F2eVRleHRE ZWNvcmF0aW9uKG1fY29udGV4dCwgc3RhcnQsIGVuZCwgdGV4dERlY29yYXRpb25UaGlja25lc3Mp OwotICAgICAgICB9IGVsc2UgaWYgKGRlY29yYXRpb24gPT0gVGV4dERlY29yYXRpb25VbmRlcmxp bmUgfHwgZGVjb3JhdGlvbiA9PSBUZXh0RGVjb3JhdGlvbk92ZXJsaW5lKSB7CisgICAgICAgIGVs c2UgaWYgKGRlY29yYXRpb24gPT0gVGV4dERlY29yYXRpb25VbmRlcmxpbmUgfHwgZGVjb3JhdGlv biA9PSBUZXh0RGVjb3JhdGlvbk92ZXJsaW5lKSB7CiAjaWYgRU5BQkxFKENTUzNfVEVYVF9ERUNP UkFUSU9OX1NLSVBfSU5LKQogICAgICAgICAgICAgaWYgKChtX2xpbmVTdHlsZS50ZXh0RGVjb3Jh dGlvblNraXAoKSA9PSBUZXh0RGVjb3JhdGlvblNraXBJbmsgfHwgbV9saW5lU3R5bGUudGV4dERl Y29yYXRpb25Ta2lwKCkgPT0gVGV4dERlY29yYXRpb25Ta2lwQXV0bykgJiYgbV9pc0hvcml6b250 YWwpIHsKICAgICAgICAgICAgICAgICBpZiAoIW1fY29udGV4dC5wYWludGluZ0Rpc2FibGVkKCkp CkBAIC0yNzksMTEgKzI3OSwxMSBAQCB2b2lkIFRleHREZWNvcmF0aW9uUGFpbnRlcjo6cGFpbnRU ZXh0RGVjb3JhdGlvbihjb25zdCBUZXh0UnVuJiB0ZXh0UnVuLCBjb25zdCBGbAogICAgICAgICAg ICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IE5lZWQgdG8gc3VwcG9ydCB0ZXh0 LWRlY29yYXRpb24tc2tpcDogbm9uZS4KICNlbmRpZgotICAgICAgICAgICAgICAgIG1fY29udGV4 dC5kcmF3TGluZUZvclRleHQoRmxvYXRQb2ludChsb2NhbE9yaWdpbi54KCksIGxvY2FsT3JpZ2lu LnkoKSArIG9mZnNldCksIG1fd2lkdGgsIG1faXNQcmludGluZywgc3R5bGUgPT0gVGV4dERlY29y YXRpb25TdHlsZURvdWJsZSk7CisgICAgICAgICAgICAgICAgbV9jb250ZXh0LmRyYXdMaW5lRm9y VGV4dChzdGFydCwgbV93aWR0aCwgbV9pc1ByaW50aW5nLCBzdHlsZSA9PSBUZXh0RGVjb3JhdGlv blN0eWxlRG91YmxlKTsKICAgICAgICAgICAgIAogICAgICAgICB9IGVsc2UgewogICAgICAgICAg ICAgQVNTRVJUKGRlY29yYXRpb24gPT0gVGV4dERlY29yYXRpb25MaW5lVGhyb3VnaCk7Ci0gICAg ICAgICAgICBtX2NvbnRleHQuZHJhd0xpbmVGb3JUZXh0KEZsb2F0UG9pbnQobG9jYWxPcmlnaW4u eCgpLCBsb2NhbE9yaWdpbi55KCkgKyAyICogbV9iYXNlbGluZSAvIDMpLCBtX3dpZHRoLCBtX2lz UHJpbnRpbmcsIHN0eWxlID09IFRleHREZWNvcmF0aW9uU3R5bGVEb3VibGUpOworICAgICAgICAg ICAgbV9jb250ZXh0LmRyYXdMaW5lRm9yVGV4dChzdGFydCwgbV93aWR0aCwgbV9pc1ByaW50aW5n LCBzdHlsZSA9PSBUZXh0RGVjb3JhdGlvblN0eWxlRG91YmxlKTsKICAgICAgICAgfQogICAgIH07 CiAKQEAgLTMyOSwxMyArMzI5LDE1IEBAIHZvaWQgVGV4dERlY29yYXRpb25QYWludGVyOjpwYWlu dFRleHREZWNvcmF0aW9uKGNvbnN0IFRleHRSdW4mIHRleHRSdW4sIGNvbnN0IEZsCiAgICAgICAg IC8vIFRoZXNlIGRlY29yYXRpb25zIHNob3VsZCBtYXRjaCB0aGUgdmlzdWFsIG92ZXJmbG93cyBj b21wdXRlZCBpbiB2aXN1YWxPdmVyZmxvd0ZvckRlY29yYXRpb25zKCkKICAgICAgICAgaWYgKG1f ZGVjb3JhdGlvbiAmIFRleHREZWNvcmF0aW9uVW5kZXJsaW5lKSB7CiAgICAgICAgICAgICBjb25z dCBpbnQgb2Zmc2V0ID0gY29tcHV0ZVVuZGVybGluZU9mZnNldChtX2xpbmVTdHlsZS50ZXh0VW5k ZXJsaW5lUG9zaXRpb24oKSwgbV9saW5lU3R5bGUuZm9udE1ldHJpY3MoKSwgbV9pbmxpbmVUZXh0 Qm94LCB0ZXh0RGVjb3JhdGlvblRoaWNrbmVzcyk7Ci0gICAgICAgICAgICBGbG9hdFBvaW50IHN0 YXJ0KGxvY2FsT3JpZ2luLngoKSwgbG9jYWxPcmlnaW4ueSgpICsgb2Zmc2V0ICsgbV93YXZ5T2Zm c2V0KTsKLSAgICAgICAgICAgIEZsb2F0UG9pbnQgZW5kKGxvY2FsT3JpZ2luLngoKSArIG1fd2lk dGgsIGxvY2FsT3JpZ2luLnkoKSArIG9mZnNldCArIG1fd2F2eU9mZnNldCk7CisgICAgICAgICAg ICBpbnQgd2F2eU9mZnNldCA9IG1fdW5kZXJsaW5lU3R5bGUgPT0gVGV4dERlY29yYXRpb25TdHls ZVdhdnkgPyBtX3dhdnlPZmZzZXQgOiAwOworICAgICAgICAgICAgRmxvYXRQb2ludCBzdGFydChs b2NhbE9yaWdpbi54KCksIGxvY2FsT3JpZ2luLnkoKSArIG9mZnNldCArIHdhdnlPZmZzZXQpOwor ICAgICAgICAgICAgRmxvYXRQb2ludCBlbmQobG9jYWxPcmlnaW4ueCgpICsgbV93aWR0aCwgbG9j YWxPcmlnaW4ueSgpICsgb2Zmc2V0ICsgd2F2eU9mZnNldCk7CiAgICAgICAgICAgICBwYWludERl Y29yYXRpb24oVGV4dERlY29yYXRpb25VbmRlcmxpbmUsIG1fdW5kZXJsaW5lU3R5bGUsIG1fdW5k ZXJsaW5lQ29sb3IsIHRleHREZWNvcmF0aW9uU3R5bGVUb1N0cm9rZVN0eWxlKG1fdW5kZXJsaW5l U3R5bGUpLCBzdGFydCwgZW5kLCBvZmZzZXQpOwogICAgICAgICB9CiAgICAgICAgIGlmIChtX2Rl Y29yYXRpb24gJiBUZXh0RGVjb3JhdGlvbk92ZXJsaW5lKSB7Ci0gICAgICAgICAgICBGbG9hdFBv aW50IHN0YXJ0KGxvY2FsT3JpZ2luLngoKSwgbG9jYWxPcmlnaW4ueSgpIC0gbV93YXZ5T2Zmc2V0 KTsKLSAgICAgICAgICAgIEZsb2F0UG9pbnQgZW5kKGxvY2FsT3JpZ2luLngoKSArIG1fd2lkdGgs IGxvY2FsT3JpZ2luLnkoKSAtIG1fd2F2eU9mZnNldCk7CisgICAgICAgICAgICBpbnQgd2F2eU9m ZnNldCA9IG1fb3ZlcmxpbmVTdHlsZSA9PSBUZXh0RGVjb3JhdGlvblN0eWxlV2F2eSA/IG1fd2F2 eU9mZnNldCA6IDA7CisgICAgICAgICAgICBGbG9hdFBvaW50IHN0YXJ0KGxvY2FsT3JpZ2luLngo KSwgbG9jYWxPcmlnaW4ueSgpIC0gd2F2eU9mZnNldCk7CisgICAgICAgICAgICBGbG9hdFBvaW50 IGVuZChsb2NhbE9yaWdpbi54KCkgKyBtX3dpZHRoLCBsb2NhbE9yaWdpbi55KCkgLSB3YXZ5T2Zm c2V0KTsKICAgICAgICAgICAgIHBhaW50RGVjb3JhdGlvbihUZXh0RGVjb3JhdGlvbk92ZXJsaW5l LCBtX292ZXJsaW5lU3R5bGUsIG1fb3ZlcmxpbmVDb2xvciwgdGV4dERlY29yYXRpb25TdHlsZVRv U3Ryb2tlU3R5bGUobV9vdmVybGluZVN0eWxlKSwgc3RhcnQsIGVuZCwgMCk7CiAgICAgICAgIH0K ICAgICAgICAgaWYgKG1fZGVjb3JhdGlvbiAmIFRleHREZWNvcmF0aW9uTGluZVRocm91Z2gpIHsK 268496 2016-01-07 14:46:58 -0800 2016-01-07 15:33:22 -0800 Patch bug-152856-20160107144625.patch text/plain 5071 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NzI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTYwZWNmZTQ5NTIwOWU2 Nzk3NmJjMTdjZTgwZTcwNTMxMzQyZGE3OC4uYjA3OWNmOTE3NTI1MWU0MWEyODMyYjc1MTE3YTY4 YzhiNTJiNjkwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTAxLTA3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHdhdnkgb2Zmc2V0IGZv ciBkZWNvcmF0aW9uIHBhaW50aW5nIHdoZW4gbGluZSBzdHlsZSBpcyBUZXh0RGVjb3JhdGlvblN0 eWxlV2F2eS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1Mjg1NgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBO byBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmluZy9UZXh0RGVj b3JhdGlvblBhaW50ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dERlY29yYXRpb25QYWlu dGVyOjpwYWludFRleHREZWNvcmF0aW9uKToKKwogMjAxNi0wMS0wNyAgQnJhZHkgRWlkc29uICA8 YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTW9kZXJuIElEQjogaW1wb3J0ZWQvdzNjL2lu ZGV4ZWRkYi9pZGJjdXJzb3ItY29udGludWUuaHRtIGZhaWxzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1RleHREZWNvcmF0aW9uUGFpbnRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmNwcAppbmRleCBmYzkyMzk2YjIy OTRlODM0NjVlOTYwZTkxMWYwNTZmMWE4ZDJkMjNjLi5kZTJkNjlkOTUxYTEyY2U0MzdjNmFjNTll ODAyNzU5OGZjZmUyYzYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4 dERlY29yYXRpb25QYWludGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4 dERlY29yYXRpb25QYWludGVyLmNwcApAQCAtMjY5LDkgKzI2OSw5IEBAIHZvaWQgVGV4dERlY29y YXRpb25QYWludGVyOjpwYWludFRleHREZWNvcmF0aW9uKGNvbnN0IFRleHRSdW4mIHRleHRSdW4s IGNvbnN0IEZsCiAgICAgICAgIG1fY29udGV4dC5zZXRTdHJva2VDb2xvcihjb2xvcik7CiAgICAg ICAgIG1fY29udGV4dC5zZXRTdHJva2VTdHlsZShzdHJva2VTdHlsZSk7CiAKLSAgICAgICAgaWYg KHN0eWxlID09IFRleHREZWNvcmF0aW9uU3R5bGVXYXZ5KSB7CisgICAgICAgIGlmIChzdHlsZSA9 PSBUZXh0RGVjb3JhdGlvblN0eWxlV2F2eSkKICAgICAgICAgICAgIHN0cm9rZVdhdnlUZXh0RGVj b3JhdGlvbihtX2NvbnRleHQsIHN0YXJ0LCBlbmQsIHRleHREZWNvcmF0aW9uVGhpY2tuZXNzKTsK LSAgICAgICAgfSBlbHNlIGlmIChkZWNvcmF0aW9uID09IFRleHREZWNvcmF0aW9uVW5kZXJsaW5l IHx8IGRlY29yYXRpb24gPT0gVGV4dERlY29yYXRpb25PdmVybGluZSkgeworICAgICAgICBlbHNl IGlmIChkZWNvcmF0aW9uID09IFRleHREZWNvcmF0aW9uVW5kZXJsaW5lIHx8IGRlY29yYXRpb24g PT0gVGV4dERlY29yYXRpb25PdmVybGluZSkgewogI2lmIEVOQUJMRShDU1MzX1RFWFRfREVDT1JB VElPTl9TS0lQX0lOSykKICAgICAgICAgICAgIGlmICgobV9saW5lU3R5bGUudGV4dERlY29yYXRp b25Ta2lwKCkgPT0gVGV4dERlY29yYXRpb25Ta2lwSW5rIHx8IG1fbGluZVN0eWxlLnRleHREZWNv cmF0aW9uU2tpcCgpID09IFRleHREZWNvcmF0aW9uU2tpcEF1dG8pICYmIG1faXNIb3Jpem9udGFs KSB7CiAgICAgICAgICAgICAgICAgaWYgKCFtX2NvbnRleHQucGFpbnRpbmdEaXNhYmxlZCgpKQpA QCAtMjc5LDExICsyNzksMTEgQEAgdm9pZCBUZXh0RGVjb3JhdGlvblBhaW50ZXI6OnBhaW50VGV4 dERlY29yYXRpb24oY29uc3QgVGV4dFJ1biYgdGV4dFJ1biwgY29uc3QgRmwKICAgICAgICAgICAg IH0gZWxzZQogICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBOZWVkIHRvIHN1cHBvcnQgdGV4dC1k ZWNvcmF0aW9uLXNraXA6IG5vbmUuCiAjZW5kaWYKLSAgICAgICAgICAgICAgICBtX2NvbnRleHQu ZHJhd0xpbmVGb3JUZXh0KEZsb2F0UG9pbnQobG9jYWxPcmlnaW4ueCgpLCBsb2NhbE9yaWdpbi55 KCkgKyBvZmZzZXQpLCBtX3dpZHRoLCBtX2lzUHJpbnRpbmcsIHN0eWxlID09IFRleHREZWNvcmF0 aW9uU3R5bGVEb3VibGUpOworICAgICAgICAgICAgICAgIG1fY29udGV4dC5kcmF3TGluZUZvclRl eHQoc3RhcnQsIG1fd2lkdGgsIG1faXNQcmludGluZywgc3R5bGUgPT0gVGV4dERlY29yYXRpb25T dHlsZURvdWJsZSk7CiAgICAgICAgICAgICAKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg IEFTU0VSVChkZWNvcmF0aW9uID09IFRleHREZWNvcmF0aW9uTGluZVRocm91Z2gpOwotICAgICAg ICAgICAgbV9jb250ZXh0LmRyYXdMaW5lRm9yVGV4dChGbG9hdFBvaW50KGxvY2FsT3JpZ2luLngo KSwgbG9jYWxPcmlnaW4ueSgpICsgMiAqIG1fYmFzZWxpbmUgLyAzKSwgbV93aWR0aCwgbV9pc1By aW50aW5nLCBzdHlsZSA9PSBUZXh0RGVjb3JhdGlvblN0eWxlRG91YmxlKTsKKyAgICAgICAgICAg IG1fY29udGV4dC5kcmF3TGluZUZvclRleHQoc3RhcnQsIG1fd2lkdGgsIG1faXNQcmludGluZywg c3R5bGUgPT0gVGV4dERlY29yYXRpb25TdHlsZURvdWJsZSk7CiAgICAgICAgIH0KICAgICB9Owog CkBAIC0zMjksMTggKzMyOSwyMCBAQCB2b2lkIFRleHREZWNvcmF0aW9uUGFpbnRlcjo6cGFpbnRU ZXh0RGVjb3JhdGlvbihjb25zdCBUZXh0UnVuJiB0ZXh0UnVuLCBjb25zdCBGbAogICAgICAgICAv LyBUaGVzZSBkZWNvcmF0aW9ucyBzaG91bGQgbWF0Y2ggdGhlIHZpc3VhbCBvdmVyZmxvd3MgY29t cHV0ZWQgaW4gdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucygpCiAgICAgICAgIGlmIChtX2Rl Y29yYXRpb24gJiBUZXh0RGVjb3JhdGlvblVuZGVybGluZSkgewogICAgICAgICAgICAgY29uc3Qg aW50IG9mZnNldCA9IGNvbXB1dGVVbmRlcmxpbmVPZmZzZXQobV9saW5lU3R5bGUudGV4dFVuZGVy bGluZVBvc2l0aW9uKCksIG1fbGluZVN0eWxlLmZvbnRNZXRyaWNzKCksIG1faW5saW5lVGV4dEJv eCwgdGV4dERlY29yYXRpb25UaGlja25lc3MpOwotICAgICAgICAgICAgRmxvYXRQb2ludCBzdGFy dChsb2NhbE9yaWdpbi54KCksIGxvY2FsT3JpZ2luLnkoKSArIG9mZnNldCArIG1fd2F2eU9mZnNl dCk7Ci0gICAgICAgICAgICBGbG9hdFBvaW50IGVuZChsb2NhbE9yaWdpbi54KCkgKyBtX3dpZHRo LCBsb2NhbE9yaWdpbi55KCkgKyBvZmZzZXQgKyBtX3dhdnlPZmZzZXQpOworICAgICAgICAgICAg aW50IHdhdnlPZmZzZXQgPSBtX3VuZGVybGluZVN0eWxlID09IFRleHREZWNvcmF0aW9uU3R5bGVX YXZ5ID8gbV93YXZ5T2Zmc2V0IDogMDsKKyAgICAgICAgICAgIEZsb2F0UG9pbnQgc3RhcnQgPSBs b2NhbE9yaWdpbiArIEZsb2F0U2l6ZSgwLCBvZmZzZXQgKyB3YXZ5T2Zmc2V0KTsKKyAgICAgICAg ICAgIEZsb2F0UG9pbnQgZW5kID0gbG9jYWxPcmlnaW4gKyBGbG9hdFNpemUobV93aWR0aCwgb2Zm c2V0ICsgd2F2eU9mZnNldCk7CiAgICAgICAgICAgICBwYWludERlY29yYXRpb24oVGV4dERlY29y YXRpb25VbmRlcmxpbmUsIG1fdW5kZXJsaW5lU3R5bGUsIG1fdW5kZXJsaW5lQ29sb3IsIHRleHRE ZWNvcmF0aW9uU3R5bGVUb1N0cm9rZVN0eWxlKG1fdW5kZXJsaW5lU3R5bGUpLCBzdGFydCwgZW5k LCBvZmZzZXQpOwogICAgICAgICB9CiAgICAgICAgIGlmIChtX2RlY29yYXRpb24gJiBUZXh0RGVj b3JhdGlvbk92ZXJsaW5lKSB7Ci0gICAgICAgICAgICBGbG9hdFBvaW50IHN0YXJ0KGxvY2FsT3Jp Z2luLngoKSwgbG9jYWxPcmlnaW4ueSgpIC0gbV93YXZ5T2Zmc2V0KTsKLSAgICAgICAgICAgIEZs b2F0UG9pbnQgZW5kKGxvY2FsT3JpZ2luLngoKSArIG1fd2lkdGgsIGxvY2FsT3JpZ2luLnkoKSAt IG1fd2F2eU9mZnNldCk7CisgICAgICAgICAgICBpbnQgd2F2eU9mZnNldCA9IG1fb3ZlcmxpbmVT dHlsZSA9PSBUZXh0RGVjb3JhdGlvblN0eWxlV2F2eSA/IG1fd2F2eU9mZnNldCA6IDA7CisgICAg ICAgICAgICBGbG9hdFBvaW50IHN0YXJ0ID0gbG9jYWxPcmlnaW4gLSBGbG9hdFNpemUoMCwgd2F2 eU9mZnNldCk7CisgICAgICAgICAgICBGbG9hdFBvaW50IGVuZCA9IGxvY2FsT3JpZ2luICsgRmxv YXRTaXplKG1fd2lkdGgsIC13YXZ5T2Zmc2V0KTsKICAgICAgICAgICAgIHBhaW50RGVjb3JhdGlv bihUZXh0RGVjb3JhdGlvbk92ZXJsaW5lLCBtX292ZXJsaW5lU3R5bGUsIG1fb3ZlcmxpbmVDb2xv ciwgdGV4dERlY29yYXRpb25TdHlsZVRvU3Ryb2tlU3R5bGUobV9vdmVybGluZVN0eWxlKSwgc3Rh cnQsIGVuZCwgMCk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKG1fZGVjb3JhdGlvbiAmIFRleHRE ZWNvcmF0aW9uTGluZVRocm91Z2gpIHsKLSAgICAgICAgICAgIEZsb2F0UG9pbnQgc3RhcnQobG9j YWxPcmlnaW4ueCgpLCBsb2NhbE9yaWdpbi55KCkgKyAyICogbV9iYXNlbGluZSAvIDMpOwotICAg ICAgICAgICAgRmxvYXRQb2ludCBlbmQobG9jYWxPcmlnaW4ueCgpICsgbV93aWR0aCwgbG9jYWxP cmlnaW4ueSgpICsgMiAqIG1fYmFzZWxpbmUgLyAzKTsKKyAgICAgICAgICAgIEZsb2F0UG9pbnQg c3RhcnQgPSBsb2NhbE9yaWdpbiArIEZsb2F0U2l6ZSgwLCAyICogbV9iYXNlbGluZSAvIDMpOwor ICAgICAgICAgICAgRmxvYXRQb2ludCBlbmQgPSBsb2NhbE9yaWdpbiArIEZsb2F0U2l6ZShtX3dp ZHRoLCAyICogbV9iYXNlbGluZSAvIDMpOwogICAgICAgICAgICAgcGFpbnREZWNvcmF0aW9uKFRl eHREZWNvcmF0aW9uTGluZVRocm91Z2gsIG1fbGluZXRocm91Z2hTdHlsZSwgbV9saW5ldGhyb3Vn aENvbG9yLCB0ZXh0RGVjb3JhdGlvblN0eWxlVG9TdHJva2VTdHlsZShtX2xpbmV0aHJvdWdoU3R5 bGUpLCBzdGFydCwgZW5kLCAwKTsKICAgICAgICAgfQogICAgIH0gd2hpbGUgKHNoYWRvdyk7Cg==