126559 2014-01-06 18:44:02 -0800 [Mac] Be more correct in dealing with NSControlSize 2014-01-06 20:42:04 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrowe mrowe commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 964841 0 mrowe 2014-01-06 18:44:02 -0800 In several places in WebCore we pass ints or ScrollbarControlSizes in places that NSControlSize is expected. This will break if NSControlSize ever moves from a typedef for NSInteger to an enum. 964842 1 220481 mrowe 2014-01-06 18:46:58 -0800 Created attachment 220481 Patch 964850 2 220481 rniwa 2014-01-06 19:34:35 -0800 Comment on attachment 220481 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=220481&action=review > Source/WebCore/platform/mac/ScrollbarThemeMac.mm:167 > +} We should have a default value just in case? 964857 3 220485 mrowe 2014-01-06 20:06:32 -0800 Created attachment 220485 Patch 964858 4 220485 commit-queue 2014-01-06 20:42:02 -0800 Comment on attachment 220485 Patch Clearing flags on attachment: 220485 Committed r161397: <http://trac.webkit.org/changeset/161397> 964859 5 commit-queue 2014-01-06 20:42:04 -0800 All reviewed patches have been landed. Closing bug. 220481 2014-01-06 18:46:58 -0800 2014-01-06 20:06:30 -0800 Patch bug-126559-20140106184701.patch text/plain 4476 mrowe U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxMzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGE1YjBhYWYxYTJhMWEw NGJkMTUxOWE3NTdlNDk4Y2Q5OWU0MzM3OC4uNWQ2NTMwY2FkN2E5NDYwYzYwMWNlYWU3Y2Y4YjMw M2NjNTI3MTFjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAxLTA2ICBNYXJr IFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CisKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9i LzEyNjU1OT4gQmUgbW9yZSBjb3JyZWN0IGluIGRlYWxpbmcgd2l0aCBOU0NvbnRyb2xTaXplCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvU2Nyb2xsYmFyVGhlbWVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpzY3JvbGxiYXJD b250cm9sU2l6ZVRvTlNDb250cm9sU2l6ZSk6IEhlbHBlciBmdW5jdGlvbiB0byBtYXAgZnJvbSBT Y3JvbGxiYXJDb250cm9sU2l6ZQorICAgICAgICB0byBOU0NvbnRyb2xTaXplLgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVNYWM6OnJlZ2lzdGVyU2Nyb2xsYmFyKTogVXNlIHRoZSBo ZWxwZXIgcmF0aGVyIHRoYW4gY2FzdGluZy4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRo ZW1lTWFjOjpzY3JvbGxiYXJUaGlja25lc3MpOiBVc2UgdGhlIGhlbHBlci4KKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVt ZU1hYzo6cHJvZ3Jlc3NCYXJSZWN0Rm9yQm91bmRzKTogVXBkYXRlIHRoZSB0eXBlIG9mIHRoZSBs b2NhbCB0byBOU0NvbnRyb2xTaXplLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6 OnBhaW50UHJvZ3Jlc3NCYXIpOiBEaXR0by4KKwogMjAxNC0wMS0wNiAgU2Vva2p1IEt3b24gIDxz ZW9ranVAd2Via2l0Lm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBHZXQgcmlkIG9mIElu c3BlY3Rvci9CaW5kaW5nVmlzaXRvcnMuaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL1Njcm9sbGJhclRoZW1lTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1Njcm9sbGJhclRoZW1lTWFjLm1tCmluZGV4IGYyMjZkZjk0ZTBjNjk2ZTAxNmI3NjIzNjQ3 MGQ0YzhjMjdjMjI4NTEuLmJhMDMyMzY3MzFlYWQ3ZTQwMjBlNTkyY2QwYzBlOWE2OGNjYjU2NzMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxiYXJUaGVtZU1h Yy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyVGhlbWVNYWMu bW0KQEAgLTE1NiwxMCArMTU2LDIwIEBAIHN0YXRpYyB2b2lkIHVwZGF0ZUFycm93UGxhY2VtZW50 KCkKICAgICB9CiB9CiAKK3N0YXRpYyBOU0NvbnRyb2xTaXplIHNjcm9sbGJhckNvbnRyb2xTaXpl VG9OU0NvbnRyb2xTaXplKFNjcm9sbGJhckNvbnRyb2xTaXplIGNvbnRyb2xTaXplKQoreworICAg IHN3aXRjaCAoY29udHJvbFNpemUpIHsKKyAgICBjYXNlIFJlZ3VsYXJTY3JvbGxiYXI6CisgICAg ICAgIHJldHVybiBOU1JlZ3VsYXJDb250cm9sU2l6ZTsKKyAgICBjYXNlIFNtYWxsU2Nyb2xsYmFy OgorICAgICAgICByZXR1cm4gTlNTbWFsbENvbnRyb2xTaXplOworICAgIH0KK30KKwogdm9pZCBT Y3JvbGxiYXJUaGVtZU1hYzo6cmVnaXN0ZXJTY3JvbGxiYXIoU2Nyb2xsYmFyVGhlbWVDbGllbnQq IHNjcm9sbGJhcikKIHsKICAgICBib29sIGlzSG9yaXpvbnRhbCA9IHNjcm9sbGJhci0+b3JpZW50 YXRpb24oKSA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyOwotICAgIFNjcm9sbGJhclBhaW50ZXIgc2Ny b2xsYmFyUGFpbnRlciA9IFtOU0NsYXNzRnJvbVN0cmluZyhAIk5TU2Nyb2xsZXJJbXAiKSBzY3Jv bGxlckltcFdpdGhTdHlsZTpyZWNvbW1lbmRlZFNjcm9sbGVyU3R5bGUoKSBjb250cm9sU2l6ZToo TlNDb250cm9sU2l6ZSlzY3JvbGxiYXItPmNvbnRyb2xTaXplKCkgaG9yaXpvbnRhbDppc0hvcml6 b250YWwgcmVwbGFjaW5nU2Nyb2xsZXJJbXA6bmlsXTsKKyAgICBTY3JvbGxiYXJQYWludGVyIHNj cm9sbGJhclBhaW50ZXIgPSBbTlNDbGFzc0Zyb21TdHJpbmcoQCJOU1Njcm9sbGVySW1wIikgc2Ny b2xsZXJJbXBXaXRoU3R5bGU6cmVjb21tZW5kZWRTY3JvbGxlclN0eWxlKCkgY29udHJvbFNpemU6 c2Nyb2xsYmFyQ29udHJvbFNpemVUb05TQ29udHJvbFNpemUoc2Nyb2xsYmFyLT5jb250cm9sU2l6 ZSgpKSBob3Jpem9udGFsOmlzSG9yaXpvbnRhbCByZXBsYWNpbmdTY3JvbGxlckltcDpuaWxdOwog ICAgIHNjcm9sbGJhck1hcCgpLT5hZGQoc2Nyb2xsYmFyLCBzY3JvbGxiYXJQYWludGVyKTsKICAg ICB1cGRhdGVFbmFibGVkU3RhdGUoc2Nyb2xsYmFyKTsKICAgICB1cGRhdGVTY3JvbGxiYXJPdmVy bGF5U3R5bGUoc2Nyb2xsYmFyKTsKQEAgLTIyMyw3ICsyMzMsNyBAQCB2b2lkIFNjcm9sbGJhclRo ZW1lTWFjOjpwcmVmZXJlbmNlc0NoYW5nZWQoKQogaW50IFNjcm9sbGJhclRoZW1lTWFjOjpzY3Jv bGxiYXJUaGlja25lc3MoU2Nyb2xsYmFyQ29udHJvbFNpemUgY29udHJvbFNpemUpCiB7CiAgICAg QkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOwotICAgIFNjcm9sbGJhclBhaW50ZXIgc2Nyb2xs YmFyUGFpbnRlciA9IFtOU0NsYXNzRnJvbVN0cmluZyhAIk5TU2Nyb2xsZXJJbXAiKSBzY3JvbGxl ckltcFdpdGhTdHlsZTpyZWNvbW1lbmRlZFNjcm9sbGVyU3R5bGUoKSBjb250cm9sU2l6ZTpjb250 cm9sU2l6ZSBob3Jpem9udGFsOk5PIHJlcGxhY2luZ1Njcm9sbGVySW1wOm5pbF07CisgICAgU2Ny b2xsYmFyUGFpbnRlciBzY3JvbGxiYXJQYWludGVyID0gW05TQ2xhc3NGcm9tU3RyaW5nKEAiTlNT Y3JvbGxlckltcCIpIHNjcm9sbGVySW1wV2l0aFN0eWxlOnJlY29tbWVuZGVkU2Nyb2xsZXJTdHls ZSgpIGNvbnRyb2xTaXplOnNjcm9sbGJhckNvbnRyb2xTaXplVG9OU0NvbnRyb2xTaXplKGNvbnRy b2xTaXplKSBob3Jpem9udGFsOk5PIHJlcGxhY2luZ1Njcm9sbGVySW1wOm5pbF07CiAgICAgaWYg KHN1cHBvcnRzRXhwYW5kZWRTY3JvbGxiYXJzKCkpCiAgICAgICAgIFtzY3JvbGxiYXJQYWludGVy IHNldEV4cGFuZGVkOllFU107CiAgICAgcmV0dXJuIFtzY3JvbGxiYXJQYWludGVyIHRyYWNrQm94 V2lkdGhdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l TWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCmluZGV4 IDJjNWQ4YWRlNjdmYWVjMjlmNWUxODBlMmRlYjY3NjA2NzIzNGNkMDEuLjY1YTU5MGMyNGIyY2Ix NGVhOWMzYWRlMGRjM2MwYTI3MzJmYWE0YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVNYWMubW0KQEAgLTk5MSw3ICs5OTEsNyBAQCBJbnRSZWN0IFJlbmRlclRoZW1l TWFjOjpwcm9ncmVzc0JhclJlY3RGb3JCb3VuZHMoY29uc3QgUmVuZGVyT2JqZWN0KiByZW5kZXJP YmplYwogICAgICAgICByZXR1cm4gYm91bmRzOwogCiAgICAgZmxvYXQgem9vbUxldmVsID0gcmVu ZGVyT2JqZWN0LT5zdHlsZSgpLmVmZmVjdGl2ZVpvb20oKTsKLSAgICBpbnQgY29udHJvbFNpemUg PSBjb250cm9sU2l6ZUZvckZvbnQoJnJlbmRlck9iamVjdC0+c3R5bGUoKSk7CisgICAgTlNDb250 cm9sU2l6ZSBjb250cm9sU2l6ZSA9IGNvbnRyb2xTaXplRm9yRm9udCgmcmVuZGVyT2JqZWN0LT5z dHlsZSgpKTsKICAgICBJbnRTaXplIHNpemUgPSBwcm9ncmVzc0JhclNpemVzKClbY29udHJvbFNp emVdOwogICAgIHNpemUuc2V0SGVpZ2h0KHNpemUuaGVpZ2h0KCkgKiB6b29tTGV2ZWwpOwogICAg IHNpemUuc2V0V2lkdGgoYm91bmRzLndpZHRoKCkpOwpAQCAtMTAyOSw3ICsxMDI5LDcgQEAgYm9v bCBSZW5kZXJUaGVtZU1hYzo6cGFpbnRQcm9ncmVzc0JhcihSZW5kZXJPYmplY3QqIHJlbmRlck9i amVjdCwgY29uc3QgUGFpbnRJbmYKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBJbnRSZWN0 IGluZmxhdGVkUmVjdCA9IHByb2dyZXNzQmFyUmVjdEZvckJvdW5kcyhyZW5kZXJPYmplY3QsIHJl Y3QpOwotICAgIGludCBjb250cm9sU2l6ZSA9IGNvbnRyb2xTaXplRm9yRm9udCgmcmVuZGVyT2Jq ZWN0LT5zdHlsZSgpKTsKKyAgICBOU0NvbnRyb2xTaXplIGNvbnRyb2xTaXplID0gY29udHJvbFNp emVGb3JGb250KCZyZW5kZXJPYmplY3QtPnN0eWxlKCkpOwogCiAgICAgUmVuZGVyUHJvZ3Jlc3Mq IHJlbmRlclByb2dyZXNzID0gdG9SZW5kZXJQcm9ncmVzcyhyZW5kZXJPYmplY3QpOwogICAgIEhJ VGhlbWVUcmFja0RyYXdJbmZvIHRyYWNrSW5mbzsK 220485 2014-01-06 20:06:32 -0800 2014-01-06 20:42:02 -0800 Patch bug-126559-20140106200638.patch text/plain 4537 mrowe U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxMzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGE1YjBhYWYxYTJhMWEw NGJkMTUxOWE3NTdlNDk4Y2Q5OWU0MzM3OC4uODI1Y2YzMjVmODgyNWIyMDc1NmM2OWNhYzlkMDI2 OTI5NWM1ZWVlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAxLTA2ICBNYXJr IFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CisKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9i LzEyNjU1OT4gQmUgbW9yZSBjb3JyZWN0IGluIGRlYWxpbmcgd2l0aCBOU0NvbnRyb2xTaXplCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAgICAgICogcGxhdGZvcm0v bWFjL1Njcm9sbGJhclRoZW1lTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6c2Nyb2xsYmFyQ29u dHJvbFNpemVUb05TQ29udHJvbFNpemUpOiBIZWxwZXIgZnVuY3Rpb24gdG8gbWFwIGZyb20gU2Ny b2xsYmFyQ29udHJvbFNpemUKKyAgICAgICAgdG8gTlNDb250cm9sU2l6ZS4KKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbGJhclRoZW1lTWFjOjpyZWdpc3RlclNjcm9sbGJhcik6IFVzZSB0aGUgaGVs cGVyIHJhdGhlciB0aGFuIGNhc3RpbmcuCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVt ZU1hYzo6c2Nyb2xsYmFyVGhpY2tuZXNzKTogVXNlIHRoZSBoZWxwZXIuCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVN YWM6OnByb2dyZXNzQmFyUmVjdEZvckJvdW5kcyk6IFVwZGF0ZSB0aGUgdHlwZSBvZiB0aGUgbG9j YWwgdG8gTlNDb250cm9sU2l6ZS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lTWFjOjpw YWludFByb2dyZXNzQmFyKTogRGl0dG8uCisKIDIwMTQtMDEtMDYgIFNlb2tqdSBLd29uICA8c2Vv a2p1QHdlYmtpdC5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogR2V0IHJpZCBvZiBJbnNw ZWN0b3IvQmluZGluZ1Zpc2l0b3JzLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9TY3JvbGxiYXJUaGVtZU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9TY3JvbGxiYXJUaGVtZU1hYy5tbQppbmRleCBmMjI2ZGY5NGUwYzY5NmUwMTZiNzYyMzY0NzBk NGM4YzI3YzIyODUxLi45ZWFjMTVlOGY0NDk4NWNkNjIxMzEyMTI4MzM3ZWNkNjYyMTVhMGRhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyVGhlbWVNYWMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbGJhclRoZW1lTWFjLm1t CkBAIC0xNTYsMTAgKzE1NiwyMyBAQCBzdGF0aWMgdm9pZCB1cGRhdGVBcnJvd1BsYWNlbWVudCgp CiAgICAgfQogfQogCitzdGF0aWMgTlNDb250cm9sU2l6ZSBzY3JvbGxiYXJDb250cm9sU2l6ZVRv TlNDb250cm9sU2l6ZShTY3JvbGxiYXJDb250cm9sU2l6ZSBjb250cm9sU2l6ZSkKK3sKKyAgICBz d2l0Y2ggKGNvbnRyb2xTaXplKSB7CisgICAgY2FzZSBSZWd1bGFyU2Nyb2xsYmFyOgorICAgICAg ICByZXR1cm4gTlNSZWd1bGFyQ29udHJvbFNpemU7CisgICAgY2FzZSBTbWFsbFNjcm9sbGJhcjoK KyAgICAgICAgcmV0dXJuIE5TU21hbGxDb250cm9sU2l6ZTsKKyAgICB9CisKKyAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gTlNSZWd1bGFyQ29udHJvbFNpemU7Cit9CisKIHZv aWQgU2Nyb2xsYmFyVGhlbWVNYWM6OnJlZ2lzdGVyU2Nyb2xsYmFyKFNjcm9sbGJhclRoZW1lQ2xp ZW50KiBzY3JvbGxiYXIpCiB7CiAgICAgYm9vbCBpc0hvcml6b250YWwgPSBzY3JvbGxiYXItPm9y aWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhcjsKLSAgICBTY3JvbGxiYXJQYWludGVy IHNjcm9sbGJhclBhaW50ZXIgPSBbTlNDbGFzc0Zyb21TdHJpbmcoQCJOU1Njcm9sbGVySW1wIikg c2Nyb2xsZXJJbXBXaXRoU3R5bGU6cmVjb21tZW5kZWRTY3JvbGxlclN0eWxlKCkgY29udHJvbFNp emU6KE5TQ29udHJvbFNpemUpc2Nyb2xsYmFyLT5jb250cm9sU2l6ZSgpIGhvcml6b250YWw6aXNI b3Jpem9udGFsIHJlcGxhY2luZ1Njcm9sbGVySW1wOm5pbF07CisgICAgU2Nyb2xsYmFyUGFpbnRl ciBzY3JvbGxiYXJQYWludGVyID0gW05TQ2xhc3NGcm9tU3RyaW5nKEAiTlNTY3JvbGxlckltcCIp IHNjcm9sbGVySW1wV2l0aFN0eWxlOnJlY29tbWVuZGVkU2Nyb2xsZXJTdHlsZSgpIGNvbnRyb2xT aXplOnNjcm9sbGJhckNvbnRyb2xTaXplVG9OU0NvbnRyb2xTaXplKHNjcm9sbGJhci0+Y29udHJv bFNpemUoKSkgaG9yaXpvbnRhbDppc0hvcml6b250YWwgcmVwbGFjaW5nU2Nyb2xsZXJJbXA6bmls XTsKICAgICBzY3JvbGxiYXJNYXAoKS0+YWRkKHNjcm9sbGJhciwgc2Nyb2xsYmFyUGFpbnRlcik7 CiAgICAgdXBkYXRlRW5hYmxlZFN0YXRlKHNjcm9sbGJhcik7CiAgICAgdXBkYXRlU2Nyb2xsYmFy T3ZlcmxheVN0eWxlKHNjcm9sbGJhcik7CkBAIC0yMjMsNyArMjM2LDcgQEAgdm9pZCBTY3JvbGxi YXJUaGVtZU1hYzo6cHJlZmVyZW5jZXNDaGFuZ2VkKCkKIGludCBTY3JvbGxiYXJUaGVtZU1hYzo6 c2Nyb2xsYmFyVGhpY2tuZXNzKFNjcm9sbGJhckNvbnRyb2xTaXplIGNvbnRyb2xTaXplKQogewog ICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKLSAgICBTY3JvbGxiYXJQYWludGVyIHNj cm9sbGJhclBhaW50ZXIgPSBbTlNDbGFzc0Zyb21TdHJpbmcoQCJOU1Njcm9sbGVySW1wIikgc2Ny b2xsZXJJbXBXaXRoU3R5bGU6cmVjb21tZW5kZWRTY3JvbGxlclN0eWxlKCkgY29udHJvbFNpemU6 Y29udHJvbFNpemUgaG9yaXpvbnRhbDpOTyByZXBsYWNpbmdTY3JvbGxlckltcDpuaWxdOworICAg IFNjcm9sbGJhclBhaW50ZXIgc2Nyb2xsYmFyUGFpbnRlciA9IFtOU0NsYXNzRnJvbVN0cmluZyhA Ik5TU2Nyb2xsZXJJbXAiKSBzY3JvbGxlckltcFdpdGhTdHlsZTpyZWNvbW1lbmRlZFNjcm9sbGVy U3R5bGUoKSBjb250cm9sU2l6ZTpzY3JvbGxiYXJDb250cm9sU2l6ZVRvTlNDb250cm9sU2l6ZShj b250cm9sU2l6ZSkgaG9yaXpvbnRhbDpOTyByZXBsYWNpbmdTY3JvbGxlckltcDpuaWxdOwogICAg IGlmIChzdXBwb3J0c0V4cGFuZGVkU2Nyb2xsYmFycygpKQogICAgICAgICBbc2Nyb2xsYmFyUGFp bnRlciBzZXRFeHBhbmRlZDpZRVNdOwogICAgIHJldHVybiBbc2Nyb2xsYmFyUGFpbnRlciB0cmFj a0JveFdpZHRoXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQpp bmRleCAyYzVkOGFkZTY3ZmFlYzI5ZjVlMTgwZTJkZWI2NzYwNjcyMzRjZDAxLi42NWE1OTBjMjRi MmNiMTRlYTljM2FkZTBkYzNjMGEyNzMyZmFhNGFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lTWFjLm1tCkBAIC05OTEsNyArOTkxLDcgQEAgSW50UmVjdCBSZW5kZXJU aGVtZU1hYzo6cHJvZ3Jlc3NCYXJSZWN0Rm9yQm91bmRzKGNvbnN0IFJlbmRlck9iamVjdCogcmVu ZGVyT2JqZWMKICAgICAgICAgcmV0dXJuIGJvdW5kczsKIAogICAgIGZsb2F0IHpvb21MZXZlbCA9 IHJlbmRlck9iamVjdC0+c3R5bGUoKS5lZmZlY3RpdmVab29tKCk7Ci0gICAgaW50IGNvbnRyb2xT aXplID0gY29udHJvbFNpemVGb3JGb250KCZyZW5kZXJPYmplY3QtPnN0eWxlKCkpOworICAgIE5T Q29udHJvbFNpemUgY29udHJvbFNpemUgPSBjb250cm9sU2l6ZUZvckZvbnQoJnJlbmRlck9iamVj dC0+c3R5bGUoKSk7CiAgICAgSW50U2l6ZSBzaXplID0gcHJvZ3Jlc3NCYXJTaXplcygpW2NvbnRy b2xTaXplXTsKICAgICBzaXplLnNldEhlaWdodChzaXplLmhlaWdodCgpICogem9vbUxldmVsKTsK ICAgICBzaXplLnNldFdpZHRoKGJvdW5kcy53aWR0aCgpKTsKQEAgLTEwMjksNyArMTAyOSw3IEBA IGJvb2wgUmVuZGVyVGhlbWVNYWM6OnBhaW50UHJvZ3Jlc3NCYXIoUmVuZGVyT2JqZWN0KiByZW5k ZXJPYmplY3QsIGNvbnN0IFBhaW50SW5mCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgSW50 UmVjdCBpbmZsYXRlZFJlY3QgPSBwcm9ncmVzc0JhclJlY3RGb3JCb3VuZHMocmVuZGVyT2JqZWN0 LCByZWN0KTsKLSAgICBpbnQgY29udHJvbFNpemUgPSBjb250cm9sU2l6ZUZvckZvbnQoJnJlbmRl ck9iamVjdC0+c3R5bGUoKSk7CisgICAgTlNDb250cm9sU2l6ZSBjb250cm9sU2l6ZSA9IGNvbnRy b2xTaXplRm9yRm9udCgmcmVuZGVyT2JqZWN0LT5zdHlsZSgpKTsKIAogICAgIFJlbmRlclByb2dy ZXNzKiByZW5kZXJQcm9ncmVzcyA9IHRvUmVuZGVyUHJvZ3Jlc3MocmVuZGVyT2JqZWN0KTsKICAg ICBISVRoZW1lVHJhY2tEcmF3SW5mbyB0cmFja0luZm87Cg==