100233 2012-10-24 04:48:30 -0700 [EFL][WK2] Ewk_Settings refactoring 2012-10-24 07:43:11 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 99696 1 mikhail.pozdnyakov mikhail.pozdnyakov gyuyoung.kim kenneth lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 749546 0 mikhail.pozdnyakov 2012-10-24 04:48:30 -0700 Ewk_Settings should be refactored accordingly with other Ewk objects (it's class members should be private), see meta bug#99696 and its sub-bugs. 749622 1 170385 mikhail.pozdnyakov 2012-10-24 06:55:09 -0700 Created attachment 170385 patch 749663 2 170385 webkit.review.bot 2012-10-24 07:43:08 -0700 Comment on attachment 170385 patch Clearing flags on attachment: 170385 Committed r132354: <http://trac.webkit.org/changeset/132354> 749664 3 webkit.review.bot 2012-10-24 07:43:11 -0700 All reviewed patches have been landed. Closing bug. 170385 2012-10-24 06:55:09 -0700 2012-10-24 07:43:07 -0700 patch bug100233 text/plain 11056 mikhail.pozdnyakov Y29tbWl0IDlkNTE1ZDhjNzkyYTgzMmUxZDQwNWEyYWZhZmMwOGM1OGEyY2JhOTMKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg V2VkIE9jdCAyNCAxNjo1MDozMiAyMDEyICswMzAwCgogICAgYnVnMTAwMjMzCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IGFlMjRhNDQuLmQyNWRmMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOCBAQAorMjAxMi0x MC0yNCAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4K KworICAgICAgICBbRUZMXVtXSzJdIEV3a19TZXR0aW5ncyByZWZhY3RvcmluZworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwMjMzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXdrX1NldHRpbmdzIHByaXZh dGUgaW1wbGVtZW50YXRpb24gaXMgbm93IEMrKyBjbGFzcyB3aGljaCBhbGxvd3MgZGlyZWN0IGlu dGVybmFsCisgICAgICAgIGFjY2VzcyB0byBXZWJLaXQ6OldlYlByZWZlcmVuY2VzLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwOgorICAgICAgICAoRXdrVmll d0ltcGw6OkV3a1ZpZXdJbXBsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfc2V0 dGluZ3MuY3BwOgorICAgICAgICAoRXdrX1NldHRpbmdzOjpwcmVmZXJlbmNlcyk6CisgICAgICAg IChld2tfc2V0dGluZ3NfZnVsbHNjcmVlbl9lbmFibGVkX3NldCk6CisgICAgICAgIChld2tfc2V0 dGluZ3NfZnVsbHNjcmVlbl9lbmFibGVkX2dldCk6CisgICAgICAgIChld2tfc2V0dGluZ3NfamF2 YXNjcmlwdF9lbmFibGVkX3NldCk6CisgICAgICAgIChld2tfc2V0dGluZ3NfamF2YXNjcmlwdF9l bmFibGVkX2dldCk6CisgICAgICAgIChld2tfc2V0dGluZ3NfbG9hZHNfaW1hZ2VzX2F1dG9tYXRp Y2FsbHlfc2V0KToKKyAgICAgICAgKGV3a19zZXR0aW5nc19sb2Fkc19pbWFnZXNfYXV0b21hdGlj YWxseV9nZXQpOgorICAgICAgICAoZXdrX3NldHRpbmdzX2RldmVsb3Blcl9leHRyYXNfZW5hYmxl ZF9zZXQpOgorICAgICAgICAoZXdrX3NldHRpbmdzX2RldmVsb3Blcl9leHRyYXNfZW5hYmxlZF9n ZXQpOgorICAgICAgICAoZXdrX3NldHRpbmdzX2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX2Fs bG93ZWRfc2V0KToKKyAgICAgICAgKGV3a19zZXR0aW5nc19maWxlX2FjY2Vzc19mcm9tX2ZpbGVf dXJsc19hbGxvd2VkX2dldCk6CisgICAgICAgIChld2tfc2V0dGluZ3NfZnJhbWVfZmxhdHRlbmlu Z19lbmFibGVkX3NldCk6CisgICAgICAgIChld2tfc2V0dGluZ3NfZnJhbWVfZmxhdHRlbmluZ19l bmFibGVkX2dldCk6CisgICAgICAgIChld2tfc2V0dGluZ3NfZG5zX3ByZWZldGNoaW5nX2VuYWJs ZWRfc2V0KToKKyAgICAgICAgKGV3a19zZXR0aW5nc19kbnNfcHJlZmV0Y2hpbmdfZW5hYmxlZF9n ZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19zZXR0aW5nc19wcml2YXRlLmg6 CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoRXdrX1NldHRpbmdzKToKKyAgICAgICAgKEV3 a19TZXR0aW5nczo6RXdrX1NldHRpbmdzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlldy5jcHA6CisgICAgICAgIChfZXdrX3ZpZXdfaW5pdGlhbGl6ZSk6CisKIDIwMTItMTAt MjQgIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2FuYS5uYWdpbmVuaUBpbnRlbC5jb20+CiAK ICAgICAgICAgW0VGTF1bV0syXSBBU1NFUlRJT04gRkFJTEVEOiBlZGplKCk6IGNvdWxkIG5vdCBw YWludCBuYXRpdmUgSFRNTCBwYXJ0IGR1ZSB0byBtaXNzaW5nIHRoZW1lCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAKaW5kZXggZjVjNTY0Ni4u MGJlNDk0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdr Vmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1Zp ZXdJbXBsLmNwcApAQCAtMTA1LDcgKzEwNSw4IEBAIHN0YXRpYyBFY29yZV9JTUZfQ29udGV4dCog X2V3a192aWV3X2ltZl9jb250ZXh0X2NyZWF0ZShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFyCiB9 CiAKIEV3a1ZpZXdJbXBsOjpFd2tWaWV3SW1wbChFdmFzX09iamVjdCogdmlldykKLSAgICA6IGFy ZU1vdXNlRXZlbnRzRW5hYmxlZChmYWxzZSkKKyAgICA6IHNldHRpbmdzKGFkb3B0UHRyKG5ldyBF d2tfU2V0dGluZ3ModGhpcykpKQorICAgICwgYXJlTW91c2VFdmVudHNFbmFibGVkKGZhbHNlKQog I2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpCiAgICAgLCBhcmVUb3VjaEV2ZW50c0VuYWJsZWQoZmFs c2UpCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a19zZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf c2V0dGluZ3MuY3BwCmluZGV4IDgwMzc2MTEuLjRiOWVjMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19zZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3NldHRpbmdzLmNwcApAQCAtMSw1ICsxLDYgQEAK IC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTIgU2Ftc3VuZyBFbGVjdHJvbmljcworICogQ29weXJp Z2h0IChDKSAyMDEyIEludGVsIENvcnBvcmF0aW9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoK ICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yNiw5ICsyNywxMSBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgImV3a19zZXR0aW5ncy5oIgogCisjaW5jbHVkZSAiRXdrVmll d0ltcGwuaCIKICNpbmNsdWRlICJld2tfc2V0dGluZ3NfcHJpdmF0ZS5oIgotI2luY2x1ZGUgPFdl YktpdDIvV0tQcmVmZXJlbmNlcy5oPgotI2luY2x1ZGUgPFdlYktpdDIvV0tQcmVmZXJlbmNlc1By aXZhdGUuaD4KKyNpbmNsdWRlIDxXZWJLaXQyL1dlYlBhZ2VHcm91cC5oPgorI2luY2x1ZGUgPFdl YktpdDIvV2ViUGFnZVByb3h5Lmg+CisjaW5jbHVkZSA8V2ViS2l0Mi9XZWJQcmVmZXJlbmNlcy5o PgogCiAjaWYgRU5BQkxFKFNQRUxMQ0hFQ0spCiAjaW5jbHVkZSAiV0tUZXh0Q2hlY2tlci5oIgpA QCAtNDAsNiArNDMsMTYgQEAKIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAorY29uc3QgV2Vi S2l0OjpXZWJQcmVmZXJlbmNlcyogRXdrX1NldHRpbmdzOjpwcmVmZXJlbmNlcygpIGNvbnN0Cit7 CisgICAgcmV0dXJuIG1fdmlld0ltcGwtPnBhZ2VQcm94eS0+cGFnZUdyb3VwKCktPnByZWZlcmVu Y2VzKCk7Cit9CisKK1dlYktpdDo6V2ViUHJlZmVyZW5jZXMqIEV3a19TZXR0aW5nczo6cHJlZmVy ZW5jZXMoKQoreworICAgIHJldHVybiBtX3ZpZXdJbXBsLT5wYWdlUHJveHktPnBhZ2VHcm91cCgp LT5wcmVmZXJlbmNlcygpOworfQorCiAjaWYgRU5BQkxFKFNQRUxMQ0hFQ0spCiBzdGF0aWMgc3Ry dWN0IHsKICAgICBib29sIGlzQ29udGludW91c1NwZWxsQ2hlY2tpbmdFbmFibGVkIDogMTsKQEAg LTczLDcgKzg2LDcgQEAgRWluYV9Cb29sIGV3a19zZXR0aW5nc19mdWxsc2NyZWVuX2VuYWJsZWRf c2V0KEV3a19TZXR0aW5ncyogc2V0dGluZ3MsIEVpbmFfQm9vbAogewogI2lmIEVOQUJMRShGVUxM U0NSRUVOX0FQSSkKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoc2V0dGluZ3Ms IGZhbHNlKTsKLSAgICBXS1ByZWZlcmVuY2VzU2V0RnVsbFNjcmVlbkVuYWJsZWQoc2V0dGluZ3Mt PnByZWZlcmVuY2VzLmdldCgpLCBlbmFibGUpOworICAgIHNldHRpbmdzLT5wcmVmZXJlbmNlcygp LT5zZXRGdWxsU2NyZWVuRW5hYmxlZChlbmFibGUpOwogICAgIHJldHVybiB0cnVlOwogI2Vsc2UK ICAgICByZXR1cm4gZmFsc2U7CkBAIC04NCw3ICs5Nyw3IEBAIEVpbmFfQm9vbCBld2tfc2V0dGlu Z3NfZnVsbHNjcmVlbl9lbmFibGVkX2dldChjb25zdCBFd2tfU2V0dGluZ3MqIHNldHRpbmdzKQog ewogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JF VFVSTl9WQUwoc2V0dGluZ3MsIGZhbHNlKTsKLSAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldEZ1 bGxTY3JlZW5FbmFibGVkKHNldHRpbmdzLT5wcmVmZXJlbmNlcy5nZXQoKSk7CisgICAgcmV0dXJu IHNldHRpbmdzLT5wcmVmZXJlbmNlcygpLT5mdWxsU2NyZWVuRW5hYmxlZCgpOwogI2Vsc2UKICAg ICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKQEAgLTk0LDcgKzEwNyw3IEBAIEVpbmFfQm9vbCBld2tf c2V0dGluZ3NfamF2YXNjcmlwdF9lbmFibGVkX3NldChFd2tfU2V0dGluZ3MqIHNldHRpbmdzLCBF aW5hX0Jvb2wKIHsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoc2V0dGluZ3Ms IGZhbHNlKTsKIAotICAgIFdLUHJlZmVyZW5jZXNTZXRKYXZhU2NyaXB0RW5hYmxlZChzZXR0aW5n cy0+cHJlZmVyZW5jZXMuZ2V0KCksIGVuYWJsZSk7CisgICAgc2V0dGluZ3MtPnByZWZlcmVuY2Vz KCktPnNldEphdmFTY3JpcHRFbmFibGVkKGVuYWJsZSk7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0K QEAgLTEwMywxNCArMTE2LDE0IEBAIEVpbmFfQm9vbCBld2tfc2V0dGluZ3NfamF2YXNjcmlwdF9l bmFibGVkX2dldChjb25zdCBFd2tfU2V0dGluZ3MqIHNldHRpbmdzKQogewogICAgIEVJTkFfU0FG RVRZX09OX05VTExfUkVUVVJOX1ZBTChzZXR0aW5ncywgZmFsc2UpOwogCi0gICAgcmV0dXJuIFdL UHJlZmVyZW5jZXNHZXRKYXZhU2NyaXB0RW5hYmxlZChzZXR0aW5ncy0+cHJlZmVyZW5jZXMuZ2V0 KCkpOworICAgIHJldHVybiBzZXR0aW5ncy0+cHJlZmVyZW5jZXMoKS0+amF2YVNjcmlwdEVuYWJs ZWQoKTsKIH0KIAogRWluYV9Cb29sIGV3a19zZXR0aW5nc19sb2Fkc19pbWFnZXNfYXV0b21hdGlj YWxseV9zZXQoRXdrX1NldHRpbmdzKiBzZXR0aW5ncywgRWluYV9Cb29sIGF1dG9tYXRpYykKIHsK ICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoc2V0dGluZ3MsIGZhbHNlKTsKIAot ICAgIFdLUHJlZmVyZW5jZXNTZXRMb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkoc2V0dGluZ3MtPnBy ZWZlcmVuY2VzLmdldCgpLCBhdXRvbWF0aWMpOworICAgIHNldHRpbmdzLT5wcmVmZXJlbmNlcygp LT5zZXRMb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkoYXV0b21hdGljKTsKIAogICAgIHJldHVybiB0 cnVlOwogfQpAQCAtMTE5LDE0ICsxMzIsMTQgQEAgRWluYV9Cb29sIGV3a19zZXR0aW5nc19sb2Fk c19pbWFnZXNfYXV0b21hdGljYWxseV9nZXQoY29uc3QgRXdrX1NldHRpbmdzKiBzZXR0aW4KIHsK ICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoc2V0dGluZ3MsIGZhbHNlKTsKIAot ICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KHNldHRp bmdzLT5wcmVmZXJlbmNlcy5nZXQoKSk7CisgICAgcmV0dXJuIHNldHRpbmdzLT5wcmVmZXJlbmNl cygpLT5sb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkoKTsKIH0KIAogRWluYV9Cb29sIGV3a19zZXR0 aW5nc19kZXZlbG9wZXJfZXh0cmFzX2VuYWJsZWRfc2V0KEV3a19TZXR0aW5ncyogc2V0dGluZ3Ms IEVpbmFfQm9vbCBlbmFibGUpCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFM KHNldHRpbmdzLCBmYWxzZSk7CiAKLSAgICBXS1ByZWZlcmVuY2VzU2V0RGV2ZWxvcGVyRXh0cmFz RW5hYmxlZChzZXR0aW5ncy0+cHJlZmVyZW5jZXMuZ2V0KCksIGVuYWJsZSk7CisgICAgc2V0dGlu Z3MtPnByZWZlcmVuY2VzKCktPnNldERldmVsb3BlckV4dHJhc0VuYWJsZWQoZW5hYmxlKTsKIAog ICAgIHJldHVybiB0cnVlOwogfQpAQCAtMTM1LDE0ICsxNDgsMTQgQEAgRWluYV9Cb29sIGV3a19z ZXR0aW5nc19kZXZlbG9wZXJfZXh0cmFzX2VuYWJsZWRfZ2V0KGNvbnN0IEV3a19TZXR0aW5ncyog c2V0dGluZ3MKIHsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoc2V0dGluZ3Ms IGZhbHNlKTsKIAotICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0RGV2ZWxvcGVyRXh0cmFzRW5h YmxlZChzZXR0aW5ncy0+cHJlZmVyZW5jZXMuZ2V0KCkpOworICAgIHJldHVybiBzZXR0aW5ncy0+ cHJlZmVyZW5jZXMoKS0+ZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgpOwogfQogCiBFaW5hX0Jvb2wg ZXdrX3NldHRpbmdzX2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX2FsbG93ZWRfc2V0KEV3a19T ZXR0aW5ncyogc2V0dGluZ3MsIEVpbmFfQm9vbCBlbmFibGUpCiB7CiAgICAgRUlOQV9TQUZFVFlf T05fTlVMTF9SRVRVUk5fVkFMKHNldHRpbmdzLCBmYWxzZSk7CiAKLSAgICBXS1ByZWZlcmVuY2Vz U2V0RmlsZUFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQoc2V0dGluZ3MtPnByZWZlcmVuY2VzLmdl dCgpLCBlbmFibGUpOworICAgIHNldHRpbmdzLT5wcmVmZXJlbmNlcygpLT5zZXRBbGxvd0ZpbGVB Y2Nlc3NGcm9tRmlsZVVSTHMoZW5hYmxlKTsKIAogICAgIHJldHVybiB0cnVlOwogfQpAQCAtMTUx LDE0ICsxNjQsMTQgQEAgRWluYV9Cb29sIGV3a19zZXR0aW5nc19maWxlX2FjY2Vzc19mcm9tX2Zp bGVfdXJsc19hbGxvd2VkX2dldChjb25zdCBFd2tfU2V0dGluZ3MKIHsKICAgICBFSU5BX1NBRkVU WV9PTl9OVUxMX1JFVFVSTl9WQUwoc2V0dGluZ3MsIGZhbHNlKTsKIAotICAgIHJldHVybiBXS1By ZWZlcmVuY2VzR2V0RmlsZUFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQoc2V0dGluZ3MtPnByZWZl cmVuY2VzLmdldCgpKTsKKyAgICByZXR1cm4gc2V0dGluZ3MtPnByZWZlcmVuY2VzKCktPmFsbG93 RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcygpOwogfQogCiBFaW5hX0Jvb2wgZXdrX3NldHRpbmdzX2Zy YW1lX2ZsYXR0ZW5pbmdfZW5hYmxlZF9zZXQoRXdrX1NldHRpbmdzKiBzZXR0aW5ncywgRWluYV9C b29sIGVuYWJsZSkKIHsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoc2V0dGlu Z3MsIGZhbHNlKTsKIAotICAgIFdLUHJlZmVyZW5jZXNTZXRGcmFtZUZsYXR0ZW5pbmdFbmFibGVk KHNldHRpbmdzLT5wcmVmZXJlbmNlcy5nZXQoKSwgZW5hYmxlKTsKKyAgICBzZXR0aW5ncy0+cHJl ZmVyZW5jZXMoKS0+c2V0RnJhbWVGbGF0dGVuaW5nRW5hYmxlZChlbmFibGUpOwogCiAgICAgcmV0 dXJuIHRydWU7CiB9CkBAIC0xNjcsMTQgKzE4MCwxNCBAQCBFaW5hX0Jvb2wgZXdrX3NldHRpbmdz X2ZyYW1lX2ZsYXR0ZW5pbmdfZW5hYmxlZF9nZXQoY29uc3QgRXdrX1NldHRpbmdzKiBzZXR0aW5n cwogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzZXR0aW5ncywgZmFsc2Up OwogCi0gICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRGcmFtZUZsYXR0ZW5pbmdFbmFibGVkKHNl dHRpbmdzLT5wcmVmZXJlbmNlcy5nZXQoKSk7CisgICAgcmV0dXJuIHNldHRpbmdzLT5wcmVmZXJl bmNlcygpLT5mcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCk7CiB9CiAKIEVpbmFfQm9vbCBld2tfc2V0 dGluZ3NfZG5zX3ByZWZldGNoaW5nX2VuYWJsZWRfc2V0KEV3a19TZXR0aW5ncyogc2V0dGluZ3Ms IEVpbmFfQm9vbCBlbmFibGUpCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFM KHNldHRpbmdzLCBmYWxzZSk7CiAKLSAgICBXS1ByZWZlcmVuY2VzU2V0RE5TUHJlZmV0Y2hpbmdF bmFibGVkKHNldHRpbmdzLT5wcmVmZXJlbmNlcy5nZXQoKSwgZW5hYmxlKTsKKyAgICBzZXR0aW5n cy0+cHJlZmVyZW5jZXMoKS0+c2V0RE5TUHJlZmV0Y2hpbmdFbmFibGVkKGVuYWJsZSk7CiAKICAg ICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTE4Myw3ICsxOTYsNyBAQCBFaW5hX0Jvb2wgZXdrX3NldHRp bmdzX2Ruc19wcmVmZXRjaGluZ19lbmFibGVkX2dldChjb25zdCBFd2tfU2V0dGluZ3MqIHNldHRp bmdzKQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzZXR0aW5ncywgZmFs c2UpOwogCi0gICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRETlNQcmVmZXRjaGluZ0VuYWJsZWQo c2V0dGluZ3MtPnByZWZlcmVuY2VzLmdldCgpKTsKKyAgICByZXR1cm4gc2V0dGluZ3MtPnByZWZl cmVuY2VzKCktPmRuc1ByZWZldGNoaW5nRW5hYmxlZCgpOwogfQogCiB2b2lkIGV3a19zZXR0aW5n c19jb250aW51b3VzX3NwZWxsX2NoZWNraW5nX2NoYW5nZV9jYl9zZXQoRXdrX1NldHRpbmdzX0Nv bnRpbnVvdXNfU3BlbGxfQ2hlY2tpbmdfQ2hhbmdlX0NiIGNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3NldHRpbmdzX3ByaXZhdGUuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19zZXR0aW5nc19wcml2YXRlLmgK aW5kZXggNDBhZTNiNy4uMjQ0Zjk1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3NldHRpbmdzX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfc2V0dGluZ3NfcHJpdmF0ZS5oCkBAIC0xLDUgKzEsNiBAQAog LyoKICAqIENvcHlyaWdodCAoQykgMjAxMiBTYW1zdW5nIEVsZWN0cm9uaWNzCisgKiBDb3B5cmln aHQgKEMpIDIwMTIgSW50ZWwgQ29ycG9yYXRpb24uIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgog ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI2LDIxICsyNywyOSBAQAogI2lmbmRlZiBl d2tfc2V0dGluZ3NfcHJpdmF0ZV9oCiAjZGVmaW5lIGV3a19zZXR0aW5nc19wcml2YXRlX2gKIAot I2luY2x1ZGUgImV3a19zZXR0aW5ncy5oIgotI2luY2x1ZGUgPFdlYktpdDIvV0tQcmVmZXJlbmNl cy5oPgotI2luY2x1ZGUgPFdlYktpdDIvV0tSZXRhaW5QdHIuaD4KLSNpbmNsdWRlIDx3dGYvUGFz c093blB0ci5oPgorI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAorbmFtZXNwYWNlIFdlYktpdCB7 CitjbGFzcyBXZWJQcmVmZXJlbmNlczsKK30KK2NsYXNzIEV3a1ZpZXdJbXBsOwogLyoqCiAgKiBc c3RydWN0ICBFd2tfU2V0dGluZ3MKICAqIEBicmllZiAgIENvbnRhaW5zIHRoZSBzZXR0aW5ncyBk YXRhLgogICovCi1zdHJ1Y3QgRXdrX1NldHRpbmdzIHsKLSAgICBXS1JldGFpblB0cjxXS1ByZWZl cmVuY2VzUmVmPiBwcmVmZXJlbmNlczsKK2NsYXNzIEV3a19TZXR0aW5ncyB7CitwdWJsaWM6Cisg ICAgZXhwbGljaXQgRXdrX1NldHRpbmdzKEV3a1ZpZXdJbXBsKiB2aWV3SW1wbCkKKyAgICAgICAg OiBtX3ZpZXdJbXBsKHZpZXdJbXBsKQorICAgIHsKKyAgICAgICAgQVNTRVJUKG1fdmlld0ltcGwp OworICAgIH0KIAotICAgIGV4cGxpY2l0IEV3a19TZXR0aW5ncyhXS1ByZWZlcmVuY2VzUmVmIHdr UHJlZmVyZW5jZXMpCi0gICAgICAgIDogcHJlZmVyZW5jZXMod2tQcmVmZXJlbmNlcykKLSAgICB7 IH0KKyAgICBjb25zdCBXZWJLaXQ6OldlYlByZWZlcmVuY2VzKiBwcmVmZXJlbmNlcygpIGNvbnN0 OworICAgIFdlYktpdDo6V2ViUHJlZmVyZW5jZXMqIHByZWZlcmVuY2VzKCk7CisKK3ByaXZhdGU6 CisgICAgRXdrVmlld0ltcGwqIG1fdmlld0ltcGw7CiB9OwogCiAjZW5kaWYgLy8gZXdrX3NldHRp bmdzX3ByaXZhdGVfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuY3BwCmluZGV4IDAyNzg4OGEuLjgwNzY2MWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAgLTc4Miw3ICs3ODIsNyBAQCBzdGF0aWMgdm9p ZCBfZXdrX3ZpZXdfaW5pdGlhbGl6ZShFdmFzX09iamVjdCogZXdrVmlldywgUGFzc1JlZlB0cjxF d2tfQ29udGV4dD4gYwogICAgIHByaXYtPnBhZ2VQcm94eS0+aW5pdGlhbGl6ZVdlYlBhZ2UoKTsK IAogICAgIHByaXYtPmJhY2tGb3J3YXJkTGlzdCA9IEV3a19CYWNrX0ZvcndhcmRfTGlzdDo6Y3Jl YXRlKHRvQVBJKHByaXYtPnBhZ2VQcm94eS0+YmFja0ZvcndhcmRMaXN0KCkpKTsKLSAgICBwcml2 LT5zZXR0aW5ncyA9IGFkb3B0UHRyKG5ldyBFd2tfU2V0dGluZ3MoV0tQYWdlR3JvdXBHZXRQcmVm ZXJlbmNlcyhXS1BhZ2VHZXRQYWdlR3JvdXAodG9BUEkocHJpdi0+cGFnZVByb3h5LmdldCgpKSkp KSk7CisKICAgICBwcml2LT5jb250ZXh0ID0gY29udGV4dDsKIAogI2lmIFVTRShUSUxFRF9CQUNL SU5HX1NUT1JFKQpAQCAtNzkzLDcgKzc5Myw3IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19pbml0 aWFsaXplKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBQYXNzUmVmUHRyPEV3a19Db250ZXh0PiBjCiAK ICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCiAgICAgcHJpdi0+cGFnZVByb3h5LT5mdWxsU2Ny ZWVuTWFuYWdlcigpLT5zZXRXZWJWaWV3KGV3a1ZpZXcpOwotICAgIGV3a19zZXR0aW5nc19mdWxs c2NyZWVuX2VuYWJsZWRfc2V0KHByaXYtPnNldHRpbmdzLmdldCgpLCB0cnVlKTsKKyAgICBwcml2 LT5wYWdlUHJveHktPnBhZ2VHcm91cCgpLT5wcmVmZXJlbmNlcygpLT5zZXRGdWxsU2NyZWVuRW5h YmxlZCh0cnVlKTsKICNlbmRpZgogCiAgICAgLy8gSW5pdGlhbGl6ZSBwYWdlIGNsaWVudHMuCg==