81269 2012-03-15 14:51:22 -0700 [BlackBerry] Use BlackBerry::Platform::DeviceInfo to generate UserAgent 2012-03-19 11:36:46 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 mlattanzio webkit-unassigned tonikitoo webkit.review.bot oldest_to_newest 579764 0 mlattanzio 2012-03-15 14:51:22 -0700 We should be using DeviceInfo to dynamically generate our UserAgent string. 579771 1 132127 mlattanzio 2012-03-15 14:57:54 -0700 Created attachment 132127 Patch 581912 2 132603 mlattanzio 2012-03-19 10:26:53 -0700 Created attachment 132603 Updated patch, resolved conflicts in WebPage_p.h 581936 3 132603 rwlbuis 2012-03-19 10:57:45 -0700 Comment on attachment 132603 Updated patch, resolved conflicts in WebPage_p.h View in context: https://bugs.webkit.org/attachment.cgi?id=132603&action=review LGTM. > Source/WebKit/blackberry/Api/WebPage.cpp:5683 > + BlackBerry::Platform::DeviceInfo* info = BlackBerry::Platform::DeviceInfo::instance(); You can probably leave off BlackBerry:: prefix. 581989 4 132603 webkit.review.bot 2012-03-19 11:36:42 -0700 Comment on attachment 132603 Updated patch, resolved conflicts in WebPage_p.h Clearing flags on attachment: 132603 Committed r111209: <http://trac.webkit.org/changeset/111209> 581990 5 webkit.review.bot 2012-03-19 11:36:46 -0700 All reviewed patches have been landed. Closing bug. 132127 2012-03-15 14:57:54 -0700 2012-03-19 10:26:53 -0700 Patch bug-81269-20120315175755.patch text/plain 6414 mlattanzio U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwODkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAxMTViNWRhNDU3Yzc1NWVkZGJiNjMyOWNiMjBmM2MwZmUwZGEyMjI5Li5jZTE0NTdiMTVl ZmEwMzNlZjU2MWMxZjE2Nzg4YjA1ZDM3MTFhYTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMi0wMy0xNSAgTWlrZSBMYXR0YW56aW8gIDxtbGF0 dGFuemlvQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFVzZSBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6RGV2aWNlSW5mbyB0byBnZW5lcmF0ZSBVc2VyQWdlbnQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMjY5CisgICAgICAgIAorICAgICAg ICBHZW5lcmF0ZSB0aGUgVXNlckFnZW50IGxhemlseSwgdXNpbmcgaXQgYXMgdGhlIGRlZmF1bHQg Zm9yIHRoZQorICAgICAgICBXZWJTZXR0aW5ncyBvYmplY3QuIEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpEZXZpY2VJbmZvIGlzIHVzZWQKKyAgICAgICAgdG8gZW5zdXJlIHRoZSBpbmZvcm1hdGlvbiBp cyBhY2N1cmF0ZSB0byB0aGUgc3BlY2lmaWMgZGV2aWNlLgorCisgICAgICAgIFJlbW92ZSB0aGUg IWlzRW1wdHkoKSBhc3NlcnQgd2hlbiBmZXRjaGluZyB0aGUgVUEgZnJvbSB0aGUKKyAgICAgICAg V2ViU2V0dGluZ3Mgb2JqZWN0LCBhcyBpdCB3aWxsIG5vdyBhbHdheXMgYmUgcHJvcGVybHkgaW5p dGlhbGl6ZWQuCisKKyAgICAgICAgQWRkIGEgc3RhdGljIGluaXRpYWxpemVyIGJsb2NrIHRvIGVu c3VyZSBkZWZhdWx0VXNlckFnZW50KCkgaXMKKyAgICAgICAgdGhyZWFkLXNhZmUgZnJvbSB0aGF0 IG1vbWVudCBvbndhcmQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBBcGkvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAo QmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6aW5pdCk6CisgICAgICAgIChCbGFj a0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpkZWZhdWx0VXNlckFnZW50KToKKyAgICAg ICAgKiBBcGkvV2ViUGFnZV9wLmg6CisgICAgICAgIChXZWJQYWdlUHJpdmF0ZSk6CisgICAgICAg ICogQXBpL1dlYlNldHRpbmdzLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2Vi U2V0dGluZ3M6OnNldFVzZXJBZ2VudFN0cmluZyk6CisgICAgICAgICogQXBpL1dlYlNldHRpbmdz Lmg6CisKIDIwMTItMDMtMTQgIEFydmlkIE5pbHNzb24gIDxhbmlsc3NvbkByaW0uY29tPgogCiAg ICAgICAgIFtCbGFja0JlcnJ5XSBNYWtlIHN1cmUgV2ViUGFnZSBhbmQgQmFja2luZ1N0b3JlIGRv bid0IGNyYXNoIHdpdGhvdXQgYSBXaW5kb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2UuY3BwCmluZGV4IDg3ZjA5OWI3ODlmNWEyYTY4YWJhZDFkMTJkNmNkNWU5NTEzZWYwM2Qu LjY0NjQxZTczOWI0OWJhYWJmNmI0NzZhOTZiM2Y5OWUwZjNjZTFkMjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcApAQCAtMTAxLDYgKzEwMSw3IEBACiAjaWYgRU5B QkxFKFdFQkRPTSkKICNpbmNsdWRlICJXZWJET01Eb2N1bWVudC5oIgogI2VuZGlmCisjaW5jbHVk ZSAiV2ViS2l0VmVyc2lvbi5oIgogI2luY2x1ZGUgIldlYlBhZ2VDbGllbnQuaCIKICNpbmNsdWRl ICJXZWJTb2NrZXQuaCIKICNpbmNsdWRlICJucGFwaS5oIgpAQCAtMTIxLDYgKzEyMiw3IEBACiAj aW5jbHVkZSAiV2ViUGFnZUNvbXBvc2l0b3IuaCIKICNlbmRpZgogCisjaW5jbHVkZSA8QmxhY2tC ZXJyeVBsYXRmb3JtRGV2aWNlSW5mby5oPgogI2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9ybUV4 ZWN1dGFibGVNZXNzYWdlLmg+CiAjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtSVRQb2xpY3ku aD4KICNpbmNsdWRlIDxCbGFja0JlcnJ5UGxhdGZvcm1LZXlib2FyZEV2ZW50Lmg+CkBAIC0zMzMs NiArMzM1LDEyIEBAIFdlYlBhZ2VQcml2YXRlOjpXZWJQYWdlUHJpdmF0ZShXZWJQYWdlKiB3ZWJQ YWdlLCBXZWJQYWdlQ2xpZW50KiBjbGllbnQsIGNvbnN0IEluCiAgICAgLCBtX2hhc0luUmVnaW9u U2Nyb2xsYWJsZUFyZWFzKGZhbHNlKQogICAgICwgbV91cGRhdGVEZWxlZ2F0ZWRPdmVybGF5c0Rp c3BhdGNoZWQoZmFsc2UpCiB7CisgICAgc3RhdGljIGJvb2wgaXNJbml0aWFsaXplZCA9IGZhbHNl OworICAgIGlmICghaXNJbml0aWFsaXplZCkgeworICAgICAgICBpc0luaXRpYWxpemVkID0gdHJ1 ZTsKKyAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkRldmljZUluZm86Omluc3RhbmNlKCk7 CisgICAgICAgIGRlZmF1bHRVc2VyQWdlbnQoKTsKKyAgICB9CiB9CiAKIFdlYlBhZ2U6OldlYlBh Z2UoV2ViUGFnZUNsaWVudCogY2xpZW50LCBjb25zdCBXZWJTdHJpbmcmIHBhZ2VHcm91cE5hbWUs IGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiByZWN0KQpAQCAtNDQ1LDYgKzQ1Myw3IEBAIHZvaWQg V2ViUGFnZVByaXZhdGU6OmluaXQoY29uc3QgV2ViU3RyaW5nJiBwYWdlR3JvdXBOYW1lKQogICAg IG1fcGFnZS0+c2V0Q3VzdG9tSFRNTFRva2VuaXplclRpbWVEZWxheSgwLjMpOwogCiAgICAgbV93 ZWJTZXR0aW5ncyA9IFdlYlNldHRpbmdzOjpjcmVhdGVGcm9tU3RhbmRhcmRTZXR0aW5ncygpOwor ICAgIG1fd2ViU2V0dGluZ3MtPnNldFVzZXJBZ2VudFN0cmluZyhkZWZhdWx0VXNlckFnZW50KCkp OwogCiAgICAgLy8gRklYTUU6IFdlIGV4cGxpY2l0bHkgY2FsbCBzZXREZWxlZ2F0ZSgpIGluc3Rl YWQgb2YgcGFzc2luZyBvdXJzZWxmIGluIGNyZWF0ZUZyb21TdGFuZGFyZFNldHRpbmdzKCkKICAg ICAvLyBzbyB0aGF0IHdlIG9ubHkgZ2V0IG9uZSBkaWRDaGFuZ2VTZXR0aW5ncygpIGNhbGxiYWNr IHdoZW4gd2Ugc2V0IHRoZSBwYWdlIGdyb3VwIG5hbWUuIFRoaXMgY2F1c2VzIHVzCkBAIC01NjEz LDUgKzU2MjIsMjQgQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6ZnJhbWVVbmxvYWRlZChjb25zdCBG cmFtZSogZnJhbWUpCiAgICAgbV9pblBhZ2VTZWFyY2hNYW5hZ2VyLT5mcmFtZVVubG9hZGVkKGZy YW1lKTsKIH0KIAorY29uc3QgU3RyaW5nJiBXZWJQYWdlUHJpdmF0ZTo6ZGVmYXVsdFVzZXJBZ2Vu dCgpCit7CisgICAgc3RhdGljIFN0cmluZyogZGVmYXVsdFVzZXJBZ2VudCA9IG5ldyBTdHJpbmc7 CisgICAgaWYgKGRlZmF1bHRVc2VyQWdlbnQtPmlzRW1wdHkoKSkgeworICAgICAgICBCbGFja0Jl cnJ5OjpQbGF0Zm9ybTo6RGV2aWNlSW5mbyogaW5mbyA9IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpE ZXZpY2VJbmZvOjppbnN0YW5jZSgpOworICAgICAgICBjaGFyIHVhQnVmZmVyWzI1Nl07CisgICAg ICAgIGludCB1YVNpemUgPSBzbnByaW50Zih1YUJ1ZmZlciwgMjU2LCAiTW96aWxsYS81LjAgKCVz KSBBcHBsZVdlYktpdC8lZC4lZCsgKEtIVE1MLCBsaWtlIEdlY2tvKSBWZXJzaW9uLyVzICVzU2Fm YXJpLyVkLiVkKyIsCisgICAgICAgICAgICBpbmZvLT5mYW1pbHkoKSwgV0VCS0lUX01BSk9SX1ZF UlNJT04sIFdFQktJVF9NSU5PUl9WRVJTSU9OLCBpbmZvLT5vc1ZlcnNpb24oKSwKKyAgICAgICAg ICAgIGluZm8tPmlzTW9iaWxlKCkgPyAiTW9iaWxlICIgOiAiIiwgV0VCS0lUX01BSk9SX1ZFUlNJ T04sIFdFQktJVF9NSU5PUl9WRVJTSU9OKTsKKworICAgICAgICBpZiAodWFTaXplIDw9IDAgfHwg dWFTaXplID49IDI1NikKKyAgICAgICAgICAgIEJMQUNLQkVSUllfQ1JBU0goKTsKKworICAgICAg ICBkZWZhdWx0VXNlckFnZW50LT5hcHBlbmQodWFCdWZmZXIpOworICAgIH0KKworICAgIHJldHVy biAqZGVmYXVsdFVzZXJBZ2VudDsKK30KKwogfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViUGFnZV9wLmgKaW5kZXggM2U3ZDRmOGMxM2E0ZjEyNjg2YjQ4NWRmNzJkODdmODAwZWI3 NTI4Yy4uODc0ZDBjODExYWVlNjE4MThjMzgyMDEwYWUyZDRjN2FmY2JmYWFkNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCkBAIC00MDAsNiArNDAwLDggQEAgcHVi bGljOgogCiAgICAgc3RhdGljIFdlYkNvcmU6OkludFNpemUgZGVmYXVsdE1heExheW91dFNpemUo KTsKIAorICAgIHN0YXRpYyBjb25zdCBTdHJpbmcmIGRlZmF1bHRVc2VyQWdlbnQoKTsKKwogICAg IFdlYlBhZ2UqIG1fd2ViUGFnZTsKICAgICBXZWJQYWdlQ2xpZW50KiBtX2NsaWVudDsKICAgICBX ZWJDb3JlOjpQYWdlKiBtX3BhZ2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi U2V0dGluZ3MuY3BwCmluZGV4IGY2MDY3MTc4YTgxYzkxZWY1YTIyN2E5NDc5YjgxOWU2YWQ1Mzlm OTAuLmMwZTI4ODEzMThmNDdmZjc0ZGZiMDAzYzU3ZGRiNGIwZjU4OGI5N2IgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCkBAIC0zOTYsMTcgKzM5Niwx MCBAQCB2b2lkIFdlYlNldHRpbmdzOjpzZXRTdGFuZGFyZEZvbnRGYW1pbHkoY29uc3QgY2hhciog c3RhbmRhcmRGb250RmFtaWx5KQogCiBXZWJTdHJpbmcgV2ViU2V0dGluZ3M6OnVzZXJBZ2VudFN0 cmluZygpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IElzIHRoaXMgdGhlIGJlc3QgcGxhY2UgZm9y IHRoaXMgYXNzZXJ0aW9uLiBXaHkgY2FuJ3Qgd2UganVzdCByZXR1cm4gYW4gZW1wdHkgc3RyaW5n Ci0gICAgLy8gYW5kIGxldCB0aGUgY2FsbGVyIGRlY2lkZSBob3cgdG8gaGFuZGxlIGl0PwotCi0g ICAgLy8gVGhlIGRlZmF1bHQgdXNlciBhZ2VudCBzdHJpbmcgaXMgZW1wdHkuIFdlIHJlbHkgdXBv biB0aGUgY2xpZW50IHRvIHNldCB0aGlzIGZvciB1cy4KLSAgICAvLyBXZSBjaGVjayB0aGlzIGJ5 IGFzc2VydGluZyBpZiB0aGUgY2xpZW50IGhhcyBub3QgZG9uZSBzbyBiZWZvcmUgdGhlIGZpcnN0 IHRpbWUgaXQgaXMgbmVlZGVkLgotICAgIFN0cmluZyB1c2VyQWdlbnRTdHJpbmcgPSBtX3ByaXZh dGUtPmdldFN0cmluZyhCbGFja0JlcnJ5VXNlckFnZW50U3RyaW5nKTsKLSAgICBBU1NFUlQoIXVz ZXJBZ2VudFN0cmluZy5pc0VtcHR5KCkpOwotICAgIHJldHVybiB1c2VyQWdlbnRTdHJpbmc7Cisg ICAgcmV0dXJuIG1fcHJpdmF0ZS0+Z2V0U3RyaW5nKEJsYWNrQmVycnlVc2VyQWdlbnRTdHJpbmcp OwogfQogCi12b2lkIFdlYlNldHRpbmdzOjpzZXRVc2VyQWdlbnRTdHJpbmcoY29uc3QgY2hhciog dXNlckFnZW50U3RyaW5nKQordm9pZCBXZWJTZXR0aW5nczo6c2V0VXNlckFnZW50U3RyaW5nKGNv bnN0IFdlYlN0cmluZyYgdXNlckFnZW50U3RyaW5nKQogewogICAgIG1fcHJpdmF0ZS0+c2V0U3Ry aW5nKEJsYWNrQmVycnlVc2VyQWdlbnRTdHJpbmcsIHVzZXJBZ2VudFN0cmluZyk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmggYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmgKaW5kZXggNDAzZThmNGEyYmMy ODU0ZmViNTU1M2JjOWU0N2M0MGFiMmQ4ZGIyNS4uNzk2NmU1Zjc3ZjBhYjk0ODVhMmM4ZWNhODQz NzVmZjAzZWQ5ZWEwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGlu Z3MuaApAQCAtOTUsNyArOTUsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBkb3dubG9hZGFibGVCaW5h cnlGb250c0VuYWJsZWQoKSBjb25zdDsKIAogICAgIFdlYlN0cmluZyB1c2VyQWdlbnRTdHJpbmco KSBjb25zdDsKLSAgICB2b2lkIHNldFVzZXJBZ2VudFN0cmluZyhjb25zdCBjaGFyKik7CisgICAg dm9pZCBzZXRVc2VyQWdlbnRTdHJpbmcoY29uc3QgV2ViU3RyaW5nJik7CiAKICAgICBXZWJTdHJp bmcgZGVmYXVsdFRleHRFbmNvZGluZ05hbWUoKSBjb25zdDsKICAgICB2b2lkIHNldERlZmF1bHRU ZXh0RW5jb2RpbmdOYW1lKGNvbnN0IGNoYXIqKTsK 132603 2012-03-19 10:26:53 -0700 2012-03-19 11:36:42 -0700 Updated patch, resolved conflicts in WebPage_p.h 0001-2012-03-14-Mike-Lattanzio-mlattanzio-rim.com.patch text/plain 7599 mlattanzio RnJvbSA3NWE1Yzk1YjM0ZjQ1MTM3Yjc1OWM1OGI2NTlhYThiZWQwZGU4M2E3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIExhdHRhbnppbyA8bWxhdHRhbnppb0ByaW0uY29tPgpE YXRlOiBXZWQsIDE0IE1hciAyMDEyIDExOjM5OjIxIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gMjAx Mi0wMy0xNCAgTWlrZSBMYXR0YW56aW8gIDxtbGF0dGFuemlvQHJpbS5jb20+CgogICAgICAgIEdl bmVyYXRlIHRoZSBVc2VyQWdlbnQgbGF6aWx5LCB1c2luZyBpdCBhcyB0aGUgZGVmYXVsdCBmb3Ig dGhlCiAgICAgICAgV2ViU2V0dGluZ3Mgb2JqZWN0LiBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6RGV2 aWNlSW5mbyBpcyB1c2VkCiAgICAgICAgdG8gZW5zdXJlIHRoZSBpbmZvcm1hdGlvbiBpcyBhY2N1 cmF0ZSB0byB0aGUgc3BlY2lmaWMgZGV2aWNlLgoKICAgICAgICBSZW1vdmUgdGhlICFpc0VtcHR5 KCkgYXNzZXJ0IHdoZW4gZmV0Y2hpbmcgdGhlIFVBIGZyb20gdGhlCiAgICAgICAgV2ViU2V0dGlu Z3Mgb2JqZWN0LCBhcyBpdCB3aWxsIG5vdyBhbHdheXMgYmUgcHJvcGVybHkgaW5pdGlhbGl6ZWQu CgogICAgICAgIEFkZCBhIHN0YXRpYyBpbml0aWFsaXplciBibG9jayB0byBlbnN1cmUgZGVmYXVs dFVzZXJBZ2VudCgpIGlzCiAgICAgICAgdGhyZWFkLXNhZmUgZnJvbSB0aGF0IG1vbWVudCBvbndh cmQuCgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICAqIEFwaS9X ZWJQYWdlLmNwcDoKICAgICAgICAoV2ViS2l0KToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpXZWJQYWdlUHJpdmF0ZTo6aW5pdCk6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2Vi UGFnZVByaXZhdGU6OmRlZmF1bHRVc2VyQWdlbnQpOgogICAgICAgICogQXBpL1dlYlBhZ2VfcC5o OgogICAgICAgIChXZWJQYWdlUHJpdmF0ZSk6CiAgICAgICAgKiBBcGkvV2ViU2V0dGluZ3MuY3Bw OgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlNldHRpbmdzOjpzZXRVc2VyQWdlbnRT dHJpbmcpOgogICAgICAgICogQXBpL1dlYlNldHRpbmdzLmg6Ci0tLQogU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCAgICAgfCAgIDI4ICsrKysrKysrKysrKysrKysrKysr KysrKysrCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oICAgICB8ICAg IDEgKwogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTZXR0aW5ncy5jcHAgfCAgIDEx ICstLS0tLS0tLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTZXR0aW5ncy5oICAg fCAgICAyICstCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nICAgICAgICAgICB8 ICAgMjcgKysrKysrKysrKysrKysrKysrKysrKysrKwogNSBmaWxlcyBjaGFuZ2VkLCA1OSBpbnNl cnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJQYWdlLmNwcAppbmRleCA3ZTdmZGIwLi5jMmVmMmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTEwMiw2ICsxMDIsNyBAQAogI2lmIEVOQUJMRShXRUJE T00pCiAjaW5jbHVkZSAiV2ViRE9NRG9jdW1lbnQuaCIKICNlbmRpZgorI2luY2x1ZGUgIldlYktp dFZlcnNpb24uaCIKICNpbmNsdWRlICJXZWJQYWdlQ2xpZW50LmgiCiAjaW5jbHVkZSAiV2ViU29j a2V0LmgiCiAjaW5jbHVkZSAibnBhcGkuaCIKQEAgLTEyMiw2ICsxMjMsNyBAQAogI2luY2x1ZGUg IldlYlBhZ2VDb21wb3NpdG9yX3AuaCIKICNlbmRpZgogCisjaW5jbHVkZSA8QmxhY2tCZXJyeVBs YXRmb3JtRGV2aWNlSW5mby5oPgogI2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9ybUV4ZWN1dGFi bGVNZXNzYWdlLmg+CiAjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtSVRQb2xpY3kuaD4KICNp bmNsdWRlIDxCbGFja0JlcnJ5UGxhdGZvcm1LZXlib2FyZEV2ZW50Lmg+CkBAIC0zMzUsNiArMzM3 LDEyIEBAIFdlYlBhZ2VQcml2YXRlOjpXZWJQYWdlUHJpdmF0ZShXZWJQYWdlKiB3ZWJQYWdlLCBX ZWJQYWdlQ2xpZW50KiBjbGllbnQsIGNvbnN0IEluCiAgICAgLCBtX2hhc0luUmVnaW9uU2Nyb2xs YWJsZUFyZWFzKGZhbHNlKQogICAgICwgbV91cGRhdGVEZWxlZ2F0ZWRPdmVybGF5c0Rpc3BhdGNo ZWQoZmFsc2UpCiB7CisgICAgc3RhdGljIGJvb2wgaXNJbml0aWFsaXplZCA9IGZhbHNlOworICAg IGlmICghaXNJbml0aWFsaXplZCkgeworICAgICAgICBpc0luaXRpYWxpemVkID0gdHJ1ZTsKKyAg ICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkRldmljZUluZm86Omluc3RhbmNlKCk7CisgICAg ICAgIGRlZmF1bHRVc2VyQWdlbnQoKTsKKyAgICB9CiB9CiAKIFdlYlBhZ2U6OldlYlBhZ2UoV2Vi UGFnZUNsaWVudCogY2xpZW50LCBjb25zdCBXZWJTdHJpbmcmIHBhZ2VHcm91cE5hbWUsIGNvbnN0 IFBsYXRmb3JtOjpJbnRSZWN0JiByZWN0KQpAQCAtNDQ3LDYgKzQ1NSw3IEBAIHZvaWQgV2ViUGFn ZVByaXZhdGU6OmluaXQoY29uc3QgV2ViU3RyaW5nJiBwYWdlR3JvdXBOYW1lKQogICAgIG1fcGFn ZS0+c2V0Q3VzdG9tSFRNTFRva2VuaXplclRpbWVEZWxheSgwLjMpOwogCiAgICAgbV93ZWJTZXR0 aW5ncyA9IFdlYlNldHRpbmdzOjpjcmVhdGVGcm9tU3RhbmRhcmRTZXR0aW5ncygpOworICAgIG1f d2ViU2V0dGluZ3MtPnNldFVzZXJBZ2VudFN0cmluZyhkZWZhdWx0VXNlckFnZW50KCkpOwogCiAg ICAgLy8gRklYTUU6IFdlIGV4cGxpY2l0bHkgY2FsbCBzZXREZWxlZ2F0ZSgpIGluc3RlYWQgb2Yg cGFzc2luZyBvdXJzZWxmIGluIGNyZWF0ZUZyb21TdGFuZGFyZFNldHRpbmdzKCkKICAgICAvLyBz byB0aGF0IHdlIG9ubHkgZ2V0IG9uZSBkaWRDaGFuZ2VTZXR0aW5ncygpIGNhbGxiYWNrIHdoZW4g d2Ugc2V0IHRoZSBwYWdlIGdyb3VwIG5hbWUuIFRoaXMgY2F1c2VzIHVzCkBAIC01NjY3LDUgKzU2 NzYsMjQgQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6ZnJhbWVVbmxvYWRlZChjb25zdCBGcmFtZSog ZnJhbWUpCiAgICAgbV9pblBhZ2VTZWFyY2hNYW5hZ2VyLT5mcmFtZVVubG9hZGVkKGZyYW1lKTsK IH0KIAorY29uc3QgU3RyaW5nJiBXZWJQYWdlUHJpdmF0ZTo6ZGVmYXVsdFVzZXJBZ2VudCgpCit7 CisgICAgc3RhdGljIFN0cmluZyogZGVmYXVsdFVzZXJBZ2VudCA9IG5ldyBTdHJpbmc7CisgICAg aWYgKGRlZmF1bHRVc2VyQWdlbnQtPmlzRW1wdHkoKSkgeworICAgICAgICBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6RGV2aWNlSW5mbyogaW5mbyA9IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpEZXZpY2VJ bmZvOjppbnN0YW5jZSgpOworICAgICAgICBjaGFyIHVhQnVmZmVyWzI1Nl07CisgICAgICAgIGlu dCB1YVNpemUgPSBzbnByaW50Zih1YUJ1ZmZlciwgMjU2LCAiTW96aWxsYS81LjAgKCVzKSBBcHBs ZVdlYktpdC8lZC4lZCsgKEtIVE1MLCBsaWtlIEdlY2tvKSBWZXJzaW9uLyVzICVzU2FmYXJpLyVk LiVkKyIsCisgICAgICAgICAgICBpbmZvLT5mYW1pbHkoKSwgV0VCS0lUX01BSk9SX1ZFUlNJT04s IFdFQktJVF9NSU5PUl9WRVJTSU9OLCBpbmZvLT5vc1ZlcnNpb24oKSwKKyAgICAgICAgICAgIGlu Zm8tPmlzTW9iaWxlKCkgPyAiTW9iaWxlICIgOiAiIiwgV0VCS0lUX01BSk9SX1ZFUlNJT04sIFdF QktJVF9NSU5PUl9WRVJTSU9OKTsKKworICAgICAgICBpZiAodWFTaXplIDw9IDAgfHwgdWFTaXpl ID49IDI1NikKKyAgICAgICAgICAgIEJMQUNLQkVSUllfQ1JBU0goKTsKKworICAgICAgICBkZWZh dWx0VXNlckFnZW50LT5hcHBlbmQodWFCdWZmZXIpOworICAgIH0KKworICAgIHJldHVybiAqZGVm YXVsdFVzZXJBZ2VudDsKK30KKwogfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9XZWJQYWdlX3AuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi UGFnZV9wLmgKaW5kZXggMDA2YTM4NC4uZDE1NjUzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2VfcC5oCkBAIC0zOTksNiArMzk5LDcgQEAgcHVibGljOgogICAgIHN0YXRp YyBXZWJDb3JlOjpSZW5kZXJMYXllciogZW5jbG9zaW5nRml4ZWRQb3NpdGlvbmVkQW5jZXN0b3JP clNlbGZJZkZpeGVkUG9zaXRpb25lZChXZWJDb3JlOjpSZW5kZXJMYXllciopOwogCiAgICAgc3Rh dGljIFdlYkNvcmU6OkludFNpemUgZGVmYXVsdE1heExheW91dFNpemUoKTsKKyAgICBzdGF0aWMg Y29uc3QgU3RyaW5nJiBkZWZhdWx0VXNlckFnZW50KCk7CiAKICAgICB2b2lkIHNldFZpc2libGUo Ym9vbCk7CiAjaWYgRU5BQkxFKFBBR0VfVklTSUJJTElUWV9BUEkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCmluZGV4IGY2MDY3MTcuLmMwZTI4ODEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCkBAIC0zOTYs MTcgKzM5NiwxMCBAQCB2b2lkIFdlYlNldHRpbmdzOjpzZXRTdGFuZGFyZEZvbnRGYW1pbHkoY29u c3QgY2hhciogc3RhbmRhcmRGb250RmFtaWx5KQogCiBXZWJTdHJpbmcgV2ViU2V0dGluZ3M6OnVz ZXJBZ2VudFN0cmluZygpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IElzIHRoaXMgdGhlIGJlc3Qg cGxhY2UgZm9yIHRoaXMgYXNzZXJ0aW9uLiBXaHkgY2FuJ3Qgd2UganVzdCByZXR1cm4gYW4gZW1w dHkgc3RyaW5nCi0gICAgLy8gYW5kIGxldCB0aGUgY2FsbGVyIGRlY2lkZSBob3cgdG8gaGFuZGxl IGl0PwotCi0gICAgLy8gVGhlIGRlZmF1bHQgdXNlciBhZ2VudCBzdHJpbmcgaXMgZW1wdHkuIFdl IHJlbHkgdXBvbiB0aGUgY2xpZW50IHRvIHNldCB0aGlzIGZvciB1cy4KLSAgICAvLyBXZSBjaGVj ayB0aGlzIGJ5IGFzc2VydGluZyBpZiB0aGUgY2xpZW50IGhhcyBub3QgZG9uZSBzbyBiZWZvcmUg dGhlIGZpcnN0IHRpbWUgaXQgaXMgbmVlZGVkLgotICAgIFN0cmluZyB1c2VyQWdlbnRTdHJpbmcg PSBtX3ByaXZhdGUtPmdldFN0cmluZyhCbGFja0JlcnJ5VXNlckFnZW50U3RyaW5nKTsKLSAgICBB U1NFUlQoIXVzZXJBZ2VudFN0cmluZy5pc0VtcHR5KCkpOwotICAgIHJldHVybiB1c2VyQWdlbnRT dHJpbmc7CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+Z2V0U3RyaW5nKEJsYWNrQmVycnlVc2VyQWdl bnRTdHJpbmcpOwogfQogCi12b2lkIFdlYlNldHRpbmdzOjpzZXRVc2VyQWdlbnRTdHJpbmcoY29u c3QgY2hhciogdXNlckFnZW50U3RyaW5nKQordm9pZCBXZWJTZXR0aW5nczo6c2V0VXNlckFnZW50 U3RyaW5nKGNvbnN0IFdlYlN0cmluZyYgdXNlckFnZW50U3RyaW5nKQogewogICAgIG1fcHJpdmF0 ZS0+c2V0U3RyaW5nKEJsYWNrQmVycnlVc2VyQWdlbnRTdHJpbmcsIHVzZXJBZ2VudFN0cmluZyk7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdz LmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmgKaW5kZXggNDAz ZThmNC4uNzk2NmU1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGlu Z3MuaApAQCAtOTUsNyArOTUsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBkb3dubG9hZGFibGVCaW5h cnlGb250c0VuYWJsZWQoKSBjb25zdDsKIAogICAgIFdlYlN0cmluZyB1c2VyQWdlbnRTdHJpbmco KSBjb25zdDsKLSAgICB2b2lkIHNldFVzZXJBZ2VudFN0cmluZyhjb25zdCBjaGFyKik7CisgICAg dm9pZCBzZXRVc2VyQWdlbnRTdHJpbmcoY29uc3QgV2ViU3RyaW5nJik7CiAKICAgICBXZWJTdHJp bmcgZGVmYXVsdFRleHRFbmNvZGluZ05hbWUoKSBjb25zdDsKICAgICB2b2lkIHNldERlZmF1bHRU ZXh0RW5jb2RpbmdOYW1lKGNvbnN0IGNoYXIqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9n CmluZGV4IGRlMzdiZWYuLmY3NjQ2MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpA QCAtMSwzICsxLDMwIEBACisyMDEyLTAzLTE5ICBNaWtlIExhdHRhbnppbyAgPG1sYXR0YW56aW9A cmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gVXNlIEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpEZXZpY2VJbmZvIHRvIGdlbmVyYXRlIFVzZXJBZ2VudAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODEyNjkKKworICAgICAgICBHZW5lcmF0ZSB0aGUg VXNlckFnZW50IGxhemlseSwgdXNpbmcgaXQgYXMgdGhlIGRlZmF1bHQgZm9yIHRoZQorICAgICAg ICBXZWJTZXR0aW5ncyBvYmplY3QuIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpEZXZpY2VJbmZvIGlz IHVzZWQKKyAgICAgICAgdG8gZW5zdXJlIHRoZSBpbmZvcm1hdGlvbiBpcyBhY2N1cmF0ZSB0byB0 aGUgc3BlY2lmaWMgZGV2aWNlLgorCisgICAgICAgIFJlbW92ZSB0aGUgIWlzRW1wdHkoKSBhc3Nl cnQgd2hlbiBmZXRjaGluZyB0aGUgVUEgZnJvbSB0aGUKKyAgICAgICAgV2ViU2V0dGluZ3Mgb2Jq ZWN0LCBhcyBpdCB3aWxsIG5vdyBhbHdheXMgYmUgcHJvcGVybHkgaW5pdGlhbGl6ZWQuCisKKyAg ICAgICAgQWRkIGEgc3RhdGljIGluaXRpYWxpemVyIGJsb2NrIHRvIGVuc3VyZSBkZWZhdWx0VXNl ckFnZW50KCkgaXMKKyAgICAgICAgdGhyZWFkLXNhZmUgZnJvbSB0aGF0IG1vbWVudCBvbndhcmQu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBBcGkv V2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpXZWJQYWdlUHJpdmF0ZTo6aW5pdCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OldlYlBhZ2VQcml2YXRlOjpkZWZhdWx0VXNlckFnZW50KToKKyAgICAgICAgKiBBcGkvV2ViUGFn ZV9wLmg6CisgICAgICAgIChXZWJQYWdlUHJpdmF0ZSk6CisgICAgICAgICogQXBpL1dlYlNldHRp bmdzLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViU2V0dGluZ3M6OnNldFVz ZXJBZ2VudFN0cmluZyk6CisgICAgICAgICogQXBpL1dlYlNldHRpbmdzLmg6CisKIDIwMTItMDMt MTkgIEFydmlkIE5pbHNzb24gIDxhbmlsc3NvbkByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0Jl cnJ5XSBSZW1vdmUgb2Jzb2xldGUgb3B0aW1pemF0aW9uIGluIFdlYlBhZ2VDb21wb3NpdG9yUHJp dmF0ZQotLSAKMS43LjUuNAoK