110125 2013-02-18 08:47:10 -0800 [GTK] Remove webkit_web_view_get_subresources from WebKit2 GTK+ API 2013-02-18 23:50:29 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 108960 1 cgarcia webkit-unassigned andersca sam oldest_to_newest 835520 0 cgarcia 2013-02-18 08:47:10 -0800 See bug #108960 for the details. 835611 1 188918 cgarcia 2013-02-18 10:36:21 -0800 Created attachment 188918 Patch 835615 2 188918 mrobinson 2013-02-18 10:39:00 -0800 Comment on attachment 188918 Patch Looks good to me. Find thee an owner. 836045 3 cgarcia 2013-02-18 23:50:29 -0800 Committed r143302: <http://trac.webkit.org/changeset/143302> 188918 2013-02-18 10:36:21 -0800 2013-02-18 10:44:16 -0800 Patch wk2-remove-subresources-api.diff text/plain 12479 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmMjRkZjA5Li45MTQyZDNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDItMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFJlbW92ZSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3N1YnJlc291cmNl cyBmcm9tIFdlYktpdDIgR1RLKyBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExMDEyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgQVBJIGlzIGN1cnJlbnRseSBpbXBsZW1lbnRlZCBjYWNoaW5n IGFsbCByZXNvdXJjZXMgaW4gdGhlCisgICAgICAgIFdlYlZpZXcgd2hpY2ggY2F1c2VzIHNvbWUg cHJvYmxlbXMgaW4gZG9jdW1lbnRzIGxvYWRpbmcgcmVzb3VyY2VzCisgICAgICAgIGluZGVmaW5p dGVseS4gVGhpcyBBUEkgd2FzIHVzZWQgaW4gV2ViS2l0MSBtYWlubHkgdG8gaW1wbGVtZW50Cisg ICAgICAgIHdlYmtpdF93ZWJfdmlld19zYXZlKCksIGJ1dCB3ZSBhbHJlYWR5IGhhdmUgc3VjaCBB UEkgaW4KKyAgICAgICAgV2ViS2l0Mi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdEluamVjdGVkQnVuZGxlQ2xpZW50LmNwcDoKKyAgICAgICAgKGRpZFJlY2VpdmVXZWJWaWV3 TWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgIChfV2ViS2l0V2ViVmlld1ByaXZhdGUpOgorICAg ICAgICAod2Via2l0V2ViVmlld0xvYWRDaGFuZ2VkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlld1ByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtp dDJndGstc2VjdGlvbnMudHh0OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rl c3RSZXNvdXJjZXMuY3BwOgorICAgICAgICAodGVzdFdlYlZpZXdSZXNvdXJjZXMpOgorICAgICAg ICAodGVzdFdlYlJlc291cmNlR2V0RGF0YSk6CisKIDIwMTMtMDItMTggIENocmlzdG9waGUgRHVt ZXogIDxjaC5kdW1lekBzaXNhLnNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdW1dLMl0gRGlz YWJsZSBmYWlsaW5nIEFQSSB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwCmluZGV4 IGY1MDFhNzYuLjZkNzg4YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdEluamVjdGVkQnVuZGxlQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRJbmplY3RlZEJ1bmRsZUNsaWVudC5jcHAKQEAgLTcx LDExICs3MSwxMiBAQCBzdGF0aWMgdm9pZCBkaWRSZWNlaXZlV2ViVmlld01lc3NhZ2VGcm9tSW5q ZWN0ZWRCdW5kbGUoV2ViS2l0V2ViVmlldyogd2ViVmlldywgYwogICAgICAgICB3ZWJraXRXZWJS ZXNvdXJjZU5vdGlmeVByb2dyZXNzKHJlc291cmNlLmdldCgpLCBjb250ZW50TGVuZ3RoLT52YWx1 ZSgpKTsKICAgICB9IGVsc2UgaWYgKGdfc3RyX2VxdWFsKG1lc3NhZ2VOYW1lLCAiRGlkRmluaXNo TG9hZEZvclJlc291cmNlIikpIHsKICAgICAgICAgV2ViVUludDY0KiByZXNvdXJjZUlkZW50aWZp ZXIgPSBzdGF0aWNfY2FzdDxXZWJVSW50NjQqPihtZXNzYWdlLmdldChTdHJpbmc6OmZyb21VVEY4 KCJJZGVudGlmaWVyIikpKTsKLSAgICAgICAgR1JlZlB0cjxXZWJLaXRXZWJSZXNvdXJjZT4gcmVz b3VyY2UgPSB3ZWJraXRXZWJWaWV3UmVzb3VyY2VMb2FkRmluaXNoZWQod2ViVmlldywgcmVzb3Vy Y2VJZGVudGlmaWVyLT52YWx1ZSgpKTsKKyAgICAgICAgR1JlZlB0cjxXZWJLaXRXZWJSZXNvdXJj ZT4gcmVzb3VyY2UgPSB3ZWJraXRXZWJWaWV3R2V0TG9hZGluZ1dlYlJlc291cmNlKHdlYlZpZXcs IHJlc291cmNlSWRlbnRpZmllci0+dmFsdWUoKSk7CiAgICAgICAgIGlmICghcmVzb3VyY2UpCiAg ICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgd2Via2l0V2ViUmVzb3VyY2VGaW5pc2hlZChy ZXNvdXJjZS5nZXQoKSk7CisgICAgICAgIHdlYmtpdFdlYlZpZXdSZW1vdmVMb2FkaW5nV2ViUmVz b3VyY2Uod2ViVmlldywgcmVzb3VyY2VJZGVudGlmaWVyLT52YWx1ZSgpKTsKICAgICB9IGVsc2Ug aWYgKGdfc3RyX2VxdWFsKG1lc3NhZ2VOYW1lLCAiRGlkRmFpbExvYWRGb3JSZXNvdXJjZSIpKSB7 CiAgICAgICAgIFdlYlVJbnQ2NCogcmVzb3VyY2VJZGVudGlmaWVyID0gc3RhdGljX2Nhc3Q8V2Vi VUludDY0Kj4obWVzc2FnZS5nZXQoU3RyaW5nOjpmcm9tVVRGOCgiSWRlbnRpZmllciIpKSk7CiAg ICAgICAgIEdSZWZQdHI8V2ViS2l0V2ViUmVzb3VyY2U+IHJlc291cmNlID0gd2Via2l0V2ViVmll d0dldExvYWRpbmdXZWJSZXNvdXJjZSh3ZWJWaWV3LCByZXNvdXJjZUlkZW50aWZpZXItPnZhbHVl KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3LmNwcAppbmRleCBlN2E3NTAxLi45MDUyM2QxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcApAQCAtMTMwLDcgKzEzMCw2IEBA IGVudW0gewogfTsKIAogdHlwZWRlZiBIYXNoTWFwPHVpbnQ2NF90LCBHUmVmUHRyPFdlYktpdFdl YlJlc291cmNlPiA+IExvYWRpbmdSZXNvdXJjZXNNYXA7Ci10eXBlZGVmIEhhc2hNYXA8U3RyaW5n LCBHUmVmUHRyPFdlYktpdFdlYlJlc291cmNlPiA+IFJlc291cmNlc01hcDsKIAogc3RydWN0IF9X ZWJLaXRXZWJWaWV3UHJpdmF0ZSB7CiAgICAgfl9XZWJLaXRXZWJWaWV3UHJpdmF0ZSgpCkBAIC0x NjksNyArMTY4LDYgQEAgc3RydWN0IF9XZWJLaXRXZWJWaWV3UHJpdmF0ZSB7CiAKICAgICBHUmVm UHRyPFdlYktpdFdlYlJlc291cmNlPiBtYWluUmVzb3VyY2U7CiAgICAgTG9hZGluZ1Jlc291cmNl c01hcCBsb2FkaW5nUmVzb3VyY2VzTWFwOwotICAgIFJlc291cmNlc01hcCBzdWJyZXNvdXJjZXNN YXA7CiAKICAgICBHUmVmUHRyPFdlYktpdFdlYkluc3BlY3Rvcj4gaW5zcGVjdG9yOwogCkBAIC0x MzYzLDcgKzEzNjEsNiBAQCB2b2lkIHdlYmtpdFdlYlZpZXdMb2FkQ2hhbmdlZChXZWJLaXRXZWJW aWV3KiB3ZWJWaWV3LCBXZWJLaXRMb2FkRXZlbnQgbG9hZEV2ZW50KQogICAgICAgICBHT3duUHRy PGNoYXI+IGZhdmljb25VUkkod2Via2l0X2Zhdmljb25fZGF0YWJhc2VfZ2V0X2Zhdmljb25fdXJp KGRhdGFiYXNlLCBwcml2LT5hY3RpdmVVUkkuZGF0YSgpKSk7CiAgICAgICAgIHdlYmtpdFdlYlZp ZXdVcGRhdGVGYXZpY29uVVJJKHdlYlZpZXcsIGZhdmljb25VUkkuZ2V0KCkpOwogCi0gICAgICAg IHByaXYtPnN1YnJlc291cmNlc01hcC5jbGVhcigpOwogICAgICAgICBpZiAoIXByaXYtPm1haW5S ZXNvdXJjZSkgewogICAgICAgICAgICAgLy8gV2hlbiBhIHBhZ2UgaXMgbG9hZGVkIGZyb20gdGhl IGhpc3RvcnkgY2FjaGUsIHRoZSBtYWluIHJlc291cmNlIGxvYWQgY2FsbGJhY2tzCiAgICAgICAg ICAgICAvLyBhcmUgY2FsbGVkIHdoZW4gdGhlIG1haW4gZnJhbWUgbG9hZCBpcyBmaW5pc2hlZC4g V2Ugd2FudCB0byBtYWtlIHN1cmUgdGhlcmUncyBhCkBAIC0xNTcyLDE2ICsxNTY5LDYgQEAgdm9p ZCB3ZWJraXRXZWJWaWV3UmVtb3ZlTG9hZGluZ1dlYlJlc291cmNlKFdlYktpdFdlYlZpZXcqIHdl YlZpZXcsIHVpbnQ2NF90IHJlc28KICAgICBwcml2LT5sb2FkaW5nUmVzb3VyY2VzTWFwLnJlbW92 ZShyZXNvdXJjZUlkZW50aWZpZXIpOwogfQogCi1XZWJLaXRXZWJSZXNvdXJjZSogd2Via2l0V2Vi Vmlld1Jlc291cmNlTG9hZEZpbmlzaGVkKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIHVpbnQ2NF90 IHJlc291cmNlSWRlbnRpZmllcikKLXsKLSAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9 IHdlYlZpZXctPnByaXY7Ci0gICAgV2ViS2l0V2ViUmVzb3VyY2UqIHJlc291cmNlID0gd2Via2l0 V2ViVmlld0dldExvYWRpbmdXZWJSZXNvdXJjZSh3ZWJWaWV3LCByZXNvdXJjZUlkZW50aWZpZXIp OwotICAgIGlmIChyZXNvdXJjZSAhPSBwcml2LT5tYWluUmVzb3VyY2UpCi0gICAgICAgIHByaXYt PnN1YnJlc291cmNlc01hcC5zZXQoU3RyaW5nOjpmcm9tVVRGOCh3ZWJraXRfd2ViX3Jlc291cmNl X2dldF91cmkocmVzb3VyY2UpKSwgcmVzb3VyY2UpOwotICAgIHdlYmtpdFdlYlZpZXdSZW1vdmVM b2FkaW5nV2ViUmVzb3VyY2Uod2ViVmlldywgcmVzb3VyY2VJZGVudGlmaWVyKTsKLSAgICByZXR1 cm4gcmVzb3VyY2U7Ci19Ci0KIGJvb2wgd2Via2l0V2ViVmlld0VudGVyRnVsbFNjcmVlbihXZWJL aXRXZWJWaWV3KiB3ZWJWaWV3KQogewogICAgIGdib29sZWFuIHJldHVyblZhbHVlOwpAQCAtMjY0 MCw3ICsyNjI3LDYgQEAgV2ViS2l0SmF2YXNjcmlwdFJlc3VsdCogd2Via2l0X3dlYl92aWV3X3J1 bl9qYXZhc2NyaXB0X2Zyb21fZ3Jlc291cmNlX2ZpbmlzaChXZWIKICAqIEB3ZWJfdmlldzogYSAj V2ViS2l0V2ViVmlldwogICoKICAqIFJldHVybiB0aGUgbWFpbiByZXNvdXJjZSBvZiBAd2ViX3Zp ZXcuCi0gKiBTZWUgYWxzbyB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3N1YnJlc291cmNlcygpOgogICoK ICAqIFJldHVybnM6ICh0cmFuc2ZlciBub25lKTogdGhlIG1haW4gI1dlYktpdFdlYlJlc291cmNl IG9mIHRoZSB2aWV3CiAgKiAgICBvciAlTlVMTCBpZiBub3RoaW5nIGhhcyBiZWVuIGxvYWRlZC4K QEAgLTI2NTMsMjggKzI2MzksNiBAQCBXZWJLaXRXZWJSZXNvdXJjZSogd2Via2l0X3dlYl92aWV3 X2dldF9tYWluX3Jlc291cmNlKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB9CiAKIC8qKgotICog d2Via2l0X3dlYl92aWV3X2dldF9zdWJyZXNvdXJjZXM6Ci0gKiBAd2ViX3ZpZXc6IGEgI1dlYktp dFdlYlZpZXcKLSAqCi0gKiBSZXR1cm4gdGhlIGxpc3Qgb2Ygc3VicmVzb3VyY2VzIG9mIEB3ZWJf dmlldy4KLSAqIFNlZSBhbHNvIHdlYmtpdF93ZWJfdmlld19nZXRfbWFpbl9yZXNvdXJjZSgpLgot ICoKLSAqIFJldHVybnM6IChlbGVtZW50LXR5cGUgV2ViS2l0V2ViUmVzb3VyY2UpICh0cmFuc2Zl ciBjb250YWluZXIpOiBhIGxpc3Qgb2YgI1dlYktpdFdlYlJlc291cmNlLgotICovCi1HTGlzdCog d2Via2l0X3dlYl92aWV3X2dldF9zdWJyZXNvdXJjZXMoV2ViS2l0V2ViVmlldyogd2ViVmlldykK LXsKLSAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldyks IDApOwotCi0gICAgR0xpc3QqIHN1YnJlc291cmNlcyA9IDA7Ci0gICAgV2ViS2l0V2ViVmlld1By aXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OwotICAgIFJlc291cmNlc01hcDo6Y29uc3RfaXRl cmF0b3IgZW5kID0gcHJpdi0+c3VicmVzb3VyY2VzTWFwLmVuZCgpOwotICAgIGZvciAoUmVzb3Vy Y2VzTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IHByaXYtPnN1YnJlc291cmNlc01hcC5iZWdpbigp OyBpdCAhPSBlbmQ7ICsraXQpCi0gICAgICAgIHN1YnJlc291cmNlcyA9IGdfbGlzdF9wcmVwZW5k KHN1YnJlc291cmNlcywgaXQtPnZhbHVlLmdldCgpKTsKLQotICAgIHJldHVybiBnX2xpc3RfcmV2 ZXJzZShzdWJyZXNvdXJjZXMpOwotfQotCi0vKioKICAqIHdlYmtpdF93ZWJfdmlld19nZXRfaW5z cGVjdG9yOgogICogQHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CiAgKgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oCmluZGV4IGI2NzlkOWQu LmEyOTkyZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJWaWV3LmgKQEAgLTM3MSw5ICszNzEsNiBAQCB3ZWJraXRfd2ViX3ZpZXdfcnVuX2phdmFz Y3JpcHRfZnJvbV9ncmVzb3VyY2VfZmluaXNoIChXZWJLaXRXZWJWaWV3CiBXRUJLSVRfQVBJIFdl YktpdFdlYlJlc291cmNlICoKIHdlYmtpdF93ZWJfdmlld19nZXRfbWFpbl9yZXNvdXJjZSAgICAg ICAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAgICAgKndlYl92aWV3KTsKIAot V0VCS0lUX0FQSSBHTGlzdCAqCi13ZWJraXRfd2ViX3ZpZXdfZ2V0X3N1YnJlc291cmNlcyAgICAg ICAgICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgICAgICp3ZWJfdmlldyk7Ci0K IFdFQktJVF9BUEkgV2ViS2l0V2ViSW5zcGVjdG9yICoKIHdlYmtpdF93ZWJfdmlld19nZXRfaW5z cGVjdG9yICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAgICAg KndlYl92aWV3KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViVmlld1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFdlYlZpZXdQcml2YXRlLmgKaW5kZXggZTlmYTNjYS4uNmQwY2RmMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld1ByaXZh dGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 UHJpdmF0ZS5oCkBAIC01MSw3ICs1MSw2IEBAIHZvaWQgd2Via2l0V2ViVmlld1Jlc291cmNlTG9h ZFN0YXJ0ZWQoV2ViS2l0V2ViVmlldyosIFdlYktpdDo6V2ViRnJhbWVQcm94eSosIHVpCiB2b2lk IHdlYmtpdFdlYlZpZXdSdW5GaWxlQ2hvb3NlclJlcXVlc3QoV2ViS2l0V2ViVmlldyosIFdlYktp dEZpbGVDaG9vc2VyUmVxdWVzdCopOwogV2ViS2l0V2ViUmVzb3VyY2UqIHdlYmtpdFdlYlZpZXdH ZXRMb2FkaW5nV2ViUmVzb3VyY2UoV2ViS2l0V2ViVmlldyosIHVpbnQ2NF90IHJlc291cmNlSWRl bnRpZmllcik7CiB2b2lkIHdlYmtpdFdlYlZpZXdSZW1vdmVMb2FkaW5nV2ViUmVzb3VyY2UoV2Vi S2l0V2ViVmlldyosIHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllcik7Ci1XZWJLaXRXZWJSZXNv dXJjZSogd2Via2l0V2ViVmlld1Jlc291cmNlTG9hZEZpbmlzaGVkKFdlYktpdFdlYlZpZXcqLCB1 aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIpOwogYm9vbCB3ZWJraXRXZWJWaWV3RW50ZXJGdWxs U2NyZWVuKFdlYktpdFdlYlZpZXcqKTsKIGJvb2wgd2Via2l0V2ViVmlld0xlYXZlRnVsbFNjcmVl bihXZWJLaXRXZWJWaWV3Kik7CiB2b2lkIHdlYmtpdFdlYlZpZXdQb3B1bGF0ZUNvbnRleHRNZW51 KFdlYktpdFdlYlZpZXcqLCBXZWJLaXQ6OkltbXV0YWJsZUFycmF5KiBwcm9wb3NlZE1lbnUsIFdl YktpdDo6V2ViSGl0VGVzdFJlc3VsdCopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25zLnR4dCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50eHQKaW5kZXgg MzhiYWJhNy4uODdhOGJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25zLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0CkBAIC0xNTAsNyAr MTUwLDYgQEAgd2Via2l0X3NjcmlwdF9kaWFsb2dfY29uZmlybV9zZXRfY29uZmlybWVkCiB3ZWJr aXRfc2NyaXB0X2RpYWxvZ19wcm9tcHRfZ2V0X2RlZmF1bHRfdGV4dAogd2Via2l0X3NjcmlwdF9k aWFsb2dfcHJvbXB0X3NldF90ZXh0CiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X21haW5fcmVzb3VyY2UK LXdlYmtpdF93ZWJfdmlld19nZXRfc3VicmVzb3VyY2VzCiAKIDxTVUJTRUNUSU9OIFN0YW5kYXJk PgogV2ViS2l0V2ViVmlld0NsYXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay90ZXN0cy9UZXN0UmVzb3VyY2VzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RSZXNvdXJjZXMuY3BwCmluZGV4IDIwYjkwYjAuLmMwNjQz YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rl c3RSZXNvdXJjZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rl c3RzL1Rlc3RSZXNvdXJjZXMuY3BwCkBAIC05MywxNSArOTMsMjcgQEAgcHVibGljOgogICAgICAg ICBnX3NpZ25hbF9jb25uZWN0KHJlc291cmNlLCAiZmFpbGVkIiwgR19DQUxMQkFDSyhyZXNvdXJj ZUZhaWxlZENhbGxiYWNrKSwgdGVzdCk7CiAgICAgfQogCisgICAgdm9pZCBjbGVhclN1YnJlc291 cmNlcygpCisgICAgeworICAgICAgICBnX2xpc3RfZnJlZV9mdWxsKG1fc3VicmVzb3VyY2VzLCBy ZWludGVycHJldF9jYXN0PEdEZXN0cm95Tm90aWZ5PihnX29iamVjdF91bnJlZikpOworICAgICAg ICBtX3N1YnJlc291cmNlcyA9IDA7CisgICAgfQorCiAgICAgUmVzb3VyY2VzVGVzdCgpCiAgICAg ICAgIDogV2ViVmlld1Rlc3QoKQogICAgICAgICAsIG1fcmVzb3VyY2VzTG9hZGVkKDApCiAgICAg ICAgICwgbV9yZXNvdXJjZXNUb0xvYWQoMCkKICAgICAgICAgLCBtX3Jlc291cmNlRGF0YVNpemUo MCkKKyAgICAgICAgLCBtX3N1YnJlc291cmNlcygwKQogICAgIHsKICAgICAgICAgZ19zaWduYWxf Y29ubmVjdChtX3dlYlZpZXcsICJyZXNvdXJjZS1sb2FkLXN0YXJ0ZWQiLCBHX0NBTExCQUNLKHJl c291cmNlTG9hZFN0YXJ0ZWRDYWxsYmFjayksIHRoaXMpOwogICAgIH0KIAorICAgIH5SZXNvdXJj ZXNUZXN0KCkKKyAgICB7CisgICAgICAgIGNsZWFyU3VicmVzb3VyY2VzKCk7CisgICAgfQorCiAg ICAgdmlydHVhbCB2b2lkIHJlc291cmNlTG9hZFN0YXJ0ZWQoV2ViS2l0V2ViUmVzb3VyY2UqIHJl c291cmNlLCBXZWJLaXRVUklSZXF1ZXN0KiByZXF1ZXN0KQogICAgIHsKICAgICB9CkBAIC0xMjEs NiArMTMzLDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCByZXNvdXJjZUZpbmlzaGVkKFdl YktpdFdlYlJlc291cmNlKiByZXNvdXJjZSkKICAgICB7CiAgICAgICAgIGdfc2lnbmFsX2hhbmRs ZXJzX2Rpc2Nvbm5lY3RfbWF0Y2hlZChyZXNvdXJjZSwgR19TSUdOQUxfTUFUQ0hfREFUQSwgMCwg MCwgMCwgMCwgdGhpcyk7CisgICAgICAgIGlmICh3ZWJraXRfd2ViX3ZpZXdfZ2V0X21haW5fcmVz b3VyY2UobV93ZWJWaWV3KSAhPSByZXNvdXJjZSkKKyAgICAgICAgICAgIG1fc3VicmVzb3VyY2Vz ID0gZ19saXN0X3ByZXBlbmQobV9zdWJyZXNvdXJjZXMsIGdfb2JqZWN0X3JlZihyZXNvdXJjZSkp OwogICAgICAgICBpZiAoKyttX3Jlc291cmNlc0xvYWRlZCA9PSBtX3Jlc291cmNlc1RvTG9hZCkK ICAgICAgICAgICAgIGdfbWFpbl9sb29wX3F1aXQobV9tYWluTG9vcCk7CiAgICAgfQpAQCAtMTM0 LDkgKzE0OCwxNSBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICBtX3Jlc291cmNlc0xvYWRlZCA9 IDA7CiAgICAgICAgIG1fcmVzb3VyY2VzVG9Mb2FkID0gcmVzb3VyY2VzQ291bnQ7CisgICAgICAg IGNsZWFyU3VicmVzb3VyY2VzKCk7CiAgICAgICAgIGdfbWFpbl9sb29wX3J1bihtX21haW5Mb29w KTsKICAgICB9CiAKKyAgICBHTGlzdCogc3VicmVzb3VyY2VzKCkKKyAgICB7CisgICAgICAgIHJl dHVybiBtX3N1YnJlc291cmNlczsKKyAgICB9CisKICAgICBzdGF0aWMgdm9pZCByZXNvdXJjZUdl dERhdGFDYWxsYmFjayhHT2JqZWN0KiBvYmplY3QsIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBncG9p bnRlciB1c2VyRGF0YSkKICAgICB7CiAgICAgICAgIHNpemVfdCBkYXRhU2l6ZTsKQEAgLTE3Nywx MyArMTk3LDE0IEBAIHB1YmxpYzoKICAgICBzaXplX3QgbV9yZXNvdXJjZXNUb0xvYWQ7CiAgICAg R093blB0cjxjaGFyPiBtX3Jlc291cmNlRGF0YTsKICAgICBzaXplX3QgbV9yZXNvdXJjZURhdGFT aXplOworICAgIEdMaXN0KiBtX3N1YnJlc291cmNlczsKIH07CiAKIHN0YXRpYyB2b2lkIHRlc3RX ZWJWaWV3UmVzb3VyY2VzKFJlc291cmNlc1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiB7CiAg ICAgLy8gTm90aGluZyBsb2FkZWQgeWV0LCB0aGVyZSBzaG91bG5kJ3QgYmUgcmVzb3VyY2VzLgog ICAgIGdfYXNzZXJ0KCF3ZWJraXRfd2ViX3ZpZXdfZ2V0X21haW5fcmVzb3VyY2UodGVzdC0+bV93 ZWJWaWV3KSk7Ci0gICAgZ19hc3NlcnQoIXdlYmtpdF93ZWJfdmlld19nZXRfc3VicmVzb3VyY2Vz KHRlc3QtPm1fd2ViVmlldykpOworICAgIGdfYXNzZXJ0KCF0ZXN0LT5zdWJyZXNvdXJjZXMoKSk7 CiAKICAgICAvLyBMb2FkIHNpbXBsZSBwYWdlIHdpdGhvdXQgc3VicmVzb3VyY2VzLgogICAgIHRl c3QtPmxvYWRIdG1sKCI8aHRtbD48Ym9keT5UZXN0aW5nIFdlYktpdEdUSys8L2JvZHk+PC9odG1s PiIsIDApOwpAQCAtMTkxLDcgKzIxMiw3IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJWaWV3UmVzb3Vy Y2VzKFJlc291cmNlc1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgV2ViS2l0V2ViUmVz b3VyY2UqIHJlc291cmNlID0gd2Via2l0X3dlYl92aWV3X2dldF9tYWluX3Jlc291cmNlKHRlc3Qt Pm1fd2ViVmlldyk7CiAgICAgZ19hc3NlcnQocmVzb3VyY2UpOwogICAgIGdfYXNzZXJ0X2NtcHN0 cih3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh0ZXN0LT5tX3dlYlZpZXcpLCA9PSwgd2Via2l0X3dl Yl9yZXNvdXJjZV9nZXRfdXJpKHJlc291cmNlKSk7Ci0gICAgZ19hc3NlcnQoIXdlYmtpdF93ZWJf dmlld19nZXRfc3VicmVzb3VyY2VzKHRlc3QtPm1fd2ViVmlldykpOworICAgIGdfYXNzZXJ0KCF0 ZXN0LT5zdWJyZXNvdXJjZXMoKSk7CiAKICAgICAvLyBMb2FkIHNpbXBsZSBwYWdlIHdpdGggc3Vi cmVzb3VyY2VzLgogICAgIHRlc3QtPmxvYWRVUkkoa1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiLyIp LmRhdGEoKSk7CkBAIC0yMDAsOSArMjIxLDkgQEAgc3RhdGljIHZvaWQgdGVzdFdlYlZpZXdSZXNv dXJjZXMoUmVzb3VyY2VzVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICByZXNvdXJjZSA9 IHdlYmtpdF93ZWJfdmlld19nZXRfbWFpbl9yZXNvdXJjZSh0ZXN0LT5tX3dlYlZpZXcpOwogICAg IGdfYXNzZXJ0KHJlc291cmNlKTsKICAgICBnX2Fzc2VydF9jbXBzdHIod2Via2l0X3dlYl92aWV3 X2dldF91cmkodGVzdC0+bV93ZWJWaWV3KSwgPT0sIHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X3Vy aShyZXNvdXJjZSkpOwotICAgIEdPd25QdHI8R0xpc3Q+IHN1YnJlc291cmNlcyh3ZWJraXRfd2Vi X3ZpZXdfZ2V0X3N1YnJlc291cmNlcyh0ZXN0LT5tX3dlYlZpZXcpKTsKKyAgICBHTGlzdCogc3Vi cmVzb3VyY2VzID0gdGVzdC0+c3VicmVzb3VyY2VzKCk7CiAgICAgZ19hc3NlcnQoc3VicmVzb3Vy Y2VzKTsKLSAgICBnX2Fzc2VydF9jbXBpbnQoZ19saXN0X2xlbmd0aChzdWJyZXNvdXJjZXMuZ2V0 KCkpLCA9PSwgMyk7CisgICAgZ19hc3NlcnRfY21waW50KGdfbGlzdF9sZW5ndGgoc3VicmVzb3Vy Y2VzKSwgPT0sIDMpOwogCiAjaWYgMAogICAgIC8vIExvYWQgdGhlIHNhbWUgVVJJIGFnYWluLgpA QCAtNTA1LDggKzUyNiw4IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJSZXNvdXJjZUdldERhdGEoUmVz b3VyY2VzVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICBnX2Fzc2VydChyZXNvdXJjZSk7 CiAgICAgdGVzdC0+Y2hlY2tSZXNvdXJjZURhdGEocmVzb3VyY2UpOwogCi0gICAgR093blB0cjxH TGlzdD4gc3VicmVzb3VyY2VzKHdlYmtpdF93ZWJfdmlld19nZXRfc3VicmVzb3VyY2VzKHRlc3Qt Pm1fd2ViVmlldykpOwotICAgIGZvciAoR0xpc3QqIGl0ZW0gPSBzdWJyZXNvdXJjZXMuZ2V0KCk7 IGl0ZW07IGl0ZW0gPSBnX2xpc3RfbmV4dChpdGVtKSkKKyAgICBHTGlzdCogc3VicmVzb3VyY2Vz ID0gdGVzdC0+c3VicmVzb3VyY2VzKCk7CisgICAgZm9yIChHTGlzdCogaXRlbSA9IHN1YnJlc291 cmNlczsgaXRlbTsgaXRlbSA9IGdfbGlzdF9uZXh0KGl0ZW0pKQogICAgICAgICB0ZXN0LT5jaGVj a1Jlc291cmNlRGF0YShXRUJLSVRfV0VCX1JFU09VUkNFKGl0ZW0tPmRhdGEpKTsKIH0KIAo=