146282 2015-06-24 09:59:00 -0700 MediaSession: propagate MediaSessionMetadata to WebPageProxy 2015-06-24 15:39:12 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 145411 1 mrajca webkit-unassigned conrad_shultz eric.carlson jer.noble mrajca webkit-bug-importer oldest_to_newest 1104392 0 mrajca 2015-06-24 09:59:00 -0700 Propagate changes to MediaSessionMetadata to WebPageProxy for clients to ultimately respond to. 1104394 1 webkit-bug-importer 2015-06-24 09:59:41 -0700 <rdar://problem/21525952> 1104398 2 255489 mrajca 2015-06-24 10:15:09 -0700 Created attachment 255489 Patch 1104399 3 255489 eric.carlson 2015-06-24 10:19:32 -0700 Comment on attachment 255489 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255489&action=review > Source/WebKit2/Shared/WebCoreArgumentCoders.cpp:91 > +#import <WebCore/MediaSessionMetadata.h> This (and the one above :-O) should be "#include", not "#import". 1104403 4 mrajca 2015-06-24 10:32:32 -0700 (In reply to comment #3) > Comment on attachment 255489 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=255489&action=review > > > Source/WebKit2/Shared/WebCoreArgumentCoders.cpp:91 > > +#import <WebCore/MediaSessionMetadata.h> > > This (and the one above :-O) should be "#include", not "#import". Fixed. I filed a separate bug (Bug 146283) for the one above. 1104407 5 255491 mrajca 2015-06-24 10:49:47 -0700 Created attachment 255491 Patch 1104494 6 255491 darin 2015-06-24 14:58:10 -0700 Comment on attachment 255491 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255491&action=review > Source/WebCore/Modules/mediasession/MediaSession.cpp:104 > + m_document.page()->chrome().client().mediaSessionMetadataDidChange(m_metadata); What guarantees that page() is not null here? We should check it for null unless there is an ironclad guarantee it can’t be. > Source/WebCore/page/ChromeClient.h:50 > +#if ENABLE(MEDIA_SESSION) > +#include "MediaSessionMetadata.h" > +#endif We should not include this header. We should be able to just forward-declare MediaSessionMetadata to compile this header. 1104495 7 255491 thorton 2015-06-24 14:58:54 -0700 Comment on attachment 255491 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255491&action=review > Source/WebCore/page/ChromeClient.h:49 > +#include "MediaSessionMetadata.h" Please forward-declare instead of including this header (it seems like you can, right?). ChromeClient.h is included in a billion places and this will just make the build slower. > Source/WebKit2/UIProcess/WebPageProxy.cpp:5775 > +{ I assume you're going to put something here in a near-future patch? > Source/WebKit2/UIProcess/WebPageProxy.h:123 > +#if ENABLE(MEDIA_SESSION) > +#include <WebCore/MediaSessionMetadata.h> Ditto here. 1104506 8 mrajca 2015-06-24 15:31:07 -0700 (In reply to comment #7) > Comment on attachment 255491 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=255491&action=review > > > Source/WebCore/page/ChromeClient.h:49 > > +#include "MediaSessionMetadata.h" > > Please forward-declare instead of including this header (it seems like you > can, right?). ChromeClient.h is included in a billion places and this will > just make the build slower. Yup, fixed. > > > Source/WebKit2/UIProcess/WebPageProxy.cpp:5775 > > +{ > > I assume you're going to put something here in a near-future patch? Yes. I have the changes locally. > > > Source/WebKit2/UIProcess/WebPageProxy.h:123 > > +#if ENABLE(MEDIA_SESSION) > > +#include <WebCore/MediaSessionMetadata.h> > > Ditto here. Changed. 1104507 9 mrajca 2015-06-24 15:32:18 -0700 (In reply to comment #6) > Comment on attachment 255491 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=255491&action=review > > > Source/WebCore/Modules/mediasession/MediaSession.cpp:104 > > + m_document.page()->chrome().client().mediaSessionMetadataDidChange(m_metadata); > > What guarantees that page() is not null here? We should check it for null > unless there is an ironclad guarantee it can’t be. Added the null check. > > > Source/WebCore/page/ChromeClient.h:50 > > +#if ENABLE(MEDIA_SESSION) > > +#include "MediaSessionMetadata.h" > > +#endif > > We should not include this header. We should be able to just forward-declare > MediaSessionMetadata to compile this header. Changed. Thanks! 1104510 10 mrajca 2015-06-24 15:39:12 -0700 Committed r185929: <http://trac.webkit.org/changeset/185929> 255489 2015-06-24 10:15:09 -0700 2015-06-24 10:49:45 -0700 Patch bug-146282-20150624101424.patch text/plain 10523 mrajca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1OTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDAyYTBiMWE1YTUyYmM1 MGJlNjhhNjI3MmRhOGYyYjRhNmY4NzE1MC4uNGM3NmJkZDhmYjA2YmE4MzM2YmNjY2ZiMzE1MDg4 YzFmOWE4ODdlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDExIEBACisyMDE1LTA2LTI0ICBNYXR0 IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYVNlc3Npb246IHByb3Bh Z2F0ZSBNZWRpYVNlc3Npb25NZXRhZGF0YSB0byBXZWJQYWdlUHJveHkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjI4MgorCisgICAgICAgICogTW9k dWxlcy9tZWRpYXNlc3Npb24vTWVkaWFTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhU2Vzc2lvbjo6c2V0TWV0YWRhdGEpOgorCiAyMDE1LTA2LTIzICBNYXR0IFJhamNhICA8bXJh amNhQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYVNlc3Npb246IFN1cHBvcnQgc2V0dGluZyBv ZiBtZXRhZGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGUyMTg5MjEyN2IwZmIzM2QyMWNiMDIzNGFjMGRmYjYz OTg3NmU3YzEuLjA2ZjU0MGU1MjM5MGRlOWQ0ZWFkZTZjNTQ3MTdiNzE0YjM5N2EyMWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxNS0wNi0yNCAgTWF0dCBSYWpjYSAgPG1yYWpjYUBh cHBsZS5jb20+CisKKyAgICAgICAgTWVkaWFTZXNzaW9uOiBwcm9wYWdhdGUgTWVkaWFTZXNzaW9u TWV0YWRhdGEgdG8gV2ViUGFnZVByb3h5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDYyODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwOiBBZGRl ZCBBcmd1bWVudEVuY29kZXIgc3VwcG9ydCBmb3IgTWVkaWFTZXNzaW9uTWV0YWRhdGEgc28gd2Ug Y2FuIHNlbmQgaXQKKyAgICAgICAgICB0aHJvdWdoIHRoZSB3ZWIgcGFnZSBwcm94eS4KKyAgICAg ICAgKElQQzo6QXJndW1lbnRDb2RlcjxNZWRpYVNlc3Npb25NZXRhZGF0YT46OmVuY29kZSk6Cisg ICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8TWVkaWFTZXNzaW9uTWV0YWRhdGE+OjpkZWNvZGUp OgorICAgICAgICAqIFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjptZWRpYVNlc3Npb25NZXRhZGF0YURpZENoYW5nZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oOiBSZWNlaXZlIG1lZGlhU2Vzc2lvbk1ldGFkYXRhRGlkQ2hhbmdlIGluIHRo ZSB3ZWIgcGFnZSBwcm94eS4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3Nh Z2VzLmluOiBBZGRlZCBhIG5ldyBNZWRpYVNlc3Npb25NZXRhZGF0YURpZENoYW5nZSBtZXNzYWdl LgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50OjptZWRpYVNlc3Npb25NZXRhZGF0 YURpZENoYW5nZSk6IFB1c2ggYSBtZWRpYVNlc3Npb25NZXRhZGF0YURpZENoYW5nZSBtZXNzYWdl IHRocm91Z2ggdGhlIHdlYiBwYWdlIHByb3h5LgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50Lmg6CisKIDIwMTUtMDYtMjQgIFJ5dWFuIENob2kgIDxy eXVhbi5jaG9pQG5hdmVyY29ycC5jb20+CiAKICAgICAgICAgUmVtb3ZlIHNvbWUgZGVhZCBjb2Rl IGZyb20gRG93bmxvYWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz ZXNzaW9uL01lZGlhU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vz c2lvbi9NZWRpYVNlc3Npb24uY3BwCmluZGV4IDEzMTVjNzFhZDU4Mzc1MzRmOTRkY2RjYWM1OGM1 MTE5ZWIxODUzZDUuLjNlMDc5OGM2MDE0MDM2YmZhZmM2ZGZhMmRjMjZhOTg3YTY1NzkyMTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNzaW9uL01lZGlhU2Vzc2lv bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vTWVkaWFTZXNz aW9uLmNwcApAQCAtMjgsNiArMjgsOCBAQAogCiAjaWYgRU5BQkxFKE1FRElBX1NFU1NJT04pCiAK KyNpbmNsdWRlICJDaHJvbWUuaCIKKyNpbmNsdWRlICJDaHJvbWVDbGllbnQuaCIKICNpbmNsdWRl ICJEaWN0aW9uYXJ5LmgiCiAjaW5jbHVkZSAiRXZlbnQuaCIKICNpbmNsdWRlICJIVE1MTWVkaWFF bGVtZW50LmgiCkBAIC05OSw2ICsxMDEsNyBAQCB2b2lkIE1lZGlhU2Vzc2lvbjo6c2V0TWV0YWRh dGEoY29uc3QgRGljdGlvbmFyeSYgbWV0YWRhdGEpCiAgICAgICAgIGFydHdvcmtVUkwgPSBtX2Rv Y3VtZW50LmNvbXBsZXRlVVJMKGFydHdvcmtQYXRoKTsKIAogICAgIG1fbWV0YWRhdGEgPSBNZWRp YVNlc3Npb25NZXRhZGF0YSh0aXRsZSwgYXJ0aXN0LCBhbGJ1bSwgYXJ0d29ya1VSTCk7CisgICAg bV9kb2N1bWVudC5wYWdlKCktPmNocm9tZSgpLmNsaWVudCgpLm1lZGlhU2Vzc2lvbk1ldGFkYXRh RGlkQ2hhbmdlKG1fbWV0YWRhdGEpOwogfQogCiB2b2lkIE1lZGlhU2Vzc2lvbjo6cmVsZWFzZVNl c3Npb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgKaW5kZXggYjM0ZTk1MzkzY2M2ODBh NzBkM2NjYjJlZGY1NDE0ZTM0MDkxODc3MC4uN2NiMTY5MjlkNjY0MTkyZmQ5YThkNWE4ZWRhODEy MTY3YmU3NDM4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCkBAIC00NSw2ICs0NSwx MCBAQAogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgog CisjaWYgRU5BQkxFKE1FRElBX1NFU1NJT04pCisjaW5jbHVkZSAiTWVkaWFTZXNzaW9uTWV0YWRh dGEuaCIKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oSU9TKQogI2luY2x1ZGUgIlBsYXRmb3JtTGF5 ZXIuaCIKICNkZWZpbmUgTlNSZXNwb25kZXIgV0FLUmVzcG9uZGVyCkBAIC00MTIsNiArNDE2LDEw IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBpc1BsYXlpbmdNZWRpYURpZENoYW5nZShN ZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlRmxhZ3MpIHsgfQogCisjaWYgRU5BQkxFKE1FRElBX1NF U1NJT04pCisgICAgdmlydHVhbCB2b2lkIG1lZGlhU2Vzc2lvbk1ldGFkYXRhRGlkQ2hhbmdlKGNv bnN0IFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbk1ldGFkYXRhJikgeyB9CisjZW5kaWYKKwogICAgIHZp cnR1YWwgdm9pZCBzZXRQYWdlQWN0aXZpdHlTdGF0ZShQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3Mp IHsgfQogCiAjaWYgRU5BQkxFKFNVQlRMRV9DUllQVE8pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCmluZGV4IDhmYTJhMGEyNzY0ZDVmNDc1NzZj OGY0Yjk5MzZmNmYwNWYxYzE2NjcuLjdmNzE5NjVlZWE5NTRlNjU3MDQ1MDllNDE2NTkxMmQyYTJk NjZiMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRD b2RlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2Rl cnMuY3BwCkBAIC04Nyw2ICs4NywxMCBAQAogI2ltcG9ydCA8V2ViQ29yZS9NZWRpYVBsYXliYWNr VGFyZ2V0Q29udGV4dC5oPgogI2VuZGlmCiAKKyNpZiBFTkFCTEUoTUVESUFfU0VTU0lPTikKKyNp bXBvcnQgPFdlYkNvcmUvTWVkaWFTZXNzaW9uTWV0YWRhdGEuaD4KKyNlbmRpZgorCiB1c2luZyBu YW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKQEAgLTE0NDYsNiAr MTQ1MCwzMiBAQCBib29sIEFyZ3VtZW50Q29kZXI8VXNlclN0eWxlU2hlZXQ+OjpkZWNvZGUoQXJn dW1lbnREZWNvZGVyJiBkZWNvZGVyLCBVc2VyU3R5bGVTaAogICAgIHJldHVybiB0cnVlOwogfQog CisjaWYgRU5BQkxFKE1FRElBX1NFU1NJT04pCit2b2lkIEFyZ3VtZW50Q29kZXI8TWVkaWFTZXNz aW9uTWV0YWRhdGE+OjplbmNvZGUoQXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBNZWRp YVNlc3Npb25NZXRhZGF0YSYgcmVzdWx0KQoreworICAgIGVuY29kZXIgPDwgcmVzdWx0LmFydGlz dCgpOworICAgIGVuY29kZXIgPDwgcmVzdWx0LmFsYnVtKCk7CisgICAgZW5jb2RlciA8PCByZXN1 bHQudGl0bGUoKTsKKyAgICBlbmNvZGVyIDw8IHJlc3VsdC5hcnR3b3JrVVJMKCk7Cit9CisKK2Jv b2wgQXJndW1lbnRDb2RlcjxNZWRpYVNlc3Npb25NZXRhZGF0YT46OmRlY29kZShBcmd1bWVudERl Y29kZXImIGRlY29kZXIsIE1lZGlhU2Vzc2lvbk1ldGFkYXRhJiByZXN1bHQpCit7CisgICAgU3Ry aW5nIGFydGlzdCwgYWxidW0sIHRpdGxlOworICAgIFVSTCBhcnR3b3JrVVJMOworICAgIGlmICgh ZGVjb2Rlci5kZWNvZGUoYXJ0aXN0KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICgh ZGVjb2Rlci5kZWNvZGUoYWxidW0pKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFk ZWNvZGVyLmRlY29kZSh0aXRsZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKGFydHdvcmtVUkwpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgcmVz dWx0ID0gTWVkaWFTZXNzaW9uTWV0YWRhdGEodGl0bGUsIGFydGlzdCwgYWxidW0sIGFydHdvcmtV UkwpOworICAgIHJldHVybiB0cnVlOworfQorI2VuZGlmCisKIHZvaWQgQXJndW1lbnRDb2RlcjxV c2VyU2NyaXB0Pjo6ZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYgZW5jb2RlciwgY29uc3QgVXNlclNj cmlwdCYgdXNlclNjcmlwdCkKIHsKICAgICBlbmNvZGVyIDw8IHVzZXJTY3JpcHQuc291cmNlKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJz LmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgKaW5kZXgg Zjk3OGYxMjQ0ZjEwNDFmNGExNTRjMGRiZDIzN2Y3MWVkZDJiMGQxNi4uOGU1YzEwNGViNzY4MjIw ODMzYTk2MzU5MjNlNTJlMDc1OTdhZTA3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9X ZWJDb3JlQXJndW1lbnRDb2RlcnMuaApAQCAtMTIxLDYgKzEyMSwxMiBAQCBzdHJ1Y3QgTWVkaWFQ bGF5YmFja1RhcmdldENvbnRleHQ7CiB9CiAjZW5kaWYKIAorI2lmIEVOQUJMRShNRURJQV9TRVNT SU9OKQorbmFtZXNwYWNlIFdlYkNvcmUgeworc3RydWN0IE1lZGlhU2Vzc2lvbk1ldGFkYXRhOwor fQorI2VuZGlmCisKIG5hbWVzcGFjZSBJUEMgewogCiB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVu dENvZGVyPFdlYkNvcmU6OkFmZmluZVRyYW5zZm9ybT4gewpAQCAtNDU1LDYgKzQ2MSwxMyBAQCB0 ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkNvbnRlbnRGaWx0ZXJVbmJs b2NrSGFuZGxlcj4gewogfTsKICNlbmRpZgogCisjaWYgRU5BQkxFKE1FRElBX1NFU1NJT04pCit0 ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbk1ldGFk YXRhPiB7CisgICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYsIGNvbnN0IFdl YkNvcmU6Ok1lZGlhU2Vzc2lvbk1ldGFkYXRhJik7CisgICAgc3RhdGljIGJvb2wgZGVjb2RlKEFy Z3VtZW50RGVjb2RlciYsIFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbk1ldGFkYXRhJik7Cit9OworI2Vu ZGlmCisKIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6VGV4dEluZGlj YXRvckRhdGE+IHsKICAgICBzdGF0aWMgdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyJiwgY29u c3QgV2ViQ29yZTo6VGV4dEluZGljYXRvckRhdGEmKTsKICAgICBzdGF0aWMgYm9vbCBkZWNvZGUo QXJndW1lbnREZWNvZGVyJiwgV2ViQ29yZTo6VGV4dEluZGljYXRvckRhdGEmKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggYTU1MGUzNTcwY2RlN2VjMDBl NWVmMjhmYzc5MTIzNWM5NDExNDFkYS4uNjJkNjMyNmQ1OGE1NWU2OTYxM2E2N2E3YTIwMTQxMGVm ODI0YWM0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAg LTU3NzAsNiArNTc3MCwxMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aXNQbGF5aW5nTWVkaWFEaWRD aGFuZ2UoTWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZUZsYWdzIHN0YXRlKQogICAgIG1fdWlDbGll bnQtPmlzUGxheWluZ0F1ZGlvRGlkQ2hhbmdlKCp0aGlzKTsKIH0KIAorI2lmIEVOQUJMRShNRURJ QV9TRVNTSU9OKQordm9pZCBXZWJQYWdlUHJveHk6Om1lZGlhU2Vzc2lvbk1ldGFkYXRhRGlkQ2hh bmdlKGNvbnN0IFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbk1ldGFkYXRhJiBtZXRhZGF0YSkKK3sKK30K KyNlbmRpZgorCiAjaWYgUExBVEZPUk0oTUFDKQogdm9pZCBXZWJQYWdlUHJveHk6OnJlbW92ZU5h dmlnYXRpb25HZXN0dXJlU25hcHNob3QoKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oCmluZGV4IDhlOTQxODM5NGJlMjlmN2ZmM2Y1ZWQyZWU0Nzk5Y2JiNDY2MWYzMjYu LmRkODgwNjlhZGFlZWNmOTkwNGJlMDY2Y2U4MDYzMGFkODIxNTM0M2MgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTExOSw2ICsxMTksMTAgQEAKICNpbmNsdWRl IDxXZWJDb3JlL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXJDbGllbnQuaD4KICNlbmRpZgogCisjaWYg RU5BQkxFKE1FRElBX1NFU1NJT04pCisjaW5jbHVkZSA8V2ViQ29yZS9NZWRpYVNlc3Npb25NZXRh ZGF0YS5oPgorI2VuZGlmCisKIG5hbWVzcGFjZSBBUEkgewogY2xhc3MgQ29udGV4dE1lbnVDbGll bnQ7CiBjbGFzcyBGaW5kQ2xpZW50OwpAQCAtMTAxMyw2ICsxMDE3LDEwIEBAIHB1YmxpYzoKICAg ICBib29sIGlzUGxheWluZ0F1ZGlvKCkgY29uc3QgeyByZXR1cm4gISEobV9tZWRpYVN0YXRlICYg V2ViQ29yZTo6TWVkaWFQcm9kdWNlcjo6SXNQbGF5aW5nQXVkaW8pOyB9CiAgICAgdm9pZCBpc1Bs YXlpbmdNZWRpYURpZENoYW5nZShXZWJDb3JlOjpNZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlRmxh Z3MpOwogCisjaWYgRU5BQkxFKE1FRElBX1NFU1NJT04pCisgICAgdm9pZCBtZWRpYVNlc3Npb25N ZXRhZGF0YURpZENoYW5nZShjb25zdCBXZWJDb3JlOjpNZWRpYVNlc3Npb25NZXRhZGF0YSYpOwor I2VuZGlmCisKICNpZiBQTEFURk9STShNQUMpCiAgICAgdm9pZCByZW1vdmVOYXZpZ2F0aW9uR2Vz dHVyZVNuYXBzaG90KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IGU4ZjVlOWJjZDY0MjMyZWRkMWI1OWI2NTZiZTRlYmI4 NjFiMjJhNzAuLmY0MjE0NDYzZGJhNmI2YTJhYTFmMWMyZjUyMmRjZjkzMDg0ZjY4MTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4K KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgpA QCAtNDIzLDYgKzQyMywxMCBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogCiAgICAgSXNQ bGF5aW5nTWVkaWFEaWRDaGFuZ2UodW5zaWduZWQgc3RhdGUpCiAKKyNpZiBFTkFCTEUoTUVESUFf U0VTU0lPTikKKyAgICBNZWRpYVNlc3Npb25NZXRhZGF0YURpZENoYW5nZShXZWJDb3JlOjpNZWRp YVNlc3Npb25NZXRhZGF0YSBtZXRhZGF0YSk7CisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKE1BQykK ICAgICBEaWRQZXJmb3JtSW1tZWRpYXRlQWN0aW9uSGl0VGVzdChzdHJ1Y3QgV2ViS2l0OjpXZWJI aXRUZXN0UmVzdWx0OjpEYXRhIHJlc3VsdCwgYm9vbCBjb250ZW50UHJldmVudHNEZWZhdWx0LCBX ZWJLaXQ6OlVzZXJEYXRhIHVzZXJEYXRhKQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAK aW5kZXggOTkxOGFmYWFhMDNhNjM4NDFjNGM2MDI0OWFiNmJjOGM5YTYzYmFmMi4uOWFkNDc4MjQ1 NTRmODQyMmI5MjdmNGM3ZDc4MWI5ZTYwNzA0YWIwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNw cApAQCAtMTA2MSw2ICsxMDYxLDEzIEBAIHZvaWQgV2ViQ2hyb21lQ2xpZW50Ojppc1BsYXlpbmdN ZWRpYURpZENoYW5nZShXZWJDb3JlOjpNZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlCiAgICAgbV9w YWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OklzUGxheWluZ01lZGlhRGlkQ2hhbmdl KHN0YXRlKSk7CiB9CiAKKyNpZiBFTkFCTEUoTUVESUFfU0VTU0lPTikKK3ZvaWQgV2ViQ2hyb21l Q2xpZW50OjptZWRpYVNlc3Npb25NZXRhZGF0YURpZENoYW5nZShjb25zdCBXZWJDb3JlOjpNZWRp YVNlc3Npb25NZXRhZGF0YSYgbWV0YWRhdGEpCit7CisgICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6Ok1lZGlhU2Vzc2lvbk1ldGFkYXRhRGlkQ2hhbmdlKG1ldGFkYXRhKSk7 Cit9CisjZW5kaWYKKwogdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnNldFBhZ2VBY3Rpdml0eVN0YXRl KFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBhY3Rpdml0eVN0YXRlKQogewogICAgIG1fcGFnZS0+ c2V0UGFnZUFjdGl2aXR5U3RhdGUoYWN0aXZpdHlTdGF0ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaApp bmRleCBlYjlhYWViNjRiMjZmNTRiMTc3NzBkYzM1YjQyYzk5NDlmM2Y1YzNkLi44OTY0MDUwMjM5 Y2Y3MjNiOGE3NDcxZjFjMDUzMTIwZGMzNzc4NzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmgKQEAg LTI5NCw2ICsyOTQsMTAgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgaXNQbGF5aW5nTWVk aWFEaWRDaGFuZ2UoV2ViQ29yZTo6TWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZUZsYWdzKSBvdmVy cmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0UGFnZUFjdGl2aXR5U3RhdGUoV2ViQ29yZTo6UGFn ZUFjdGl2aXR5U3RhdGU6OkZsYWdzKSBvdmVycmlkZTsKIAorI2lmIEVOQUJMRShNRURJQV9TRVNT SU9OKQorICAgIHZpcnR1YWwgdm9pZCBtZWRpYVNlc3Npb25NZXRhZGF0YURpZENoYW5nZShjb25z dCBXZWJDb3JlOjpNZWRpYVNlc3Npb25NZXRhZGF0YSYpIG92ZXJyaWRlOworI2VuZGlmCisKICNp ZiBFTkFCTEUoU1VCVExFX0NSWVBUTykKICAgICB2aXJ0dWFsIGJvb2wgd3JhcENyeXB0b0tleShj b25zdCBWZWN0b3I8dWludDhfdD4mLCBWZWN0b3I8dWludDhfdD4mKSBjb25zdCBvdmVycmlkZTsK ICAgICB2aXJ0dWFsIGJvb2wgdW53cmFwQ3J5cHRvS2V5KGNvbnN0IFZlY3Rvcjx1aW50OF90PiYs IFZlY3Rvcjx1aW50OF90PiYpIGNvbnN0IG92ZXJyaWRlOwo= 255491 2015-06-24 10:49:47 -0700 2015-06-24 14:58:10 -0700 Patch bug-146282-20150624104903.patch text/plain 10524 mrajca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1OTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDAyYTBiMWE1YTUyYmM1 MGJlNjhhNjI3MmRhOGYyYjRhNmY4NzE1MC4uNGM3NmJkZDhmYjA2YmE4MzM2YmNjY2ZiMzE1MDg4 YzFmOWE4ODdlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDExIEBACisyMDE1LTA2LTI0ICBNYXR0 IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYVNlc3Npb246IHByb3Bh Z2F0ZSBNZWRpYVNlc3Npb25NZXRhZGF0YSB0byBXZWJQYWdlUHJveHkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjI4MgorCisgICAgICAgICogTW9k dWxlcy9tZWRpYXNlc3Npb24vTWVkaWFTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhU2Vzc2lvbjo6c2V0TWV0YWRhdGEpOgorCiAyMDE1LTA2LTIzICBNYXR0IFJhamNhICA8bXJh amNhQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYVNlc3Npb246IFN1cHBvcnQgc2V0dGluZyBv ZiBtZXRhZGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGUyMTg5MjEyN2IwZmIzM2QyMWNiMDIzNGFjMGRmYjYz OTg3NmU3YzEuLjA2ZjU0MGU1MjM5MGRlOWQ0ZWFkZTZjNTQ3MTdiNzE0YjM5N2EyMWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxNS0wNi0yNCAgTWF0dCBSYWpjYSAgPG1yYWpjYUBh cHBsZS5jb20+CisKKyAgICAgICAgTWVkaWFTZXNzaW9uOiBwcm9wYWdhdGUgTWVkaWFTZXNzaW9u TWV0YWRhdGEgdG8gV2ViUGFnZVByb3h5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDYyODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwOiBBZGRl ZCBBcmd1bWVudEVuY29kZXIgc3VwcG9ydCBmb3IgTWVkaWFTZXNzaW9uTWV0YWRhdGEgc28gd2Ug Y2FuIHNlbmQgaXQKKyAgICAgICAgICB0aHJvdWdoIHRoZSB3ZWIgcGFnZSBwcm94eS4KKyAgICAg ICAgKElQQzo6QXJndW1lbnRDb2RlcjxNZWRpYVNlc3Npb25NZXRhZGF0YT46OmVuY29kZSk6Cisg ICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8TWVkaWFTZXNzaW9uTWV0YWRhdGE+OjpkZWNvZGUp OgorICAgICAgICAqIFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjptZWRpYVNlc3Npb25NZXRhZGF0YURpZENoYW5nZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oOiBSZWNlaXZlIG1lZGlhU2Vzc2lvbk1ldGFkYXRhRGlkQ2hhbmdlIGluIHRo ZSB3ZWIgcGFnZSBwcm94eS4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3Nh Z2VzLmluOiBBZGRlZCBhIG5ldyBNZWRpYVNlc3Npb25NZXRhZGF0YURpZENoYW5nZSBtZXNzYWdl LgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50OjptZWRpYVNlc3Npb25NZXRhZGF0 YURpZENoYW5nZSk6IFB1c2ggYSBtZWRpYVNlc3Npb25NZXRhZGF0YURpZENoYW5nZSBtZXNzYWdl IHRocm91Z2ggdGhlIHdlYiBwYWdlIHByb3h5LgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50Lmg6CisKIDIwMTUtMDYtMjQgIFJ5dWFuIENob2kgIDxy eXVhbi5jaG9pQG5hdmVyY29ycC5jb20+CiAKICAgICAgICAgUmVtb3ZlIHNvbWUgZGVhZCBjb2Rl IGZyb20gRG93bmxvYWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz ZXNzaW9uL01lZGlhU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vz c2lvbi9NZWRpYVNlc3Npb24uY3BwCmluZGV4IDEzMTVjNzFhZDU4Mzc1MzRmOTRkY2RjYWM1OGM1 MTE5ZWIxODUzZDUuLjNlMDc5OGM2MDE0MDM2YmZhZmM2ZGZhMmRjMjZhOTg3YTY1NzkyMTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNzaW9uL01lZGlhU2Vzc2lv bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vTWVkaWFTZXNz aW9uLmNwcApAQCAtMjgsNiArMjgsOCBAQAogCiAjaWYgRU5BQkxFKE1FRElBX1NFU1NJT04pCiAK KyNpbmNsdWRlICJDaHJvbWUuaCIKKyNpbmNsdWRlICJDaHJvbWVDbGllbnQuaCIKICNpbmNsdWRl ICJEaWN0aW9uYXJ5LmgiCiAjaW5jbHVkZSAiRXZlbnQuaCIKICNpbmNsdWRlICJIVE1MTWVkaWFF bGVtZW50LmgiCkBAIC05OSw2ICsxMDEsNyBAQCB2b2lkIE1lZGlhU2Vzc2lvbjo6c2V0TWV0YWRh dGEoY29uc3QgRGljdGlvbmFyeSYgbWV0YWRhdGEpCiAgICAgICAgIGFydHdvcmtVUkwgPSBtX2Rv Y3VtZW50LmNvbXBsZXRlVVJMKGFydHdvcmtQYXRoKTsKIAogICAgIG1fbWV0YWRhdGEgPSBNZWRp YVNlc3Npb25NZXRhZGF0YSh0aXRsZSwgYXJ0aXN0LCBhbGJ1bSwgYXJ0d29ya1VSTCk7CisgICAg bV9kb2N1bWVudC5wYWdlKCktPmNocm9tZSgpLmNsaWVudCgpLm1lZGlhU2Vzc2lvbk1ldGFkYXRh RGlkQ2hhbmdlKG1fbWV0YWRhdGEpOwogfQogCiB2b2lkIE1lZGlhU2Vzc2lvbjo6cmVsZWFzZVNl c3Npb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgKaW5kZXggYjM0ZTk1MzkzY2M2ODBh NzBkM2NjYjJlZGY1NDE0ZTM0MDkxODc3MC4uN2NiMTY5MjlkNjY0MTkyZmQ5YThkNWE4ZWRhODEy MTY3YmU3NDM4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCkBAIC00NSw2ICs0NSwx MCBAQAogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgog CisjaWYgRU5BQkxFKE1FRElBX1NFU1NJT04pCisjaW5jbHVkZSAiTWVkaWFTZXNzaW9uTWV0YWRh dGEuaCIKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oSU9TKQogI2luY2x1ZGUgIlBsYXRmb3JtTGF5 ZXIuaCIKICNkZWZpbmUgTlNSZXNwb25kZXIgV0FLUmVzcG9uZGVyCkBAIC00MTIsNiArNDE2LDEw IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBpc1BsYXlpbmdNZWRpYURpZENoYW5nZShN ZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlRmxhZ3MpIHsgfQogCisjaWYgRU5BQkxFKE1FRElBX1NF U1NJT04pCisgICAgdmlydHVhbCB2b2lkIG1lZGlhU2Vzc2lvbk1ldGFkYXRhRGlkQ2hhbmdlKGNv bnN0IFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbk1ldGFkYXRhJikgeyB9CisjZW5kaWYKKwogICAgIHZp cnR1YWwgdm9pZCBzZXRQYWdlQWN0aXZpdHlTdGF0ZShQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3Mp IHsgfQogCiAjaWYgRU5BQkxFKFNVQlRMRV9DUllQVE8pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCmluZGV4IDhmYTJhMGEyNzY0ZDVmNDc1NzZj OGY0Yjk5MzZmNmYwNWYxYzE2NjcuLmY0OTE3ZjA4MzVhN2JjZDQ3OTk2OWYzNDU0M2RjMzFmZDIw MjM0NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRD b2RlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2Rl cnMuY3BwCkBAIC04Nyw2ICs4NywxMCBAQAogI2ltcG9ydCA8V2ViQ29yZS9NZWRpYVBsYXliYWNr VGFyZ2V0Q29udGV4dC5oPgogI2VuZGlmCiAKKyNpZiBFTkFCTEUoTUVESUFfU0VTU0lPTikKKyNp bmNsdWRlIDxXZWJDb3JlL01lZGlhU2Vzc2lvbk1ldGFkYXRhLmg+CisjZW5kaWYKKwogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCkBAIC0xNDQ2LDYg KzE0NTAsMzIgQEAgYm9vbCBBcmd1bWVudENvZGVyPFVzZXJTdHlsZVNoZWV0Pjo6ZGVjb2RlKEFy Z3VtZW50RGVjb2RlciYgZGVjb2RlciwgVXNlclN0eWxlU2gKICAgICByZXR1cm4gdHJ1ZTsKIH0K IAorI2lmIEVOQUJMRShNRURJQV9TRVNTSU9OKQordm9pZCBBcmd1bWVudENvZGVyPE1lZGlhU2Vz c2lvbk1ldGFkYXRhPjo6ZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYgZW5jb2RlciwgY29uc3QgTWVk aWFTZXNzaW9uTWV0YWRhdGEmIHJlc3VsdCkKK3sKKyAgICBlbmNvZGVyIDw8IHJlc3VsdC5hcnRp c3QoKTsKKyAgICBlbmNvZGVyIDw8IHJlc3VsdC5hbGJ1bSgpOworICAgIGVuY29kZXIgPDwgcmVz dWx0LnRpdGxlKCk7CisgICAgZW5jb2RlciA8PCByZXN1bHQuYXJ0d29ya1VSTCgpOworfQorCiti b29sIEFyZ3VtZW50Q29kZXI8TWVkaWFTZXNzaW9uTWV0YWRhdGE+OjpkZWNvZGUoQXJndW1lbnRE ZWNvZGVyJiBkZWNvZGVyLCBNZWRpYVNlc3Npb25NZXRhZGF0YSYgcmVzdWx0KQoreworICAgIFN0 cmluZyBhcnRpc3QsIGFsYnVtLCB0aXRsZTsKKyAgICBVUkwgYXJ0d29ya1VSTDsKKyAgICBpZiAo IWRlY29kZXIuZGVjb2RlKGFydGlzdCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAo IWRlY29kZXIuZGVjb2RlKGFsYnVtKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICgh ZGVjb2Rlci5kZWNvZGUodGl0bGUpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShhcnR3b3JrVVJMKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHJl c3VsdCA9IE1lZGlhU2Vzc2lvbk1ldGFkYXRhKHRpdGxlLCBhcnRpc3QsIGFsYnVtLCBhcnR3b3Jr VVJMKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKyNlbmRpZgorCiB2b2lkIEFyZ3VtZW50Q29kZXI8 VXNlclNjcmlwdD46OmVuY29kZShBcmd1bWVudEVuY29kZXImIGVuY29kZXIsIGNvbnN0IFVzZXJT Y3JpcHQmIHVzZXJTY3JpcHQpCiB7CiAgICAgZW5jb2RlciA8PCB1c2VyU2NyaXB0LnNvdXJjZSgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVy cy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5oCmluZGV4 IGY5NzhmMTI0NGYxMDQxZjRhMTU0YzBkYmQyMzdmNzFlZGQyYjBkMTYuLjhlNWMxMDRlYjc2ODIy MDgzM2E5NjM1OTIzZTUyZTA3NTk3YWUwNzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgKQEAgLTEyMSw2ICsxMjEsMTIgQEAgc3RydWN0IE1lZGlh UGxheWJhY2tUYXJnZXRDb250ZXh0OwogfQogI2VuZGlmCiAKKyNpZiBFTkFCTEUoTUVESUFfU0VT U0lPTikKK25hbWVzcGFjZSBXZWJDb3JlIHsKK3N0cnVjdCBNZWRpYVNlc3Npb25NZXRhZGF0YTsK K30KKyNlbmRpZgorCiBuYW1lc3BhY2UgSVBDIHsKIAogdGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1l bnRDb2RlcjxXZWJDb3JlOjpBZmZpbmVUcmFuc2Zvcm0+IHsKQEAgLTQ1NSw2ICs0NjEsMTMgQEAg dGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRDb2RlcjxXZWJDb3JlOjpDb250ZW50RmlsdGVyVW5i bG9ja0hhbmRsZXI+IHsKIH07CiAjZW5kaWYKIAorI2lmIEVOQUJMRShNRURJQV9TRVNTSU9OKQor dGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRDb2RlcjxXZWJDb3JlOjpNZWRpYVNlc3Npb25NZXRh ZGF0YT4geworICAgIHN0YXRpYyB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXImLCBjb25zdCBX ZWJDb3JlOjpNZWRpYVNlc3Npb25NZXRhZGF0YSYpOworICAgIHN0YXRpYyBib29sIGRlY29kZShB cmd1bWVudERlY29kZXImLCBXZWJDb3JlOjpNZWRpYVNlc3Npb25NZXRhZGF0YSYpOworfTsKKyNl bmRpZgorCiB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OlRleHRJbmRp Y2F0b3JEYXRhPiB7CiAgICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYsIGNv bnN0IFdlYkNvcmU6OlRleHRJbmRpY2F0b3JEYXRhJik7CiAgICAgc3RhdGljIGJvb2wgZGVjb2Rl KEFyZ3VtZW50RGVjb2RlciYsIFdlYkNvcmU6OlRleHRJbmRpY2F0b3JEYXRhJik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGE1NTBlMzU3MGNkZTdlYzAw ZTVlZjI4ZmM3OTEyMzVjOTQxMTQxZGEuLjYyZDYzMjZkNThhNTVlNjk2MTNhNjdhN2EyMDE0MTBl ZjgyNGFjNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBA IC01NzcwLDYgKzU3NzAsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmlzUGxheWluZ01lZGlhRGlk Q2hhbmdlKE1lZGlhUHJvZHVjZXI6Ok1lZGlhU3RhdGVGbGFncyBzdGF0ZSkKICAgICBtX3VpQ2xp ZW50LT5pc1BsYXlpbmdBdWRpb0RpZENoYW5nZSgqdGhpcyk7CiB9CiAKKyNpZiBFTkFCTEUoTUVE SUFfU0VTU0lPTikKK3ZvaWQgV2ViUGFnZVByb3h5OjptZWRpYVNlc3Npb25NZXRhZGF0YURpZENo YW5nZShjb25zdCBXZWJDb3JlOjpNZWRpYVNlc3Npb25NZXRhZGF0YSYgbWV0YWRhdGEpCit7Cit9 CisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKE1BQykKIHZvaWQgV2ViUGFnZVByb3h5OjpyZW1vdmVO YXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90KCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaAppbmRleCA4ZTk0MTgzOTRiZTI5ZjdmZjNmNWVkMmVlNDc5OWNiYjQ2NjFmMzI2 Li5kZDg4MDY5YWRhZWVjZjk5MDRiZTA2NmNlODA2MzBhZDgyMTUzNDNjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0xMTksNiArMTE5LDEwIEBACiAjaW5jbHVk ZSA8V2ViQ29yZS9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyQ2xpZW50Lmg+CiAjZW5kaWYKIAorI2lm IEVOQUJMRShNRURJQV9TRVNTSU9OKQorI2luY2x1ZGUgPFdlYkNvcmUvTWVkaWFTZXNzaW9uTWV0 YWRhdGEuaD4KKyNlbmRpZgorCiBuYW1lc3BhY2UgQVBJIHsKIGNsYXNzIENvbnRleHRNZW51Q2xp ZW50OwogY2xhc3MgRmluZENsaWVudDsKQEAgLTEwMTMsNiArMTAxNywxMCBAQCBwdWJsaWM6CiAg ICAgYm9vbCBpc1BsYXlpbmdBdWRpbygpIGNvbnN0IHsgcmV0dXJuICEhKG1fbWVkaWFTdGF0ZSAm IFdlYkNvcmU6Ok1lZGlhUHJvZHVjZXI6OklzUGxheWluZ0F1ZGlvKTsgfQogICAgIHZvaWQgaXNQ bGF5aW5nTWVkaWFEaWRDaGFuZ2UoV2ViQ29yZTo6TWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZUZs YWdzKTsKIAorI2lmIEVOQUJMRShNRURJQV9TRVNTSU9OKQorICAgIHZvaWQgbWVkaWFTZXNzaW9u TWV0YWRhdGFEaWRDaGFuZ2UoY29uc3QgV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWV0YWRhdGEmKTsK KyNlbmRpZgorCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIHZvaWQgcmVtb3ZlTmF2aWdhdGlvbkdl c3R1cmVTbmFwc2hvdCgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5tZXNzYWdlcy5pbgppbmRleCBlOGY1ZTliY2Q2NDIzMmVkZDFiNTliNjU2YmU0ZWJi ODYxYjIyYTcwLi5mNDIxNDQ2M2RiYTZiNmEyYWExZjFjMmY1MjJkY2Y5MzA4NGY2ODE1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmlu CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4K QEAgLTQyMyw2ICs0MjMsMTAgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKIAogICAgIElz UGxheWluZ01lZGlhRGlkQ2hhbmdlKHVuc2lnbmVkIHN0YXRlKQogCisjaWYgRU5BQkxFKE1FRElB X1NFU1NJT04pCisgICAgTWVkaWFTZXNzaW9uTWV0YWRhdGFEaWRDaGFuZ2UoV2ViQ29yZTo6TWVk aWFTZXNzaW9uTWV0YWRhdGEgbWV0YWRhdGEpOworI2VuZGlmCisKICNpZiBQTEFURk9STShNQUMp CiAgICAgRGlkUGVyZm9ybUltbWVkaWF0ZUFjdGlvbkhpdFRlc3Qoc3RydWN0IFdlYktpdDo6V2Vi SGl0VGVzdFJlc3VsdDo6RGF0YSByZXN1bHQsIGJvb2wgY29udGVudFByZXZlbnRzRGVmYXVsdCwg V2ViS2l0OjpVc2VyRGF0YSB1c2VyRGF0YSkKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3Bw CmluZGV4IDk5MThhZmFhYTAzYTYzODQxYzRjNjAyNDlhYjZiYzhjOWE2M2JhZjIuLjlhZDQ3ODI0 NTU0Zjg0MjJiOTI3ZjRjN2Q3ODFiOWU2MDcwNGFiMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5j cHAKQEAgLTEwNjEsNiArMTA2MSwxMyBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6aXNQbGF5aW5n TWVkaWFEaWRDaGFuZ2UoV2ViQ29yZTo6TWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZQogICAgIG1f cGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpJc1BsYXlpbmdNZWRpYURpZENoYW5n ZShzdGF0ZSkpOwogfQogCisjaWYgRU5BQkxFKE1FRElBX1NFU1NJT04pCit2b2lkIFdlYkNocm9t ZUNsaWVudDo6bWVkaWFTZXNzaW9uTWV0YWRhdGFEaWRDaGFuZ2UoY29uc3QgV2ViQ29yZTo6TWVk aWFTZXNzaW9uTWV0YWRhdGEmIG1ldGFkYXRhKQoreworICAgIG1fcGFnZS0+c2VuZChNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpNZWRpYVNlc3Npb25NZXRhZGF0YURpZENoYW5nZShtZXRhZGF0YSkp OworfQorI2VuZGlmCisKIHZvaWQgV2ViQ2hyb21lQ2xpZW50OjpzZXRQYWdlQWN0aXZpdHlTdGF0 ZShQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3MgYWN0aXZpdHlTdGF0ZSkKIHsKICAgICBtX3BhZ2Ut PnNldFBhZ2VBY3Rpdml0eVN0YXRlKGFjdGl2aXR5U3RhdGUpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmgK aW5kZXggZWI5YWFlYjY0YjI2ZjU0YjE3NzcwZGMzNWI0MmM5OTQ5ZjNmNWMzZC4uODk2NDA1MDIz OWNmNzIzYjhhNzQ3MWYxYzA1MzEyMGRjMzc3ODcwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oCkBA IC0yOTQsNiArMjk0LDEwIEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGlzUGxheWluZ01l ZGlhRGlkQ2hhbmdlKFdlYkNvcmU6Ok1lZGlhUHJvZHVjZXI6Ok1lZGlhU3RhdGVGbGFncykgb3Zl cnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHNldFBhZ2VBY3Rpdml0eVN0YXRlKFdlYkNvcmU6OlBh Z2VBY3Rpdml0eVN0YXRlOjpGbGFncykgb3ZlcnJpZGU7CiAKKyNpZiBFTkFCTEUoTUVESUFfU0VT U0lPTikKKyAgICB2aXJ0dWFsIHZvaWQgbWVkaWFTZXNzaW9uTWV0YWRhdGFEaWRDaGFuZ2UoY29u c3QgV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWV0YWRhdGEmKSBvdmVycmlkZTsKKyNlbmRpZgorCiAj aWYgRU5BQkxFKFNVQlRMRV9DUllQVE8pCiAgICAgdmlydHVhbCBib29sIHdyYXBDcnlwdG9LZXko Y29uc3QgVmVjdG9yPHVpbnQ4X3Q+JiwgVmVjdG9yPHVpbnQ4X3Q+JikgY29uc3Qgb3ZlcnJpZGU7 CiAgICAgdmlydHVhbCBib29sIHVud3JhcENyeXB0b0tleShjb25zdCBWZWN0b3I8dWludDhfdD4m LCBWZWN0b3I8dWludDhfdD4mKSBjb25zdCBvdmVycmlkZTsK