100228 2012-10-24 04:24:50 -0700 [EFL][WK2] Move Ewk_View_Private_Data out of ewk_view.cpp 2012-10-24 22:56:46 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 100226 100230 100232 100331 1 cdumez cdumez gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi mikhail.pozdnyakov rakuco tonikitoo webkit.review.bot oldest_to_newest 749526 0 cdumez 2012-10-24 04:24:50 -0700 We should move Ewk_View_Private_Data out of ewk_view.cpp so that we can make it a proper C++ class in the future. WebKit code should interact with the C++ object not with Evas_Object. 749527 1 170359 cdumez 2012-10-24 04:28:29 -0700 Created attachment 170359 Patch 749547 2 170359 gyuyoung.kim 2012-10-24 04:55:12 -0700 Comment on attachment 170359 Patch LGTM 749557 3 170359 webkit.review.bot 2012-10-24 05:02:42 -0700 Comment on attachment 170359 Patch Clearing flags on attachment: 170359 Committed r132337: <http://trac.webkit.org/changeset/132337> 749558 4 webkit.review.bot 2012-10-24 05:02:48 -0700 All reviewed patches have been landed. Closing bug. 170359 2012-10-24 04:28:29 -0700 2012-10-24 05:02:42 -0700 Patch 100228_ewk_view_split.patch text/plain 21863 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwZmQyZDhmLi5mMmRjMTU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUg QEAKKzIwMTItMTAtMjQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4gYW5kIE1pa2hhaWwgUG96ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5j b20+CisKKyAgICAgICAgW0VGTF1bV0syXSBNb3ZlIEV3a19WaWV3X1ByaXZhdGVfRGF0YSBvdXQg b2YgZXdrX3ZpZXcuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDAyMjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBNb3ZlIEV3a19WaWV3X1ByaXZhdGVfRGF0YSBvdXQgb2YgZXdrX3ZpZXcuY3BwIGFu ZAorICAgICAgICByZW5hbWUgaXQgdG8gRXdrVmlld0ltcGwuIFRoaXMgaXMgYSBmaXJzdCBzdGVw IHRvd2FyZHMKKyAgICAgICAgZ2V0dGluZyByaWQgb2YgQydpc20gaW4gRXdrX1ZpZXcuCisKKyAg ICAgICAgSW4gYSBmdXR1cmUsIHdlIHdpbGwgbWFrZSBFd2tWaWV3SW1wbCBhIHByb3BlciBDKysK KyAgICAgICAgY2xhc3MgYW5kIGdldCByaWQgb2YgdGhlIHByaXZhdGUgZXdrX3ZpZXcgQyBBUEkg c28KKyAgICAgICAgdGhhdCBXZWJLaXQgY29kZSBpbnRlcmFjdHMgd2l0aCBFd2tWaWV3SW1wbCBp bnN0ZWFkCisgICAgICAgIG9mIEV2YXNfT2JqZWN0LgorCisgICAgICAgICogUGxhdGZvcm1FZmwu Y21ha2U6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwOiBBZGRl ZC4KKyAgICAgICAgKF9ld2tfdmlld19jb21taXQpOgorICAgICAgICAoX2V3a192aWV3X3ByZWVk aXRfY2hhbmdlZCk6CisgICAgICAgIChfZXdrX3ZpZXdfaW1mX2NvbnRleHRfZGVzdHJveSk6Cisg ICAgICAgIChfZXdrX3ZpZXdfaW1mX2NvbnRleHRfY3JlYXRlKToKKyAgICAgICAgKEV3a1ZpZXdJ bXBsOjpFd2tWaWV3SW1wbCk6CisgICAgICAgIChFd2tWaWV3SW1wbDo6fkV3a1ZpZXdJbXBsKToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5oOiBBZGRlZC4KKyAgICAg ICAgKFdlYktpdCk6CisgICAgICAgIChFd2tWaWV3SW1wbCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfZGVsKToKKyAg ICAgICAgKF9ld2tfdmlld19zbWFydF9hZGQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L2V3a192aWV3Lmg6CisKIDIwMTItMTAtMjMgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhl LmR1bWV6QGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXVtXSzJdIE1ha2UgZmluZCBhbmQgZm9y bSBjbGllbnRzIEMrKyBjbGFzc2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bUVmbC5jbWFrZSBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtlCmluZGV4IDI4YjBm ZDcuLmNlZDNlNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtl CisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtlCkBAIC00Miw2ICs0Miw3IEBA IExJU1QoQVBQRU5EIFdlYktpdDJfU09VUkNFUwogICAgIFVJUHJvY2Vzcy9BUEkvQy9zb3VwL1dL U291cFJlcXVlc3RNYW5hZ2VyLmNwcAogCiAgICAgVUlQcm9jZXNzL0FQSS9lZmwvQmF0dGVyeVBy b3ZpZGVyLmNwcAorICAgIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcAogICAgIFVJ UHJvY2Vzcy9BUEkvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCiAgICAg VUlQcm9jZXNzL0FQSS9lZmwvTmV0d29ya0luZm9Qcm92aWRlci5jcHAKICAgICBVSVByb2Nlc3Mv QVBJL2VmbC9QYWdlQ2xpZW50SW1wbC5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi5mNWM1NjQ2Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwCkBAIC0wLDAgKzEsMTQ0IEBACisvKgorICAgQ29weXJp Z2h0IChDKSAyMDExIFNhbXN1bmcgRWxlY3Ryb25pY3MKKyAgIENvcHlyaWdodCAoQykgMjAxMiBJ bnRlbCBDb3Jwb3JhdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKworICAgIFRoaXMgbGlicmFy eSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyAgICBt b2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1Ymxp YworICAgIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRp b247IGVpdGhlcgorICAgIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0 aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKworICAgIFRoaXMgbGlicmFyeSBpcyBkaXN0cmlidXRl ZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICAgIGJ1dCBXSVRIT1VUIEFO WSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgICAgTUVS Q0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRo ZSBHTlUKKyAgICBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWls cy4KKworICAgIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJy YXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAgICBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsg c2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bworICAgIHRoZSBGcmVl IFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxv b3IsCisgICAgQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisqLworCisjaW5jbHVkZSAiY29u ZmlnLmgiCisjaW5jbHVkZSAiRXdrVmlld0ltcGwuaCIKKworI2luY2x1ZGUgIkVmbFNjcmVlblV0 aWxpdGllcy5oIgorI2luY2x1ZGUgIkZpbmRDbGllbnRFZmwuaCIKKyNpbmNsdWRlICJGb3JtQ2xp ZW50RWZsLmgiCisjaW5jbHVkZSAiUGFnZUNsaWVudEltcGwuaCIKKyNpbmNsdWRlICJQYWdlTG9h ZENsaWVudEVmbC5oIgorI2luY2x1ZGUgIlBhZ2VQb2xpY3lDbGllbnRFZmwuaCIKKyNpbmNsdWRl ICJQYWdlVUlDbGllbnRFZmwuaCIKKyNpbmNsdWRlICJQYWdlVmlld3BvcnRDb250cm9sbGVyLmgi CisjaW5jbHVkZSAiUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5oIgorI2luY2x1ZGUg IlJlc291cmNlTG9hZENsaWVudEVmbC5oIgorI2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgorI2lu Y2x1ZGUgIldlYlBvcHVwTWVudVByb3h5RWZsLmgiCisjaW5jbHVkZSAiZXdrX2JhY2tfZm9yd2Fy ZF9saXN0X3ByaXZhdGUuaCIKKyNpbmNsdWRlICJld2tfY29udGV4dF9wcml2YXRlLmgiCisjaW5j bHVkZSAiZXdrX2Zhdmljb25fZGF0YWJhc2VfcHJpdmF0ZS5oIgorI2luY2x1ZGUgImV3a19wb3B1 cF9tZW51X2l0ZW1fcHJpdmF0ZS5oIgorI2luY2x1ZGUgImV3a19zZXR0aW5nc19wcml2YXRlLmgi CisjaW5jbHVkZSAiZXdrX3ZpZXcuaCIKKyNpbmNsdWRlICJld2tfdmlld19wcml2YXRlLmgiCisj aW5jbHVkZSA8RWNvcmVfRXZhcy5oPgorCit1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKK3VzaW5n IG5hbWVzcGFjZSBXZWJLaXQ7CisKK3N0YXRpYyB2b2lkIF9ld2tfdmlld19jb21taXQodm9pZCog ZGF0YSwgRWNvcmVfSU1GX0NvbnRleHQqLCB2b2lkKiBldmVudEluZm8pCit7CisgICAgRXdrX1Zp ZXdfU21hcnRfRGF0YSogc21hcnREYXRhID0gc3RhdGljX2Nhc3Q8RXdrX1ZpZXdfU21hcnRfRGF0 YSo+KGRhdGEpOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHBy aXYpOworICAgIGlmICghZXZlbnRJbmZvIHx8ICFwcml2LT5pc0ltZkZvY3VzZWQpCisgICAgICAg IHJldHVybjsKKworICAgIHByaXYtPnBhZ2VQcm94eS0+Y29uZmlybUNvbXBvc2l0aW9uKFN0cmlu Zzo6ZnJvbVVURjgoc3RhdGljX2Nhc3Q8Y2hhcio+KGV2ZW50SW5mbykpKTsKK30KKworc3RhdGlj IHZvaWQgX2V3a192aWV3X3ByZWVkaXRfY2hhbmdlZCh2b2lkKiBkYXRhLCBFY29yZV9JTUZfQ29u dGV4dCogY29udGV4dCwgdm9pZCopCit7CisgICAgRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnRE YXRhID0gc3RhdGljX2Nhc3Q8RXdrX1ZpZXdfU21hcnRfRGF0YSo+KGRhdGEpOworICAgIEVXS19W SUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYpOworCisgICAgaWYgKCFwcml2 LT5wYWdlUHJveHktPmZvY3VzZWRGcmFtZSgpIHx8ICFwcml2LT5pc0ltZkZvY3VzZWQpCisgICAg ICAgIHJldHVybjsKKworICAgIGNoYXIqIGJ1ZmZlciA9IDA7CisgICAgZWNvcmVfaW1mX2NvbnRl eHRfcHJlZWRpdF9zdHJpbmdfZ2V0KGNvbnRleHQsICZidWZmZXIsIDApOworICAgIGlmICghYnVm ZmVyKQorICAgICAgICByZXR1cm47CisKKyAgICBTdHJpbmcgcHJlZWRpdFN0cmluZyA9IFN0cmlu Zzo6ZnJvbVVURjgoYnVmZmVyKTsKKyAgICBWZWN0b3I8Q29tcG9zaXRpb25VbmRlcmxpbmU+IHVu ZGVybGluZXM7CisgICAgdW5kZXJsaW5lcy5hcHBlbmQoQ29tcG9zaXRpb25VbmRlcmxpbmUoMCwg cHJlZWRpdFN0cmluZy5sZW5ndGgoKSwgQ29sb3IoMCwgMCwgMCksIGZhbHNlKSk7CisgICAgcHJp di0+cGFnZVByb3h5LT5zZXRDb21wb3NpdGlvbihwcmVlZGl0U3RyaW5nLCB1bmRlcmxpbmVzLCAw KTsKK30KKworc3RhdGljIHZvaWQgX2V3a192aWV3X2ltZl9jb250ZXh0X2Rlc3Ryb3koRWNvcmVf SU1GX0NvbnRleHQqIGltZkNvbnRleHQpCit7CisgICAgaWYgKCFpbWZDb250ZXh0KQorICAgICAg ICByZXR1cm47CisKKyAgICBlY29yZV9pbWZfY29udGV4dF9ldmVudF9jYWxsYmFja19kZWwoaW1m Q29udGV4dCwgRUNPUkVfSU1GX0NBTExCQUNLX1BSRUVESVRfQ0hBTkdFRCwgX2V3a192aWV3X3By ZWVkaXRfY2hhbmdlZCk7CisgICAgZWNvcmVfaW1mX2NvbnRleHRfZXZlbnRfY2FsbGJhY2tfZGVs KGltZkNvbnRleHQsIEVDT1JFX0lNRl9DQUxMQkFDS19DT01NSVQsIF9ld2tfdmlld19jb21taXQp OworICAgIGVjb3JlX2ltZl9jb250ZXh0X2RlbChpbWZDb250ZXh0KTsKK30KKworc3RhdGljIEVj b3JlX0lNRl9Db250ZXh0KiBfZXdrX3ZpZXdfaW1mX2NvbnRleHRfY3JlYXRlKEV3a19WaWV3X1Nt YXJ0X0RhdGEqIHNtYXJ0RGF0YSkKK3sKKyAgICBjb25zdCBjaGFyKiBkZWZhdWx0Q29udGV4dElE ID0gZWNvcmVfaW1mX2NvbnRleHRfZGVmYXVsdF9pZF9nZXQoKTsKKyAgICBpZiAoIWRlZmF1bHRD b250ZXh0SUQpCisgICAgICAgIHJldHVybiAwOworCisgICAgRWNvcmVfSU1GX0NvbnRleHQqIGlt ZkNvbnRleHQgPSBlY29yZV9pbWZfY29udGV4dF9hZGQoZGVmYXVsdENvbnRleHRJRCk7CisgICAg aWYgKCFpbWZDb250ZXh0KQorICAgICAgICByZXR1cm4gMDsKKworICAgIGVjb3JlX2ltZl9jb250 ZXh0X2V2ZW50X2NhbGxiYWNrX2FkZChpbWZDb250ZXh0LCBFQ09SRV9JTUZfQ0FMTEJBQ0tfUFJF RURJVF9DSEFOR0VELCBfZXdrX3ZpZXdfcHJlZWRpdF9jaGFuZ2VkLCBzbWFydERhdGEpOworICAg IGVjb3JlX2ltZl9jb250ZXh0X2V2ZW50X2NhbGxiYWNrX2FkZChpbWZDb250ZXh0LCBFQ09SRV9J TUZfQ0FMTEJBQ0tfQ09NTUlULCBfZXdrX3ZpZXdfY29tbWl0LCBzbWFydERhdGEpOworCisgICAg RWNvcmVfRXZhcyogZWNvcmVFdmFzID0gZWNvcmVfZXZhc19lY29yZV9ldmFzX2dldChzbWFydERh dGEtPmJhc2UuZXZhcyk7CisgICAgZWNvcmVfaW1mX2NvbnRleHRfY2xpZW50X3dpbmRvd19zZXQo aW1mQ29udGV4dCwgKHZvaWQqKWVjb3JlX2V2YXNfd2luZG93X2dldChlY29yZUV2YXMpKTsKKyAg ICBlY29yZV9pbWZfY29udGV4dF9jbGllbnRfY2FudmFzX3NldChpbWZDb250ZXh0LCBzbWFydERh dGEtPmJhc2UuZXZhcyk7CisKKyAgICByZXR1cm4gaW1mQ29udGV4dDsKK30KKworRXdrVmlld0lt cGw6OkV3a1ZpZXdJbXBsKEV2YXNfT2JqZWN0KiB2aWV3KQorICAgIDogYXJlTW91c2VFdmVudHNF bmFibGVkKGZhbHNlKQorI2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpCisgICAgLCBhcmVUb3VjaEV2 ZW50c0VuYWJsZWQoZmFsc2UpCisjZW5kaWYKKyAgICAsIHBvcHVwTWVudVByb3h5KDApCisgICAg LCBwb3B1cE1lbnVJdGVtcygwKQorICAgICwgaW1mQ29udGV4dCgwKQorICAgICwgaXNJbWZGb2N1 c2VkKGZhbHNlKQorI2lmZGVmIEhBVkVfRUNPUkVfWAorICAgICwgaXNVc2luZ0Vjb3JlWChmYWxz ZSkKKyNlbmRpZgorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAgICAsIGV2YXNH bCgwKQorICAgICwgZXZhc0dsQ29udGV4dCgwKQorICAgICwgZXZhc0dsU3VyZmFjZSgwKQorI2Vu ZGlmCisgICAgLCBtX3ZpZXcodmlldykKK3sKKyAgICBBU1NFUlQodmlldyk7CisgICAgRXdrX1Zp ZXdfU21hcnRfRGF0YSogc21hcnREYXRhID0gc3RhdGljX2Nhc3Q8RXdrX1ZpZXdfU21hcnRfRGF0 YSo+KGV2YXNfb2JqZWN0X3NtYXJ0X2RhdGFfZ2V0KHZpZXcpKTsKKyAgICBBU1NFUlQoc21hcnRE YXRhKTsKKworICAgIGltZkNvbnRleHQgPSBfZXdrX3ZpZXdfaW1mX2NvbnRleHRfY3JlYXRlKHNt YXJ0RGF0YSk7CisKKyNpZmRlZiBIQVZFX0VDT1JFX1gKKyAgICBpc1VzaW5nRWNvcmVYID0gV2Vi Q29yZTo6aXNVc2luZ0Vjb3JlWChzbWFydERhdGEtPmJhc2UuZXZhcyk7CisjZW5kaWYKK30KKwor RXdrVmlld0ltcGw6On5Fd2tWaWV3SW1wbCgpCit7CisgICAgX2V3a192aWV3X2ltZl9jb250ZXh0 X2Rlc3Ryb3koaW1mQ29udGV4dCk7CisKKyAgICB2b2lkKiBpdGVtOworICAgIEVJTkFfTElTVF9G UkVFKHBvcHVwTWVudUl0ZW1zLCBpdGVtKQorICAgICAgICBkZWxldGUgc3RhdGljX2Nhc3Q8RXdr X1BvcHVwX01lbnVfSXRlbSo+KGl0ZW0pOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uOWE4MGViNgotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL0V3a1ZpZXdJbXBsLmgKQEAgLTAsMCArMSwxMjIgQEAKKy8qCisgICBDb3B5cmlnaHQg KEMpIDIwMTEgU2Ftc3VuZyBFbGVjdHJvbmljcworICAgQ29weXJpZ2h0IChDKSAyMDEyIEludGVs IENvcnBvcmF0aW9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorCisgICAgVGhpcyBsaWJyYXJ5IGlz IGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorICAgIG1vZGlm eSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCisg ICAgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsg ZWl0aGVyCisgICAgdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRpb24p IGFueSBsYXRlciB2ZXJzaW9uLgorCisgICAgVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGlu IHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgICAgYnV0IFdJVEhPVVQgQU5ZIFdB UlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyAgICBNRVJDSEFO VEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdO VQorICAgIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgor CisgICAgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExpYnJhcnkg R2VuZXJhbCBQdWJsaWMgTGljZW5zZQorICAgIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUg dGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdyaXRlIHRvCisgICAgdGhlIEZyZWUgU29m dHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwK KyAgICBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KKyovCisKKyNpZm5kZWYgRXdrVmlld0lt cGxfaAorI2RlZmluZSBFd2tWaWV3SW1wbF9oCisKKyNpbmNsdWRlICJSZWZQdHJFZmwuaCIKKyNp bmNsdWRlICJXS0VpbmFTaGFyZWRTdHJpbmcuaCIKKyNpbmNsdWRlICJXS1JldGFpblB0ci5oIgor I2luY2x1ZGUgPEVjb3JlX0lNRi5oPgorI2luY2x1ZGUgPEVjb3JlX0lNRl9FdmFzLmg+CisjaW5j bHVkZSA8RXZhcy5oPgorI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KKyNpbmNsdWRlIDx3dGYvUmVm UHRyLmg+CisKKyNkZWZpbmUgRVdLX1ZJRVdfUFJJVl9HRVQoc21hcnREYXRhLCBwcml2KSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgRXdrVmlld0ltcGwqIHByaXYg PSBzbWFydERhdGEtPnByaXYKKworI2RlZmluZSBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4o c21hcnREYXRhLCBwcml2LCAuLi4pICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICBpZiAoIXNt YXJ0RGF0YSkgeyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBcCisgICAgICAgIEVJTkFfTE9HX0NSSVQoInNtYXJ0IGRhdGEgaXMgbnVsbCIp OyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICByZXR1cm4gX19W QV9BUkdTX187ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFwKKyAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgRVdLX1ZJRVdfUFJJVl9HRVQoc21h cnREYXRhLCBwcml2KTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAor ICAgIGRvIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgaWYgKCFwcml2KSB7ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAg ICAgICBFSU5BX0xPR19DUklUKCJubyBwcml2YXRlIGRhdGEgZm9yIG9iamVjdCAlcCAoJXMpIiwg ICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgICAgIHNtYXJ0RGF0YS0+c2VsZiwgZXZhc19v YmplY3RfdHlwZV9nZXQoc21hcnREYXRhLT5zZWxmKSk7ICAgICAgIFwKKyAgICAgICAgICAgIHJl dHVybiBfX1ZBX0FSR1NfXzsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCisgICAgICAgIH0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgIH0gd2hpbGUgKDApCisKK25h bWVzcGFjZSBXZWJLaXQgeworY2xhc3MgRmluZENsaWVudEVmbDsKK2NsYXNzIEZvcm1DbGllbnRF Zmw7CitjbGFzcyBQYWdlQ2xpZW50SW1wbDsKK2NsYXNzIFBhZ2VMb2FkQ2xpZW50RWZsOworY2xh c3MgUGFnZVBvbGljeUNsaWVudEVmbDsKK2NsYXNzIFBhZ2VVSUNsaWVudEVmbDsKK2NsYXNzIFBh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw7CitjbGFzcyBQYWdlVmlld3BvcnRDb250cm9s bGVyOworY2xhc3MgUmVzb3VyY2VMb2FkQ2xpZW50RWZsOworY2xhc3MgV2ViUGFnZVByb3h5Owor Y2xhc3MgV2ViUG9wdXBNZW51UHJveHlFZmw7Cit9CisKK2NsYXNzIEV3a19CYWNrX0ZvcndhcmRf TGlzdDsKK2NsYXNzIEV3a19Db250ZXh0OworY2xhc3MgRXdrX1NldHRpbmdzOworCitjbGFzcyBF d2tWaWV3SW1wbCB7CitwdWJsaWM6CisgICAgZXhwbGljaXQgRXdrVmlld0ltcGwoRXZhc19PYmpl Y3QqIHZpZXcpOworICAgIH5Fd2tWaWV3SW1wbCgpOworCisgICAgT3duUHRyPFdlYktpdDo6UGFn ZUNsaWVudEltcGw+IHBhZ2VDbGllbnQ7CisjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCisg ICAgT3duUHRyPFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbD4gcGFnZVZp ZXdwb3J0Q29udHJvbGxlckNsaWVudDsKKyAgICBPd25QdHI8V2ViS2l0OjpQYWdlVmlld3BvcnRD b250cm9sbGVyPiBwYWdlVmlld3BvcnRDb250cm9sbGVyOworI2VuZGlmCisgICAgUmVmUHRyPFdl YktpdDo6V2ViUGFnZVByb3h5PiBwYWdlUHJveHk7CisgICAgT3duUHRyPFdlYktpdDo6UGFnZUxv YWRDbGllbnRFZmw+IHBhZ2VMb2FkQ2xpZW50OworICAgIE93blB0cjxXZWJLaXQ6OlBhZ2VQb2xp Y3lDbGllbnRFZmw+IHBhZ2VQb2xpY3lDbGllbnQ7CisgICAgT3duUHRyPFdlYktpdDo6UGFnZVVJ Q2xpZW50RWZsPiBwYWdlVUlDbGllbnQ7CisgICAgT3duUHRyPFdlYktpdDo6UmVzb3VyY2VMb2Fk Q2xpZW50RWZsPiByZXNvdXJjZUxvYWRDbGllbnQ7CisgICAgT3duUHRyPFdlYktpdDo6RmluZENs aWVudEVmbD4gZmluZENsaWVudDsKKyAgICBPd25QdHI8V2ViS2l0OjpGb3JtQ2xpZW50RWZsPiBm b3JtQ2xpZW50OworCisgICAgV0tFaW5hU2hhcmVkU3RyaW5nIHVybDsKKyAgICBXS0VpbmFTaGFy ZWRTdHJpbmcgdGl0bGU7CisgICAgV0tFaW5hU2hhcmVkU3RyaW5nIHRoZW1lOworICAgIFdLRWlu YVNoYXJlZFN0cmluZyBjdXN0b21FbmNvZGluZzsKKyAgICBXS0VpbmFTaGFyZWRTdHJpbmcgY3Vy c29yR3JvdXA7CisgICAgV0tFaW5hU2hhcmVkU3RyaW5nIGZhdmljb25VUkw7CisgICAgUmVmUHRy PEV2YXNfT2JqZWN0PiBjdXJzb3JPYmplY3Q7CisgICAgT3duUHRyPEV3a19CYWNrX0ZvcndhcmRf TGlzdD4gYmFja0ZvcndhcmRMaXN0OworICAgIE93blB0cjxFd2tfU2V0dGluZ3M+IHNldHRpbmdz OworICAgIGJvb2wgYXJlTW91c2VFdmVudHNFbmFibGVkOworICAgIFdLUmV0YWluUHRyPFdLQ29s b3JQaWNrZXJSZXN1bHRMaXN0ZW5lclJlZj4gY29sb3JQaWNrZXJSZXN1bHRMaXN0ZW5lcjsKKyAg ICBSZWZQdHI8RXdrX0NvbnRleHQ+IGNvbnRleHQ7CisjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykK KyAgICBib29sIGFyZVRvdWNoRXZlbnRzRW5hYmxlZDsKKyNlbmRpZgorCisgICAgV2ViS2l0OjpX ZWJQb3B1cE1lbnVQcm94eUVmbCogcG9wdXBNZW51UHJveHk7CisgICAgRWluYV9MaXN0KiBwb3B1 cE1lbnVJdGVtczsKKworICAgIEVjb3JlX0lNRl9Db250ZXh0KiBpbWZDb250ZXh0OworICAgIGJv b2wgaXNJbWZGb2N1c2VkOworCisjaWZkZWYgSEFWRV9FQ09SRV9YCisgICAgYm9vbCBpc1VzaW5n RWNvcmVYOworI2VuZGlmCisKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAg RXZhc19HTCogZXZhc0dsOworICAgIEV2YXNfR0xfQ29udGV4dCogZXZhc0dsQ29udGV4dDsKKyAg ICBFdmFzX0dMX1N1cmZhY2UqIGV2YXNHbFN1cmZhY2U7CisjZW5kaWYKKworcHJpdmF0ZToKKyAg ICBFdmFzX09iamVjdCogbV92aWV3OworfTsKKworI2VuZGlmIC8vIEV3a1ZpZXdJbXBsX2gKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRleCA0NzJh Njc5Li5mZDdjNTAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X3ZpZXcuY3BwCkBAIC0yMSw2ICsyMSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVk ZSAiZXdrX3ZpZXcuaCIKIAorI2luY2x1ZGUgIkV3a1ZpZXdJbXBsLmgiCiAjaW5jbHVkZSAiRmlu ZENsaWVudEVmbC5oIgogI2luY2x1ZGUgIkZvcm1DbGllbnRFZmwuaCIKICNpbmNsdWRlICJOYXRp dmVXZWJLZXlib2FyZEV2ZW50LmgiCkBAIC05MCwxMCArOTEsNiBAQCBzdGF0aWMgY29uc3QgY2hh ciBFV0tfVklFV19UWVBFX1NUUltdID0gIkVXSzJfVmlldyI7CiAKIHN0YXRpYyBjb25zdCBpbnQg ZGVmYXVsdEN1cnNvclNpemUgPSAxNjsKIAotc3RhdGljIHZvaWQgX2V3a192aWV3X29uX2Zhdmlj b25fY2hhbmdlZChjb25zdCBjaGFyKiBwYWdlVVJMLCB2b2lkKiBldmVudEluZm8pOwotc3RhdGlj IEVjb3JlX0lNRl9Db250ZXh0KiBfZXdrX3ZpZXdfaW1mX2NvbnRleHRfY3JlYXRlKEV3a19WaWV3 X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSk7Ci1zdGF0aWMgdm9pZCBfZXdrX3ZpZXdfaW1mX2NvbnRl eHRfZGVzdHJveShFY29yZV9JTUZfQ29udGV4dCogaW1mQ29udGV4dCk7Ci0KIHR5cGVkZWYgSGFz aE1hcDxjb25zdCBXZWJQYWdlUHJveHkqLCBjb25zdCBFdmFzX09iamVjdCo+IFBhZ2VWaWV3TWFw OwogCiBzdGF0aWMgaW5saW5lIFBhZ2VWaWV3TWFwJiBwYWdlVmlld01hcCgpCkBAIC0xMTgsODUg KzExNSw2IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCByZW1vdmVGcm9tUGFnZVZpZXdNYXAoY29uc3Qg RXZhc19PYmplY3QqIGV3a1ZpZXcpCiAgICAgcGFnZVZpZXdNYXAoKS5yZW1vdmUoZXdrX3ZpZXdf cGFnZV9nZXQoZXdrVmlldykpOwogfQogCi1zdHJ1Y3QgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIHsK LSAgICBPd25QdHI8UGFnZUNsaWVudEltcGw+IHBhZ2VDbGllbnQ7Ci0jaWYgVVNFKFRJTEVEX0JB Q0tJTkdfU1RPUkUpCi0gICAgT3duUHRyPFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw+ IHBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQ7Ci0gICAgT3duUHRyPFBhZ2VWaWV3cG9ydENv bnRyb2xsZXI+IHBhZ2VWaWV3cG9ydENvbnRyb2xsZXI7Ci0jZW5kaWYKLSAgICBSZWZQdHI8V2Vi UGFnZVByb3h5PiBwYWdlUHJveHk7Ci0gICAgT3duUHRyPFBhZ2VMb2FkQ2xpZW50RWZsPiBwYWdl TG9hZENsaWVudDsKLSAgICBPd25QdHI8UGFnZVBvbGljeUNsaWVudEVmbD4gcGFnZVBvbGljeUNs aWVudDsKLSAgICBPd25QdHI8UGFnZVVJQ2xpZW50RWZsPiBwYWdlVUlDbGllbnQ7Ci0gICAgT3du UHRyPFJlc291cmNlTG9hZENsaWVudEVmbD4gcmVzb3VyY2VMb2FkQ2xpZW50OwotICAgIE93blB0 cjxGaW5kQ2xpZW50RWZsPiBmaW5kQ2xpZW50OwotICAgIE93blB0cjxGb3JtQ2xpZW50RWZsPiBm b3JtQ2xpZW50OwotCi0gICAgV0tFaW5hU2hhcmVkU3RyaW5nIHVybDsKLSAgICBXS0VpbmFTaGFy ZWRTdHJpbmcgdGl0bGU7Ci0gICAgV0tFaW5hU2hhcmVkU3RyaW5nIHRoZW1lOwotICAgIFdLRWlu YVNoYXJlZFN0cmluZyBjdXN0b21FbmNvZGluZzsKLSAgICBXS0VpbmFTaGFyZWRTdHJpbmcgY3Vy c29yR3JvdXA7Ci0gICAgV0tFaW5hU2hhcmVkU3RyaW5nIGZhdmljb25VUkw7Ci0gICAgUmVmUHRy PEV2YXNfT2JqZWN0PiBjdXJzb3JPYmplY3Q7Ci0gICAgT3duUHRyPEV3a19CYWNrX0ZvcndhcmRf TGlzdD4gYmFja0ZvcndhcmRMaXN0OwotICAgIE93blB0cjxFd2tfU2V0dGluZ3M+IHNldHRpbmdz OwotICAgIGJvb2wgYXJlTW91c2VFdmVudHNFbmFibGVkOwotICAgIFdLUmV0YWluUHRyPFdLQ29s b3JQaWNrZXJSZXN1bHRMaXN0ZW5lclJlZj4gY29sb3JQaWNrZXJSZXN1bHRMaXN0ZW5lcjsKLSAg ICBSZWZQdHI8RXdrX0NvbnRleHQ+IGNvbnRleHQ7Ci0jaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykK LSAgICBib29sIGFyZVRvdWNoRXZlbnRzRW5hYmxlZDsKLSNlbmRpZgotCi0gICAgV2ViUG9wdXBN ZW51UHJveHlFZmwqIHBvcHVwTWVudVByb3h5OwotICAgIEVpbmFfTGlzdCogcG9wdXBNZW51SXRl bXM7Ci0KLSAgICBFY29yZV9JTUZfQ29udGV4dCogaW1mQ29udGV4dDsKLSAgICBib29sIGlzSW1m Rm9jdXNlZDsKLQotI2lmZGVmIEhBVkVfRUNPUkVfWAotICAgIGJvb2wgaXNVc2luZ0Vjb3JlWDsK LSNlbmRpZgotCi0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgIEV2YXNfR0wq IGV2YXNHbDsKLSAgICBFdmFzX0dMX0NvbnRleHQqIGV2YXNHbENvbnRleHQ7Ci0gICAgRXZhc19H TF9TdXJmYWNlKiBldmFzR2xTdXJmYWNlOwotI2VuZGlmCi0KLSAgICBFd2tfVmlld19Qcml2YXRl X0RhdGEoKQotICAgICAgICA6IGFyZU1vdXNlRXZlbnRzRW5hYmxlZChmYWxzZSkKLSNpZiBFTkFC TEUoVE9VQ0hfRVZFTlRTKQotICAgICAgICAsIGFyZVRvdWNoRXZlbnRzRW5hYmxlZChmYWxzZSkK LSNlbmRpZgotICAgICAgICAsIHBvcHVwTWVudVByb3h5KDApCi0gICAgICAgICwgcG9wdXBNZW51 SXRlbXMoMCkKLSAgICAgICAgLCBpbWZDb250ZXh0KDApCi0gICAgICAgICwgaXNJbWZGb2N1c2Vk KGZhbHNlKQotI2lmZGVmIEhBVkVfRUNPUkVfWAotICAgICAgICAsIGlzVXNpbmdFY29yZVgoZmFs c2UpCi0jZW5kaWYKLSNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgICAgICwg ZXZhc0dsKDApCi0gICAgICAgICwgZXZhc0dsQ29udGV4dCgwKQotICAgICAgICAsIGV2YXNHbFN1 cmZhY2UoMCkKLSNlbmRpZgotICAgIHsgfQotCi0gICAgfkV3a19WaWV3X1ByaXZhdGVfRGF0YSgp Ci0gICAgewotICAgICAgICBfZXdrX3ZpZXdfaW1mX2NvbnRleHRfZGVzdHJveShpbWZDb250ZXh0 KTsKLQotICAgICAgICAvKiBVbnJlZ2lzdGVyIGljb24gY2hhbmdlIGNhbGxiYWNrICovCi0gICAg ICAgIEV3a19GYXZpY29uX0RhdGFiYXNlKiBpY29uRGF0YWJhc2UgPSBjb250ZXh0LT5mYXZpY29u RGF0YWJhc2UoKTsKLSAgICAgICAgaWNvbkRhdGFiYXNlLT51bndhdGNoQ2hhbmdlcyhfZXdrX3Zp ZXdfb25fZmF2aWNvbl9jaGFuZ2VkKTsKLQotICAgICAgICB2b2lkKiBpdGVtOwotICAgICAgICBF SU5BX0xJU1RfRlJFRShwb3B1cE1lbnVJdGVtcywgaXRlbSkKLSAgICAgICAgICAgIGRlbGV0ZSBz dGF0aWNfY2FzdDxFd2tfUG9wdXBfTWVudV9JdGVtKj4oaXRlbSk7Ci0gICAgfQotfTsKLQogI2Rl ZmluZSBFV0tfVklFV19UWVBFX0NIRUNLKGV3a1ZpZXcsIHJlc3VsdCkgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFwKICAgICBib29sIHJlc3VsdCA9IHRydWU7ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgZG8geyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXApAQCAtMjQwLDIzICsxNTgsNiBAQCBzdHJ1Y3QgRXdrX1ZpZXdfUHJpdmF0 ZV9EYXRhIHsKICAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgfSB3aGlsZSAoMCkKIAotI2Rl ZmluZSBFV0tfVklFV19QUklWX0dFVChzbWFydERhdGEsIHByaXYpICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFwKLSAgICBFd2tfVmlld19Qcml2YXRlX0RhdGEqIHByaXYgPSBz bWFydERhdGEtPnByaXYKLQotI2RlZmluZSBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21h cnREYXRhLCBwcml2LCAuLi4pICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICBpZiAoIXNtYXJ0 RGF0YSkgeyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCi0gICAgICAgIEVJTkFfTE9HX0NSSVQoInNtYXJ0IGRhdGEgaXMgbnVsbCIpOyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICByZXR1cm4gX19WQV9B UkdTX187ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKLSAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgRVdLX1ZJRVdfUFJJVl9HRVQoc21hcnRE YXRhLCBwcml2KTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAg IGRvIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgaWYgKCFwcml2KSB7ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgICAg ICBFSU5BX0xPR19DUklUKCJubyBwcml2YXRlIGRhdGEgZm9yIG9iamVjdCAlcCAoJXMpIiwgICAg ICAgICAgICAgICAgXAotICAgICAgICAgICAgICAgICAgICAgc21hcnREYXRhLT5zZWxmLCBldmFz X29iamVjdF90eXBlX2dldChzbWFydERhdGEtPnNlbGYpKTsgIFwKLSAgICAgICAgICAgIHJldHVy biBfX1ZBX0FSR1NfXzsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcCi0gICAgICAgIH0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgIH0gd2hpbGUgKDApCi0KIHN0YXRp YyB2b2lkIF9ld2tfdmlld19zbWFydF9jaGFuZ2VkKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0 RGF0YSkKIHsKICAgICBpZiAoc21hcnREYXRhLT5jaGFuZ2VkLmFueSkKQEAgLTUyMyw1NiArNDI0 LDE0IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19vbl90b3VjaF9tb3ZlKHZvaWQqIC8qIGRhdGEg Ki8sIEV2YXMqIC8qIGNhbnZhcyAqLywgRXZhc19PCiB9CiAjZW5kaWYKIAotc3RhdGljIHZvaWQg X2V3a192aWV3X3ByZWVkaXRfY2hhbmdlZCh2b2lkKiBkYXRhLCBFY29yZV9JTUZfQ29udGV4dCog Y29udGV4dCwgdm9pZCopCi17Ci0gICAgRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhID0g c3RhdGljX2Nhc3Q8RXdrX1ZpZXdfU21hcnRfRGF0YSo+KGRhdGEpOwotICAgIEVXS19WSUVXX1BS SVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYpOwotCi0gICAgaWYgKCFwcml2LT5wYWdl UHJveHktPmZvY3VzZWRGcmFtZSgpIHx8ICFwcml2LT5pc0ltZkZvY3VzZWQpCi0gICAgICAgIHJl dHVybjsKLQotICAgIGNoYXIqIGJ1ZmZlciA9IDA7Ci0gICAgZWNvcmVfaW1mX2NvbnRleHRfcHJl ZWRpdF9zdHJpbmdfZ2V0KGNvbnRleHQsICZidWZmZXIsIDApOwotICAgIGlmICghYnVmZmVyKQot ICAgICAgICByZXR1cm47Ci0KLSAgICBTdHJpbmcgcHJlZWRpdFN0cmluZyA9IFN0cmluZzo6ZnJv bVVURjgoYnVmZmVyKTsKLSAgICBWZWN0b3I8Q29tcG9zaXRpb25VbmRlcmxpbmU+IHVuZGVybGlu ZXM7Ci0gICAgdW5kZXJsaW5lcy5hcHBlbmQoQ29tcG9zaXRpb25VbmRlcmxpbmUoMCwgcHJlZWRp dFN0cmluZy5sZW5ndGgoKSwgQ29sb3IoMCwgMCwgMCksIGZhbHNlKSk7Ci0gICAgcHJpdi0+cGFn ZVByb3h5LT5zZXRDb21wb3NpdGlvbihwcmVlZGl0U3RyaW5nLCB1bmRlcmxpbmVzLCAwKTsKLX0K LQotc3RhdGljIHZvaWQgX2V3a192aWV3X2NvbW1pdCh2b2lkKiBkYXRhLCBFY29yZV9JTUZfQ29u dGV4dCosIHZvaWQqIGV2ZW50SW5mbykKLXsKLSAgICBFd2tfVmlld19TbWFydF9EYXRhKiBzbWFy dERhdGEgPSBzdGF0aWNfY2FzdDxFd2tfVmlld19TbWFydF9EYXRhKj4oZGF0YSk7Ci0gICAgRVdL X1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdik7Ci0gICAgaWYgKCFldmVu dEluZm8gfHwgIXByaXYtPmlzSW1mRm9jdXNlZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgcHJp di0+cGFnZVByb3h5LT5jb25maXJtQ29tcG9zaXRpb24oU3RyaW5nOjpmcm9tVVRGOChzdGF0aWNf Y2FzdDxjaGFyKj4oZXZlbnRJbmZvKSkpOwotfQotCiBzdGF0aWMgRXZhc19TbWFydF9DbGFzcyBn X3BhcmVudFNtYXJ0Q2xhc3MgPSBFVkFTX1NNQVJUX0NMQVNTX0lOSVRfTlVMTDsKIAotc3RhdGlj IEV3a19WaWV3X1ByaXZhdGVfRGF0YSogX2V3a192aWV3X3ByaXZfbmV3KEV3a19WaWV3X1NtYXJ0 X0RhdGEqIHNtYXJ0RGF0YSkKK3N0YXRpYyB2b2lkIF9ld2tfdmlld19wcml2X2RlbChFd2tWaWV3 SW1wbCogcHJpdikKIHsKLSAgICBFd2tfVmlld19Qcml2YXRlX0RhdGEqIHByaXYgPSBuZXcgRXdr X1ZpZXdfUHJpdmF0ZV9EYXRhOwotICAgIGlmICghcHJpdikgewotICAgICAgICBFSU5BX0xPR19D UklUKCJjb3VsZCBub3QgYWxsb2NhdGUgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIik7Ci0gICAgICAg IHJldHVybiAwOwotICAgIH0KLQotICAgIHByaXYtPmltZkNvbnRleHQgPSBfZXdrX3ZpZXdfaW1m X2NvbnRleHRfY3JlYXRlKHNtYXJ0RGF0YSk7Ci0KLSNpZmRlZiBIQVZFX0VDT1JFX1gKLSAgICBw cml2LT5pc1VzaW5nRWNvcmVYID0gV2ViQ29yZTo6aXNVc2luZ0Vjb3JlWChzbWFydERhdGEtPmJh c2UuZXZhcyk7Ci0jZW5kaWYKLQotICAgIHJldHVybiBwcml2OwotfQorICAgIC8qIFVucmVnaXN0 ZXIgaWNvbiBjaGFuZ2UgY2FsbGJhY2sgKi8KKyAgICBFd2tfRmF2aWNvbl9EYXRhYmFzZSogaWNv bkRhdGFiYXNlID0gcHJpdi0+Y29udGV4dC0+ZmF2aWNvbkRhdGFiYXNlKCk7CisgICAgaWNvbkRh dGFiYXNlLT51bndhdGNoQ2hhbmdlcyhfZXdrX3ZpZXdfb25fZmF2aWNvbl9jaGFuZ2VkKTsKIAot c3RhdGljIHZvaWQgX2V3a192aWV3X3ByaXZfZGVsKEV3a19WaWV3X1ByaXZhdGVfRGF0YSogcHJp dikKLXsKICAgICBkZWxldGUgcHJpdjsKIH0KIApAQCAtNTk3LDkgKzQ1Niw5IEBAIHN0YXRpYyB2 b2lkIF9ld2tfdmlld19zbWFydF9hZGQoRXZhc19PYmplY3QqIGV3a1ZpZXcpCiAKICAgICBnX3Bh cmVudFNtYXJ0Q2xhc3MuYWRkKGV3a1ZpZXcpOwogCi0gICAgc21hcnREYXRhLT5wcml2ID0gX2V3 a192aWV3X3ByaXZfbmV3KHNtYXJ0RGF0YSk7CisgICAgc21hcnREYXRhLT5wcml2ID0gbmV3IEV3 a1ZpZXdJbXBsKGV3a1ZpZXcpOwogICAgIGlmICghc21hcnREYXRhLT5wcml2KSB7Ci0gICAgICAg IEVJTkFfTE9HX0NSSVQoImNvdWxkIG5vdCBhbGxvY2F0ZSBFd2tfVmlld19Qcml2YXRlX0RhdGEi KTsKKyAgICAgICAgRUlOQV9MT0dfQ1JJVCgiY291bGQgbm90IGFsbG9jYXRlIEV3a1ZpZXdJbXBs Iik7CiAgICAgICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2RhdGFfc2V0KGV3a1ZpZXcsIDApOwogICAg ICAgICBmcmVlKHNtYXJ0RGF0YSk7CiAgICAgICAgIHJldHVybjsKQEAgLTEyMDYsMzYgKzEwNjUs NiBAQCB2b2lkIGV3a192aWV3X3RleHRfZm91bmQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIHVuc2ln bmVkIGludCBtYXRjaENvdW50KQogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwo ZXdrVmlldywgInRleHQsZm91bmQiLCAmbWF0Y2hDb3VudCk7CiB9CiAKLXN0YXRpYyBFY29yZV9J TUZfQ29udGV4dCogX2V3a192aWV3X2ltZl9jb250ZXh0X2NyZWF0ZShFd2tfVmlld19TbWFydF9E YXRhKiBzbWFydERhdGEpCi17Ci0gICAgY29uc3QgY2hhciogZGVmYXVsdENvbnRleHRJRCA9IGVj b3JlX2ltZl9jb250ZXh0X2RlZmF1bHRfaWRfZ2V0KCk7Ci0gICAgaWYgKCFkZWZhdWx0Q29udGV4 dElEKQotICAgICAgICByZXR1cm4gMDsKLQotICAgIEVjb3JlX0lNRl9Db250ZXh0KiBpbWZDb250 ZXh0ID0gZWNvcmVfaW1mX2NvbnRleHRfYWRkKGRlZmF1bHRDb250ZXh0SUQpOwotICAgIGlmICgh aW1mQ29udGV4dCkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBlY29yZV9pbWZfY29udGV4dF9l dmVudF9jYWxsYmFja19hZGQoaW1mQ29udGV4dCwgRUNPUkVfSU1GX0NBTExCQUNLX1BSRUVESVRf Q0hBTkdFRCwgX2V3a192aWV3X3ByZWVkaXRfY2hhbmdlZCwgc21hcnREYXRhKTsKLSAgICBlY29y ZV9pbWZfY29udGV4dF9ldmVudF9jYWxsYmFja19hZGQoaW1mQ29udGV4dCwgRUNPUkVfSU1GX0NB TExCQUNLX0NPTU1JVCwgX2V3a192aWV3X2NvbW1pdCwgc21hcnREYXRhKTsKLQotICAgIEVjb3Jl X0V2YXMqIGVjb3JlRXZhcyA9IGVjb3JlX2V2YXNfZWNvcmVfZXZhc19nZXQoc21hcnREYXRhLT5i YXNlLmV2YXMpOwotICAgIGVjb3JlX2ltZl9jb250ZXh0X2NsaWVudF93aW5kb3dfc2V0KGltZkNv bnRleHQsICh2b2lkKillY29yZV9ldmFzX3dpbmRvd19nZXQoZWNvcmVFdmFzKSk7Ci0gICAgZWNv cmVfaW1mX2NvbnRleHRfY2xpZW50X2NhbnZhc19zZXQoaW1mQ29udGV4dCwgc21hcnREYXRhLT5i YXNlLmV2YXMpOwotCi0gICAgcmV0dXJuIGltZkNvbnRleHQ7Ci19Ci0KLXN0YXRpYyB2b2lkIF9l d2tfdmlld19pbWZfY29udGV4dF9kZXN0cm95KEVjb3JlX0lNRl9Db250ZXh0KiBpbWZDb250ZXh0 KQotewotICAgIGlmICghaW1mQ29udGV4dCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgZWNvcmVf aW1mX2NvbnRleHRfZXZlbnRfY2FsbGJhY2tfZGVsKGltZkNvbnRleHQsIEVDT1JFX0lNRl9DQUxM QkFDS19QUkVFRElUX0NIQU5HRUQsIF9ld2tfdmlld19wcmVlZGl0X2NoYW5nZWQpOwotICAgIGVj b3JlX2ltZl9jb250ZXh0X2V2ZW50X2NhbGxiYWNrX2RlbChpbWZDb250ZXh0LCBFQ09SRV9JTUZf Q0FMTEJBQ0tfQ09NTUlULCBfZXdrX3ZpZXdfY29tbWl0KTsKLSAgICBlY29yZV9pbWZfY29udGV4 dF9kZWwoaW1mQ29udGV4dCk7Ci19Ci0KIC8qKgogICogQGludGVybmFsCiAgKiBUaGUgdmlldyB3 YXMgcmVxdWVzdGVkIHRvIHVwZGF0ZSB0ZXh0IGlucHV0IHN0YXRlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAppbmRleCA1OTgwOWZhLi4zOTIxMGQyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKQEAgLTE4Miw3ICsx ODIsNyBAQCBzdHJ1Y3QgRXdrX1ZpZXdfU21hcnRfQ2xhc3MgewogICovCiAjZGVmaW5lIEVXS19W SUVXX1NNQVJUX0NMQVNTX0lOSVRfTkFNRV9WRVJTSU9OKG5hbWUpIEVXS19WSUVXX1NNQVJUX0NM QVNTX0lOSVQoRVZBU19TTUFSVF9DTEFTU19JTklUX05BTUVfVkVSU0lPTihuYW1lKSkKIAotdHlw ZWRlZiBzdHJ1Y3QgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIEV3a19WaWV3X1ByaXZhdGVfRGF0YTsK K3R5cGVkZWYgc3RydWN0IEV3a1ZpZXdJbXBsIEV3a1ZpZXdJbXBsOwogLyoqCiAgKiBAYnJpZWYg Q29udGFpbnMgYW4gaW50ZXJuYWwgVmlldyBkYXRhLgogICoKQEAgLTE5NCw3ICsxOTQsNyBAQCBz dHJ1Y3QgRXdrX1ZpZXdfU21hcnRfRGF0YSB7CiAgICAgY29uc3QgRXdrX1ZpZXdfU21hcnRfQ2xh c3MqIGFwaTsgLyoqPCByZWZlcmVuY2UgdG8gY2FzdGVkIGNsYXNzIGluc3RhbmNlICovCiAgICAg RXZhc19PYmplY3QqIHNlbGY7IC8qKjwgcmVmZXJlbmNlIHRvIG93bmVyIG9iamVjdCAqLwogICAg IEV2YXNfT2JqZWN0KiBpbWFnZTsgLyoqPCByZWZlcmVuY2UgdG8gZXZhc19vYmplY3RfaW1hZ2Ug Zm9yIGRyYXdpbmcgd2ViIGNvbnRlbnRzICovCi0gICAgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBw cml2OyAvKio8IHNob3VsZCBuZXZlciBiZSBhY2Nlc3NlZCwgYysrIHN0dWZmICovCisgICAgRXdr Vmlld0ltcGwqIHByaXY7IC8qKjwgc2hvdWxkIG5ldmVyIGJlIGFjY2Vzc2VkLCBjKysgc3R1ZmYg Ki8KICAgICBzdHJ1Y3QgewogICAgICAgICBFdmFzX0Nvb3JkIHgsIHksIHcsIGg7IC8qKjwgbGFz dCB1c2VkIHZpZXdwb3J0ICovCiAgICAgfSB2aWV3Owo=