116549 2013-05-21 09:16:10 -0700 [EFL][WK2] Change Ewk_Context_Menu_Item's parent menu to raw pointer 2013-05-22 02:37:31 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 114728 116311 1 mpakulavelrutka mpakulavelrutka cdumez commit-queue gyuyoung.kim lucas.de.marchi mikhail.pozdnyakov rakuco oldest_to_newest 891826 0 mpakulavelrutka 2013-05-21 09:16:10 -0700 SSIA 891829 1 202441 mpakulavelrutka 2013-05-21 09:22:00 -0700 Created attachment 202441 proposed patch 891904 2 202441 cdumez 2013-05-21 11:12:09 -0700 Comment on attachment 202441 proposed patch This seems more like a revert than a proper fix. I think the best solution would be for EwkContextMenuItem::create() / constructor to take a EwkContextMenu* instead of a PassRefPtr<EwkContextMenu>. It is not correct to have the menu own the item and have the item own the menu at the same time. 892178 3 202508 mpakulavelrutka 2013-05-22 02:03:54 -0700 Created attachment 202508 patch Instead of removing parent menu from context menu item, RefPtr to parent menu is changed to raw pointer. 892181 4 202508 cdumez 2013-05-22 02:08:34 -0700 Comment on attachment 202508 patch LGTM. r=me. 892194 5 202508 commit-queue 2013-05-22 02:37:28 -0700 Comment on attachment 202508 patch Clearing flags on attachment: 202508 Committed r150507: <http://trac.webkit.org/changeset/150507> 892195 6 commit-queue 2013-05-22 02:37:31 -0700 All reviewed patches have been landed. Closing bug. 202441 2013-05-21 09:22:00 -0700 2013-05-22 02:03:54 -0700 proposed patch fix-ewk-context-menu.diff text/plain 16969 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0ZjBiMjlmLi4yNTdlNjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTMtMDUtMjEgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFJlbW92ZSBwYXJlbnQgbWVudSBmcm9tIEV3 a19Db250ZXh0X01lbnUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExNjU0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFJlbW92ZSBwYXJlbnQgbWVudSBmcm9tIEV3a19Db250ZXh0X01lbnUuIE5vdywgd2hl biBFd2tfQ29udGV4dF9NZW51X0l0ZW0KKyAgICAgICAgaGFzIG5vIHJlZmVyZW5jZSB0byBwYXJl bnQgbWVudSBvYmplY3QsIGNsaWVudCBoYXMgdG8gc3RvcmUgcG9pbnRlciB0byBtZW51CisgICAg ICAgIG9uIGl0cyBvd24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4 dF9tZW51LmNwcDoKKyAgICAgICAgKEV3a0NvbnRleHRNZW51OjpFd2tDb250ZXh0TWVudSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcDoKKyAg ICAgICAgKEV3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5oOgorICAgICAg ICAoRXdrQ29udGV4dE1lbnVJdGVtOjpjcmVhdGUpOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJ dGVtKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4 dF9tZW51LmNwcDoKKyAgICAgICAgKHNob3dDb250ZXh0TWVudSk6CisKIDIwMTMtMDUtMTkgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgbGlu ayBwcmVyZW5kZXJpbmcgY29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfY29udGV4dF9tZW51LmNwcAppbmRleCAwYmVmMGJlLi42MDE0ZDg5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9t ZW51LmNwcApAQCAtNDUsNyArNDUsNyBAQCBFd2tDb250ZXh0TWVudTo6RXdrQ29udGV4dE1lbnUo RXdrVmlldyogdmlldywgV0tBcnJheVJlZiBpdGVtcykKIHsKICAgICBzaXplX3Qgc2l6ZSA9IFdL QXJyYXlHZXRTaXplKGl0ZW1zKTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHNpemU7ICsr aSkKLSAgICAgICAgbV9jb250ZXh0TWVudUl0ZW1zID0gZWluYV9saXN0X2FwcGVuZChtX2NvbnRl eHRNZW51SXRlbXMsIEV3a19Db250ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKHN0YXRpY19jYXN0PFdL Q29udGV4dE1lbnVJdGVtUmVmPihXS0FycmF5R2V0SXRlbUF0SW5kZXgoaXRlbXMsIGkpKSwgdGhp cykubGVha1B0cigpKTsKKyAgICAgICAgbV9jb250ZXh0TWVudUl0ZW1zID0gZWluYV9saXN0X2Fw cGVuZChtX2NvbnRleHRNZW51SXRlbXMsIEV3a19Db250ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKHN0 YXRpY19jYXN0PFdLQ29udGV4dE1lbnVJdGVtUmVmPihXS0FycmF5R2V0SXRlbUF0SW5kZXgoaXRl bXMsIGkpKSkubGVha1B0cigpKTsKIH0KIAogRXdrQ29udGV4dE1lbnU6OkV3a0NvbnRleHRNZW51 KCkKQEAgLTYxLDEwICs2MSw4IEBAIEV3a0NvbnRleHRNZW51OjpFd2tDb250ZXh0TWVudShFaW5h X0xpc3QqIGl0ZW1zKQogICAgIEVpbmFfTGlzdCogbDsKICAgICB2b2lkKiBkYXRhOwogICAgIEVJ TkFfTElTVF9GT1JFQUNIKGl0ZW1zLCBsLCBkYXRhKSB7Ci0gICAgICAgIGlmIChFd2tDb250ZXh0 TWVudUl0ZW0qIGl0ZW0gPSBzdGF0aWNfY2FzdDxFd2tDb250ZXh0TWVudUl0ZW0qPihkYXRhKSkg ewotICAgICAgICAgICAgaXRlbS0+c2V0UGFyZW50TWVudSh0aGlzKTsKKyAgICAgICAgaWYgKEV3 a0NvbnRleHRNZW51SXRlbSogaXRlbSA9IHN0YXRpY19jYXN0PEV3a0NvbnRleHRNZW51SXRlbSo+ KGRhdGEpKQogICAgICAgICAgICAgbV9jb250ZXh0TWVudUl0ZW1zID0gZWluYV9saXN0X2FwcGVu ZChtX2NvbnRleHRNZW51SXRlbXMsIGl0ZW0pOwotICAgICAgICB9CiAgICAgfQogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51 X2l0ZW0uY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRf bWVudV9pdGVtLmNwcAppbmRleCAwMzAwZjc5Li4wMDY4NDE1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5j cHAKQEAgLTM2LDI3ICszNiwyNSBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiBzdGF0aWMg RXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBnZXRFd2tBY3Rpb25Gcm9tV0tUYWcoV0tDb250 ZXh0TWVudUl0ZW1UYWcgYWN0aW9uKTsKIAotRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0 TWVudUl0ZW0oV0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSwgUGFzc1JlZlB0cjxFd2tDb250ZXh0 TWVudT4gcGFyZW50TWVudSkKK0V3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVt KFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW0pCiAgICAgOiBtX3R5cGUoc3RhdGljX2Nhc3Q8RXdr X0NvbnRleHRfTWVudV9JdGVtX1R5cGU+KFdLQ29udGV4dE1lbnVJdGVtR2V0VHlwZShpdGVtKSkp CiAgICAgLCBtX2FjdGlvbihnZXRFd2tBY3Rpb25Gcm9tV0tUYWcoKFdLQ29udGV4dE1lbnVJdGVt R2V0VGFnKGl0ZW0pKSkpCiAgICAgLCBtX3RpdGxlKFdLRWluYVNoYXJlZFN0cmluZyhBZG9wdFdL LCBXS0NvbnRleHRNZW51SXRlbUNvcHlUaXRsZShpdGVtKSkpCiAgICAgLCBtX2lzQ2hlY2tlZChX S0NvbnRleHRNZW51SXRlbUdldENoZWNrZWQoaXRlbSkpCiAgICAgLCBtX2lzRW5hYmxlZChXS0Nv bnRleHRNZW51SXRlbUdldEVuYWJsZWQoaXRlbSkpCi0gICAgLCBtX3BhcmVudE1lbnUocGFyZW50 TWVudSkKIHsKICAgICBpZiAoV0tDb250ZXh0TWVudUl0ZW1HZXRUeXBlKGl0ZW0pID09IGtXS0Nv bnRleHRNZW51SXRlbVR5cGVTdWJtZW51KSB7CiAgICAgICAgIFdLUmV0YWluUHRyPFdLQXJyYXlS ZWY+IG1lbnVJdGVtcyA9IGFkb3B0V0soV0tDb250ZXh0TWVudUNvcHlTdWJtZW51SXRlbXMoaXRl bSkpOwotICAgICAgICBtX3N1Yk1lbnUgPSBFd2tDb250ZXh0TWVudTo6Y3JlYXRlKG1fcGFyZW50 TWVudS0+ZXdrVmlldygpLCBtZW51SXRlbXMuZ2V0KCkpOworICAgICAgICBtX3N1Yk1lbnUgPSBF d2tDb250ZXh0TWVudTo6Y3JlYXRlKDAsIG1lbnVJdGVtcy5nZXQoKSk7CiAgICAgfQogfQogCi1F d2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0 ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3Qg Y2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgUGFzc1Jl ZlB0cjxFd2tDb250ZXh0TWVudT4gc3ViTWVudSwgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVudT4g cGFyZW50TWVudSkKK0V3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKEV3a19D b250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24g YWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBl bmFibGVkLCBQYXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PiBzdWJNZW51KQogICAgIDogbV90eXBl KHR5cGUpCiAgICAgLCBtX2FjdGlvbihhY3Rpb24pCiAgICAgLCBtX3RpdGxlKHRpdGxlKQogICAg ICwgbV9pc0NoZWNrZWQoY2hlY2tlZCkKICAgICAsIG1faXNFbmFibGVkKGVuYWJsZWQpCi0gICAg LCBtX3BhcmVudE1lbnUocGFyZW50TWVudSkKICAgICAsIG1fc3ViTWVudShzdWJNZW51KQogewog fQpAQCAtMTUzLDEzICsxNTEsNiBAQCBFaW5hX0Jvb2wgZXdrX2NvbnRleHRfbWVudV9pdGVtX2Vu YWJsZWRfc2V0KEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSwgRWluYV9CbwogICAgIHJldHVy biB0cnVlOwogfQogCi1Fd2tfQ29udGV4dF9NZW51KiBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFy ZW50X21lbnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSkKLXsKLSAgICBF SU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoaXRlbSwgMCk7Ci0KLSAgICByZXR1cm4gaXRl bS0+cGFyZW50TWVudSgpOwotfQotCiBFd2tfQ29udGV4dF9NZW51KiBld2tfY29udGV4dF9tZW51 X2l0ZW1fc3VibWVudV9nZXQoY29uc3QgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBpdGVtKQogewog ICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChpdGVtLCAwKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVt LmgKaW5kZXggYjAxNGNiYy4uY2Y5MjAzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmgKQEAgLTI2MCwxNSAr MjYwLDYgQEAgRUFQSSBFaW5hX0Jvb2wgZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfZ2V0 KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSAqbykKIEVBUEkgRWluYV9Cb29sIGV3a19jb250 ZXh0X21lbnVfaXRlbV9lbmFibGVkX3NldChFd2tfQ29udGV4dF9NZW51X0l0ZW0gKm8sIEVpbmFf Qm9vbCBlbmFibGVkKTsKIAogLyoqCi0gKiBHZXRzIHRoZSBwYXJlbnQgbWVudSBmb3IgdGhlIGl0 ZW0uCi0gKgotICogQHBhcmFtIG8gaXRlbSB0byBnZXQgdGhlIHBhcmVudAotICoKLSAqIEByZXR1 cm4gdGhlIHBvaW50ZXIgdG8gcGFyZW50IG1lbnUgb24gc3VjY2VzcyBvciBAYyBOVUxMIG9uIGZh aWx1cmUKLSAqLwotRUFQSSBFd2tfQ29udGV4dF9NZW51ICpld2tfY29udGV4dF9tZW51X2l0ZW1f cGFyZW50X21lbnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSAqbyk7Ci0KLS8qKgog ICogR2V0cyB0aGUgc3VibWVudSBmb3IgdGhlIGl0ZW0uCiAgKgogICogQHBhcmFtIG8gaXRlbSB0 byBnZXQgdGhlIHN1Ym1lbnUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5oCmluZGV4IDMy ODdkMTAuLjQzMTgwNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaApAQCAtNDEs MTQgKzQxLDE0IEBACiAgKi8KIGNsYXNzIEV3a0NvbnRleHRNZW51SXRlbSB7CiBwdWJsaWM6Ci0g ICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUoV0tDb250ZXh0 TWVudUl0ZW1SZWYgaXRlbSwgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVudT4gcGFyZW50TWVudSA9 IDApCisgICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUoV0tD b250ZXh0TWVudUl0ZW1SZWYgaXRlbSkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFB0cihu ZXcgRXdrQ29udGV4dE1lbnVJdGVtKGl0ZW0sIHBhcmVudE1lbnUpKTsKKyAgICAgICAgcmV0dXJu IGFkb3B0UHRyKG5ldyBFd2tDb250ZXh0TWVudUl0ZW0oaXRlbSkpOwogICAgIH0KIAotICAgIHN0 YXRpYyBQYXNzT3duUHRyPEV3a0NvbnRleHRNZW51SXRlbT4gY3JlYXRlKEV3a19Db250ZXh0X01l bnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBj b25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBQ YXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PiBzdWJNZW51ID0gMCwgUGFzc1JlZlB0cjxFd2tDb250 ZXh0TWVudT4gcGFyZW50TWVudSA9IDApCisgICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4 dE1lbnVJdGVtPiBjcmVhdGUoRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0Nv bnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jv b2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIFBhc3NSZWZQdHI8RXdrQ29udGV4dE1lbnU+ IHN1Yk1lbnUgPSAwKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tDb250 ZXh0TWVudUl0ZW0odHlwZSwgYWN0aW9uLCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCwgc3ViTWVu dSwgcGFyZW50TWVudSkpOworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEV3a0NvbnRleHRN ZW51SXRlbSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVkLCBzdWJNZW51KSk7 CiAgICAgfQogCiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24oKSBjb25z dCB7IHJldHVybiBtX2FjdGlvbjsgfQpAQCAtNjYsMTQgKzY2LDExIEBAIHB1YmxpYzoKICAgICBi b29sIGVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2lzRW5hYmxlZDsgfQogICAgIHZvaWQgc2V0 RW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV9pc0VuYWJsZWQgPSBlbmFibGVkOyB9CiAKLSAgICBF d2tDb250ZXh0TWVudSogcGFyZW50TWVudSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50TWVudS5n ZXQoKTsgfQotICAgIHZvaWQgc2V0UGFyZW50TWVudShFd2tDb250ZXh0TWVudSogcGFyZW50TWVu dSkgeyBtX3BhcmVudE1lbnUgPSBwYXJlbnRNZW51OyB9Ci0KICAgICBFd2tDb250ZXh0TWVudSog c3ViTWVudSgpIGNvbnN0IHsgcmV0dXJuIG1fc3ViTWVudS5nZXQoKTsgfQogCiBwcml2YXRlOgot ICAgIEV3a0NvbnRleHRNZW51SXRlbShXS0NvbnRleHRNZW51SXRlbVJlZiwgUGFzc1JlZlB0cjxF d2tDb250ZXh0TWVudT4gcGFyZW50TWVudSk7Ci0gICAgRXdrQ29udGV4dE1lbnVJdGVtKEV3a19D b250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24g YWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBl bmFibGVkLCBQYXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PiBzdWJNZW51LCBQYXNzUmVmUHRyPEV3 a0NvbnRleHRNZW51PiBwYXJlbnRNZW51KTsKKyAgICBFd2tDb250ZXh0TWVudUl0ZW0oV0tDb250 ZXh0TWVudUl0ZW1SZWYpOworICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51 X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29u c3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgUGFz c1JlZlB0cjxFd2tDb250ZXh0TWVudT4gc3ViTWVudSk7CiAKICAgICBFd2tfQ29udGV4dF9NZW51 X0l0ZW1fVHlwZSBtX3R5cGU7CiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBtX2Fj dGlvbjsKQEAgLTgzLDcgKzgwLDYgQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNDaGVja2VkOwog ICAgIGJvb2wgbV9pc0VuYWJsZWQ7CiAKLSAgICBSZWZQdHI8RXdrQ29udGV4dE1lbnU+IG1fcGFy ZW50TWVudTsKICAgICBSZWZQdHI8RXdrQ29udGV4dE1lbnU+IG1fc3ViTWVudTsKIH07CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdr Ml9jb250ZXh0X21lbnUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVz dHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5jcHAKaW5kZXggYmEyYzhkZS4uOGE2Yjc4MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X2NvbnRleHRfbWVudS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv dGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5jcHAKQEAgLTQ2LDkgKzQ2LDYgQEAgc3RhdGlj IEVpbmFfQm9vbCBzaG93Q29udGV4dE1lbnUoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRh LCBFdmFzX0Nvb3JkIHgsIEUKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGl0ZW0gPSBzdGF0 aWNfY2FzdDxFd2tfQ29udGV4dF9NZW51X0l0ZW0qPihlaW5hX2xpc3RfbnRoKGxpc3QsIDApKTsK ICAgICBjaGVja0Jhc2ljQ29udGV4dE1lbnVJdGVtKGl0ZW0sIEVXS19BQ1RJT05fVFlQRSwgRVdL X0NPTlRFWFRfTUVOVV9JVEVNX1RBR19HT19CQUNLLCAiR28gQmFjayIsIGZhbHNlLCB0cnVlKTsK IAotICAgIC8vIFdoZW4gY29udGV4dCBtZW51IGlzIGNyZWF0ZWQgYnkgV2ViS2l0LCBhbiBpdGVt IHNob3VsZCBoYXZlIHBhcmVudCBtZW51LgotICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdr X2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChpdGVtKSk7Ci0KICAgICBpdGVtID0g c3RhdGljX2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtKj4oZWluYV9saXN0X250aChsaXN0LCAx KSk7CiAgICAgY2hlY2tCYXNpY0NvbnRleHRNZW51SXRlbShpdGVtLCBFV0tfQUNUSU9OX1RZUEUs IEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfR09fRk9SV0FSRCwgIkdvIEZvcndhcmQiLCBmYWxz ZSwgdHJ1ZSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfc2V0KGl0ZW0sIGZh bHNlKTsKQEAgLTY2LDEzICs2Myw4IEBAIHN0YXRpYyBFaW5hX0Jvb2wgc2hvd0NvbnRleHRNZW51 KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgRXZhc19Db29yZCB4LCBFCiAKICAgICAv LyBNYWtlcyBuZXcgY29udGV4dCBtZW51IGl0ZW1zLgogICAgIEV3a19Db250ZXh0X01lbnVfSXRl bSogbmV3SXRlbSA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElPTl9UWVBFLCBF V0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IEN1c3RvbSBJdGVtIiwgZmFsc2Us IHRydWUpOwotICAgIC8vIFdoZW4gY29udGV4dCBtZW51IGl0ZW0gaXMgY3JlYXRlZCB1c2luZyBl d2tfY29udGV4dF9tZW51X2l0ZW1fbmV3LCBpdCBzaG91bGQgbm90IGhhdmUgcGFyZW50IG1lbnUu Ci0gICAgRVhQRUNUX0VRKDAsIGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQo bmV3SXRlbSkpOwogICAgIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQoY29udGV4dE1lbnUs IG5ld0l0ZW0pOwogCi0gICAgLy8gV2hlbiBjb250ZXh0IG1lbnUgaXRlbSBpcyBhZGRlZCB0byBt ZW51IHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQsIGl0IHNob3VsZCBoYXZlIHBh cmVudCBtZW51LgotICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9p dGVtX3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7Ci0KICAgICAvLyBXaGVuIGNvbnRleHQgbWVu dSBpdGVtIHdhcyBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcsIHN1Ym1l bnUgc2hvdWxkIGJlIDAuCiAgICAgRVhQRUNUX0VRKDAsIGV3a19jb250ZXh0X21lbnVfaXRlbV9z dWJtZW51X2dldChuZXdJdGVtKSk7CiAKQEAgLTg1LDIwICs3NywxMiBAQCBzdGF0aWMgRWluYV9C b29sIHNob3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIEV2YXNf Q29vcmQgeCwgRQogICAgIHN1Yk1lbnVJdGVtTGlzdCA9IGVpbmFfbGlzdF9hcHBlbmQoc3ViTWVu dUl0ZW1MaXN0LCBzdWJNZW51SXRlbTMpOwogICAgIEV3a19Db250ZXh0X01lbnUqIHN1Yk1lbnUg PSBld2tfY29udGV4dF9tZW51X25ld193aXRoX2l0ZW1zKHN1Yk1lbnVJdGVtTGlzdCk7CiAKLSAg ICAvLyBXaGVuIGNvbnRleHQgbWVudSBpcyBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVf bmV3X3dpdGhfaXRlbXMsIGl0ZW1zIHNob3VsZCBoYXZlIHBhcmVudCBtZW51LgotICAgIEVYUEVD VF9FUShzdWJNZW51LCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KHN1Yk1l bnVJdGVtMSkpOwotCiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBuZXdJdGVtMiA9IGV3a19j b250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEVXS19TVUJNRU5VX1RZUEUsIEVXS19D T05URVhUX01FTlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgQ3VzdG9tIEl0ZW0gMiIsIGZhbHNlLCB0 cnVlLCBzdWJNZW51KTsKLSAgICAvLyBXaGVuIGNvbnRleHQgbWVudSBpdGVtIGlzIGNyZWF0ZWQg dXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193aXRoX3N1Ym1lbnUsIGl0IHNob3VsZCBu b3QgaGF2ZSBwYXJlbnQgbWVudS4KLSAgICBFWFBFQ1RfRVEoMCwgZXdrX2NvbnRleHRfbWVudV9p dGVtX3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9pdGVt X2FwcGVuZChjb250ZXh0TWVudSwgbmV3SXRlbTIpOwogCiAgICAgLy8gQ29udGV4dCBtZW51IHJl Y2VpdmVkIGZyb20gZXdrX2NvbnRleHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0IHNob3VsZCBiZSB0 aGUgc2FtZSBhcyBvbmUgdXNlZCB0byBjcmVhdGUgc3ViIG1lbnUuCiAgICAgRVhQRUNUX0VRKHN1 Yk1lbnUsIGV3a19jb250ZXh0X21lbnVfaXRlbV9zdWJtZW51X2dldChuZXdJdGVtMikpOwogCi0g ICAgLy8gV2hlbiBjb250ZXh0IG1lbnUgaXRlbSBpcyBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0 X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51IGFuZCBhZGRlZCB1c2luZyBld2tfY29udGV4dF9t ZW51X2l0ZW1fYXBwZW5kIGl0IHNob3VsZCBoYXZlIHBhcmVudCBtZW51LgotICAgIEVYUEVDVF9F UShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChuZXdJ dGVtKSk7Ci0KICAgICBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51MiA9IGV3a19jb250ZXh0X21l bnVfbmV3KCk7CiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBuZXdJdGVtMyA9IGV3a19jb250 ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEVXS19TVUJNRU5VX1RZUEUsIEVXS19DT05U RVhUX01FTlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgQ3VzdG9tIEl0ZW0gMyIsIGZhbHNlLCB0cnVl LCBzdWJNZW51Mik7CiAgICAgZXdrX2NvbnRleHRfbWVudV9pdGVtX2FwcGVuZChjb250ZXh0TWVu dSwgbmV3SXRlbTMpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IDM2NTFlNDEuLjVhZGM3ZTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wNS0yMSAgTWljaGHF giBQYWt1xYJhIHZlbCBSdXRrYSAgPG0ucGFrdWxhQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtF RkxdW1dLMl0gUmVtb3ZlIHBhcmVudCBtZW51IGZyb20gRXdrX0NvbnRleHRfTWVudQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2NTQ5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHBhcmVudCBt ZW51IGZyb20gRXdrX0NvbnRleHRfTWVudS4gTm93LCB3aGVuIEV3a19Db250ZXh0X01lbnVfSXRl bQorICAgICAgICBoYXMgbm8gcmVmZXJlbmNlIHRvIHBhcmVudCBtZW51IG9iamVjdCwgY2xpZW50 IGhhcyB0byBzdG9yZSBwb2ludGVyIHRvIG1lbnUKKyAgICAgICAgb24gaXRzIG93bi4KKworICAg ICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6CisgICAgICAgIChfQnJvd3Nlcl9XaW5kb3cp OgorICAgICAgICAoY29udGV4dF9wb3B1cF9pdGVtX3NlbGVjdGVkX2NiKToKKyAgICAgICAgKGNv bnRleHRfcG9wdXBfcG9wdWxhdGUpOgorICAgICAgICAob25fY29udGV4dF9tZW51X3Nob3cpOgor ICAgICAgICAob25fY29udGV4dF9tZW51X2hpZGUpOgorCiAyMDEzLTA1LTE5ICBSeXVhbiBDaG9p ICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBpbml0L3NodXRkb3du IHNob3VsZCBiZSBwYWlyZWQgaW4gRVdlYkxhdW5jaGVyCmRpZmYgLS1naXQgYS9Ub29scy9NaW5p QnJvd3Nlci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCBm NTU3Njk4Li44NzIwOTBjNSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4u YworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC0xMDksNyArMTA5LDEwIEBA IHR5cGVkZWYgc3RydWN0IF9Ccm93c2VyX1dpbmRvdyB7CiAgICAgfSBzZWFyY2g7CiAgICAgaW50 IGN1cnJlbnRfem9vbV9sZXZlbDsgCiAgICAgVG9vbHRpcF9JbmZvcm1hdGlvbiB0b29sdGlwOwot ICAgIEV2YXNfT2JqZWN0ICpjb250ZXh0X3BvcHVwOworICAgIHN0cnVjdCB7CisgICAgICAgIEV2 YXNfT2JqZWN0ICplbG1fbWVudTsKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudSAqZXdrX21lbnU7 CisgICAgfSBjb250ZXh0X21lbnU7CiB9IEJyb3dzZXJfV2luZG93OwogCiB0eXBlZGVmIHN0cnVj dCBfRmlsZV9TZWxlY3Rvcl9EYXRhIHsKQEAgLTExMTgsMTAgKzExMjEsMTggQEAgY29udGV4dF9w b3B1cF9pdGVtX3NlbGVjdGVkX2NiKHZvaWQgKmRhdGEsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQg KmV2ZW50X2luZm8pCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBFdmFzX09iamVjdCAq ZWxtX21lbnUgPSBlbG1fb2JqZWN0X3BhcmVudF93aWRnZXRfZ2V0KGVsbV9vYmplY3RfcGFyZW50 X3dpZGdldF9nZXQob2JqKSk7CisKKyAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gZXZhc19v YmplY3RfZGF0YV9nZXQoZWxtX21lbnUsICJ3aW5kb3ciKTsKKyAgICBpZiAoIXdpbmRvdykgewor ICAgICAgICBpbmZvKCJFUlJPUjogQnJvd3Nlcl9XaW5kb3cgaXMgTlVMTC4iKTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KKwogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSAqZXdrX2l0ZW0gPSAo RXdrX0NvbnRleHRfTWVudV9JdGVtICopZGF0YTsKICAgICBpbmZvKCJTZWxlY3RlZCBjb250ZXh0 IHBvcHVwIGl0ZW06ICVzLiIsIGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoZXdrX2l0 ZW0pKTsKLSAgICBld2tfY29udGV4dF9tZW51X2l0ZW1fc2VsZWN0KGV3a19jb250ZXh0X21lbnVf aXRlbV9wYXJlbnRfbWVudV9nZXQoZXdrX2l0ZW0pLCBld2tfaXRlbSk7Ci0gICAgZXdrX2NvbnRl eHRfbWVudV9oaWRlKGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoZXdrX2l0 ZW0pKTsKKyAgICBld2tfY29udGV4dF9tZW51X2l0ZW1fc2VsZWN0KHdpbmRvdy0+Y29udGV4dF9t ZW51LmV3a19tZW51LCBld2tfaXRlbSk7CisgICAgZXdrX2NvbnRleHRfbWVudV9oaWRlKHdpbmRv dy0+Y29udGV4dF9tZW51LmV3a19tZW51KTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTExMzksMTEg KzExNTAsMTEgQEAgY29udGV4dF9wb3B1cF9wb3B1bGF0ZShCcm93c2VyX1dpbmRvdyAqd2luZG93 LCBFd2tfQ29udGV4dF9NZW51ICpld2tfbWVudSkKICAgICAgICAgZXdrX2l0ZW0gPSAoRXdrX0Nv bnRleHRfTWVudV9JdGVtICopZGF0YTsKICAgICAgICAgc3dpdGNoIChld2tfY29udGV4dF9tZW51 X2l0ZW1fdHlwZV9nZXQoZXdrX2l0ZW0pKSB7CiAgICAgICAgIGNhc2UgRVdLX0FDVElPTl9UWVBF OgotICAgICAgICAgICAgZWxtX3BvcHVwX2l0ZW0gPSBlbG1fY3R4cG9wdXBfaXRlbV9hcHBlbmQo d2luZG93LT5jb250ZXh0X3BvcHVwLCBld2tfY29udGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3 a19pdGVtKSwgTlVMTCwgY29udGV4dF9wb3B1cF9pdGVtX3NlbGVjdGVkX2NiLCBld2tfaXRlbSk7 CisgICAgICAgICAgICBlbG1fcG9wdXBfaXRlbSA9IGVsbV9jdHhwb3B1cF9pdGVtX2FwcGVuZCh3 aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxl X2dldChld2tfaXRlbSksIE5VTEwsIGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9jYiwgZXdr X2l0ZW0pOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgRVdLX0NIRUNLQUJMRV9B Q1RJT05fVFlQRToKLSAgICAgICAgICAgIGVsbV9jaGVja19pdGVtID0gZWxtX2NoZWNrX2FkZCh3 aW5kb3ctPmNvbnRleHRfcG9wdXApOwotICAgICAgICAgICAgZWxtX3BvcHVwX2l0ZW0gPSBlbG1f Y3R4cG9wdXBfaXRlbV9hcHBlbmQod2luZG93LT5jb250ZXh0X3BvcHVwLCBld2tfY29udGV4dF9t ZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSwgTlVMTCwgY29udGV4dF9wb3B1cF9pdGVtX3Nl bGVjdGVkX2NiLCBld2tfaXRlbSk7CisgICAgICAgICAgICBlbG1fY2hlY2tfaXRlbSA9IGVsbV9j aGVja19hZGQod2luZG93LT5jb250ZXh0X21lbnUuZWxtX21lbnUpOworICAgICAgICAgICAgZWxt X3BvcHVwX2l0ZW0gPSBlbG1fY3R4cG9wdXBfaXRlbV9hcHBlbmQod2luZG93LT5jb250ZXh0X21l bnUuZWxtX21lbnUsIGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoZXdrX2l0ZW0pLCBO VUxMLCBjb250ZXh0X3BvcHVwX2l0ZW1fc2VsZWN0ZWRfY2IsIGV3a19pdGVtKTsKICAgICAgICAg ICAgIGVsbV9vYmplY3RfaXRlbV9jb250ZW50X3NldChlbG1fcG9wdXBfaXRlbSwgZWxtX2NoZWNr X2l0ZW0pOwogICAgICAgICAgICAgZWxtX2NoZWNrX3N0YXRlX3NldChlbG1fY2hlY2tfaXRlbSwg ZXdrX2NvbnRleHRfbWVudV9pdGVtX2NoZWNrZWRfZ2V0KGV3a19pdGVtKSk7CiAgICAgICAgICAg ICBicmVhazsKQEAgLTExNjQsMTggKzExNzUsMjEgQEAgb25fY29udGV4dF9tZW51X3Nob3coRXdr X1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV2YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LCBFd2tfQ28K ICAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAgICAgfQogCi0gICAgd2luZG93LT5jb250ZXh0 X3BvcHVwID0gZWxtX2N0eHBvcHVwX2FkZCh3aW5kb3ctPmVsbV93aW5kb3cpOworICAgIHdpbmRv dy0+Y29udGV4dF9tZW51LmVsbV9tZW51ID0gZWxtX2N0eHBvcHVwX2FkZCh3aW5kb3ctPmVsbV93 aW5kb3cpOworICAgIHdpbmRvdy0+Y29udGV4dF9tZW51LmV3a19tZW51ID0gbWVudTsKIAotICAg IGlmICghd2luZG93LT5jb250ZXh0X3BvcHVwKSB7CisgICAgaWYgKCF3aW5kb3ctPmNvbnRleHRf bWVudS5lbG1fbWVudSkgewogICAgICAgICBpbmZvKCJFUlJPUjogY291bGQgbm90IGNyZWF0ZSBj b250ZXh0IHBvcHVwIHdpZGdldC4iKTsKICAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAgICAg fQogCisgICAgZXZhc19vYmplY3RfZGF0YV9zZXQod2luZG93LT5jb250ZXh0X21lbnUuZWxtX21l bnUsICJ3aW5kb3ciLCB3aW5kb3cpOworCiAgICAgY29udGV4dF9wb3B1cF9wb3B1bGF0ZSh3aW5k b3csIG1lbnUpOwogCiAgICAgaW5mbygiU2hvd2luZyBjb250ZXh0IHBvcHVwIGF0ICglZCwgJWQp LiIsIHgsIHkpOwotICAgIGV2YXNfb2JqZWN0X21vdmUod2luZG93LT5jb250ZXh0X3BvcHVwLCB4 LCB5KTsKLSAgICBldmFzX29iamVjdF9zaG93KHdpbmRvdy0+Y29udGV4dF9wb3B1cCk7CisgICAg ZXZhc19vYmplY3RfbW92ZSh3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSwgeCwgeSk7Cisg ICAgZXZhc19vYmplY3Rfc2hvdyh3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSk7CiAKICAg ICByZXR1cm4gRUlOQV9UUlVFOwogfQpAQCAtMTE4NSwxNCArMTE5OSwxNCBAQCBvbl9jb250ZXh0 X21lbnVfaGlkZShFd2tfVmlld19TbWFydF9EYXRhICpzZCkKIHsKICAgICBCcm93c2VyX1dpbmRv dyAqd2luZG93ID0gd2luZG93X2ZpbmRfd2l0aF9ld2tfdmlldyhzZC0+c2VsZik7CiAKLSAgICBp ZiAoIXdpbmRvdyB8fCAhd2luZG93LT5jb250ZXh0X3BvcHVwKSB7CisgICAgaWYgKCF3aW5kb3cg fHwgIXdpbmRvdy0+Y29udGV4dF9tZW51LmVsbV9tZW51KSB7CiAgICAgICAgIGluZm8oIkVSUk9S OiBuZWNlc3Nhcnkgb2JqZWN0cyBhcmUgTlVMTC4iKTsKICAgICAgICAgcmV0dXJuIEVJTkFfRkFM U0U7CiAgICAgfQogCi0gICAgZWxtX2N0eHBvcHVwX2Rpc21pc3Mod2luZG93LT5jb250ZXh0X3Bv cHVwKTsKLSAgICBldmFzX29iamVjdF9kZWwod2luZG93LT5jb250ZXh0X3BvcHVwKTsKLSAgICB3 aW5kb3ctPmNvbnRleHRfcG9wdXAgPSBOVUxMOworICAgIGVsbV9jdHhwb3B1cF9kaXNtaXNzKHdp bmRvdy0+Y29udGV4dF9tZW51LmVsbV9tZW51KTsKKyAgICBldmFzX29iamVjdF9kZWwod2luZG93 LT5jb250ZXh0X21lbnUuZWxtX21lbnUpOworICAgIHdpbmRvdy0+Y29udGV4dF9tZW51LmVsbV9t ZW51ID0gTlVMTDsKIAogICAgIHJldHVybiBFSU5BX1RSVUU7CiB9Cg== 202508 2013-05-22 02:03:54 -0700 2013-05-22 02:37:28 -0700 patch fix-ewk-context-menu2.diff text/plain 5075 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkNjBkZmI3Li4wY2YzNDg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTMtMDUtMjIgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIENoYW5nZSBFd2tfQ29udGV4dF9NZW51X0l0 ZW0ncyBwYXJlbnQgbWVudSB0byByYXcgcG9pbnRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2NTQ5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQSBjb250ZXh0IG1lbnUgaXRlbSBzaG91bGQgaGF2ZSBv bmx5IGEgcG9pbnRlciB0byBwYXJlbnQgbWVudSBpbnN0ZWFkCisgICAgICAgIG9mIG93bmluZyBw YXJlbnQgbWVudS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21l bnVfaXRlbS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51 SXRlbSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVt X3ByaXZhdGUuaDoKKyAgICAgICAgKEV3a0NvbnRleHRNZW51SXRlbTo6Y3JlYXRlKToKKyAgICAg ICAgKEV3a0NvbnRleHRNZW51SXRlbTo6cGFyZW50TWVudSk6CisgICAgICAgIChFd2tDb250ZXh0 TWVudUl0ZW0pOgorCiAyMDEzLTA1LTIxICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlh LmNvbT4KIAogICAgICAgICBbR1RLXSBDb21waWxlIGV2ZXJ5dGhpbmcgaW4gQysrMTEgbW9kZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRf bWVudV9pdGVtLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250 ZXh0X21lbnVfaXRlbS5jcHAKaW5kZXggMDMwMGY3OS4uOGM1NTVkYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0 ZW0uY3BwCkBAIC0zNiw3ICszNiw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIHN0YXRp YyBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGdldEV3a0FjdGlvbkZyb21XS1RhZyhXS0Nv bnRleHRNZW51SXRlbVRhZyBhY3Rpb24pOwogCi1Fd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRl eHRNZW51SXRlbShXS0NvbnRleHRNZW51SXRlbVJlZiBpdGVtLCBQYXNzUmVmUHRyPEV3a0NvbnRl eHRNZW51PiBwYXJlbnRNZW51KQorRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0 ZW0oV0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUp CiAgICAgOiBtX3R5cGUoc3RhdGljX2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGU+KFdL Q29udGV4dE1lbnVJdGVtR2V0VHlwZShpdGVtKSkpCiAgICAgLCBtX2FjdGlvbihnZXRFd2tBY3Rp b25Gcm9tV0tUYWcoKFdLQ29udGV4dE1lbnVJdGVtR2V0VGFnKGl0ZW0pKSkpCiAgICAgLCBtX3Rp dGxlKFdLRWluYVNoYXJlZFN0cmluZyhBZG9wdFdLLCBXS0NvbnRleHRNZW51SXRlbUNvcHlUaXRs ZShpdGVtKSkpCkBAIC01MCw3ICs1MCw3IEBAIEV3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4 dE1lbnVJdGVtKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW0sIFBhc3NSZWZQdHI8RXdrCiAgICAg fQogfQogCi1Fd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4 dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlv biwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxl ZCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVudT4gc3ViTWVudSwgUGFzc1JlZlB0cjxFd2tDb250 ZXh0TWVudT4gcGFyZW50TWVudSkKK0V3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJ dGVtKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRl bV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVp bmFfQm9vbCBlbmFibGVkLCBQYXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PiBzdWJNZW51LCBFd2tD b250ZXh0TWVudSogcGFyZW50TWVudSkKICAgICA6IG1fdHlwZSh0eXBlKQogICAgICwgbV9hY3Rp b24oYWN0aW9uKQogICAgICwgbV90aXRsZSh0aXRsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJp dmF0ZS5oCmluZGV4IDMyODdkMTAuLjIyMTU4ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3By aXZhdGUuaApAQCAtNDEsMTIgKzQxLDEyIEBACiAgKi8KIGNsYXNzIEV3a0NvbnRleHRNZW51SXRl bSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBj cmVhdGUoV0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSwgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVu dT4gcGFyZW50TWVudSA9IDApCisgICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJ dGVtPiBjcmVhdGUoV0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSwgRXdrQ29udGV4dE1lbnUqIHBh cmVudE1lbnUpCiAgICAgewogICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEV3a0NvbnRleHRN ZW51SXRlbShpdGVtLCBwYXJlbnRNZW51KSk7CiAgICAgfQogCi0gICAgc3RhdGljIFBhc3NPd25Q dHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUoRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUg dHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRp dGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIFBhc3NSZWZQdHI8RXdr Q29udGV4dE1lbnU+IHN1Yk1lbnUgPSAwLCBQYXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PiBwYXJl bnRNZW51ID0gMCkKKyAgICBzdGF0aWMgUGFzc093blB0cjxFd2tDb250ZXh0TWVudUl0ZW0+IGNy ZWF0ZShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0 ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBF aW5hX0Jvb2wgZW5hYmxlZCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVudT4gc3ViTWVudSA9IDAs IEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51ID0gMCkKICAgICB7CiAgICAgICAgIHJldHVybiBh ZG9wdFB0cihuZXcgRXdrQ29udGV4dE1lbnVJdGVtKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNr ZWQsIGVuYWJsZWQsIHN1Yk1lbnUsIHBhcmVudE1lbnUpKTsKICAgICB9CkBAIC02NiwxNCArNjYs MTQgQEAgcHVibGljOgogICAgIGJvb2wgZW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNFbmFi bGVkOyB9CiAgICAgdm9pZCBzZXRFbmFibGVkKGJvb2wgZW5hYmxlZCkgeyBtX2lzRW5hYmxlZCA9 IGVuYWJsZWQ7IH0KIAotICAgIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KCkgY29uc3QgeyBy ZXR1cm4gbV9wYXJlbnRNZW51LmdldCgpOyB9CisgICAgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1l bnUoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudE1lbnU7IH0KICAgICB2b2lkIHNldFBhcmVudE1l bnUoRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpIHsgbV9wYXJlbnRNZW51ID0gcGFyZW50TWVu dTsgfQogCiAgICAgRXdrQ29udGV4dE1lbnUqIHN1Yk1lbnUoKSBjb25zdCB7IHJldHVybiBtX3N1 Yk1lbnUuZ2V0KCk7IH0KIAogcHJpdmF0ZToKLSAgICBFd2tDb250ZXh0TWVudUl0ZW0oV0tDb250 ZXh0TWVudUl0ZW1SZWYsIFBhc3NSZWZQdHI8RXdrQ29udGV4dE1lbnU+IHBhcmVudE1lbnUpOwot ICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBF d2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVp bmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0 TWVudT4gc3ViTWVudSwgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVudT4gcGFyZW50TWVudSk7Cisg ICAgRXdrQ29udGV4dE1lbnVJdGVtKFdLQ29udGV4dE1lbnVJdGVtUmVmLCBFd2tDb250ZXh0TWVu dSogcGFyZW50TWVudSk7CisgICAgRXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01lbnVf SXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25z dCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBQYXNz UmVmUHRyPEV3a0NvbnRleHRNZW51PiBzdWJNZW51LCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVu dSk7CiAKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSBtX3R5cGU7CiAgICAgRXdrX0Nv bnRleHRfTWVudV9JdGVtX0FjdGlvbiBtX2FjdGlvbjsKQEAgLTgzLDcgKzgzLDcgQEAgcHJpdmF0 ZToKICAgICBib29sIG1faXNDaGVja2VkOwogICAgIGJvb2wgbV9pc0VuYWJsZWQ7CiAKLSAgICBS ZWZQdHI8RXdrQ29udGV4dE1lbnU+IG1fcGFyZW50TWVudTsKKyAgICBFd2tDb250ZXh0TWVudSog bV9wYXJlbnRNZW51OwogICAgIFJlZlB0cjxFd2tDb250ZXh0TWVudT4gbV9zdWJNZW51OwogfTsK IAo=