73921 2011-12-06 06:57:03 -0800 [Qt] Rendering issues with sliders and QStyle 2011-12-12 08:44:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pierre.rossi pierre.rossi webkit.review.bot oldest_to_newest 515884 0 pierre.rossi 2011-12-06 06:57:03 -0800 [Qt] Rendering issues with sliders and QStyle 515888 1 118045 pierre.rossi 2011-12-06 07:10:49 -0800 Created attachment 118045 Patch 516523 2 118045 hausmann 2011-12-07 00:27:23 -0800 Comment on attachment 118045 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=118045&action=review > Source/WebCore/platform/qt/RenderThemeQStyle.cpp:806 > +#ifndef QT_NO_STYLE_MOTIF > + // Motif style sliders have a border on each side that needs to be accounted for > + if (qobject_cast<QMotifStyle*>(qstyle)) > + length += 2 * qstyle->pixelMetric(QStyle::PM_DefaultFrameWidth); > +#endif Hmm, can we leave out this part of the patch? :) An #ifdef, a qobject_cast and an #include for a configuration that is beyond being just obsolete? :) 516626 3 118206 pierre.rossi 2011-12-07 07:02:04 -0800 Created attachment 118206 Patch 517276 4 118206 hausmann 2011-12-08 02:44:31 -0800 Comment on attachment 118206 Patch r=me 517307 5 118206 webkit.review.bot 2011-12-08 04:55:30 -0800 Comment on attachment 118206 Patch Rejecting attachment 118206 from commit-queue. pierre.rossi@gmail.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 519231 6 118206 webkit.review.bot 2011-12-12 08:44:48 -0800 Comment on attachment 118206 Patch Clearing flags on attachment: 118206 Committed r102589: <http://trac.webkit.org/changeset/102589> 519232 7 webkit.review.bot 2011-12-12 08:44:52 -0800 All reviewed patches have been landed. Closing bug. 118045 2011-12-06 07:10:49 -0800 2011-12-07 07:01:57 -0800 Patch bug-73921-20111206161234.patch text/plain 5074 pierre.rossi U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTNkZTdkYzBmOGRkZjc5 NzYxMmJkYWM4ZTMzNDAwNjhkZTg5NWE1NS4uZDVjNTUxYjcxODllZGM5ZGM3NDUwM2ZmMDY4ODEw NmUwYTY1OGVlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDExLTEyLTA2ICBQaWVy cmUgUm9zc2kgIDxwaWVycmUucm9zc2lAZ21haWwuY29tPgorCisgICAgICAgIFtRdF0gUmVuZGVy aW5nIGlzc3VlcyB3aXRoIHNsaWRlcnMgYW5kIFFTdHlsZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM5MjEKKworICAgICAgICBXaXRoIFFTdHlsZSdz IG9yaWdpbnMgYmVpbmcgZGVlcGx5IHJvb3RlZCB3aXRoIHdpZGdldHMsCisgICAgICAgIHNldmVy YWwgc3R5bGVzIG1ha2Ugd3JvbmcgYXNzdW1wdGlvbnMsIGxlYWRpbmcgdG8gc2xpZGVycworICAg ICAgICBub3QgYmVpbmcgcGFpbnRlZCBwcm9wZXJseSBpbiBXZWJLaXQuIFdlIGNhbiBzb2x2ZSBh IGxvdAorICAgICAgICBvZiBwcm9ibGVtcyBieSBzeXN0ZW1hdGljYWxseSB0cmFuc2xhdGluZyB0 aGUgcGFpbnRlciB0bworICAgICAgICB0aGUgdG9wIGxlZnQgY29ybmVyIG9mIHRoZSByZW5kZXIg b2JqZWN0LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cy4gVGhlIFF0IHRlc3RzIGFyZSByYW4gd2l0aCB0aGUgV2luZG93cworICAg ICAgICBzdHlsZSwgdGhpcyBmaXhlcyBzb21lIHF1aXJrcyBhZmZlY3Rpbmcgb3RoZXIgc3R5bGVz LgorCisgICAgICAgICogcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRU3R5bGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVRU3R5bGU6OnBhaW50U2xpZGVyVHJhY2spOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVRU3R5bGU6OnBhaW50U2xpZGVyVGh1bWIpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVRU3R5bGU6OmFkanVzdFNsaWRlclRodW1iU2l6ZSk6CisK IDIwMTEtMTEtMjEgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgogCiAgICAg ICAgIEVuYWJsZSBQYXJhbGxlbEpvYnMgYnkgZGVmYXVsdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRU3R5bGUuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRU3R5bGUuY3BwCmluZGV4IDEyZTI1YzczYzFiN2ViN2Nh ODIxOGQ5MTA0Y2NhNjBlZTI5YzkwM2UuLmE4YWY1MjA4ZGZkZDExNGYwYjA2YWYzZTYxYzI3OGZm ODk2MGJlYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRo ZW1lUVN0eWxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVt ZVFTdHlsZS5jcHAKQEAgLTY0LDcgKzY0LDEyIEBACiAjaW5jbHVkZSA8UUxpbmVFZGl0PgogI2lu Y2x1ZGUgPFFNYWNTdHlsZT4KICNpbmNsdWRlIDxRUGFpbnRlcj4KKyNpZm5kZWYgUVRfTk9fU1RZ TEVfUExBU1RJUVVFCiAjaW5jbHVkZSA8UVBsYXN0aXF1ZVN0eWxlPgorI2VuZGlmCisjaWZuZGVm IFFUX05PX1NUWUxFX01PVElGCisjaW5jbHVkZSA8UU1vdGlmU3R5bGU+CisjZW5kaWYKICNpbmNs dWRlIDxRUHVzaEJ1dHRvbj4KICNpbmNsdWRlIDxRU3R5bGVGYWN0b3J5PgogI2luY2x1ZGUgPFFT dHlsZU9wdGlvbkJ1dHRvbj4KQEAgLTU1NiwxNiArNTYxLDM0IEBAIGJvb2wgUmVuZGVyVGhlbWVR U3R5bGU6OnBhaW50U2xpZGVyVHJhY2soUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8m IHBpLAogICAgIGlmICghcC5pc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCisgICAg Y29uc3QgUVBvaW50IHRvcExlZnQgPSByLmxvY2F0aW9uKCk7CisgICAgcC5wYWludGVyLT50cmFu c2xhdGUodG9wTGVmdCk7CisKICAgICBRU3R5bGVPcHRpb25TbGlkZXIgb3B0aW9uOwogICAgIGlu aXRTdHlsZU9wdGlvbihwLndpZGdldCwgb3B0aW9uKTsKICAgICBvcHRpb24uc3ViQ29udHJvbHMg PSBRU3R5bGU6OlNDX1NsaWRlckdyb292ZTsKICAgICBDb250cm9sUGFydCBhcHBlYXJhbmNlID0g aW5pdGlhbGl6ZUNvbW1vblFTdHlsZU9wdGlvbnMob3B0aW9uLCBvKTsKICAgICBvcHRpb24ucmVj dCA9IHI7CisgICAgb3B0aW9uLnJlY3QubW92ZVRvKFFQb2ludCgwLCAwKSk7CiAgICAgaWYgKGFw cGVhcmFuY2UgPT0gU2xpZGVyVmVydGljYWxQYXJ0KQogICAgICAgICBvcHRpb24ub3JpZW50YXRp b24gPSBRdDo6VmVydGljYWw7CiAgICAgaWYgKGlzUHJlc3NlZChvKSkKICAgICAgICAgb3B0aW9u LnN0YXRlIHw9IFFTdHlsZTo6U3RhdGVfU3Vua2VuOwogCisgICAgLy8gc29tZSBzdHlsZXMgbmVl ZCB0aGlzIHRvIHNob3cgYSBoaWdobGlnaHQgb24gb25lIHNpZGUgb2YgdGhlIGdyb292ZQorICAg IEhUTUxJbnB1dEVsZW1lbnQqIHNsaWRlciA9IG8tPm5vZGUoKS0+dG9JbnB1dEVsZW1lbnQoKTsK KyAgICBpZiAoc2xpZGVyKSB7CisgICAgICAgIG9wdGlvbi51cHNpZGVEb3duID0gKGFwcGVhcmFu Y2UgPT0gU2xpZGVySG9yaXpvbnRhbFBhcnQpICYmICFvLT5zdHlsZSgpLT5pc0xlZnRUb1JpZ2h0 RGlyZWN0aW9uKCk7CisgICAgICAgIC8vIFVzZSB0aGUgd2lkdGggYXMgYSBtdWx0aXBsaWVyIGlu IGNhc2UgdGhlIHNsaWRlciB2YWx1ZXMgYXJlIDw9IDEKKyAgICAgICAgY29uc3QgaW50IHdpZHRo ID0gci53aWR0aCgpID4gMCA/IHIud2lkdGgoKSA6IDEwMDsKKyAgICAgICAgb3B0aW9uLm1heGlt dW0gPSBzbGlkZXItPm1heGltdW0oKSAqIHdpZHRoOworICAgICAgICBvcHRpb24ubWluaW11bSA9 IHNsaWRlci0+bWluaW11bSgpICogd2lkdGg7CisgICAgICAgIGlmICghb3B0aW9uLnVwc2lkZURv d24pCisgICAgICAgICAgICBvcHRpb24uc2xpZGVyUG9zaXRpb24gPSBzbGlkZXItPnZhbHVlQXNO dW1iZXIoKSAqIHdpZHRoOworICAgICAgICBlbHNlCisgICAgICAgICAgICBvcHRpb24uc2xpZGVy UG9zaXRpb24gPSBvcHRpb24ubWluaW11bSArIG9wdGlvbi5tYXhpbXVtIC0gc2xpZGVyLT52YWx1 ZUFzTnVtYmVyKCkgKiB3aWR0aDsKKyAgICB9CisKICAgICBwLmRyYXdDb21wbGV4Q29udHJvbChR U3R5bGU6OkNDX1NsaWRlciwgb3B0aW9uKTsKIAogICAgIGlmIChvcHRpb24uc3RhdGUgJiBRU3R5 bGU6OlN0YXRlX0hhc0ZvY3VzKSB7CkBAIC01NzMsNyArNTk2LDcgQEAgYm9vbCBSZW5kZXJUaGVt ZVFTdHlsZTo6cGFpbnRTbGlkZXJUcmFjayhSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFBhaW50SW5m byYgcGksCiAgICAgICAgIGZvY3VzT3B0aW9uLnJlY3QgPSByOwogICAgICAgICBwLmRyYXdQcmlt aXRpdmUoUVN0eWxlOjpQRV9GcmFtZUZvY3VzUmVjdCwgZm9jdXNPcHRpb24pOwogICAgIH0KLQor ICAgIHAucGFpbnRlci0+dHJhbnNsYXRlKC10b3BMZWZ0KTsKICAgICByZXR1cm4gZmFsc2U7CiB9 CiAKQEAgLTU4OSwxMSArNjEyLDE1IEBAIGJvb2wgUmVuZGVyVGhlbWVRU3R5bGU6OnBhaW50U2xp ZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8mIHBpLAogICAgIGlmICgh cC5pc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCisgICAgY29uc3QgUVBvaW50IHRv cExlZnQgPSByLmxvY2F0aW9uKCk7CisgICAgcC5wYWludGVyLT50cmFuc2xhdGUodG9wTGVmdCk7 CisKICAgICBRU3R5bGVPcHRpb25TbGlkZXIgb3B0aW9uOwogICAgIGluaXRTdHlsZU9wdGlvbihw LndpZGdldCwgb3B0aW9uKTsKICAgICBvcHRpb24uc3ViQ29udHJvbHMgPSBRU3R5bGU6OlNDX1Ns aWRlckhhbmRsZTsKICAgICBDb250cm9sUGFydCBhcHBlYXJhbmNlID0gaW5pdGlhbGl6ZUNvbW1v blFTdHlsZU9wdGlvbnMob3B0aW9uLCBvKTsKICAgICBvcHRpb24ucmVjdCA9IHI7CisgICAgb3B0 aW9uLnJlY3QubW92ZVRvKFFQb2ludCgwLCAwKSk7CiAgICAgaWYgKGFwcGVhcmFuY2UgPT0gU2xp ZGVyVGh1bWJWZXJ0aWNhbFBhcnQpCiAgICAgICAgIG9wdGlvbi5vcmllbnRhdGlvbiA9IFF0OjpW ZXJ0aWNhbDsKICAgICBpZiAoaXNQcmVzc2VkKG8pKSB7CkBAIC02MDIsNyArNjI5LDcgQEAgYm9v bCBSZW5kZXJUaGVtZVFTdHlsZTo6cGFpbnRTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqIG8sIGNv bnN0IFBhaW50SW5mbyYgcGksCiAgICAgfQogCiAgICAgcC5kcmF3Q29tcGxleENvbnRyb2woUVN0 eWxlOjpDQ19TbGlkZXIsIG9wdGlvbik7Ci0KKyAgICBwLnBhaW50ZXItPnRyYW5zbGF0ZSgtdG9w TGVmdCk7CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCkBAIC03NzEsNiArNzk4LDEzIEBAIHZvaWQg UmVuZGVyVGhlbWVRU3R5bGU6OmFkanVzdFNsaWRlclRodW1iU2l6ZShSZW5kZXJTdHlsZSogc3R5 bGUpIGNvbnN0CiAgICAgICAgIFFTdHlsZSogcXN0eWxlID0gcVN0eWxlKCk7CiAKICAgICAgICAg aW50IGxlbmd0aCA9IHFzdHlsZS0+cGl4ZWxNZXRyaWMoUVN0eWxlOjpQTV9TbGlkZXJMZW5ndGgs ICZvcHRpb24pOworCisjaWZuZGVmIFFUX05PX1NUWUxFX01PVElGCisgICAgICAgIC8vIE1vdGlm IHN0eWxlIHNsaWRlcnMgaGF2ZSBhIGJvcmRlciBvbiBlYWNoIHNpZGUgdGhhdCBuZWVkcyB0byBi ZSBhY2NvdW50ZWQgZm9yCisgICAgICAgIGlmIChxb2JqZWN0X2Nhc3Q8UU1vdGlmU3R5bGUqPihx c3R5bGUpKQorICAgICAgICAgICAgbGVuZ3RoICs9IDIgKiBxc3R5bGUtPnBpeGVsTWV0cmljKFFT dHlsZTo6UE1fRGVmYXVsdEZyYW1lV2lkdGgpOworI2VuZGlmCisKICAgICAgICAgaW50IHRoaWNr bmVzcyA9IHFzdHlsZS0+cGl4ZWxNZXRyaWMoUVN0eWxlOjpQTV9TbGlkZXJUaGlja25lc3MsICZv cHRpb24pOwogICAgICAgICBpZiAob3B0aW9uLm9yaWVudGF0aW9uID09IFF0OjpWZXJ0aWNhbCkg ewogICAgICAgICAgICAgc3R5bGUtPnNldFdpZHRoKExlbmd0aCh0aGlja25lc3MsIEZpeGVkKSk7 Cg== 118206 2011-12-07 07:02:04 -0800 2011-12-12 08:44:48 -0800 Patch bug-73921-20111207160345.patch text/plain 4356 pierre.rossi U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMjMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTVlZjk5MjQwNTNhMmI3 YTA2Y2Y2N2U2MzZkNzNmZjYxYmU0MzYwYy4uOTI3NzFiZjVlODU1MTYyMmVlMTRmYzRlZDhjMGFh MDEwMGJmN2EyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTEyLTA3ICBQaWVy cmUgUm9zc2kgIDxwaWVycmUucm9zc2lAZ21haWwuY29tPgorCisgICAgICAgIFtRdF0gUmVuZGVy aW5nIGlzc3VlcyB3aXRoIHNsaWRlcnMgYW5kIFFTdHlsZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM5MjEKKworICAgICAgICBXaXRoIFFTdHlsZSdz IG9yaWdpbnMgYmVpbmcgZGVlcGx5IHJvb3RlZCB3aXRoIHdpZGdldHMsCisgICAgICAgIHNldmVy YWwgc3R5bGVzIG1ha2Ugd3JvbmcgYXNzdW1wdGlvbnMsIGxlYWRpbmcgdG8gc2xpZGVycworICAg ICAgICBub3QgYmVpbmcgcGFpbnRlZCBwcm9wZXJseSBpbiBXZWJLaXQuIFdlIGNhbiBzb2x2ZSBh IGxvdAorICAgICAgICBvZiBwcm9ibGVtcyBieSBzeXN0ZW1hdGljYWxseSB0cmFuc2xhdGluZyB0 aGUgcGFpbnRlciB0bworICAgICAgICB0aGUgdG9wIGxlZnQgY29ybmVyIG9mIHRoZSByZW5kZXIg b2JqZWN0LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cy4gVGhlIFF0IHRlc3RzIGFyZSByYW4gd2l0aCB0aGUgV2luZG93cworICAg ICAgICBzdHlsZSwgdGhpcyBmaXhlcyBzb21lIHF1aXJrcyBhZmZlY3Rpbmcgb3RoZXIgc3R5bGVz LgorCisgICAgICAgICogcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRU3R5bGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVRU3R5bGU6OnBhaW50U2xpZGVyVHJhY2spOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVRU3R5bGU6OnBhaW50U2xpZGVyVGh1bWIpOgorCiAyMDEx LTEyLTA3ICBTaGlueWEgS2F3YW5ha2EgIDxzaGlueWFrQGdvb2dsZS5jb20+CiAKICAgICAgICAg SW50ZXJuYWxzIHNob3VsZCBoYXZlIGEgbWV0aG9kIHRvIHJldXRybiB0aGUgbWF4IHNlcXVlbmNl IG51bWJlciBvZiBzcGVsbGNoZWNrIHJlcWV1c3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVFTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9xdC9SZW5kZXJUaGVtZVFTdHlsZS5jcHAKaW5kZXggMTJlMjVjNzNjMWI3ZWI3Y2E4MjE4 ZDkxMDRjY2E2MGVlMjljOTAzZS4uZjYyODZmNDkyMTVkZjgzNmZlZGQyYjMxYjQ1ZGM0YjA4Mzc0 MTY1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVR U3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUVN0 eWxlLmNwcApAQCAtNjQsNyArNjQsOSBAQAogI2luY2x1ZGUgPFFMaW5lRWRpdD4KICNpbmNsdWRl IDxRTWFjU3R5bGU+CiAjaW5jbHVkZSA8UVBhaW50ZXI+CisjaWZuZGVmIFFUX05PX1NUWUxFX1BM QVNUSVFVRQogI2luY2x1ZGUgPFFQbGFzdGlxdWVTdHlsZT4KKyNlbmRpZgogI2luY2x1ZGUgPFFQ dXNoQnV0dG9uPgogI2luY2x1ZGUgPFFTdHlsZUZhY3Rvcnk+CiAjaW5jbHVkZSA8UVN0eWxlT3B0 aW9uQnV0dG9uPgpAQCAtNTU2LDE2ICs1NTgsMzQgQEAgYm9vbCBSZW5kZXJUaGVtZVFTdHlsZTo6 cGFpbnRTbGlkZXJUcmFjayhSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFBhaW50SW5mbyYgcGksCiAg ICAgaWYgKCFwLmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKKyAgICBjb25zdCBR UG9pbnQgdG9wTGVmdCA9IHIubG9jYXRpb24oKTsKKyAgICBwLnBhaW50ZXItPnRyYW5zbGF0ZSh0 b3BMZWZ0KTsKKwogICAgIFFTdHlsZU9wdGlvblNsaWRlciBvcHRpb247CiAgICAgaW5pdFN0eWxl T3B0aW9uKHAud2lkZ2V0LCBvcHRpb24pOwogICAgIG9wdGlvbi5zdWJDb250cm9scyA9IFFTdHls ZTo6U0NfU2xpZGVyR3Jvb3ZlOwogICAgIENvbnRyb2xQYXJ0IGFwcGVhcmFuY2UgPSBpbml0aWFs aXplQ29tbW9uUVN0eWxlT3B0aW9ucyhvcHRpb24sIG8pOwogICAgIG9wdGlvbi5yZWN0ID0gcjsK KyAgICBvcHRpb24ucmVjdC5tb3ZlVG8oUVBvaW50KDAsIDApKTsKICAgICBpZiAoYXBwZWFyYW5j ZSA9PSBTbGlkZXJWZXJ0aWNhbFBhcnQpCiAgICAgICAgIG9wdGlvbi5vcmllbnRhdGlvbiA9IFF0 OjpWZXJ0aWNhbDsKICAgICBpZiAoaXNQcmVzc2VkKG8pKQogICAgICAgICBvcHRpb24uc3RhdGUg fD0gUVN0eWxlOjpTdGF0ZV9TdW5rZW47CiAKKyAgICAvLyBzb21lIHN0eWxlcyBuZWVkIHRoaXMg dG8gc2hvdyBhIGhpZ2hsaWdodCBvbiBvbmUgc2lkZSBvZiB0aGUgZ3Jvb3ZlCisgICAgSFRNTElu cHV0RWxlbWVudCogc2xpZGVyID0gby0+bm9kZSgpLT50b0lucHV0RWxlbWVudCgpOworICAgIGlm IChzbGlkZXIpIHsKKyAgICAgICAgb3B0aW9uLnVwc2lkZURvd24gPSAoYXBwZWFyYW5jZSA9PSBT bGlkZXJIb3Jpem9udGFsUGFydCkgJiYgIW8tPnN0eWxlKCktPmlzTGVmdFRvUmlnaHREaXJlY3Rp b24oKTsKKyAgICAgICAgLy8gVXNlIHRoZSB3aWR0aCBhcyBhIG11bHRpcGxpZXIgaW4gY2FzZSB0 aGUgc2xpZGVyIHZhbHVlcyBhcmUgPD0gMQorICAgICAgICBjb25zdCBpbnQgd2lkdGggPSByLndp ZHRoKCkgPiAwID8gci53aWR0aCgpIDogMTAwOworICAgICAgICBvcHRpb24ubWF4aW11bSA9IHNs aWRlci0+bWF4aW11bSgpICogd2lkdGg7CisgICAgICAgIG9wdGlvbi5taW5pbXVtID0gc2xpZGVy LT5taW5pbXVtKCkgKiB3aWR0aDsKKyAgICAgICAgaWYgKCFvcHRpb24udXBzaWRlRG93bikKKyAg ICAgICAgICAgIG9wdGlvbi5zbGlkZXJQb3NpdGlvbiA9IHNsaWRlci0+dmFsdWVBc051bWJlcigp ICogd2lkdGg7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG9wdGlvbi5zbGlkZXJQb3NpdGlv biA9IG9wdGlvbi5taW5pbXVtICsgb3B0aW9uLm1heGltdW0gLSBzbGlkZXItPnZhbHVlQXNOdW1i ZXIoKSAqIHdpZHRoOworICAgIH0KKwogICAgIHAuZHJhd0NvbXBsZXhDb250cm9sKFFTdHlsZTo6 Q0NfU2xpZGVyLCBvcHRpb24pOwogCiAgICAgaWYgKG9wdGlvbi5zdGF0ZSAmIFFTdHlsZTo6U3Rh dGVfSGFzRm9jdXMpIHsKQEAgLTU3Myw3ICs1OTMsNyBAQCBib29sIFJlbmRlclRoZW1lUVN0eWxl OjpwYWludFNsaWRlclRyYWNrKFJlbmRlck9iamVjdCogbywgY29uc3QgUGFpbnRJbmZvJiBwaSwK ICAgICAgICAgZm9jdXNPcHRpb24ucmVjdCA9IHI7CiAgICAgICAgIHAuZHJhd1ByaW1pdGl2ZShR U3R5bGU6OlBFX0ZyYW1lRm9jdXNSZWN0LCBmb2N1c09wdGlvbik7CiAgICAgfQotCisgICAgcC5w YWludGVyLT50cmFuc2xhdGUoLXRvcExlZnQpOwogICAgIHJldHVybiBmYWxzZTsKIH0KIApAQCAt NTg5LDExICs2MDksMTUgQEAgYm9vbCBSZW5kZXJUaGVtZVFTdHlsZTo6cGFpbnRTbGlkZXJUaHVt YihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFBhaW50SW5mbyYgcGksCiAgICAgaWYgKCFwLmlzVmFs aWQoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKKyAgICBjb25zdCBRUG9pbnQgdG9wTGVmdCA9 IHIubG9jYXRpb24oKTsKKyAgICBwLnBhaW50ZXItPnRyYW5zbGF0ZSh0b3BMZWZ0KTsKKwogICAg IFFTdHlsZU9wdGlvblNsaWRlciBvcHRpb247CiAgICAgaW5pdFN0eWxlT3B0aW9uKHAud2lkZ2V0 LCBvcHRpb24pOwogICAgIG9wdGlvbi5zdWJDb250cm9scyA9IFFTdHlsZTo6U0NfU2xpZGVySGFu ZGxlOwogICAgIENvbnRyb2xQYXJ0IGFwcGVhcmFuY2UgPSBpbml0aWFsaXplQ29tbW9uUVN0eWxl T3B0aW9ucyhvcHRpb24sIG8pOwogICAgIG9wdGlvbi5yZWN0ID0gcjsKKyAgICBvcHRpb24ucmVj dC5tb3ZlVG8oUVBvaW50KDAsIDApKTsKICAgICBpZiAoYXBwZWFyYW5jZSA9PSBTbGlkZXJUaHVt YlZlcnRpY2FsUGFydCkKICAgICAgICAgb3B0aW9uLm9yaWVudGF0aW9uID0gUXQ6OlZlcnRpY2Fs OwogICAgIGlmIChpc1ByZXNzZWQobykpIHsKQEAgLTYwMiw3ICs2MjYsNyBAQCBib29sIFJlbmRl clRoZW1lUVN0eWxlOjpwYWludFNsaWRlclRodW1iKFJlbmRlck9iamVjdCogbywgY29uc3QgUGFp bnRJbmZvJiBwaSwKICAgICB9CiAKICAgICBwLmRyYXdDb21wbGV4Q29udHJvbChRU3R5bGU6OkND X1NsaWRlciwgb3B0aW9uKTsKLQorICAgIHAucGFpbnRlci0+dHJhbnNsYXRlKC10b3BMZWZ0KTsK ICAgICByZXR1cm4gZmFsc2U7CiB9CiAK