91455 2012-07-16 17:41:19 -0700 [Chromium] TextInputController shouldn't know about TestShell 2012-07-17 01:11:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 91308 1 abarth abarth jochen ojan rniwa tkent tony webkit.review.bot oldest_to_newest 670827 0 abarth 2012-07-16 17:41:19 -0700 [Chromium] TextInputController shouldn't know about TestShell 670828 1 152657 abarth 2012-07-16 17:42:07 -0700 Created attachment 152657 Patch 671022 2 152702 abarth 2012-07-16 23:29:22 -0700 Created attachment 152702 Patch 671063 3 152702 tkent 2012-07-17 01:02:23 -0700 Comment on attachment 152702 Patch ok 671067 4 152702 abarth 2012-07-17 01:10:58 -0700 Comment on attachment 152702 Patch Clearing flags on attachment: 152702 Committed r122821: <http://trac.webkit.org/changeset/122821> 671068 5 abarth 2012-07-17 01:11:04 -0700 All reviewed patches have been landed. Closing bug. 152657 2012-07-16 17:42:07 -0700 2012-07-16 23:29:18 -0700 Patch bug-91455-20120716174214.patch text/plain 9766 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNjU5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDQ2ZWMxNGFkMjM2M2RmNTg0ZjU1YWMxZTBjM2VhNmU3 YjczYTFkMy4uNDA1MjM4YmRhNTk0ZDNhZTE3NzA3YzkzNTM1NDRmZTdlMWMyZWNkYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2 IEBACiAyMDEyLTA3LTE2ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKKyAgICAg ICAgW0Nocm9taXVtXSBUZXh0SW5wdXRDb250cm9sbGVyIHNob3VsZG4ndCBrbm93IGFib3V0IFRl c3RTaGVsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTE0NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIHBhdGNoIHVzZXMgdGhlIHNhbWUgcGF0dGVybiB3ZSB1c2VkIGZvciB0aGUKKyAgICAgICAg QWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIgdG8gcmVtb3ZlIHRoZSBkZXBlbmRlbmN5IG9uIFRlc3RT aGVsbC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHA6 CisgICAgICAgIChUZXN0U2hlbGw6OmluaXRpYWxpemUpOgorICAgICAgICAoVGVzdFNoZWxsOjpj cmVhdGVNYWluV2luZG93KToKKyAgICAgICAgKFRlc3RTaGVsbDo6flRlc3RTaGVsbCk6CisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGV4dElucHV0Q29udHJvbGxlci5jcHA6Cisg ICAgICAgIChUZXh0SW5wdXRDb250cm9sbGVyOjpUZXh0SW5wdXRDb250cm9sbGVyKToKKyAgICAg ICAgKFRleHRJbnB1dENvbnRyb2xsZXI6Omluc2VydFRleHQpOgorICAgICAgICAoVGV4dElucHV0 Q29udHJvbGxlcjo6ZG9Db21tYW5kKToKKyAgICAgICAgKFRleHRJbnB1dENvbnRyb2xsZXI6OnNl dE1hcmtlZFRleHQpOgorICAgICAgICAoVGV4dElucHV0Q29udHJvbGxlcjo6dW5tYXJrVGV4dCk6 CisgICAgICAgIChUZXh0SW5wdXRDb250cm9sbGVyOjpoYXNNYXJrZWRUZXh0KToKKyAgICAgICAg KFRleHRJbnB1dENvbnRyb2xsZXI6Om1hcmtlZFJhbmdlKToKKyAgICAgICAgKFRleHRJbnB1dENv bnRyb2xsZXI6OnNlbGVjdGVkUmFuZ2UpOgorICAgICAgICAoVGV4dElucHV0Q29udHJvbGxlcjo6 Zmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2UpOgorICAgICAgICAoVGV4dElucHV0Q29udHJvbGxl cjo6dmFsaWRBdHRyaWJ1dGVzRm9yTWFya2VkVGV4dCk6CisgICAgICAgIChUZXh0SW5wdXRDb250 cm9sbGVyOjpzZXRDb21wb3NpdGlvbik6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vVGV4dElucHV0Q29udHJvbGxlci5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFRl eHRJbnB1dENvbnRyb2xsZXIpOgorICAgICAgICAoVGV4dElucHV0Q29udHJvbGxlcjo6c2V0V2Vi Vmlldyk6CisKKzIwMTItMDctMTYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwog ICAgICAgICBbQ2hyb21pdW1dIE1vdmUgVGFzay4oY3BwfGgpIGludG8gVGVzdFJ1bm5lci5hCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTQ0NgogCmRp ZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwIGIv VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAppbmRleCA5ZDFiMjEz ZjFmMTg0YTMxMzZiMzE2MjM3ZmVlNzkyYTFiMTA3MDI0Li4wYjY1ODk2NDlhMjk1ZjhjNWRlZDE4 N2RlMDVhMTNiMzc5ZGJlZTBhIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9UZXN0U2hlbGwuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rl c3RTaGVsbC5jcHAKQEAgLTE1MCw3ICsxNTAsNyBAQCB2b2lkIFRlc3RTaGVsbDo6aW5pdGlhbGl6 ZSgpCiAgICAgbV90ZXN0SW50ZXJmYWNlcyA9IGFkb3B0UHRyKG5ldyBUZXN0SW50ZXJmYWNlcygp KTsKICAgICBtX2xheW91dFRlc3RDb250cm9sbGVyID0gYWRvcHRQdHIobmV3IExheW91dFRlc3RD b250cm9sbGVyKHRoaXMpKTsKICAgICBtX2V2ZW50U2VuZGVyID0gYWRvcHRQdHIobmV3IEV2ZW50 U2VuZGVyKHRoaXMpKTsKLSAgICBtX3RleHRJbnB1dENvbnRyb2xsZXIgPSBhZG9wdFB0cihuZXcg VGV4dElucHV0Q29udHJvbGxlcih0aGlzKSk7CisgICAgbV90ZXh0SW5wdXRDb250cm9sbGVyID0g YWRvcHRQdHIobmV3IFRleHRJbnB1dENvbnRyb2xsZXIoKSk7CiAjaWYgRU5BQkxFKE5PVElGSUNB VElPTlMpIHx8IEVOQUJMRShMRUdBQ1lfTk9USUZJQ0FUSU9OUykKICAgICBtX25vdGlmaWNhdGlv blByZXNlbnRlciA9IGFkb3B0UHRyKG5ldyBOb3RpZmljYXRpb25QcmVzZW50ZXIodGhpcykpOwog I2VuZGlmCkBAIC0xNzYsMTIgKzE3NiwxNCBAQCB2b2lkIFRlc3RTaGVsbDo6Y3JlYXRlTWFpbldp bmRvdygpCiAgICAgbV93ZWJWaWV3SG9zdCA9IGFkb3B0UHRyKGNyZWF0ZU5ld1dpbmRvdyhXZWJV UkwoKSwgbV9kcnREZXZUb29sc0FnZW50LmdldCgpKSk7CiAgICAgbV93ZWJWaWV3ID0gbV93ZWJW aWV3SG9zdC0+d2ViVmlldygpOwogICAgIG1fYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXItPnNldFdl YlZpZXcobV93ZWJWaWV3KTsKKyAgICBtX3RleHRJbnB1dENvbnRyb2xsZXItPnNldFdlYlZpZXco bV93ZWJWaWV3KTsKICAgICBtX2RydERldlRvb2xzQWdlbnQtPnNldFdlYlZpZXcobV93ZWJWaWV3 KTsKIH0KIAogVGVzdFNoZWxsOjp+VGVzdFNoZWxsKCkKIHsKICAgICBtX2FjY2Vzc2liaWxpdHlD b250cm9sbGVyLT5zZXRXZWJWaWV3KDApOworICAgIG1fdGV4dElucHV0Q29udHJvbGxlci0+c2V0 V2ViVmlldygwKTsKICAgICBtX2RydERldlRvb2xzQWdlbnQtPnNldFdlYlZpZXcoMCk7CiB9CiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1RleHRJbnB1dENvbnRy b2xsZXIuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGV4dElucHV0Q29udHJv bGxlci5jcHAKaW5kZXggYTM2MzcwNjdhNWJkMmU1NzQ2MTE0ZDA1MDIzZjdmZmZjNTc0MzkwNy4u YjcyYTIwODBkMmMwOTc1OGFlMTk0M2ExNGEyMWY5M2E0MDY3NzdjYiAxMDA2NDQKLS0tIGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGV4dElucHV0Q29udHJvbGxlci5jcHAKKysrIGIv VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGV4dElucHV0Q29udHJvbGxlci5jcHAKQEAg LTMxLDI4ICszMSwyMSBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlRleHRJbnB1 dENvbnRyb2xsZXIuaCIKIAotI2luY2x1ZGUgIlRlc3RTaGVsbC5oIgogI2luY2x1ZGUgIldlYkJp bmRpbmdzLmgiCiAjaW5jbHVkZSAiV2ViQ29tcG9zaXRpb25VbmRlcmxpbmUuaCIKICNpbmNsdWRl ICJXZWJGcmFtZS5oIgorI2luY2x1ZGUgIldlYklucHV0RXZlbnQuaCIKICNpbmNsdWRlICJXZWJS YW5nZS5oIgorI2luY2x1ZGUgIldlYlZpZXcuaCIKICNpbmNsdWRlICJwbGF0Zm9ybS9XZWJTdHJp bmcuaCIKICNpbmNsdWRlICJwbGF0Zm9ybS9XZWJWZWN0b3IuaCIKLSNpbmNsdWRlICJXZWJWaWV3 LmgiCiAjaW5jbHVkZSA8c3RyaW5nPgogI2luY2x1ZGUgPHd0Zi9TdHJpbmdFeHRyYXMuaD4KIAog dXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAotVGVzdFNoZWxsKiBUZXh0SW5wdXRDb250cm9sbGVy Ojp0ZXN0U2hlbGwgPSAwOwotCi1UZXh0SW5wdXRDb250cm9sbGVyOjpUZXh0SW5wdXRDb250cm9s bGVyKFRlc3RTaGVsbCogc2hlbGwpCitUZXh0SW5wdXRDb250cm9sbGVyOjpUZXh0SW5wdXRDb250 cm9sbGVyKCkKIHsKLSAgICAvLyBTZXQgc3RhdGljIHRlc3RTaGVsbCB2YXJpYWJsZS4gQmUgY2Fy ZWZ1bCBub3QgdG8gYXNzaWduIHRlc3RTaGVsbCB0byBuZXcKLSAgICAvLyB3aW5kb3dzIHdoaWNo IGFyZSB0ZW1wb3JhcnkuCi0gICAgaWYgKCF0ZXN0U2hlbGwpCi0gICAgICAgIHRlc3RTaGVsbCA9 IHNoZWxsOwotCiAgICAgYmluZE1ldGhvZCgiYXR0cmlidXRlZFN1YnN0cmluZ0Zyb21SYW5nZSIs ICZUZXh0SW5wdXRDb250cm9sbGVyOjphdHRyaWJ1dGVkU3Vic3RyaW5nRnJvbVJhbmdlKTsKICAg ICBiaW5kTWV0aG9kKCJjaGFyYWN0ZXJJbmRleEZvclBvaW50IiwgJlRleHRJbnB1dENvbnRyb2xs ZXI6OmNoYXJhY3RlckluZGV4Rm9yUG9pbnQpOwogICAgIGJpbmRNZXRob2QoImNvbnZlcnNhdGlv bklkZW50aWZpZXIiLCAmVGV4dElucHV0Q29udHJvbGxlcjo6Y29udmVyc2F0aW9uSWRlbnRpZmll cik7CkBAIC03MCwxMSArNjMsNiBAQCBUZXh0SW5wdXRDb250cm9sbGVyOjpUZXh0SW5wdXRDb250 cm9sbGVyKFRlc3RTaGVsbCogc2hlbGwpCiAgICAgYmluZE1ldGhvZCgic2V0Q29tcG9zaXRpb24i LCAmVGV4dElucHV0Q29udHJvbGxlcjo6c2V0Q29tcG9zaXRpb24pOwogfQogCi1XZWJGcmFtZSog VGV4dElucHV0Q29udHJvbGxlcjo6Z2V0TWFpbkZyYW1lKCkKLXsKLSAgICByZXR1cm4gdGVzdFNo ZWxsLT53ZWJWaWV3KCktPm1haW5GcmFtZSgpOwotfQotCiB2b2lkIFRleHRJbnB1dENvbnRyb2xs ZXI6Omluc2VydFRleHQoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiBhcmd1bWVudHMsIENwcFZhcmlh bnQqIHJlc3VsdCkKIHsKICAgICByZXN1bHQtPnNldE51bGwoKTsKQEAgLTgyLDE0ICs3MCwxNCBA QCB2b2lkIFRleHRJbnB1dENvbnRyb2xsZXI6Omluc2VydFRleHQoY29uc3QgQ3BwQXJndW1lbnRM aXN0JiBhcmd1bWVudHMsIENwcFZhcmlhbgogICAgIGlmIChhcmd1bWVudHMuc2l6ZSgpIDwgMSB8 fCAhYXJndW1lbnRzWzBdLmlzU3RyaW5nKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIHRlc3RT aGVsbC0+d2ViVmlldygpLT5jb25maXJtQ29tcG9zaXRpb24oV2ViU3RyaW5nOjpmcm9tVVRGOChh cmd1bWVudHNbMF0udG9TdHJpbmcoKSkpOworICAgIG1fd2ViVmlldy0+Y29uZmlybUNvbXBvc2l0 aW9uKFdlYlN0cmluZzo6ZnJvbVVURjgoYXJndW1lbnRzWzBdLnRvU3RyaW5nKCkpKTsKIH0KIAog dm9pZCBUZXh0SW5wdXRDb250cm9sbGVyOjpkb0NvbW1hbmQoY29uc3QgQ3BwQXJndW1lbnRMaXN0 JiBhcmd1bWVudHMsIENwcFZhcmlhbnQqIHJlc3VsdCkKIHsKICAgICByZXN1bHQtPnNldE51bGwo KTsKIAotICAgIFdlYkZyYW1lKiBtYWluRnJhbWUgPSBnZXRNYWluRnJhbWUoKTsKKyAgICBXZWJG cmFtZSogbWFpbkZyYW1lID0gbV93ZWJWaWV3LT5tYWluRnJhbWUoKTsKICAgICBpZiAoIW1haW5G cmFtZSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0xMDQsMTAgKzkyLDEwIEBAIHZvaWQgVGV4dElu cHV0Q29udHJvbGxlcjo6c2V0TWFya2VkVGV4dChjb25zdCBDcHBBcmd1bWVudExpc3QmIGFyZ3Vt ZW50cywgQ3BwVmFyCiAgICAgaWYgKGFyZ3VtZW50cy5zaXplKCkgPj0gMyAmJiBhcmd1bWVudHNb MF0uaXNTdHJpbmcoKQogICAgICAgICAmJiBhcmd1bWVudHNbMV0uaXNOdW1iZXIoKSAmJiBhcmd1 bWVudHNbMl0uaXNOdW1iZXIoKSkgewogICAgICAgICBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25V bmRlcmxpbmU+IHVuZGVybGluZXM7Ci0gICAgICAgIHRlc3RTaGVsbC0+d2ViVmlldygpLT5zZXRD b21wb3NpdGlvbihXZWJTdHJpbmc6OmZyb21VVEY4KGFyZ3VtZW50c1swXS50b1N0cmluZygpKSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuZGVybGluZXMs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcmd1bWVudHNb MV0udG9JbnQzMigpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYXJndW1lbnRzWzFdLnRvSW50MzIoKSArIGFyZ3VtZW50c1syXS50b0ludDMyKCkpOworICAg ICAgICBtX3dlYlZpZXctPnNldENvbXBvc2l0aW9uKFdlYlN0cmluZzo6ZnJvbVVURjgoYXJndW1l bnRzWzBdLnRvU3RyaW5nKCkpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVu ZGVybGluZXMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXJndW1lbnRzWzFd LnRvSW50MzIoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcmd1bWVudHNb MV0udG9JbnQzMigpICsgYXJndW1lbnRzWzJdLnRvSW50MzIoKSk7CiAgICAgfQogfQogCkBAIC0x MTUsMTQgKzEwMywxNCBAQCB2b2lkIFRleHRJbnB1dENvbnRyb2xsZXI6OnVubWFya1RleHQoY29u c3QgQ3BwQXJndW1lbnRMaXN0JiwgQ3BwVmFyaWFudCogcmVzdWx0KQogewogICAgIHJlc3VsdC0+ c2V0TnVsbCgpOwogCi0gICAgdGVzdFNoZWxsLT53ZWJWaWV3KCktPmNvbmZpcm1Db21wb3NpdGlv bigpOworICAgIG1fd2ViVmlldy0+Y29uZmlybUNvbXBvc2l0aW9uKCk7CiB9CiAKIHZvaWQgVGV4 dElucHV0Q29udHJvbGxlcjo6aGFzTWFya2VkVGV4dChjb25zdCBDcHBBcmd1bWVudExpc3QmLCBD cHBWYXJpYW50KiByZXN1bHQpCiB7CiAgICAgcmVzdWx0LT5zZXROdWxsKCk7CiAKLSAgICBXZWJG cmFtZSogbWFpbkZyYW1lID0gZ2V0TWFpbkZyYW1lKCk7CisgICAgV2ViRnJhbWUqIG1haW5GcmFt ZSA9IG1fd2ViVmlldy0+bWFpbkZyYW1lKCk7CiAgICAgaWYgKCFtYWluRnJhbWUpCiAgICAgICAg IHJldHVybjsKIApAQCAtMTUxLDcgKzEzOSw3IEBAIHZvaWQgVGV4dElucHV0Q29udHJvbGxlcjo6 bWFya2VkUmFuZ2UoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiwgQ3BwVmFyaWFudCogcmVzdWx0CiB7 CiAgICAgcmVzdWx0LT5zZXROdWxsKCk7CiAKLSAgICBXZWJGcmFtZSogbWFpbkZyYW1lID0gZ2V0 TWFpbkZyYW1lKCk7CisgICAgV2ViRnJhbWUqIG1haW5GcmFtZSA9IG1fd2ViVmlldy0+bWFpbkZy YW1lKCk7CiAgICAgaWYgKCFtYWluRnJhbWUpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTY2LDcg KzE1NCw3IEBAIHZvaWQgVGV4dElucHV0Q29udHJvbGxlcjo6c2VsZWN0ZWRSYW5nZShjb25zdCBD cHBBcmd1bWVudExpc3QmLCBDcHBWYXJpYW50KiByZXN1CiB7CiAgICAgcmVzdWx0LT5zZXROdWxs KCk7CiAKLSAgICBXZWJGcmFtZSogbWFpbkZyYW1lID0gZ2V0TWFpbkZyYW1lKCk7CisgICAgV2Vi RnJhbWUqIG1haW5GcmFtZSA9IG1fd2ViVmlldy0+bWFpbkZyYW1lKCk7CiAgICAgaWYgKCFtYWlu RnJhbWUpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTgxLDcgKzE2OSw3IEBAIHZvaWQgVGV4dElu cHV0Q29udHJvbGxlcjo6Zmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2UoY29uc3QgQ3BwQXJndW1l bnRMaXN0JiBhcmd1CiB7CiAgICAgcmVzdWx0LT5zZXROdWxsKCk7CiAKLSAgICBXZWJGcmFtZSog ZnJhbWUgPSB0ZXN0U2hlbGwtPndlYlZpZXcoKS0+Zm9jdXNlZEZyYW1lKCk7CisgICAgV2ViRnJh bWUqIGZyYW1lID0gbV93ZWJWaWV3LT5mb2N1c2VkRnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQog ICAgICAgICByZXR1cm47CiAKQEAgLTIxMCw3ICsxOTgsNyBAQCB2b2lkIFRleHRJbnB1dENvbnRy b2xsZXI6OnZhbGlkQXR0cmlidXRlc0Zvck1hcmtlZFRleHQoY29uc3QgQ3BwQXJndW1lbnRMaXN0 JiwgQwogewogICAgIHJlc3VsdC0+c2V0TnVsbCgpOwogCi0gICAgV2ViRnJhbWUqIG1haW5GcmFt ZSA9IGdldE1haW5GcmFtZSgpOworICAgIFdlYkZyYW1lKiBtYWluRnJhbWUgPSBtX3dlYlZpZXct Pm1haW5GcmFtZSgpOwogICAgIGlmICghbWFpbkZyYW1lKQogICAgICAgICByZXR1cm47CiAKQEAg LTIyOCwxMCArMjE2LDYgQEAgdm9pZCBUZXh0SW5wdXRDb250cm9sbGVyOjpzZXRDb21wb3NpdGlv bihjb25zdCBDcHBBcmd1bWVudExpc3QmIGFyZ3VtZW50cywgQ3BwVmEKIHsKICAgICByZXN1bHQt PnNldE51bGwoKTsKIAotICAgIFdlYlZpZXcqIHZpZXcgPSBnZXRNYWluRnJhbWUoKSA/IGdldE1h aW5GcmFtZSgpLT52aWV3KCkgOiAwOwotICAgIGlmICghdmlldykKLSAgICAgICAgcmV0dXJuOwot CiAgICAgaWYgKGFyZ3VtZW50cy5zaXplKCkgPCAxKQogICAgICAgICByZXR1cm47CiAKQEAgLTI0 MSw5ICsyMjUsOSBAQCB2b2lkIFRleHRJbnB1dENvbnRyb2xsZXI6OnNldENvbXBvc2l0aW9uKGNv bnN0IENwcEFyZ3VtZW50TGlzdCYgYXJndW1lbnRzLCBDcHBWYQogICAgIGtleURvd24ubW9kaWZp ZXJzID0gMDsKICAgICBrZXlEb3duLndpbmRvd3NLZXlDb2RlID0gMHhFNTsgLy8gVktFWV9QUk9D RVNTS0VZCiAgICAga2V5RG93bi5zZXRLZXlJZGVudGlmaWVyRnJvbVdpbmRvd3NLZXlDb2RlKCk7 Ci0gICAgdmlldy0+aGFuZGxlSW5wdXRFdmVudChrZXlEb3duKTsKKyAgICBtX3dlYlZpZXctPmhh bmRsZUlucHV0RXZlbnQoa2V5RG93bik7CiAKICAgICBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25V bmRlcmxpbmU+IHVuZGVybGluZXM7CiAgICAgV2ViU3RyaW5nIHRleHQoV2ViU3RyaW5nOjpmcm9t VVRGOChhcmd1bWVudHNbMF0udG9TdHJpbmcoKSkpOwotICAgIHZpZXctPnNldENvbXBvc2l0aW9u KHRleHQsIHVuZGVybGluZXMsIDAsIHRleHQubGVuZ3RoKCkpOworICAgIG1fd2ViVmlldy0+c2V0 Q29tcG9zaXRpb24odGV4dCwgdW5kZXJsaW5lcywgMCwgdGV4dC5sZW5ndGgoKSk7CiB9CmRpZmYg LS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXh0SW5wdXRDb250cm9sbGVy LmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXh0SW5wdXRDb250cm9sbGVyLmgK aW5kZXggM2EzOTA3ZmRhOGFhZDVhYzQwYzBjNTg0NjBlYzUxZDNhMjg5NWNiOC4uYTk1OWFhOGIz Njg0MzcyMWY0MWNkMzUyZWRmMDNkZjg4MWUzOGQ2NSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vVGV4dElucHV0Q29udHJvbGxlci5oCisrKyBiL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2Nocm9taXVtL1RleHRJbnB1dENvbnRyb2xsZXIuaApAQCAtMzcsMTUgKzM3LDE1 IEBACiAKICNpbmNsdWRlICJDcHBCb3VuZENsYXNzLmgiCiAKLWNsYXNzIFRlc3RTaGVsbDsKLQog bmFtZXNwYWNlIFdlYktpdCB7Ci1jbGFzcyBXZWJGcmFtZTsKK2NsYXNzIFdlYlZpZXc7CiB9CiAK IGNsYXNzIFRleHRJbnB1dENvbnRyb2xsZXIgOiBwdWJsaWMgQ3BwQm91bmRDbGFzcyB7CiBwdWJs aWM6Ci0gICAgVGV4dElucHV0Q29udHJvbGxlcihUZXN0U2hlbGwqKTsKKyAgICBUZXh0SW5wdXRD b250cm9sbGVyKCk7CisKKyAgICB2b2lkIHNldFdlYlZpZXcoV2ViS2l0OjpXZWJWaWV3KiB3ZWJW aWV3KSB7IG1fd2ViVmlldyA9IHdlYlZpZXc7IH0KIAogICAgIHZvaWQgaW5zZXJ0VGV4dChjb25z dCBDcHBBcmd1bWVudExpc3QmLCBDcHBWYXJpYW50Kik7CiAgICAgdm9pZCBkb0NvbW1hbmQoY29u c3QgQ3BwQXJndW1lbnRMaXN0JiwgQ3BwVmFyaWFudCopOwpAQCAtNjQsMTEgKzY0LDcgQEAgcHVi bGljOgogICAgIHZvaWQgc2V0Q29tcG9zaXRpb24oY29uc3QgQ3BwQXJndW1lbnRMaXN0JiwgQ3Bw VmFyaWFudCopOwogCiBwcml2YXRlOgotICAgIC8vIFJldHVybnMgdGhlIHRlc3Qgc2hlbGwncyBt YWluIFdlYkZyYW1lLgotICAgIHN0YXRpYyBXZWJLaXQ6OldlYkZyYW1lKiBnZXRNYWluRnJhbWUo KTsKLQotICAgIC8vIE5vbi1vd25pbmcgcG9pbnRlci4gVGhlIFRleHRJbnB1dENvbnRyb2xsZXIg aXMgb3duZWQgYnkgdGhlIFRlc3RTaGVsbC4KLSAgICBzdGF0aWMgVGVzdFNoZWxsKiB0ZXN0U2hl bGw7CisgICAgV2ViS2l0OjpXZWJWaWV3KiBtX3dlYlZpZXc7CiB9OwogCiAjZW5kaWYgLy8gVGV4 dElucHV0Q29udHJvbGxlcl9oCg== 152702 2012-07-16 23:29:22 -0700 2012-07-17 01:10:58 -0700 Patch bug-91455-20120716232921.patch text/plain 9766 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyODEwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDkzOWI4ZjlkMmE1YjZjNDllYmRmNTJlNTgxMTUwZDc2 ZjY4YmRkMS4uZjY0OGNjMTg2ZjgxNmJjOTJlZjNlNDZiNTAzMTFiNzc3NTZhNGM5NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2 IEBACiAyMDEyLTA3LTE2ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKKyAgICAg ICAgW0Nocm9taXVtXSBUZXh0SW5wdXRDb250cm9sbGVyIHNob3VsZG4ndCBrbm93IGFib3V0IFRl c3RTaGVsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTE0NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIHBhdGNoIHVzZXMgdGhlIHNhbWUgcGF0dGVybiB3ZSB1c2VkIGZvciB0aGUKKyAgICAgICAg QWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIgdG8gcmVtb3ZlIHRoZSBkZXBlbmRlbmN5IG9uIFRlc3RT aGVsbC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHA6 CisgICAgICAgIChUZXN0U2hlbGw6OmluaXRpYWxpemUpOgorICAgICAgICAoVGVzdFNoZWxsOjpj cmVhdGVNYWluV2luZG93KToKKyAgICAgICAgKFRlc3RTaGVsbDo6flRlc3RTaGVsbCk6CisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGV4dElucHV0Q29udHJvbGxlci5jcHA6Cisg ICAgICAgIChUZXh0SW5wdXRDb250cm9sbGVyOjpUZXh0SW5wdXRDb250cm9sbGVyKToKKyAgICAg ICAgKFRleHRJbnB1dENvbnRyb2xsZXI6Omluc2VydFRleHQpOgorICAgICAgICAoVGV4dElucHV0 Q29udHJvbGxlcjo6ZG9Db21tYW5kKToKKyAgICAgICAgKFRleHRJbnB1dENvbnRyb2xsZXI6OnNl dE1hcmtlZFRleHQpOgorICAgICAgICAoVGV4dElucHV0Q29udHJvbGxlcjo6dW5tYXJrVGV4dCk6 CisgICAgICAgIChUZXh0SW5wdXRDb250cm9sbGVyOjpoYXNNYXJrZWRUZXh0KToKKyAgICAgICAg KFRleHRJbnB1dENvbnRyb2xsZXI6Om1hcmtlZFJhbmdlKToKKyAgICAgICAgKFRleHRJbnB1dENv bnRyb2xsZXI6OnNlbGVjdGVkUmFuZ2UpOgorICAgICAgICAoVGV4dElucHV0Q29udHJvbGxlcjo6 Zmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2UpOgorICAgICAgICAoVGV4dElucHV0Q29udHJvbGxl cjo6dmFsaWRBdHRyaWJ1dGVzRm9yTWFya2VkVGV4dCk6CisgICAgICAgIChUZXh0SW5wdXRDb250 cm9sbGVyOjpzZXRDb21wb3NpdGlvbik6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vVGV4dElucHV0Q29udHJvbGxlci5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFRl eHRJbnB1dENvbnRyb2xsZXIpOgorICAgICAgICAoVGV4dElucHV0Q29udHJvbGxlcjo6c2V0V2Vi Vmlldyk6CisKKzIwMTItMDctMTYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwog ICAgICAgICBbQ2hyb21pdW1dIE1vdmUgVGFzay4oY3BwfGgpIGludG8gVGVzdFJ1bm5lci5hCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTQ0NgogCmRp ZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwIGIv VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAppbmRleCA5ZDFiMjEz ZjFmMTg0YTMxMzZiMzE2MjM3ZmVlNzkyYTFiMTA3MDI0Li4wYjY1ODk2NDlhMjk1ZjhjNWRlZDE4 N2RlMDVhMTNiMzc5ZGJlZTBhIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9UZXN0U2hlbGwuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rl c3RTaGVsbC5jcHAKQEAgLTE1MCw3ICsxNTAsNyBAQCB2b2lkIFRlc3RTaGVsbDo6aW5pdGlhbGl6 ZSgpCiAgICAgbV90ZXN0SW50ZXJmYWNlcyA9IGFkb3B0UHRyKG5ldyBUZXN0SW50ZXJmYWNlcygp KTsKICAgICBtX2xheW91dFRlc3RDb250cm9sbGVyID0gYWRvcHRQdHIobmV3IExheW91dFRlc3RD b250cm9sbGVyKHRoaXMpKTsKICAgICBtX2V2ZW50U2VuZGVyID0gYWRvcHRQdHIobmV3IEV2ZW50 U2VuZGVyKHRoaXMpKTsKLSAgICBtX3RleHRJbnB1dENvbnRyb2xsZXIgPSBhZG9wdFB0cihuZXcg VGV4dElucHV0Q29udHJvbGxlcih0aGlzKSk7CisgICAgbV90ZXh0SW5wdXRDb250cm9sbGVyID0g YWRvcHRQdHIobmV3IFRleHRJbnB1dENvbnRyb2xsZXIoKSk7CiAjaWYgRU5BQkxFKE5PVElGSUNB VElPTlMpIHx8IEVOQUJMRShMRUdBQ1lfTk9USUZJQ0FUSU9OUykKICAgICBtX25vdGlmaWNhdGlv blByZXNlbnRlciA9IGFkb3B0UHRyKG5ldyBOb3RpZmljYXRpb25QcmVzZW50ZXIodGhpcykpOwog I2VuZGlmCkBAIC0xNzYsMTIgKzE3NiwxNCBAQCB2b2lkIFRlc3RTaGVsbDo6Y3JlYXRlTWFpbldp bmRvdygpCiAgICAgbV93ZWJWaWV3SG9zdCA9IGFkb3B0UHRyKGNyZWF0ZU5ld1dpbmRvdyhXZWJV UkwoKSwgbV9kcnREZXZUb29sc0FnZW50LmdldCgpKSk7CiAgICAgbV93ZWJWaWV3ID0gbV93ZWJW aWV3SG9zdC0+d2ViVmlldygpOwogICAgIG1fYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXItPnNldFdl YlZpZXcobV93ZWJWaWV3KTsKKyAgICBtX3RleHRJbnB1dENvbnRyb2xsZXItPnNldFdlYlZpZXco bV93ZWJWaWV3KTsKICAgICBtX2RydERldlRvb2xzQWdlbnQtPnNldFdlYlZpZXcobV93ZWJWaWV3 KTsKIH0KIAogVGVzdFNoZWxsOjp+VGVzdFNoZWxsKCkKIHsKICAgICBtX2FjY2Vzc2liaWxpdHlD b250cm9sbGVyLT5zZXRXZWJWaWV3KDApOworICAgIG1fdGV4dElucHV0Q29udHJvbGxlci0+c2V0 V2ViVmlldygwKTsKICAgICBtX2RydERldlRvb2xzQWdlbnQtPnNldFdlYlZpZXcoMCk7CiB9CiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1RleHRJbnB1dENvbnRy b2xsZXIuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGV4dElucHV0Q29udHJv bGxlci5jcHAKaW5kZXggYTM2MzcwNjdhNWJkMmU1NzQ2MTE0ZDA1MDIzZjdmZmZjNTc0MzkwNy4u YjcyYTIwODBkMmMwOTc1OGFlMTk0M2ExNGEyMWY5M2E0MDY3NzdjYiAxMDA2NDQKLS0tIGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGV4dElucHV0Q29udHJvbGxlci5jcHAKKysrIGIv VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGV4dElucHV0Q29udHJvbGxlci5jcHAKQEAg LTMxLDI4ICszMSwyMSBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlRleHRJbnB1 dENvbnRyb2xsZXIuaCIKIAotI2luY2x1ZGUgIlRlc3RTaGVsbC5oIgogI2luY2x1ZGUgIldlYkJp bmRpbmdzLmgiCiAjaW5jbHVkZSAiV2ViQ29tcG9zaXRpb25VbmRlcmxpbmUuaCIKICNpbmNsdWRl ICJXZWJGcmFtZS5oIgorI2luY2x1ZGUgIldlYklucHV0RXZlbnQuaCIKICNpbmNsdWRlICJXZWJS YW5nZS5oIgorI2luY2x1ZGUgIldlYlZpZXcuaCIKICNpbmNsdWRlICJwbGF0Zm9ybS9XZWJTdHJp bmcuaCIKICNpbmNsdWRlICJwbGF0Zm9ybS9XZWJWZWN0b3IuaCIKLSNpbmNsdWRlICJXZWJWaWV3 LmgiCiAjaW5jbHVkZSA8c3RyaW5nPgogI2luY2x1ZGUgPHd0Zi9TdHJpbmdFeHRyYXMuaD4KIAog dXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAotVGVzdFNoZWxsKiBUZXh0SW5wdXRDb250cm9sbGVy Ojp0ZXN0U2hlbGwgPSAwOwotCi1UZXh0SW5wdXRDb250cm9sbGVyOjpUZXh0SW5wdXRDb250cm9s bGVyKFRlc3RTaGVsbCogc2hlbGwpCitUZXh0SW5wdXRDb250cm9sbGVyOjpUZXh0SW5wdXRDb250 cm9sbGVyKCkKIHsKLSAgICAvLyBTZXQgc3RhdGljIHRlc3RTaGVsbCB2YXJpYWJsZS4gQmUgY2Fy ZWZ1bCBub3QgdG8gYXNzaWduIHRlc3RTaGVsbCB0byBuZXcKLSAgICAvLyB3aW5kb3dzIHdoaWNo IGFyZSB0ZW1wb3JhcnkuCi0gICAgaWYgKCF0ZXN0U2hlbGwpCi0gICAgICAgIHRlc3RTaGVsbCA9 IHNoZWxsOwotCiAgICAgYmluZE1ldGhvZCgiYXR0cmlidXRlZFN1YnN0cmluZ0Zyb21SYW5nZSIs ICZUZXh0SW5wdXRDb250cm9sbGVyOjphdHRyaWJ1dGVkU3Vic3RyaW5nRnJvbVJhbmdlKTsKICAg ICBiaW5kTWV0aG9kKCJjaGFyYWN0ZXJJbmRleEZvclBvaW50IiwgJlRleHRJbnB1dENvbnRyb2xs ZXI6OmNoYXJhY3RlckluZGV4Rm9yUG9pbnQpOwogICAgIGJpbmRNZXRob2QoImNvbnZlcnNhdGlv bklkZW50aWZpZXIiLCAmVGV4dElucHV0Q29udHJvbGxlcjo6Y29udmVyc2F0aW9uSWRlbnRpZmll cik7CkBAIC03MCwxMSArNjMsNiBAQCBUZXh0SW5wdXRDb250cm9sbGVyOjpUZXh0SW5wdXRDb250 cm9sbGVyKFRlc3RTaGVsbCogc2hlbGwpCiAgICAgYmluZE1ldGhvZCgic2V0Q29tcG9zaXRpb24i LCAmVGV4dElucHV0Q29udHJvbGxlcjo6c2V0Q29tcG9zaXRpb24pOwogfQogCi1XZWJGcmFtZSog VGV4dElucHV0Q29udHJvbGxlcjo6Z2V0TWFpbkZyYW1lKCkKLXsKLSAgICByZXR1cm4gdGVzdFNo ZWxsLT53ZWJWaWV3KCktPm1haW5GcmFtZSgpOwotfQotCiB2b2lkIFRleHRJbnB1dENvbnRyb2xs ZXI6Omluc2VydFRleHQoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiBhcmd1bWVudHMsIENwcFZhcmlh bnQqIHJlc3VsdCkKIHsKICAgICByZXN1bHQtPnNldE51bGwoKTsKQEAgLTgyLDE0ICs3MCwxNCBA QCB2b2lkIFRleHRJbnB1dENvbnRyb2xsZXI6Omluc2VydFRleHQoY29uc3QgQ3BwQXJndW1lbnRM aXN0JiBhcmd1bWVudHMsIENwcFZhcmlhbgogICAgIGlmIChhcmd1bWVudHMuc2l6ZSgpIDwgMSB8 fCAhYXJndW1lbnRzWzBdLmlzU3RyaW5nKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIHRlc3RT aGVsbC0+d2ViVmlldygpLT5jb25maXJtQ29tcG9zaXRpb24oV2ViU3RyaW5nOjpmcm9tVVRGOChh cmd1bWVudHNbMF0udG9TdHJpbmcoKSkpOworICAgIG1fd2ViVmlldy0+Y29uZmlybUNvbXBvc2l0 aW9uKFdlYlN0cmluZzo6ZnJvbVVURjgoYXJndW1lbnRzWzBdLnRvU3RyaW5nKCkpKTsKIH0KIAog dm9pZCBUZXh0SW5wdXRDb250cm9sbGVyOjpkb0NvbW1hbmQoY29uc3QgQ3BwQXJndW1lbnRMaXN0 JiBhcmd1bWVudHMsIENwcFZhcmlhbnQqIHJlc3VsdCkKIHsKICAgICByZXN1bHQtPnNldE51bGwo KTsKIAotICAgIFdlYkZyYW1lKiBtYWluRnJhbWUgPSBnZXRNYWluRnJhbWUoKTsKKyAgICBXZWJG cmFtZSogbWFpbkZyYW1lID0gbV93ZWJWaWV3LT5tYWluRnJhbWUoKTsKICAgICBpZiAoIW1haW5G cmFtZSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0xMDQsMTAgKzkyLDEwIEBAIHZvaWQgVGV4dElu cHV0Q29udHJvbGxlcjo6c2V0TWFya2VkVGV4dChjb25zdCBDcHBBcmd1bWVudExpc3QmIGFyZ3Vt ZW50cywgQ3BwVmFyCiAgICAgaWYgKGFyZ3VtZW50cy5zaXplKCkgPj0gMyAmJiBhcmd1bWVudHNb MF0uaXNTdHJpbmcoKQogICAgICAgICAmJiBhcmd1bWVudHNbMV0uaXNOdW1iZXIoKSAmJiBhcmd1 bWVudHNbMl0uaXNOdW1iZXIoKSkgewogICAgICAgICBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25V bmRlcmxpbmU+IHVuZGVybGluZXM7Ci0gICAgICAgIHRlc3RTaGVsbC0+d2ViVmlldygpLT5zZXRD b21wb3NpdGlvbihXZWJTdHJpbmc6OmZyb21VVEY4KGFyZ3VtZW50c1swXS50b1N0cmluZygpKSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuZGVybGluZXMs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcmd1bWVudHNb MV0udG9JbnQzMigpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYXJndW1lbnRzWzFdLnRvSW50MzIoKSArIGFyZ3VtZW50c1syXS50b0ludDMyKCkpOworICAg ICAgICBtX3dlYlZpZXctPnNldENvbXBvc2l0aW9uKFdlYlN0cmluZzo6ZnJvbVVURjgoYXJndW1l bnRzWzBdLnRvU3RyaW5nKCkpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVu ZGVybGluZXMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXJndW1lbnRzWzFd LnRvSW50MzIoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcmd1bWVudHNb MV0udG9JbnQzMigpICsgYXJndW1lbnRzWzJdLnRvSW50MzIoKSk7CiAgICAgfQogfQogCkBAIC0x MTUsMTQgKzEwMywxNCBAQCB2b2lkIFRleHRJbnB1dENvbnRyb2xsZXI6OnVubWFya1RleHQoY29u c3QgQ3BwQXJndW1lbnRMaXN0JiwgQ3BwVmFyaWFudCogcmVzdWx0KQogewogICAgIHJlc3VsdC0+ c2V0TnVsbCgpOwogCi0gICAgdGVzdFNoZWxsLT53ZWJWaWV3KCktPmNvbmZpcm1Db21wb3NpdGlv bigpOworICAgIG1fd2ViVmlldy0+Y29uZmlybUNvbXBvc2l0aW9uKCk7CiB9CiAKIHZvaWQgVGV4 dElucHV0Q29udHJvbGxlcjo6aGFzTWFya2VkVGV4dChjb25zdCBDcHBBcmd1bWVudExpc3QmLCBD cHBWYXJpYW50KiByZXN1bHQpCiB7CiAgICAgcmVzdWx0LT5zZXROdWxsKCk7CiAKLSAgICBXZWJG cmFtZSogbWFpbkZyYW1lID0gZ2V0TWFpbkZyYW1lKCk7CisgICAgV2ViRnJhbWUqIG1haW5GcmFt ZSA9IG1fd2ViVmlldy0+bWFpbkZyYW1lKCk7CiAgICAgaWYgKCFtYWluRnJhbWUpCiAgICAgICAg IHJldHVybjsKIApAQCAtMTUxLDcgKzEzOSw3IEBAIHZvaWQgVGV4dElucHV0Q29udHJvbGxlcjo6 bWFya2VkUmFuZ2UoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiwgQ3BwVmFyaWFudCogcmVzdWx0CiB7 CiAgICAgcmVzdWx0LT5zZXROdWxsKCk7CiAKLSAgICBXZWJGcmFtZSogbWFpbkZyYW1lID0gZ2V0 TWFpbkZyYW1lKCk7CisgICAgV2ViRnJhbWUqIG1haW5GcmFtZSA9IG1fd2ViVmlldy0+bWFpbkZy YW1lKCk7CiAgICAgaWYgKCFtYWluRnJhbWUpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTY2LDcg KzE1NCw3IEBAIHZvaWQgVGV4dElucHV0Q29udHJvbGxlcjo6c2VsZWN0ZWRSYW5nZShjb25zdCBD cHBBcmd1bWVudExpc3QmLCBDcHBWYXJpYW50KiByZXN1CiB7CiAgICAgcmVzdWx0LT5zZXROdWxs KCk7CiAKLSAgICBXZWJGcmFtZSogbWFpbkZyYW1lID0gZ2V0TWFpbkZyYW1lKCk7CisgICAgV2Vi RnJhbWUqIG1haW5GcmFtZSA9IG1fd2ViVmlldy0+bWFpbkZyYW1lKCk7CiAgICAgaWYgKCFtYWlu RnJhbWUpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTgxLDcgKzE2OSw3IEBAIHZvaWQgVGV4dElu cHV0Q29udHJvbGxlcjo6Zmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2UoY29uc3QgQ3BwQXJndW1l bnRMaXN0JiBhcmd1CiB7CiAgICAgcmVzdWx0LT5zZXROdWxsKCk7CiAKLSAgICBXZWJGcmFtZSog ZnJhbWUgPSB0ZXN0U2hlbGwtPndlYlZpZXcoKS0+Zm9jdXNlZEZyYW1lKCk7CisgICAgV2ViRnJh bWUqIGZyYW1lID0gbV93ZWJWaWV3LT5mb2N1c2VkRnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQog ICAgICAgICByZXR1cm47CiAKQEAgLTIxMCw3ICsxOTgsNyBAQCB2b2lkIFRleHRJbnB1dENvbnRy b2xsZXI6OnZhbGlkQXR0cmlidXRlc0Zvck1hcmtlZFRleHQoY29uc3QgQ3BwQXJndW1lbnRMaXN0 JiwgQwogewogICAgIHJlc3VsdC0+c2V0TnVsbCgpOwogCi0gICAgV2ViRnJhbWUqIG1haW5GcmFt ZSA9IGdldE1haW5GcmFtZSgpOworICAgIFdlYkZyYW1lKiBtYWluRnJhbWUgPSBtX3dlYlZpZXct Pm1haW5GcmFtZSgpOwogICAgIGlmICghbWFpbkZyYW1lKQogICAgICAgICByZXR1cm47CiAKQEAg LTIyOCwxMCArMjE2LDYgQEAgdm9pZCBUZXh0SW5wdXRDb250cm9sbGVyOjpzZXRDb21wb3NpdGlv bihjb25zdCBDcHBBcmd1bWVudExpc3QmIGFyZ3VtZW50cywgQ3BwVmEKIHsKICAgICByZXN1bHQt PnNldE51bGwoKTsKIAotICAgIFdlYlZpZXcqIHZpZXcgPSBnZXRNYWluRnJhbWUoKSA/IGdldE1h aW5GcmFtZSgpLT52aWV3KCkgOiAwOwotICAgIGlmICghdmlldykKLSAgICAgICAgcmV0dXJuOwot CiAgICAgaWYgKGFyZ3VtZW50cy5zaXplKCkgPCAxKQogICAgICAgICByZXR1cm47CiAKQEAgLTI0 MSw5ICsyMjUsOSBAQCB2b2lkIFRleHRJbnB1dENvbnRyb2xsZXI6OnNldENvbXBvc2l0aW9uKGNv bnN0IENwcEFyZ3VtZW50TGlzdCYgYXJndW1lbnRzLCBDcHBWYQogICAgIGtleURvd24ubW9kaWZp ZXJzID0gMDsKICAgICBrZXlEb3duLndpbmRvd3NLZXlDb2RlID0gMHhFNTsgLy8gVktFWV9QUk9D RVNTS0VZCiAgICAga2V5RG93bi5zZXRLZXlJZGVudGlmaWVyRnJvbVdpbmRvd3NLZXlDb2RlKCk7 Ci0gICAgdmlldy0+aGFuZGxlSW5wdXRFdmVudChrZXlEb3duKTsKKyAgICBtX3dlYlZpZXctPmhh bmRsZUlucHV0RXZlbnQoa2V5RG93bik7CiAKICAgICBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25V bmRlcmxpbmU+IHVuZGVybGluZXM7CiAgICAgV2ViU3RyaW5nIHRleHQoV2ViU3RyaW5nOjpmcm9t VVRGOChhcmd1bWVudHNbMF0udG9TdHJpbmcoKSkpOwotICAgIHZpZXctPnNldENvbXBvc2l0aW9u KHRleHQsIHVuZGVybGluZXMsIDAsIHRleHQubGVuZ3RoKCkpOworICAgIG1fd2ViVmlldy0+c2V0 Q29tcG9zaXRpb24odGV4dCwgdW5kZXJsaW5lcywgMCwgdGV4dC5sZW5ndGgoKSk7CiB9CmRpZmYg LS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXh0SW5wdXRDb250cm9sbGVy LmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXh0SW5wdXRDb250cm9sbGVyLmgK aW5kZXggM2EzOTA3ZmRhOGFhZDVhYzQwYzBjNTg0NjBlYzUxZDNhMjg5NWNiOC4uYTk1OWFhOGIz Njg0MzcyMWY0MWNkMzUyZWRmMDNkZjg4MWUzOGQ2NSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vVGV4dElucHV0Q29udHJvbGxlci5oCisrKyBiL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2Nocm9taXVtL1RleHRJbnB1dENvbnRyb2xsZXIuaApAQCAtMzcsMTUgKzM3LDE1 IEBACiAKICNpbmNsdWRlICJDcHBCb3VuZENsYXNzLmgiCiAKLWNsYXNzIFRlc3RTaGVsbDsKLQog bmFtZXNwYWNlIFdlYktpdCB7Ci1jbGFzcyBXZWJGcmFtZTsKK2NsYXNzIFdlYlZpZXc7CiB9CiAK IGNsYXNzIFRleHRJbnB1dENvbnRyb2xsZXIgOiBwdWJsaWMgQ3BwQm91bmRDbGFzcyB7CiBwdWJs aWM6Ci0gICAgVGV4dElucHV0Q29udHJvbGxlcihUZXN0U2hlbGwqKTsKKyAgICBUZXh0SW5wdXRD b250cm9sbGVyKCk7CisKKyAgICB2b2lkIHNldFdlYlZpZXcoV2ViS2l0OjpXZWJWaWV3KiB3ZWJW aWV3KSB7IG1fd2ViVmlldyA9IHdlYlZpZXc7IH0KIAogICAgIHZvaWQgaW5zZXJ0VGV4dChjb25z dCBDcHBBcmd1bWVudExpc3QmLCBDcHBWYXJpYW50Kik7CiAgICAgdm9pZCBkb0NvbW1hbmQoY29u c3QgQ3BwQXJndW1lbnRMaXN0JiwgQ3BwVmFyaWFudCopOwpAQCAtNjQsMTEgKzY0LDcgQEAgcHVi bGljOgogICAgIHZvaWQgc2V0Q29tcG9zaXRpb24oY29uc3QgQ3BwQXJndW1lbnRMaXN0JiwgQ3Bw VmFyaWFudCopOwogCiBwcml2YXRlOgotICAgIC8vIFJldHVybnMgdGhlIHRlc3Qgc2hlbGwncyBt YWluIFdlYkZyYW1lLgotICAgIHN0YXRpYyBXZWJLaXQ6OldlYkZyYW1lKiBnZXRNYWluRnJhbWUo KTsKLQotICAgIC8vIE5vbi1vd25pbmcgcG9pbnRlci4gVGhlIFRleHRJbnB1dENvbnRyb2xsZXIg aXMgb3duZWQgYnkgdGhlIFRlc3RTaGVsbC4KLSAgICBzdGF0aWMgVGVzdFNoZWxsKiB0ZXN0U2hl bGw7CisgICAgV2ViS2l0OjpXZWJWaWV3KiBtX3dlYlZpZXc7CiB9OwogCiAjZW5kaWYgLy8gVGV4 dElucHV0Q29udHJvbGxlcl9oCg==