115713 2013-05-06 23:26:07 -0700 [EFL] Refactor ewk_view_scroll to remove internal structure. 2013-06-13 00:53:23 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ryuan.choi ryuan.choi cdumez commit-queue gyuyoung.kim lucas.de.marchi rakuco oldest_to_newest 885619 0 ryuan.choi 2013-05-06 23:26:07 -0700 After removed c-ism from WebKit/Efl, we don't need to keep the internal structures like Ewk_Scroll_Request. It's just used to pass scrollRect and delta to c files. 885622 1 200876 ryuan.choi 2013-05-06 23:32:33 -0700 Created attachment 200876 Patch 899924 2 200876 gyuyoung.kim 2013-06-13 00:45:28 -0700 Comment on attachment 200876 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=200876&action=review Looks fine refactoring. r=me. > Source/WebKit/efl/ChangeLog:8 > + After removed c-ism from WebKit/Efl, There are no reason to keep internal are -> is ? 899927 3 ryuan.choi 2013-06-13 00:52:56 -0700 Committed r151540: <http://trac.webkit.org/changeset/151540> 899928 4 ryuan.choi 2013-06-13 00:53:23 -0700 (In reply to comment #2) > (From update of attachment 200876 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=200876&action=review > > Looks fine refactoring. r=me. > > > Source/WebKit/efl/ChangeLog:8 > > + After removed c-ism from WebKit/Efl, There are no reason to keep internal > > are -> is ? Thank you. Landed after fixed. 200876 2013-05-06 23:32:33 -0700 2013-06-13 00:45:28 -0700 Patch bug-115713-20130507153138.patch text/plain 21091 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggYzE5Y2M3MThi ZGYwMmFmNjQwNGVhNzZkYzJjMDdlOTA5MjNkMDQyZC4uMzJjYTVhNzhhZjY1ODA1MTlmYzExYTll YmEzYzgwYmEyZDJkOGI1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEz LTA1LTA2ICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBb RUZMXSBSZWZhY3RvciBld2tfdmlld19zY3JvbGwgdG8gcmVtb3ZlIGludGVybmFsIHN0cnVjdHVy ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTcx MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFmdGVy IHJlbW92ZWQgYy1pc20gZnJvbSBXZWJLaXQvRWZsLCBUaGVyZSBhcmUgbm8gcmVhc29uIHRvIGtl ZXAgaW50ZXJuYWwKKyAgICAgICAgc3RydWN0dXJlcyBsaWtlIEV3a19TY3JvbGxfUmVxdWVzdC4K KyAgICAgICAgVGhpcyBwYXRjaCByZWZhY3RvcmVkIGV3a192aWV3X3Njcm9sbCB0byB1c2UgV1RG IGluc3RlYWQgb2YgRXdrX1Njcm9sbF9SZXF1ZXN0CisgICAgICAgIGFuZCBzY3JvbGxzIG9mIFNt YXJ0RGF0YS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRFZmw6OnNjcm9sbCk6CisgICAgICAgICog ZXdrL2V3a192aWV3LmNwcDogUmVtb3ZlZCBmdW5jdGlvbnMgdG8gbWFuYWdlIEV3a19TY3JvbGxf UmVxdWVzdC4KKyAgICAgICAgKF9Fd2tfVmlld19Qcml2YXRlX0RhdGEpOgorICAgICAgICAoX2V3 a192aWV3X3Njcm9sbHNfZmx1c2gpOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfZGVsKToKKyAg ICAgICAgKF9ld2tfdmlld19zbWFydF9jYWxjdWxhdGUpOgorICAgICAgICAoZXdrX3ZpZXdfc2Ny b2xsX29mZnNldHNfZ2V0KToKKyAgICAgICAgKGV3a192aWV3X3Njcm9sbF9yZWN0c19nZXQpOgor ICAgICAgICAoZXdrX3ZpZXdfc2Nyb2xsKToKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuaDogUmVt b3ZlZCBFd2tfU2Nyb2xsX1JlcXVlc3Qgd2hpY2ggaXMgcHJpdmF0ZSBzdHJ1Y3R1cmUuCisgICAg ICAgICogZXdrL2V3a192aWV3X3ByaXZhdGUuaDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAg ICAqIGV3ay9ld2tfdmlld19zaW5nbGUuY3BwOgorICAgICAgICAoX2V3a192aWV3X3NpbmdsZV9z Y3JvbGxfcHJvY2Vzc19zaW5nbGUpOgorICAgICAgICAoX2V3a192aWV3X3NpbmdsZV9zbWFydF9z Y3JvbGxzX3Byb2Nlc3MpOgorICAgICAgICAqIGV3ay9ld2tfdmlld190aWxlZC5jcHA6CisgICAg ICAgIChfZXdrX3ZpZXdfdGlsZWRfc21hcnRfc2Nyb2xsc19wcm9jZXNzKToKKwogMjAxMy0wNC0y NiAgSm9zZSBMZWppbiBQSiAgPGpvc2UubGVqaW5AZ21haWwuY29tPgogCiAgICAgICAgIFtFRkxd IEFkZCB1bml0IHRlc3QgY2FzZXMgZm9yIGV3a19zZXR0aW5ncyBBUElzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3BwIGIvU291 cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcAppbmRleCBl YmViNWEwNTkzOTcyMWE3YjBjODk0ZjBlMzAzZjdhMWU1OGMzOTc2Li5jZDk2NDNkYzJmMzI1YzQ3 MzVmNDRkZDYwNDMwYTViMTMyMDQ3M2NmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9X ZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZs L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5jcHAKQEAgLTU1OCw3ICs1NTgsNyBAQCB2 b2lkIENocm9tZUNsaWVudEVmbDo6aW52YWxpZGF0ZUNvbnRlbnRzRm9yU2xvd1Njcm9sbChjb25z dCBJbnRSZWN0JiB1cGRhdGVSZWN0LAogCiB2b2lkIENocm9tZUNsaWVudEVmbDo6c2Nyb2xsKGNv bnN0IEludFNpemUmIHNjcm9sbERlbHRhLCBjb25zdCBJbnRSZWN0JiByZWN0VG9TY3JvbGwsIGNv bnN0IEludFJlY3QmIGNsaXBSZWN0KQogewotICAgIGV3a192aWV3X3Njcm9sbChtX3ZpZXcsIHNj cm9sbERlbHRhLndpZHRoKCksIHNjcm9sbERlbHRhLmhlaWdodCgpLCByZWN0VG9TY3JvbGwueCgp LCByZWN0VG9TY3JvbGwueSgpLCByZWN0VG9TY3JvbGwud2lkdGgoKSwgcmVjdFRvU2Nyb2xsLmhl aWdodCgpLCBjbGlwUmVjdC54KCksIGNsaXBSZWN0LnkoKSwgY2xpcFJlY3Qud2lkdGgoKSwgY2xp cFJlY3QuaGVpZ2h0KCkpOworICAgIGV3a192aWV3X3Njcm9sbChtX3ZpZXcsIHNjcm9sbERlbHRh LCByZWN0VG9TY3JvbGwsIGNsaXBSZWN0KTsKIH0KIAogdm9pZCBDaHJvbWVDbGllbnRFZmw6OmNh bmNlbEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RGb3JGcmFtZShGcmFtZSopCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9l ZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCAzMDlkZjFjNWIyY2VmMTQ0YjAwY2FkMzhhZWQ1ZWMz ZDNhOGU4Yjc1Li4xZTY5OTA4N2UzNzA2MGM5MGM3OTNjYzdkODQ4Mzg5NTBjZGQ5MWFkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKQEAgLTEzNCwxMCArMTM0LDYgQEAgc3RhdGljIGNv bnN0IHNpemVfdCBld2tWaWV3UmVwYWludHNTaXplSW5pdGlhbCA9IDMyOwogc3RhdGljIGNvbnN0 IHNpemVfdCBld2tWaWV3UmVwYWludHNTaXplU3RlcCA9IDg7CiBzdGF0aWMgY29uc3Qgc2l6ZV90 IGV3a1ZpZXdSZXBhaW50c1NpemVNYXhpbXVtRnJlZSA9IDY0OwogCi1zdGF0aWMgY29uc3Qgc2l6 ZV90IGV3a1ZpZXdTY3JvbGxzU2l6ZUluaXRpYWwgPSA4Owotc3RhdGljIGNvbnN0IHNpemVfdCBl d2tWaWV3U2Nyb2xsc1NpemVTdGVwID0gMjsKLXN0YXRpYyBjb25zdCBzaXplX3QgZXdrVmlld1Nj cm9sbHNTaXplTWF4aW11bUZyZWUgPSAzMjsKLQogc3RhdGljIGNvbnN0IEV2YXNfU21hcnRfQ2Jf RGVzY3JpcHRpb24gX2V3a192aWV3X2NhbGxiYWNrX25hbWVzW10gPSB7CiAgICAgeyAiY29sb3Jj aG9vc2VyLGNyZWF0ZSIsICIoeXl5eSkiIH0sCiAgICAgeyAiY29sb3JjaG9vc2VyLHdpbGxkZWxl dGUiLCAiIiB9LApAQCAtMjg2LDExICsyODIsOCBAQCBzdHJ1Y3QgX0V3a19WaWV3X1ByaXZhdGVf RGF0YSB7CiAgICAgICAgIHNpemVfdCBjb3VudDsKICAgICAgICAgc2l6ZV90IGFsbG9jYXRlZDsK ICAgICB9IHJlcGFpbnRzOwotICAgIHN0cnVjdCB7Ci0gICAgICAgIEV3a19TY3JvbGxfUmVxdWVz dCogYXJyYXk7Ci0gICAgICAgIHNpemVfdCBjb3VudDsKLSAgICAgICAgc2l6ZV90IGFsbG9jYXRl ZDsKLSAgICB9IHNjcm9sbHM7CisgICAgV1RGOjpWZWN0b3I8V2ViQ29yZTo6SW50UmVjdD4gbV9y ZWN0c1RvU2Nyb2xsOworICAgIFdURjo6VmVjdG9yPFdlYkNvcmU6OkludFNpemU+IG1fc2Nyb2xs T2Zmc2V0czsKICAgICB1bnNpZ25lZCBpbnQgaW1oOyAvKio8IGlucHV0IG1ldGhvZCBoaW50cyAq LwogICAgIHN0cnVjdCB7CiAgICAgICAgIGJvb2wgdmlld0NsZWFyZWQgOiAxOwpAQCAtNDkzLDg1 ICs0ODYsMTAgQEAgc3RhdGljIHZvaWQgX2V3a192aWV3X3JlcGFpbnRzX2ZsdXNoKEV3a19WaWV3 X1ByaXZhdGVfRGF0YSogcHJpdikKICAgICBfZXdrX3ZpZXdfcmVwYWludHNfcmVzaXplKHByaXYs IGV3a1ZpZXdSZXBhaW50c1NpemVNYXhpbXVtRnJlZSk7CiB9CiAKLXN0YXRpYyBFaW5hX0Jvb2wg X2V3a192aWV3X3Njcm9sbHNfcmVzaXplKEV3a19WaWV3X1ByaXZhdGVfRGF0YSogcHJpdiwgc2l6 ZV90IHNpemUpCi17Ci0gICAgdm9pZCogdG1wID0gcmVhbGxvYyhwcml2LT5zY3JvbGxzLmFycmF5 LCBzaXplICogc2l6ZW9mKEV3a19TY3JvbGxfUmVxdWVzdCkpOwotICAgIGlmICghdG1wKSB7Ci0g ICAgICAgIENSSVRJQ0FMKCJjb3VsZCBub3QgcmVhbGxvYyBzY3JvbGxzIGFycmF5IHRvICV6dSBl bGVtZW50cy4iLCBzaXplKTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLSAgICBwcml2 LT5zY3JvbGxzLmFsbG9jYXRlZCA9IHNpemU7Ci0gICAgcHJpdi0+c2Nyb2xscy5hcnJheSA9IHN0 YXRpY19jYXN0PEV3a19TY3JvbGxfUmVxdWVzdCo+KHRtcCk7Ci0gICAgcmV0dXJuIHRydWU7Ci19 Ci0KLXN0YXRpYyB2b2lkIF9ld2tfdmlld19zY3JvbGxfYWRkKEV3a19WaWV3X1ByaXZhdGVfRGF0 YSogcHJpdiwgRXZhc19Db29yZCBkZWx0YVgsIEV2YXNfQ29vcmQgZGVsdGFZLCBFdmFzX0Nvb3Jk IHgsIEV2YXNfQ29vcmQgeSwgRXZhc19Db29yZCB3aWR0aCwgRXZhc19Db29yZCBoZWlnaHQpCi17 Ci0gICAgRXdrX1Njcm9sbF9SZXF1ZXN0KiByZWN0OwotICAgIEV3a19TY3JvbGxfUmVxdWVzdCog cmVjdF9lbmQ7Ci0gICAgRXZhc19Db29yZCB4MiA9IHggKyB3aWR0aCwgeTIgPSB5ICsgaGVpZ2h0 OwotCi0gICAgcmVjdCA9IHByaXYtPnNjcm9sbHMuYXJyYXk7Ci0gICAgcmVjdF9lbmQgPSByZWN0 ICsgcHJpdi0+c2Nyb2xscy5jb3VudDsKLSAgICBmb3IgKDsgcmVjdCA8IHJlY3RfZW5kOyByZWN0 KyspIHsKLSAgICAgICAgaWYgKHJlY3QtPnggPT0geCAmJiByZWN0LT55ID09IHkgJiYgcmVjdC0+ dyA9PSB3aWR0aCAmJiByZWN0LT5oID09IGhlaWdodCkgewotICAgICAgICAgICAgREJHKCJyZWdp b24gYWxyZWFkeSBzY3JvbGxlZCAlZCwlZCslZHglZCAlKzAzZCwlKzAzZCBhZGQgIgotICAgICAg ICAgICAgICAgICIlKzAzZCwlKzAzZCIsCi0gICAgICAgICAgICAgICAgcmVjdC0+eCwgcmVjdC0+ eSwgcmVjdC0+dywgcmVjdC0+aCwgcmVjdC0+ZHgsIHJlY3QtPmR5LCBkZWx0YVgsIGRlbHRhWSk7 Ci0gICAgICAgICAgICByZWN0LT5keCArPSBkZWx0YVg7Ci0gICAgICAgICAgICByZWN0LT5keSAr PSBkZWx0YVk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKCh4 IDw9IHJlY3QtPnggJiYgeDIgPj0gcmVjdC0+eDIpICYmICh5IDw9IHJlY3QtPnkgJiYgeTIgPj0g cmVjdC0+eTIpKSB7Ci0gICAgICAgICAgICBEQkcoIm9sZCB2aWV3cG9ydCAoJWQsJWQrJWR4JWQg JSswM2QsJSswM2QpIHdhcyBzY3JvbGxlZCBpdHNlbGYsICIKLSAgICAgICAgICAgICAgICAiYWRk ICUrMDNkLCUrMDNkIiwKLSAgICAgICAgICAgICAgICByZWN0LT54LCByZWN0LT55LCByZWN0LT53 LCByZWN0LT5oLCByZWN0LT5keCwgcmVjdC0+ZHksIGRlbHRhWCwgZGVsdGFZKTsKLSAgICAgICAg ICAgIHJlY3QtPnggKz0gZGVsdGFYOwotICAgICAgICAgICAgcmVjdC0+eSArPSBkZWx0YVk7Ci0g ICAgICAgIH0KLSAgICB9Ci0KLSAgICBpZiAocHJpdi0+c2Nyb2xscy5hbGxvY2F0ZWQgPT0gcHJp di0+c2Nyb2xscy5jb3VudCkgewotICAgICAgICBzaXplX3Qgc2l6ZTsKLSAgICAgICAgaWYgKCFw cml2LT5zY3JvbGxzLmFsbG9jYXRlZCkKLSAgICAgICAgICAgIHNpemUgPSBld2tWaWV3U2Nyb2xs c1NpemVJbml0aWFsOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBzaXplID0gcHJpdi0+c2Ny b2xscy5hbGxvY2F0ZWQgKyBld2tWaWV3U2Nyb2xsc1NpemVTdGVwOwotICAgICAgICBpZiAoIV9l d2tfdmlld19zY3JvbGxzX3Jlc2l6ZShwcml2LCBzaXplKSkKLSAgICAgICAgICAgIHJldHVybjsK LSAgICB9Ci0KLSAgICByZWN0ID0gcHJpdi0+c2Nyb2xscy5hcnJheSArIHByaXYtPnNjcm9sbHMu Y291bnQ7Ci0gICAgcHJpdi0+c2Nyb2xscy5jb3VudCsrOwotCi0gICAgcmVjdC0+eCA9IHg7Ci0g ICAgcmVjdC0+eSA9IHk7Ci0gICAgcmVjdC0+dyA9IHdpZHRoOwotICAgIHJlY3QtPmggPSBoZWln aHQ7Ci0gICAgcmVjdC0+eDIgPSB4MjsKLSAgICByZWN0LT55MiA9IHkyOwotICAgIHJlY3QtPmR4 ID0gZGVsdGFYOwotICAgIHJlY3QtPmR5ID0gZGVsdGFZOwotICAgIERCRygiYWRkIHNjcm9sbCBp biByZWdpb246ICVkLCAlZCslZHglZCAlKzAzZCwgJSswM2QiLCB4LCB5LCB3aWR0aCwgaGVpZ2h0 LCBkZWx0YVgsIGRlbHRhWSk7Ci0KLSAgICBFaW5hX1JlY3RhbmdsZSogcHI7Ci0gICAgRWluYV9S ZWN0YW5nbGUqIHByX2VuZDsKLSAgICBzaXplX3QgY291bnQ7Ci0gICAgcHIgPSBwcml2LT5yZXBh aW50cy5hcnJheTsKLSAgICBjb3VudCA9IHByaXYtPnJlcGFpbnRzLmNvdW50OwotICAgIHByX2Vu ZCA9IHByICsgY291bnQ7Ci0gICAgZm9yICg7IHByIDwgcHJfZW5kOyBwcisrKSB7Ci0gICAgICAg IHByLT54ICs9IGRlbHRhWDsKLSAgICAgICAgcHItPnkgKz0gZGVsdGFZOwotICAgIH0KLX0KLQog c3RhdGljIHZvaWQgX2V3a192aWV3X3Njcm9sbHNfZmx1c2goRXdrX1ZpZXdfUHJpdmF0ZV9EYXRh KiBwcml2KQogewotICAgIHByaXYtPnNjcm9sbHMuY291bnQgPSAwOwotICAgIGlmIChwcml2LT5z Y3JvbGxzLmFsbG9jYXRlZCA8PSBld2tWaWV3U2Nyb2xsc1NpemVNYXhpbXVtRnJlZSkKLSAgICAg ICAgcmV0dXJuOwotICAgIF9ld2tfdmlld19zY3JvbGxzX3Jlc2l6ZShwcml2LCBld2tWaWV3U2Ny b2xsc1NpemVNYXhpbXVtRnJlZSk7CisgICAgcHJpdi0+bV9zY3JvbGxPZmZzZXRzLmNsZWFyKCk7 CisgICAgcHJpdi0+bV9yZWN0c1RvU2Nyb2xsLmNsZWFyKCk7CiB9CiAKIC8vIERlZmF1bHQgRXZl bnQgSGFuZGxpbmcgLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v LwpAQCAtOTYzLDcgKzg4MSw2IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19wcml2X2RlbChFd2tf Vmlld19Qcml2YXRlX0RhdGEqIHByaXYpCiAgICAgLyogZG8gbm90IGRlbGV0ZSBwcml2LT5tYWlu X2ZyYW1lICovCiAKICAgICBmcmVlKHByaXYtPnJlcGFpbnRzLmFycmF5KTsKLSAgICBmcmVlKHBy aXYtPnNjcm9sbHMuYXJyYXkpOwogCiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0 dGluZ3MudXNlckFnZW50KTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5n cy51c2VyU3R5bGVzaGVldCk7CkBAIC0xMTIxLDEwICsxMDM4LDggQEAgc3RhdGljIHZvaWQgX2V3 a192aWV3X3NtYXJ0X2NhbGN1bGF0ZShFdmFzX09iamVjdCogZXdrVmlldykKIAogICAgIGV2YXNf b2JqZWN0X2dlb21ldHJ5X2dldChld2tWaWV3LCAmeCwgJnksICZ3aWR0aCwgJmhlaWdodCk7CiAK LSAgICBEQkcoImV3a1ZpZXc9JXAgZ2VvPVslZCwgJWQgKyAlZHglZF0sIGNoYW5nZWQ6IHNpemU9 JWhodSwgIgotICAgICAgICAic2Nyb2xscz0lenUsIHJlcGFpbnRzPSV6dSIsCi0gICAgICAgIGV3 a1ZpZXcsIHgsIHksIHdpZHRoLCBoZWlnaHQsIHNtYXJ0RGF0YS0+Y2hhbmdlZC5zaXplLAotICAg ICAgICBwcml2LT5zY3JvbGxzLmNvdW50LCBwcml2LT5yZXBhaW50cy5jb3VudCk7CisgICAgREJH KCJld2tWaWV3PSVwIGdlbz1bJWQsICVkICsgJWR4JWRdLCBjaGFuZ2VkOiBzaXplPSVodXUiLAor ICAgICAgICBld2tWaWV3LCB4LCB5LCB3aWR0aCwgaGVpZ2h0LCBzbWFydERhdGEtPmNoYW5nZWQu c2l6ZSk7CiAKICAgICBpZiAoc21hcnREYXRhLT5jaGFuZ2VkLnNpemUgJiYgKCh3aWR0aCAhPSBz bWFydERhdGEtPnZpZXcudykgfHwgKGhlaWdodCAhPSBzbWFydERhdGEtPnZpZXcuaCkpKSB7CiAg ICAgICAgIFdlYkNvcmU6OkZyYW1lVmlldyogdmlldyA9IHByaXYtPm1haW5GcmFtZS0+dmlldygp OwpAQCAtMjgzOCwzMSArMjc1MywxNiBAQCBjb25zdCBFaW5hX1JlY3RhbmdsZSogZXdrX3ZpZXdf cmVwYWludHNfcG9wKEV3a19WaWV3X1ByaXZhdGVfRGF0YSogcHJpdiwgc2l6ZV90KgogICAgIHJl dHVybiBwcml2LT5yZXBhaW50cy5hcnJheTsKIH0KIAotLyoqCi0gKiBHZXRzIHRoZSBpbnRlcm5h bCBhcnJheSBvZiBzY3JvbGwgcmVxdWVzdHMuCi0gKgotICogVGhpcyBhcnJheSBzaG91bGQgbm90 IGJlIG1vZGlmaWVkIGFueWhvdy4gSXQgc2hvdWxkIGJlIHByb2Nlc3NlZAotICogaW1tZWRpYXRl bHkgYXMgYW55IGZ1cnRoZXIgZXdrX3ZpZXcgY2FsbCBtaWdodCBjaGFuZ2UgaXQsIGxpa2UKLSAq IHRob3NlIHRoYXQgYWRkIHNjcm9sbHMgb3IgZmx1c2ggdGhlbSwgc28gYmUgc3VyZSB0aGF0IHlv dXIgY29kZQotICogZG9lcyBub3QgY2FsbCBhbnkgb2YgdGhvc2Ugd2hpbGUgeW91IHByb2Nlc3Mg dGhlIHNjcm9sbHMsCi0gKiBvdGhlcndpc2UgY29weSB0aGUgYXJyYXkuCi0gKgotICogQHBhcmFt IHByaXYgcHJpdmF0ZSBoYW5kbGUgcG9pbnRlciBvZiB0aGUgdmlldyB0byBnZXQgc2Nyb2xscy4K LSAqIEBwYXJhbSBjb3VudCB3aGVyZSB0byByZXR1cm4gdGhlIG51bWJlciBvZiBlbGVtZW50cyBv ZiByZXR1cm5lZCBhcnJheSwgbWF5IGJlIEBjIDAuCi0gKgotICogQHJldHVybiByZWZlcmVuY2Ug dG8gYXJyYXkgb2YgcmVxdWVzdGVkIHNjcm9sbHMuCi0gKgotICogQG5vdGUgdGhpcyBpcyBub3Qg Zm9yIGdlbmVyYWwgdXNlIGJ1dCBqdXN0IGZvciBzdWJjbGFzc2VzIHRoYXQgd2FudAotICogICAg ICAgdG8gZGVmaW5lIHRoZWlyIG93biBiYWNraW5nIHN0b3JlLgotICovCi1jb25zdCBFd2tfU2Ny b2xsX1JlcXVlc3QqIGV3a192aWV3X3Njcm9sbF9yZXF1ZXN0c19nZXQoY29uc3QgRXdrX1ZpZXdf UHJpdmF0ZV9EYXRhKiBwcml2LCBzaXplX3QqIGNvdW50KQorY29uc3QgVmVjdG9yPFdlYkNvcmU6 OkludFNpemU+JiBld2tfdmlld19zY3JvbGxfb2Zmc2V0c19nZXQoY29uc3QgRXdrX1ZpZXdfUHJp dmF0ZV9EYXRhKiBwcml2KQogewotICAgIGlmIChjb3VudCkKLSAgICAgICAgKmNvdW50ID0gMDsK LSAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwocHJpdiwgMCk7Ci0gICAgaWYgKGNv dW50KQotICAgICAgICAqY291bnQgPSBwcml2LT5zY3JvbGxzLmNvdW50OwotICAgIHJldHVybiBw cml2LT5zY3JvbGxzLmFycmF5OworICAgIEFTU0VSVChwcml2KTsKKyAgICByZXR1cm4gcHJpdi0+ bV9zY3JvbGxPZmZzZXRzOworfQorCitjb25zdCBWZWN0b3I8V2ViQ29yZTo6SW50UmVjdD4mIGV3 a192aWV3X3Njcm9sbF9yZWN0c19nZXQoY29uc3QgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBwcml2 KQoreworICAgIEFTU0VSVChwcml2KTsKKyAgICByZXR1cm4gcHJpdi0+bV9yZWN0c1RvU2Nyb2xs OwogfQogCiAvKioKQEAgLTM3MzUsMjAgKzM2MzUsMjEgQEAgdm9pZCBld2tfdmlld19yZXBhaW50 KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFdmFzX0Nvb3JkIHgsIEV2YXNfQ29vcmQgeSwgRXZhc19D b28KICAgICBfZXdrX3ZpZXdfc21hcnRfY2hhbmdlZChzbWFydERhdGEpOwogfQogCi12b2lkIGV3 a192aWV3X3Njcm9sbChFdmFzX09iamVjdCogZXdrVmlldywgRXZhc19Db29yZCBkZWx0YVgsIEV2 YXNfQ29vcmQgZGVsdGFZLCBFdmFzX0Nvb3JkIHNjcm9sbFgsIEV2YXNfQ29vcmQgc2Nyb2xsWSwg RXZhc19Db29yZCBzY3JvbGxXaWR0aCwgRXZhc19Db29yZCBzY3JvbGxIZWlnaHQsIEV2YXNfQ29v cmQgY2VudGVyWCwgRXZhc19Db29yZCBjZW50ZXJZLCBFdmFzX0Nvb3JkIGNlbnRlcldpZHRoLCBF dmFzX0Nvb3JkIGNlbnRlckhlaWdodCkKK3ZvaWQgZXdrX3ZpZXdfc2Nyb2xsKEV2YXNfT2JqZWN0 KiBld2tWaWV3LCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBkZWx0YSwgY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYgcmVjdFRvU2Nyb2xsLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JikKIHsKLSAgICBE QkcoImV3a1ZpZXc9JXAsIGRlbHRhOiAlZCwlZCwgc2Nyb2xsOiAlZCwlZCslZHglZCwgY2xpcDog JWQsJWQrJWR4JWQiLAotICAgICAgICBld2tWaWV3LCBkZWx0YVgsIGRlbHRhWSwgc2Nyb2xsWCwg c2Nyb2xsWSwgc2Nyb2xsV2lkdGgsIHNjcm9sbEhlaWdodCwgY2VudGVyWCwgY2VudGVyWSwgY2Vu dGVyV2lkdGgsIGNlbnRlckhlaWdodCk7Ci0KLSAgICBpZiAoKHNjcm9sbFggIT0gY2VudGVyWCkg fHwgKHNjcm9sbFkgIT0gY2VudGVyWSkgfHwgKHNjcm9sbFdpZHRoICE9IGNlbnRlcldpZHRoKSB8 fCAoc2Nyb2xsSGVpZ2h0ICE9IGNlbnRlckhlaWdodCkpCi0gICAgICAgIFdBUk4oInNjcm9sbCBy ZWdpb24gYW5kIGNsaXAgYXJlIGRpZmZlcmVudCEgJWQsJWQrJWR4JWQgYW5kICVkLCVkKyVkeCVk IiwKLSAgICAgICAgICAgIHNjcm9sbFgsIHNjcm9sbFksIHNjcm9sbFdpZHRoLCBzY3JvbGxIZWln aHQsIGNlbnRlclgsIGNlbnRlclksIGNlbnRlcldpZHRoLCBjZW50ZXJIZWlnaHQpOworICAgIEFT U0VSVCghcmVjdFRvU2Nyb2xsLmlzRW1wdHkoKSk7CisgICAgQVNTRVJUKCFkZWx0YS53aWR0aCgp ICYmICFkZWx0YS5oZWlnaHQoKSk7CiAKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3 a1ZpZXcsIHNtYXJ0RGF0YSk7CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0 RGF0YSwgcHJpdik7Ci0gICAgRUlOQV9TQUZFVFlfT05fVFJVRV9SRVRVUk4oIWRlbHRhWCAmJiAh ZGVsdGFZKTsKIAotICAgIF9ld2tfdmlld19zY3JvbGxfYWRkKHByaXYsIGRlbHRhWCwgZGVsdGFZ LCBzY3JvbGxYLCBzY3JvbGxZLCBzY3JvbGxXaWR0aCwgc2Nyb2xsSGVpZ2h0KTsKKyAgICBwcml2 LT5tX3JlY3RzVG9TY3JvbGwuYXBwZW5kKHJlY3RUb1Njcm9sbCk7CisgICAgcHJpdi0+bV9zY3Jv bGxPZmZzZXRzLmFwcGVuZChkZWx0YSk7CisKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHBy aXYtPnJlcGFpbnRzLmNvdW50OyArK2kpIHsKKyAgICAgICAgcHJpdi0+cmVwYWludHMuYXJyYXlb aV0ueCA9IGRlbHRhLndpZHRoKCk7CisgICAgICAgIHByaXYtPnJlcGFpbnRzLmFycmF5W2ldLnkg PSBkZWx0YS5oZWlnaHQoKTsKKyAgICB9CiAKICAgICBfZXdrX3ZpZXdfc21hcnRfY2hhbmdlZChz bWFydERhdGEpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAppbmRleCA5ZGVhOGY1OTYyMjAy MTZkMTY3YzI2NjYyZTRhNjIxNDljMDI0NTFhLi4yZTEzMTEyZGE1MDgzZTBjNTc1NDIwZDBlZjlh MmNjOGJmNWM1NWU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaApAQCAtMzM3LDEzICszMzcs NiBAQCBzdHJ1Y3QgX0V3a19WaWV3X1JlZGlyZWN0aW9uX0RhdGEgewogICAgIGNvbnN0IGNoYXIg KnNvdXJjZV91cmw7ICAvKio8IFJlZGlyZWN0IHNvdXJjZSBVUkwuICovCiAgICAgY29uc3QgY2hh ciAqZGVzdGluYXRpb25fdXJsOyAgLyoqPCBSZWRpcmVjdCBkZXN0aW5hdGlvbiBVUkwuICovIAog fTsKLS8vLyBDcmVhdGVzIGEgdHlwZSBuYW1lIGZvciBAYSBfRXdrX1Njcm9sbF9SZXF1ZXN0Lgot dHlwZWRlZiBzdHJ1Y3QgX0V3a19TY3JvbGxfUmVxdWVzdCBFd2tfU2Nyb2xsX1JlcXVlc3Q7Ci0v Ly8gQ29udGFpbnMgdGhlIHNjcm9sbCByZXF1ZXN0IHRoYXQgc2hvdWxkIGJlIHByb2Nlc3NlZCBi eSBzdWJjbGFzcyBpbXBsZW1lbnRhdGlvbnMuCi1zdHJ1Y3QgX0V3a19TY3JvbGxfUmVxdWVzdCB7 Ci0gICAgRXZhc19Db29yZCBkeCwgZHk7Ci0gICAgRXZhc19Db29yZCB4LCB5LCB3LCBoLCB4Miwg eTI7Ci19OwogCiAvLy8gQ3JlYXRlcyBhIHR5cGUgbmFtZSBmb3IgQGEgX0V3a19Db2xvci4KIHR5 cGVkZWYgc3RydWN0IF9Fd2tfQ29sb3IgRXdrX0NvbG9yOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9lZmwvZXdrL2V3a192aWV3X3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfdmlld19wcml2YXRlLmgKaW5kZXggMDYwNmNjMDBjMTBmNDAxNGNhMTY3ZjlkM2Y1N2I5YmM5 M2M3YmQzOS4uZGFjNDkwYjI1ZDZjNDk5MDVjZmI1MWM5ODM4MjZkMzVlZTRjMzg1NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3X3ByaXZhdGUuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfcHJpdmF0ZS5oCkBAIC00MSw2ICs0MSw4IEBAIGNs YXNzIEdyYXBoaWNzQ29udGV4dDNEOwogY2xhc3MgR3JhcGhpY3NMYXllcjsKICNlbmRpZgogY2xh c3MgSFRNTFBsdWdJbkVsZW1lbnQ7CitjbGFzcyBJbnRSZWN0OworY2xhc3MgSW50U2l6ZTsKIGNs YXNzIFBvcHVwTWVudUNsaWVudDsKIH0KIApAQCAtMTA2LDcgKzEwOCw3IEBAIHVpbnQ2NF90IGV3 a192aWV3X2V4Y2VlZGVkX2RhdGFiYXNlX3F1b3RhKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFdmFz X09iamVjdCogZnJhCiBib29sIGV3a192aWV3X3J1bl9vcGVuX3BhbmVsKEV2YXNfT2JqZWN0KiBl d2tWaWV3LCBFdmFzX09iamVjdCogZnJhbWUsIEV3a19GaWxlX0Nob29zZXIqIGZpbGVDaG9vc2Vy LCBFaW5hX0xpc3QqKiBzZWxlY3RlZEZpbGVuYW1lcyk7CiAKIHZvaWQgZXdrX3ZpZXdfcmVwYWlu dChFdmFzX09iamVjdCogZXdrVmlldywgRXZhc19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV2YXNf Q29vcmQgd2lkdGgsIEV2YXNfQ29vcmQgaGVpZ2h0KTsKLXZvaWQgZXdrX3ZpZXdfc2Nyb2xsKEV2 YXNfT2JqZWN0KiBld2tWaWV3LCBFdmFzX0Nvb3JkIGRlbHRhWCwgRXZhc19Db29yZCBkZWx0YVks IEV2YXNfQ29vcmQgc2Nyb2xsWCwgRXZhc19Db29yZCBzY3JvbGxZLCBFdmFzX0Nvb3JkIHNjcm9s bFdpZHRoLCBFdmFzX0Nvb3JkIHNjcm9sbEhlaWdodCwgRXZhc19Db29yZCBjZW50ZXJYLCBFdmFz X0Nvb3JkIGNlbnRlclksIEV2YXNfQ29vcmQgY2VudGVyVywgRXZhc19Db29yZCBjZW50ZXJIZWln aHQpOwordm9pZCBld2tfdmlld19zY3JvbGwoRXZhc19PYmplY3QqLCBjb25zdCBXZWJDb3JlOjpJ bnRTaXplJiBkZWx0YSwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdFRvU2Nyb2xsLCBjb25z dCBXZWJDb3JlOjpJbnRSZWN0JiBjbGlwUmVjdCk7CiBXZWJDb3JlOjpQYWdlKiBld2tfdmlld19j b3JlX3BhZ2VfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KTsKIAogV1RGOjpQYXNzUmVm UHRyPFdlYkNvcmU6OkZyYW1lPiBld2tfdmlld19mcmFtZV9jcmVhdGUoRXZhc19PYmplY3QqIGV3 a1ZpZXcsIEV2YXNfT2JqZWN0KiBmcmFtZSwgY29uc3QgV1RGOjpTdHJpbmcmIG5hbWUsIFdlYkNv cmU6OkhUTUxGcmFtZU93bmVyRWxlbWVudCogb3duZXJFbGVtZW50LCBjb25zdCBXZWJDb3JlOjpL VVJMJiB1cmwsIGNvbnN0IFdURjo6U3RyaW5nJiByZWZlcnJlcik7CkBAIC0xNDYsNyArMTQ4LDgg QEAgYm9vbCBld2tfdmlld19uZWVkX3RvdWNoX2V2ZW50c19nZXQoY29uc3QgRXZhc19PYmplY3Qq KTsKICNlbmRpZgogCiBjb25zdCBFaW5hX1JlY3RhbmdsZSogZXdrX3ZpZXdfcmVwYWludHNfcG9w KEV3a19WaWV3X1ByaXZhdGVfRGF0YSogcHJpdiwgc2l6ZV90KiBjb3VudCk7Ci1jb25zdCBFd2tf U2Nyb2xsX1JlcXVlc3QqIGV3a192aWV3X3Njcm9sbF9yZXF1ZXN0c19nZXQoY29uc3QgRXdrX1Zp ZXdfUHJpdmF0ZV9EYXRhKiBwcml2LCBzaXplX3QqIGNvdW50KTsKK2NvbnN0IFZlY3RvcjxXZWJD b3JlOjpJbnRTaXplPiYgZXdrX3ZpZXdfc2Nyb2xsX29mZnNldHNfZ2V0KGNvbnN0IEV3a19WaWV3 X1ByaXZhdGVfRGF0YSopOworY29uc3QgVmVjdG9yPFdlYkNvcmU6OkludFJlY3Q+JiBld2tfdmll d19zY3JvbGxfcmVjdHNfZ2V0KGNvbnN0IEV3a19WaWV3X1ByaXZhdGVfRGF0YSopOwogCiB2b2lk IGV3a192aWV3X3JlcGFpbnRfYWRkKEV3a19WaWV3X1ByaXZhdGVfRGF0YSogcHJpdiwgRXZhc19D b29yZCB4LCBFdmFzX0Nvb3JkIHksIEV2YXNfQ29vcmQgd2lkdGgsIEV2YXNfQ29vcmQgaGVpZ2h0 KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3X3NpbmdsZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfc2luZ2xlLmNwcAppbmRleCBiMDQy Y2EzNDc3YTEwMzM5Mzg1ZGQyYzlmYTY3N2YxZjk3YzIxZDRlLi4wYjgzMTdiMDM4OTIxZmRhMjM5 ZGRkYmJiYzFiY2U5YTliYmI0YzQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2sv ZXdrX3ZpZXdfc2luZ2xlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdf c2luZ2xlLmNwcApAQCAtMTI5LDIyICsxMjksMTcgQEAgc3RhdGljIGlubGluZSB2b2lkIF9ld2tf dmlld19zY3JlZW5fbW92ZSh1aW50MzJfdCogaW1hZ2UsIHNpemVfdCBkZXN0aW5hdGlvblgsIHMK ICAgICB9CiB9CiAKLXN0YXRpYyBpbmxpbmUgdm9pZCBfZXdrX3ZpZXdfc2luZ2xlX3Njcm9sbF9w cm9jZXNzX3NpbmdsZShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIHZvaWQqIHBpeGVs cywgRXZhc19Db29yZCB3aWR0aCwgRXZhc19Db29yZCBoZWlnaHQsIGNvbnN0IEV3a19TY3JvbGxf UmVxdWVzdCogc2Nyb2xsUmVxdWVzdCkKK3N0YXRpYyBpbmxpbmUgdm9pZCBfZXdrX3ZpZXdfc2lu Z2xlX3Njcm9sbF9wcm9jZXNzX3NpbmdsZShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEs IHZvaWQqIHBpeGVscywgRXZhc19Db29yZCB3aWR0aCwgRXZhc19Db29yZCBoZWlnaHQsIGNvbnN0 IFdlYkNvcmU6OkludFNpemUmIHNjcm9sbE9mZnNldCwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYg cmVjdFRvU2Nyb2xsKQogewotICAgIEV2YXNfQ29vcmQgc2Nyb2xsWCwgc2Nyb2xsWSwgc2Nyb2xs V2lkdGgsIHNjcm9sbEhlaWdodDsKKyAgICBpbnQgc2Nyb2xsWCA9IHJlY3RUb1Njcm9sbC54KCk7 CisgICAgaW50IHNjcm9sbFkgPSByZWN0VG9TY3JvbGwueSgpOworICAgIGludCBzY3JvbGxXaWR0 aCA9IHJlY3RUb1Njcm9sbC53aWR0aCgpOworICAgIGludCBzY3JvbGxIZWlnaHQgPSByZWN0VG9T Y3JvbGwuaGVpZ2h0KCk7CiAKICAgICBEQkcoIiVkLCVkICsgJWQsJWQgJSswM2QsJSswM2QsIHN0 b3JlOiAlcCAlZHglZCIsCi0gICAgICAgIHNjcm9sbFJlcXVlc3QtPngsIHNjcm9sbFJlcXVlc3Qt PnksIHNjcm9sbFJlcXVlc3QtPncsIHNjcm9sbFJlcXVlc3QtPmgsIHNjcm9sbFJlcXVlc3QtPmR4 LCBzY3JvbGxSZXF1ZXN0LT5keSwgcGl4ZWxzLCB3aWR0aCwgaGVpZ2h0KTsKKyAgICAgICAgc2Ny b2xsWCwgc2Nyb2xsWSwgc2Nyb2xsV2lkdGgsIHNjcm9sbEhlaWdodCwgc2Nyb2xsT2Zmc2V0Lndp ZHRoKCksIHNjcm9sbE9mZnNldC5oZWlnaHQoKSwgcGl4ZWxzLCB3aWR0aCwgaGVpZ2h0KTsKIAot ICAgIHNjcm9sbFggPSBzY3JvbGxSZXF1ZXN0LT54OwotICAgIHNjcm9sbFkgPSBzY3JvbGxSZXF1 ZXN0LT55OwotICAgIHNjcm9sbFdpZHRoID0gc2Nyb2xsUmVxdWVzdC0+dzsKLSAgICBzY3JvbGxI ZWlnaHQgPSBzY3JvbGxSZXF1ZXN0LT5oOwotCi0gICAgaWYgKGFicyhzY3JvbGxSZXF1ZXN0LT5k eCkgPj0gc2Nyb2xsV2lkdGggfHwgYWJzKHNjcm9sbFJlcXVlc3QtPmR5KSA+PSBzY3JvbGxIZWln aHQpIHsKLSAgICAgICAgLyogZG91YnQgd2Via2l0IHdvdWxkIGJlIHNvIHN0dXBpZC4uLiAqLwot ICAgICAgICBEQkcoImZ1bGwgcGFnZSBzY3JvbGwgJSswM2QsJSswM2QuIGNvbnZlcnQgdG8gcmVw YWludCAlZCwlZCArICVkeCVkIiwKLSAgICAgICAgICAgIHNjcm9sbFJlcXVlc3QtPmR4LCBzY3Jv bGxSZXF1ZXN0LT5keSwgc2Nyb2xsWCwgc2Nyb2xsWSwgc2Nyb2xsV2lkdGgsIHNjcm9sbEhlaWdo dCk7CisgICAgaWYgKGFicyhzY3JvbGxPZmZzZXQud2lkdGgoKSkgPj0gc2Nyb2xsV2lkdGggfHwg YWJzKHNjcm9sbE9mZnNldC5oZWlnaHQoKSkgPj0gc2Nyb2xsSGVpZ2h0KSB7CiAgICAgICAgIGV3 a192aWV3X3JlcGFpbnRfYWRkKHNtYXJ0RGF0YS0+X3ByaXYsIHNjcm9sbFgsIHNjcm9sbFksIHNj cm9sbFdpZHRoLCBzY3JvbGxIZWlnaHQpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTYz LDIwICsxNTgsMTYgQEAgc3RhdGljIGlubGluZSB2b2lkIF9ld2tfdmlld19zaW5nbGVfc2Nyb2xs X3Byb2Nlc3Nfc2luZ2xlKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHMKICAgICBpZiAoc2Nyb2xsWSAr IHNjcm9sbEhlaWdodCA+IGhlaWdodCkKICAgICAgICAgc2Nyb2xsSGVpZ2h0ID0gaGVpZ2h0IC0g c2Nyb2xsWTsKIAotICAgIGlmIChzY3JvbGxXaWR0aCA8IDApCi0gICAgICAgIHNjcm9sbFdpZHRo ID0gMDsKLSAgICBpZiAoc2Nyb2xsSGVpZ2h0IDwgMCkKLSAgICAgICAgc2Nyb2xsSGVpZ2h0ID0g MDsKLQotICAgIEVJTkFfU0FGRVRZX09OX1RSVUVfUkVUVVJOKCFzY3JvbGxXaWR0aCB8fCAhc2Ny b2xsSGVpZ2h0KTsKKyAgICBpZiAoc2Nyb2xsV2lkdGggPD0gMCB8fCBzY3JvbGxIZWlnaHQgPD0g MCkKKyAgICAgICAgcmV0dXJuOwogCi0gICAgaW50IHNvdXJjZVggPSBzY3JvbGxSZXF1ZXN0LT5k eCA8IDAgPyBhYnMoc2Nyb2xsUmVxdWVzdC0+ZHgpIDogMDsKLSAgICBpbnQgc291cmNlWSA9IHNj cm9sbFJlcXVlc3QtPmR5IDwgMCA/IGFicyhzY3JvbGxSZXF1ZXN0LT5keSkgOiAwOwotICAgIGlu dCBkZXN0aW5hdGlvblggPSBzY3JvbGxSZXF1ZXN0LT5keCA8IDAgPyAwIDogc2Nyb2xsUmVxdWVz dC0+ZHg7Ci0gICAgaW50IGRlc3RpbmF0aW9uWSA9IHNjcm9sbFJlcXVlc3QtPmR5IDwgMCA/IDAg OiBzY3JvbGxSZXF1ZXN0LT5keTsKLSAgICBpbnQgY29weVdpZHRoID0gc2Nyb2xsV2lkdGggLSBh YnMoc2Nyb2xsUmVxdWVzdC0+ZHgpOwotICAgIGludCBjb3B5SGVpZ2h0ID0gc2Nyb2xsSGVpZ2h0 IC0gYWJzKHNjcm9sbFJlcXVlc3QtPmR5KTsKLSAgICBpZiAoc2Nyb2xsUmVxdWVzdC0+ZHggfHwg c2Nyb2xsUmVxdWVzdC0+ZHkpIHsKKyAgICBpbnQgc291cmNlWCA9IHNjcm9sbE9mZnNldC53aWR0 aCgpIDwgMCA/IGFicyhzY3JvbGxPZmZzZXQud2lkdGgoKSkgOiAwOworICAgIGludCBzb3VyY2VZ ID0gc2Nyb2xsT2Zmc2V0LmhlaWdodCgpIDwgMCA/IGFicyhzY3JvbGxPZmZzZXQuaGVpZ2h0KCkp IDogMDsKKyAgICBpbnQgZGVzdGluYXRpb25YID0gc2Nyb2xsT2Zmc2V0LndpZHRoKCkgPCAwID8g MCA6IHNjcm9sbE9mZnNldC53aWR0aCgpOworICAgIGludCBkZXN0aW5hdGlvblkgPSBzY3JvbGxP ZmZzZXQuaGVpZ2h0KCkgPCAwID8gMCA6IHNjcm9sbE9mZnNldC5oZWlnaHQoKTsKKyAgICBpbnQg Y29weVdpZHRoID0gc2Nyb2xsV2lkdGggLSBhYnMoc2Nyb2xsT2Zmc2V0LndpZHRoKCkpOworICAg IGludCBjb3B5SGVpZ2h0ID0gc2Nyb2xsSGVpZ2h0IC0gYWJzKHNjcm9sbE9mZnNldC5oZWlnaHQo KSk7CisgICAgaWYgKHNjcm9sbE9mZnNldC53aWR0aCgpIHx8IHNjcm9sbE9mZnNldC5oZWlnaHQo KSkgewogICAgICAgICBfZXdrX3ZpZXdfc2NyZWVuX21vdmUoc3RhdGljX2Nhc3Q8dWludDMyX3Qq PihwaXhlbHMpLCBkZXN0aW5hdGlvblgsIGRlc3RpbmF0aW9uWSwgc291cmNlWCwgc291cmNlWSwg Y29weVdpZHRoLCBjb3B5SGVpZ2h0LCB3aWR0aCk7CiAgICAgICAgIGV2YXNfb2JqZWN0X2ltYWdl X2RhdGFfdXBkYXRlX2FkZChzbWFydERhdGEtPmJhY2tpbmdfc3RvcmUsIGRlc3RpbmF0aW9uWCwg ZGVzdGluYXRpb25ZLCBjb3B5V2lkdGgsIGNvcHlIZWlnaHQpOwogICAgIH0KQEAgLTE4NCw3ICsx NzUsNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgX2V3a192aWV3X3NpbmdsZV9zY3JvbGxfcHJvY2Vz c19zaW5nbGUoRXdrX1ZpZXdfU21hcnRfRGF0YSogcwogICAgIEVpbmFfUmVjdGFuZ2xlIHZlcnRp Y2FsVXBkYXRlOwogICAgIHZlcnRpY2FsVXBkYXRlLnggPSBkZXN0aW5hdGlvblggPyAwIDogY29w eVdpZHRoIC0gMTsKICAgICB2ZXJ0aWNhbFVwZGF0ZS55ID0gMDsKLSAgICB2ZXJ0aWNhbFVwZGF0 ZS53ID0gYWJzKHNjcm9sbFJlcXVlc3QtPmR4KTsKKyAgICB2ZXJ0aWNhbFVwZGF0ZS53ID0gYWJz KHNjcm9sbE9mZnNldC53aWR0aCgpKTsKICAgICB2ZXJ0aWNhbFVwZGF0ZS5oID0gc2Nyb2xsSGVp Z2h0OwogICAgIGlmICh2ZXJ0aWNhbFVwZGF0ZS53ICYmIHZlcnRpY2FsVXBkYXRlLmgpCiAgICAg ICAgIGV3a192aWV3X3JlcGFpbnRfYWRkKHNtYXJ0RGF0YS0+X3ByaXYsIHZlcnRpY2FsVXBkYXRl LngsIHZlcnRpY2FsVXBkYXRlLnksIHZlcnRpY2FsVXBkYXRlLncsIHZlcnRpY2FsVXBkYXRlLmgp OwpAQCAtMTkzLDI0ICsxODQsMjEgQEAgc3RhdGljIGlubGluZSB2b2lkIF9ld2tfdmlld19zaW5n bGVfc2Nyb2xsX3Byb2Nlc3Nfc2luZ2xlKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHMKICAgICBob3Jp em9udGFsVXBkYXRlLnggPSBkZXN0aW5hdGlvblg7CiAgICAgaG9yaXpvbnRhbFVwZGF0ZS55ID0g ZGVzdGluYXRpb25ZID8gMCA6IGNvcHlIZWlnaHQgLSAxOwogICAgIGhvcml6b250YWxVcGRhdGUu dyA9IGNvcHlXaWR0aDsKLSAgICBob3Jpem9udGFsVXBkYXRlLmggPSBhYnMoc2Nyb2xsUmVxdWVz dC0+ZHkpOworICAgIGhvcml6b250YWxVcGRhdGUuaCA9IGFicyhzY3JvbGxPZmZzZXQuaGVpZ2h0 KCkpOwogICAgIGlmIChob3Jpem9udGFsVXBkYXRlLncgJiYgaG9yaXpvbnRhbFVwZGF0ZS5oKQog ICAgICAgICBld2tfdmlld19yZXBhaW50X2FkZChzbWFydERhdGEtPl9wcml2LCBob3Jpem9udGFs VXBkYXRlLngsIGhvcml6b250YWxVcGRhdGUueSwgaG9yaXpvbnRhbFVwZGF0ZS53LCBob3Jpem9u dGFsVXBkYXRlLmgpOwogfQogCiBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19zaW5nbGVfc21h cnRfc2Nyb2xsc19wcm9jZXNzKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSkKIHsKLSAg ICBjb25zdCBFd2tfU2Nyb2xsX1JlcXVlc3QqIHNyOwotICAgIGNvbnN0IEV3a19TY3JvbGxfUmVx dWVzdCogc3JfZW5kOwotICAgIEV2YXNfQ29vcmQgb3csIG9oOwotICAgIHNpemVfdCBjb3VudDsK KyAgICBFdmFzX0Nvb3JkIGltYWdlV2lkdGgsIGltYWdlSGVpZ2h0OwogICAgIHZvaWQqIHBpeGVs cyA9IGV2YXNfb2JqZWN0X2ltYWdlX2RhdGFfZ2V0KHNtYXJ0RGF0YS0+YmFja2luZ19zdG9yZSwg MSk7Ci0gICAgZXZhc19vYmplY3RfaW1hZ2Vfc2l6ZV9nZXQoc21hcnREYXRhLT5iYWNraW5nX3N0 b3JlLCAmb3csICZvaCk7CisgICAgZXZhc19vYmplY3RfaW1hZ2Vfc2l6ZV9nZXQoc21hcnREYXRh LT5iYWNraW5nX3N0b3JlLCAmaW1hZ2VXaWR0aCwgJmltYWdlSGVpZ2h0KTsKIAotICAgIHNyID0g ZXdrX3ZpZXdfc2Nyb2xsX3JlcXVlc3RzX2dldChzbWFydERhdGEtPl9wcml2LCAmY291bnQpOwot ICAgIHNyX2VuZCA9IHNyICsgY291bnQ7Ci0gICAgZm9yICg7IHNyIDwgc3JfZW5kOyBzcisrKQot ICAgICAgICBfZXdrX3ZpZXdfc2luZ2xlX3Njcm9sbF9wcm9jZXNzX3NpbmdsZShzbWFydERhdGEs IHBpeGVscywgb3csIG9oLCBzcik7CisgICAgY29uc3QgV1RGOjpWZWN0b3I8V2ViQ29yZTo6SW50 U2l6ZT4mIHNjcm9sbE9mZnNldCA9IGV3a192aWV3X3Njcm9sbF9vZmZzZXRzX2dldChzbWFydERh dGEtPl9wcml2KTsKKyAgICBjb25zdCBXVEY6OlZlY3RvcjxXZWJDb3JlOjpJbnRSZWN0PiYgcmVj dHNUb1Njcm9sbCA9IGV3a192aWV3X3Njcm9sbF9yZWN0c19nZXQoc21hcnREYXRhLT5fcHJpdik7 CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzY3JvbGxPZmZzZXQuc2l6ZSgpOyArK2kpCisg ICAgICAgIF9ld2tfdmlld19zaW5nbGVfc2Nyb2xsX3Byb2Nlc3Nfc2luZ2xlKHNtYXJ0RGF0YSwg cGl4ZWxzLCBpbWFnZVdpZHRoLCBpbWFnZUhlaWdodCwgc2Nyb2xsT2Zmc2V0W2ldLCByZWN0c1Rv U2Nyb2xsW2ldKTsKIAogICAgIGV2YXNfb2JqZWN0X2ltYWdlX2RhdGFfc2V0KHNtYXJ0RGF0YS0+ YmFja2luZ19zdG9yZSwgcGl4ZWxzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwv ZXdrL2V3a192aWV3X3RpbGVkLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlld190 aWxlZC5jcHAKaW5kZXggZjBhMGU1MjQ1N2E0MTAyZGVkNDIzMTg0ODIxZjQ2ZmJkN2FjNWU2NC4u NDNhMWRkZjI4MTc1NGQ5ZWZjMGIyZWRkYmY5YjllZmI2NDA5NjlhNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3X3RpbGVkLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX3ZpZXdfdGlsZWQuY3BwCkBAIC04OSwxNyArODksOSBAQCBzdGF0aWMgdm9p ZCBfZXdrX3ZpZXdfdGlsZWRfc21hcnRfYWRkKEV2YXNfT2JqZWN0KiBld2tWaWV3KQogCiBzdGF0 aWMgRWluYV9Cb29sIF9ld2tfdmlld190aWxlZF9zbWFydF9zY3JvbGxzX3Byb2Nlc3MoRXdrX1Zp ZXdfU21hcnRfRGF0YSogc21hcnREYXRhKQogewotICAgIGNvbnN0IEV3a19TY3JvbGxfUmVxdWVz dCogc2Nyb2xsUmVxdWVzdDsKLSAgICBjb25zdCBFd2tfU2Nyb2xsX1JlcXVlc3QqIGVuZE9mU2Ny b2xsUmVxdWVzdDsKLSAgICBzaXplX3QgY291bnQ7Ci0gICAgRXZhc19Db29yZCBjb250ZW50c1dp ZHRoLCBjb250ZW50c0hlaWdodDsKLQotICAgIGV3a19mcmFtZV9jb250ZW50c19zaXplX2dldChz bWFydERhdGEtPm1haW5fZnJhbWUsICZjb250ZW50c1dpZHRoLCAmY29udGVudHNIZWlnaHQpOwot Ci0gICAgc2Nyb2xsUmVxdWVzdCA9IGV3a192aWV3X3Njcm9sbF9yZXF1ZXN0c19nZXQoc21hcnRE YXRhLT5fcHJpdiwgJmNvdW50KTsKLSAgICBlbmRPZlNjcm9sbFJlcXVlc3QgPSBzY3JvbGxSZXF1 ZXN0ICsgY291bnQ7Ci0gICAgZm9yICg7IHNjcm9sbFJlcXVlc3QgPCBlbmRPZlNjcm9sbFJlcXVl c3Q7IHNjcm9sbFJlcXVlc3QrKykKLSAgICAgICAgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfc2Ny b2xsX2Z1bGxfb2Zmc2V0X2FkZChzbWFydERhdGEtPmJhY2tpbmdfc3RvcmUsIHNjcm9sbFJlcXVl c3QtPmR4LCBzY3JvbGxSZXF1ZXN0LT5keSk7CisgICAgY29uc3QgV1RGOjpWZWN0b3I8V2ViQ29y ZTo6SW50U2l6ZT4mIHNjcm9sbE9mZnNldCA9IGV3a192aWV3X3Njcm9sbF9vZmZzZXRzX2dldChz bWFydERhdGEtPl9wcml2KTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHNjcm9sbE9mZnNl dC5zaXplKCk7ICsraSkKKyAgICAgICAgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfc2Nyb2xsX2Z1 bGxfb2Zmc2V0X2FkZChzbWFydERhdGEtPmJhY2tpbmdfc3RvcmUsIHNjcm9sbE9mZnNldFtpXS53 aWR0aCgpLCBzY3JvbGxPZmZzZXRbaV0uaGVpZ2h0KCkpOwogCiAgICAgcmV0dXJuIHRydWU7CiB9 Cg==