119003 2013-07-23 01:52:17 -0700 [GTK] GtkAdjustmentWatcher idle source not correctly handled 2013-08-20 10:06:12 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned gdesmott grant_gayed pochu27 oldest_to_newest 910931 0 cgarcia 2013-07-23 01:52:17 -0700 GtkAdjustmentWatcher::updateAdjustmentsFromScrollbarsLater() creates a new idle source and initializes m_updateAdjustmentCallbackId, which is used everywhere and specially in the destructor to cancel the source when the GtkAdjustmentWatcher is deleted. However, m_updateAdjustmentCallbackId is reset to 0 in GtkAdjustmentWatcher::updateAdjustmentsFromScrollbars() only when not returning early. This method is public and not only called by the updateAdjustmentCallback, which means that a call to updateAdjustmentsFromScrollbars could reset the m_updateAdjustmentCallbackId without actually destroying the source. 910933 1 207312 cgarcia 2013-07-23 01:55:42 -0700 Created attachment 207312 Patch Only reset the idle id when the idle callback has been called. 910942 2 cgarcia 2013-07-23 02:05:27 -0700 I wonder if should also destroy the source in GtkAdjustmentWatcher::updateAdjustmentsFromScrollbars() where we were setting it to 0 before, since we have already handled the adjustment update. 910959 3 207317 cgarcia 2013-07-23 03:04:15 -0700 Created attachment 207317 Updated patch Also destroy the source in GtkAdjustmentWatcher::updateAdjustmentsFromScrollbars() 911041 4 cgarcia 2013-07-23 08:07:04 -0700 *** Bug 118396 has been marked as a duplicate of this bug. *** 911045 5 207317 mrobinson 2013-07-23 08:13:13 -0700 Comment on attachment 207317 Updated patch Thanks! 911049 6 cgarcia 2013-07-23 08:34:59 -0700 Committed r153052: <http://trac.webkit.org/changeset/153052> 207312 2013-07-23 01:55:42 -0700 2013-07-23 03:04:15 -0700 Patch wk-adjustment-watcher.diff text/plain 3108 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCBlMzI3MWNhLi4xNTc3NTc2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjkgQEAKKzIwMTMtMDctMjMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEd0a0FkanVzdG1lbnRXYXRjaGVyIGlkbGUg c291cmNlIG5vdCBjb3JyZWN0bHkgaGFuZGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5MDAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgR3RrQWRqdXN0bWVudFdhdGNoZXI6OnVwZGF0ZUFkanVzdG1l bnRzRnJvbVNjcm9sbGJhcnNMYXRlcigpCisgICAgICAgIGNyZWF0ZXMgYSBuZXcgaWRsZSBzb3Vy Y2UgYW5kIGluaXRpYWxpemVzCisgICAgICAgIG1fdXBkYXRlQWRqdXN0bWVudENhbGxiYWNrSWQs IHdoaWNoIGlzIHVzZWQgZXZlcnl3aGVyZSBhbmQKKyAgICAgICAgc3BlY2lhbGx5IGluIHRoZSBk ZXN0cnVjdG9yIHRvIGNhbmNlbCB0aGUgc291cmNlIHdoZW4gdGhlCisgICAgICAgIEd0a0FkanVz dG1lbnRXYXRjaGVyIGlzIGRlbGV0ZWQuIEhvd2V2ZXIsCisgICAgICAgIG1fdXBkYXRlQWRqdXN0 bWVudENhbGxiYWNrSWQgaXMgcmVzZXQgdG8gMCBpbgorICAgICAgICBHdGtBZGp1c3RtZW50V2F0 Y2hlcjo6dXBkYXRlQWRqdXN0bWVudHNGcm9tU2Nyb2xsYmFycygpIG9ubHkgd2hlbgorICAgICAg ICBub3QgcmV0dXJuaW5nIGVhcmx5LiBUaGlzIG1ldGhvZCBpcyBwdWJsaWMgYW5kIG5vdCBvbmx5 IGNhbGxlZCBieQorICAgICAgICB0aGUgdXBkYXRlQWRqdXN0bWVudENhbGxiYWNrLCB3aGljaCBt ZWFucyB0aGF0IGEgY2FsbCB0bworICAgICAgICB1cGRhdGVBZGp1c3RtZW50c0Zyb21TY3JvbGxi YXJzIGNvdWxkIHJlc2V0IHRoZQorICAgICAgICBtX3VwZGF0ZUFkanVzdG1lbnRDYWxsYmFja0lk IHdpdGhvdXQgYWN0dWFsbHkgZGVzdHJveWluZyB0aGUgc291cmNlLgorCisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvR3RrQWRqdXN0bWVudFdhdGNoZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpH dGtBZGp1c3RtZW50V2F0Y2hlcjo6dXBkYXRlQWRqdXN0bWVudHNGcm9tU2Nyb2xsYmFycyk6Cisg ICAgICAgIERvIG5vdCByZXNldCBtX3VwZGF0ZUFkanVzdG1lbnRDYWxsYmFja0lkLgorICAgICAg ICAoV2ViS2l0OjpHdGtBZGp1c3RtZW50V2F0Y2hlcjo6dXBkYXRlQWRqdXN0bWVudENhbGxiYWNr KTogUmVzZXQKKyAgICAgICAgbV91cGRhdGVBZGp1c3RtZW50Q2FsbGJhY2tJZC4KKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9HdGtBZGp1c3RtZW50V2F0Y2hlci5oOgorCiAyMDEzLTA3LTE3ICBL YW5naWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KIAogICAgICAgICBVc2UgdG9IVE1M TWVkaWFFbGVtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9y dC9HdGtBZGp1c3RtZW50V2F0Y2hlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9HdGtBZGp1c3RtZW50V2F0Y2hlci5jcHAKaW5kZXggYjc4ZDEyZS4uZTY0ZTkxNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvR3RrQWRqdXN0bWVudFdh dGNoZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0d0a0FkanVz dG1lbnRXYXRjaGVyLmNwcApAQCAtNjgsMTIgKzY4LDEyIEBAIHZvaWQgR3RrQWRqdXN0bWVudFdh dGNoZXI6OnVwZGF0ZUFkanVzdG1lbnRzRnJvbVNjcm9sbGJhcnMoKQogICAgIEZyYW1lVmlldyog ZnJhbWVWaWV3ID0gY29yZShtX3dlYlZpZXcpLT5tYWluRnJhbWUoKS0+dmlldygpOwogICAgIHVw ZGF0ZUFkanVzdG1lbnRGcm9tU2Nyb2xsYmFyKG1faG9yaXpvbnRhbEFkanVzdG1lbnQuZ2V0KCks IGZyYW1lVmlldy0+aG9yaXpvbnRhbFNjcm9sbGJhcigpKTsKICAgICB1cGRhdGVBZGp1c3RtZW50 RnJvbVNjcm9sbGJhcihtX3ZlcnRpY2FsQWRqdXN0bWVudC5nZXQoKSwgZnJhbWVWaWV3LT52ZXJ0 aWNhbFNjcm9sbGJhcigpKTsKLSAgICBtX3VwZGF0ZUFkanVzdG1lbnRDYWxsYmFja0lkID0gMDsK IH0KIAotc3RhdGljIGdib29sZWFuIHVwZGF0ZUFkanVzdG1lbnRDYWxsYmFjayhHdGtBZGp1c3Rt ZW50V2F0Y2hlciogd2F0Y2hlcikKK2dib29sZWFuIEd0a0FkanVzdG1lbnRXYXRjaGVyOjp1cGRh dGVBZGp1c3RtZW50Q2FsbGJhY2soR3RrQWRqdXN0bWVudFdhdGNoZXIqIHdhdGNoZXIpCiB7CiAg ICAgd2F0Y2hlci0+dXBkYXRlQWRqdXN0bWVudHNGcm9tU2Nyb2xsYmFycygpOworICAgIHdhdGNo ZXItPm1fdXBkYXRlQWRqdXN0bWVudENhbGxiYWNrSWQgPSAwOwogICAgIHJldHVybiBGQUxTRTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvR3RrQWRq dXN0bWVudFdhdGNoZXIuaCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0d0a0Fk anVzdG1lbnRXYXRjaGVyLmgKaW5kZXggMmY3YmVlMy4uZTU2OWNkYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvR3RrQWRqdXN0bWVudFdhdGNoZXIuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9HdGtBZGp1c3RtZW50V2F0Y2hlci5o CkBAIC00Myw2ICs0Myw4IEBAIHB1YmxpYzoKICAgICBib29sIHNjcm9sbGJhcnNEaXNhYmxlZCgp IGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsYmFyc0Rpc2FibGVkOyB9OwogCiBwcml2YXRlOgorICAg IHN0YXRpYyBnYm9vbGVhbiB1cGRhdGVBZGp1c3RtZW50Q2FsbGJhY2soR3RrQWRqdXN0bWVudFdh dGNoZXIqKTsKKwogICAgIFdlYktpdFdlYlZpZXcqIG1fd2ViVmlldzsKICAgICBHUmVmUHRyPEd0 a0FkanVzdG1lbnQ+IG1faG9yaXpvbnRhbEFkanVzdG1lbnQ7CiAgICAgR1JlZlB0cjxHdGtBZGp1 c3RtZW50PiBtX3ZlcnRpY2FsQWRqdXN0bWVudDsK 207317 2013-07-23 03:04:15 -0700 2013-07-23 08:13:13 -0700 Updated patch wk-adjustment-watcher2.diff text/plain 3269 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCBlMzI3MWNhLi5lYzNjNzA1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjkgQEAKKzIwMTMtMDctMjMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEd0a0FkanVzdG1lbnRXYXRjaGVyIGlkbGUg c291cmNlIG5vdCBjb3JyZWN0bHkgaGFuZGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5MDAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgR3RrQWRqdXN0bWVudFdhdGNoZXI6OnVwZGF0ZUFkanVzdG1l bnRzRnJvbVNjcm9sbGJhcnNMYXRlcigpCisgICAgICAgIGNyZWF0ZXMgYSBuZXcgaWRsZSBzb3Vy Y2UgYW5kIGluaXRpYWxpemVzCisgICAgICAgIG1fdXBkYXRlQWRqdXN0bWVudENhbGxiYWNrSWQs IHdoaWNoIGlzIHVzZWQgZXZlcnl3aGVyZSBhbmQKKyAgICAgICAgc3BlY2lhbGx5IGluIHRoZSBk ZXN0cnVjdG9yIHRvIGNhbmNlbCB0aGUgc291cmNlIHdoZW4gdGhlCisgICAgICAgIEd0a0FkanVz dG1lbnRXYXRjaGVyIGlzIGRlbGV0ZWQuIEhvd2V2ZXIsCisgICAgICAgIG1fdXBkYXRlQWRqdXN0 bWVudENhbGxiYWNrSWQgaXMgcmVzZXQgdG8gMCBpbgorICAgICAgICBHdGtBZGp1c3RtZW50V2F0 Y2hlcjo6dXBkYXRlQWRqdXN0bWVudHNGcm9tU2Nyb2xsYmFycygpIG9ubHkgd2hlbgorICAgICAg ICBub3QgcmV0dXJuaW5nIGVhcmx5LiBUaGlzIG1ldGhvZCBpcyBwdWJsaWMgYW5kIG5vdCBvbmx5 IGNhbGxlZCBieQorICAgICAgICB0aGUgdXBkYXRlQWRqdXN0bWVudENhbGxiYWNrLCB3aGljaCBt ZWFucyB0aGF0IGEgY2FsbCB0bworICAgICAgICB1cGRhdGVBZGp1c3RtZW50c0Zyb21TY3JvbGxi YXJzIGNvdWxkIHJlc2V0IHRoZQorICAgICAgICBtX3VwZGF0ZUFkanVzdG1lbnRDYWxsYmFja0lk IHdpdGhvdXQgYWN0dWFsbHkgZGVzdHJveWluZyB0aGUgc291cmNlLgorCisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvR3RrQWRqdXN0bWVudFdhdGNoZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpH dGtBZGp1c3RtZW50V2F0Y2hlcjo6dXBkYXRlQWRqdXN0bWVudHNGcm9tU2Nyb2xsYmFycyk6Cisg ICAgICAgIENhbmNlbCB0aGUgYWRqdXN0bWVudCBsYXRlciBpZGxlIGlmIGl0IGhhcyBiZWVuIHNj aGVkdWxlZC4KKyAgICAgICAgKFdlYktpdDo6R3RrQWRqdXN0bWVudFdhdGNoZXI6OnVwZGF0ZUFk anVzdG1lbnRDYWxsYmFjayk6IFJlc2V0CisgICAgICAgIG1fdXBkYXRlQWRqdXN0bWVudENhbGxi YWNrSWQuCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvR3RrQWRqdXN0bWVudFdhdGNoZXIuaDoK KwogMjAxMy0wNy0xNyAgS2FuZ2lsIEhhbiAgPGthbmdpbC5oYW5Ac2Ftc3VuZy5jb20+CiAKICAg ICAgICAgVXNlIHRvSFRNTE1lZGlhRWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9n dGsvV2ViQ29yZVN1cHBvcnQvR3RrQWRqdXN0bWVudFdhdGNoZXIuY3BwIGIvU291cmNlL1dlYktp dC9ndGsvV2ViQ29yZVN1cHBvcnQvR3RrQWRqdXN0bWVudFdhdGNoZXIuY3BwCmluZGV4IGI3OGQx MmUuLjI0YjA0MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0 L0d0a0FkanVzdG1lbnRXYXRjaGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3Jl U3VwcG9ydC9HdGtBZGp1c3RtZW50V2F0Y2hlci5jcHAKQEAgLTY4LDExICs2OCwxNSBAQCB2b2lk IEd0a0FkanVzdG1lbnRXYXRjaGVyOjp1cGRhdGVBZGp1c3RtZW50c0Zyb21TY3JvbGxiYXJzKCkK ICAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IGNvcmUobV93ZWJWaWV3KS0+bWFpbkZyYW1lKCkt PnZpZXcoKTsKICAgICB1cGRhdGVBZGp1c3RtZW50RnJvbVNjcm9sbGJhcihtX2hvcml6b250YWxB ZGp1c3RtZW50LmdldCgpLCBmcmFtZVZpZXctPmhvcml6b250YWxTY3JvbGxiYXIoKSk7CiAgICAg dXBkYXRlQWRqdXN0bWVudEZyb21TY3JvbGxiYXIobV92ZXJ0aWNhbEFkanVzdG1lbnQuZ2V0KCks IGZyYW1lVmlldy0+dmVydGljYWxTY3JvbGxiYXIoKSk7Ci0gICAgbV91cGRhdGVBZGp1c3RtZW50 Q2FsbGJhY2tJZCA9IDA7CisgICAgaWYgKG1fdXBkYXRlQWRqdXN0bWVudENhbGxiYWNrSWQpIHsK KyAgICAgICAgZ19zb3VyY2VfcmVtb3ZlKG1fdXBkYXRlQWRqdXN0bWVudENhbGxiYWNrSWQpOwor ICAgICAgICBtX3VwZGF0ZUFkanVzdG1lbnRDYWxsYmFja0lkID0gMDsKKyAgICB9CiB9CiAKLXN0 YXRpYyBnYm9vbGVhbiB1cGRhdGVBZGp1c3RtZW50Q2FsbGJhY2soR3RrQWRqdXN0bWVudFdhdGNo ZXIqIHdhdGNoZXIpCitnYm9vbGVhbiBHdGtBZGp1c3RtZW50V2F0Y2hlcjo6dXBkYXRlQWRqdXN0 bWVudENhbGxiYWNrKEd0a0FkanVzdG1lbnRXYXRjaGVyKiB3YXRjaGVyKQogeworICAgIHdhdGNo ZXItPm1fdXBkYXRlQWRqdXN0bWVudENhbGxiYWNrSWQgPSAwOwogICAgIHdhdGNoZXItPnVwZGF0 ZUFkanVzdG1lbnRzRnJvbVNjcm9sbGJhcnMoKTsKICAgICByZXR1cm4gRkFMU0U7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9HdGtBZGp1c3RtZW50V2F0 Y2hlci5oIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvR3RrQWRqdXN0bWVudFdh dGNoZXIuaAppbmRleCAyZjdiZWUzLi5lNTY5Y2RjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2d0ay9XZWJDb3JlU3VwcG9ydC9HdGtBZGp1c3RtZW50V2F0Y2hlci5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0d0a0FkanVzdG1lbnRXYXRjaGVyLmgKQEAgLTQzLDYg KzQzLDggQEAgcHVibGljOgogICAgIGJvb2wgc2Nyb2xsYmFyc0Rpc2FibGVkKCkgY29uc3QgeyBy ZXR1cm4gbV9zY3JvbGxiYXJzRGlzYWJsZWQ7IH07CiAKIHByaXZhdGU6CisgICAgc3RhdGljIGdi b29sZWFuIHVwZGF0ZUFkanVzdG1lbnRDYWxsYmFjayhHdGtBZGp1c3RtZW50V2F0Y2hlciopOwor CiAgICAgV2ViS2l0V2ViVmlldyogbV93ZWJWaWV3OwogICAgIEdSZWZQdHI8R3RrQWRqdXN0bWVu dD4gbV9ob3Jpem9udGFsQWRqdXN0bWVudDsKICAgICBHUmVmUHRyPEd0a0FkanVzdG1lbnQ+IG1f dmVydGljYWxBZGp1c3RtZW50Owo=