16329 2007-12-06 08:23:58 -0800 [GTK] Two small cleanups 2007-12-10 13:09:39 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Other OS X 10.4 RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned oldest_to_newest 63474 0 xan.lopez 2007-12-06 08:23:58 -0800 Rename m_webPage to m_webView in ChromeClient and chain to parent class in WebKitWebView to activate bindings. 63476 1 17749 xan.lopez 2007-12-06 08:25:12 -0800 Created attachment 17749 Patch 63479 2 xan.lopez 2007-12-06 08:29:24 -0800 + return GTK_WIDGET_CLASS(webkit_web_view_parent_class)->key_press_event (widget, event); Extra space, blah :) 63510 3 17753 xan.lopez 2007-12-06 11:55:45 -0800 Created attachment 17753 Cleanup 63511 4 17753 alp 2007-12-06 12:08:31 -0800 Comment on attachment 17753 Cleanup Good, apart from a whitespace tweak (not your fault, it was that way before the change) and chaining up key_release to key_press (will fix up before landing). 63854 5 alp 2007-12-10 13:09:39 -0800 Landed in r28490. 17749 2007-12-06 08:25:12 -0800 2007-12-06 11:55:45 -0800 Patch 0001-2007-12-06-Xan-Lopez-xan-gnome.org.patch text/plain 9106 xan.lopez RnJvbSBmNmRmZWFlZDA3OTg4NDU3ZTgyZGNiODNlZWVkNTZhNTJiOGY5NzAzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhhbkBnbm9tZS5vcmc+CkRhdGU6IFRodSwg NiBEZWMgMjAwNyAxODoyMToxMiArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMDctMTItMDYgIFhh biBMb3BleiAgPHhhbkBnbm9tZS5vcmc+CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgoKICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHA6CiAgICAg ICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50OjpjcmVhdGVXaW5kb3cpOgogICAgICAgIChXZWJLaXQ6 OkNocm9tZUNsaWVudDo6YWRkTWVzc2FnZVRvQ29uc29sZSk6CiAgICAgICAgKFdlYktpdDo6Q2hy b21lQ2xpZW50OjpydW5KYXZhU2NyaXB0QWxlcnQpOgogICAgICAgIChXZWJLaXQ6OkNocm9tZUNs aWVudDo6cnVuSmF2YVNjcmlwdENvbmZpcm0pOgogICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVu dDo6cnVuSmF2YVNjcmlwdFByb21wdCk6CiAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50Ojpz ZXRTdGF0dXNiYXJUZXh0KToKICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6Om1vdXNlRGlk TW92ZU92ZXJFbGVtZW50KToKICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OnNldFRvb2xU aXApOgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmg6CiAgICAgICAg KiBXZWJWaWV3L3dlYmtpdHByaXZhdGUuY3BwOgogICAgICAgIChXZWJLaXQ6OmtpdCk6CgoJcy9t X3dlYlBhZ2UvbV93ZWJWaWV3LwoKICAgICAgICAqIFdlYlZpZXcvd2Via2l0d2Vidmlldy5jcHA6 CgoJQ2hhaW4gdXAgdG8gdGhlIHBhcmVudCBjbGFzcyB0byBhY3RpdmF0ZSBiaW5kaW5ncyBpbnN0 ZWFkCglvZiBkb2luZyBpdCBleHBsaWNpdGVseS4KLS0tCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDI0ICsrKysrKysrKysrKysrKysrKysrKwogV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwIHwgICAyOCArKysrKysr KysrKystLS0tLS0tLS0tLS0KIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 R3RrLmggICB8ICAgIDQgKy0KIFdlYktpdC9ndGsvV2ViVmlldy93ZWJraXRwcml2YXRlLmNwcCAg ICAgICAgICB8ICAgIDIgKy0KIFdlYktpdC9ndGsvV2ViVmlldy93ZWJraXR3ZWJ2aWV3LmNwcCAg ICAgICAgICB8ICAgIDMgKy0KIDUgZmlsZXMgY2hhbmdlZCwgNDMgaW5zZXJ0aW9ucygrKSwgMTgg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCAxZDY2NjQ3Li5lMTg5ZjhmIDEwMDY0NAotLS0gYS9XZWJLaXQv Z3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBA CisyMDA3LTEyLTA2ICBYYW4gTG9wZXogIDx4YW5AZ25vbWUub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21l Q2xpZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50OjpjcmVhdGVXaW5k b3cpOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OmFkZE1lc3NhZ2VUb0NvbnNvbGUp OgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OnJ1bkphdmFTY3JpcHRBbGVydCk6Cisg ICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudDo6cnVuSmF2YVNjcmlwdENvbmZpcm0pOgorICAg ICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OnJ1bkphdmFTY3JpcHRQcm9tcHQpOgorICAgICAg ICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OnNldFN0YXR1c2JhclRleHQpOgorICAgICAgICAoV2Vi S2l0OjpDaHJvbWVDbGllbnQ6Om1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KToKKyAgICAgICAgKFdl YktpdDo6Q2hyb21lQ2xpZW50OjpzZXRUb29sVGlwKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9y dC9DaHJvbWVDbGllbnRHdGsuaDoKKyAgICAgICAgKiBXZWJWaWV3L3dlYmtpdHByaXZhdGUuY3Bw OgorICAgICAgICAoV2ViS2l0OjpraXQpOgorCisJcy9tX3dlYlBhZ2UvbV93ZWJWaWV3LworCQor ICAgICAgICAqIFdlYlZpZXcvd2Via2l0d2Vidmlldy5jcHA6CisKKwlDaGFpbiB1cCB0byB0aGUg cGFyZW50IGNsYXNzIHRvIGFjdGl2YXRlIGJpbmRpbmdzIGluc3RlYWQKKwlvZiBkb2luZyBpdCBl eHBsaWNpdGVseS4KKwogMjAwNy0xMi0wNiAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIgPGhv bGdlci5mcmV5dGhlckB0cm9sbHRlY2guY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFscCBU b2tlci4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcApp bmRleCBmZGYwM2VkLi43NGFlMGY5IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBw b3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKKysrIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9D aHJvbWVDbGllbnRHdGsuY3BwCkBAIC00Myw4ICs0Myw4IEBACiB1c2luZyBuYW1lc3BhY2UgV2Vi Q29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7Ci1DaHJvbWVDbGllbnQ6OkNocm9tZUNsaWVudChX ZWJLaXRXZWJWaWV3KiBwYWdlKQotICAgIDogbV93ZWJQYWdlKHBhZ2UpCitDaHJvbWVDbGllbnQ6 OkNocm9tZUNsaWVudChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQorICAgIDogbV93ZWJWaWV3KHdl YlZpZXcpCiB7CiB9CiAKQEAgLTkzLDExICs5MywxMSBAQCBQYWdlKiBDaHJvbWVDbGllbnQ6OmNy ZWF0ZVdpbmRvdyhGcmFtZSosIGNvbnN0IEZyYW1lTG9hZFJlcXVlc3QmLCBjb25zdCBXaW5kb3dG ZQogICAgICAgICByZXR1cm4gMDsKICAgICB9IGVsc2UgewogICAgICAgICAvKiBUT0RPOiBGcmFt ZUxvYWRSZXF1ZXN0IGlzIG5vdCB1c2VkICovCi0gICAgICAgIFdlYktpdFdlYlZpZXcqIHBhZ2Ug PSBXRUJLSVRfV0VCX1ZJRVdfR0VUX0NMQVNTKG1fd2ViUGFnZSktPmNyZWF0ZV93ZWJfdmlldyht X3dlYlBhZ2UpOwotICAgICAgICBpZiAoIXBhZ2UpCisgICAgICAgIFdlYktpdFdlYlZpZXcqIHdl YlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVdfR0VUX0NMQVNTKG1fd2ViVmlldyktPmNyZWF0ZV93ZWJf dmlldyhtX3dlYlZpZXcpOworICAgICAgICBpZiAoIXdlYlZpZXcpCiAgICAgICAgICAgICByZXR1 cm4gMDsKIAotICAgICAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSAqcHJpdmF0ZURhdGEgPSBXRUJL SVRfV0VCX1ZJRVdfR0VUX1BSSVZBVEUoV0VCS0lUX1dFQl9WSUVXKHBhZ2UpKTsKKyAgICAgICAg V2ViS2l0V2ViVmlld1ByaXZhdGUgKnByaXZhdGVEYXRhID0gV0VCS0lUX1dFQl9WSUVXX0dFVF9Q UklWQVRFKHdlYlZpZXcpOwogICAgICAgICByZXR1cm4gcHJpdmF0ZURhdGEtPmNvcmVQYWdlOwog ICAgIH0KIH0KQEAgLTE5NywyMCArMTk3LDIwIEBAIGJvb2wgQ2hyb21lQ2xpZW50OjpydW5CZWZv cmVVbmxvYWRDb25maXJtUGFuZWwoY29uc3QgV2ViQ29yZTo6U3RyaW5nJiwgV2ViQ29yZTo6CiB2 b2lkIENocm9tZUNsaWVudDo6YWRkTWVzc2FnZVRvQ29uc29sZShjb25zdCBXZWJDb3JlOjpTdHJp bmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGludCBsaW5lTnVtYmVyLCBjb25zdCBXZWJDb3JlOjpTdHJp bmcmIHNvdXJjZUlkKQogewogICAgIGdib29sZWFuIHJldHZhbDsKLSAgICBnX3NpZ25hbF9lbWl0 X2J5X25hbWUobV93ZWJQYWdlLCAiY29uc29sZS1tZXNzYWdlIiwgbWVzc2FnZS51dGY4KCkuZGF0 YSgpLCBsaW5lTnVtYmVyLCBzb3VyY2VJZC51dGY4KCkuZGF0YSgpLCAmcmV0dmFsKTsKKyAgICBn X3NpZ25hbF9lbWl0X2J5X25hbWUobV93ZWJWaWV3LCAiY29uc29sZS1tZXNzYWdlIiwgbWVzc2Fn ZS51dGY4KCkuZGF0YSgpLCBsaW5lTnVtYmVyLCBzb3VyY2VJZC51dGY4KCkuZGF0YSgpLCAmcmV0 dmFsKTsKIH0KIAogdm9pZCBDaHJvbWVDbGllbnQ6OnJ1bkphdmFTY3JpcHRBbGVydChGcmFtZSog ZnJhbWUsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKICAgICBnYm9vbGVhbiByZXR2YWw7Ci0g ICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKG1fd2ViUGFnZSwgInNjcmlwdC1hbGVydCIsIGtpdChm cmFtZSksIG1lc3NhZ2UudXRmOCgpLmRhdGEoKSwgJnJldHZhbCk7CisgICAgZ19zaWduYWxfZW1p dF9ieV9uYW1lKG1fd2ViVmlldywgInNjcmlwdC1hbGVydCIsIGtpdChmcmFtZSksIG1lc3NhZ2Uu dXRmOCgpLmRhdGEoKSwgJnJldHZhbCk7CiB9CiAKIGJvb2wgQ2hyb21lQ2xpZW50OjpydW5KYXZh U2NyaXB0Q29uZmlybShGcmFtZSogZnJhbWUsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKICAg ICBnYm9vbGVhbiByZXR2YWw7CiAgICAgZ2Jvb2xlYW4gZGlkQ29uZmlybTsKLSAgICBnX3NpZ25h bF9lbWl0X2J5X25hbWUobV93ZWJQYWdlLCAic2NyaXB0LWNvbmZpcm0iLCBraXQoZnJhbWUpLCBt ZXNzYWdlLnV0ZjgoKS5kYXRhKCksICZkaWRDb25maXJtLCAmcmV0dmFsKTsKKyAgICBnX3NpZ25h bF9lbWl0X2J5X25hbWUobV93ZWJWaWV3LCAic2NyaXB0LWNvbmZpcm0iLCBraXQoZnJhbWUpLCBt ZXNzYWdlLnV0ZjgoKS5kYXRhKCksICZkaWRDb25maXJtLCAmcmV0dmFsKTsKICAgICByZXR1cm4g ZGlkQ29uZmlybSA9PSBUUlVFOwogfQogCkBAIC0yMTgsNyArMjE4LDcgQEAgYm9vbCBDaHJvbWVD bGllbnQ6OnJ1bkphdmFTY3JpcHRQcm9tcHQoRnJhbWUqIGZyYW1lLCBjb25zdCBTdHJpbmcmIG1l c3NhZ2UsIGNvbnMKIHsKICAgICBnYm9vbGVhbiByZXR2YWw7CiAgICAgZ2NoYXIqIHZhbHVlID0g MDsKLSAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUobV93ZWJQYWdlLCAic2NyaXB0LXByb21wdCIs IGtpdChmcmFtZSksIG1lc3NhZ2UudXRmOCgpLmRhdGEoKSwgZGVmYXVsdFZhbHVlLnV0ZjgoKS5k YXRhKCksICZ2YWx1ZSwgJnJldHZhbCk7CisgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKG1fd2Vi VmlldywgInNjcmlwdC1wcm9tcHQiLCBraXQoZnJhbWUpLCBtZXNzYWdlLnV0ZjgoKS5kYXRhKCks IGRlZmF1bHRWYWx1ZS51dGY4KCkuZGF0YSgpLCAmdmFsdWUsICZyZXR2YWwpOwogICAgIGlmICh2 YWx1ZSkgewogICAgICAgICByZXN1bHQgPSBTdHJpbmc6OmZyb21VVEY4KHZhbHVlKTsKICAgICAg ICAgZ19mcmVlKHZhbHVlKTsKQEAgLTIzMCw3ICsyMzAsNyBAQCBib29sIENocm9tZUNsaWVudDo6 cnVuSmF2YVNjcmlwdFByb21wdChGcmFtZSogZnJhbWUsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwg Y29ucwogdm9pZCBDaHJvbWVDbGllbnQ6OnNldFN0YXR1c2JhclRleHQoY29uc3QgU3RyaW5nJiBz dHJpbmcpCiB7CiAgICAgQ1N0cmluZyBzdHJpbmdNZXNzYWdlID0gc3RyaW5nLnV0ZjgoKTsKLSAg ICBnX3NpZ25hbF9lbWl0X2J5X25hbWUobV93ZWJQYWdlLCAic3RhdHVzLWJhci10ZXh0LWNoYW5n ZWQiLCBzdHJpbmdNZXNzYWdlLmRhdGEoKSk7CisgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKG1f d2ViVmlldywgInN0YXR1cy1iYXItdGV4dC1jaGFuZ2VkIiwgc3RyaW5nTWVzc2FnZS5kYXRhKCkp OwogfQogCiBib29sIENocm9tZUNsaWVudDo6c2hvdWxkSW50ZXJydXB0SmF2YVNjcmlwdCgpCkBA IC0yNzQsMTEgKzI3NCwxMSBAQCB2b2lkIENocm9tZUNsaWVudDo6bW91c2VEaWRNb3ZlT3ZlckVs ZW1lbnQoY29uc3QgSGl0VGVzdFJlc3VsdCYgaGl0LCB1bnNpZ25lZCBtbwogICAgICAgICBpZiAo IXVybC5pc0VtcHR5KCkgJiYgdXJsICE9IG1faG92ZXJlZExpbmtVUkwpIHsKICAgICAgICAgICAg IENTdHJpbmcgdGl0bGVTdHJpbmcgPSBoaXQudGl0bGUoKS51dGY4KCk7CiAgICAgICAgICAgICBE ZXByZWNhdGVkQ1N0cmluZyB1cmxTdHJpbmcgPSB1cmwucHJldHR5VVJMKCkudXRmOCgpOwotICAg ICAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKG1fd2ViUGFnZSwgImhvdmVyaW5nLW92ZXIt bGluayIsIHRpdGxlU3RyaW5nLmRhdGEoKSwgdXJsU3RyaW5nLmRhdGEoKSk7CisgICAgICAgICAg ICBnX3NpZ25hbF9lbWl0X2J5X25hbWUobV93ZWJWaWV3LCAiaG92ZXJpbmctb3Zlci1saW5rIiwg dGl0bGVTdHJpbmcuZGF0YSgpLCB1cmxTdHJpbmcuZGF0YSgpKTsKICAgICAgICAgICAgIG1faG92 ZXJlZExpbmtVUkwgPSB1cmw7CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKCFpc0xpbmsgJiYg IW1faG92ZXJlZExpbmtVUkwuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGdfc2lnbmFsX2VtaXRfYnlf bmFtZShtX3dlYlBhZ2UsICJob3ZlcmluZy1vdmVyLWxpbmsiLCAwLCAwKTsKKyAgICAgICAgZ19z aWduYWxfZW1pdF9ieV9uYW1lKG1fd2ViVmlldywgImhvdmVyaW5nLW92ZXItbGluayIsIDAsIDAp OwogICAgICAgICBtX2hvdmVyZWRMaW5rVVJMID0gS1VSTCgpOwogICAgIH0KIH0KQEAgLTI4Nyw5 ICsyODcsOSBAQCB2b2lkIENocm9tZUNsaWVudDo6c2V0VG9vbFRpcChjb25zdCBTdHJpbmcmIHRv b2xUaXApCiB7CiAjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwxMiwwKQogICAgIGlmICh0b29sVGlw LmlzRW1wdHkoKSkKLSAgICAgICAgZ19vYmplY3Rfc2V0KEdfT0JKRUNUKG1fd2ViUGFnZSksICJo YXMtdG9vbHRpcCIsIEZBTFNFLCBOVUxMKTsKKyAgICAgICAgZ19vYmplY3Rfc2V0KEdfT0JKRUNU KG1fd2ViVmlldyksICJoYXMtdG9vbHRpcCIsIEZBTFNFLCBOVUxMKTsKICAgICBlbHNlCi0gICAg ICAgIGd0a193aWRnZXRfc2V0X3Rvb2x0aXBfdGV4dChHVEtfV0lER0VUKG1fd2ViUGFnZSksIHRv b2xUaXAudXRmOCgpLmRhdGEoKSk7CisgICAgICAgIGd0a193aWRnZXRfc2V0X3Rvb2x0aXBfdGV4 dChHVEtfV0lER0VUKG1fd2ViVmlldyksIHRvb2xUaXAudXRmOCgpLmRhdGEoKSk7CiAjZWxzZQog ICAgIC8vIFRPRE86IFN1cHBvcnQgb2xkZXIgR1RLKyB2ZXJzaW9ucwogICAgIC8vIFNlZSBodHRw Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTc5MwpkaWZmIC0tZ2l0IGEvV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuaCBiL1dlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmgKaW5kZXggN2FmMGU2MC4uMWM5NmI0MiAxMDA2 NDQKLS0tIGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuaAorKysg Yi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5oCkBAIC0zMCw3ICsz MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogICAgIGNsYXNzIENocm9tZUNsaWVudCA6IHB1Ymxp YyBXZWJDb3JlOjpDaHJvbWVDbGllbnQgewogICAgIHB1YmxpYzoKICAgICAgICAgQ2hyb21lQ2xp ZW50KFdlYktpdFdlYlZpZXcqKTsKLSAgICAgICAgV2ViS2l0V2ViVmlldyogd2ViUGFnZSgpIGNv bnN0IHsgcmV0dXJuIG1fd2ViUGFnZTsgfQorICAgICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 KCkgY29uc3QgeyByZXR1cm4gbV93ZWJWaWV3OyB9CiAKICAgICAgICAgdmlydHVhbCB2b2lkIGNo cm9tZURlc3Ryb3llZCgpOwogCkBAIC05Nyw3ICs5Nyw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewog ICAgICAgICB2aXJ0dWFsIHVuc2lnbmVkIGxvbmcgbG9uZyByZXF1ZXN0UXVvdGFJbmNyZWFzZUZv ckRhdGFiYXNlT3BlcmF0aW9uKFdlYkNvcmU6OkZyYW1lKiwgY29uc3QgV2ViQ29yZTo6U2VjdXJp dHlPcmlnaW5EYXRhJiwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiwgdW5zaWduZWQgbG9uZyBsb25n KTsKIAogICAgIHByaXZhdGU6Ci0gICAgICAgIFdlYktpdFdlYlZpZXcqIG1fd2ViUGFnZTsKKyAg ICAgICAgV2ViS2l0V2ViVmlldyogbV93ZWJWaWV3OwogICAgICAgICBXZWJDb3JlOjpLVVJMIG1f aG92ZXJlZExpbmtVUkw7CiAgICAgfTsKIH0KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvV2ViVmll dy93ZWJraXRwcml2YXRlLmNwcCBiL1dlYktpdC9ndGsvV2ViVmlldy93ZWJraXRwcml2YXRlLmNw cAppbmRleCA1NWEzOWE4Li4wYmMyYjE4IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYlZpZXcv d2Via2l0cHJpdmF0ZS5jcHAKKysrIGIvV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdHByaXZhdGUu Y3BwCkBAIC04NCw2ICs4NCw2IEBAIFdlYktpdFdlYlZpZXcqIGtpdChXZWJDb3JlOjpQYWdlKiBj b3JlUGFnZSkKIAogICAgIEFTU0VSVChjb3JlUGFnZS0+Y2hyb21lKCkpOwogICAgIFdlYktpdDo6 Q2hyb21lQ2xpZW50KiBjbGllbnQgPSBzdGF0aWNfY2FzdDxXZWJLaXQ6OkNocm9tZUNsaWVudCo+ KGNvcmVQYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCkpOwotICAgIHJldHVybiBjbGllbnQgPyBjbGll bnQtPndlYlBhZ2UoKSA6IDA7CisgICAgcmV0dXJuIGNsaWVudCA/IGNsaWVudC0+d2ViVmlldygp IDogMDsKIH0KIH0KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvV2ViVmlldy93ZWJraXR3ZWJ2aWV3 LmNwcCBiL1dlYktpdC9ndGsvV2ViVmlldy93ZWJraXR3ZWJ2aWV3LmNwcAppbmRleCBmOTJhNWIx Li40YTQzYjFmIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0d2Vidmlldy5j cHAKKysrIGIvV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0xNDEsNyAr MTQxLDggQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19rZXlfcHJlc3NfZXZlbnQo R3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50S2V5KgogICAgICAgICByZXR1cm4gVFJVRTsKICAg ICB9CiAKLSAgICByZXR1cm4gZ3RrX2JpbmRpbmdzX2FjdGl2YXRlX2V2ZW50KEdUS19PQkpFQ1Qo d2lkZ2V0KSwgZXZlbnQpOworICAgIC8qIENoYWluIHVwIHRvIG91ciBwYXJlbnQgY2xhc3MgZm9y IGJpbmRpbmdzICovCisgICAgcmV0dXJuIEdUS19XSURHRVRfQ0xBU1Mod2Via2l0X3dlYl92aWV3 X3BhcmVudF9jbGFzcyktPmtleV9wcmVzc19ldmVudCAod2lkZ2V0LCBldmVudCk7CiB9CiAKIHN0 YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfa2V5X3JlbGVhc2VfZXZlbnQoR3RrV2lkZ2V0 KiB3aWRnZXQsIEdka0V2ZW50S2V5KiBldmVudCkKLS0gCjEuNS4zLjQKCg== 17753 2007-12-06 11:55:45 -0800 2007-12-06 12:08:31 -0800 Cleanup 0001-2007-12-06-Xan-Lopez-xan-gnome.org.patch text/plain 9552 xan.lopez RnJvbSA3YTUwZmViM2U1MjFiY2FjYTNhZDY0MTU5YmU1YzE2ZmE1NmY0YTQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhhbkBnbm9tZS5vcmc+CkRhdGU6IFRodSwg NiBEZWMgMjAwNyAxODoyMToxMiArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMDctMTItMDYgIFhh biBMb3BleiAgPHhhbkBnbm9tZS5vcmc+CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgoKICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHA6CiAgICAg ICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50OjpjcmVhdGVXaW5kb3cpOgogICAgICAgIChXZWJLaXQ6 OkNocm9tZUNsaWVudDo6YWRkTWVzc2FnZVRvQ29uc29sZSk6CiAgICAgICAgKFdlYktpdDo6Q2hy b21lQ2xpZW50OjpydW5KYXZhU2NyaXB0QWxlcnQpOgogICAgICAgIChXZWJLaXQ6OkNocm9tZUNs aWVudDo6cnVuSmF2YVNjcmlwdENvbmZpcm0pOgogICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVu dDo6cnVuSmF2YVNjcmlwdFByb21wdCk6CiAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50Ojpz ZXRTdGF0dXNiYXJUZXh0KToKICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6Om1vdXNlRGlk TW92ZU92ZXJFbGVtZW50KToKICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OnNldFRvb2xU aXApOgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmg6CiAgICAgICAg KiBXZWJWaWV3L3dlYmtpdHByaXZhdGUuY3BwOgogICAgICAgIChXZWJLaXQ6OmtpdCk6CgoJcy9t X3dlYlBhZ2UvbV93ZWJWaWV3LwoKICAgICAgICAqIFdlYlZpZXcvd2Via2l0d2Vidmlldy5jcHA6 CgoJQ2hhaW4gdXAgdG8gdGhlIHBhcmVudCBjbGFzcyB0byBhY3RpdmF0ZSBiaW5kaW5ncyBpbnN0 ZWFkCglvZiBkb2luZyBpdCBleHBsaWNpdGVseS4KLS0tCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDI0ICsrKysrKysrKysrKysrKysrKysrKwogV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwIHwgICAyOCArKysrKysr KysrKystLS0tLS0tLS0tLS0KIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 R3RrLmggICB8ICAgIDQgKy0KIFdlYktpdC9ndGsvV2ViVmlldy93ZWJraXRwcml2YXRlLmNwcCAg ICAgICAgICB8ICAgIDIgKy0KIFdlYktpdC9ndGsvV2ViVmlldy93ZWJraXR3ZWJ2aWV3LmNwcCAg ICAgICAgICB8ICAgIDYgKysrLQogNSBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCspLCAx OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktp dC9ndGsvQ2hhbmdlTG9nCmluZGV4IDFkNjY2NDcuLmUxODlmOGYgMTAwNjQ0Ci0tLSBhL1dlYktp dC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMDctMTItMDYgIFhhbiBMb3BleiAgPHhhbkBnbm9tZS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJv bWVDbGllbnRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OmNyZWF0ZVdp bmRvdyk6CisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudDo6YWRkTWVzc2FnZVRvQ29uc29s ZSk6CisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudDo6cnVuSmF2YVNjcmlwdEFsZXJ0KToK KyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50OjpydW5KYXZhU2NyaXB0Q29uZmlybSk6Cisg ICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudDo6cnVuSmF2YVNjcmlwdFByb21wdCk6CisgICAg ICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudDo6c2V0U3RhdHVzYmFyVGV4dCk6CisgICAgICAgIChX ZWJLaXQ6OkNocm9tZUNsaWVudDo6bW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQpOgorICAgICAgICAo V2ViS2l0OjpDaHJvbWVDbGllbnQ6OnNldFRvb2xUaXApOgorICAgICAgICAqIFdlYkNvcmVTdXBw b3J0L0Nocm9tZUNsaWVudEd0ay5oOgorICAgICAgICAqIFdlYlZpZXcvd2Via2l0cHJpdmF0ZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OmtpdCk6CisKKwlzL21fd2ViUGFnZS9tX3dlYlZpZXcvCisJ CisgICAgICAgICogV2ViVmlldy93ZWJraXR3ZWJ2aWV3LmNwcDoKKworCUNoYWluIHVwIHRvIHRo ZSBwYXJlbnQgY2xhc3MgdG8gYWN0aXZhdGUgYmluZGluZ3MgaW5zdGVhZAorCW9mIGRvaW5nIGl0 IGV4cGxpY2l0ZWx5LgorCiAyMDA3LTEyLTA2ICBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8 aG9sZ2VyLmZyZXl0aGVyQHRyb2xsdGVjaC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxw IFRva2VyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGll bnRHdGsuY3BwIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3Bw CmluZGV4IGZkZjAzZWQuLjc0YWUwZjkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1 cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0 L0Nocm9tZUNsaWVudEd0ay5jcHAKQEAgLTQzLDggKzQzLDggQEAKIHVzaW5nIG5hbWVzcGFjZSBX ZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKLUNocm9tZUNsaWVudDo6Q2hyb21lQ2xpZW50 KFdlYktpdFdlYlZpZXcqIHBhZ2UpCi0gICAgOiBtX3dlYlBhZ2UocGFnZSkKK0Nocm9tZUNsaWVu dDo6Q2hyb21lQ2xpZW50KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCisgICAgOiBtX3dlYlZpZXco d2ViVmlldykKIHsKIH0KIApAQCAtOTMsMTEgKzkzLDExIEBAIFBhZ2UqIENocm9tZUNsaWVudDo6 Y3JlYXRlV2luZG93KEZyYW1lKiwgY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYsIGNvbnN0IFdpbmRv d0ZlCiAgICAgICAgIHJldHVybiAwOwogICAgIH0gZWxzZSB7CiAgICAgICAgIC8qIFRPRE86IEZy YW1lTG9hZFJlcXVlc3QgaXMgbm90IHVzZWQgKi8KLSAgICAgICAgV2ViS2l0V2ViVmlldyogcGFn ZSA9IFdFQktJVF9XRUJfVklFV19HRVRfQ0xBU1MobV93ZWJQYWdlKS0+Y3JlYXRlX3dlYl92aWV3 KG1fd2ViUGFnZSk7Ci0gICAgICAgIGlmICghcGFnZSkKKyAgICAgICAgV2ViS2l0V2ViVmlldyog d2ViVmlldyA9IFdFQktJVF9XRUJfVklFV19HRVRfQ0xBU1MobV93ZWJWaWV3KS0+Y3JlYXRlX3dl Yl92aWV3KG1fd2ViVmlldyk7CisgICAgICAgIGlmICghd2ViVmlldykKICAgICAgICAgICAgIHJl dHVybiAwOwogCi0gICAgICAgIFdlYktpdFdlYlZpZXdQcml2YXRlICpwcml2YXRlRGF0YSA9IFdF QktJVF9XRUJfVklFV19HRVRfUFJJVkFURShXRUJLSVRfV0VCX1ZJRVcocGFnZSkpOworICAgICAg ICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSAqcHJpdmF0ZURhdGEgPSBXRUJLSVRfV0VCX1ZJRVdfR0VU X1BSSVZBVEUod2ViVmlldyk7CiAgICAgICAgIHJldHVybiBwcml2YXRlRGF0YS0+Y29yZVBhZ2U7 CiAgICAgfQogfQpAQCAtMTk3LDIwICsxOTcsMjAgQEAgYm9vbCBDaHJvbWVDbGllbnQ6OnJ1bkJl Zm9yZVVubG9hZENvbmZpcm1QYW5lbChjb25zdCBXZWJDb3JlOjpTdHJpbmcmLCBXZWJDb3JlOjoK IHZvaWQgQ2hyb21lQ2xpZW50OjphZGRNZXNzYWdlVG9Db25zb2xlKGNvbnN0IFdlYkNvcmU6OlN0 cmluZyYgbWVzc2FnZSwgdW5zaWduZWQgaW50IGxpbmVOdW1iZXIsIGNvbnN0IFdlYkNvcmU6OlN0 cmluZyYgc291cmNlSWQpCiB7CiAgICAgZ2Jvb2xlYW4gcmV0dmFsOwotICAgIGdfc2lnbmFsX2Vt aXRfYnlfbmFtZShtX3dlYlBhZ2UsICJjb25zb2xlLW1lc3NhZ2UiLCBtZXNzYWdlLnV0ZjgoKS5k YXRhKCksIGxpbmVOdW1iZXIsIHNvdXJjZUlkLnV0ZjgoKS5kYXRhKCksICZyZXR2YWwpOworICAg IGdfc2lnbmFsX2VtaXRfYnlfbmFtZShtX3dlYlZpZXcsICJjb25zb2xlLW1lc3NhZ2UiLCBtZXNz YWdlLnV0ZjgoKS5kYXRhKCksIGxpbmVOdW1iZXIsIHNvdXJjZUlkLnV0ZjgoKS5kYXRhKCksICZy ZXR2YWwpOwogfQogCiB2b2lkIENocm9tZUNsaWVudDo6cnVuSmF2YVNjcmlwdEFsZXJ0KEZyYW1l KiBmcmFtZSwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogewogICAgIGdib29sZWFuIHJldHZhbDsK LSAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUobV93ZWJQYWdlLCAic2NyaXB0LWFsZXJ0Iiwga2l0 KGZyYW1lKSwgbWVzc2FnZS51dGY4KCkuZGF0YSgpLCAmcmV0dmFsKTsKKyAgICBnX3NpZ25hbF9l bWl0X2J5X25hbWUobV93ZWJWaWV3LCAic2NyaXB0LWFsZXJ0Iiwga2l0KGZyYW1lKSwgbWVzc2Fn ZS51dGY4KCkuZGF0YSgpLCAmcmV0dmFsKTsKIH0KIAogYm9vbCBDaHJvbWVDbGllbnQ6OnJ1bkph dmFTY3JpcHRDb25maXJtKEZyYW1lKiBmcmFtZSwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogewog ICAgIGdib29sZWFuIHJldHZhbDsKICAgICBnYm9vbGVhbiBkaWRDb25maXJtOwotICAgIGdfc2ln bmFsX2VtaXRfYnlfbmFtZShtX3dlYlBhZ2UsICJzY3JpcHQtY29uZmlybSIsIGtpdChmcmFtZSks IG1lc3NhZ2UudXRmOCgpLmRhdGEoKSwgJmRpZENvbmZpcm0sICZyZXR2YWwpOworICAgIGdfc2ln bmFsX2VtaXRfYnlfbmFtZShtX3dlYlZpZXcsICJzY3JpcHQtY29uZmlybSIsIGtpdChmcmFtZSks IG1lc3NhZ2UudXRmOCgpLmRhdGEoKSwgJmRpZENvbmZpcm0sICZyZXR2YWwpOwogICAgIHJldHVy biBkaWRDb25maXJtID09IFRSVUU7CiB9CiAKQEAgLTIxOCw3ICsyMTgsNyBAQCBib29sIENocm9t ZUNsaWVudDo6cnVuSmF2YVNjcmlwdFByb21wdChGcmFtZSogZnJhbWUsIGNvbnN0IFN0cmluZyYg bWVzc2FnZSwgY29ucwogewogICAgIGdib29sZWFuIHJldHZhbDsKICAgICBnY2hhciogdmFsdWUg PSAwOwotICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShtX3dlYlBhZ2UsICJzY3JpcHQtcHJvbXB0 Iiwga2l0KGZyYW1lKSwgbWVzc2FnZS51dGY4KCkuZGF0YSgpLCBkZWZhdWx0VmFsdWUudXRmOCgp LmRhdGEoKSwgJnZhbHVlLCAmcmV0dmFsKTsKKyAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUobV93 ZWJWaWV3LCAic2NyaXB0LXByb21wdCIsIGtpdChmcmFtZSksIG1lc3NhZ2UudXRmOCgpLmRhdGEo KSwgZGVmYXVsdFZhbHVlLnV0ZjgoKS5kYXRhKCksICZ2YWx1ZSwgJnJldHZhbCk7CiAgICAgaWYg KHZhbHVlKSB7CiAgICAgICAgIHJlc3VsdCA9IFN0cmluZzo6ZnJvbVVURjgodmFsdWUpOwogICAg ICAgICBnX2ZyZWUodmFsdWUpOwpAQCAtMjMwLDcgKzIzMCw3IEBAIGJvb2wgQ2hyb21lQ2xpZW50 OjpydW5KYXZhU2NyaXB0UHJvbXB0KEZyYW1lKiBmcmFtZSwgY29uc3QgU3RyaW5nJiBtZXNzYWdl LCBjb25zCiB2b2lkIENocm9tZUNsaWVudDo6c2V0U3RhdHVzYmFyVGV4dChjb25zdCBTdHJpbmcm IHN0cmluZykKIHsKICAgICBDU3RyaW5nIHN0cmluZ01lc3NhZ2UgPSBzdHJpbmcudXRmOCgpOwot ICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShtX3dlYlBhZ2UsICJzdGF0dXMtYmFyLXRleHQtY2hh bmdlZCIsIHN0cmluZ01lc3NhZ2UuZGF0YSgpKTsKKyAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUo bV93ZWJWaWV3LCAic3RhdHVzLWJhci10ZXh0LWNoYW5nZWQiLCBzdHJpbmdNZXNzYWdlLmRhdGEo KSk7CiB9CiAKIGJvb2wgQ2hyb21lQ2xpZW50OjpzaG91bGRJbnRlcnJ1cHRKYXZhU2NyaXB0KCkK QEAgLTI3NCwxMSArMjc0LDExIEBAIHZvaWQgQ2hyb21lQ2xpZW50Ojptb3VzZURpZE1vdmVPdmVy RWxlbWVudChjb25zdCBIaXRUZXN0UmVzdWx0JiBoaXQsIHVuc2lnbmVkIG1vCiAgICAgICAgIGlm ICghdXJsLmlzRW1wdHkoKSAmJiB1cmwgIT0gbV9ob3ZlcmVkTGlua1VSTCkgewogICAgICAgICAg ICAgQ1N0cmluZyB0aXRsZVN0cmluZyA9IGhpdC50aXRsZSgpLnV0ZjgoKTsKICAgICAgICAgICAg IERlcHJlY2F0ZWRDU3RyaW5nIHVybFN0cmluZyA9IHVybC5wcmV0dHlVUkwoKS51dGY4KCk7Ci0g ICAgICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUobV93ZWJQYWdlLCAiaG92ZXJpbmctb3Zl ci1saW5rIiwgdGl0bGVTdHJpbmcuZGF0YSgpLCB1cmxTdHJpbmcuZGF0YSgpKTsKKyAgICAgICAg ICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShtX3dlYlZpZXcsICJob3ZlcmluZy1vdmVyLWxpbmsi LCB0aXRsZVN0cmluZy5kYXRhKCksIHVybFN0cmluZy5kYXRhKCkpOwogICAgICAgICAgICAgbV9o b3ZlcmVkTGlua1VSTCA9IHVybDsKICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAoIWlzTGluayAm JiAhbV9ob3ZlcmVkTGlua1VSTC5pc0VtcHR5KCkpIHsKLSAgICAgICAgZ19zaWduYWxfZW1pdF9i eV9uYW1lKG1fd2ViUGFnZSwgImhvdmVyaW5nLW92ZXItbGluayIsIDAsIDApOworICAgICAgICBn X3NpZ25hbF9lbWl0X2J5X25hbWUobV93ZWJWaWV3LCAiaG92ZXJpbmctb3Zlci1saW5rIiwgMCwg MCk7CiAgICAgICAgIG1faG92ZXJlZExpbmtVUkwgPSBLVVJMKCk7CiAgICAgfQogfQpAQCAtMjg3 LDkgKzI4Nyw5IEBAIHZvaWQgQ2hyb21lQ2xpZW50OjpzZXRUb29sVGlwKGNvbnN0IFN0cmluZyYg dG9vbFRpcCkKIHsKICNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLDEyLDApCiAgICAgaWYgKHRvb2xU aXAuaXNFbXB0eSgpKQotICAgICAgICBnX29iamVjdF9zZXQoR19PQkpFQ1QobV93ZWJQYWdlKSwg Imhhcy10b29sdGlwIiwgRkFMU0UsIE5VTEwpOworICAgICAgICBnX29iamVjdF9zZXQoR19PQkpF Q1QobV93ZWJWaWV3KSwgImhhcy10b29sdGlwIiwgRkFMU0UsIE5VTEwpOwogICAgIGVsc2UKLSAg ICAgICAgZ3RrX3dpZGdldF9zZXRfdG9vbHRpcF90ZXh0KEdUS19XSURHRVQobV93ZWJQYWdlKSwg dG9vbFRpcC51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgZ3RrX3dpZGdldF9zZXRfdG9vbHRpcF90 ZXh0KEdUS19XSURHRVQobV93ZWJWaWV3KSwgdG9vbFRpcC51dGY4KCkuZGF0YSgpKTsKICNlbHNl CiAgICAgLy8gVE9ETzogU3VwcG9ydCBvbGRlciBHVEsrIHZlcnNpb25zCiAgICAgLy8gU2VlIGh0 dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzkzCmRpZmYgLS1naXQgYS9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5oIGIvV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuaAppbmRleCA3YWYwZTYwLi4xYzk2YjQyIDEw MDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5oCisr KyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmgKQEAgLTMwLDcg KzMwLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAgICAgY2xhc3MgQ2hyb21lQ2xpZW50IDogcHVi bGljIFdlYkNvcmU6OkNocm9tZUNsaWVudCB7CiAgICAgcHVibGljOgogICAgICAgICBDaHJvbWVD bGllbnQoV2ViS2l0V2ViVmlldyopOwotICAgICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJQYWdlKCkg Y29uc3QgeyByZXR1cm4gbV93ZWJQYWdlOyB9CisgICAgICAgIFdlYktpdFdlYlZpZXcqIHdlYlZp ZXcoKSBjb25zdCB7IHJldHVybiBtX3dlYlZpZXc7IH0KIAogICAgICAgICB2aXJ0dWFsIHZvaWQg Y2hyb21lRGVzdHJveWVkKCk7CiAKQEAgLTk3LDcgKzk3LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7 CiAgICAgICAgIHZpcnR1YWwgdW5zaWduZWQgbG9uZyBsb25nIHJlcXVlc3RRdW90YUluY3JlYXNl Rm9yRGF0YWJhc2VPcGVyYXRpb24oV2ViQ29yZTo6RnJhbWUqLCBjb25zdCBXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbkRhdGEmLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmLCB1bnNpZ25lZCBsb25nIGxv bmcpOwogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgV2ViS2l0V2ViVmlldyogbV93ZWJQYWdlOwor ICAgICAgICBXZWJLaXRXZWJWaWV3KiBtX3dlYlZpZXc7CiAgICAgICAgIFdlYkNvcmU6OktVUkwg bV9ob3ZlcmVkTGlua1VSTDsKICAgICB9OwogfQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJW aWV3L3dlYmtpdHByaXZhdGUuY3BwIGIvV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdHByaXZhdGUu Y3BwCmluZGV4IDU1YTM5YTguLjBiYzJiMTggMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViVmll dy93ZWJraXRwcml2YXRlLmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0cHJpdmF0 ZS5jcHAKQEAgLTg0LDYgKzg0LDYgQEAgV2ViS2l0V2ViVmlldyoga2l0KFdlYkNvcmU6OlBhZ2Uq IGNvcmVQYWdlKQogCiAgICAgQVNTRVJUKGNvcmVQYWdlLT5jaHJvbWUoKSk7CiAgICAgV2ViS2l0 OjpDaHJvbWVDbGllbnQqIGNsaWVudCA9IHN0YXRpY19jYXN0PFdlYktpdDo6Q2hyb21lQ2xpZW50 Kj4oY29yZVBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKSk7Ci0gICAgcmV0dXJuIGNsaWVudCA/IGNs aWVudC0+d2ViUGFnZSgpIDogMDsKKyAgICByZXR1cm4gY2xpZW50ID8gY2xpZW50LT53ZWJWaWV3 KCkgOiAwOwogfQogfQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdHdlYnZp ZXcuY3BwIGIvV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IGY5MmE1 YjEuLmRmZTE2ODEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViVmlldy93ZWJraXR3ZWJ2aWV3 LmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0d2Vidmlldy5jcHAKQEAgLTE0MSw3 ICsxNDEsOCBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2tleV9wcmVzc19ldmVu dChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRLZXkqCiAgICAgICAgIHJldHVybiBUUlVFOwog ICAgIH0KIAotICAgIHJldHVybiBndGtfYmluZGluZ3NfYWN0aXZhdGVfZXZlbnQoR1RLX09CSkVD VCh3aWRnZXQpLCBldmVudCk7CisgICAgLyogQ2hhaW4gdXAgdG8gb3VyIHBhcmVudCBjbGFzcyBm b3IgYmluZGluZ3MgKi8KKyAgICByZXR1cm4gR1RLX1dJREdFVF9DTEFTUyh3ZWJraXRfd2ViX3Zp ZXdfcGFyZW50X2NsYXNzKS0+a2V5X3ByZXNzX2V2ZW50KHdpZGdldCwgZXZlbnQpOwogfQogCiBz dGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2tleV9yZWxlYXNlX2V2ZW50KEd0a1dpZGdl dCogd2lkZ2V0LCBHZGtFdmVudEtleSogZXZlbnQpCkBAIC0xNTIsNyArMTUzLDggQEAgc3RhdGlj IGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19rZXlfcmVsZWFzZV9ldmVudChHdGtXaWRnZXQqIHdp ZGdldCwgR2RrRXZlbnRLZXkKICAgICBpZiAoZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5rZXlFdmVu dChrZXlib2FyZEV2ZW50KSkKICAgICAgICAgcmV0dXJuIFRSVUU7CiAKLSAgICByZXR1cm4gRkFM U0U7CisgICAgLyogQ2hhaW4gdXAgdG8gb3VyIHBhcmVudCBjbGFzcyBmb3IgYmluZGluZ3MgKi8K KyAgICByZXR1cm4gR1RLX1dJREdFVF9DTEFTUyh3ZWJraXRfd2ViX3ZpZXdfcGFyZW50X2NsYXNz KS0+a2V5X3ByZXNzX2V2ZW50KHdpZGdldCwgZXZlbnQpOwogfQogCiBzdGF0aWMgZ2Jvb2xlYW4g d2Via2l0X3dlYl92aWV3X2J1dHRvbl9wcmVzc19ldmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2Rr RXZlbnRCdXR0b24qIGV2ZW50KQotLSAKMS41LjMuNAoK