136306 2014-08-27 14:03:14 -0700 Subpixel layout: Rename LayoutPoint's device pixel snapping functions. 2014-08-27 19:34:51 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 136275 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1031766 0 zalan 2014-08-27 14:03:14 -0700 to the new naming style of round/ceil/floorPointToDevicePixels. 1031775 1 237250 zalan 2014-08-27 14:14:42 -0700 Created attachment 237250 Patch 1031881 2 237250 commit-queue 2014-08-27 19:34:48 -0700 Comment on attachment 237250 Patch Clearing flags on attachment: 237250 Committed r173044: <http://trac.webkit.org/changeset/173044> 1031882 3 commit-queue 2014-08-27 19:34:51 -0700 All reviewed patches have been landed. Closing bug. 237250 2014-08-27 14:14:42 -0700 2014-08-27 19:34:48 -0700 Patch bug-136306-20140827141435.patch text/plain 10172 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMDEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWFlYWRjMWE3ODY3ODhm OGVkZmFmZDJjM2ZkNDZmMTk1N2JiNzlmMi4uNjc0YWYzNjE4ZTQxODk1NjQ2ZmE2NWRhNDFiYjll ODZlMTEzODk5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTA4LTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU3VicGl4ZWwgbGF5b3V0OiBS ZW5hbWUgTGF5b3V0UG9pbnQncyBkZXZpY2UgcGl4ZWwgc25hcHBpbmcgZnVuY3Rpb25zLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2MzA2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnJvbSAqZWRGb3JQ YWludGluZygpIHRvICpQb2ludFRvRGV2aWNlUGl4ZWxzKCkgKCogPSBmbG9vci9yb3VuZC9jZWls KQorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvTGF5b3V0UG9pbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OnJvdW5kUG9p bnRUb0RldmljZVBpeGVscyk6CisgICAgICAgIChXZWJDb3JlOjpmbG9vclBvaW50VG9EZXZpY2VQ aXhlbHMpOgorICAgICAgICAoV2ViQ29yZTo6Y2VpbFBvaW50VG9EZXZpY2VQaXhlbHMpOgorICAg ICAgICAoV2ViQ29yZTo6cm91bmRlZEZvclBhaW50aW5nKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OmZsb29yZWRGb3JQYWludGluZyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpj ZWlsZWRGb3JQYWludGluZyk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv TGF5b3V0UmVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjplbmNsb3NpbmdSZWN0Rm9yUGFpbnRp bmcpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0xheW91dFJlY3QuaDoKKyAgICAgICAg KFdlYkNvcmU6OmRpcmVjdGlvbmFsUGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmcpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3hNb2RlbE9iamVjdDo6cGl4ZWxTbmFwQmFja2dyb3VuZEltYWdlR2VvbWV0cnlGb3JQ YWludGluZyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludExheWVyQnlBcHBseWluZ1RyYW5zZm9ybSk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2FsY3VsYXRlQ2xpcFJlY3RzKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR2VvbWV0cnkpOgorCiAyMDE0LTA4LTI3ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0aW5nIGF0 dHJpYnV0ZXMgb24gSFRNTCBlbGVtZW50cyBkbyBub3QgaW52YWxpZGF0ZSB0aGUgc3R5bGUgY29y cmVjdGx5IHVubGVzcyB0aGUgYXR0cmlidXRlIG5hbWUgaXMgbG93ZXJjYXNlIGluIHRoZSBzdHls ZXNoZWV0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlv dXRQb2ludC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0UG9pbnQu aAppbmRleCBlNjI0Y2VhMmE4OWFmNDNhZTk4NGIwM2VlMjgzYjlhMTEyY2VkMjNiLi5lYjY1MTEy M2YyMTNlNThjNzdmNGM1YTU1OTVjNGQxNDc4M2IyYmYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRQb2ludC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0xheW91dFBvaW50LmgKQEAgLTE4NCwxNyArMTg0LDE3IEBAIGlu bGluZSBJbnRTaXplIHBpeGVsU25hcHBlZEludFNpemUoY29uc3QgTGF5b3V0U2l6ZSYgcywgY29u c3QgTGF5b3V0UG9pbnQmIHApCiAgICAgcmV0dXJuIEludFNpemUoc25hcFNpemVUb1BpeGVsKHMu d2lkdGgoKSwgcC54KCkpLCBzbmFwU2l6ZVRvUGl4ZWwocy5oZWlnaHQoKSwgcC55KCkpKTsKIH0K IAotaW5saW5lIEZsb2F0UG9pbnQgcm91bmRlZEZvclBhaW50aW5nKGNvbnN0IExheW91dFBvaW50 JiBwb2ludCwgZmxvYXQgcGl4ZWxTbmFwcGluZ0ZhY3RvciwgYm9vbCBkaXJlY3Rpb25hbFJvdW5k aW5nVG9SaWdodCA9IHRydWUsIGJvb2wgZGlyZWN0aW9uYWxSb3VuZGluZ1RvQm90dG9tID0gdHJ1 ZSkKK2lubGluZSBGbG9hdFBvaW50IHJvdW5kUG9pbnRUb0RldmljZVBpeGVscyhjb25zdCBMYXlv dXRQb2ludCYgcG9pbnQsIGZsb2F0IHBpeGVsU25hcHBpbmdGYWN0b3IsIGJvb2wgZGlyZWN0aW9u YWxSb3VuZGluZ1RvUmlnaHQgPSB0cnVlLCBib29sIGRpcmVjdGlvbmFsUm91bmRpbmdUb0JvdHRv bSA9IHRydWUpCiB7CiAgICAgcmV0dXJuIEZsb2F0UG9pbnQocm91bmRUb0RldmljZVBpeGVsKHBv aW50LngoKSwgcGl4ZWxTbmFwcGluZ0ZhY3RvciwgIWRpcmVjdGlvbmFsUm91bmRpbmdUb1JpZ2h0 KSwgcm91bmRUb0RldmljZVBpeGVsKHBvaW50LnkoKSwgcGl4ZWxTbmFwcGluZ0ZhY3RvciwgIWRp cmVjdGlvbmFsUm91bmRpbmdUb0JvdHRvbSkpOwogfQogCi1pbmxpbmUgRmxvYXRQb2ludCBmbG9v cmVkRm9yUGFpbnRpbmcoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50LCBmbG9hdCBwaXhlbFNuYXBw aW5nRmFjdG9yKQoraW5saW5lIEZsb2F0UG9pbnQgZmxvb3JQb2ludFRvRGV2aWNlUGl4ZWxzKGNv bnN0IExheW91dFBvaW50JiBwb2ludCwgZmxvYXQgcGl4ZWxTbmFwcGluZ0ZhY3RvcikKIHsKICAg ICByZXR1cm4gRmxvYXRQb2ludChmbG9vclRvRGV2aWNlUGl4ZWwocG9pbnQueCgpLCBwaXhlbFNu YXBwaW5nRmFjdG9yKSwgZmxvb3JUb0RldmljZVBpeGVsKHBvaW50LnkoKSwgcGl4ZWxTbmFwcGlu Z0ZhY3RvcikpOwogfQogCi1pbmxpbmUgRmxvYXRQb2ludCBjZWlsZWRGb3JQYWludGluZyhjb25z dCBMYXlvdXRQb2ludCYgcG9pbnQsIGZsb2F0IHBpeGVsU25hcHBpbmdGYWN0b3IpCitpbmxpbmUg RmxvYXRQb2ludCBjZWlsUG9pbnRUb0RldmljZVBpeGVscyhjb25zdCBMYXlvdXRQb2ludCYgcG9p bnQsIGZsb2F0IHBpeGVsU25hcHBpbmdGYWN0b3IpCiB7CiAgICAgcmV0dXJuIEZsb2F0UG9pbnQo Y2VpbFRvRGV2aWNlUGl4ZWwocG9pbnQueCgpLCBwaXhlbFNuYXBwaW5nRmFjdG9yKSwgY2VpbFRv RGV2aWNlUGl4ZWwocG9pbnQueSgpLCBwaXhlbFNuYXBwaW5nRmFjdG9yKSk7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRSZWN0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0xheW91dFJlY3QuY3BwCmluZGV4IDFmZjA4 OWJlNDU0MDkzMWFlYzYzNWVhMTNlZDhjMGE2ODRlZWMzYmIuLjdkZmZiNzQxODU1Mjk3YzE0ZTEx YjQ3MjRiMmI1Y2Y2ZmI3ZmY4ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0xheW91dFJlY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0xheW91dFJlY3QuY3BwCkBAIC0xNDYsOCArMTQ2LDggQEAgTGF5b3V0UmVjdCBlbmNs b3NpbmdMYXlvdXRSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKIAogRmxvYXRSZWN0IGVuY2xv c2luZ1JlY3RGb3JQYWludGluZyhjb25zdCBMYXlvdXRSZWN0JiByZWN0LCBmbG9hdCBwaXhlbFNu YXBwaW5nRmFjdG9yKQogewotICAgIEZsb2F0UG9pbnQgbG9jYXRpb24gPSBmbG9vcmVkRm9yUGFp bnRpbmcocmVjdC5taW5YTWluWUNvcm5lcigpLCBwaXhlbFNuYXBwaW5nRmFjdG9yKTsKLSAgICBG bG9hdFBvaW50IG1heFBvaW50ID0gY2VpbGVkRm9yUGFpbnRpbmcocmVjdC5tYXhYTWF4WUNvcm5l cigpLCBwaXhlbFNuYXBwaW5nRmFjdG9yKTsKKyAgICBGbG9hdFBvaW50IGxvY2F0aW9uID0gZmxv b3JQb2ludFRvRGV2aWNlUGl4ZWxzKHJlY3QubWluWE1pbllDb3JuZXIoKSwgcGl4ZWxTbmFwcGlu Z0ZhY3Rvcik7CisgICAgRmxvYXRQb2ludCBtYXhQb2ludCA9IGNlaWxQb2ludFRvRGV2aWNlUGl4 ZWxzKHJlY3QubWF4WE1heFlDb3JuZXIoKSwgcGl4ZWxTbmFwcGluZ0ZhY3Rvcik7CiAKICAgICBy ZXR1cm4gRmxvYXRSZWN0KGxvY2F0aW9uLCBtYXhQb2ludCAtIGxvY2F0aW9uKTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0xheW91dFJlY3QuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0xheW91dFJlY3QuaAppbmRleCBiNTNmZTJi OWY3NjBhZjRjMjEyMWZhODQ2MzQ3NWU3MWI4YTE5YTViLi45NjJlNGUzOTVlMDczNjZkZTNhYTk2 YWE2Mzg1NjM0YjMwNzM3N2Y1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9MYXlvdXRSZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvTGF5b3V0UmVjdC5oCkBAIC0yNDEsNyArMjQxLDcgQEAgaW5saW5lIEZsb2F0UmVjdCBwaXhl bFNuYXBwZWRGb3JQYWludGluZyhMYXlvdXRVbml0IHgsIExheW91dFVuaXQgeSwgTGF5b3V0VW5p dAogaW5saW5lIEZsb2F0UmVjdCBkaXJlY3Rpb25hbFBpeGVsU25hcHBlZEZvclBhaW50aW5nKGNv bnN0IExheW91dFJlY3QmIHJlY3QsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBib29sIGx0cikK IHsKICAgICBpZiAoIWx0cikgewotICAgICAgICBGbG9hdFBvaW50IHNuYXBwZWRUb3BSaWdodCA9 IHJvdW5kZWRGb3JQYWludGluZyhyZWN0Lm1heFhNaW5ZQ29ybmVyKCksIGRldmljZVNjYWxlRmFj dG9yLCBsdHIpOworICAgICAgICBGbG9hdFBvaW50IHNuYXBwZWRUb3BSaWdodCA9IHJvdW5kUG9p bnRUb0RldmljZVBpeGVscyhyZWN0Lm1heFhNaW5ZQ29ybmVyKCksIGRldmljZVNjYWxlRmFjdG9y LCBsdHIpOwogICAgICAgICBmbG9hdCBzbmFwcGVkV2lkdGggPSBzbmFwU2l6ZVRvRGV2aWNlUGl4 ZWwocmVjdC53aWR0aCgpLCByZWN0Lm1heFgoKSwgZGV2aWNlU2NhbGVGYWN0b3IpOwogICAgICAg ICBmbG9hdCBzbmFwcGVkSGVpZ2h0ID0gc25hcFNpemVUb0RldmljZVBpeGVsKHJlY3QuaGVpZ2h0 KCksIHJlY3QueSgpLCBkZXZpY2VTY2FsZUZhY3Rvcik7CiAgICAgICAgIHJldHVybiBGbG9hdFJl Y3Qoc25hcHBlZFRvcFJpZ2h0LngoKSAtIHNuYXBwZWRXaWR0aCwgc25hcHBlZFRvcFJpZ2h0Lnko KSwgc25hcHBlZFdpZHRoLCBzbmFwcGVkSGVpZ2h0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCmluZGV4IDkxYzEyNjBmZGUzMzY4OTdl MDViNjE2NTU1ZjBjZDE3YmQ3N2UwMmIuLjMzMTA5NjM5NmY2YTNkNjhkMjQ3MGMxYzAxNmQwZTFm MWM5ZTJlYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hN b2RlbE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1v ZGVsT2JqZWN0LmNwcApAQCAtMTA3NCw5ICsxMDc0LDkgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9i amVjdDo6cGl4ZWxTbmFwQmFja2dyb3VuZEltYWdlR2VvbWV0cnlGb3JQYWludGluZyhCYWNrZ3Jv dW4KICAgICAvLyBGSVhNRTogV2UgbmVlZCBhIGJldHRlciByb3VuZGluZyBzdHJhdGVneSB0byBy b3VuZC9zcGFjZSBvdXQgdGlsZXMuCiAgICAgZ2VvbWV0cnkuc2V0VGlsZVNpemUoTGF5b3V0U2l6 ZShwaXhlbFNuYXBwZWRGb3JQYWludGluZyhMYXlvdXRSZWN0KGdlb21ldHJ5LmRlc3RSZWN0KCku bG9jYXRpb24oKSwgZ2VvbWV0cnkudGlsZVNpemUoKSksIGRldmljZVNjYWxlRmFjdG9yKS5zaXpl KCkpKTsKICAgICBnZW9tZXRyeS5zZXRTcGFjZVNpemUoTGF5b3V0U2l6ZShwaXhlbFNuYXBwZWRG b3JQYWludGluZyhMYXlvdXRSZWN0KExheW91dFBvaW50KCksIGdlb21ldHJ5LnNwYWNlU2l6ZSgp KSwgZGV2aWNlU2NhbGVGYWN0b3IpLnNpemUoKSkpOwotICAgIGdlb21ldHJ5LnNldERlc3RPcmln aW4oTGF5b3V0UG9pbnQocm91bmRlZEZvclBhaW50aW5nKGdlb21ldHJ5LmRlc3RPcmlnaW4oKSwg ZGV2aWNlU2NhbGVGYWN0b3IpKSk7CisgICAgZ2VvbWV0cnkuc2V0RGVzdE9yaWdpbihMYXlvdXRQ b2ludChyb3VuZFBvaW50VG9EZXZpY2VQaXhlbHMoZ2VvbWV0cnkuZGVzdE9yaWdpbigpLCBkZXZp Y2VTY2FsZUZhY3RvcikpKTsKICAgICBnZW9tZXRyeS5zZXREZXN0UmVjdChMYXlvdXRSZWN0KHBp eGVsU25hcHBlZEZvclBhaW50aW5nKGdlb21ldHJ5LmRlc3RSZWN0KCksIGRldmljZVNjYWxlRmFj dG9yKSkpOwotICAgIGdlb21ldHJ5LnNldFBoYXNlKExheW91dFBvaW50KHJvdW5kZWRGb3JQYWlu dGluZyhnZW9tZXRyeS5waGFzZSgpLCBkZXZpY2VTY2FsZUZhY3RvcikpKTsKKyAgICBnZW9tZXRy eS5zZXRQaGFzZShMYXlvdXRQb2ludChyb3VuZFBvaW50VG9EZXZpY2VQaXhlbHMoZ2VvbWV0cnku cGhhc2UoKSwgZGV2aWNlU2NhbGVGYWN0b3IpKSk7CiB9CiAKIHZvaWQgUmVuZGVyQm94TW9kZWxP YmplY3Q6OmNhbGN1bGF0ZUJhY2tncm91bmRJbWFnZUdlb21ldHJ5KGNvbnN0IFJlbmRlckxheWVy TW9kZWxPYmplY3QqIHBhaW50Q29udGFpbmVyLCBjb25zdCBGaWxsTGF5ZXIqIGZpbGxMYXllciwg Y29uc3QgTGF5b3V0UmVjdCYgcGFpbnRSZWN0LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAKaW5kZXggNTg4MWQyOTRmYmQwY2RkMDMzZGYyMTk0NDFjMzljNDViZWQwMTdi NC4uODY5NWYzYTY5MWIwNDFhYWMwODQwYmE3MGQxZjE2M2YzZGIwMGFlMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC00MjAyLDcgKzQyMDIsNyBAQCB2b2lk IFJlbmRlckxheWVyOjpwYWludExheWVyQnlBcHBseWluZ1RyYW5zZm9ybShHcmFwaGljc0NvbnRl eHQqIGNvbnRleHQsIGNvbnN0CiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggdHJhbnNmb3JtKHJl bmRlcmFibGVUcmFuc2Zvcm0ocGFpbnRpbmdJbmZvLnBhaW50QmVoYXZpb3IpKTsKICAgICAvLyBB ZGQgdGhlIHN1YnBpeGVsIGFjY3VtdWxhdGlvbiB0byB0aGUgY3VycmVudCBsYXllcidzIG9mZnNl dCBzbyB0aGF0IHdlIGNhbiBhbHdheXMgc25hcCB0aGUgdHJhbnNsYXRlUmlnaHQgdmFsdWUgdG8g d2hlcmUgdGhlIHJlbmRlcmVyKCkgaXMgc3VwcG9zZWQgdG8gYmUgcGFpbnRpbmcuCiAgICAgTGF5 b3V0U2l6ZSBvZmZzZXRGb3JUaGlzTGF5ZXIgPSBvZmZzZXRGcm9tUGFyZW50ICsgcGFpbnRpbmdJ bmZvLnN1YnBpeGVsQWNjdW11bGF0aW9uOwotICAgIEZsb2F0U2l6ZSBkZXZpY2VQaXhlbFNuYXBw ZWRPZmZzZXRGb3JUaGlzTGF5ZXIgPSB0b0Zsb2F0U2l6ZShyb3VuZGVkRm9yUGFpbnRpbmcodG9M YXlvdXRQb2ludChvZmZzZXRGb3JUaGlzTGF5ZXIpLCBkZXZpY2VTY2FsZUZhY3RvcikpOworICAg IEZsb2F0U2l6ZSBkZXZpY2VQaXhlbFNuYXBwZWRPZmZzZXRGb3JUaGlzTGF5ZXIgPSB0b0Zsb2F0 U2l6ZShyb3VuZFBvaW50VG9EZXZpY2VQaXhlbHModG9MYXlvdXRQb2ludChvZmZzZXRGb3JUaGlz TGF5ZXIpLCBkZXZpY2VTY2FsZUZhY3RvcikpOwogICAgIC8vIFdlIGhhbmRsZSBhY2N1bXVsYXRl ZCBzdWJwaXhlbHMgdGhyb3VnaCBuZXN0ZWQgbGF5ZXJzIGhlcmUuIFNpbmNlIHRoZSBjb250ZXh0 IGdldHMgdHJhbnNsYXRlZCB0byBkZXZpY2UgcGl4ZWxzLAogICAgIC8vIGFsbCB3ZSBuZWVkIHRv IGRvIGlzIGFkZCB0aGUgZGVsdGEgdG8gdGhlIGFjY3VtdWxhdGVkIHBpeGVscyBjb21pbmcgZnJv bSBhbmNlc3RvciBsYXllcnMuCiAgICAgLy8gVHJhbnNsYXRlIHRoZSBncmFwaGljcyBjb250ZXh0 IHRvIHRoZSBzbmFwcGluZyBwb3NpdGlvbiB0byBhdm9pZCBvZmYtZGV2aWNlLXBpeGVsIHBvc2l0 aW5nLgpAQCAtNjc0MSw3ICs2NzQxLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnROYW1lZEZs b3dUaHJlYWRJbnNpZGVSZWdpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBSZW4KICAgICBy ZWdpb24tPnNldFJlZ2lvbk9iamVjdHNSZWdpb25TdHlsZSgpOwogCiAgICAgTGF5b3V0U2l6ZSBt b3ZlT2Zmc2V0ID0gcmVnaW9uLT5mbG93VGhyZWFkUG9ydGlvbkxvY2F0aW9uKCkgLSAocGFpbnRP ZmZzZXQgKyByZWdpb25Db250ZW50Qm94LmxvY2F0aW9uKCkpICsgcmVnaW9uLT5mcmFnbWVudENv bnRhaW5lcigpLnNjcm9sbGVkQ29udGVudE9mZnNldCgpOwotICAgIEZsb2F0UG9pbnQgYWRqdXN0 ZWRQYWludE9mZnNldCA9IHJvdW5kZWRGb3JQYWludGluZyh0b0xheW91dFBvaW50KG1vdmVPZmZz ZXQpLCByZW5kZXJlcigpLmRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKSk7CisgICAgRmxv YXRQb2ludCBhZGp1c3RlZFBhaW50T2Zmc2V0ID0gcm91bmRQb2ludFRvRGV2aWNlUGl4ZWxzKHRv TGF5b3V0UG9pbnQobW92ZU9mZnNldCksIHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5kZXZpY2VTY2Fs ZUZhY3RvcigpKTsKICAgICBjb250ZXh0LT5zYXZlKCk7CiAgICAgY29udGV4dC0+dHJhbnNsYXRl KC1hZGp1c3RlZFBhaW50T2Zmc2V0LngoKSwgLWFkanVzdGVkUGFpbnRPZmZzZXQueSgpKTsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRl eCBiOGYyNWJkMDY0NWViNWQ1ZWMyMTdjN2FmYWQxMTM2NmQyZTJhNGNiLi5hMDAxZDk3NmE2ZmYx NjllN2Q5ODY2YzZlYjYxYzI3YTAxZjU4MjYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtODE5LDcgKzgxOSw3IEBAIHZvaWQgUmVu ZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHZW9tZXRyeSgpCiAgICAgICAgIC8vIFVwZGF0ZSBwcm9w ZXJ0aWVzIHRoYXQgZGVwZW5kIG9uIGxheWVyIGRpbWVuc2lvbnMuCiAgICAgICAgIEZsb2F0UG9p bnQzRCB0cmFuc2Zvcm1PcmlnaW4gPSBjb21wdXRlVHJhbnNmb3JtT3JpZ2luRm9yUGFpbnRpbmco dG9SZW5kZXJCb3gocmVuZGVyZXIoKSkuYm9yZGVyQm94UmVjdCgpKTsKICAgICAgICAgLy8gR2V0 IGxheW91dCBib3VuZHMgaW4gdGhlIGNvb3JkcyBvZiBjb21wQW5jZXN0b3IgdG8gbWF0Y2ggcmVs YXRpdmVDb21wb3NpdGluZ0JvdW5kcy4KLSAgICAgICAgRmxvYXRQb2ludCBsYXllck9mZnNldCA9 IHJvdW5kZWRGb3JQYWludGluZyhvZmZzZXRGcm9tUGFyZW50LCBkZXZpY2VTY2FsZUZhY3Rvcik7 CisgICAgICAgIEZsb2F0UG9pbnQgbGF5ZXJPZmZzZXQgPSByb3VuZFBvaW50VG9EZXZpY2VQaXhl bHMob2Zmc2V0RnJvbVBhcmVudCwgZGV2aWNlU2NhbGVGYWN0b3IpOwogICAgICAgICAvLyBDb21w dXRlIHRoZSBhbmNob3IgcG9pbnQsIHdoaWNoIGlzIGluIHRoZSBjZW50ZXIgb2YgdGhlIHJlbmRl cmVyIGJveCB1bmxlc3MgdHJhbnNmb3JtLW9yaWdpbiBpcyBzZXQuCiAgICAgICAgIEZsb2F0UG9p bnQzRCBhbmNob3IoZW5jbG9zaW5nUmVsYXRpdmVDb21wb3NpdGluZ0JvdW5kcy53aWR0aCgpID8g KChsYXllck9mZnNldC54KCkgLSBlbmNsb3NpbmdSZWxhdGl2ZUNvbXBvc2l0aW5nQm91bmRzLngo KSkgKyB0cmFuc2Zvcm1PcmlnaW4ueCgpKQogICAgICAgICAgICAgLyBlbmNsb3NpbmdSZWxhdGl2 ZUNvbXBvc2l0aW5nQm91bmRzLndpZHRoKCkgOiAwLjUsIGVuY2xvc2luZ1JlbGF0aXZlQ29tcG9z aXRpbmdCb3VuZHMuaGVpZ2h0KCkgPyAoKGxheWVyT2Zmc2V0LnkoKSAtIGVuY2xvc2luZ1JlbGF0 aXZlQ29tcG9zaXRpbmdCb3VuZHMueSgpKQo=