73036 2011-11-23 11:51:22 -0800 Add simple implementation for web intents chromium API data classes. 2011-12-22 14:09:54 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 75123 0 gbillock webkit-unassigned fishd jhawkins webkit.review.bot oldest_to_newest 508261 0 gbillock 2011-11-23 11:51:22 -0800 Add simple implementation for web intents chromium API data classes. 508262 1 116388 gbillock 2011-11-23 11:51:54 -0800 Created attachment 116388 Patch 508265 2 webkit.review.bot 2011-11-23 11:54:38 -0800 Please wait for approval from fishd@chromium.org before submitting because this patch contains changes to the Chromium public API. 508285 3 116388 fishd 2011-11-23 12:14:20 -0800 Comment on attachment 116388 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116388&action=review > Source/WebKit/chromium/public/WebIntent.h:44 > + WebIntent(const WebString& action, const WebString& type, const WebString& data, int identifier); public, non-inline methods need to be annotated with WEBKIT_EXPORT or else you will break the shared library build. also, please note that we normally do not export constructors. instead, we write initialize() methods, and export those. the constructor can call the initialize() method. in this case, though... I wonder... will there be no WebCore::Intent class? if there is such a class, maybe you want the constructor to take that instead? the same issue applies to WebIntentServiceInfo. 508328 4 116388 gbillock 2011-11-23 13:17:18 -0800 Comment on attachment 116388 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116388&action=review >> Source/WebKit/chromium/public/WebIntent.h:44 >> + WebIntent(const WebString& action, const WebString& type, const WebString& data, int identifier); > > public, non-inline methods need to be annotated with WEBKIT_EXPORT or else you will break the shared library build. > > also, please note that we normally do not export constructors. instead, we write initialize() methods, and export > those. the constructor can call the initialize() method. > > in this case, though... I wonder... will there be no WebCore::Intent class? if there is such a class, maybe you > want the constructor to take that instead? > > the same issue applies to WebIntentServiceInfo. Right. I didn't export the constructor for that reason. Will this break the shared lib? There will be a WebCore::Intent class; I have that constructor in a separate CL which I'm going to send along soon. For now I just wanted some simple method implementations so I can check in the adjustments to our Chromium code that will use these accessors. I could take the constructors out completely. Shall I just do that? 508394 5 fishd 2011-11-23 14:19:55 -0800 (In reply to comment #4) > Right. I didn't export the constructor for that reason. Will this break the shared lib? Ah, OK... since the class is only ever created by WebKit, then you should hide this constructor behind #if WEBKIT_IMPLEMENTATION. That way we can avoid the possibility of someone trying to construct it outside of WebKit. > There will be a WebCore::Intent class; I have that constructor in a separate CL which I'm going to send along soon. For now I just wanted some simple method implementations so I can check in the adjustments to our Chromium code that will use these accessors. I could take the constructors out completely. Shall I just do that? I guess you can initialize these classes by just calling the setFoo methods, right? 508502 6 gbillock 2011-11-23 16:48:50 -0800 (In reply to comment #5) > (In reply to comment #4) > > Right. I didn't export the constructor for that reason. Will this break the shared lib? > > Ah, OK... since the class is only ever created by WebKit, then you should hide this constructor behind #if WEBKIT_IMPLEMENTATION. That way we can avoid the possibility of someone trying to construct it outside of WebKit. Done. > > > > There will be a WebCore::Intent class; I have that constructor in a separate CL which I'm going to send along soon. For now I just wanted some simple method implementations so I can check in the adjustments to our Chromium code that will use these accessors. I could take the constructors out completely. Shall I just do that? > > I guess you can initialize these classes by just calling the setFoo methods, right? Sounds good. I just replaced them with empty constructors; I'll adapt to that in the other CLs when I merge. 508503 7 116455 gbillock 2011-11-23 16:52:07 -0800 Created attachment 116455 Patch 508646 8 116455 webkit.review.bot 2011-11-23 23:46:22 -0800 Comment on attachment 116455 Patch Clearing flags on attachment: 116455 Committed r101123: <http://trac.webkit.org/changeset/101123> 508647 9 webkit.review.bot 2011-11-23 23:46:27 -0800 All reviewed patches have been landed. Closing bug. 116388 2011-11-23 11:51:54 -0800 2011-11-23 16:52:03 -0800 Patch bug-73036-20111123115153.patch text/plain 11049 gbillock U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDQzODNlMjhmN2VlMGU4YmYwNTcwMjVlZGMwZDRiZWU1NGNmZjE2OWMuLjRlMDUxY2VmZGQ4YWRi NDkyNjkxOTg5NTA0ZGQxOTFlMTg3Nzk0YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMzYgQEAKKzIwMTEtMTEtMjMgIEdyZWcgQmlsbG9jayAgPGdiaWxsb2NrQGdvb2ds ZS5jb20+CisKKyAgICAgICAgQWRkIHNpbXBsZSBpbXBsZW1lbnRhdGlvbiBmb3Igd2ViIGludGVu dHMgY2hyb21pdW0gQVBJIGRhdGEgY2xhc3Nlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTczMDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1YmxpYy9XZWJJ bnRlbnQuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViSW50ZW50U2VydmljZUluZm8uaDoKKyAgICAg ICAgKiBzcmMvV2ViSW50ZW50LmNwcDogQ29waWVkIGZyb20gU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViSW50ZW50LmguCisgICAgICAgIChXZWJLaXQ6OldlYkludGVudDo6V2ViSW50 ZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViSW50ZW50OjphY3Rpb24pOgorICAgICAgICAoV2Vi S2l0OjpXZWJJbnRlbnQ6OnNldEFjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYkludGVudDo6 dHlwZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkludGVudDo6c2V0VHlwZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYkludGVudDo6ZGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYkludGVudDo6c2V0 RGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYkludGVudDo6aWRlbnRpZmllcik6CisgICAgICAg IChXZWJLaXQ6OldlYkludGVudDo6c2V0SWRlbnRpZmllcik6CisgICAgICAgICogc3JjL1dlYklu dGVudFNlcnZpY2VJbmZvLmNwcDogQ29waWVkIGZyb20gU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViSW50ZW50U2VydmljZUluZm8uaC4KKyAgICAgICAgKFdlYktpdDo6V2ViSW50ZW50 U2VydmljZUluZm86OldlYkludGVudFNlcnZpY2VJbmZvKToKKyAgICAgICAgKFdlYktpdDo6V2Vi SW50ZW50U2VydmljZUluZm86OnVybCk6CisgICAgICAgIChXZWJLaXQ6OldlYkludGVudFNlcnZp Y2VJbmZvOjpzZXRVUkwpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnRlbnRTZXJ2aWNlSW5mbzo6 dGl0bGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnRlbnRTZXJ2aWNlSW5mbzo6c2V0VGl0bGUp OgorICAgICAgICAoV2ViS2l0OjpXZWJJbnRlbnRTZXJ2aWNlSW5mbzo6YWN0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6V2ViSW50ZW50U2VydmljZUluZm86OnNldEFjdGlvbik6CisgICAgICAgIChX ZWJLaXQ6OldlYkludGVudFNlcnZpY2VJbmZvOjp0eXBlKToKKyAgICAgICAgKFdlYktpdDo6V2Vi SW50ZW50U2VydmljZUluZm86OnNldFR5cGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnRlbnRT ZXJ2aWNlSW5mbzo6ZGlzcG9zaXRpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnRlbnRTZXJ2 aWNlSW5mbzo6c2V0RGlzcG9zaXRpb24pOgorCiAyMDExLTExLTIyICBLZW5uZXRoIFJ1c3NlbGwg IDxrYnJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIFN1cHBvcnQgQ29yZSBBbmlt YXRpb24gcGx1Z2lucyBpbiBjb21wb3NpdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL1dlYktpdC5neXAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKaW5k ZXggYWMzZTJjZjBkNTMwMTY0YTJiZjhlYzQ2MDBmNzhlYzkzOGRiM2MxYS4uZjAzMmNhMWI2ZDQ3 OGI5M2U3YWJlMTVkNGJlODY1Zjg2YTA1YzlkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9XZWJLaXQuZ3lwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5 cApAQCAtNTYxLDYgKzU2MSw4IEBACiAgICAgICAgICAgICAgICAgJ3NyYy9XZWJJbnB1dEV2ZW50 LmNwcCcsCiAgICAgICAgICAgICAgICAgJ3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHAn LAogICAgICAgICAgICAgICAgICdzcmMvV2ViSW5wdXRFdmVudENvbnZlcnNpb24uaCcsCisgICAg ICAgICAgICAgICAgJ3NyYy9XZWJJbnRlbnQuY3BwJywKKyAgICAgICAgICAgICAgICAnc3JjL1dl YkludGVudFNlcnZpY2VJbmZvLmNwcCcsCiAgICAgICAgICAgICAgICAgJ3NyYy9XZWJLaXQuY3Bw JywKICAgICAgICAgICAgICAgICAnc3JjL1dlYkxhYmVsRWxlbWVudC5jcHAnLAogICAgICAgICAg ICAgICAgICdzcmMvV2ViTGF5ZXIuY3BwJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkludGVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViSW50ZW50LmgKaW5kZXggZjBlY2FjMjNiZDNiMGI1M2VhMzQyYzljOTJjOWJhNTFhOTgyODUy Yi4uMjcxNTJiYTA1MjQ2MzgxMTBmZDRjOTAyNzExMTkxNjA4YmQ1Njk4YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSW50ZW50LmgKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSW50ZW50LmgKQEAgLTMxLDE1ICszMSwxNyBAQAogI2lm bmRlZiBXZWJJbnRlbnRfaAogI2RlZmluZSBXZWJJbnRlbnRfaAogCi1uYW1lc3BhY2UgV2ViS2l0 IHsKKyNpbmNsdWRlICJXZWJDb21tb24uaCIKKyNpbmNsdWRlICJXZWJTdHJpbmcuaCIKIAotY2xh c3MgV2ViU3RyaW5nOworbmFtZXNwYWNlIFdlYktpdCB7CiAKIC8vIEhvbGRzIGRhdGEgcGFzc2Vk IHRocm91Z2ggYSBXZWIgSW50ZW50cyBpbnZvY2F0aW9uIGNhbGwgZnJvbSB0aGUgSmF2YXNjcmlw dAogLy8gSW50ZW50IG9iamVjdC4KIC8vIFNlZSBzcGVjIGF0IGh0dHA6Ly93d3cuY2hyb21pdW0u b3JnL2RldmVsb3BlcnMvZGVzaWduLWRvY3VtZW50cy93ZWJpbnRlbnRzYXBpCiBjbGFzcyBXZWJJ bnRlbnQgewogcHVibGljOgorICAgIFdlYkludGVudChjb25zdCBXZWJTdHJpbmcmIGFjdGlvbiwg Y29uc3QgV2ViU3RyaW5nJiB0eXBlLCBjb25zdCBXZWJTdHJpbmcmIGRhdGEsIGludCBpZGVudGlm aWVyKTsKICAgICB+V2ViSW50ZW50KCkgeyB9CiAKICAgICBXRUJLSVRfRVhQT1JUIFdlYlN0cmlu ZyBhY3Rpb24oKSBjb25zdDsKQEAgLTUzLDYgKzU1LDEyIEBAIHB1YmxpYzoKIAogICAgIFdFQktJ VF9FWFBPUlQgaW50IGlkZW50aWZpZXIoKSBjb25zdDsKICAgICBXRUJLSVRfRVhQT1JUIHZvaWQg c2V0SWRlbnRpZmllcihpbnQpOworCitwcml2YXRlOgorICAgIFdlYlN0cmluZyBtX2FjdGlvbjsK KyAgICBXZWJTdHJpbmcgbV90eXBlOworICAgIFdlYlN0cmluZyBtX2RhdGE7CisgICAgaW50IG1f aWRlbnRpZmllcjsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSW50ZW50U2VydmljZUluZm8uaCBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkludGVudFNlcnZpY2VJbmZvLmgKaW5kZXggYzhj MTk2OWI4MTdmMDJkYTFkZjRkMjU0M2E3NDliMGQyNDQxMzE0OS4uNDA0NTc5NTg3MTY1NDM1MzBi ZDgwOWIwYjc4NWRjNzk4NWRiZTVjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViSW50ZW50U2VydmljZUluZm8uaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJJbnRlbnRTZXJ2aWNlSW5mby5oCkBAIC0zMSwxNSArMzEsMTggQEAKICNp Zm5kZWYgV2ViSW50ZW50U2VydmljZUluZm9faAogI2RlZmluZSBXZWJJbnRlbnRTZXJ2aWNlSW5m b19oCiAKLW5hbWVzcGFjZSBXZWJLaXQgeworI2luY2x1ZGUgIldlYkNvbW1vbi5oIgorI2luY2x1 ZGUgIldlYlN0cmluZy5oIgorI2luY2x1ZGUgIldlYlVSTC5oIgogCi1jbGFzcyBXZWJTdHJpbmc7 Ci1jbGFzcyBXZWJVUkw7CituYW1lc3BhY2UgV2ViS2l0IHsKIAogLy8gSG9sZHMgZGF0YSB1c2Vk IHRvIGluaXRpYWxpemUgYSBXZWIgSW50ZW50cyBzZXJ2aWNlIChoYW5kbGVyKS4KIC8vIFNlZSBz cGVjIGF0IGh0dHA6Ly93d3cuY2hyb21pdW0ub3JnL2RldmVsb3BlcnMvZGVzaWduLWRvY3VtZW50 cy93ZWJpbnRlbnRzYXBpCiBjbGFzcyBXZWJJbnRlbnRTZXJ2aWNlSW5mbyB7CiBwdWJsaWM6Cisg ICAgV2ViSW50ZW50U2VydmljZUluZm8oY29uc3QgV2ViU3RyaW5nJiBhY3Rpb24sIGNvbnN0IFdl YlN0cmluZyYgdHlwZSwgY29uc3QgV2ViVVJMJiBocmVmLAorICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IFdlYlN0cmluZyYgdGl0bGUsIGNvbnN0IFdlYlN0cmluZyYgZGlzcG9zaXRpb24p OwogICAgIH5XZWJJbnRlbnRTZXJ2aWNlSW5mbygpIHsgfQogCiAgICAgLy8gVGhlIGxvY2F0aW9u IG9mIHRoZSBoYW5kbGVyIHBhZ2UgcmVnaXN0ZXJlZCBieSB0aGUgc2VydmljZS4KQEAgLTY0LDYg KzY3LDEzIEBAIHB1YmxpYzoKICAgICAvLyBjb250ZXh0ICh0aGUgZGVmYXVsdCkuCiAgICAgV0VC S0lUX0VYUE9SVCBXZWJTdHJpbmcgZGlzcG9zaXRpb24oKSBjb25zdDsKICAgICBXRUJLSVRfRVhQ T1JUIHZvaWQgc2V0RGlzcG9zaXRpb24oY29uc3QgV2ViU3RyaW5nJik7CisKK3ByaXZhdGU6Cisg ICAgV2ViU3RyaW5nIG1fYWN0aW9uOworICAgIFdlYlN0cmluZyBtX3R5cGU7CisgICAgV2ViVVJM IG1faHJlZjsKKyAgICBXZWJTdHJpbmcgbV90aXRsZTsKKyAgICBXZWJTdHJpbmcgbV9kaXNwb3Np dGlvbjsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViSW50ZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYkludGVudC5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzVkYTE0NWNlZmQ1MTY2YjU1YzQ3MzVlYzZi ZjAyNGVlMTVkMzdjNQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYkludGVudC5jcHAKQEAgLTAsMCArMSw4MiBAQAorLyoKKyAqIENvcHlyaWdodCAoQykg MjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zIGFyZQorICogbWV0OgorICoKKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisg KiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlCisgKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisgKiBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Ig b3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisgKiBkaXN0cmlidXRpb24uCisgKiAg ICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRz CisgKiBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1 Y3RzIGRlcml2ZWQgZnJvbQorICogdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9y IHdyaXR0ZW4gcGVybWlzc2lvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZ IFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisgKiAiQVMgSVMiIEFORCBB TlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorICog TElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SCisgKiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4g Tk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJF IExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisgKiBTUEVDSUFM LCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9U CisgKiBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJ Q0VTOyBMT1NTIE9GIFVTRSwKKyAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVS UlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZIE9GIExJQUJJTElU WSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElO Q0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBP RiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNp bmNsdWRlICJXZWJJbnRlbnQuaCIKKworbmFtZXNwYWNlIFdlYktpdCB7CisKK1dlYkludGVudDo6 V2ViSW50ZW50KGNvbnN0IFdlYlN0cmluZyYgYWN0aW9uLCBjb25zdCBXZWJTdHJpbmcmIHR5cGUs IGNvbnN0IFdlYlN0cmluZyYgZGF0YSwgaW50IGlkZW50aWZpZXIpCisgICAgOiBtX2FjdGlvbihh Y3Rpb24pLAorICAgICAgbV90eXBlKHR5cGUpLAorICAgICAgbV9kYXRhKGRhdGEpLAorICAgICAg bV9pZGVudGlmaWVyKGlkZW50aWZpZXIpIHsgfQorCitXZWJTdHJpbmcgV2ViSW50ZW50OjphY3Rp b24oKSBjb25zdAoreworICAgIHJldHVybiBtX2FjdGlvbjsKK30KKwordm9pZCBXZWJJbnRlbnQ6 OnNldEFjdGlvbihjb25zdCBXZWJTdHJpbmcmIGFjdGlvbikKK3sKKyAgICBtX2FjdGlvbiA9IGFj dGlvbjsKK30KKworV2ViU3RyaW5nIFdlYkludGVudDo6dHlwZSgpIGNvbnN0Cit7CisgICAgcmV0 dXJuIG1fdHlwZTsKK30KKwordm9pZCBXZWJJbnRlbnQ6OnNldFR5cGUoY29uc3QgV2ViU3RyaW5n JiB0eXBlKQoreworICAgIG1fdHlwZSA9IHR5cGU7Cit9CisKK1dlYlN0cmluZyBXZWJJbnRlbnQ6 OmRhdGEoKSBjb25zdAoreworICAgIHJldHVybiBtX2RhdGE7Cit9CisKK3ZvaWQgV2ViSW50ZW50 OjpzZXREYXRhKGNvbnN0IFdlYlN0cmluZyYgZGF0YSkKK3sKKyAgICBtX2RhdGEgPSBkYXRhOwor fQorCitpbnQgV2ViSW50ZW50OjppZGVudGlmaWVyKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9p ZGVudGlmaWVyOworfQorCit2b2lkIFdlYkludGVudDo6c2V0SWRlbnRpZmllcihpbnQgaWRlbnRp ZmllcikKK3sKKyAgICBtX2lkZW50aWZpZXIgPSBpZGVudGlmaWVyOworfQorCit9IC8vIG5hbWVz cGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklu dGVudFNlcnZpY2VJbmZvLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkludGVu dFNlcnZpY2VJbmZvLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zYWVkMDhhNWM0ODRmNzlhZmYzNzk5ZWI5Yzg4 ZTBkMGQ1YjkyODdjCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViSW50ZW50U2VydmljZUluZm8uY3BwCkBAIC0wLDAgKzEsOTcgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAgICAgKiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor ICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3VtZW50YXRp b24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlzdHJpYnV0 aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5h bWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJv bW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVj aWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworICogIkFT IElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9SIENPTlRS SUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAor ICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElO RywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09E UyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29u ZmlnLmgiCisjaW5jbHVkZSAiV2ViSW50ZW50U2VydmljZUluZm8uaCIKKworbmFtZXNwYWNlIFdl YktpdCB7CisKK1dlYkludGVudFNlcnZpY2VJbmZvOjpXZWJJbnRlbnRTZXJ2aWNlSW5mbyhjb25z dCBXZWJTdHJpbmcmIGFjdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBXZWJTdHJpbmcmIHR5cGUsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgV2ViVVJMJiBocmVmLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYlN0cmluZyYgdGl0bGUsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiBkaXNw b3NpdGlvbikKKyAgICA6IG1fYWN0aW9uKGFjdGlvbiksCisgICAgICBtX3R5cGUodHlwZSksCisg ICAgICBtX2hyZWYoaHJlZiksCisgICAgICBtX3RpdGxlKHRpdGxlKSwKKyAgICAgIG1fZGlzcG9z aXRpb24oZGlzcG9zaXRpb24pIHsgfQorCitXZWJVUkwgV2ViSW50ZW50U2VydmljZUluZm86OnVy bCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1faHJlZjsKK30KKwordm9pZCBXZWJJbnRlbnRTZXJ2 aWNlSW5mbzo6c2V0VVJMKGNvbnN0IFdlYlVSTCYgdXJsKQoreworICAgIG1faHJlZiA9IHVybDsK K30KKworV2ViU3RyaW5nIFdlYkludGVudFNlcnZpY2VJbmZvOjp0aXRsZSgpIGNvbnN0Cit7Cisg ICAgcmV0dXJuIG1fdGl0bGU7Cit9CisKK3ZvaWQgV2ViSW50ZW50U2VydmljZUluZm86OnNldFRp dGxlKGNvbnN0IFdlYlN0cmluZyYgdGl0bGUpCit7CisgICAgbV90aXRsZSA9IHRpdGxlOworfQor CitXZWJTdHJpbmcgV2ViSW50ZW50U2VydmljZUluZm86OmFjdGlvbigpIGNvbnN0Cit7CisgICAg cmV0dXJuIG1fYWN0aW9uOworfQorCit2b2lkIFdlYkludGVudFNlcnZpY2VJbmZvOjpzZXRBY3Rp b24oY29uc3QgV2ViU3RyaW5nJiBhY3Rpb24pCit7CisgICAgbV9hY3Rpb24gPSBhY3Rpb247Cit9 CisKK1dlYlN0cmluZyBXZWJJbnRlbnRTZXJ2aWNlSW5mbzo6dHlwZSgpIGNvbnN0Cit7CisgICAg cmV0dXJuIG1fdHlwZTsKK30KKwordm9pZCBXZWJJbnRlbnRTZXJ2aWNlSW5mbzo6c2V0VHlwZShj b25zdCBXZWJTdHJpbmcmIHR5cGUpCit7CisgICAgbV90eXBlID0gdHlwZTsKK30KKworV2ViU3Ry aW5nIFdlYkludGVudFNlcnZpY2VJbmZvOjpkaXNwb3NpdGlvbigpIGNvbnN0Cit7CisgICAgcmV0 dXJuIG1fZGlzcG9zaXRpb247Cit9CisKK3ZvaWQgV2ViSW50ZW50U2VydmljZUluZm86OnNldERp c3Bvc2l0aW9uKGNvbnN0IFdlYlN0cmluZyYgZGlzcG9zaXRpb24pCit7CisgICAgbV9kaXNwb3Np dGlvbiA9IGRpc3Bvc2l0aW9uOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQK 116455 2011-11-23 16:52:07 -0800 2011-11-23 23:46:22 -0800 Patch bug-73036-20111123165206.patch text/plain 9966 gbillock U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDQzODNlMjhmN2VlMGU4YmYwNTcwMjVlZGMwZDRiZWU1NGNmZjE2OWMuLjRlMDUxY2VmZGQ4YWRi NDkyNjkxOTg5NTA0ZGQxOTFlMTg3Nzk0YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMzYgQEAKKzIwMTEtMTEtMjMgIEdyZWcgQmlsbG9jayAgPGdiaWxsb2NrQGdvb2ds ZS5jb20+CisKKyAgICAgICAgQWRkIHNpbXBsZSBpbXBsZW1lbnRhdGlvbiBmb3Igd2ViIGludGVu dHMgY2hyb21pdW0gQVBJIGRhdGEgY2xhc3Nlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTczMDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1YmxpYy9XZWJJ bnRlbnQuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViSW50ZW50U2VydmljZUluZm8uaDoKKyAgICAg ICAgKiBzcmMvV2ViSW50ZW50LmNwcDogQ29waWVkIGZyb20gU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViSW50ZW50LmguCisgICAgICAgIChXZWJLaXQ6OldlYkludGVudDo6V2ViSW50 ZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViSW50ZW50OjphY3Rpb24pOgorICAgICAgICAoV2Vi S2l0OjpXZWJJbnRlbnQ6OnNldEFjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYkludGVudDo6 dHlwZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkludGVudDo6c2V0VHlwZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYkludGVudDo6ZGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYkludGVudDo6c2V0 RGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYkludGVudDo6aWRlbnRpZmllcik6CisgICAgICAg IChXZWJLaXQ6OldlYkludGVudDo6c2V0SWRlbnRpZmllcik6CisgICAgICAgICogc3JjL1dlYklu dGVudFNlcnZpY2VJbmZvLmNwcDogQ29waWVkIGZyb20gU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViSW50ZW50U2VydmljZUluZm8uaC4KKyAgICAgICAgKFdlYktpdDo6V2ViSW50ZW50 U2VydmljZUluZm86OldlYkludGVudFNlcnZpY2VJbmZvKToKKyAgICAgICAgKFdlYktpdDo6V2Vi SW50ZW50U2VydmljZUluZm86OnVybCk6CisgICAgICAgIChXZWJLaXQ6OldlYkludGVudFNlcnZp Y2VJbmZvOjpzZXRVUkwpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnRlbnRTZXJ2aWNlSW5mbzo6 dGl0bGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnRlbnRTZXJ2aWNlSW5mbzo6c2V0VGl0bGUp OgorICAgICAgICAoV2ViS2l0OjpXZWJJbnRlbnRTZXJ2aWNlSW5mbzo6YWN0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6V2ViSW50ZW50U2VydmljZUluZm86OnNldEFjdGlvbik6CisgICAgICAgIChX ZWJLaXQ6OldlYkludGVudFNlcnZpY2VJbmZvOjp0eXBlKToKKyAgICAgICAgKFdlYktpdDo6V2Vi SW50ZW50U2VydmljZUluZm86OnNldFR5cGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnRlbnRT ZXJ2aWNlSW5mbzo6ZGlzcG9zaXRpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnRlbnRTZXJ2 aWNlSW5mbzo6c2V0RGlzcG9zaXRpb24pOgorCiAyMDExLTExLTIyICBLZW5uZXRoIFJ1c3NlbGwg IDxrYnJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIFN1cHBvcnQgQ29yZSBBbmlt YXRpb24gcGx1Z2lucyBpbiBjb21wb3NpdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL1dlYktpdC5neXAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKaW5k ZXggYWMzZTJjZjBkNTMwMTY0YTJiZjhlYzQ2MDBmNzhlYzkzOGRiM2MxYS4uZjAzMmNhMWI2ZDQ3 OGI5M2U3YWJlMTVkNGJlODY1Zjg2YTA1YzlkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9XZWJLaXQuZ3lwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5 cApAQCAtNTYxLDYgKzU2MSw4IEBACiAgICAgICAgICAgICAgICAgJ3NyYy9XZWJJbnB1dEV2ZW50 LmNwcCcsCiAgICAgICAgICAgICAgICAgJ3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHAn LAogICAgICAgICAgICAgICAgICdzcmMvV2ViSW5wdXRFdmVudENvbnZlcnNpb24uaCcsCisgICAg ICAgICAgICAgICAgJ3NyYy9XZWJJbnRlbnQuY3BwJywKKyAgICAgICAgICAgICAgICAnc3JjL1dl YkludGVudFNlcnZpY2VJbmZvLmNwcCcsCiAgICAgICAgICAgICAgICAgJ3NyYy9XZWJLaXQuY3Bw JywKICAgICAgICAgICAgICAgICAnc3JjL1dlYkxhYmVsRWxlbWVudC5jcHAnLAogICAgICAgICAg ICAgICAgICdzcmMvV2ViTGF5ZXIuY3BwJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkludGVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViSW50ZW50LmgKaW5kZXggZjBlY2FjMjNiZDNiMGI1M2VhMzQyYzljOTJjOWJhNTFhOTgyODUy Yi4uOTg5ZTliMDdmZDU5M2RjZDRlYTM1MTVmNTgwNzFkMmIwMGRjZjg1NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSW50ZW50LmgKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSW50ZW50LmgKQEAgLTMxLDkgKzMxLDEwIEBACiAjaWZu ZGVmIFdlYkludGVudF9oCiAjZGVmaW5lIFdlYkludGVudF9oCiAKLW5hbWVzcGFjZSBXZWJLaXQg eworI2luY2x1ZGUgIldlYkNvbW1vbi5oIgorI2luY2x1ZGUgIldlYlN0cmluZy5oIgogCi1jbGFz cyBXZWJTdHJpbmc7CituYW1lc3BhY2UgV2ViS2l0IHsKIAogLy8gSG9sZHMgZGF0YSBwYXNzZWQg dGhyb3VnaCBhIFdlYiBJbnRlbnRzIGludm9jYXRpb24gY2FsbCBmcm9tIHRoZSBKYXZhc2NyaXB0 CiAvLyBJbnRlbnQgb2JqZWN0LgpAQCAtNTMsNiArNTQsMTYgQEAgcHVibGljOgogCiAgICAgV0VC S0lUX0VYUE9SVCBpbnQgaWRlbnRpZmllcigpIGNvbnN0OwogICAgIFdFQktJVF9FWFBPUlQgdm9p ZCBzZXRJZGVudGlmaWVyKGludCk7CisKKyNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04KKyAgICBX ZWJJbnRlbnQoKTsKKyNlbmRpZgorCitwcml2YXRlOgorICAgIFdlYlN0cmluZyBtX2FjdGlvbjsK KyAgICBXZWJTdHJpbmcgbV90eXBlOworICAgIFdlYlN0cmluZyBtX2RhdGE7CisgICAgaW50IG1f aWRlbnRpZmllcjsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSW50ZW50U2VydmljZUluZm8uaCBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkludGVudFNlcnZpY2VJbmZvLmgKaW5kZXggYzhj MTk2OWI4MTdmMDJkYTFkZjRkMjU0M2E3NDliMGQyNDQxMzE0OS4uNWVlNGEwOTYzYzdmMTQxZjll OTJjMzMzMWI5MTczZDk5Y2ViNGViZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViSW50ZW50U2VydmljZUluZm8uaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJJbnRlbnRTZXJ2aWNlSW5mby5oCkBAIC0zMSwxMCArMzEsMTEgQEAKICNp Zm5kZWYgV2ViSW50ZW50U2VydmljZUluZm9faAogI2RlZmluZSBXZWJJbnRlbnRTZXJ2aWNlSW5m b19oCiAKLW5hbWVzcGFjZSBXZWJLaXQgeworI2luY2x1ZGUgIldlYkNvbW1vbi5oIgorI2luY2x1 ZGUgIldlYlN0cmluZy5oIgorI2luY2x1ZGUgIldlYlVSTC5oIgogCi1jbGFzcyBXZWJTdHJpbmc7 Ci1jbGFzcyBXZWJVUkw7CituYW1lc3BhY2UgV2ViS2l0IHsKIAogLy8gSG9sZHMgZGF0YSB1c2Vk IHRvIGluaXRpYWxpemUgYSBXZWIgSW50ZW50cyBzZXJ2aWNlIChoYW5kbGVyKS4KIC8vIFNlZSBz cGVjIGF0IGh0dHA6Ly93d3cuY2hyb21pdW0ub3JnL2RldmVsb3BlcnMvZGVzaWduLWRvY3VtZW50 cy93ZWJpbnRlbnRzYXBpCkBAIC02NCw2ICs2NSwxNyBAQCBwdWJsaWM6CiAgICAgLy8gY29udGV4 dCAodGhlIGRlZmF1bHQpLgogICAgIFdFQktJVF9FWFBPUlQgV2ViU3RyaW5nIGRpc3Bvc2l0aW9u KCkgY29uc3Q7CiAgICAgV0VCS0lUX0VYUE9SVCB2b2lkIHNldERpc3Bvc2l0aW9uKGNvbnN0IFdl YlN0cmluZyYpOworCisjaWYgV0VCS0lUX0lNUExFTUVOVEFUSU9OCisgICAgV2ViSW50ZW50U2Vy dmljZUluZm8oKTsKKyNlbmRpZgorCitwcml2YXRlOgorICAgIFdlYlN0cmluZyBtX2FjdGlvbjsK KyAgICBXZWJTdHJpbmcgbV90eXBlOworICAgIFdlYlVSTCBtX2hyZWY7CisgICAgV2ViU3RyaW5n IG1fdGl0bGU7CisgICAgV2ViU3RyaW5nIG1fZGlzcG9zaXRpb247CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklu dGVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbnRlbnQuY3BwCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjEzNTQwZTE2MjFiOGEzYWZlYzgxYmE5NGVhMDliZGZmMTBiOWVjZTMKLS0tIC9kZXYv bnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbnRlbnQuY3BwCkBAIC0w LDAgKzEsNzggQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1l dDoKKyAqCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRh aW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25z IGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l cgorICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZQorICogZGlzdHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBv ZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBi ZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRo aXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisg KgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMg QU5EIENPTlRSSUJVVE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBX QVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVE IFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJU SUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZ UklHSFQKKyAqIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1Qs IElORElSRUNULCBJTkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFV RU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VS RU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBE QVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VE IEFORCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiV2ViSW50ZW50LmgiCisK K25hbWVzcGFjZSBXZWJLaXQgeworCitXZWJJbnRlbnQ6OldlYkludGVudCgpIHsgfQorCitXZWJT dHJpbmcgV2ViSW50ZW50OjphY3Rpb24oKSBjb25zdAoreworICAgIHJldHVybiBtX2FjdGlvbjsK K30KKwordm9pZCBXZWJJbnRlbnQ6OnNldEFjdGlvbihjb25zdCBXZWJTdHJpbmcmIGFjdGlvbikK K3sKKyAgICBtX2FjdGlvbiA9IGFjdGlvbjsKK30KKworV2ViU3RyaW5nIFdlYkludGVudDo6dHlw ZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fdHlwZTsKK30KKwordm9pZCBXZWJJbnRlbnQ6OnNl dFR5cGUoY29uc3QgV2ViU3RyaW5nJiB0eXBlKQoreworICAgIG1fdHlwZSA9IHR5cGU7Cit9CisK K1dlYlN0cmluZyBXZWJJbnRlbnQ6OmRhdGEoKSBjb25zdAoreworICAgIHJldHVybiBtX2RhdGE7 Cit9CisKK3ZvaWQgV2ViSW50ZW50OjpzZXREYXRhKGNvbnN0IFdlYlN0cmluZyYgZGF0YSkKK3sK KyAgICBtX2RhdGEgPSBkYXRhOworfQorCitpbnQgV2ViSW50ZW50OjppZGVudGlmaWVyKCkgY29u c3QKK3sKKyAgICByZXR1cm4gbV9pZGVudGlmaWVyOworfQorCit2b2lkIFdlYkludGVudDo6c2V0 SWRlbnRpZmllcihpbnQgaWRlbnRpZmllcikKK3sKKyAgICBtX2lkZW50aWZpZXIgPSBpZGVudGlm aWVyOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYkludGVudFNlcnZpY2VJbmZvLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYkludGVudFNlcnZpY2VJbmZvLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jNjM2NWNl ZjNhZjhhMTZlNGYwZDJhYzZhYTgzYmFhYTQ5NTUxMDg2Ci0tLSAvZGV2L251bGwKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW50ZW50U2VydmljZUluZm8uY3BwCkBAIC0wLDAg KzEsODggQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoK KyAqCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4g dGhlIGFib3ZlIGNvcHlyaWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGlu IGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgor ICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZQorICogZGlzdHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBH b29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1 c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMg c29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgor ICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5E IENPTlRSSUJVVE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJS QU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdB UlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNV TEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklH SFQKKyAqIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElO RElSRUNULCBJTkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5U SUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRB LCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFO RCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNU UklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF UldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K KyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiV2ViSW50ZW50U2VydmljZUlu Zm8uaCIKKworbmFtZXNwYWNlIFdlYktpdCB7CisKK1dlYkludGVudFNlcnZpY2VJbmZvOjpXZWJJ bnRlbnRTZXJ2aWNlSW5mbygpIHsgfQorCitXZWJVUkwgV2ViSW50ZW50U2VydmljZUluZm86OnVy bCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1faHJlZjsKK30KKwordm9pZCBXZWJJbnRlbnRTZXJ2 aWNlSW5mbzo6c2V0VVJMKGNvbnN0IFdlYlVSTCYgdXJsKQoreworICAgIG1faHJlZiA9IHVybDsK K30KKworV2ViU3RyaW5nIFdlYkludGVudFNlcnZpY2VJbmZvOjp0aXRsZSgpIGNvbnN0Cit7Cisg ICAgcmV0dXJuIG1fdGl0bGU7Cit9CisKK3ZvaWQgV2ViSW50ZW50U2VydmljZUluZm86OnNldFRp dGxlKGNvbnN0IFdlYlN0cmluZyYgdGl0bGUpCit7CisgICAgbV90aXRsZSA9IHRpdGxlOworfQor CitXZWJTdHJpbmcgV2ViSW50ZW50U2VydmljZUluZm86OmFjdGlvbigpIGNvbnN0Cit7CisgICAg cmV0dXJuIG1fYWN0aW9uOworfQorCit2b2lkIFdlYkludGVudFNlcnZpY2VJbmZvOjpzZXRBY3Rp b24oY29uc3QgV2ViU3RyaW5nJiBhY3Rpb24pCit7CisgICAgbV9hY3Rpb24gPSBhY3Rpb247Cit9 CisKK1dlYlN0cmluZyBXZWJJbnRlbnRTZXJ2aWNlSW5mbzo6dHlwZSgpIGNvbnN0Cit7CisgICAg cmV0dXJuIG1fdHlwZTsKK30KKwordm9pZCBXZWJJbnRlbnRTZXJ2aWNlSW5mbzo6c2V0VHlwZShj b25zdCBXZWJTdHJpbmcmIHR5cGUpCit7CisgICAgbV90eXBlID0gdHlwZTsKK30KKworV2ViU3Ry aW5nIFdlYkludGVudFNlcnZpY2VJbmZvOjpkaXNwb3NpdGlvbigpIGNvbnN0Cit7CisgICAgcmV0 dXJuIG1fZGlzcG9zaXRpb247Cit9CisKK3ZvaWQgV2ViSW50ZW50U2VydmljZUluZm86OnNldERp c3Bvc2l0aW9uKGNvbnN0IFdlYlN0cmluZyYgZGlzcG9zaXRpb24pCit7CisgICAgbV9kaXNwb3Np dGlvbiA9IGRpc3Bvc2l0aW9uOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQK