85194 2012-04-30 07:48:44 -0700 [GTK] Missing WebPreferences for media playback requiring user gestures and inline playback 2012-05-09 10:22:45 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 spena webkit-unassigned mrobinson pnormand spena webkit.review.bot oldest_to_newest 612629 0 spena 2012-04-30 07:48:44 -0700 When the WebPreferences for media playback requiring user gestures or supporting inline playback were added in bug #64742, GTK+ support wasn't. Later, when bug #83620 (Media engine should not be told to prepare for playback if media loading is not allowed) was fixed, some unit tests started being flaky. This was reported as bug #83874. Although I proposed there a fix involving adding the missing WebPreferences to the GTK+ API, that wasn't the cause for flakyness (Philippe solved that fixing an existing error in the tests). The WebPreferences weren't finally added there, so this bug is meant for that. 612703 1 139466 spena 2012-04-30 09:40:53 -0700 Created attachment 139466 Patch 612708 2 spena 2012-04-30 09:46:23 -0700 (In reply to comment #1) > Created an attachment (id=139466) [details] > Patch I'm not sure if this patch deserves new tests: in bug #64742, no tests were added, and they were similar changes. I noticed an almost-flaky test (media/track/track-cues-pause-on-exit.html). It's been failing sometimes (timing out) after applying this test, but not always. I don't think it is related to this change, but anyway. 613301 3 139466 pnormand 2012-05-01 01:01:43 -0700 Comment on attachment 139466 Patch Alright, looks good to me but we'd need another reviewer to +1. Will you provide a similar patch but for WebKit2? 614636 4 spena 2012-05-02 13:58:08 -0700 (In reply to comment #3) > (From update of attachment 139466 [details]) > Alright, looks good to me but we'd need another reviewer to +1. Will you provide a similar patch but for WebKit2? Yes: I'll report a new bug with a patch for the WebKit2 part tomorrow. 615238 5 pnormand 2012-05-03 06:39:28 -0700 Martin can you please have a look at this patch? I did a first review but we need another +1 for the added API. Thanks! 615302 6 139466 mrobinson 2012-05-03 08:41:00 -0700 Comment on attachment 139466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139466&action=review Looks good. r- only because you don't have commit access yet the documentation isn't quite clear. > Source/WebKit/gtk/webkit/webkitwebsettings.cpp:985 > + * Whether an user gesture would be required to start media playback or load > + * media. This is off by default, so media playback could start > + * automatically. Setting it on requires a gesture by the user to start > + * playback, or to load the media. > + * Weird English rules exception nit: Whether an user -> Whether a user I think this documentation could be slightly more clear about what kind of gesture is required to start playback. For instance, if I turn this on, what will I need to do to trigger playback? Mouse over the page? Mouse over the element itself? Click on the element? 619480 7 spena 2012-05-09 07:55:04 -0700 (In reply to comment #6) > (From update of attachment 139466 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=139466&action=review > > Looks good. r- only because you don't have commit access yet the documentation isn't quite clear. > > > Source/WebKit/gtk/webkit/webkitwebsettings.cpp:985 > > + * Whether an user gesture would be required to start media playback or load > > + * media. This is off by default, so media playback could start > > + * automatically. Setting it on requires a gesture by the user to start > > + * playback, or to load the media. > > + * > > Weird English rules exception nit: Whether an user -> Whether a user Thanks for catching, I'll fix this. > I think this documentation could be slightly more clear about what kind of gesture is required to start playback. For instance, if I turn this on, what will I need to do to trigger playback? Mouse over the page? Mouse over the element itself? Click on the element? From « LayoutTests/media/video-play-require-user-gesture.html », I understand it typically involves clicking on the Play button, but probably other gestures could be required. I guess I can make the documentation read something like: « Whether a user gesture (typically clicking on the play button) would be required to start media playback or load media... » What do you think? I'll use the same description for the WK2 patch. 619501 8 mrobinson 2012-05-09 08:17:43 -0700 Sounds good to me! 619513 9 140951 spena 2012-05-09 08:30:16 -0700 Created attachment 140951 Patch 619621 10 140951 webkit.review.bot 2012-05-09 10:22:40 -0700 Comment on attachment 140951 Patch Clearing flags on attachment: 140951 Committed r116541: <http://trac.webkit.org/changeset/116541> 619622 11 webkit.review.bot 2012-05-09 10:22:45 -0700 All reviewed patches have been landed. Closing bug. 139466 2012-04-30 09:40:53 -0700 2012-05-09 08:30:05 -0700 Patch bug-85194-20120430184051.patch text/plain 7930 spena U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggZjBjMzc3ZDJh YTYxZDkwODgzZTExMjAzNTY0NDZmZWFmODc5ZjA1Zi4uMTYyMzJiZGNkYTk3ZmI4NmQxMmFhNTQ4 OWYzMDBiMTY1NjM2ZDlkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEy LTA0LTMwICBTaW1vbiBQZW5hICA8c3BlbmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBN aXNzaW5nIFdlYlByZWZlcmVuY2VzIGZvciBtZWRpYSBwbGF5YmFjayByZXF1aXJpbmcgdXNlciBn ZXN0dXJlcyBhbmQgaW5saW5lIHBsYXliYWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04NTE5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEV4cG9zZSBXZWJQcmVmZXJlbmNlcyBmb3IgbWVkaWEgcGxheWJh Y2sgcmVxdWlyZXMgdXNlciBnZXN0dXJlIGFuZAorICAgICAgICBtZWRpYSBwbGF5YmFjayBhbGxv d3MgaW5saW5lIHRvIEdUSyBzaWRlLgorCisgICAgICAgIFRoaXMgYWRkcyB0d28gcHJvcGVydGll cyAobWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUgYW5kCisgICAgICAgIG1lZGlhUGxh eWJhY2tBbGxvd3NJbmxpbmUpIHRvIEdUSyBXZWJLaXQgV2ViU2V0dGluZ3MsIGFuZCBjb25uZWN0 cworICAgICAgICB0aGVtIHRvIHRoZSBXZWJLaXQgV2ViVmlldywgc28gY2xpZW50cyBjYW4gcHJv Z3JhbW1hdGljYWxseSBtb2RpZnkKKyAgICAgICAgdGhlbS4KKworICAgICAgICAqIHdlYmtpdC93 ZWJraXR3ZWJzZXR0aW5ncy5jcHA6IGluc3RhbGwgbmV3IHByb3BlcnRpZXMgYW5kIHVwZGF0ZQor ICAgICAgICBzZXR0ZXIgYW5kIGdldHRlcgorICAgICAgICAod2Via2l0X3dlYl9zZXR0aW5nc19j bGFzc19pbml0KToKKyAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3Nfc2V0X3Byb3BlcnR5KToK KyAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3NfZ2V0X3Byb3BlcnR5KToKKyAgICAgICAgKiB3 ZWJraXQvd2Via2l0d2Vic2V0dGluZ3Nwcml2YXRlLmg6IGFkZCBtZWRpYSBwbGF5YmFjayByZWxh dGVkCisgICAgICAgIHByb3BlcnRpZXMKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5j cHA6IGNvbm5lY3QgbmV3bHkgYWRkZWQgcHJvcGVydGllcworICAgICAgICAod2Via2l0X3dlYl92 aWV3X3VwZGF0ZV9zZXR0aW5ncyk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfc2V0dGluZ3Nf bm90aWZ5KToKKwogMjAxMi0wNC0zMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gVXBkYXRlIE5FV1MgYW5kIGNvbmZpZ3VyZS5hYyBm b3IgMS45LjEgcmVsZWFzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYnNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJz ZXR0aW5ncy5jcHAKaW5kZXggMWEzYTI3ZWI0MTBkMGZkYThmMzMyMmVkNmE1ODk5NjI1MGMyYTc3 OC4uYmY5NWZlZTRmY2MwNzJhZDk1OTc5OWFiZjJmNjUzN2YyNWU1ZTkzYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwCkBAIC0xMjEsNyArMTIx LDkgQEAgZW51bSB7CiAgICAgUFJPUF9FTkFCTEVfV0VCR0wsCiAgICAgUFJPUF9FTkFCTEVfV0VC X0FVRElPLAogICAgIFBST1BfRU5BQkxFX0FDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HLAotICAgIFBS T1BfRU5BQkxFX1NNT09USF9TQ1JPTExJTkcKKyAgICBQUk9QX0VOQUJMRV9TTU9PVEhfU0NST0xM SU5HLAorICAgIFBST1BfTUVESUFfUExBWUJBQ0tfUkVRVUlSRVNfVVNFUl9HRVNUVVJFLAorICAg IFBST1BfTUVESUFfUExBWUJBQ0tfQUxMT1dTX0lOTElORQogfTsKIAogLy8gQ3JlYXRlIGEgZGVm YXVsdCB1c2VyIGFnZW50IHN0cmluZwpAQCAtOTcyLDYgKzk3NCw0MiBAQCBzdGF0aWMgdm9pZCB3 ZWJraXRfd2ViX3NldHRpbmdzX2NsYXNzX2luaXQoV2ViS2l0V2ViU2V0dGluZ3NDbGFzcyoga2xh c3MpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBfKCJXaGV0aGVyIHRvIGVuYWJsZSBzbW9vdGggc2Nyb2xsaW5nIiksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGQUxTRSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZs YWdzKSk7CisKKyAgICAvKioKKyAgICAqIFdlYktpdFdlYlNldHRpbmdzOm1lZGlhLXBsYXliYWNr LXJlcXVpcmVzLXVzZXItZ2VzdHVyZQorICAgICoKKyAgICAqIFdoZXRoZXIgYW4gdXNlciBnZXN0 dXJlIHdvdWxkIGJlIHJlcXVpcmVkIHRvIHN0YXJ0IG1lZGlhIHBsYXliYWNrIG9yIGxvYWQKKyAg ICAqIG1lZGlhLiBUaGlzIGlzIG9mZiBieSBkZWZhdWx0LCBzbyBtZWRpYSBwbGF5YmFjayBjb3Vs ZCBzdGFydAorICAgICogYXV0b21hdGljYWxseS4gU2V0dGluZyBpdCBvbiByZXF1aXJlcyBhIGdl c3R1cmUgYnkgdGhlIHVzZXIgdG8gc3RhcnQKKyAgICAqIHBsYXliYWNrLCBvciB0byBsb2FkIHRo ZSBtZWRpYS4KKyAgICAqCisgICAgKiBTaW5jZTogMS4xMC4wCisgICAgKi8KKyAgICBnX29iamVj dF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KGdvYmplY3RfY2xhc3MsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBQUk9QX01FRElBX1BMQVlCQUNLX1JFUVVJUkVTX1VTRVJfR0VT VFVSRSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19i b29sZWFuKCJtZWRpYS1wbGF5YmFjay1yZXF1aXJlcy11c2VyLWdlc3R1cmUiLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXygiTWVkaWEg cGxheWJhY2sgcmVxdWlyZXMgdXNlciBnZXN0dXJlIiksCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJXaGV0aGVyIG1lZGlhIHBsYXli YWNrIHJlcXVpcmVzIHVzZXIgZ2VzdHVyZSIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRkFMU0UsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmbGFncykpOworCisgICAgLyoq CisgICAgKiBXZWJLaXRXZWJTZXR0aW5nczptZWRpYS1wbGF5YmFjay1hbGxvd3MtaW5saW5lCisg ICAgKgorICAgICogV2hldGhlciBtZWRpYSBwbGF5YmFjayBpcyBmdWxsLXNjcmVlbiBvbmx5IG9y IGlubGluZSBwbGF5YmFjayBpcyBhbGxvd2VkLgorICAgICogVGhpcyBpcyB0cnVlIGJ5IGRlZmF1 bHQsIHNvIG1lZGlhIHBsYXliYWNrIGNhbiBiZSBpbmxpbmUuIFNldHRpbmcgaXQgdG8KKyAgICAq IGZhbHNlIGFsbG93cyBzcGVjaWZ5aW5nIHRoYXQgbWVkaWEgcGxheWJhY2sgc2hvdWxkIGJlIGFs d2F5cyBmdWxsc2NyZWVuLgorICAgICoKKyAgICAqIFNpbmNlOiAxLjEwLjAKKyAgICAqLworICAg IGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoZ29iamVjdF9jbGFzcywKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1BfTUVESUFfUExBWUJBQ0tfQUxMT1dTX0lO TElORSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19i b29sZWFuKCJtZWRpYS1wbGF5YmFjay1hbGxvd3MtaW5saW5lIiwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8oIk1lZGlhIHBsYXliYWNr IGFsbG93cyBpbmxpbmUiKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIF8oIldoZXRoZXIgbWVkaWEgcGxheWJhY2sgYWxsb3dzIGlubGlu ZSIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgVFJVRSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGZsYWdzKSk7CisKIH0KIAogc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zZXR0 aW5nc19pbml0KFdlYktpdFdlYlNldHRpbmdzKiB3ZWJfc2V0dGluZ3MpCkBAIC0xMTUwLDYgKzEx ODgsMTIgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19zZXRfcHJvcGVydHkoR09i amVjdCogb2JqZWN0LCBndWludCBwcm9wX2lkLCBjb24KICAgICBjYXNlIFBST1BfRU5BQkxFX1NN T09USF9TQ1JPTExJTkc6CiAgICAgICAgIHByaXYtPmVuYWJsZVNtb290aFNjcm9sbGluZyA9IGdf dmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1Bf TUVESUFfUExBWUJBQ0tfUkVRVUlSRVNfVVNFUl9HRVNUVVJFOgorICAgICAgICBwcml2LT5tZWRp YVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZSA9IGdfdmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUp OworICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfTUVESUFfUExBWUJBQ0tfQUxMT1dTX0lO TElORToKKyAgICAgICAgcHJpdi0+bWVkaWFQbGF5YmFja0FsbG93c0lubGluZSA9IGdfdmFsdWVf Z2V0X2Jvb2xlYW4odmFsdWUpOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAg ICBHX09CSkVDVF9XQVJOX0lOVkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wX2lkLCBwc3Bl Yyk7CiAgICAgICAgIGJyZWFrOwpAQCAtMTMxOCw2ICsxMzYyLDEyIEBAIHN0YXRpYyB2b2lkIHdl YmtpdF93ZWJfc2V0dGluZ3NfZ2V0X3Byb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJv cF9pZCwgR1ZhCiAgICAgY2FzZSBQUk9QX0VOQUJMRV9TTU9PVEhfU0NST0xMSU5HOgogICAgICAg ICBnX3ZhbHVlX3NldF9ib29sZWFuKHZhbHVlLCBwcml2LT5lbmFibGVTbW9vdGhTY3JvbGxpbmcp OwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfTUVESUFfUExBWUJBQ0tfUkVRVUlSRVNf VVNFUl9HRVNUVVJFOgorICAgICAgICBnX3ZhbHVlX3NldF9ib29sZWFuKHZhbHVlLCBwcml2LT5t ZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZSk7CisgICAgICAgIGJyZWFrOworICAgIGNh c2UgUFJPUF9NRURJQV9QTEFZQkFDS19BTExPV1NfSU5MSU5FOgorICAgICAgICBnX3ZhbHVlX3Nl dF9ib29sZWFuKHZhbHVlLCBwcml2LT5tZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lKTsKKyAgICAg ICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BS T1BFUlRZX0lEKG9iamVjdCwgcHJvcF9pZCwgcHNwZWMpOwogICAgICAgICBicmVhazsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5nc3ByaXZhdGUu aCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5nc3ByaXZhdGUuaApp bmRleCA0NWY4MjIzNzEwMTE2MDIzYzJiNTg0ZDQxMThlMTVmMTFmYzVlMmY0Li41ZWQyNGE1Mzc3 ZmYwYTZlMWY2MzZmYzI2NzZhZDI2NzlhNjg2MGRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3Nwcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzcHJpdmF0ZS5oCkBAIC04MSw2ICs4MSw4IEBA IHN0cnVjdCBfV2ViS2l0V2ViU2V0dGluZ3NQcml2YXRlIHsKICAgICBnYm9vbGVhbiBlbmFibGVX ZWJBdWRpbzsKICAgICBnYm9vbGVhbiBlbmFibGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nOwogICAg IGdib29sZWFuIGVuYWJsZVNtb290aFNjcm9sbGluZzsKKyAgICBnYm9vbGVhbiBtZWRpYVBsYXli YWNrUmVxdWlyZXNVc2VyR2VzdHVyZTsKKyAgICBnYm9vbGVhbiBtZWRpYVBsYXliYWNrQWxsb3dz SW5saW5lOwogfTsKIAogV0VCS0lUX0FQSSB2b2lkIHdlYmtpdF93ZWJfc2V0dGluZ3NfYWRkX2V4 dHJhX3BsdWdpbl9kaXJlY3RvcnkoV2ViS2l0V2ViVmlldyosIGNvbnN0IGdjaGFyKiBkaXJlY3Rv cnkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu Y3BwIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDNm MTc3YmVlYWZkYjMxMGJlNWI4MzVhMmU2ZjljMjBiMjNmYzVjNjIuLmFjMTg3YmFhMWVmMGVkMmYy OWJlYTEwMzQ0NDM5NWM1NGMwMzkxZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Vi a2l0d2Vidmlldy5jcHAKQEAgLTMzNzUsNiArMzM3NSw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93 ZWJfdmlld191cGRhdGVfc2V0dGluZ3MoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICBjb3Jl U2V0dGluZ3MtPnNldEphdmFFbmFibGVkKHNldHRpbmdzUHJpdmF0ZS0+ZW5hYmxlSmF2YUFwcGxl dCk7CiAgICAgY29yZVNldHRpbmdzLT5zZXRIeXBlcmxpbmtBdWRpdGluZ0VuYWJsZWQoc2V0dGlu Z3NQcml2YXRlLT5lbmFibGVIeXBlcmxpbmtBdWRpdGluZyk7CiAgICAgY29yZVNldHRpbmdzLT5z ZXRETlNQcmVmZXRjaGluZ0VuYWJsZWQoc2V0dGluZ3NQcml2YXRlLT5lbmFibGVETlNQcmVmZXRj aGluZyk7CisgICAgY29yZVNldHRpbmdzLT5zZXRNZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2Vz dHVyZShzZXR0aW5nc1ByaXZhdGUtPm1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlKTsK KyAgICBjb3JlU2V0dGluZ3MtPnNldE1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUoc2V0dGluZ3NQ cml2YXRlLT5tZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lKTsKIAogI2lmIEVOQUJMRShTUUxfREFU QUJBU0UpCiAgICAgQWJzdHJhY3REYXRhYmFzZTo6c2V0SXNBdmFpbGFibGUoc2V0dGluZ3NQcml2 YXRlLT5lbmFibGVIVE1MNURhdGFiYXNlKTsKQEAgLTM1MTYsNiArMzUxOCwxMCBAQCBzdGF0aWMg dm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2V0dGluZ3Nfbm90aWZ5KFdlYktpdFdlYlNldHRpbmdzKiB3 ZWJTZXR0aW5ncywgR1BhcgogICAgICAgICBzZXR0aW5ncy0+c2V0SmF2YUVuYWJsZWQoZ192YWx1 ZV9nZXRfYm9vbGVhbigmdmFsdWUpKTsKICAgICBlbHNlIGlmIChuYW1lID09IGdfaW50ZXJuX3N0 cmluZygiZW5hYmxlLWh5cGVybGluay1hdWRpdGluZyIpKQogICAgICAgICBzZXR0aW5ncy0+c2V0 SHlwZXJsaW5rQXVkaXRpbmdFbmFibGVkKGdfdmFsdWVfZ2V0X2Jvb2xlYW4oJnZhbHVlKSk7Cisg ICAgZWxzZSBpZiAobmFtZSA9PSBnX2ludGVybl9zdHJpbmcoIm1lZGlhLXBsYXliYWNrLXJlcXVp cmVzLXVzZXItZ2VzdHVyZSIpKQorICAgICAgICBzZXR0aW5ncy0+c2V0TWVkaWFQbGF5YmFja1Jl cXVpcmVzVXNlckdlc3R1cmUoZ192YWx1ZV9nZXRfYm9vbGVhbigmdmFsdWUpKTsKKyAgICBlbHNl IGlmIChuYW1lID09IGdfaW50ZXJuX3N0cmluZygibWVkaWEtcGxheWJhY2stYWxsb3dzLWlubGlu ZSIpKQorICAgICAgICBzZXR0aW5ncy0+c2V0TWVkaWFQbGF5YmFja0FsbG93c0lubGluZShnX3Zh bHVlX2dldF9ib29sZWFuKCZ2YWx1ZSkpOwogCiAjaWYgRU5BQkxFKFNQRUxMQ0hFQ0spCiAgICAg ZWxzZSBpZiAobmFtZSA9PSBnX2ludGVybl9zdHJpbmcoInNwZWxsLWNoZWNraW5nLWxhbmd1YWdl cyIpKSB7Cg== 140951 2012-05-09 08:30:16 -0700 2012-05-09 10:22:40 -0700 Patch bug-85194-20120509173014.patch text/plain 7969 spena U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2NTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNzcwNTI2ZTUz ZGE3ZWQwNWM1NDI0MWE5ZjU3YzBkNTE0NzU3YWEyZi4uMGMzZWVlYTRlNzYwNDBiZjk3YmFmNjlh YWIwODA3N2YzOTBhOTFmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEy LTA0LTMwICBTaW1vbiBQZW5hICA8c3BlbmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBN aXNzaW5nIFdlYlByZWZlcmVuY2VzIGZvciBtZWRpYSBwbGF5YmFjayByZXF1aXJpbmcgdXNlciBn ZXN0dXJlcyBhbmQgaW5saW5lIHBsYXliYWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04NTE5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEV4cG9zZSBXZWJQcmVmZXJlbmNlcyBmb3IgbWVkaWEgcGxheWJh Y2sgcmVxdWlyZXMgdXNlciBnZXN0dXJlIGFuZAorICAgICAgICBtZWRpYSBwbGF5YmFjayBhbGxv d3MgaW5saW5lIHRvIEdUSyBzaWRlLgorCisgICAgICAgIFRoaXMgYWRkcyB0d28gcHJvcGVydGll cyAobWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUgYW5kCisgICAgICAgIG1lZGlhUGxh eWJhY2tBbGxvd3NJbmxpbmUpIHRvIEdUSyBXZWJLaXQgV2ViU2V0dGluZ3MsIGFuZCBjb25uZWN0 cworICAgICAgICB0aGVtIHRvIHRoZSBXZWJLaXQgV2ViVmlldywgc28gY2xpZW50cyBjYW4gcHJv Z3JhbW1hdGljYWxseSBtb2RpZnkKKyAgICAgICAgdGhlbS4KKworICAgICAgICAqIHdlYmtpdC93 ZWJraXR3ZWJzZXR0aW5ncy5jcHA6IGluc3RhbGwgbmV3IHByb3BlcnRpZXMgYW5kIHVwZGF0ZQor ICAgICAgICBzZXR0ZXIgYW5kIGdldHRlcgorICAgICAgICAod2Via2l0X3dlYl9zZXR0aW5nc19j bGFzc19pbml0KToKKyAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3Nfc2V0X3Byb3BlcnR5KToK KyAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3NfZ2V0X3Byb3BlcnR5KToKKyAgICAgICAgKiB3 ZWJraXQvd2Via2l0d2Vic2V0dGluZ3Nwcml2YXRlLmg6IGFkZCBtZWRpYSBwbGF5YmFjayByZWxh dGVkCisgICAgICAgIHByb3BlcnRpZXMKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5j cHA6IGNvbm5lY3QgbmV3bHkgYWRkZWQgcHJvcGVydGllcworICAgICAgICAod2Via2l0X3dlYl92 aWV3X3VwZGF0ZV9zZXR0aW5ncyk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfc2V0dGluZ3Nf bm90aWZ5KToKKwogMjAxMi0wNS0wNiAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1 bmcuY29tPgogCiAgICAgICAgIENvbnZlcnQgaXNQYWdlQm94VmlzaWJsZSB0byB1c2UgSW50ZXJu YWxzIGludGVyZmFjZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJzZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0 dGluZ3MuY3BwCmluZGV4IDFhM2EyN2ViNDEwZDBmZGE4ZjMzMjJlZDZhNTg5OTYyNTBjMmE3Nzgu LmNlODc3ZTRmMGQxZWNlYWQ4Nzk4MzQzZDE3ZDI2MDQ3YjU2MmUxYWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAKKysrIGIvU291cmNl L1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcApAQCAtMTIxLDcgKzEyMSw5 IEBAIGVudW0gewogICAgIFBST1BfRU5BQkxFX1dFQkdMLAogICAgIFBST1BfRU5BQkxFX1dFQl9B VURJTywKICAgICBQUk9QX0VOQUJMRV9BQ0NFTEVSQVRFRF9DT01QT1NJVElORywKLSAgICBQUk9Q X0VOQUJMRV9TTU9PVEhfU0NST0xMSU5HCisgICAgUFJPUF9FTkFCTEVfU01PT1RIX1NDUk9MTElO RywKKyAgICBQUk9QX01FRElBX1BMQVlCQUNLX1JFUVVJUkVTX1VTRVJfR0VTVFVSRSwKKyAgICBQ Uk9QX01FRElBX1BMQVlCQUNLX0FMTE9XU19JTkxJTkUKIH07CiAKIC8vIENyZWF0ZSBhIGRlZmF1 bHQgdXNlciBhZ2VudCBzdHJpbmcKQEAgLTk3Miw2ICs5NzQsNDMgQEAgc3RhdGljIHZvaWQgd2Vi a2l0X3dlYl9zZXR0aW5nc19jbGFzc19pbml0KFdlYktpdFdlYlNldHRpbmdzQ2xhc3MqIGtsYXNz KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXygiV2hldGhlciB0byBlbmFibGUgc21vb3RoIHNjcm9sbGluZyIpLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRkFMU0UsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmbGFn cykpOworCisgICAgLyoqCisgICAgKiBXZWJLaXRXZWJTZXR0aW5nczptZWRpYS1wbGF5YmFjay1y ZXF1aXJlcy11c2VyLWdlc3R1cmUKKyAgICAqCisgICAgKiBXaGV0aGVyIGEgdXNlciBnZXN0dXJl IChzdWNoIGFzIGNsaWNraW5nIHRoZSBwbGF5IGJ1dHRvbikgd291bGQKKyAgICAqIGJlIHJlcXVp cmVkIHRvIHN0YXJ0IG1lZGlhIHBsYXliYWNrIG9yIGxvYWQgbWVkaWEuIFRoaXMgaXMgb2ZmCisg ICAgKiBieSBkZWZhdWx0LCBzbyBtZWRpYSBwbGF5YmFjayBjb3VsZCBzdGFydCBhdXRvbWF0aWNh bGx5LiBTZXR0aW5nCisgICAgKiBpdCBvbiByZXF1aXJlcyBhIGdlc3R1cmUgYnkgdGhlIHVzZXIg dG8gc3RhcnQgcGxheWJhY2ssIG9yIHRvIGxvYWQKKyAgICAqIHRoZSBtZWRpYS4KKyAgICAqCisg ICAgKiBTaW5jZTogMS4xMC4wCisgICAgKi8KKyAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3By b3BlcnR5KGdvYmplY3RfY2xhc3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBQUk9QX01FRElBX1BMQVlCQUNLX1JFUVVJUkVTX1VTRVJfR0VTVFVSRSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19ib29sZWFuKCJtZWRpYS1wbGF5 YmFjay1yZXF1aXJlcy11c2VyLWdlc3R1cmUiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXygiTWVkaWEgcGxheWJhY2sgcmVxdWlyZXMg dXNlciBnZXN0dXJlIiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBfKCJXaGV0aGVyIG1lZGlhIHBsYXliYWNrIHJlcXVpcmVzIHVzZXIg Z2VzdHVyZSIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgRkFMU0UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBmbGFncykpOworCisgICAgLyoqCisgICAgKiBXZWJLaXRXZWJT ZXR0aW5nczptZWRpYS1wbGF5YmFjay1hbGxvd3MtaW5saW5lCisgICAgKgorICAgICogV2hldGhl ciBtZWRpYSBwbGF5YmFjayBpcyBmdWxsLXNjcmVlbiBvbmx5IG9yIGlubGluZSBwbGF5YmFjayBp cyBhbGxvd2VkLgorICAgICogVGhpcyBpcyB0cnVlIGJ5IGRlZmF1bHQsIHNvIG1lZGlhIHBsYXli YWNrIGNhbiBiZSBpbmxpbmUuIFNldHRpbmcgaXQgdG8KKyAgICAqIGZhbHNlIGFsbG93cyBzcGVj aWZ5aW5nIHRoYXQgbWVkaWEgcGxheWJhY2sgc2hvdWxkIGJlIGFsd2F5cyBmdWxsc2NyZWVuLgor ICAgICoKKyAgICAqIFNpbmNlOiAxLjEwLjAKKyAgICAqLworICAgIGdfb2JqZWN0X2NsYXNzX2lu c3RhbGxfcHJvcGVydHkoZ29iamVjdF9jbGFzcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFBST1BfTUVESUFfUExBWUJBQ0tfQUxMT1dTX0lOTElORSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19ib29sZWFuKCJtZWRpYS1wbGF5 YmFjay1hbGxvd3MtaW5saW5lIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIF8oIk1lZGlhIHBsYXliYWNrIGFsbG93cyBpbmxpbmUiKSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IF8oIldoZXRoZXIgbWVkaWEgcGxheWJhY2sgYWxsb3dzIGlubGluZSIpLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVFJVRSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsYWdz KSk7CisKIH0KIAogc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19pbml0KFdlYktpdFdl YlNldHRpbmdzKiB3ZWJfc2V0dGluZ3MpCkBAIC0xMTUwLDYgKzExODksMTIgQEAgc3RhdGljIHZv aWQgd2Via2l0X3dlYl9zZXR0aW5nc19zZXRfcHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBndWlu dCBwcm9wX2lkLCBjb24KICAgICBjYXNlIFBST1BfRU5BQkxFX1NNT09USF9TQ1JPTExJTkc6CiAg ICAgICAgIHByaXYtPmVuYWJsZVNtb290aFNjcm9sbGluZyA9IGdfdmFsdWVfZ2V0X2Jvb2xlYW4o dmFsdWUpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfTUVESUFfUExBWUJBQ0tfUkVR VUlSRVNfVVNFUl9HRVNUVVJFOgorICAgICAgICBwcml2LT5tZWRpYVBsYXliYWNrUmVxdWlyZXNV c2VyR2VzdHVyZSA9IGdfdmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUpOworICAgICAgICBicmVhazsK KyAgICBjYXNlIFBST1BfTUVESUFfUExBWUJBQ0tfQUxMT1dTX0lOTElORToKKyAgICAgICAgcHJp di0+bWVkaWFQbGF5YmFja0FsbG93c0lubGluZSA9IGdfdmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUp OworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lO VkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wX2lkLCBwc3BlYyk7CiAgICAgICAgIGJyZWFr OwpAQCAtMTMxOCw2ICsxMzYzLDEyIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfc2V0dGluZ3Nf Z2V0X3Byb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcF9pZCwgR1ZhCiAgICAgY2Fz ZSBQUk9QX0VOQUJMRV9TTU9PVEhfU0NST0xMSU5HOgogICAgICAgICBnX3ZhbHVlX3NldF9ib29s ZWFuKHZhbHVlLCBwcml2LT5lbmFibGVTbW9vdGhTY3JvbGxpbmcpOwogICAgICAgICBicmVhazsK KyAgICBjYXNlIFBST1BfTUVESUFfUExBWUJBQ0tfUkVRVUlSRVNfVVNFUl9HRVNUVVJFOgorICAg ICAgICBnX3ZhbHVlX3NldF9ib29sZWFuKHZhbHVlLCBwcml2LT5tZWRpYVBsYXliYWNrUmVxdWly ZXNVc2VyR2VzdHVyZSk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9NRURJQV9QTEFZ QkFDS19BTExPV1NfSU5MSU5FOgorICAgICAgICBnX3ZhbHVlX3NldF9ib29sZWFuKHZhbHVlLCBw cml2LT5tZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lKTsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVm YXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lEKG9iamVjdCwg cHJvcF9pZCwgcHNwZWMpOwogICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5nc3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5nc3ByaXZhdGUuaAppbmRleCA0NWY4MjIzNzEwMTE2 MDIzYzJiNTg0ZDQxMThlMTVmMTFmYzVlMmY0Li41ZWQyNGE1Mzc3ZmYwYTZlMWY2MzZmYzI2NzZh ZDI2NzlhNjg2MGRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 d2Vic2V0dGluZ3Nwcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYnNldHRpbmdzcHJpdmF0ZS5oCkBAIC04MSw2ICs4MSw4IEBAIHN0cnVjdCBfV2ViS2l0V2Vi U2V0dGluZ3NQcml2YXRlIHsKICAgICBnYm9vbGVhbiBlbmFibGVXZWJBdWRpbzsKICAgICBnYm9v bGVhbiBlbmFibGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nOwogICAgIGdib29sZWFuIGVuYWJsZVNt b290aFNjcm9sbGluZzsKKyAgICBnYm9vbGVhbiBtZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2Vz dHVyZTsKKyAgICBnYm9vbGVhbiBtZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lOwogfTsKIAogV0VC S0lUX0FQSSB2b2lkIHdlYmtpdF93ZWJfc2V0dGluZ3NfYWRkX2V4dHJhX3BsdWdpbl9kaXJlY3Rv cnkoV2ViS2l0V2ViVmlldyosIGNvbnN0IGdjaGFyKiBkaXJlY3RvcnkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvU291cmNlL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDgwZTJmYzNhMzFkZWRlN2RhYzQ2 ZjQyY2U2ZDYzNzJkN2VmNTE5MjcuLjMwMGVhOGM5OTU2OTVmMGY0MWVlYTVhMWQyM2Q1MDZjMTBj YTJhMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAg LTMzMzQsNiArMzMzNCw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld191cGRhdGVfc2V0 dGluZ3MoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICBjb3JlU2V0dGluZ3MtPnNldEphdmFF bmFibGVkKHNldHRpbmdzUHJpdmF0ZS0+ZW5hYmxlSmF2YUFwcGxldCk7CiAgICAgY29yZVNldHRp bmdzLT5zZXRIeXBlcmxpbmtBdWRpdGluZ0VuYWJsZWQoc2V0dGluZ3NQcml2YXRlLT5lbmFibGVI eXBlcmxpbmtBdWRpdGluZyk7CiAgICAgY29yZVNldHRpbmdzLT5zZXRETlNQcmVmZXRjaGluZ0Vu YWJsZWQoc2V0dGluZ3NQcml2YXRlLT5lbmFibGVETlNQcmVmZXRjaGluZyk7CisgICAgY29yZVNl dHRpbmdzLT5zZXRNZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZShzZXR0aW5nc1ByaXZh dGUtPm1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlKTsKKyAgICBjb3JlU2V0dGluZ3Mt PnNldE1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUoc2V0dGluZ3NQcml2YXRlLT5tZWRpYVBsYXli YWNrQWxsb3dzSW5saW5lKTsKIAogI2lmIEVOQUJMRShTUUxfREFUQUJBU0UpCiAgICAgQWJzdHJh Y3REYXRhYmFzZTo6c2V0SXNBdmFpbGFibGUoc2V0dGluZ3NQcml2YXRlLT5lbmFibGVIVE1MNURh dGFiYXNlKTsKQEAgLTM0NzUsNiArMzQ3NywxMCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3Zp ZXdfc2V0dGluZ3Nfbm90aWZ5KFdlYktpdFdlYlNldHRpbmdzKiB3ZWJTZXR0aW5ncywgR1Bhcgog ICAgICAgICBzZXR0aW5ncy0+c2V0SmF2YUVuYWJsZWQoZ192YWx1ZV9nZXRfYm9vbGVhbigmdmFs dWUpKTsKICAgICBlbHNlIGlmIChuYW1lID09IGdfaW50ZXJuX3N0cmluZygiZW5hYmxlLWh5cGVy bGluay1hdWRpdGluZyIpKQogICAgICAgICBzZXR0aW5ncy0+c2V0SHlwZXJsaW5rQXVkaXRpbmdF bmFibGVkKGdfdmFsdWVfZ2V0X2Jvb2xlYW4oJnZhbHVlKSk7CisgICAgZWxzZSBpZiAobmFtZSA9 PSBnX2ludGVybl9zdHJpbmcoIm1lZGlhLXBsYXliYWNrLXJlcXVpcmVzLXVzZXItZ2VzdHVyZSIp KQorICAgICAgICBzZXR0aW5ncy0+c2V0TWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUo Z192YWx1ZV9nZXRfYm9vbGVhbigmdmFsdWUpKTsKKyAgICBlbHNlIGlmIChuYW1lID09IGdfaW50 ZXJuX3N0cmluZygibWVkaWEtcGxheWJhY2stYWxsb3dzLWlubGluZSIpKQorICAgICAgICBzZXR0 aW5ncy0+c2V0TWVkaWFQbGF5YmFja0FsbG93c0lubGluZShnX3ZhbHVlX2dldF9ib29sZWFuKCZ2 YWx1ZSkpOwogCiAjaWYgRU5BQkxFKFNQRUxMQ0hFQ0spCiAgICAgZWxzZSBpZiAobmFtZSA9PSBn X2ludGVybl9zdHJpbmcoInNwZWxsLWNoZWNraW5nLWxhbmd1YWdlcyIpKSB7Cg==