43278 2010-07-30 16:13:52 -0700 [Gtk] Enable view mode media feature layout test 2010-08-19 06:33:33 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 luiz webkit-unassigned gustavo kenneth mrobinson tonikitoo webkit.review.bot xan.lopez oldest_to_newest 258446 0 luiz 2010-07-30 16:13:52 -0700 Test fast/media/view-mode-media-feature.html is skipped because LayoutTestController lacks method setViewModeMediaFeature(). 266384 1 64775 gustavo 2010-08-18 14:42:43 -0700 Created attachment 64775 Add API to support the feature, and the testing infrastructure to test it 266385 2 webkit.review.bot 2010-08-18 14:43:44 -0700 Attachment 64775 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit/gtk/webkit/webkitwebview.h:68: This { should be at the end of the previous line [whitespace/braces] [4] WebKit/gtk/webkit/webkitwebview.h:352: Extra space before ( in function call [whitespace/parens] [4] WebKit/gtk/webkit/webkitwebview.h:356: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 3 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 266386 3 64775 kenneth 2010-08-18 14:44:54 -0700 Comment on attachment 64775 Add API to support the feature, and the testing infrastructure to test it Looks good! 266392 4 64775 gustavo 2010-08-18 14:51:45 -0700 Comment on attachment 64775 Add API to support the feature, and the testing infrastructure to test it Thanks, Kenneth! I'll switch the review flag to ? just to get the EWS bots to try the patch for me since they seem to not build patches after they get r+ =( 266393 5 kenneth 2010-08-18 14:52:41 -0700 Fine :-) history records the r+ 266691 6 gustavo 2010-08-19 06:18:29 -0700 (In reply to comment #2) > Attachment 64775 [details] did not pass style-queue: > > Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 > WebKit/gtk/webkit/webkitwebview.h:68: This { should be at the end of the previous line [whitespace/braces] [4] > WebKit/gtk/webkit/webkitwebview.h:352: Extra space before ( in function call [whitespace/parens] [4] > WebKit/gtk/webkit/webkitwebview.h:356: Extra space before ( in function call [whitespace/parens] [4] > Total errors found: 3 in 12 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. FWIW, these are false positives. I thought out API headers were already special-cased, but it looks like they still need to be =) 266693 7 64775 gustavo 2010-08-19 06:19:09 -0700 Comment on attachment 64775 Add API to support the feature, and the testing infrastructure to test it Removing flag, I'll land this with kenne's r+ as soon as I finish my final build test here. 266699 8 gustavo 2010-08-19 06:32:50 -0700 Landed as r65666. 266700 9 gustavo 2010-08-19 06:33:33 -0700 (In reply to comment #8) > Landed as r65666. The 65th commit of the devil, or something. 64775 2010-08-18 14:42:43 -0700 2010-08-19 06:19:09 -0700 Add API to support the feature, and the testing infrastructure to test it 0001-Add-API-support-for-the-view-mode-media-feature.patch text/plain 18427 gustavo RnJvbSA1ZjQ2YzAzNWY0OGJiOThjMGEwOTBlYjRiZGMzNzNlODc5Mzk2OGQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IFdlZCwgMTggQXVnIDIwMTAgMTg6NDE6NDIgLTAzMDAKU3ViamVjdDogW1BBVENIXSBB ZGQgQVBJIHN1cHBvcnQgZm9yIHRoZSB2aWV3IG1vZGUgbWVkaWEgZmVhdHVyZQoKLS0tCiBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTEgKysK IExheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkICAgICAgICAgICAgICAgICAgIHwgICAg MyAtCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8 ICAgMTggKysrKwogV2ViS2l0L2d0ay9kb2NzL3dlYmtpdGd0ay1zZWN0aW9ucy50eHQgICAgICAg ICAgICAgfCAgICAzICsKIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwICAgICAg ICAgICAgICAgIHwgIDEwNSArKysrKysrKysrKysrKysrKysrLQogV2ViS2l0L2d0ay93ZWJraXQv d2Via2l0d2Vidmlldy5oICAgICAgICAgICAgICAgICAgfCAgIDE2ICsrKwogV2ViS2l0VG9vbHMv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDI0ICsrKysrCiAuLi4v RHVtcFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwICAgICAgICB8ICAgMTYgKysr CiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oICB8ICAg IDEgKwogLi4uL0R1bXBSZW5kZXJUcmVlL2d0ay9MYXlvdXRUZXN0Q29udHJvbGxlckd0ay5jcHAg fCAgIDIxICsrKysKIC4uLi9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdENvbnRyb2xsZXJN YWMubW0gIHwgICAgNSArCiAuLi4vRHVtcFJlbmRlclRyZWUvd2luL0xheW91dFRlc3RDb250cm9s bGVyV2luLmNwcCB8ICAgIDUgKwogLi4uL0R1bXBSZW5kZXJUcmVlL3d4L0xheW91dFRlc3RDb250 cm9sbGVyV3guY3BwICAgfCAgICA1ICsKIDEzIGZpbGVzIGNoYW5nZWQsIDIyOSBpbnNlcnRpb25z KCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwM2VjZjc1Li5lNTQ2NDY5IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTQgQEAKKzIwMTAtMDgtMTggIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8u bm9yb25oYUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW0d0a10gRW5hYmxlIHZpZXcgbW9kZSBtZWRpYSBmZWF0dXJlIGxh eW91dCB0ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00MzI3OAorCisgICAgICAgIFVuc2tpcCB0ZXN0cyB0aGF0IGFyZSBub3cgcGFzc2luZy4KKwor ICAgICAgICAqIHBsYXRmb3JtL2d0ay9Ta2lwcGVkOgorCiAyMDEwLTA4LTEzICBPamFuIFZhZmFp ICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIu CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCmluZGV4IDcwOTEzYjUuLjNhZTZlMWUgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL2d0ay9Ta2lwcGVkCkBAIC01NTEwLDkgKzU1MTAsNiBAQCBmYXN0L3J1bmluL2dlbmVy YXRlZDIuaHRtbAogZmFzdC9ydW5pbi9nZW5lcmF0ZWQzLmh0bWwKIGZhc3QvcnVuaW4vZ2VuZXJh dGVkNC5odG1sCiAKLSMgdmlldyBtb2RlIG1lZGlhIGZlYXR1cmUKLWZhc3QvbWVkaWEvdmlldy1t b2RlLW1lZGlhLWZlYXR1cmUuaHRtbAotCiAjIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lciBk b2Vzbid0IHJldHVybiB0byBORVRXT1JLX0lETEUgYW5kIGhlbmNlIGRvZXNuJ3QgZmlyZSBhIHN1 c3BlbmQgZXZlbnQKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3 MDM0CiBodHRwL3Rlc3RzL21lZGlhL3ZpZGVvLXBsYXktc3VzcGVuZC5odG1sCmRpZmYgLS1naXQg YS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IDc5ZTRh MGIuLmJjOTc1MWUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktp dC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAKIDIwMTAtMDgtMTggIEd1c3Rhdm8gTm9y b25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+CiAKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0d0a10gRW5hYmxlIHZpZXcg bW9kZSBtZWRpYSBmZWF0dXJlIGxheW91dCB0ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzI3OAorCisgICAgICAgIEFkZCB0aGUgdmlldy1tb2Rl IHByb3BlcnR5LCB0byBjb250cm9sIHRoZSBXZWJDb3JlIHBhZ2UncyB2aWV3TW9kZS4KKworICAg ICAgICAqIGRvY3Mvd2Via2l0Z3RrLXNlY3Rpb25zLnR4dDoKKyAgICAgICAgKiB3ZWJraXQvd2Vi a2l0d2Vidmlldy5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3Byb3BlcnR5KToK KyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19zZXRfcHJvcGVydHkpOgorICAgICAgICAod2Via2l0 X3dlYl92aWV3X2NsYXNzX2luaXQpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3NldF92aWV3 X21vZGUpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2dldF92aWV3X21vZGUpOgorICAgICAg ICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3Lmg6CisKKzIwMTAtMDgtMTggIEd1c3Rhdm8gTm9yb25o YSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+CisKICAgICAgICAgUmV2 aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgogCiAgICAgICAgIFtHVEtdIFdlYkJhY2tGb3J3YXJk TGlzdCdzIG5ld193aXRoX3dlYl92aWV3IHNob3VsZCBub3QgYmUgcHVibGljCmRpZmYgLS1naXQg YS9XZWJLaXQvZ3RrL2RvY3Mvd2Via2l0Z3RrLXNlY3Rpb25zLnR4dCBiL1dlYktpdC9ndGsvZG9j cy93ZWJraXRndGstc2VjdGlvbnMudHh0CmluZGV4IDAwODMxNDYuLjM1ZjliNDAgMTAwNjQ0Ci0t LSBhL1dlYktpdC9ndGsvZG9jcy93ZWJraXRndGstc2VjdGlvbnMudHh0CisrKyBiL1dlYktpdC9n dGsvZG9jcy93ZWJraXRndGstc2VjdGlvbnMudHh0CkBAIC00MTksNiArNDE5LDcgQEAgV2ViS2l0 TmV0d29ya1Jlc3BvbnNlQ2xhc3MKIDxGSUxFPndlYmtpdHdlYnZpZXc8L0ZJTEU+CiBXZWJLaXRO YXZpZ2F0aW9uUmVzcG9uc2UKIFdlYktpdFdlYlZpZXdUYXJnZXRJbmZvCitXZWJLaXRXZWJWaWV3 Vmlld01vZGUKIDxUSVRMRT5XZWJLaXRXZWJWaWV3PC9USVRMRT4KIFdlYktpdFdlYlZpZXcKIHdl YmtpdF93ZWJfdmlld19jYW5fY29weV9jbGlwYm9hcmQKQEAgLTQ1Myw2ICs0NTQsNyBAQCB3ZWJr aXRfd2ViX3ZpZXdfZ2V0X3NldHRpbmdzCiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3RpdGxlCiB3ZWJr aXRfd2ViX3ZpZXdfZ2V0X3RyYW5zcGFyZW50CiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaQord2Vi a2l0X3dlYl92aWV3X2dldF92aWV3X21vZGUKIHdlYmtpdF93ZWJfdmlld19nZXRfdmlld19zb3Vy Y2VfbW9kZQogd2Via2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsCiB3ZWJraXRfd2ViX3ZpZXdf Z29fYmFjawpAQCAtNDgxLDYgKzQ4Myw3IEBAIHdlYmtpdF93ZWJfdmlld19zZXRfaGlnaGxpZ2h0 X3RleHRfbWF0Y2hlcwogd2Via2l0X3dlYl92aWV3X3NldF9tYWludGFpbnNfYmFja19mb3J3YXJk X2xpc3QKIHdlYmtpdF93ZWJfdmlld19zZXRfc2V0dGluZ3MKIHdlYmtpdF93ZWJfdmlld19zZXRf dHJhbnNwYXJlbnQKK3dlYmtpdF93ZWJfdmlld19zZXRfdmlld19tb2RlCiB3ZWJraXRfd2ViX3Zp ZXdfc2V0X3ZpZXdfc291cmNlX21vZGUKIHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV9sZXZlbAog d2Via2l0X3dlYl92aWV3X3N0b3BfbG9hZGluZwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0d2Vidmlldy5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNw cAppbmRleCA2NGI3ZGNjLi43NWVkZDM1IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93 ZWJraXR3ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNw cApAQCAtMTk1LDcgKzE5NSw4IEBAIGVudW0gewogICAgIFBST1BfRU5DT0RJTkcsCiAgICAgUFJP UF9DVVNUT01fRU5DT0RJTkcsCiAgICAgUFJPUF9JQ09OX1VSSSwKLSAgICBQUk9QX0lNX0NPTlRF WFQKKyAgICBQUk9QX0lNX0NPTlRFWFQsCisgICAgUFJPUF9WSUVXX01PREUKIH07CiAKIHN0YXRp YyBndWludCB3ZWJraXRfd2ViX3ZpZXdfc2lnbmFsc1tMQVNUX1NJR05BTF0gPSB7IDAsIH07CkBA IC00NDksNiArNDUwLDkgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2dldF9wcm9wZXJ0 eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIEdWYWx1ZSoKICAgICBjYXNlIFBST1Bf SU1fQ09OVEVYVDoKICAgICAgICAgZ192YWx1ZV9zZXRfb2JqZWN0KHZhbHVlLCB3ZWJraXRfd2Vi X3ZpZXdfZ2V0X2ltX2NvbnRleHQod2ViVmlldykpOwogICAgICAgICBicmVhazsKKyAgICBjYXNl IFBST1BfVklFV19NT0RFOgorICAgICAgICBnX3ZhbHVlX3NldF9lbnVtKHZhbHVlLCB3ZWJraXRf d2ViX3ZpZXdfZ2V0X3ZpZXdfbW9kZSh3ZWJWaWV3KSk7CisgICAgICAgIGJyZWFrOwogICAgIGRl ZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3Qs IHByb3BfaWQsIHBzcGVjKTsKICAgICB9CkBAIC00ODAsNiArNDg0LDkgQEAgc3RhdGljIHZvaWQg d2Via2l0X3dlYl92aWV3X3NldF9wcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3Bf aWQsIGNvbnN0IEcKICAgICBjYXNlIFBST1BfQ1VTVE9NX0VOQ09ESU5HOgogICAgICAgICB3ZWJr aXRfd2ViX3ZpZXdfc2V0X2N1c3RvbV9lbmNvZGluZyh3ZWJWaWV3LCBnX3ZhbHVlX2dldF9zdHJp bmcodmFsdWUpKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX1ZJRVdfTU9ERToKKyAg ICAgICAgd2Via2l0X3dlYl92aWV3X3NldF92aWV3X21vZGUod2ViVmlldywgc3RhdGljX2Nhc3Q8 V2ViS2l0V2ViVmlld1ZpZXdNb2RlPihnX3ZhbHVlX2dldF9lbnVtKHZhbHVlKSkpOworICAgICAg ICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURfUFJP UEVSVFlfSUQob2JqZWN0LCBwcm9wX2lkLCBwc3BlYyk7CiAgICAgfQpAQCAtMjg1OSw2ICsyODY2 LDMyIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZp ZXdDbGFzcyogd2ViVmlld0NsYXNzKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBHVEtfVFlQRV9JTV9DT05URVhULAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXRUJLSVRfUEFSQU1f UkVBREFCTEUpKTsKIAorICAgIC8qKgorICAgICogV2ViS2l0V2ViVmlldzp2aWV3LW1vZGU6Cisg ICAgKgorICAgICogVGhlICJ2aWV3LW1vZGUiIG1lZGlhIGZlYXR1cmUgZm9yIHRoZSAjV2ViS2l0 V2ViVmlldy4KKyAgICAqCisgICAgKiBUaGUgInZpZXctbW9kZSIgbWVkaWEgZmVhdHVyZSBpcyBh ZGRpdGlvbmFsIGluZm9ybWF0aW9uIGZvciB3ZWIKKyAgICAqIGFwcGxpY2F0aW9ucyBhYm91dCBo b3cgdGhlIGFwcGxpY2F0aW9uIGlzIHJ1bm5pbmcsIHdoZW4gaXQgY29tZXMKKyAgICAqIHRvIHVz ZXIgZXhwZXJpZW5jZS4gV2hldGhlciB0aGUgYXBwbGljYXRpb24gaXMgcnVubmluZyBpbnNpZGUg YQorICAgICogcmVndWxhciBicm93c2VyIHdpbmRvdywgaW4gYSBkZWRpY2F0ZWQgd2luZG93LCBm dWxsc2NyZWVuLCBmb3IKKyAgICAqIGluc3RhbmNlLgorICAgICoKKyAgICAqIFRoaXMgcHJvcGVy dHkgc3RvcmVzIGEgJVdlYktpdFdlYlZpZXdWaWV3TW9kZSB2YWx1ZSB0aGF0IG1hdGNoZXMKKyAg ICAqIHRoZSAidmlldy1tb2RlIiBtZWRpYSBmZWF0dXJlIHRoZSB3ZWIgYXBwbGljYXRpb24gd2ls bCBzZWUuCisgICAgKgorICAgICogU2VlIGh0dHA6Ly93d3cudzMub3JnL1RSL3ZpZXctbW9kZS8g Zm9yIG1vcmUgaW5mb3JtYXRpb24uCisgICAgKgorICAgICogU2luY2U6IDEuMy40CisgICAgKi8K KyAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KG9iamVjdENsYXNzLCBQUk9QX1ZJ RVdfTU9ERSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3Bl Y19lbnVtKCJ2aWV3LW1vZGUiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIlZpZXcgTW9kZSIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiVGhlIHZpZXctbW9kZSBtZWRpYSBmZWF0dXJl IGZvciB0aGUgI1dlYktpdFdlYlZpZXcuIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJVF9UWVBFX1dFQl9WSUVXX1ZJRVdfTU9ERSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdF QktJVF9XRUJfVklFV19WSUVXX01PREVfV0lORE9XRUQsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVBRFdSSVRFKSk7 CisKICAgICBnX3R5cGVfY2xhc3NfYWRkX3ByaXZhdGUod2ViVmlld0NsYXNzLCBzaXplb2YoV2Vi S2l0V2ViVmlld1ByaXZhdGUpKTsKIH0KIApAQCAtNDI1Miw2ICs0Mjg1LDc2IEBAIGNvbnN0IGNo YXIqIHdlYmtpdF93ZWJfdmlld19nZXRfY3VzdG9tX2VuY29kaW5nKFdlYktpdFdlYlZpZXcqIHdl YlZpZXcpCiB9CiAKIC8qKgorICogd2Via2l0X3dlYl92aWV3X3NldF92aWV3X21vZGU6CisgKiBA d2ViX3ZpZXc6IHRoZSAjV2ViS2l0V2ViVmlldyB0aGF0IHdpbGwgaGF2ZSBpdHMgdmlldyBtb2Rl IHNldAorICogQG1vZGU6IHRoZSAlV2ViS2l0V2ViVmlld1ZpZXdNb2RlIHRvIGJlIHNldAorICoK KyAqIFNldHMgdGhlIHZpZXctbW9kZSBwcm9wZXJ0eSBvZiB0aGUgI1dlYktpdFdlYlZpZXcuIENo ZWNrIHRoZQorICogcHJvcGVydHkncyBkb2N1bWVudGF0aW9uIGZvciBtb3JlIGluZm9ybWF0aW9u LgorICoKKyAqIFNpbmNlOiAxLjMuNAorICovCit2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfdmll d19tb2RlKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIFdlYktpdFdlYlZpZXdWaWV3TW9kZSBtb2Rl KQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsK KworICAgIFBhZ2UqIHBhZ2UgPSBjb3JlKHdlYlZpZXcpOworCisgICAgc3dpdGNoIChtb2RlKSB7 CisgICAgY2FzZSBXRUJLSVRfV0VCX1ZJRVdfVklFV19NT0RFX0ZMT0FUSU5HOgorICAgICAgICBw YWdlLT5zZXRWaWV3TW9kZShQYWdlOjpWaWV3TW9kZUZsb2F0aW5nKTsKKyAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBXRUJLSVRfV0VCX1ZJRVdfVklFV19NT0RFX0ZVTExTQ1JFRU46CisgICAgICAg IHBhZ2UtPnNldFZpZXdNb2RlKFBhZ2U6OlZpZXdNb2RlRnVsbHNjcmVlbik7CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgV0VCS0lUX1dFQl9WSUVXX1ZJRVdfTU9ERV9NQVhJTUlaRUQ6CisgICAg ICAgIHBhZ2UtPnNldFZpZXdNb2RlKFBhZ2U6OlZpZXdNb2RlTWF4aW1pemVkKTsKKyAgICAgICAg YnJlYWs7CisgICAgY2FzZSBXRUJLSVRfV0VCX1ZJRVdfVklFV19NT0RFX01JTklNSVpFRDoKKyAg ICAgICAgcGFnZS0+c2V0Vmlld01vZGUoUGFnZTo6Vmlld01vZGVNaW5pbWl6ZWQpOworICAgICAg ICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBwYWdlLT5zZXRWaWV3TW9kZShQYWdlOjpW aWV3TW9kZVdpbmRvd2VkKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorfQorCisvKioKKyAqIHdl YmtpdF93ZWJfdmlld19nZXRfdmlld19tb2RlOgorICogQHdlYl92aWV3OiB0aGUgI1dlYktpdFdl YlZpZXcgdG8gb2J0YWluIHRoZSB2aWV3IG1vZGUgZnJvbQorICoKKyAqIEdldHMgdGhlIHZhbHVl IG9mIHRoZSB2aWV3LW1vZGUgcHJvcGVydHkgb2YgdGhlCisgKiAjV2ViS2l0V2ViVmlldy4gQ2hl Y2sgdGhlIHByb3BlcnR5J3MgZG9jdW1lbnRhdGlvbiBmb3IgbW9yZQorICogaW5mb3JtYXRpb24u CisgKgorICogUmV0dXJuIHZhbHVlOiB0aGUgJVdlYktpdFdlYlZpZXdWaWV3TW9kZSBjdXJyZW50 bHkgc2V0IGZvciB0aGUKKyAqICNXZWJLaXRXZWJWaWV3LgorICoKKyAqIFNpbmNlOiAxLjMuNAor ICovCitXZWJLaXRXZWJWaWV3Vmlld01vZGUgd2Via2l0X3dlYl92aWV3X2dldF92aWV3X21vZGUo V2ViS2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJL SVRfSVNfV0VCX1ZJRVcod2ViVmlldyksIFdFQktJVF9XRUJfVklFV19WSUVXX01PREVfV0lORE9X RUQpOworCisgICAgUGFnZSogcGFnZSA9IGNvcmUod2ViVmlldyk7CisgICAgUGFnZTo6Vmlld01v ZGUgbW9kZSA9IHBhZ2UtPnZpZXdNb2RlKCk7CisKKyAgICBpZiAobW9kZSA9PSBQYWdlOjpWaWV3 TW9kZUZsb2F0aW5nKQorICAgICAgICByZXR1cm4gV0VCS0lUX1dFQl9WSUVXX1ZJRVdfTU9ERV9G TE9BVElORzsKKworICAgIGlmIChtb2RlID09IFBhZ2U6OlZpZXdNb2RlRnVsbHNjcmVlbikKKyAg ICAgICAgcmV0dXJuIFdFQktJVF9XRUJfVklFV19WSUVXX01PREVfRlVMTFNDUkVFTjsKKworICAg IGlmIChtb2RlID09IFBhZ2U6OlZpZXdNb2RlTWF4aW1pemVkKQorICAgICAgICByZXR1cm4gV0VC S0lUX1dFQl9WSUVXX1ZJRVdfTU9ERV9NQVhJTUlaRUQ7CisKKyAgICBpZiAobW9kZSA9PSBQYWdl OjpWaWV3TW9kZU1pbmltaXplZCkKKyAgICAgICAgcmV0dXJuIFdFQktJVF9XRUJfVklFV19WSUVX X01PREVfTUlOSU1JWkVEOworCisgICAgcmV0dXJuIFdFQktJVF9XRUJfVklFV19WSUVXX01PREVf V0lORE9XRUQ7Cit9CisKKy8qKgogICogd2Via2l0X3dlYl92aWV3X21vdmVfY3Vyc29yOgogICog QHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CiAgKiBAc3RlcDogYSAjR3RrTW92ZW1lbnRTdGVw CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmggYi9XZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmgKaW5kZXggODY1YWU5ZC4uYTMyMDEzMSAxMDA2NDQK LS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oCisrKyBiL1dlYktpdC9ndGsv d2Via2l0L3dlYmtpdHdlYnZpZXcuaApAQCAtNjQsNiArNjQsMTUgQEAgdHlwZWRlZiBlbnVtCiAg ICAgV0VCS0lUX1dFQl9WSUVXX1RBUkdFVF9JTkZPX05FVFNDQVBFX1VSTAogfSBXZWJLaXRXZWJW aWV3VGFyZ2V0SW5mbzsKIAordHlwZWRlZiBlbnVtCit7CisgICAgV0VCS0lUX1dFQl9WSUVXX1ZJ RVdfTU9ERV9XSU5ET1dFRCwKKyAgICBXRUJLSVRfV0VCX1ZJRVdfVklFV19NT0RFX0ZMT0FUSU5H LAorICAgIFdFQktJVF9XRUJfVklFV19WSUVXX01PREVfRlVMTFNDUkVFTiwKKyAgICBXRUJLSVRf V0VCX1ZJRVdfVklFV19NT0RFX01BWElNSVpFRCwKKyAgICBXRUJLSVRfV0VCX1ZJRVdfVklFV19N T0RFX01JTklNSVpFRAorfSBXZWJLaXRXZWJWaWV3Vmlld01vZGU7CisKIHN0cnVjdCBfV2ViS2l0 V2ViVmlldyB7CiAgICAgR3RrQ29udGFpbmVyIHBhcmVudF9pbnN0YW5jZTsKIApAQCAtMzQwLDYg KzM0OSwxMyBAQCBXRUJLSVRfQVBJIGNvbnN0IGNoYXIqCiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2N1 c3RvbV9lbmNvZGluZyAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgKiB3ZWJWaWV3 KTsKIAogV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdfc2V0X3ZpZXdfbW9kZSAgICAg ICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgKndlYl92aWV3LAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYktpdFdlYlZpZXdWaWV3 TW9kZSBtb2RlKTsKKworV0VCS0lUX0FQSSBXZWJLaXRXZWJWaWV3Vmlld01vZGUKK3dlYmtpdF93 ZWJfdmlld19nZXRfdmlld19tb2RlICAgICAgICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAg ICAgICAqd2ViX3ZpZXcpOworCitXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF93ZWJfdmlld19tb3Zl X2N1cnNvciAgICAgICAgICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAqIHdlYlZp ZXcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR3Rr TW92ZW1lbnRTdGVwICAgICAgICBzdGVwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGdpbnQgICAgICAgICAgICAgICAgICAgY291bnQpOwpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4 IDMyNGMzMmQuLjY0OGQzYmEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysg Yi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wOC0xOCAgR3Vz dGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR3RrXSBFbmFi bGUgdmlldyBtb2RlIG1lZGlhIGZlYXR1cmUgbGF5b3V0IHRlc3QKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzMjc4CisKKyAgICAgICAgQWRkIHZpZXcg bW9kZSBtZWRpYSBmZWF0dXJlIHRlc3RpbmcgaW5mcmFzdHJ1Y3R1cmUsIGFuZCBhZGQKKyAgICAg ICAgcGxhY2Vob2xkZXIgbWV0aG9kcyBmb3IgdGhlIG90aGVyIHBsYXRmb3JtcycKKyAgICAgICAg TGF5b3V0VGVzdENvbnRyb2xsZXJzLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvTGF5b3V0 VGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoc2V0Vmlld01vZGVNZWRpYUZlYXR1cmVDYWxs YmFjayk6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6c3RhdGljRnVuY3Rpb25zKToK KyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oOgorICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL2d0ay9MYXlvdXRUZXN0Q29udHJvbGxlckd0ay5jcHA6CisgICAg ICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0Vmlld01vZGVNZWRpYUZlYXR1cmUpOgorICAg ICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1hYy5tbToKKyAg ICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpzZXRWaWV3TW9kZU1lZGlhRmVhdHVyZSk6Cisg ICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL0xheW91dFRlc3RDb250cm9sbGVyV2luLmNwcDoK KyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpzZXRWaWV3TW9kZU1lZGlhRmVhdHVyZSk6 CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd3gvTGF5b3V0VGVzdENvbnRyb2xsZXJXeC5jcHA6 CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0Vmlld01vZGVNZWRpYUZlYXR1cmUp OgorCiAyMDEwLTA4LTE4ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAg ICBGaXggaGFuZyB3aGVuIHNhdmluZyBjcmFzaCBsb2dzIG9uIFdpbmRvd3MKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0xheW91dFRlc3RDb250cm9sbGVyLmNwcCBiL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0xheW91dFRlc3RDb250cm9sbGVyLmNwcAppbmRleCA3 MDBiNDRjLi4xNjQzYmE2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9M YXlvdXRUZXN0Q29udHJvbGxlci5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv TGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCkBAIC0xMzE1LDYgKzEzMTUsMjEgQEAgc3RhdGljIEpT VmFsdWVSZWYgc2V0VXNlclN0eWxlU2hlZXRMb2NhdGlvbkNhbGxiYWNrKEpTQ29udGV4dFJlZiBj b250ZXh0LCBKU09iamUKICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7 CiB9CiAKK3N0YXRpYyBKU1ZhbHVlUmVmIHNldFZpZXdNb2RlTWVkaWFGZWF0dXJlQ2FsbGJhY2so SlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKU09iamVjdFJlZiB0 aGlzT2JqZWN0LCBzaXplX3QgYXJndW1lbnRDb3VudCwgY29uc3QgSlNWYWx1ZVJlZiBhcmd1bWVu dHNbXSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQoreworICAgIC8vIEhhcyBtYWMgaW1wbGVtZW50 YXRpb24KKyAgICBpZiAoYXJndW1lbnRDb3VudCA8IDEpCisgICAgICAgIHJldHVybiBKU1ZhbHVl TWFrZVVuZGVmaW5lZChjb250ZXh0KTsKKworICAgIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBt b2RlKEFkb3B0LCBKU1ZhbHVlVG9TdHJpbmdDb3B5KGNvbnRleHQsIGFyZ3VtZW50c1swXSwgZXhj ZXB0aW9uKSk7CisgICAgQVNTRVJUKCEqZXhjZXB0aW9uKTsKKworICAgIExheW91dFRlc3RDb250 cm9sbGVyKiBjb250cm9sbGVyID0gc3RhdGljX2Nhc3Q8TGF5b3V0VGVzdENvbnRyb2xsZXIqPihK U09iamVjdEdldFByaXZhdGUodGhpc09iamVjdCkpOworICAgIGNvbnRyb2xsZXItPnNldFZpZXdN b2RlTWVkaWFGZWF0dXJlKG1vZGUuZ2V0KCkpOworCisgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5k ZWZpbmVkKGNvbnRleHQpOworfQorCiBzdGF0aWMgSlNWYWx1ZVJlZiBzZXRXaWxsU2VuZFJlcXVl c3RDbGVhckhlYWRlckNhbGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBm dW5jdGlvbiwgSlNPYmplY3RSZWYgdGhpc09iamVjdCwgc2l6ZV90IGFyZ3VtZW50Q291bnQsIGNv bnN0IEpTVmFsdWVSZWYgYXJndW1lbnRzW10sIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikKIHsKICAg ICAvLyBIYXMgbWFjICYgd2luZG93cyBpbXBsZW1lbnRhdGlvbgpAQCAtMTkyOSw2ICsxOTQ0LDcg QEAgSlNTdGF0aWNGdW5jdGlvbiogTGF5b3V0VGVzdENvbnRyb2xsZXI6OnN0YXRpY0Z1bmN0aW9u cygpCiAgICAgICAgIHsgInNldFVzZURhc2hib2FyZENvbXBhdGliaWxpdHlNb2RlIiwgc2V0VXNl RGFzaGJvYXJkQ29tcGF0aWJpbGl0eU1vZGVDYWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVS ZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJz ZXRVc2VyU3R5bGVTaGVldEVuYWJsZWQiLCBzZXRVc2VyU3R5bGVTaGVldEVuYWJsZWRDYWxsYmFj aywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9u dERlbGV0ZSB9LAogICAgICAgICB7ICJzZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uIiwgc2V0VXNl clN0eWxlU2hlZXRMb2NhdGlvbkNhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5 IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCisgICAgICAgIHsgInNldFZpZXdN b2RlTWVkaWFGZWF0dXJlIiwgc2V0Vmlld01vZGVNZWRpYUZlYXR1cmVDYWxsYmFjaywga0pTUHJv cGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9 LAogICAgICAgICB7ICJzZXRXZWJWaWV3RWRpdGFibGUiLCBzZXRXZWJWaWV3RWRpdGFibGVDYWxs YmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRl RG9udERlbGV0ZSB9LAogICAgICAgICB7ICJzZXRXaWxsU2VuZFJlcXVlc3RDbGVhckhlYWRlciIs IHNldFdpbGxTZW5kUmVxdWVzdENsZWFySGVhZGVyQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmli dXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAgICAg eyAic2V0V2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051bGwiLCBzZXRXaWxsU2VuZFJlcXVlc3RSZXR1 cm5zTnVsbENhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVy dHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVu ZGVyVHJlZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuaAppbmRleCAyYmFiNTQyLi4yYmY3YTc1IDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oCisr KyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0xheW91dFRlc3RDb250cm9sbGVyLmgKQEAg LTEwNCw2ICsxMDQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRVc2VEYXNoYm9hcmRDb21wYXRp YmlsaXR5TW9kZShib29sIGZsYWcpOwogICAgIHZvaWQgc2V0VXNlclN0eWxlU2hlZXRFbmFibGVk KGJvb2wgZmxhZyk7CiAgICAgdm9pZCBzZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uKEpTU3RyaW5n UmVmIHBhdGgpOworICAgIHZvaWQgc2V0Vmlld01vZGVNZWRpYUZlYXR1cmUoSlNTdHJpbmdSZWYg bW9kZSk7CiAgICAgdm9pZCBzZXRYU1NBdWRpdG9yRW5hYmxlZChib29sIGZsYWcpOwogICAgIHZv aWQgc2V0RnJhbWVGbGF0dGVuaW5nRW5hYmxlZChib29sIGVuYWJsZSk7CiAgICAgdm9pZCBzZXRT cGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQoYm9vbCBlbmFibGUpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0xheW91dFRlc3RDb250cm9sbGVyR3RrLmNwcCBiL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9MYXlvdXRUZXN0Q29udHJvbGxlckd0ay5jcHAK aW5kZXggZGI0NGE2MC4uMzJiZTQzZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRl clRyZWUvZ3RrL0xheW91dFRlc3RDb250cm9sbGVyR3RrLmNwcAorKysgYi9XZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9ndGsvTGF5b3V0VGVzdENvbnRyb2xsZXJHdGsuY3BwCkBAIC0zNTMsNiAr MzUzLDI3IEBAIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldFVzZXJTdHlsZVNoZWV0TG9j YXRpb24oSlNTdHJpbmdSZWYgcGF0aCkKICAgICAgICAgc2V0VXNlclN0eWxlU2hlZXRFbmFibGVk KHRydWUpOwogfQogCit2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRWaWV3TW9kZU1lZGlh RmVhdHVyZShKU1N0cmluZ1JlZiBtb2RlKQoreworICAgIFdlYktpdFdlYlZpZXcqIHZpZXcgPSB3 ZWJraXRfd2ViX2ZyYW1lX2dldF93ZWJfdmlldyhtYWluRnJhbWUpOworICAgIEFTU0VSVCh2aWV3 KTsKKworICAgIGNoYXIqIHZpZXdNb2RlID0gSlNTdHJpbmdDb3B5VVRGOENTdHJpbmcobW9kZSk7 CisKKyAgICBpZiAoIWdfc3RyY21wMCh2aWV3TW9kZSwgIndpbmRvd2VkIikpCisgICAgICAgIHdl YmtpdF93ZWJfdmlld19zZXRfdmlld19tb2RlKHZpZXcsIFdFQktJVF9XRUJfVklFV19WSUVXX01P REVfV0lORE9XRUQpOworICAgIGVsc2UgaWYgKCFnX3N0cmNtcDAodmlld01vZGUsICJmbG9hdGlu ZyIpKQorICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3ZpZXdfbW9kZSh2aWV3LCBXRUJLSVRf V0VCX1ZJRVdfVklFV19NT0RFX0ZMT0FUSU5HKTsKKyAgICBlbHNlIGlmICghZ19zdHJjbXAwKHZp ZXdNb2RlLCAiZnVsbHNjcmVlbiIpKQorICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3ZpZXdf bW9kZSh2aWV3LCBXRUJLSVRfV0VCX1ZJRVdfVklFV19NT0RFX0ZVTExTQ1JFRU4pOworICAgIGVs c2UgaWYgKCFnX3N0cmNtcDAodmlld01vZGUsICJtYXhpbWl6ZWQiKSkKKyAgICAgICAgd2Via2l0 X3dlYl92aWV3X3NldF92aWV3X21vZGUodmlldywgV0VCS0lUX1dFQl9WSUVXX1ZJRVdfTU9ERV9N QVhJTUlaRUQpOworICAgIGVsc2UgaWYgKCFnX3N0cmNtcDAodmlld01vZGUsICJtaW5pbWl6ZWQi KSkKKyAgICAgICAgd2Via2l0X3dlYl92aWV3X3NldF92aWV3X21vZGUodmlldywgV0VCS0lUX1dF Ql9WSUVXX1ZJRVdfTU9ERV9NSU5JTUlaRUQpOworCisgICAgZ19mcmVlKHZpZXdNb2RlKTsKK30K Kwogdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0V2luZG93SXNLZXkoYm9vbCB3aW5kb3dJ c0tleSkKIHsKICAgICAvLyBGSVhNRTogaW1wbGVtZW50CmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdENvbnRyb2xsZXJNYWMubW0gYi9XZWJLaXRU b29scy9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdENvbnRyb2xsZXJNYWMubW0KaW5kZXgg YTg1YWMyZS4uOTdjMTc3ZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv bWFjL0xheW91dFRlc3RDb250cm9sbGVyTWFjLm1tCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1hYy5tbQpAQCAtNDY4LDYgKzQ2OCwxMSBA QCB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uKEpT U3RyaW5nUmVmIHBhdGgpCiAgICAgW1tXZWJQcmVmZXJlbmNlcyBzdGFuZGFyZFByZWZlcmVuY2Vz XSBzZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uOnVybF07CiB9CiAKK3ZvaWQgTGF5b3V0VGVzdENv bnRyb2xsZXI6OnNldFZpZXdNb2RlTWVkaWFGZWF0dXJlKEpTU3RyaW5nUmVmIG1vZGUpCit7Cisg ICAgLy8gRklYTUU6IGltcGxlbWVudAorfQorCiB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpk aXNhYmxlSW1hZ2VMb2FkaW5nKCkKIHsKICAgICBbW1dlYlByZWZlcmVuY2VzIHN0YW5kYXJkUHJl ZmVyZW5jZXNdIHNldExvYWRzSW1hZ2VzQXV0b21hdGljYWxseTpOT107CmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vTGF5b3V0VGVzdENvbnRyb2xsZXJXaW4uY3Bw IGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0xheW91dFRlc3RDb250cm9sbGVyV2lu LmNwcAppbmRleCAxZmY4OGU1Li42OGY0YTZhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS93aW4vTGF5b3V0VGVzdENvbnRyb2xsZXJXaW4uY3BwCisrKyBiL1dlYktpdFRv b2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9MYXlvdXRUZXN0Q29udHJvbGxlcldpbi5jcHAKQEAgLTc1 MSw2ICs3NTEsMTEgQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0VXNlclN0eWxlU2hl ZXRMb2NhdGlvbihKU1N0cmluZ1JlZiBqc1VSTCkKICAgICBTeXNGcmVlU3RyaW5nKHJlc3VsdFBh dGhCU1RSKTsKIH0KIAordm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0Vmlld01vZGVNZWRp YUZlYXR1cmUoSlNTdHJpbmdSZWYgbW9kZSkKK3sKKyAgICAvLyBGSVhNRTogaW1wbGVtZW50Cit9 CisKIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldFBlcnNpc3RlbnRVc2VyU3R5bGVTaGVl dExvY2F0aW9uKEpTU3RyaW5nUmVmIGpzVVJMKQogewogICAgIFJldGFpblB0cjxDRlN0cmluZ1Jl Zj4gdXJsU3RyaW5nKEFkb3B0Q0YsIEpTU3RyaW5nQ29weUNGU3RyaW5nKDAsIGpzVVJMKSk7CmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS93eC9MYXlvdXRUZXN0Q29udHJv bGxlcld4LmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3d4L0xheW91dFRlc3RDb250 cm9sbGVyV3guY3BwCmluZGV4IDlmZWUxZTMuLmYzNmMyOTAgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL0R1bXBSZW5kZXJUcmVlL3d4L0xheW91dFRlc3RDb250cm9sbGVyV3guY3BwCisrKyBiL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3d4L0xheW91dFRlc3RDb250cm9sbGVyV3guY3BwCkBA IC0xMzUsNiArMTM1LDExIEBAIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldFVzZXJTdHls ZVNoZWV0TG9jYXRpb24oSlNTdHJpbmdSZWYgcGF0aCkKIHsKIH0KIAordm9pZCBMYXlvdXRUZXN0 Q29udHJvbGxlcjo6c2V0Vmlld01vZGVNZWRpYUZlYXR1cmUoSlNTdHJpbmdSZWYgbW9kZSkKK3sK KyAgICAvLyBGSVhNRTogaW1wbGVtZW50Cit9CisKIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6 OnNldFdpbmRvd0lzS2V5KGJvb2wgd2luZG93SXNLZXkpCiB7CiAgICAgLy8gRklYTUU6IGltcGxl bWVudAotLSAKMS43LjEKCg==