132195 2014-04-25 08:17:10 -0700 Allow a platform-specific size enumeration to be passed into popup-menu display 2014-04-29 16:45:16 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dino dino sam oldest_to_newest 1004098 0 dino 2014-04-25 08:17:10 -0700 Allow a platform-specific size enumeration to be passed into popup-menu display 1004103 1 230181 dino 2014-04-25 08:31:31 -0700 Created attachment 230181 Patch 1004104 2 dino 2014-04-25 08:32:40 -0700 This will fail to compile due to required changes in WebKitSystemInterface. <rdar://problem/16175750> 1004116 3 230181 bfulgham 2014-04-25 09:50:09 -0700 Comment on attachment 230181 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230181&action=review r=me. It looks like no similar changes are needed for iOS, right? > Source/WebKit2/WebProcess/WebCoreSupport/mac/WebPopupMenuMac.mm:38 > +void WebPopupMenu::setUpPlatformData(const IntRect& pageRect, PlatformPopupMenuData& data) It doesn't seem like you use pageRect anywhere. 1004144 4 dino 2014-04-25 11:00:47 -0700 (In reply to comment #3) > (From update of attachment 230181 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=230181&action=review > > r=me. It looks like no similar changes are needed for iOS, right? No. iOS uses something completely different for popup menus. 1004147 5 230188 dino 2014-04-25 11:12:53 -0700 Created attachment 230188 Updated patch for building 1004221 6 dino 2014-04-25 14:43:30 -0700 Committed r167825: <http://trac.webkit.org/changeset/167825> 1005207 7 230188 bfulgham 2014-04-29 16:45:16 -0700 Comment on attachment 230188 Updated patch for building Clearing review flag so it doesn't show up in the Request Queue. 230181 2014-04-25 08:31:31 -0700 2014-04-25 09:50:09 -0700 Patch bug-132195-20140425083109.patch text/plain 21193 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGZlYTFlNDQyYTIxMjI1 N2NjNTNjNTgyNDlkMGEwNTY5MmUxNzcwNS4uMjcxYTg5ZDkxMDdiMWE2ZTkzOWU3NDdmYTlkZTNk OWM1YjUwMjE0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE0LTA0LTI1ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBBbGxvdyBhIHBsYXRmb3JtLXNw ZWNpZmljIHNpemUgZW51bWVyYXRpb24gdG8gYmUgcGFzc2VkIGludG8gcG9wdXAtbWVudSBkaXNw bGF5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIx OTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQbGF0 Zm9ybXMgbGlrZSBPUyBYIHVzZSBhIHNldCBvZiBwcmVkZWZpbmVkIHNpemVzIGZvciBidWlsdC1p biBjb250cm9scworICAgICAgICB1c2VkIGZvciA8c2VsZWN0Pjogbm9ybWFsLCBzbWFsbCBhbmQg bWluaS4gRXhwb3NlIHRoYXQgaW5mb3JtYXRpb24gdG8KKyAgICAgICAgdGhlIFBvcHVwTWVudUNs aWVudCB2aWEgdGhlIFBvcHVwTWVudVN0eWxlLCBhbGxvd2luZyBpdCB0byBiZSBwYXNzZWQKKyAg ICAgICAgaW50byB0aGUgcGxhdGZvcm0gY29kZSBpbiBXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuCisK KyAgICAgICAgSXQncyBhIGJpdCBhbm5veWluZyB0aGF0IHdlIGRlZmluZSBzbyBtYW55IGVudW1z IGZvciBlZmZlY3RpdmVseQorICAgICAgICB0aGUgc2FtZSBkYXRhLgorCisgICAgICAgICogcGxh dGZvcm0vUG9wdXBNZW51U3R5bGUuaDogQWRkIGEgbWVudSBzaXplIGVudW0uCisgICAgICAgIChX ZWJDb3JlOjpQb3B1cE1lbnVTdHlsZTo6UG9wdXBNZW51U3R5bGUpOgorICAgICAgICAoV2ViQ29y ZTo6UG9wdXBNZW51U3R5bGU6Om1lbnVTaXplKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2Vi Q29yZVN5c3RlbUludGVyZmFjZS5oOiBBZGQgYW5vdGhlciB2ZXJzaW9uIG9mIHRoZSBlbnVtCisg ICAgICAgIGFuZCBoYXZlIHdrUG9wdXBNZW51IGFjY2VwdCBpdCBhcyBhIHBhcmFtZXRlci4KKyAg ICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwOgorICAgICAgICAoUmVuZGVyTWVudUxpc3Q6 Om1lbnVTdHlsZSk6IEFzayB0aGUgUmVuZGVyVGhlbWUgdG8gY2FsY3VsYXRlIHRoZSBzaXplCisg ICAgICAgIG9mIHRoZSBtZW51IGJ1dHRvbiwgc28gdGhhdCBpdCBjYW4gYmUgYWRkZWQgdG8gdGhl IFBvcHVwTWVudVN0eWxlLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5oOiBOZXcg bWV0aG9kIHRvIHJldHJpZXZlIHRoZSBtZW51IHNpemUuCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUaGVtZTo6cG9wdXBNZW51U2l6ZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1l TWFjLmg6IE92ZXJyaWRlIHRoZSBiYXNlIGZ1bmN0aW9uLCBhbmQgYWRkIGEKKyAgICAgICAgY29u dHJvbFNpemVGb3JDZWxsIGhlbHBlci4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVN YWMubW06CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZU1hYzo6Y29udHJvbFNpemVGb3JD ZWxsKTogVXNlZCBieSB0aGlzIG5ldworICAgICAgICBjb2RlIGFuZCB0aGUgb2xkIHNldENvbnRy b2xTaXplRm9yQ2VsbCB0byBjYWxjdWxhdGUgdGhlIE5TQ29udHJvbFNpemUKKyAgICAgICAgdGhh dCB3b3VsZCBiZSB1c2VkIGZvciB0aGUgYnV0dG9uLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVNYWM6OnNldENvbnRyb2xTaXplKTogQ2FsbCB0aGUgbmV3IGhlbHBlci4KKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lTWFjOjpwb3B1cE1lbnVTaXplKTogUmV0dXJuIHRoZSB2YWx1 ZSBmcm9tIHRoZSBoZWxwZXIuCisKIDIwMTQtMDQtMjEgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBw bGUuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeCBmb3IgTW91bnRhaW4gTGlvbi4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZwppbmRleCA2YmExNDM0OTk3YWViNWUxODU2MWE2M2RmMWJhYjJjOTg5Y2NkYzY4Li44NGEy MDJhM2QxYjQ5Nzc4ZWRlZGMwMGQxYzc1OGE1YWQyMDllNTYzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTQtMDQtMjUgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29t PgorCisgICAgICAgIEFsbG93IGEgcGxhdGZvcm0tc3BlY2lmaWMgc2l6ZSBlbnVtZXJhdGlvbiB0 byBiZSBwYXNzZWQgaW50byBwb3B1cC1tZW51IGRpc3BsYXkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjE5NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBsYXRmb3JtcyBsaWtlIE9TIFggdXNlIGEgc2V0 IG9mIHByZWRlZmluZWQgc2l6ZXMgZm9yIGJ1aWx0LWluIGNvbnRyb2xzCisgICAgICAgIHVzZWQg Zm9yIDxzZWxlY3Q+OiBub3JtYWwsIHNtYWxsIGFuZCBtaW5pLiBFeHBvc2UgdGhhdCBpbmZvcm1h dGlvbiB0bworICAgICAgICB0aGUgUG9wdXBNZW51Q2xpZW50IHZpYSB0aGUgUG9wdXBNZW51U3R5 bGUsIGFsbG93aW5nIGl0IHRvIGJlIHBhc3NlZAorICAgICAgICBpbnRvIHRoZSBwbGF0Zm9ybSBj b2RlIGluIFdlYktpdFN5c3RlbUludGVyZmFjZS4KKworICAgICAgICBJdCdzIGEgYml0IGFubm95 aW5nIHRoYXQgd2UgZGVmaW5lIHNvIG1hbnkgZW51bXMgZm9yIGVmZmVjdGl2ZWx5CisgICAgICAg IHRoZSBzYW1lIGRhdGEuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9Qb3B1cE1lbnVNYWMu bW06CisgICAgICAgIChQb3B1cE1lbnVNYWM6OnNob3cpOiBDb252ZXJ0IHRoZSBXZWJDb3JlIG1l bnUgc2l6ZSB0eXBlIGludG8gdGhlCisgICAgICAgIFdlYkNvcmVTeXN0ZW1JbnRlcmZhY2UgdHlw ZS4KKwogMjAxNC0wNC0yMSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4K IAogICAgICAgICBbTWFjXSBpbXBsZW1lbnQgV2ViS2l0RGF0YUN1ZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDVk MjJjODU1NGY4NmQyYmQzMzc1MmMzZjFkZTlhMDIxZDg4OWQ2ZDAuLmQ2M2FiNjJhNGUyMmNiOTE5 M2MxMTM2Y2QzNzcxNDczMTlkZDQ5ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAx NC0wNC0yNSAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cg YSBwbGF0Zm9ybS1zcGVjaWZpYyBzaXplIGVudW1lcmF0aW9uIHRvIGJlIHBhc3NlZCBpbnRvIHBv cHVwLW1lbnUgZGlzcGxheQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMyMTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUGxhdGZvcm1zIGxpa2UgT1MgWCB1c2UgYSBzZXQgb2YgcHJlZGVmaW5lZCBzaXpl cyBmb3IgYnVpbHQtaW4gY29udHJvbHMKKyAgICAgICAgdXNlZCBmb3IgPHNlbGVjdD46IG5vcm1h bCwgc21hbGwgYW5kIG1pbmkuIEV4cG9zZSB0aGF0IGluZm9ybWF0aW9uIHRvCisgICAgICAgIHRo ZSBQb3B1cE1lbnVDbGllbnQgdmlhIHRoZSBQb3B1cE1lbnVTdHlsZSwgYWxsb3dpbmcgaXQgdG8g YmUgcGFzc2VkCisgICAgICAgIGludG8gdGhlIHBsYXRmb3JtIGNvZGUgaW4gV2ViS2l0U3lzdGVt SW50ZXJmYWNlLgorCisgICAgICAgIEl0J3MgYSBiaXQgYW5ub3lpbmcgdGhhdCB3ZSBkZWZpbmUg c28gbWFueSBlbnVtcyBmb3IgZWZmZWN0aXZlbHkKKyAgICAgICAgdGhlIHNhbWUgZGF0YS4KKwor ICAgICAgICAqIFNoYXJlZC9QbGF0Zm9ybVBvcHVwTWVudURhdGEuY3BwOiBFbmNvZGUgYW5kIGRl Y29kZSB0aGUgbmV3IGVudW0gZm9yIG1lbnUgc2l6ZS4KKyAgICAgICAgKFdlYktpdDo6UGxhdGZv cm1Qb3B1cE1lbnVEYXRhOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpQbGF0Zm9ybVBvcHVw TWVudURhdGE6OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL1BsYXRmb3JtUG9wdXBNZW51RGF0 YS5oOiBFeHBvc2UgYW5vdGhlciBlbnVtIGZvciB0aGUgbWVudSBzaXplLgorICAgICAgICAqIFVJ UHJvY2Vzcy9tYWMvV2ViUG9wdXBNZW51UHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6Oldl YlBvcHVwTWVudVByb3h5TWFjOjpzaG93UG9wdXBNZW51KTogQ29udmVydCB0aGUgUGxhdGZvcm1Q b3B1cE1lbnVEYXRhCisgICAgICAgIGNvbnRyb2wgc2l6ZSBlbnVtIGludG8gYSBXS0NvbnRyb2xT aXplLCBhbmQgcGFzcyB0aGF0IGludG8gV0tQb3B1cE1lbnUuCisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViUG9wdXBNZW51TWFjLm1tOgorICAgICAgICAoV2ViS2l0 OjpXZWJQb3B1cE1lbnU6OnNldFVwUGxhdGZvcm1EYXRhKTogQ29udmVydCBhCisgICAgICAgIFdl YkNvcmU6OlBvcHVwTWVudVN0eWxlOjpQb3B1cE1lbnVTaXplIGludG8gYQorICAgICAgICBQbGF0 Zm9ybVBvcHVwTWVudURhdGE6OlBvcHVwTWVudVNpemUuCisKIDIwMTQtMDQtMjEgIERhbiBCZXJu c3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQgcGFydCBvZiA8cmRhcjov L3Byb2JsZW0vMTY2MzEzMjM+IFBhZ2U6OnNldERlZmVyc0xvYWRpbmcgZG9lc27igJl0IGRvIGFu eXRoaW5nIHdoZW4gdXNpbmcgdGhlIE5ldHdvcmsgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vUG9wdXBNZW51U3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1BvcHVwTWVudVN0eWxlLmgKaW5kZXggNjg5ZWQyOWRiODRhZjAyNDEzYzc2ZmZiYzRlMzk1 ZDAxM2Y2MmNhNS4uYzdhYWFjNTJiYmY5ODUzMWU0ZjM2ZDFjOGZiYjAzOTg3YjE5NjYxNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUG9wdXBNZW51U3R5bGUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Qb3B1cE1lbnVTdHlsZS5oCkBAIC0zNyw3ICszNywxMyBA QCBjbGFzcyBQb3B1cE1lbnVTdHlsZSB7CiBwdWJsaWM6CiAgICAgZW51bSBQb3B1cE1lbnVUeXBl IHsgU2VsZWN0UG9wdXAsIEF1dG9maWxsUG9wdXAgfTsKICAgICBlbnVtIEJhY2tncm91bmRDb2xv clR5cGUgeyBEZWZhdWx0QmFja2dyb3VuZENvbG9yLCBDdXN0b21CYWNrZ3JvdW5kQ29sb3IgfTsK LSAgICBQb3B1cE1lbnVTdHlsZShjb25zdCBDb2xvciYgZm9yZWdyb3VuZCwgY29uc3QgQ29sb3Im IGJhY2tncm91bmQsIGNvbnN0IEZvbnQmIGZvbnQsIGJvb2wgdmlzaWJsZSwgYm9vbCBpc0Rpc3Bs YXlOb25lLCBMZW5ndGggdGV4dEluZGVudCwgVGV4dERpcmVjdGlvbiB0ZXh0RGlyZWN0aW9uLCBi b29sIGhhc1RleHREaXJlY3Rpb25PdmVycmlkZSwgQmFja2dyb3VuZENvbG9yVHlwZSBiYWNrZ3Jv dW5kQ29sb3JUeXBlID0gRGVmYXVsdEJhY2tncm91bmRDb2xvciwgUG9wdXBNZW51VHlwZSBtZW51 VHlwZSA9IFNlbGVjdFBvcHVwKQorICAgIGVudW0gUG9wdXBNZW51U2l6ZSB7CisgICAgICAgIFBv cHVwTWVudVNpemVOb3JtYWwsCisgICAgICAgIFBvcHVwTWVudVNpemVTbWFsbCwKKyAgICAgICAg UG9wdXBNZW51U2l6ZU1pbmkKKyAgICB9OworCisgICAgUG9wdXBNZW51U3R5bGUoY29uc3QgQ29s b3ImIGZvcmVncm91bmQsIGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kLCBjb25zdCBGb250JiBmb250 LCBib29sIHZpc2libGUsIGJvb2wgaXNEaXNwbGF5Tm9uZSwgTGVuZ3RoIHRleHRJbmRlbnQsIFRl eHREaXJlY3Rpb24gdGV4dERpcmVjdGlvbiwgYm9vbCBoYXNUZXh0RGlyZWN0aW9uT3ZlcnJpZGUs IEJhY2tncm91bmRDb2xvclR5cGUgYmFja2dyb3VuZENvbG9yVHlwZSA9IERlZmF1bHRCYWNrZ3Jv dW5kQ29sb3IsIFBvcHVwTWVudVR5cGUgbWVudVR5cGUgPSBTZWxlY3RQb3B1cCwgUG9wdXBNZW51 U2l6ZSBtZW51U2l6ZSA9IFBvcHVwTWVudVNpemVOb3JtYWwpCiAgICAgICAgIDogbV9mb3JlZ3Jv dW5kQ29sb3IoZm9yZWdyb3VuZCkKICAgICAgICAgLCBtX2JhY2tncm91bmRDb2xvcihiYWNrZ3Jv dW5kKQogICAgICAgICAsIG1fZm9udChmb250KQpAQCAtNDgsNiArNTQsNyBAQCBwdWJsaWM6CiAg ICAgICAgICwgbV9oYXNUZXh0RGlyZWN0aW9uT3ZlcnJpZGUoaGFzVGV4dERpcmVjdGlvbk92ZXJy aWRlKQogICAgICAgICAsIG1fYmFja2dyb3VuZENvbG9yVHlwZShiYWNrZ3JvdW5kQ29sb3JUeXBl KQogICAgICAgICAsIG1fbWVudVR5cGUobWVudVR5cGUpCisgICAgICAgICwgbV9tZW51U2l6ZSht ZW51U2l6ZSkKICAgICB7CiAgICAgfQogCkBAIC02MSw2ICs2OCw4IEBAIHB1YmxpYzoKICAgICBi b29sIGhhc1RleHREaXJlY3Rpb25PdmVycmlkZSgpIGNvbnN0IHsgcmV0dXJuIG1faGFzVGV4dERp cmVjdGlvbk92ZXJyaWRlOyB9CiAgICAgQmFja2dyb3VuZENvbG9yVHlwZSBiYWNrZ3JvdW5kQ29s b3JUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9iYWNrZ3JvdW5kQ29sb3JUeXBlOyB9CiAgICAgUG9w dXBNZW51VHlwZSBtZW51VHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWVudVR5cGU7IH0KKyAgICBQ b3B1cE1lbnVTaXplIG1lbnVTaXplKCkgY29uc3QgeyByZXR1cm4gbV9tZW51U2l6ZTsgfQorCiBw cml2YXRlOgogICAgIENvbG9yIG1fZm9yZWdyb3VuZENvbG9yOwogICAgIENvbG9yIG1fYmFja2dy b3VuZENvbG9yOwpAQCAtNzIsNiArODEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9oYXNUZXh0 RGlyZWN0aW9uT3ZlcnJpZGU7CiAgICAgQmFja2dyb3VuZENvbG9yVHlwZSBtX2JhY2tncm91bmRD b2xvclR5cGU7CiAgICAgUG9wdXBNZW51VHlwZSBtX21lbnVUeXBlOworICAgIFBvcHVwTWVudVNp emUgbV9tZW51U2l6ZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5oCmluZGV4 IDczN2I1OTRkYjUwMWFmYjUwMzY4NGIxZTFlMzc4NDI0ZTBhZjM4NzMuLjhmMDY4MTlkZWI0MjEw MmE4YWFkMDM1NzhmOTI3N2RhZWUzZmFjN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaApAQCAtMTk2LDcgKzE5NiwxNCBA QCBleHRlcm4gTlNDb250cm9sICooKndrQ3JlYXRlTWVkaWFVSUNvbnRyb2wpKGludCk7CiAKIGV4 dGVybiB2b2lkICgqd2tXaW5kb3dTZXRBbHBoYSkoTlNXaW5kb3cgKiwgZmxvYXQpOwogZXh0ZXJu IHZvaWQgKCp3a1dpbmRvd1NldFNjYWxlZEZyYW1lKShOU1dpbmRvdyAqLCBOU1JlY3QsIE5TUmVj dCk7Ci1leHRlcm4gdm9pZCAoKndrUG9wdXBNZW51KShOU01lbnUqLCBOU1BvaW50IGxvY2F0aW9u LCBmbG9hdCB3aWR0aCwgTlNWaWV3KiwgaW50IHNlbGVjdGVkSXRlbSwgTlNGb250Kik7CisKK3R5 cGVkZWYgZW51bSB7CisgICAgd2tSZWd1bGFyQ29udHJvbFNpemUsCisgICAgd2tTbWFsbENvbnRy b2xTaXplLAorICAgIHdrTWluaUNvbnRyb2xTaXplCit9IHdrQ29udHJvbFNpemU7CitleHRlcm4g dm9pZCAoKndrUG9wdXBNZW51KShOU01lbnUqLCBOU1BvaW50IGxvY2F0aW9uLCBmbG9hdCB3aWR0 aCwgTlNWaWV3KiwgaW50IHNlbGVjdGVkSXRlbSwgTlNGb250KiwgaW50IGNvbnRyb2xTaXplKTsK KwogZXh0ZXJuIHVuc2lnbmVkICgqd2tRVEluY2x1ZGVPbmx5TW9kZXJuTWVkaWFGaWxlVHlwZXMp KHZvaWQpOwogZXh0ZXJuIGludCAoKndrUVRNb3ZpZURhdGFSYXRlKShRVE1vdmllKik7CiBleHRl cm4gdm9pZCAoKndrUVRNb3ZpZURpc2FibGVDb21wb25lbnQpKHVpbnQzMl90WzVdKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNl Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2Uu bW0KaW5kZXggM2ExNWQ2MTFkMjU1OTAxY2ZhMmJkYTQwOWYzZDUwZTEzNzIwZTFlOC4uZWI5Mzky MzA0OTE4Y2NhN2VjODlhYTBjNjdjZmQzMTc3YTE4NTc2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UubW0KQEAgLTY2LDcg KzY2LDcgQEAgTlNEYXRlICooKndrR2V0TlNVUkxSZXNwb25zZUxhc3RNb2RpZmllZERhdGUpKE5T VVJMUmVzcG9uc2UgKnJlc3BvbnNlKTsKIEJPT0wgKCp3a0dldE5TVVJMUmVzcG9uc2VNdXN0UmV2 YWxpZGF0ZSkoTlNVUkxSZXNwb25zZSAqcmVzcG9uc2UpOwogdm9pZCAoKndrR2V0V2hlZWxFdmVu dERlbHRhcykoTlNFdmVudCosIGZsb2F0KiBkZWx0YVgsIGZsb2F0KiBkZWx0YVksIEJPT0wqIGNv bnRpbnVvdXMpOwogVUludDggKCp3a0dldE5TRXZlbnRLZXlDaGFyKShOU0V2ZW50ICopOwotdm9p ZCAoKndrUG9wdXBNZW51KShOU01lbnUqLCBOU1BvaW50IGxvY2F0aW9uLCBmbG9hdCB3aWR0aCwg TlNWaWV3KiwgaW50IHNlbGVjdGVkSXRlbSwgTlNGb250Kik7Cit2b2lkICgqd2tQb3B1cE1lbnUp KE5TTWVudSosIE5TUG9pbnQgbG9jYXRpb24sIGZsb2F0IHdpZHRoLCBOU1ZpZXcqLCBpbnQgc2Vs ZWN0ZWRJdGVtLCBOU0ZvbnQqLCBpbnQgY29udHJvbFNpemUpOwogdW5zaWduZWQgKCp3a1FUSW5j bHVkZU9ubHlNb2Rlcm5NZWRpYUZpbGVUeXBlcykodm9pZCk7CiBpbnQgKCp3a1FUTW92aWVEYXRh UmF0ZSkoUVRNb3ZpZSopOwogdm9pZCAoKndrUVRNb3ZpZURpc2FibGVDb21wb25lbnQpKHVpbnQz Ml90WzVdKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51 TGlzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwCmlu ZGV4IDMwYWE0ZWM4YzgwMDEyNzdkMjkxNTYyMTkyMWQxMzIxNjQwMTIxZWMuLjllZjcxMTNjMzZh Yjg4YmVmYWU5NTNhNWI4ZjA2OWM5YTk0N2ZkMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck1lbnVMaXN0LmNwcApAQCAtNTYwLDggKzU2MCwxMSBAQCB2b2lkIFJlbmRlck1l bnVMaXN0OjpnZXRJdGVtQmFja2dyb3VuZENvbG9yKHVuc2lnbmVkIGxpc3RJbmRleCwgQ29sb3Im IGl0ZW1CYWNrZwogUG9wdXBNZW51U3R5bGUgUmVuZGVyTWVudUxpc3Q6Om1lbnVTdHlsZSgpIGNv bnN0CiB7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlVG9Vc2UgPSBtX2lubmVyQmxvY2sg PyBtX2lubmVyQmxvY2stPnN0eWxlKCkgOiBzdHlsZSgpOwotICAgIHJldHVybiBQb3B1cE1lbnVT dHlsZShzdHlsZVRvVXNlLnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKSwg c3R5bGVUb1VzZS52aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29s b3IpLCBzdHlsZVRvVXNlLmZvbnQoKSwgc3R5bGVUb1VzZS52aXNpYmlsaXR5KCkgPT0gVklTSUJM RSwKLSAgICAgICAgc3R5bGVUb1VzZS5kaXNwbGF5KCkgPT0gTk9ORSwgc3R5bGVUb1VzZS50ZXh0 SW5kZW50KCksIHN0eWxlKCkuZGlyZWN0aW9uKCksIGlzT3ZlcnJpZGUoc3R5bGUoKS51bmljb2Rl QmlkaSgpKSk7CisgICAgSW50UmVjdCBhYnNCb3VuZHMgPSBhYnNvbHV0ZUJvdW5kaW5nQm94UmVj dElnbm9yaW5nVHJhbnNmb3JtcygpOworICAgIHJldHVybiBQb3B1cE1lbnVTdHlsZShzdHlsZVRv VXNlLnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKSwgc3R5bGVUb1VzZS52 aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpLAorICAgICAg ICBzdHlsZVRvVXNlLmZvbnQoKSwgc3R5bGVUb1VzZS52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSwg c3R5bGVUb1VzZS5kaXNwbGF5KCkgPT0gTk9ORSwgc3R5bGVUb1VzZS50ZXh0SW5kZW50KCksCisg ICAgICAgIHN0eWxlKCkuZGlyZWN0aW9uKCksIGlzT3ZlcnJpZGUoc3R5bGUoKS51bmljb2RlQmlk aSgpKSwgUG9wdXBNZW51U3R5bGU6OkRlZmF1bHRCYWNrZ3JvdW5kQ29sb3IsCisgICAgICAgIFBv cHVwTWVudVN0eWxlOjpTZWxlY3RQb3B1cCwgdGhlbWUoKS5wb3B1cE1lbnVTaXplKCZzdHlsZVRv VXNlLCBhYnNCb3VuZHMpKTsKIH0KIAogSG9zdFdpbmRvdyogUmVuZGVyTWVudUxpc3Q6Omhvc3RX aW5kb3coKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaAppbmRleCA5 YmQ4MGU5OGMxYTNiNDE0MDhjODdlMzA2YWU1MGVhZDJkZWNiMzk5Li44NWY2NmFkNDg5OTRlZTE3 Zjk4OGE5YjAwMDgzMDZkMWY1YzRkZjhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWUuaApAQCAtMjksNiArMjksNyBAQAogI2Vsc2UKICNpbmNsdWRlICJUaGVtZVR5cGVzLmgi CiAjZW5kaWYKKyNpbmNsdWRlICJQb3B1cE1lbnVTdHlsZS5oIgogI2luY2x1ZGUgIlJlbmRlck9i amVjdC5oIgogI2luY2x1ZGUgIlNjcm9sbFR5cGVzLmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQ dHIuaD4KQEAgLTE4NCw2ICsxODUsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBpbnQgcG9wdXBJ bnRlcm5hbFBhZGRpbmdUb3AoUmVuZGVyU3R5bGUqKSBjb25zdCB7IHJldHVybiAwOyB9CiAgICAg dmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdCb3R0b20oUmVuZGVyU3R5bGUqKSBjb25z dCB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBib29sIHBvcHVwT3B0aW9uU3VwcG9ydHNUZXh0 SW5kZW50KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIFBvcHVwTWVudVN0 eWxlOjpQb3B1cE1lbnVTaXplIHBvcHVwTWVudVNpemUoY29uc3QgUmVuZGVyU3R5bGUqLCBJbnRS ZWN0JikgY29uc3QgeyByZXR1cm4gUG9wdXBNZW51U3R5bGU6OlBvcHVwTWVudVNpemVOb3JtYWw7 IH0KIAogICAgIHZpcnR1YWwgU2Nyb2xsYmFyQ29udHJvbFNpemUgc2Nyb2xsYmFyQ29udHJvbFNp emVGb3JQYXJ0KENvbnRyb2xQYXJ0KSB7IHJldHVybiBSZWd1bGFyU2Nyb2xsYmFyOyB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLmgKaW5kZXggMGZiZTYxMWEyYmNm ODQzYzIwNmFlOWZmYzEwNWQxNWZiYzYwY2FjNC4uNjcxYmU2ZDUyOWUxN2NjMDAxNDMyOWU3ZWM2 NzU1ZmFmOTA5MmViNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFj LmgKQEAgLTgxLDYgKzgxLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJu YWxQYWRkaW5nUmlnaHQoUmVuZGVyU3R5bGUqKSBjb25zdDsKICAgICB2aXJ0dWFsIGludCBwb3B1 cEludGVybmFsUGFkZGluZ1RvcChSZW5kZXJTdHlsZSopIGNvbnN0OwogICAgIHZpcnR1YWwgaW50 IHBvcHVwSW50ZXJuYWxQYWRkaW5nQm90dG9tKFJlbmRlclN0eWxlKikgY29uc3Q7CisgICAgdmly dHVhbCBQb3B1cE1lbnVTdHlsZTo6UG9wdXBNZW51U2l6ZSBwb3B1cE1lbnVTaXplKGNvbnN0IFJl bmRlclN0eWxlKiwgSW50UmVjdCYpIGNvbnN0OwogCiAgICAgdmlydHVhbCBib29sIHBhaW50Q2Fw c0xvY2tJbmRpY2F0b3IoUmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50 UmVjdCYpIG92ZXJyaWRlOwogCkBAIC0xNzksNiArMTgwLDcgQEAgcHJpdmF0ZToKICAgICAvLyBH ZXQgdGhlIGNvbnRyb2wgc2l6ZSBiYXNlZCBvZmYgdGhlIGZvbnQuIFVzZWQgYnkgc29tZSBvZiB0 aGUgY29udHJvbHMgKGxpa2UgYnV0dG9ucykuCiAgICAgTlNDb250cm9sU2l6ZSBjb250cm9sU2l6 ZUZvckZvbnQoUmVuZGVyU3R5bGUqKSBjb25zdDsKICAgICBOU0NvbnRyb2xTaXplIGNvbnRyb2xT aXplRm9yU3lzdGVtRm9udChSZW5kZXJTdHlsZSopIGNvbnN0OworICAgIE5TQ29udHJvbFNpemUg Y29udHJvbFNpemVGb3JDZWxsKE5TQ2VsbCosIGNvbnN0IEludFNpemUqIHNpemVzLCBjb25zdCBJ bnRTaXplJiBtaW5TaXplLCBmbG9hdCB6b29tTGV2ZWwgPSAxLjBmKSBjb25zdDsKICAgICB2b2lk IHNldENvbnRyb2xTaXplKE5TQ2VsbCosIGNvbnN0IEludFNpemUqIHNpemVzLCBjb25zdCBJbnRT aXplJiBtaW5TaXplLCBmbG9hdCB6b29tTGV2ZWwgPSAxLjBmKTsKICAgICB2b2lkIHNldFNpemVG cm9tRm9udChSZW5kZXJTdHlsZSosIGNvbnN0IEludFNpemUqIHNpemVzKSBjb25zdDsKICAgICBJ bnRTaXplIHNpemVGb3JGb250KFJlbmRlclN0eWxlKiwgY29uc3QgSW50U2l6ZSogc2l6ZXMpIGNv bnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFj Lm1tIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCmluZGV4IDI1 OGM3YWUyYjJmYmFkYjI1MGIxYjQ0OGU0MDg2MmE5OWVjMDY4MGMuLjA0ZTAxODIwMWMyM2VhMDlm MGU0MDJhZjEzYzE1MjQ5MmVkNGMzNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVNYWMubW0KQEAgLTc0MCwxNyArNzQwLDIyIEBAIE5TQ29udHJvbFNpemUgUmVuZGVy VGhlbWVNYWM6OmNvbnRyb2xTaXplRm9yRm9udChSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0CiAg ICAgcmV0dXJuIE5TTWluaUNvbnRyb2xTaXplOwogfQogCitOU0NvbnRyb2xTaXplIFJlbmRlclRo ZW1lTWFjOjpjb250cm9sU2l6ZUZvckNlbGwoTlNDZWxsKiwgY29uc3QgSW50U2l6ZSogc2l6ZXMs IGNvbnN0IEludFNpemUmIG1pblNpemUsIGZsb2F0IHpvb21MZXZlbCkgY29uc3QKK3sKKyAgICBp ZiAobWluU2l6ZS53aWR0aCgpID49IHN0YXRpY19jYXN0PGludD4oc2l6ZXNbTlNSZWd1bGFyQ29u dHJvbFNpemVdLndpZHRoKCkgKiB6b29tTGV2ZWwpCisgICAgICAgICYmIG1pblNpemUuaGVpZ2h0 KCkgPj0gc3RhdGljX2Nhc3Q8aW50PihzaXplc1tOU1JlZ3VsYXJDb250cm9sU2l6ZV0uaGVpZ2h0 KCkgKiB6b29tTGV2ZWwpKQorICAgICAgICByZXR1cm4gTlNSZWd1bGFyQ29udHJvbFNpemU7CisK KyAgICBpZiAobWluU2l6ZS53aWR0aCgpID49IHN0YXRpY19jYXN0PGludD4oc2l6ZXNbTlNTbWFs bENvbnRyb2xTaXplXS53aWR0aCgpICogem9vbUxldmVsKQorICAgICAgICAmJiBtaW5TaXplLmhl aWdodCgpID49IHN0YXRpY19jYXN0PGludD4oc2l6ZXNbTlNTbWFsbENvbnRyb2xTaXplXS5oZWln aHQoKSAqIHpvb21MZXZlbCkpCisgICAgICAgIHJldHVybiBOU1NtYWxsQ29udHJvbFNpemU7CisK KyAgICByZXR1cm4gTlNNaW5pQ29udHJvbFNpemU7Cit9CisKIHZvaWQgUmVuZGVyVGhlbWVNYWM6 OnNldENvbnRyb2xTaXplKE5TQ2VsbCogY2VsbCwgY29uc3QgSW50U2l6ZSogc2l6ZXMsIGNvbnN0 IEludFNpemUmIG1pblNpemUsIGZsb2F0IHpvb21MZXZlbCkKIHsKLSAgICBOU0NvbnRyb2xTaXpl IHNpemU7Ci0gICAgaWYgKG1pblNpemUud2lkdGgoKSA+PSBzdGF0aWNfY2FzdDxpbnQ+KHNpemVz W05TUmVndWxhckNvbnRyb2xTaXplXS53aWR0aCgpICogem9vbUxldmVsKSAmJgotICAgICAgICBt aW5TaXplLmhlaWdodCgpID49IHN0YXRpY19jYXN0PGludD4oc2l6ZXNbTlNSZWd1bGFyQ29udHJv bFNpemVdLmhlaWdodCgpICogem9vbUxldmVsKSkKLSAgICAgICAgc2l6ZSA9IE5TUmVndWxhckNv bnRyb2xTaXplOwotICAgIGVsc2UgaWYgKG1pblNpemUud2lkdGgoKSA+PSBzdGF0aWNfY2FzdDxp bnQ+KHNpemVzW05TU21hbGxDb250cm9sU2l6ZV0ud2lkdGgoKSAqIHpvb21MZXZlbCkgJiYKLSAg ICAgICAgICAgICBtaW5TaXplLmhlaWdodCgpID49IHN0YXRpY19jYXN0PGludD4oc2l6ZXNbTlNT bWFsbENvbnRyb2xTaXplXS5oZWlnaHQoKSAqIHpvb21MZXZlbCkpCi0gICAgICAgIHNpemUgPSBO U1NtYWxsQ29udHJvbFNpemU7Ci0gICAgZWxzZQotICAgICAgICBzaXplID0gTlNNaW5pQ29udHJv bFNpemU7CisgICAgTlNDb250cm9sU2l6ZSBzaXplID0gY29udHJvbFNpemVGb3JDZWxsKGNlbGws IHNpemVzLCBtaW5TaXplLCB6b29tTGV2ZWwpOwogICAgIGlmIChzaXplICE9IFtjZWxsIGNvbnRy b2xTaXplXSkgLy8gT25seSB1cGRhdGUgaWYgd2UgaGF2ZSB0bywgc2luY2UgQXBwS2l0IGRvZXMg d29yayBldmVuIGlmIHRoZSBzaXplIGlzIHRoZSBzYW1lLgogICAgICAgICBbY2VsbCBzZXRDb250 cm9sU2l6ZTpzaXplXTsKIH0KQEAgLTEzODMsNiArMTM4OCwyMCBAQCBpbnQgUmVuZGVyVGhlbWVN YWM6OnBvcHVwSW50ZXJuYWxQYWRkaW5nQm90dG9tKFJlbmRlclN0eWxlKiBzdHlsZSkgY29uc3QK ICAgICByZXR1cm4gMDsKIH0KIAorUG9wdXBNZW51U3R5bGU6OlBvcHVwTWVudVNpemUgUmVuZGVy VGhlbWVNYWM6OnBvcHVwTWVudVNpemUoY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlLCBJbnRSZWN0 JiByZWN0KSBjb25zdAoreworICAgIE5TUG9wVXBCdXR0b25DZWxsKiBwb3B1cEJ1dHRvbiA9IHRo aXMtPnBvcHVwQnV0dG9uKCk7CisgICAgTlNDb250cm9sU2l6ZSBzaXplID0gY29udHJvbFNpemVG b3JDZWxsKHBvcHVwQnV0dG9uLCBwb3B1cEJ1dHRvblNpemVzKCksIHJlY3Quc2l6ZSgpLCBzdHls ZS0+ZWZmZWN0aXZlWm9vbSgpKTsKKyAgICBzd2l0Y2ggKHNpemUpIHsKKyAgICBjYXNlIE5TUmVn dWxhckNvbnRyb2xTaXplOgorICAgICAgICByZXR1cm4gUG9wdXBNZW51U3R5bGU6OlBvcHVwTWVu dVNpemVOb3JtYWw7CisgICAgY2FzZSBOU1NtYWxsQ29udHJvbFNpemU6CisgICAgICAgIHJldHVy biBQb3B1cE1lbnVTdHlsZTo6UG9wdXBNZW51U2l6ZVNtYWxsOworICAgIGNhc2UgTlNNaW5pQ29u dHJvbFNpemU6CisgICAgICAgIHJldHVybiBQb3B1cE1lbnVTdHlsZTo6UG9wdXBNZW51U2l6ZU1p bmk7CisgICAgfQorfQorCiB2b2lkIFJlbmRlclRoZW1lTWFjOjphZGp1c3RNZW51TGlzdEJ1dHRv blN0eWxlKFN0eWxlUmVzb2x2ZXIqLCBSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQqKSBjb25z dAogewogICAgIGZsb2F0IGZvbnRTY2FsZSA9IHN0eWxlLT5mb250U2l6ZSgpIC8gYmFzZUZvbnRT aXplOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvUG9wdXBN ZW51TWFjLm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvUG9wdXBNZW51TWFj Lm1tCmluZGV4IGQyOTZhM2Q3NjY5MjVhZTBhZjViMzEwOTdmNGM0ZDNlYTcxMDZiN2UuLjliZmRl YTNlNTUwMTc0OGJjM2U4YTBiOGZkOGE5YzQ5ZDI4NDUzYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1BvcHVwTWVudU1hYy5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJDb3JlU3VwcG9ydC9Qb3B1cE1lbnVNYWMubW0KQEAgLTE5MSw3ICsxOTEsMjAg QEAgdm9pZCBQb3B1cE1lbnVNYWM6OnNob3coY29uc3QgSW50UmVjdCYgciwgRnJhbWVWaWV3KiB2 LCBpbnQgaW5kZXgpCiAgICAgICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiAgICAgfQog Ci0gICAgd2tQb3B1cE1lbnUobWVudSwgbG9jYXRpb24sIHJvdW5kZihOU1dpZHRoKHIpKSwgZHVt bXlWaWV3LmdldCgpLCBpbmRleCwgZm9udCk7CisgICAgd2tDb250cm9sU2l6ZSBjb250cm9sU2l6 ZTsKKyAgICBzd2l0Y2ggKG1fY2xpZW50LT5tZW51U3R5bGUoKS5tZW51U2l6ZSgpKSB7CisgICAg Y2FzZSBQb3B1cE1lbnVTdHlsZTo6UG9wdXBNZW51U2l6ZU5vcm1hbDoKKyAgICAgICAgY29udHJv bFNpemUgPSB3a1JlZ3VsYXJDb250cm9sU2l6ZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQ b3B1cE1lbnVTdHlsZTo6UG9wdXBNZW51U2l6ZVNtYWxsOgorICAgICAgICBjb250cm9sU2l6ZSA9 IHdrU21hbGxDb250cm9sU2l6ZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQb3B1cE1lbnVT dHlsZTo6UG9wdXBNZW51U2l6ZU1pbmk6CisgICAgICAgIGNvbnRyb2xTaXplID0gd2tNaW5pQ29u dHJvbFNpemU7CisgICAgICAgIGJyZWFrOworICAgIH0KKworICAgIHdrUG9wdXBNZW51KG1lbnUs IGxvY2F0aW9uLCByb3VuZGYoTlNXaWR0aChyKSksIGR1bW15Vmlldy5nZXQoKSwgaW5kZXgsIGZv bnQsIGNvbnRyb2xTaXplKTsKIAogICAgIFttX3BvcHVwIGRpc21pc3NQb3BVcF07CiAgICAgW2R1 bW15VmlldyByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9QbGF0Zm9ybVBvcHVwTWVudURhdGEuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVk L1BsYXRmb3JtUG9wdXBNZW51RGF0YS5jcHAKaW5kZXggYjJjNzVhOTc3M2U4MTEwZjY4ZjYyZGYy NzgxNjIxOGU4MWIxYzNjNS4uNWVlYmZlMTNkYWJkY2U4ZTY1MjcyNzk0MjNmNGNhOTgxMTBkNGNj OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsYXRmb3JtUG9wdXBNZW51RGF0 YS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsYXRmb3JtUG9wdXBNZW51RGF0YS5j cHAKQEAgLTM5LDYgKzM5LDcgQEAgdm9pZCBQbGF0Zm9ybVBvcHVwTWVudURhdGE6OmVuY29kZShJ UEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICNpZiBQTEFURk9STShDT0NPQSkK ICAgICBlbmNvZGVyIDw8IGZvbnRJbmZvOwogICAgIGVuY29kZXIgPDwgc2hvdWxkUG9wT3ZlcjsK KyAgICBlbmNvZGVyLmVuY29kZUVudW0obWVudVNpemUpOwogI2Vsc2UKICAgICBVTlVTRURfUEFS QU0oZW5jb2Rlcik7CiAjZW5kaWYKQEAgLTUxLDYgKzUyLDggQEAgYm9vbCBQbGF0Zm9ybVBvcHVw TWVudURhdGE6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgUGxhdGZvcm1Q b3B1cE0KICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUoZGF0 YS5zaG91bGRQb3BPdmVyKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rl ci5kZWNvZGVFbnVtKGRhdGEubWVudVNpemUpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAjZWxz ZQogICAgIFVOVVNFRF9QQVJBTShkZWNvZGVyKTsKICAgICBVTlVTRURfUEFSQU0oZGF0YSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGxhdGZvcm1Qb3B1cE1lbnVEYXRhLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGxhdGZvcm1Qb3B1cE1lbnVEYXRhLmgKaW5kZXggY2Ni NWFlZTg5M2QyMWJhMjRjOWVkNGZmYzlhZjgwNjc5YWU5YTkyYS4uZGM4YjcwZDI2YmUyZjIxZDUw ZjIyZmM2YTk3YmRhN2FhZWQzZGI0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVk L1BsYXRmb3JtUG9wdXBNZW51RGF0YS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbGF0 Zm9ybVBvcHVwTWVudURhdGEuaApAQCAtMzgsNiArMzgsMTMgQEAgbmFtZXNwYWNlIElQQyB7CiBu YW1lc3BhY2UgV2ViS2l0IHsKIAogc3RydWN0IFBsYXRmb3JtUG9wdXBNZW51RGF0YSB7CisKKyAg ICBlbnVtIFBvcHVwTWVudVNpemUgeworICAgICAgICBQb3B1cE1lbnVTaXplTm9ybWFsLAorICAg ICAgICBQb3B1cE1lbnVTaXplU21hbGwsCisgICAgICAgIFBvcHVwTWVudVNpemVNaW5pCisgICAg fTsKKwogICAgIFBsYXRmb3JtUG9wdXBNZW51RGF0YSgpOwogCiAgICAgdm9pZCBlbmNvZGUoSVBD OjpBcmd1bWVudEVuY29kZXImKSBjb25zdDsKQEAgLTQ2LDYgKzUzLDcgQEAgc3RydWN0IFBsYXRm b3JtUG9wdXBNZW51RGF0YSB7CiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgRm9udEluZm8gZm9u dEluZm87CiAgICAgYm9vbCBzaG91bGRQb3BPdmVyOworICAgIFBvcHVwTWVudVNpemUgbWVudVNp emU7CiAjZW5kaWYKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV2ViUG9wdXBNZW51UHJveHlNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFj L1dlYlBvcHVwTWVudVByb3h5TWFjLm1tCmluZGV4IDJhZjAyNGRlN2NjNzM1NDY0OWEzMDcyYjhj NTQ2OWFkNzZiNDlhYjcuLjBhMWRhODNlMzM5ODJmNTdiODA3MGFkZDM3ZjRlMDVkZTlkZWQzZmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUG9wdXBNZW51UHJv eHlNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQb3B1cE1lbnVQ cm94eU1hYy5tbQpAQCAtMTM0LDcgKzEzNCwyMCBAQCB2b2lkIFdlYlBvcHVwTWVudVByb3h5TWFj OjpzaG93UG9wdXBNZW51KGNvbnN0IEludFJlY3QmIHJlY3QsIFRleHREaXJlY3Rpb24gdGV4dAog ICAgIFttX3dlYlZpZXcgYWRkU3VidmlldzpkdW1teVZpZXcuZ2V0KCldOwogICAgIGxvY2F0aW9u ID0gW2R1bW15VmlldyBjb252ZXJ0UG9pbnQ6bG9jYXRpb24gZnJvbVZpZXc6bV93ZWJWaWV3XTsK IAotICAgIFdLUG9wdXBNZW51KG1lbnUsIGxvY2F0aW9uLCByb3VuZGYoTlNXaWR0aChyZWN0KSks IGR1bW15Vmlldy5nZXQoKSwgc2VsZWN0ZWRJbmRleCwgZm9udCk7CisgICAgV0tDb250cm9sU2l6 ZSBjb250cm9sU2l6ZTsKKyAgICBzd2l0Y2ggKGRhdGEubWVudVNpemUpIHsKKyAgICBjYXNlIFBs YXRmb3JtUG9wdXBNZW51RGF0YTo6UG9wdXBNZW51U2l6ZU5vcm1hbDoKKyAgICAgICAgY29udHJv bFNpemUgPSBXS1JlZ3VsYXJDb250cm9sU2l6ZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQ bGF0Zm9ybVBvcHVwTWVudURhdGE6OlBvcHVwTWVudVNpemVTbWFsbDoKKyAgICAgICAgY29udHJv bFNpemUgPSBXS1NtYWxsQ29udHJvbFNpemU7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgUGxh dGZvcm1Qb3B1cE1lbnVEYXRhOjpQb3B1cE1lbnVTaXplTWluaToKKyAgICAgICAgY29udHJvbFNp emUgPSBXS01pbmlDb250cm9sU2l6ZTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorCisgICAgV0tQ b3B1cE1lbnUobWVudSwgbG9jYXRpb24sIHJvdW5kZihOU1dpZHRoKHJlY3QpKSwgZHVtbXlWaWV3 LmdldCgpLCBzZWxlY3RlZEluZGV4LCBmb250LCBjb250cm9sU2l6ZSk7CiAKICAgICBbbV9wb3B1 cCBkaXNtaXNzUG9wVXBdOwogICAgIFtkdW1teVZpZXcgcmVtb3ZlRnJvbVN1cGVydmlld107CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9X ZWJQb3B1cE1lbnVNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L21hYy9XZWJQb3B1cE1lbnVNYWMubW0KaW5kZXggNzU3MGYzZGQzNmUxODU0NjNlMjkwMjZj MWU3NmI5NDdkODg3ODI3Yy4uMzAxNDJhNWJlNDEyZmQ4ZjkzZTA1ZThhYmQwOTAwNjQ0ZDkxYTEx NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9t YWMvV2ViUG9wdXBNZW51TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvbWFjL1dlYlBvcHVwTWVudU1hYy5tbQpAQCAtMzUsNyArMzUsNyBAQCB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXZvaWQgV2ViUG9w dXBNZW51OjpzZXRVcFBsYXRmb3JtRGF0YShjb25zdCBJbnRSZWN0JiwgUGxhdGZvcm1Qb3B1cE1l bnVEYXRhJiBkYXRhKQordm9pZCBXZWJQb3B1cE1lbnU6OnNldFVwUGxhdGZvcm1EYXRhKGNvbnN0 IEludFJlY3QmIHBhZ2VSZWN0LCBQbGF0Zm9ybVBvcHVwTWVudURhdGEmIGRhdGEpCiB7CiAjaWYg VVNFKEFQUEtJVCkKICAgICAvLyBGSVhNRTogZm9udCB3aWxsIGJlIG5pbCBoZXJlIGZvciBjdXN0 b20gZm9udHMsIHdlIHNob3VsZCBmaXggdGhhdC4KQEAgLTQ5LDYgKzQ5LDE5IEBAIHZvaWQgV2Vi UG9wdXBNZW51OjpzZXRVcFBsYXRmb3JtRGF0YShjb25zdCBJbnRSZWN0JiwgUGxhdGZvcm1Qb3B1 cE1lbnVEYXRhJiBkYXRhCiAgICAgCiAgICAgZGF0YS5mb250SW5mby5mb250QXR0cmlidXRlRGlj dGlvbmFyeSA9IGZvbnREZXNjcmlwdG9yQXR0cmlidXRlczsKICAgICBkYXRhLnNob3VsZFBvcE92 ZXIgPSBtX3BvcHVwQ2xpZW50LT5zaG91bGRQb3BPdmVyKCk7CisKKyAgICBzd2l0Y2ggKG1fcG9w dXBDbGllbnQtPm1lbnVTdHlsZSgpLm1lbnVTaXplKCkpIHsKKyAgICBjYXNlIFdlYkNvcmU6OlBv cHVwTWVudVN0eWxlOjpQb3B1cE1lbnVTaXplTm9ybWFsOgorICAgICAgICBkYXRhLm1lbnVTaXpl ID0gUGxhdGZvcm1Qb3B1cE1lbnVEYXRhOjpQb3B1cE1lbnVTaXplTm9ybWFsOworICAgICAgICBi cmVhazsKKyAgICBjYXNlIFdlYkNvcmU6OlBvcHVwTWVudVN0eWxlOjpQb3B1cE1lbnVTaXplU21h bGw6CisgICAgICAgIGRhdGEubWVudVNpemUgPSBQbGF0Zm9ybVBvcHVwTWVudURhdGE6OlBvcHVw TWVudVNpemVTbWFsbDsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXZWJDb3JlOjpQb3B1cE1l bnVTdHlsZTo6UG9wdXBNZW51U2l6ZU1pbmk6CisgICAgICAgIGRhdGEubWVudVNpemUgPSBQbGF0 Zm9ybVBvcHVwTWVudURhdGE6OlBvcHVwTWVudVNpemVNaW5pOworICAgICAgICBicmVhazsKKyAg ICB9CisKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKGRhdGEpOwogI2VuZGlmCg== 230188 2014-04-25 11:12:53 -0700 2014-04-29 16:45:16 -0700 Updated patch for building bug-132195-20140425111231.patch text/plain 20066 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3ODA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMzOWJjOWQ2ZmM1YzRl ZjcyYTIyYmQ5MjY4MDQyZTk4NmJlZGU0MC4uYTFkYTJlOGU4NzAwYmRhYWJkMzMwYWZlZTM2ZDli NzBkMGM2YzYzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE0LTA0LTI1ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBBbGxvdyBhIHBsYXRmb3JtLXNw ZWNpZmljIHNpemUgZW51bWVyYXRpb24gdG8gYmUgcGFzc2VkIGludG8gcG9wdXAtbWVudSBkaXNw bGF5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIx OTUKKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxnaGFtLiBXaXRoIHNvbWUgaW4tcGVy c29uIHJldmlldyBjb21tZW50cyBmcm9tIFNhbSBXZWluaWcuCisKKyAgICAgICAgUGxhdGZvcm1z IGxpa2UgT1MgWCB1c2UgYSBzZXQgb2YgcHJlZGVmaW5lZCBzaXplcyBmb3IgYnVpbHQtaW4gY29u dHJvbHMKKyAgICAgICAgdXNlZCBmb3IgPHNlbGVjdD46IG5vcm1hbCwgc21hbGwgYW5kIG1pbmku IEV4cG9zZSB0aGF0IGluZm9ybWF0aW9uIHRvCisgICAgICAgIHRoZSBQb3B1cE1lbnVDbGllbnQg dmlhIHRoZSBQb3B1cE1lbnVTdHlsZSwgYWxsb3dpbmcgaXQgdG8gYmUgcGFzc2VkCisgICAgICAg IGludG8gdGhlIHBsYXRmb3JtIGNvZGUgaW4gV2ViS2l0U3lzdGVtSW50ZXJmYWNlLgorCisgICAg ICAgICogcGxhdGZvcm0vUG9wdXBNZW51U3R5bGUuaDogQWRkIGEgbWVudSBzaXplIGVudW0uCisg ICAgICAgIChXZWJDb3JlOjpQb3B1cE1lbnVTdHlsZTo6UG9wdXBNZW51U3R5bGUpOgorICAgICAg ICAoV2ViQ29yZTo6UG9wdXBNZW51U3R5bGU6Om1lbnVTaXplKToKKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5oOiBQYXNzIGluIE5TQ29udHJvbFNpemUgYXMg YSBwYXJhbWV0ZXIKKyAgICAgICAgdG8gV0tQb3B1cE1lbnUuCisgICAgICAgICogcGxhdGZvcm0v bWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UubW06IERpdHRvLgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJNZW51TGlzdC5jcHA6CisgICAgICAgIChSZW5kZXJNZW51TGlzdDo6bWVudVN0eWxl KTogQXNrIHRoZSBSZW5kZXJUaGVtZSB0byBjYWxjdWxhdGUgdGhlIHNpemUKKyAgICAgICAgb2Yg dGhlIG1lbnUgYnV0dG9uLCBzbyB0aGF0IGl0IGNhbiBiZSBhZGRlZCB0byB0aGUgUG9wdXBNZW51 U3R5bGUuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmg6IE5ldyBtZXRob2QgdG8g cmV0cmlldmUgdGhlIG1lbnUgc2l6ZS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjpw b3B1cE1lbnVTaXplKTogQ29udmVydCBhbiBOU0NvbnRyb2xTaXplIGludG8gYSBQb3B1cE1lbnVT aXplLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oOiBPdmVycmlkZSB0aGUg YmFzZSBmdW5jdGlvbiwgYW5kIGFkZCBhCisgICAgICAgIGNvbnRyb2xTaXplRm9yQ2VsbCBoZWxw ZXIuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGhlbWVNYWM6OmNvbnRyb2xTaXplRm9yQ2VsbCk6IFVzZWQgYnkgdGhpcyBu ZXcKKyAgICAgICAgY29kZSBhbmQgdGhlIG9sZCBzZXRDb250cm9sU2l6ZUZvckNlbGwgdG8gY2Fs Y3VsYXRlIHRoZSBOU0NvbnRyb2xTaXplCisgICAgICAgIHRoYXQgd291bGQgYmUgdXNlZCBmb3Ig dGhlIGJ1dHRvbi4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lTWFjOjpzZXRDb250cm9s U2l6ZSk6IENhbGwgdGhlIG5ldyBoZWxwZXIuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVt ZU1hYzo6cG9wdXBNZW51U2l6ZSk6IFJldHVybiB0aGUgdmFsdWUgZnJvbSB0aGUgaGVscGVyLgor CiAyMDE0LTA0LTI0ICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBb TmV3IE11bHRpY29sdW1uXSBBZGQgc3VwcG9ydCBmb3Igb2Zmc2V0TGVmdCBhbmQgb2Zmc2V0VG9w LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCmluZGV4IDM5ZjI3YTM5MTIwYTY2YTU0NWMwYTk1YmIzZGFkNzRiYTBi ODZkNmYuLjkyNjNlYTZhYjU0NjdjNDVhMDA3N2Q1YzYwYjE4ZjM2MjI4NDQ3YjcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxNC0wNC0yNSAgRGVhbiBKYWNrc29uICA8ZGlu b0BhcHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cgYSBwbGF0Zm9ybS1zcGVjaWZpYyBzaXplIGVu dW1lcmF0aW9uIHRvIGJlIHBhc3NlZCBpbnRvIHBvcHVwLW1lbnUgZGlzcGxheQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyMTk1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4gV2l0aCBzb21lIGluLXBlcnNvbiByZXZpZXcgY29t bWVudHMgZnJvbSBTYW0gV2VpbmlnLgorCisgICAgICAgIFBsYXRmb3JtcyBsaWtlIE9TIFggdXNl IGEgc2V0IG9mIHByZWRlZmluZWQgc2l6ZXMgZm9yIGJ1aWx0LWluIGNvbnRyb2xzCisgICAgICAg IHVzZWQgZm9yIDxzZWxlY3Q+OiBub3JtYWwsIHNtYWxsIGFuZCBtaW5pLiBFeHBvc2UgdGhhdCBp bmZvcm1hdGlvbiB0bworICAgICAgICB0aGUgUG9wdXBNZW51Q2xpZW50IHZpYSB0aGUgUG9wdXBN ZW51U3R5bGUsIGFsbG93aW5nIGl0IHRvIGJlIHBhc3NlZAorICAgICAgICBpbnRvIHRoZSBwbGF0 Zm9ybSBjb2RlIGluIFdlYktpdFN5c3RlbUludGVyZmFjZS4KKworICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L1BvcHVwTWVudU1hYy5tbToKKyAgICAgICAgKFBvcHVwTWVudU1hYzo6c2hvdyk6IENv bnZlcnQgdGhlIFdlYkNvcmUgbWVudSBzaXplIHR5cGUgaW50byB0aGUKKyAgICAgICAgV2ViQ29y ZVN5c3RlbUludGVyZmFjZSB0eXBlLgorCiAyMDE0LTA0LTI0ICBDb21taXQgUXVldWUgIDxjb21t aXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCBy MTY3NzAwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCmluZGV4IDkxOTc1MTVjMWJkZWIwNThmZjEzZmE5MTU3OTQ4N2M4MDE0 MmNjOTMuLmU1MWQxNjVjMjg3OTNiZjAxODFhNjk3NTQyZTE3M2MzYmUyZjhkMzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyNiBAQAorMjAxNC0wNC0yNSAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBs ZS5jb20+CisKKyAgICAgICAgQWxsb3cgYSBwbGF0Zm9ybS1zcGVjaWZpYyBzaXplIGVudW1lcmF0 aW9uIHRvIGJlIHBhc3NlZCBpbnRvIHBvcHVwLW1lbnUgZGlzcGxheQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyMTk1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQnJlbnQgRnVsZ2hhbS4gV2l0aCBzb21lIGluLXBlcnNvbiByZXZpZXcgY29tbWVudHMg ZnJvbSBTYW0gV2VpbmlnLgorCisgICAgICAgIFBsYXRmb3JtcyBsaWtlIE9TIFggdXNlIGEgc2V0 IG9mIHByZWRlZmluZWQgc2l6ZXMgZm9yIGJ1aWx0LWluIGNvbnRyb2xzCisgICAgICAgIHVzZWQg Zm9yIDxzZWxlY3Q+OiBub3JtYWwsIHNtYWxsIGFuZCBtaW5pLiBFeHBvc2UgdGhhdCBpbmZvcm1h dGlvbiB0bworICAgICAgICB0aGUgUG9wdXBNZW51Q2xpZW50IHZpYSB0aGUgUG9wdXBNZW51U3R5 bGUsIGFsbG93aW5nIGl0IHRvIGJlIHBhc3NlZAorICAgICAgICBpbnRvIHRoZSBwbGF0Zm9ybSBj b2RlIGluIFdlYktpdFN5c3RlbUludGVyZmFjZS4KKworICAgICAgICAqIFNoYXJlZC9QbGF0Zm9y bVBvcHVwTWVudURhdGEuY3BwOiBFbmNvZGUgYW5kIGRlY29kZSB0aGUgUG9wdXBNZW51U2l6ZSBl bnVtLgorICAgICAgICAoV2ViS2l0OjpQbGF0Zm9ybVBvcHVwTWVudURhdGE6OmVuY29kZSk6Cisg ICAgICAgIChXZWJLaXQ6OlBsYXRmb3JtUG9wdXBNZW51RGF0YTo6ZGVjb2RlKToKKyAgICAgICAg KiBTaGFyZWQvUGxhdGZvcm1Qb3B1cE1lbnVEYXRhLmg6IEFkZCBQb3B1cE1lbnVTaXplIG1lbWJl ciB2YXJpYWJsZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBvcHVwTWVudVByb3h5TWFj Lm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQb3B1cE1lbnVQcm94eU1hYzo6c2hvd1BvcHVwTWVu dSk6IENvbnZlcnQgdGhlIFBvcHVwTWVudVNpemUKKyAgICAgICAgaW50byBhIFdLQ29udHJvbFNp emUsIGFuZCBwYXNzIHRoYXQgaW50byBXS1BvcHVwTWVudS4KKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L21hYy9XZWJQb3B1cE1lbnVNYWMubW06CisgICAgICAgIChXZWJLaXQ6 OldlYlBvcHVwTWVudTo6c2V0VXBQbGF0Zm9ybURhdGEpOiBBZGQgdGhlIFBvcHVwTWVudVNpemUg dG8KKyAgICAgICAgdGhlIFBsYXRmb3JtUG9wdXBNZW51RGF0YS4KKwogMjAxNC0wNC0yNSAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10g UGx1Z2luIHByb2Nlc3MgY3Jhc2hlcyB3aXRoIEdUSzIgd2luZG93ZWQgcGx1Z2lucwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUG9wdXBNZW51U3R5bGUuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1BvcHVwTWVudVN0eWxlLmgKaW5kZXggNjg5ZWQyOWRiODRhZjAyNDEz Yzc2ZmZiYzRlMzk1ZDAxM2Y2MmNhNS4uYzdhYWFjNTJiYmY5ODUzMWU0ZjM2ZDFjOGZiYjAzOTg3 YjE5NjYxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUG9wdXBNZW51U3R5 bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Qb3B1cE1lbnVTdHlsZS5oCkBAIC0z Nyw3ICszNywxMyBAQCBjbGFzcyBQb3B1cE1lbnVTdHlsZSB7CiBwdWJsaWM6CiAgICAgZW51bSBQ b3B1cE1lbnVUeXBlIHsgU2VsZWN0UG9wdXAsIEF1dG9maWxsUG9wdXAgfTsKICAgICBlbnVtIEJh Y2tncm91bmRDb2xvclR5cGUgeyBEZWZhdWx0QmFja2dyb3VuZENvbG9yLCBDdXN0b21CYWNrZ3Jv dW5kQ29sb3IgfTsKLSAgICBQb3B1cE1lbnVTdHlsZShjb25zdCBDb2xvciYgZm9yZWdyb3VuZCwg Y29uc3QgQ29sb3ImIGJhY2tncm91bmQsIGNvbnN0IEZvbnQmIGZvbnQsIGJvb2wgdmlzaWJsZSwg Ym9vbCBpc0Rpc3BsYXlOb25lLCBMZW5ndGggdGV4dEluZGVudCwgVGV4dERpcmVjdGlvbiB0ZXh0 RGlyZWN0aW9uLCBib29sIGhhc1RleHREaXJlY3Rpb25PdmVycmlkZSwgQmFja2dyb3VuZENvbG9y VHlwZSBiYWNrZ3JvdW5kQ29sb3JUeXBlID0gRGVmYXVsdEJhY2tncm91bmRDb2xvciwgUG9wdXBN ZW51VHlwZSBtZW51VHlwZSA9IFNlbGVjdFBvcHVwKQorICAgIGVudW0gUG9wdXBNZW51U2l6ZSB7 CisgICAgICAgIFBvcHVwTWVudVNpemVOb3JtYWwsCisgICAgICAgIFBvcHVwTWVudVNpemVTbWFs bCwKKyAgICAgICAgUG9wdXBNZW51U2l6ZU1pbmkKKyAgICB9OworCisgICAgUG9wdXBNZW51U3R5 bGUoY29uc3QgQ29sb3ImIGZvcmVncm91bmQsIGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kLCBjb25z dCBGb250JiBmb250LCBib29sIHZpc2libGUsIGJvb2wgaXNEaXNwbGF5Tm9uZSwgTGVuZ3RoIHRl eHRJbmRlbnQsIFRleHREaXJlY3Rpb24gdGV4dERpcmVjdGlvbiwgYm9vbCBoYXNUZXh0RGlyZWN0 aW9uT3ZlcnJpZGUsIEJhY2tncm91bmRDb2xvclR5cGUgYmFja2dyb3VuZENvbG9yVHlwZSA9IERl ZmF1bHRCYWNrZ3JvdW5kQ29sb3IsIFBvcHVwTWVudVR5cGUgbWVudVR5cGUgPSBTZWxlY3RQb3B1 cCwgUG9wdXBNZW51U2l6ZSBtZW51U2l6ZSA9IFBvcHVwTWVudVNpemVOb3JtYWwpCiAgICAgICAg IDogbV9mb3JlZ3JvdW5kQ29sb3IoZm9yZWdyb3VuZCkKICAgICAgICAgLCBtX2JhY2tncm91bmRD b2xvcihiYWNrZ3JvdW5kKQogICAgICAgICAsIG1fZm9udChmb250KQpAQCAtNDgsNiArNTQsNyBA QCBwdWJsaWM6CiAgICAgICAgICwgbV9oYXNUZXh0RGlyZWN0aW9uT3ZlcnJpZGUoaGFzVGV4dERp cmVjdGlvbk92ZXJyaWRlKQogICAgICAgICAsIG1fYmFja2dyb3VuZENvbG9yVHlwZShiYWNrZ3Jv dW5kQ29sb3JUeXBlKQogICAgICAgICAsIG1fbWVudVR5cGUobWVudVR5cGUpCisgICAgICAgICwg bV9tZW51U2l6ZShtZW51U2l6ZSkKICAgICB7CiAgICAgfQogCkBAIC02MSw2ICs2OCw4IEBAIHB1 YmxpYzoKICAgICBib29sIGhhc1RleHREaXJlY3Rpb25PdmVycmlkZSgpIGNvbnN0IHsgcmV0dXJu IG1faGFzVGV4dERpcmVjdGlvbk92ZXJyaWRlOyB9CiAgICAgQmFja2dyb3VuZENvbG9yVHlwZSBi YWNrZ3JvdW5kQ29sb3JUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9iYWNrZ3JvdW5kQ29sb3JUeXBl OyB9CiAgICAgUG9wdXBNZW51VHlwZSBtZW51VHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWVudVR5 cGU7IH0KKyAgICBQb3B1cE1lbnVTaXplIG1lbnVTaXplKCkgY29uc3QgeyByZXR1cm4gbV9tZW51 U2l6ZTsgfQorCiBwcml2YXRlOgogICAgIENvbG9yIG1fZm9yZWdyb3VuZENvbG9yOwogICAgIENv bG9yIG1fYmFja2dyb3VuZENvbG9yOwpAQCAtNzIsNiArODEsNyBAQCBwcml2YXRlOgogICAgIGJv b2wgbV9oYXNUZXh0RGlyZWN0aW9uT3ZlcnJpZGU7CiAgICAgQmFja2dyb3VuZENvbG9yVHlwZSBt X2JhY2tncm91bmRDb2xvclR5cGU7CiAgICAgUG9wdXBNZW51VHlwZSBtX21lbnVUeXBlOworICAg IFBvcHVwTWVudVNpemUgbV9tZW51U2l6ZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50 ZXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVy ZmFjZS5oCmluZGV4IDczN2I1OTRkYjUwMWFmYjUwMzY4NGIxZTFlMzc4NDI0ZTBhZjM4NzMuLjQ3 OGU4N2VhMmViOTQyNWU0ODU5ZTk5MjQ2NDE2ZDE2OGJiNzBiMWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaApAQCAtMTk2 LDcgKzE5NiwxMSBAQCBleHRlcm4gTlNDb250cm9sICooKndrQ3JlYXRlTWVkaWFVSUNvbnRyb2wp KGludCk7CiAKIGV4dGVybiB2b2lkICgqd2tXaW5kb3dTZXRBbHBoYSkoTlNXaW5kb3cgKiwgZmxv YXQpOwogZXh0ZXJuIHZvaWQgKCp3a1dpbmRvd1NldFNjYWxlZEZyYW1lKShOU1dpbmRvdyAqLCBO U1JlY3QsIE5TUmVjdCk7Ci1leHRlcm4gdm9pZCAoKndrUG9wdXBNZW51KShOU01lbnUqLCBOU1Bv aW50IGxvY2F0aW9uLCBmbG9hdCB3aWR0aCwgTlNWaWV3KiwgaW50IHNlbGVjdGVkSXRlbSwgTlNG b250Kik7CisKKyNpZiBkZWZpbmVkKF9fT0JKQ19fKQorZXh0ZXJuIHZvaWQgKCp3a1BvcHVwTWVu dSkoTlNNZW51KiwgTlNQb2ludCBsb2NhdGlvbiwgZmxvYXQgd2lkdGgsIE5TVmlldyosIGludCBz ZWxlY3RlZEl0ZW0sIE5TRm9udCosIE5TQ29udHJvbFNpemUgY29udHJvbFNpemUpOworI2VuZGlm CisKIGV4dGVybiB1bnNpZ25lZCAoKndrUVRJbmNsdWRlT25seU1vZGVybk1lZGlhRmlsZVR5cGVz KSh2b2lkKTsKIGV4dGVybiBpbnQgKCp3a1FUTW92aWVEYXRhUmF0ZSkoUVRNb3ZpZSopOwogZXh0 ZXJuIHZvaWQgKCp3a1FUTW92aWVEaXNhYmxlQ29tcG9uZW50KSh1aW50MzJfdFs1XSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFj ZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNl Lm1tCmluZGV4IDNhMTVkNjExZDI1NTkwMWNmYTJiZGE0MDlmM2Q1MGUxMzcyMGUxZTguLmQ3MjM4 ZDI1ZDc2YmRjNzZkMmJhMmE1Y2EwZjkyMDNhZmYyNTgxMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLm1tCkBAIC02Niw3 ICs2Niw3IEBAIE5TRGF0ZSAqKCp3a0dldE5TVVJMUmVzcG9uc2VMYXN0TW9kaWZpZWREYXRlKShO U1VSTFJlc3BvbnNlICpyZXNwb25zZSk7CiBCT09MICgqd2tHZXROU1VSTFJlc3BvbnNlTXVzdFJl dmFsaWRhdGUpKE5TVVJMUmVzcG9uc2UgKnJlc3BvbnNlKTsKIHZvaWQgKCp3a0dldFdoZWVsRXZl bnREZWx0YXMpKE5TRXZlbnQqLCBmbG9hdCogZGVsdGFYLCBmbG9hdCogZGVsdGFZLCBCT09MKiBj b250aW51b3VzKTsKIFVJbnQ4ICgqd2tHZXROU0V2ZW50S2V5Q2hhcikoTlNFdmVudCAqKTsKLXZv aWQgKCp3a1BvcHVwTWVudSkoTlNNZW51KiwgTlNQb2ludCBsb2NhdGlvbiwgZmxvYXQgd2lkdGgs IE5TVmlldyosIGludCBzZWxlY3RlZEl0ZW0sIE5TRm9udCopOwordm9pZCAoKndrUG9wdXBNZW51 KShOU01lbnUqLCBOU1BvaW50IGxvY2F0aW9uLCBmbG9hdCB3aWR0aCwgTlNWaWV3KiwgaW50IHNl bGVjdGVkSXRlbSwgTlNGb250KiwgTlNDb250cm9sU2l6ZSBjb250cm9sU2l6ZSk7CiB1bnNpZ25l ZCAoKndrUVRJbmNsdWRlT25seU1vZGVybk1lZGlhRmlsZVR5cGVzKSh2b2lkKTsKIGludCAoKndr UVRNb3ZpZURhdGFSYXRlKShRVE1vdmllKik7CiB2b2lkICgqd2tRVE1vdmllRGlzYWJsZUNvbXBv bmVudCkodWludDMyX3RbNV0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck1lbnVMaXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51 TGlzdC5jcHAKaW5kZXggMzBhYTRlYzhjODAwMTI3N2QyOTE1NjIxOTIxZDEzMjE2NDAxMjFlYy4u OWVmNzExM2MzNmFiODhiZWZhZTk1M2E1YjhmMDY5YzlhOTQ3ZmQzOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwCkBAIC01NjAsOCArNTYwLDExIEBAIHZv aWQgUmVuZGVyTWVudUxpc3Q6OmdldEl0ZW1CYWNrZ3JvdW5kQ29sb3IodW5zaWduZWQgbGlzdElu ZGV4LCBDb2xvciYgaXRlbUJhY2tnCiBQb3B1cE1lbnVTdHlsZSBSZW5kZXJNZW51TGlzdDo6bWVu dVN0eWxlKCkgY29uc3QKIHsKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVUb1VzZSA9IG1f aW5uZXJCbG9jayA/IG1faW5uZXJCbG9jay0+c3R5bGUoKSA6IHN0eWxlKCk7Ci0gICAgcmV0dXJu IFBvcHVwTWVudVN0eWxlKHN0eWxlVG9Vc2UudmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3Bl cnR5Q29sb3IpLCBzdHlsZVRvVXNlLnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUJh Y2tncm91bmRDb2xvciksIHN0eWxlVG9Vc2UuZm9udCgpLCBzdHlsZVRvVXNlLnZpc2liaWxpdHko KSA9PSBWSVNJQkxFLAotICAgICAgICBzdHlsZVRvVXNlLmRpc3BsYXkoKSA9PSBOT05FLCBzdHls ZVRvVXNlLnRleHRJbmRlbnQoKSwgc3R5bGUoKS5kaXJlY3Rpb24oKSwgaXNPdmVycmlkZShzdHls ZSgpLnVuaWNvZGVCaWRpKCkpKTsKKyAgICBJbnRSZWN0IGFic0JvdW5kcyA9IGFic29sdXRlQm91 bmRpbmdCb3hSZWN0SWdub3JpbmdUcmFuc2Zvcm1zKCk7CisgICAgcmV0dXJuIFBvcHVwTWVudVN0 eWxlKHN0eWxlVG9Vc2UudmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5Q29sb3IpLCBz dHlsZVRvVXNlLnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xv ciksCisgICAgICAgIHN0eWxlVG9Vc2UuZm9udCgpLCBzdHlsZVRvVXNlLnZpc2liaWxpdHkoKSA9 PSBWSVNJQkxFLCBzdHlsZVRvVXNlLmRpc3BsYXkoKSA9PSBOT05FLCBzdHlsZVRvVXNlLnRleHRJ bmRlbnQoKSwKKyAgICAgICAgc3R5bGUoKS5kaXJlY3Rpb24oKSwgaXNPdmVycmlkZShzdHlsZSgp LnVuaWNvZGVCaWRpKCkpLCBQb3B1cE1lbnVTdHlsZTo6RGVmYXVsdEJhY2tncm91bmRDb2xvciwK KyAgICAgICAgUG9wdXBNZW51U3R5bGU6OlNlbGVjdFBvcHVwLCB0aGVtZSgpLnBvcHVwTWVudVNp emUoJnN0eWxlVG9Vc2UsIGFic0JvdW5kcykpOwogfQogCiBIb3N0V2luZG93KiBSZW5kZXJNZW51 TGlzdDo6aG9zdFdpbmRvdygpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZS5oCmluZGV4IDRkODA5ODY5MTc2NzI1OTI4MDZkNTQ2ZTUwOWJmMDIyYjdkN2ZhNzguLmUyMzEy MWIyNWEyNWVmYTgwZjExMTU0NWY5NjQ3MDlmOTZhYmY2NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZS5oCkBAIC0yOSw2ICsyOSw3IEBACiAjZWxzZQogI2luY2x1ZGUgIlRo ZW1lVHlwZXMuaCIKICNlbmRpZgorI2luY2x1ZGUgIlBvcHVwTWVudVN0eWxlLmgiCiAjaW5jbHVk ZSAiUmVuZGVyT2JqZWN0LmgiCiAjaW5jbHVkZSAiU2Nyb2xsVHlwZXMuaCIKICNpbmNsdWRlIDx3 dGYvUGFzc1JlZlB0ci5oPgpAQCAtMTg0LDYgKzE4NSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IGludCBwb3B1cEludGVybmFsUGFkZGluZ1RvcChSZW5kZXJTdHlsZSopIGNvbnN0IHsgcmV0dXJu IDA7IH0KICAgICB2aXJ0dWFsIGludCBwb3B1cEludGVybmFsUGFkZGluZ0JvdHRvbShSZW5kZXJT dHlsZSopIGNvbnN0IHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIGJvb2wgcG9wdXBPcHRpb25T dXBwb3J0c1RleHRJbmRlbnQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwg UG9wdXBNZW51U3R5bGU6OlBvcHVwTWVudVNpemUgcG9wdXBNZW51U2l6ZShjb25zdCBSZW5kZXJT dHlsZSosIEludFJlY3QmKSBjb25zdCB7IHJldHVybiBQb3B1cE1lbnVTdHlsZTo6UG9wdXBNZW51 U2l6ZU5vcm1hbDsgfQogCiAgICAgdmlydHVhbCBTY3JvbGxiYXJDb250cm9sU2l6ZSBzY3JvbGxi YXJDb250cm9sU2l6ZUZvclBhcnQoQ29udHJvbFBhcnQpIHsgcmV0dXJuIFJlZ3VsYXJTY3JvbGxi YXI7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l TWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMuaAppbmRleCAw MzFjYzRiZTZkMjZjYzQ3YWZiNzIxNDQ3YjYxZThjNTZkZjFhMTZlLi5hZWYzMzRlNGVkZTYzYTE1 OWI3NGZkMmI0NDI1MjM4MzUwMGIxMzM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWVNYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVNYWMuaApAQCAtODEsNiArODEsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBpbnQg cG9wdXBJbnRlcm5hbFBhZGRpbmdSaWdodChSZW5kZXJTdHlsZSopIGNvbnN0OwogICAgIHZpcnR1 YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nVG9wKFJlbmRlclN0eWxlKikgY29uc3Q7CiAgICAg dmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdCb3R0b20oUmVuZGVyU3R5bGUqKSBjb25z dDsKKyAgICB2aXJ0dWFsIFBvcHVwTWVudVN0eWxlOjpQb3B1cE1lbnVTaXplIHBvcHVwTWVudVNp emUoY29uc3QgUmVuZGVyU3R5bGUqLCBJbnRSZWN0JikgY29uc3Q7CiAKICAgICB2aXJ0dWFsIGJv b2wgcGFpbnRDYXBzTG9ja0luZGljYXRvcihjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWlu dEluZm8mLCBjb25zdCBJbnRSZWN0Jikgb3ZlcnJpZGU7CiAKQEAgLTE3OSw2ICsxODAsNyBAQCBw cml2YXRlOgogICAgIC8vIEdldCB0aGUgY29udHJvbCBzaXplIGJhc2VkIG9mZiB0aGUgZm9udC4g VXNlZCBieSBzb21lIG9mIHRoZSBjb250cm9scyAobGlrZSBidXR0b25zKS4KICAgICBOU0NvbnRy b2xTaXplIGNvbnRyb2xTaXplRm9yRm9udChSZW5kZXJTdHlsZSopIGNvbnN0OwogICAgIE5TQ29u dHJvbFNpemUgY29udHJvbFNpemVGb3JTeXN0ZW1Gb250KFJlbmRlclN0eWxlKikgY29uc3Q7Cisg ICAgTlNDb250cm9sU2l6ZSBjb250cm9sU2l6ZUZvckNlbGwoTlNDZWxsKiwgY29uc3QgSW50U2l6 ZSogc2l6ZXMsIGNvbnN0IEludFNpemUmIG1pblNpemUsIGZsb2F0IHpvb21MZXZlbCA9IDEuMGYp IGNvbnN0OwogICAgIHZvaWQgc2V0Q29udHJvbFNpemUoTlNDZWxsKiwgY29uc3QgSW50U2l6ZSog c2l6ZXMsIGNvbnN0IEludFNpemUmIG1pblNpemUsIGZsb2F0IHpvb21MZXZlbCA9IDEuMGYpOwog ICAgIHZvaWQgc2V0U2l6ZUZyb21Gb250KFJlbmRlclN0eWxlKiwgY29uc3QgSW50U2l6ZSogc2l6 ZXMpIGNvbnN0OwogICAgIEludFNpemUgc2l6ZUZvckZvbnQoUmVuZGVyU3R5bGUqLCBjb25zdCBJ bnRTaXplKiBzaXplcykgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhl bWVNYWMubW0KaW5kZXggYThjY2JmNTkwYWQzNzdhNDlhZjVhN2NiYmQ1Njk2NDQ2MGRlMjYyYy4u YzY4ZjA1NmVkZGYyY2RhMDgwMDg2OTQyOThhY2RlYWVlMDFmNWM0MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQpAQCAtNzQwLDE3ICs3NDAsMjIgQEAgTlND b250cm9sU2l6ZSBSZW5kZXJUaGVtZU1hYzo6Y29udHJvbFNpemVGb3JGb250KFJlbmRlclN0eWxl KiBzdHlsZSkgY29uc3QKICAgICByZXR1cm4gTlNNaW5pQ29udHJvbFNpemU7CiB9CiAKK05TQ29u dHJvbFNpemUgUmVuZGVyVGhlbWVNYWM6OmNvbnRyb2xTaXplRm9yQ2VsbChOU0NlbGwqLCBjb25z dCBJbnRTaXplKiBzaXplcywgY29uc3QgSW50U2l6ZSYgbWluU2l6ZSwgZmxvYXQgem9vbUxldmVs KSBjb25zdAoreworICAgIGlmIChtaW5TaXplLndpZHRoKCkgPj0gc3RhdGljX2Nhc3Q8aW50Pihz aXplc1tOU1JlZ3VsYXJDb250cm9sU2l6ZV0ud2lkdGgoKSAqIHpvb21MZXZlbCkKKyAgICAgICAg JiYgbWluU2l6ZS5oZWlnaHQoKSA+PSBzdGF0aWNfY2FzdDxpbnQ+KHNpemVzW05TUmVndWxhckNv bnRyb2xTaXplXS5oZWlnaHQoKSAqIHpvb21MZXZlbCkpCisgICAgICAgIHJldHVybiBOU1JlZ3Vs YXJDb250cm9sU2l6ZTsKKworICAgIGlmIChtaW5TaXplLndpZHRoKCkgPj0gc3RhdGljX2Nhc3Q8 aW50PihzaXplc1tOU1NtYWxsQ29udHJvbFNpemVdLndpZHRoKCkgKiB6b29tTGV2ZWwpCisgICAg ICAgICYmIG1pblNpemUuaGVpZ2h0KCkgPj0gc3RhdGljX2Nhc3Q8aW50PihzaXplc1tOU1NtYWxs Q29udHJvbFNpemVdLmhlaWdodCgpICogem9vbUxldmVsKSkKKyAgICAgICAgcmV0dXJuIE5TU21h bGxDb250cm9sU2l6ZTsKKworICAgIHJldHVybiBOU01pbmlDb250cm9sU2l6ZTsKK30KKwogdm9p ZCBSZW5kZXJUaGVtZU1hYzo6c2V0Q29udHJvbFNpemUoTlNDZWxsKiBjZWxsLCBjb25zdCBJbnRT aXplKiBzaXplcywgY29uc3QgSW50U2l6ZSYgbWluU2l6ZSwgZmxvYXQgem9vbUxldmVsKQogewot ICAgIE5TQ29udHJvbFNpemUgc2l6ZTsKLSAgICBpZiAobWluU2l6ZS53aWR0aCgpID49IHN0YXRp Y19jYXN0PGludD4oc2l6ZXNbTlNSZWd1bGFyQ29udHJvbFNpemVdLndpZHRoKCkgKiB6b29tTGV2 ZWwpICYmCi0gICAgICAgIG1pblNpemUuaGVpZ2h0KCkgPj0gc3RhdGljX2Nhc3Q8aW50PihzaXpl c1tOU1JlZ3VsYXJDb250cm9sU2l6ZV0uaGVpZ2h0KCkgKiB6b29tTGV2ZWwpKQotICAgICAgICBz aXplID0gTlNSZWd1bGFyQ29udHJvbFNpemU7Ci0gICAgZWxzZSBpZiAobWluU2l6ZS53aWR0aCgp ID49IHN0YXRpY19jYXN0PGludD4oc2l6ZXNbTlNTbWFsbENvbnRyb2xTaXplXS53aWR0aCgpICog em9vbUxldmVsKSAmJgotICAgICAgICAgICAgIG1pblNpemUuaGVpZ2h0KCkgPj0gc3RhdGljX2Nh c3Q8aW50PihzaXplc1tOU1NtYWxsQ29udHJvbFNpemVdLmhlaWdodCgpICogem9vbUxldmVsKSkK LSAgICAgICAgc2l6ZSA9IE5TU21hbGxDb250cm9sU2l6ZTsKLSAgICBlbHNlCi0gICAgICAgIHNp emUgPSBOU01pbmlDb250cm9sU2l6ZTsKKyAgICBOU0NvbnRyb2xTaXplIHNpemUgPSBjb250cm9s U2l6ZUZvckNlbGwoY2VsbCwgc2l6ZXMsIG1pblNpemUsIHpvb21MZXZlbCk7CiAgICAgaWYgKHNp emUgIT0gW2NlbGwgY29udHJvbFNpemVdKSAvLyBPbmx5IHVwZGF0ZSBpZiB3ZSBoYXZlIHRvLCBz aW5jZSBBcHBLaXQgZG9lcyB3b3JrIGV2ZW4gaWYgdGhlIHNpemUgaXMgdGhlIHNhbWUuCiAgICAg ICAgIFtjZWxsIHNldENvbnRyb2xTaXplOnNpemVdOwogfQpAQCAtMTM4Myw2ICsxMzg4LDIwIEBA IGludCBSZW5kZXJUaGVtZU1hYzo6cG9wdXBJbnRlcm5hbFBhZGRpbmdCb3R0b20oUmVuZGVyU3R5 bGUqIHN0eWxlKSBjb25zdAogICAgIHJldHVybiAwOwogfQogCitQb3B1cE1lbnVTdHlsZTo6UG9w dXBNZW51U2l6ZSBSZW5kZXJUaGVtZU1hYzo6cG9wdXBNZW51U2l6ZShjb25zdCBSZW5kZXJTdHls ZSogc3R5bGUsIEludFJlY3QmIHJlY3QpIGNvbnN0Cit7CisgICAgTlNQb3BVcEJ1dHRvbkNlbGwq IHBvcHVwQnV0dG9uID0gdGhpcy0+cG9wdXBCdXR0b24oKTsKKyAgICBOU0NvbnRyb2xTaXplIHNp emUgPSBjb250cm9sU2l6ZUZvckNlbGwocG9wdXBCdXR0b24sIHBvcHVwQnV0dG9uU2l6ZXMoKSwg cmVjdC5zaXplKCksIHN0eWxlLT5lZmZlY3RpdmVab29tKCkpOworICAgIHN3aXRjaCAoc2l6ZSkg eworICAgIGNhc2UgTlNSZWd1bGFyQ29udHJvbFNpemU6CisgICAgICAgIHJldHVybiBQb3B1cE1l bnVTdHlsZTo6UG9wdXBNZW51U2l6ZU5vcm1hbDsKKyAgICBjYXNlIE5TU21hbGxDb250cm9sU2l6 ZToKKyAgICAgICAgcmV0dXJuIFBvcHVwTWVudVN0eWxlOjpQb3B1cE1lbnVTaXplU21hbGw7Cisg ICAgY2FzZSBOU01pbmlDb250cm9sU2l6ZToKKyAgICAgICAgcmV0dXJuIFBvcHVwTWVudVN0eWxl OjpQb3B1cE1lbnVTaXplTWluaTsKKyAgICB9Cit9CisKIHZvaWQgUmVuZGVyVGhlbWVNYWM6OmFk anVzdE1lbnVMaXN0QnV0dG9uU3R5bGUoU3R5bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKiBzdHls ZSwgRWxlbWVudCopIGNvbnN0CiB7CiAgICAgZmxvYXQgZm9udFNjYWxlID0gc3R5bGUtPmZvbnRT aXplKCkgLyBiYXNlRm9udFNpemU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJD b3JlU3VwcG9ydC9Qb3B1cE1lbnVNYWMubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9Qb3B1cE1lbnVNYWMubW0KaW5kZXggZDI5NmEzZDc2NjkyNWFlMGFmNWIzMTA5N2Y0YzRk M2VhNzEwNmI3ZS4uOWJmZGVhM2U1NTAxNzQ4YmMzZThhMGI4ZmQ4YTljNDlkMjg0NTNhOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvUG9wdXBNZW51TWFjLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1BvcHVwTWVudU1hYy5tbQpA QCAtMTkxLDcgKzE5MSwyMCBAQCB2b2lkIFBvcHVwTWVudU1hYzo6c2hvdyhjb25zdCBJbnRSZWN0 JiByLCBGcmFtZVZpZXcqIHYsIGludCBpbmRleCkKICAgICAgICAgRU5EX0JMT0NLX09CSkNfRVhD RVBUSU9OUzsKICAgICB9CiAKLSAgICB3a1BvcHVwTWVudShtZW51LCBsb2NhdGlvbiwgcm91bmRm KE5TV2lkdGgocikpLCBkdW1teVZpZXcuZ2V0KCksIGluZGV4LCBmb250KTsKKyAgICB3a0NvbnRy b2xTaXplIGNvbnRyb2xTaXplOworICAgIHN3aXRjaCAobV9jbGllbnQtPm1lbnVTdHlsZSgpLm1l bnVTaXplKCkpIHsKKyAgICBjYXNlIFBvcHVwTWVudVN0eWxlOjpQb3B1cE1lbnVTaXplTm9ybWFs OgorICAgICAgICBjb250cm9sU2l6ZSA9IHdrUmVndWxhckNvbnRyb2xTaXplOworICAgICAgICBi cmVhazsKKyAgICBjYXNlIFBvcHVwTWVudVN0eWxlOjpQb3B1cE1lbnVTaXplU21hbGw6CisgICAg ICAgIGNvbnRyb2xTaXplID0gd2tTbWFsbENvbnRyb2xTaXplOworICAgICAgICBicmVhazsKKyAg ICBjYXNlIFBvcHVwTWVudVN0eWxlOjpQb3B1cE1lbnVTaXplTWluaToKKyAgICAgICAgY29udHJv bFNpemUgPSB3a01pbmlDb250cm9sU2l6ZTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorCisgICAg d2tQb3B1cE1lbnUobWVudSwgbG9jYXRpb24sIHJvdW5kZihOU1dpZHRoKHIpKSwgZHVtbXlWaWV3 LmdldCgpLCBpbmRleCwgZm9udCwgY29udHJvbFNpemUpOwogCiAgICAgW21fcG9wdXAgZGlzbWlz c1BvcFVwXTsKICAgICBbZHVtbXlWaWV3IHJlbW92ZUZyb21TdXBlcnZpZXddOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsYXRmb3JtUG9wdXBNZW51RGF0YS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvUGxhdGZvcm1Qb3B1cE1lbnVEYXRhLmNwcAppbmRleCBiMmM3NWE5 NzczZTgxMTBmNjhmNjJkZjI3ODE2MjE4ZTgxYjFjM2M1Li41ZWViZmUxM2RhYmRjZThlNjUyNzI3 OTQyM2Y0Y2E5ODExMGQ0Y2M4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGxh dGZvcm1Qb3B1cE1lbnVEYXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGxhdGZv cm1Qb3B1cE1lbnVEYXRhLmNwcApAQCAtMzksNiArMzksNyBAQCB2b2lkIFBsYXRmb3JtUG9wdXBN ZW51RGF0YTo6ZW5jb2RlKElQQzo6QXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogI2lm IFBMQVRGT1JNKENPQ09BKQogICAgIGVuY29kZXIgPDwgZm9udEluZm87CiAgICAgZW5jb2RlciA8 PCBzaG91bGRQb3BPdmVyOworICAgIGVuY29kZXIuZW5jb2RlRW51bShtZW51U2l6ZSk7CiAjZWxz ZQogICAgIFVOVVNFRF9QQVJBTShlbmNvZGVyKTsKICNlbmRpZgpAQCAtNTEsNiArNTIsOCBAQCBi b29sIFBsYXRmb3JtUG9wdXBNZW51RGF0YTo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBk ZWNvZGVyLCBQbGF0Zm9ybVBvcHVwTQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShkYXRhLnNob3VsZFBvcE92ZXIpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZUVudW0oZGF0YS5tZW51U2l6ZSkpCisgICAgICAgIHJl dHVybiBmYWxzZTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKGRlY29kZXIpOwogICAgIFVOVVNF RF9QQVJBTShkYXRhKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbGF0Zm9y bVBvcHVwTWVudURhdGEuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbGF0Zm9ybVBvcHVwTWVu dURhdGEuaAppbmRleCBjY2I1YWVlODkzZDIxYmEyNGM5ZWQ0ZmZjOWFmODA2NzlhZTlhOTJhLi40 MDBlZGNkMjZiZmVlOTE3ZTZjMGEyNzVkMWRiNzIwM2VlYmM3MDg5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvUGxhdGZvcm1Qb3B1cE1lbnVEYXRhLmgKKysrIGIvU291cmNlL1dl YktpdDIvU2hhcmVkL1BsYXRmb3JtUG9wdXBNZW51RGF0YS5oCkBAIC0yOCw2ICsyOCw3IEBACiAK ICNpbmNsdWRlICJGb250SW5mby5oIgogI2luY2x1ZGUgIlNoYXJlYWJsZUJpdG1hcC5oIgorI2lu Y2x1ZGUgPFdlYkNvcmUvUG9wdXBNZW51U3R5bGUuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZT dHJpbmcuaD4KIAogbmFtZXNwYWNlIElQQyB7CkBAIC00Niw2ICs0Nyw3IEBAIHN0cnVjdCBQbGF0 Zm9ybVBvcHVwTWVudURhdGEgewogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIEZvbnRJbmZvIGZv bnRJbmZvOwogICAgIGJvb2wgc2hvdWxkUG9wT3ZlcjsKKyAgICBXZWJDb3JlOjpQb3B1cE1lbnVT dHlsZTo6UG9wdXBNZW51U2l6ZSBtZW51U2l6ZTsKICNlbmRpZgogfTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQb3B1cE1lbnVQcm94eU1hYy5tbSBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUG9wdXBNZW51UHJveHlNYWMubW0KaW5kZXgg MmFmMDI0ZGU3Y2M3MzU0NjQ5YTMwNzJiOGM1NDY5YWQ3NmI0OWFiNy4uNDllYTlmMDUxZWJjMWQy MjdjYjUzYTA5ZDVmMTQ1NjZiMDM1MjlkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9XZWJQb3B1cE1lbnVQcm94eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1dlYlBvcHVwTWVudVByb3h5TWFjLm1tCkBAIC0xMzQsNyArMTM0LDIwIEBA IHZvaWQgV2ViUG9wdXBNZW51UHJveHlNYWM6OnNob3dQb3B1cE1lbnUoY29uc3QgSW50UmVjdCYg cmVjdCwgVGV4dERpcmVjdGlvbiB0ZXh0CiAgICAgW21fd2ViVmlldyBhZGRTdWJ2aWV3OmR1bW15 Vmlldy5nZXQoKV07CiAgICAgbG9jYXRpb24gPSBbZHVtbXlWaWV3IGNvbnZlcnRQb2ludDpsb2Nh dGlvbiBmcm9tVmlldzptX3dlYlZpZXddOwogCi0gICAgV0tQb3B1cE1lbnUobWVudSwgbG9jYXRp b24sIHJvdW5kZihOU1dpZHRoKHJlY3QpKSwgZHVtbXlWaWV3LmdldCgpLCBzZWxlY3RlZEluZGV4 LCBmb250KTsKKyAgICBXS0NvbnRyb2xTaXplIGNvbnRyb2xTaXplOworICAgIHN3aXRjaCAoZGF0 YS5tZW51U2l6ZSkgeworICAgIGNhc2UgV2ViQ29yZTo6UG9wdXBNZW51U3R5bGU6OlBvcHVwTWVu dVNpemVOb3JtYWw6CisgICAgICAgIGNvbnRyb2xTaXplID0gV0tSZWd1bGFyQ29udHJvbFNpemU7 CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgV2ViQ29yZTo6UG9wdXBNZW51U3R5bGU6OlBvcHVw TWVudVNpemVTbWFsbDoKKyAgICAgICAgY29udHJvbFNpemUgPSBXS1NtYWxsQ29udHJvbFNpemU7 CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgV2ViQ29yZTo6UG9wdXBNZW51U3R5bGU6OlBvcHVw TWVudVNpemVNaW5pOgorICAgICAgICBjb250cm9sU2l6ZSA9IFdLTWluaUNvbnRyb2xTaXplOwor ICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICBXS1BvcHVwTWVudShtZW51LCBsb2NhdGlvbiwg cm91bmRmKE5TV2lkdGgocmVjdCkpLCBkdW1teVZpZXcuZ2V0KCksIHNlbGVjdGVkSW5kZXgsIGZv bnQsIGNvbnRyb2xTaXplKTsKIAogICAgIFttX3BvcHVwIGRpc21pc3NQb3BVcF07CiAgICAgW2R1 bW15VmlldyByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYlBvcHVwTWVudU1hYy5tbSBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYlBvcHVwTWVudU1hYy5t bQppbmRleCA3NTcwZjNkZDM2ZTE4NTQ2M2UyOTAyNmMxZTc2Yjk0N2Q4ODc4MjdjLi44MTQxYWMy NWRhY2ViM2YwMDRhM2ZlOGRlMjNjY2I2MTA2N2MxOWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJQb3B1cE1lbnVNYWMubW0KKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViUG9wdXBN ZW51TWFjLm1tCkBAIC00OSw2ICs0OSw3IEBAIHZvaWQgV2ViUG9wdXBNZW51OjpzZXRVcFBsYXRm b3JtRGF0YShjb25zdCBJbnRSZWN0JiwgUGxhdGZvcm1Qb3B1cE1lbnVEYXRhJiBkYXRhCiAgICAg CiAgICAgZGF0YS5mb250SW5mby5mb250QXR0cmlidXRlRGljdGlvbmFyeSA9IGZvbnREZXNjcmlw dG9yQXR0cmlidXRlczsKICAgICBkYXRhLnNob3VsZFBvcE92ZXIgPSBtX3BvcHVwQ2xpZW50LT5z aG91bGRQb3BPdmVyKCk7CisgICAgZGF0YS5tZW51U2l6ZSA9IG1fcG9wdXBDbGllbnQtPm1lbnVT dHlsZSgpLm1lbnVTaXplKCk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShkYXRhKTsKICNlbmRp Zgo=