42977 2010-07-26 09:43:20 -0700 Clean up event handling functions 2010-07-26 10:45:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca abarth eric webkit.review.bot oldest_to_newest 256071 0 andersca 2010-07-26 09:43:20 -0700 Clean up event handling functions 256072 1 62581 andersca 2010-07-26 09:44:05 -0700 Created attachment 62581 Patch 256085 2 andersca 2010-07-26 10:04:13 -0700 Committed r64050: <http://trac.webkit.org/changeset/64050> 256099 3 webkit.review.bot 2010-07-26 10:45:03 -0700 http://trac.webkit.org/changeset/64050 might have broken Chromium Win Release The following changes are on the blame list: http://trac.webkit.org/changeset/64050 http://trac.webkit.org/changeset/64051 62581 2010-07-26 09:44:05 -0700 2010-07-26 09:45:09 -0700 Patch bug-42977-20100726094404.patch text/plain 6552 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MDY5YWM0Yjc0MDc0Yzc2OTI2YjFlNWVkM2RkNDY4MzI5MTcwNzFlNi4uYjYzMjg5MTYyNWZlNGM3 MWY3YTgzODdmYTk1M2I1YjE0ZjVlMTE1MyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNy0yNiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsZWFuIHVwIGV2ZW50IGhhbmRsaW5nIGZ1bmN0 aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI5 NzcKKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZTo6bW91c2VFdmVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6 OndoZWVsRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjprZXlFdmVudCk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorCiAyMDEwLTA3LTI1ICBEYXJpbiBBZGxlciAgPGRh cmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4K ZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggOWRmMzcxNzU5YzQxNzMw Y2ExMzA1NDI3ODQwODIwNTY0YTFjYWQ0ZC4uOGJiYjE5NDYwMWE2OWUzOGY5NzYwYTMzNDkyMTkz ODdiOTc5ZGVjMyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTI3 NywyMCArMjc3LDI0IEBAIHZvaWQgV2ViUGFnZTo6ZHJhd1JlY3QoR3JhcGhpY3NDb250ZXh0JiBn cmFwaGljc0NvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAKIC8vIEV2ZW50cyAKIAotdm9p ZCBXZWJQYWdlOjptb3VzZUV2ZW50KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZXZlbnQpCit2 b2lkIFdlYlBhZ2U6Om1vdXNlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VFdmVudCkK IHsKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmQoV2ViUGFnZVBy b3h5TWVzc2FnZTo6RGlkUmVjZWl2ZUV2ZW50LCBtX3BhZ2VJRCwgQ29yZUlQQzo6SW4oc3RhdGlj X2Nhc3Q8dWludDMyX3Q+KG1vdXNlRXZlbnQudHlwZSgpKSkpOworCiAgICAgaWYgKCFtX21haW5G cmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgc3dpdGNo IChldmVudC5ldmVudFR5cGUoKSkgeworICAgIFBsYXRmb3JtTW91c2VFdmVudCBwbGF0Zm9ybU1v dXNlRXZlbnQgPSBwbGF0Zm9ybShtb3VzZUV2ZW50KTsKKyAgICAKKyAgICBzd2l0Y2ggKHBsYXRm b3JtTW91c2VFdmVudC5ldmVudFR5cGUoKSkgewogICAgICAgICBjYXNlIFdlYkNvcmU6Ok1vdXNl RXZlbnRQcmVzc2VkOgotICAgICAgICAgICAgbV9tYWluRnJhbWUtPmNvcmVGcmFtZSgpLT5ldmVu dEhhbmRsZXIoKS0+aGFuZGxlTW91c2VQcmVzc0V2ZW50KGV2ZW50KTsKKyAgICAgICAgICAgIG1f bWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPmhhbmRsZU1vdXNlUHJlc3NF dmVudChwbGF0Zm9ybU1vdXNlRXZlbnQpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNh c2UgV2ViQ29yZTo6TW91c2VFdmVudFJlbGVhc2VkOgotICAgICAgICAgICAgbV9tYWluRnJhbWUt PmNvcmVGcmFtZSgpLT5ldmVudEhhbmRsZXIoKS0+aGFuZGxlTW91c2VSZWxlYXNlRXZlbnQoZXZl bnQpOworICAgICAgICAgICAgbV9tYWluRnJhbWUtPmNvcmVGcmFtZSgpLT5ldmVudEhhbmRsZXIo KS0+aGFuZGxlTW91c2VSZWxlYXNlRXZlbnQocGxhdGZvcm1Nb3VzZUV2ZW50KTsKICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICBjYXNlIFdlYkNvcmU6Ok1vdXNlRXZlbnRNb3ZlZDoKLSAgICAg ICAgICAgIG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPm1vdXNlTW92 ZWQoZXZlbnQpOworICAgICAgICAgICAgbV9tYWluRnJhbWUtPmNvcmVGcmFtZSgpLT5ldmVudEhh bmRsZXIoKS0+bW91c2VNb3ZlZChwbGF0Zm9ybU1vdXNlRXZlbnQpOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK QEAgLTI5OCwyMCArMzAyLDI1IEBAIHZvaWQgV2ViUGFnZTo6bW91c2VFdmVudChjb25zdCBQbGF0 Zm9ybU1vdXNlRXZlbnQmIGV2ZW50KQogICAgIH0KIH0KIAotdm9pZCBXZWJQYWdlOjp3aGVlbEV2 ZW50KFBsYXRmb3JtV2hlZWxFdmVudCYgZXZlbnQpCit2b2lkIFdlYlBhZ2U6OndoZWVsRXZlbnQo Y29uc3QgV2ViV2hlZWxFdmVudCYgd2hlZWxFdmVudCkKIHsKKyAgICBXZWJQcm9jZXNzOjpzaGFy ZWQoKS5jb25uZWN0aW9uKCktPnNlbmQoV2ViUGFnZVByb3h5TWVzc2FnZTo6RGlkUmVjZWl2ZUV2 ZW50LCBtX3BhZ2VJRCwgQ29yZUlQQzo6SW4oc3RhdGljX2Nhc3Q8dWludDMyX3Q+KHdoZWVsRXZl bnQudHlwZSgpKSkpOwogICAgIGlmICghbV9tYWluRnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3KCkp CiAgICAgICAgIHJldHVybjsKIAotICAgIG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+ZXZlbnRI YW5kbGVyKCktPmhhbmRsZVdoZWVsRXZlbnQoZXZlbnQpOworICAgIFBsYXRmb3JtV2hlZWxFdmVu dCBwbGF0Zm9ybVdoZWVsRXZlbnQgPSBwbGF0Zm9ybSh3aGVlbEV2ZW50KTsKKyAgICBtX21haW5G cmFtZS0+Y29yZUZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5oYW5kbGVXaGVlbEV2ZW50KHBsYXRm b3JtV2hlZWxFdmVudCk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6a2V5RXZlbnQoY29uc3QgUGxhdGZv cm1LZXlib2FyZEV2ZW50JiBldmVudCkKK3ZvaWQgV2ViUGFnZTo6a2V5RXZlbnQoY29uc3QgV2Vi S2V5Ym9hcmRFdmVudCYga2V5Ym9hcmRFdmVudCkKIHsKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQo KS5jb25uZWN0aW9uKCktPnNlbmQoV2ViUGFnZVByb3h5TWVzc2FnZTo6RGlkUmVjZWl2ZUV2ZW50 LCBtX3BhZ2VJRCwgQ29yZUlQQzo6SW4oc3RhdGljX2Nhc3Q8dWludDMyX3Q+KGtleWJvYXJkRXZl bnQudHlwZSgpKSkpOworCiAgICAgaWYgKCFtX21haW5GcmFtZS0+Y29yZUZyYW1lKCktPnZpZXco KSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9j dXNlZE9yTWFpbkZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5rZXlFdmVudChldmVudCk7CisgICAg UGxhdGZvcm1LZXlib2FyZEV2ZW50IHBsYXRmb3JtS2V5Ym9hcmRFdmVudCA9IHBsYXRmb3JtKGtl eWJvYXJkRXZlbnQpOworICAgIG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1h aW5GcmFtZSgpLT5ldmVudEhhbmRsZXIoKS0+a2V5RXZlbnQocGxhdGZvcm1LZXlib2FyZEV2ZW50 KTsKIH0KIAogdm9pZCBXZWJQYWdlOjpzZXRBY3RpdmUoYm9vbCBpc0FjdGl2ZSkKQEAgLTQ0MCw5 ICs0NDksNyBAQCB2b2lkIFdlYlBhZ2U6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5l Y3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZwogICAgICAgICAgICAgV2ViTW91c2VF dmVudCBldmVudDsKICAgICAgICAgICAgIGlmICghYXJndW1lbnRzLmRlY29kZShldmVudCkpCiAg ICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgY29ubmVjdGlvbi0+c2VuZChXZWJQ YWdlUHJveHlNZXNzYWdlOjpEaWRSZWNlaXZlRXZlbnQsIG1fcGFnZUlELCBDb3JlSVBDOjpJbigo dWludDMyX3QpZXZlbnQudHlwZSgpKSk7Ci0gICAgICAgICAgICBQbGF0Zm9ybU1vdXNlRXZlbnQg cGxhdGZvcm1FdmVudCA9IHBsYXRmb3JtKGV2ZW50KTsKLSAgICAgICAgICAgIG1vdXNlRXZlbnQo cGxhdGZvcm1FdmVudCk7CisgICAgICAgICAgICBtb3VzZUV2ZW50KGV2ZW50KTsKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBjYXNlIFdlYlBhZ2VNZXNzYWdlOjpQcmVm ZXJlbmNlc0RpZENoYW5nZTogewpAQCAtNDU3LDE4ICs0NjQsMTYgQEAgdm9pZCBXZWJQYWdlOjpk aWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVBD OjpNZXNzYWcKICAgICAgICAgICAgIFdlYldoZWVsRXZlbnQgZXZlbnQ7CiAgICAgICAgICAgICBp ZiAoIWFyZ3VtZW50cy5kZWNvZGUoZXZlbnQpKQogICAgICAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgICAgIGNvbm5lY3Rpb24tPnNlbmQoV2ViUGFnZVByb3h5TWVzc2FnZTo6RGlkUmVjZWl2 ZUV2ZW50LCBtX3BhZ2VJRCwgQ29yZUlQQzo6SW4oKHVpbnQzMl90KWV2ZW50LnR5cGUoKSkpOwot ICAgICAgICAgICAgUGxhdGZvcm1XaGVlbEV2ZW50IHBsYXRmb3JtRXZlbnQgPSBwbGF0Zm9ybShl dmVudCk7Ci0gICAgICAgICAgICB3aGVlbEV2ZW50KHBsYXRmb3JtRXZlbnQpOworCisgICAgICAg ICAgICB3aGVlbEV2ZW50KGV2ZW50KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQog ICAgICAgICBjYXNlIFdlYlBhZ2VNZXNzYWdlOjpLZXlFdmVudDogewogICAgICAgICAgICAgV2Vi S2V5Ym9hcmRFdmVudCBldmVudDsKICAgICAgICAgICAgIGlmICghYXJndW1lbnRzLmRlY29kZShl dmVudCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgY29ubmVjdGlvbi0+ c2VuZChXZWJQYWdlUHJveHlNZXNzYWdlOjpEaWRSZWNlaXZlRXZlbnQsIG1fcGFnZUlELCBDb3Jl SVBDOjpJbigodWludDMyX3QpZXZlbnQudHlwZSgpKSk7Ci0gICAgICAgICAgICBQbGF0Zm9ybUtl eWJvYXJkRXZlbnQgcGxhdGZvcm1FdmVudCA9IHBsYXRmb3JtKGV2ZW50KTsKLSAgICAgICAgICAg IGtleUV2ZW50KHBsYXRmb3JtRXZlbnQpOworCisgICAgICAgICAgICBrZXlFdmVudChldmVudCk7 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBXZWJQYWdlTWVz c2FnZTo6TG9hZFVSTDogewpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDg2 NTU1NmYxOTA2YmRmNzNkN2UyOGJiZjYzODgyNzQ5MjNiYjY0YTkuLmFhNTU2ZmM5NDE2ZmIxZjY2 MGY1ODQ0ZjU4MzE1YzA3YmQwMGFmZWEgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgKQEAgLTQ4LDkgKzQ4LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIEdyYXBo aWNzQ29udGV4dDsKICAgICBjbGFzcyBLZXlib2FyZEV2ZW50OwogICAgIGNsYXNzIFBhZ2U7Ci0g ICAgY2xhc3MgUGxhdGZvcm1LZXlib2FyZEV2ZW50OwotICAgIGNsYXNzIFBsYXRmb3JtTW91c2VF dmVudDsKLSAgICBjbGFzcyBQbGF0Zm9ybVdoZWVsRXZlbnQ7CiAgICAgY2xhc3MgU3RyaW5nOwog fQogCkBAIC01OCw2ICs1NSw5IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBEcmF3aW5n QXJlYTsKIGNsYXNzIFdlYkZyYW1lOworY2xhc3MgV2ViS2V5Ym9hcmRFdmVudDsKK2NsYXNzIFdl Yk1vdXNlRXZlbnQ7CitjbGFzcyBXZWJXaGVlbEV2ZW50Owogc3RydWN0IFdlYlByZWZlcmVuY2Vz U3RvcmU7CiAKIGNsYXNzIFdlYlBhZ2UgOiBwdWJsaWMgUmVmQ291bnRlZDxXZWJQYWdlPiB7CkBA IC0xMjYsOSArMTI2LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldEFjdGl2ZShib29sKTsKICAg ICB2b2lkIHNldEZvY3VzZWQoYm9vbCk7CiAgICAgdm9pZCBzZXRJc0luV2luZG93KGJvb2wpOwot ICAgIHZvaWQgbW91c2VFdmVudChjb25zdCBXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQmKTsK LSAgICB2b2lkIHdoZWVsRXZlbnQoV2ViQ29yZTo6UGxhdGZvcm1XaGVlbEV2ZW50Jik7Ci0gICAg dm9pZCBrZXlFdmVudChjb25zdCBXZWJDb3JlOjpQbGF0Zm9ybUtleWJvYXJkRXZlbnQmKTsKKyAg ICB2b2lkIG1vdXNlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYpOworICAgIHZvaWQgd2hlZWxF dmVudChjb25zdCBXZWJXaGVlbEV2ZW50Jik7CisgICAgdm9pZCBrZXlFdmVudChjb25zdCBXZWJL ZXlib2FyZEV2ZW50Jik7CiAgICAgdm9pZCBydW5KYXZhU2NyaXB0SW5NYWluRnJhbWUoY29uc3Qg V2ViQ29yZTo6U3RyaW5nJiwgdWludDY0X3QgY2FsbGJhY2tJRCk7CiAgICAgdm9pZCBnZXRSZW5k ZXJUcmVlRXh0ZXJuYWxSZXByZXNlbnRhdGlvbih1aW50NjRfdCBjYWxsYmFja0lEKTsKICAgICB2 b2lkIHByZWZlcmVuY2VzRGlkQ2hhbmdlKGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmKTsK