41926 2010-07-08 19:24:58 -0700 [GTK] Misc improvements to the scrolling code 2010-08-11 07:44:10 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Gtk P2 Normal --- 1 gustavo webkit-unassigned commit-queue webkit.review.bot xan.lopez oldest_to_newest 248687 0 gustavo 2010-07-08 19:24:58 -0700 This bug is here to track a number of small patches I am going to propose to improve the scrolling code - removing unnecessary code, making code more robust, and refactoring to enhance reusability. 248704 1 61001 gustavo 2010-07-08 20:37:59 -0700 Created attachment 61001 no need to reset adjustment on detaching A couple more will follow tomorrow. 248950 2 61039 gustavo 2010-07-09 06:26:44 -0700 Created attachment 61039 Make ScrollView and Scrollbar use GtkVersioning infrastructure 248952 3 webkit.review.bot 2010-07-09 06:27:57 -0700 Attachment 61039 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/platform/gtk/GtkVersioning.cpp:43: Use 0 instead of NULL. [readability/null] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 249010 4 61044 gustavo 2010-07-09 07:31:18 -0700 Created attachment 61044 Use signal connections for disconnecting signals, instead of matching 249610 5 61039 xan.lopez 2010-07-11 03:13:34 -0700 Comment on attachment 61039 Make ScrollView and Scrollbar use GtkVersioning infrastructure Do you really need to #define the actual name to a private name? Why not simply implement the function when the GTK+ is too old? 249611 6 61001 xan.lopez 2010-07-11 03:15:02 -0700 Comment on attachment 61001 no need to reset adjustment on detaching What I understand from the comment is that it's important to do this on destroy for some effects to happen, so waiting until something is re-attached would be wrong (?). 249612 7 61044 xan.lopez 2010-07-11 03:15:44 -0700 Comment on attachment 61044 Use signal connections for disconnecting signals, instead of matching Was this causing any problem? 249790 8 61001 gustavo 2010-07-12 06:11:53 -0700 Comment on attachment 61001 no need to reset adjustment on detaching (In reply to comment #6) > (From update of attachment 61001 [details]) > What I understand from the comment is that it's important to do this on destroy for some effects to happen, so waiting until something is re-attached would be wrong (?). Yes, after reading the original commit and testing I think you are totally right. 249791 9 gustavo 2010-07-12 06:13:07 -0700 (In reply to comment #5) > (From update of attachment 61039 [details]) > Do you really need to #define the actual name to a private name? Why not simply implement the function when the GTK+ is too old? That would be more in line with the other stuff we do, indeed, I'll update the patch. 249792 10 gustavo 2010-07-12 06:16:10 -0700 (In reply to comment #7) > (From update of attachment 61044 [details]) > Was this causing any problem? None that I could see, but since we can keep the IDs easily enough, and make the disconnection more explicit, it seems like a good idea to have. 249804 11 61223 gustavo 2010-07-12 06:46:36 -0700 Created attachment 61223 make ScrollView and Scrollbar GtkVersioning users Address comments by Xan and that the first patch is no more. 249808 12 61223 xan.lopez 2010-07-12 06:57:20 -0700 Comment on attachment 61223 make ScrollView and Scrollbar GtkVersioning users OK. 259110 13 61044 xan.lopez 2010-08-02 14:14:37 -0700 Comment on attachment 61044 Use signal connections for disconnecting signals, instead of matching Seeing that this is more code and we don't really need the extra precision it brings I don't really agree with the change to be honest. So marking r- for now, you can try harder to convince me! 263044 14 61223 abarth 2010-08-10 22:56:58 -0700 Comment on attachment 61223 make ScrollView and Scrollbar GtkVersioning users Shall we land this patch? 263208 15 61223 gustavo 2010-08-11 05:57:33 -0700 Comment on attachment 61223 make ScrollView and Scrollbar GtkVersioning users I forgot about it, thanks Adam! 263250 16 61223 commit-queue 2010-08-11 07:44:06 -0700 Comment on attachment 61223 make ScrollView and Scrollbar GtkVersioning users Clearing flags on attachment: 61223 Committed r65155: <http://trac.webkit.org/changeset/65155> 263251 17 commit-queue 2010-08-11 07:44:10 -0700 All reviewed patches have been landed. Closing bug. 61001 2010-07-08 20:37:59 -0700 2010-07-12 06:11:53 -0700 no need to reset adjustment on detaching 0001-No-need-to-reset-the-adjustment-on-detaching.patch text/plain 2034 gustavo RnJvbSAwZGU5ZGQxNzNkM2QxOTM5OTI3MjNiMjY0MjJiMTNlYTFiZDkyMDIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IEZyaSwgOSBKdWwgMjAxMCAwMDozNjo1MCAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIE5v IG5lZWQgdG8gcmVzZXQgdGhlIGFkanVzdG1lbnQgb24gZGV0YWNoaW5nCgotLS0KIFdlYkNvcmUv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgfCAgIDEzICsrKysrKysrKysrKysKIFdlYkNv cmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5jcHAgfCAgIDEyIC0tLS0tLS0tLS0tLQogMiBm aWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDY2YjlkZWMu LjkwOWM5OGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDctMDggIEd1c3Rhdm8gTm9yb25oYSBTaWx2 YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gTWlzYyBpbXByb3ZlbWVudHMgdG8g dGhlIHNjcm9sbGluZyBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00MTkyNgorCisgICAgICAgIE5vIHJlYXNvbiB0byByZXNldCB0aGUgYWRqdXN0 bWVudCB3aGVuIGRlc3Ryb3lpbmcgc2Nyb2xsYmFycy4gVGhleQorICAgICAgICBnZXQgcmVzZXQg dG8gYXBwcm9wcmlhdGUgdmFsdWVzIHdoZW4gYXR0YWNoaW5nLgorCisgICAgICAgICogcGxhdGZv cm0vZ3RrL1Njcm9sbGJhckd0ay5jcHA6CisgICAgICAgIChTY3JvbGxiYXJHdGs6OmRldGFjaEFk anVzdG1lbnQpOgorCiAyMDEwLTA3LTA4ICBFcmlrIEFydmlkc3NvbiAgPGFydkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2phbiBWYWZhaS4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9T Y3JvbGxiYXJHdGsuY3BwCmluZGV4IDgwODFmYjguLjI5ZGI5ZWYgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvU2Nyb2xsYmFyR3RrLmNwcApAQCAtMTE3LDE4ICsxMTcsNiBAQCB2b2lkIFNjcm9sbGJhckd0 azo6ZGV0YWNoQWRqdXN0bWVudCgpCiAKICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0 X2J5X2Z1bmMoR19PQkpFQ1QobV9hZGp1c3RtZW50KSwgKGdwb2ludGVyKVNjcm9sbGJhckd0azo6 Z3RrVmFsdWVDaGFuZ2VkLCB0aGlzKTsKIAotICAgIC8vIEZvciB0aGUgY2FzZSB3aGVyZSB3ZSBv bmx5IG9wZXJhdGUgb24gdGhlIEd0a0FkanVzdG1lbnQgaXQgaXMgYmVzdCB0bwotICAgIC8vIHJl c2V0IHRoZSB2YWx1ZXMgc28gdGhhdCB0aGUgc3Vycm91bmRpbmcgc2Nyb2xsYmFyIGdldHMgdXBk YXRlZCwgb3IKLSAgICAvLyBlLmcuIGZvciBhIEd0a1Njcm9sbGVkV2luZG93IHRoZSBzY3JvbGxi YXIgZ2V0cyBoaWRkZW4uCi0jaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTQsIDApCi0gICAgZ3Rr X2FkanVzdG1lbnRfY29uZmlndXJlKG1fYWRqdXN0bWVudCwgMCwgMCwgMCwgMCwgMCwgMCk7Ci0j ZWxzZQotICAgIG1fYWRqdXN0bWVudC0+bG93ZXIgPSAwOwotICAgIG1fYWRqdXN0bWVudC0+dXBw ZXIgPSAwOwotICAgIG1fYWRqdXN0bWVudC0+dmFsdWUgPSAwOwotICAgIGd0a19hZGp1c3RtZW50 X2NoYW5nZWQobV9hZGp1c3RtZW50KTsKLSAgICBndGtfYWRqdXN0bWVudF92YWx1ZV9jaGFuZ2Vk KG1fYWRqdXN0bWVudCk7Ci0jZW5kaWYKICAgICBnX29iamVjdF91bnJlZihtX2FkanVzdG1lbnQp OwogICAgIG1fYWRqdXN0bWVudCA9IDA7CiB9Ci0tIAoxLjcuMQoK 61039 2010-07-09 06:26:44 -0700 2010-07-12 06:46:36 -0700 Make ScrollView and Scrollbar use GtkVersioning infrastructure 0001-Make-ScrollViewGtk-and-ScrollbarGtk-use-GtkVersionin.patch text/plain 8193 gustavo RnJvbSA4NDc1MGUwY2RiNDU5NTVjMjIwMTExMzMyN2E3MTI1MGMwYWM2YmJkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IEZyaSwgOSBKdWwgMjAxMCAxMDoyNDo1OSAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIE1h a2UgU2Nyb2xsVmlld0d0ayBhbmQgU2Nyb2xsYmFyR3RrIHVzZSBHdGtWZXJzaW9uaW5nIGluZnJh c3RydWN0dXJlCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgIHwg ICAxOCArKysrKysrKysrKwogV2ViQ29yZS9HTlVtYWtlZmlsZS5hbSAgICAgICAgICAgICAgICAg fCAgICAxICsKIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuY3BwIHwgICA1MCAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3Rr VmVyc2lvbmluZy5oICAgfCAgICA3ICsrKysKIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbFZp ZXdHdGsuY3BwIHwgICAyNCArLS0tLS0tLS0tLS0tLS0KIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL1Nj cm9sbGJhckd0ay5jcHAgIHwgICAyMCArKy0tLS0tLS0tLS0tCiA2IGZpbGVzIGNoYW5nZWQsIDgw IGluc2VydGlvbnMoKyksIDQwIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IFdlYkNv cmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuY3BwCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9D aGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5MDljOThkLi5jOTBmNTU1IDEwMDY0 NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDIxIEBACisyMDEwLTA3LTA5ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5v cm9uaGFAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtHVEtdIE1pc2MgaW1wcm92ZW1lbnRzIHRvIHRoZSBzY3JvbGxpbmcg Y29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE5 MjYKKworICAgICAgICBSZWZhY3RvciBjb2RlIHRoYXQgdXNlcyBkZXByZWNhdGVkIHdheXMgb2Yg ZGVhbGluZyB3aXRoIHRoZQorICAgICAgICBhZGp1c3RtZW50cyB0byB1c2UgdGhlIEd0a1ZlcnNp b25pbmcgaW5mcmFzdHJ1Y3R1cmUuCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5jcHA6IEFkZGVkLgorICAgICAgICAqIHBs YXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Njcm9s bFZpZXdHdGsuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsuY3BwOgor ICAgICAgICAoU2Nyb2xsYmFyR3RrOjp1cGRhdGVUaHVtYlBvc2l0aW9uKToKKyAgICAgICAgKFNj cm9sbGJhckd0azo6dXBkYXRlVGh1bWJQcm9wb3J0aW9uKToKKwogMjAxMC0wNy0wOCAgR3VzdGF2 byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KIAogICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvR05V bWFrZWZpbGUuYW0gYi9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtCmluZGV4IDQyYjI1OTkuLmE2ZWY5 YmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0KKysrIGIvV2ViQ29yZS9HTlVt YWtlZmlsZS5hbQpAQCAtMjIxNiw2ICsyMjE2LDcgQEAgd2ViY29yZWd0a19zb3VyY2VzICs9IFwK IAlXZWJDb3JlL3BsYXRmb3JtL2d0ay9ndGtkcmF3aW5nLmggXAogCVdlYkNvcmUvcGxhdGZvcm0v Z3RrL0d0a1BsdWdpbldpZGdldC5jcHAgXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1BsdWdp bldpZGdldC5oIFwKKwlXZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmNwcCBcCiAJ V2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oIFwKIAlXZWJDb3JlL3BsYXRmb3Jt L2d0ay9LZXlFdmVudEd0ay5jcHAgXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3RrL0tVUkxHdGsuY3Bw IFwKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuY3BwIGIv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uZDJkMjEzNAotLS0gL2Rldi9udWxsCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuY3BwCkBAIC0wLDAgKzEsNTAgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTAgQ29sbGFib3JhIEx0ZC4KKyAqCisgKiAgVGhpcyBsaWJyYXJ5IGlzIGZy ZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorICogIG1vZGlmeSBp dCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCisgKiAg TGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0 aGVyCisgKiAgdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRpb24pIGFu eSBsYXRlciB2ZXJzaW9uLgorICoKKyAqICBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4g dGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAqICBidXQgV0lUSE9VVCBBTlkgV0FS UkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICogIE1FUkNIQU5U QUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05V CisgKiAgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisg KgorICogIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5 IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAqICBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgc2Vl IHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bworICogIHRoZSBGcmVlIFNv ZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3Is CisgKiAgQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisgKi8KKworI2luY2x1ZGUgImNvbmZp Zy5oIgorI2luY2x1ZGUgIkd0a1ZlcnNpb25pbmcuaCIKKworI2luY2x1ZGUgPGd0ay9ndGsuaD4K KworI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxNCwgMCkKK3ZvaWQgV2ViS2l0R3RrQWRqdXN0 bWVudFNldHZhbHVlKEd0a0FkanVzdG1lbnQqIGFkanVzbWVudCwgZ2RvdWJsZSB2YWx1ZSkKK3sK KyAgICAgICAgbV9hZGp1c3RtZW50LT52YWx1ZSA9IG1fY3VycmVudFBvczsKKyAgICAgICAgZ3Rr X2FkanVzdG1lbnRfdmFsdWVfY2hhbmdlZChtX2FkanVzdG1lbnQpOworfQorCit2b2lkIFdlYktp dEd0a0FkanVzdG1lbnRDb25maWd1cmUoR3RrQWRqdXN0bWVudCogYWRqdXN0bWVudCwgZ2RvdWJs ZSB2YWx1ZSwgZ2RvdWJsZSBsb3dlciwgZ2RvdWJsZSB1cHBlciwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBnZG91YmxlIHN0ZXBJbmNyZW1lbnQsIGdkb3VibGUgcGFnZUluY3Jl bWVudCwgZ2RvdWJsZSBwYWdlU2l6ZSkKK3sKKyAgICBnX29iamVjdF9mcmVlemVfbm90aWZ5KEdf T0JKRUNUKGFkanVzdG1lbnQpKTsKKworICAgIGdfb2JqZWN0X3NldChhZGp1c3RtZW50LAorICAg ICAgICAgICAgICAgICAibG93ZXIiLCBsb3dlciwKKyAgICAgICAgICAgICAgICAgInVwcGVyIiwg dXBwZXIsCisgICAgICAgICAgICAgICAgICJzdGVwLWluY3JlbWVudCIsIHN0ZXBJbmNyZW1lbnQs CisgICAgICAgICAgICAgICAgICJwYWdlLWluY3JlbWVudCIsIHBhZ2VJbmNyZW1lbnQsCisgICAg ICAgICAgICAgICAgICJwYWdlLXNpemUiLCBwYWdlU2l6ZSwKKyAgICAgICAgICAgICAgICAgTlVM TCk7CisKKyAgICBnX29iamVjdF90aGF3X25vdGlmeShHX09CSkVDVChhZGp1c3RtZW50KSk7CisK KyAgICBndGtfYWRqdXN0bWVudF9jaGFuZ2VkKGFkanVzdG1lbnQpOworICAgIGd0a19hZGp1c3Rt ZW50X3ZhbHVlX2NoYW5nZWQoYWRqdXN0bWVudCk7Cit9CisjZW5kaWYKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L0d0a1ZlcnNpb25pbmcuaAppbmRleCA4ODVkNjlmLi5mMGRjNTAzIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvR3RrVmVyc2lvbmluZy5oCkBAIC01Niw2ICs1NiwxMyBAQAogI2RlZmluZSBndGtfc2VsZWN0 aW9uX2RhdGFfZ2V0X2xlbmd0aChkYXRhKSAoZGF0YSktPmxlbmd0aAogI2RlZmluZSBndGtfc2Vs ZWN0aW9uX2RhdGFfZ2V0X2RhdGEoZGF0YSkgKGRhdGEpLT5kYXRhCiAjZGVmaW5lIGd0a19hZGp1 c3RtZW50X3NldF9wYWdlX3NpemUoYWRqLCB2YWx1ZSkgKGFkaiktPnBhZ2Vfc2l6ZSA9IHZhbHVl CisKKyNkZWZpbmUgZ3RrX2FkanVzdG1lbnRfY29uZmlndXJlIFdlYktpdEd0a0FkanVzdG1lbnRD b25maWd1cmUKK3ZvaWQgV2ViS2l0R3RrQWRqdXN0bWVudENvbmZpZ3VyZShHdGtBZGp1c3RtZW50 KiBhZGp1c3RtZW50LCBnZG91YmxlIHZhbHVlLCBnZG91YmxlIGxvd2VyLCBnZG91YmxlIHVwcGVy LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdkb3VibGUgc3RlcEluY3JlbWVu dCwgZ2RvdWJsZSBwYWdlSW5jcmVtZW50LCBnZG91YmxlIHBhZ2VTaXplKTsKKworI2RlZmluZSBn dGtfYWRqdXN0bWVudF9zZXRfdmFsdWUgV2ViS2l0R3RrQWRqdXN0bWVudFNldFZhbHVlCit2b2lk IFdlYktpdEd0a0FkanVzdG1lbnRTZXR2YWx1ZShHdGtBZGp1c3RtZW50KiBhZGp1c21lbnQsIGdk b3VibGUgdmFsdWUpCiAjZW5kaWYgLy8gR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTQsIDApCiAKICNl bmRpZiAvLyBHdGtWZXJzaW9uaW5nX2gKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1Njcm9sbFZpZXdHdGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5j cHAKaW5kZXggZTcwNWZlMC4uODcxYTBiZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvU2Nyb2xsVmlld0d0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmll d0d0ay5jcHAKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUg IkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgorI2luY2x1ZGUgIkd0 a1ZlcnNpb25pbmcuaCIKICNpbmNsdWRlICJIb3N0V2luZG93LmgiCiAjaW5jbHVkZSAiSW50UmVj dC5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKQEAgLTcyLDI5ICs3Myw2IEBAIFBhc3NSZWZQdHI8U2Ny b2xsYmFyPiBTY3JvbGxWaWV3OjpjcmVhdGVTY3JvbGxiYXIoU2Nyb2xsYmFyT3JpZW50YXRpb24g b3JpZW50YXRpCiAgICAgICAgIHJldHVybiBTY3JvbGxiYXI6OmNyZWF0ZU5hdGl2ZVNjcm9sbGJh cih0aGlzLCBvcmllbnRhdGlvbiwgUmVndWxhclNjcm9sbGJhcik7CiB9CiAKLSNpZiAhR1RLX0NI RUNLX1ZFUlNJT04oMiwgMTQsIDApCi0jZGVmaW5lIGd0a19hZGp1c3RtZW50X2NvbmZpZ3VyZSBB ZGp1c3RtZW50Q29uZmlndXJlCi0KLXN0YXRpYyB2b2lkIEFkanVzdG1lbnRDb25maWd1cmUoR3Rr QWRqdXN0bWVudCogYWRqdXN0bWVudCwgZ2RvdWJsZSB2YWx1ZSwgZ2RvdWJsZSBsb3dlciwgZ2Rv dWJsZSB1cHBlciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2RvdWJsZSBzdGVw SW5jcmVtZW50LCBnZG91YmxlIHBhZ2VJbmNyZW1lbnQsIGdkb3VibGUgcGFnZVNpemUpCi17Ci0g ICAgZ19vYmplY3RfZnJlZXplX25vdGlmeShHX09CSkVDVChhZGp1c3RtZW50KSk7Ci0KLSAgICBn X29iamVjdF9zZXQoYWRqdXN0bWVudCwKLSAgICAgICAgICAgICAgICAgImxvd2VyIiwgbG93ZXIs Ci0gICAgICAgICAgICAgICAgICJ1cHBlciIsIHVwcGVyLAotICAgICAgICAgICAgICAgICAic3Rl cC1pbmNyZW1lbnQiLCBzdGVwSW5jcmVtZW50LAotICAgICAgICAgICAgICAgICAicGFnZS1pbmNy ZW1lbnQiLCBwYWdlSW5jcmVtZW50LAotICAgICAgICAgICAgICAgICAicGFnZS1zaXplIiwgcGFn ZVNpemUsCi0gICAgICAgICAgICAgICAgIE5VTEwpOwotCi0gICAgZ19vYmplY3RfdGhhd19ub3Rp ZnkoR19PQkpFQ1QoYWRqdXN0bWVudCkpOwotCi0gICAgZ3RrX2FkanVzdG1lbnRfY2hhbmdlZChh ZGp1c3RtZW50KTsKLSAgICBndGtfYWRqdXN0bWVudF92YWx1ZV9jaGFuZ2VkKGFkanVzdG1lbnQp OwotfQotI2VuZGlmCi0KIC8qCiAgKiBUaGUgZm9sbG93aW5nIGlzIGFzc3VtZWQ6CiAgKiAgICho YWRqICYmIHZhZGopIHx8ICghaGFkaiAmJiAhdmFkaikKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxi YXJHdGsuY3BwCmluZGV4IDI5ZGI5ZWYuLmIwNTdjYjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Ny b2xsYmFyR3RrLmNwcApAQCAtMjAsMTAgKzIwLDEwIEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiU2Nyb2xsYmFyR3RrLmgiCiAKKyNpbmNsdWRlICJGcmFtZVZpZXcuaCIKKyNpbmNs dWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJHdGtWZXJzaW9uaW5nLmgiCiAjaW5j bHVkZSAiSW50UmVjdC5oIgotI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgotI2luY2x1ZGUg IkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIlNjcm9sbGJhclRoZW1lLmgiCiAKICNpbmNsdWRlIDxn dGsvZ3RrLmg+CkBAIC0xNTAsMTkgKzE1MCwxMiBAQCB2b2lkIFNjcm9sbGJhckd0azo6ZnJhbWVS ZWN0c0NoYW5nZWQoKQogCiB2b2lkIFNjcm9sbGJhckd0azo6dXBkYXRlVGh1bWJQb3NpdGlvbigp CiB7Ci0gICAgaWYgKGd0a19hZGp1c3RtZW50X2dldF92YWx1ZShtX2FkanVzdG1lbnQpICE9IG1f Y3VycmVudFBvcykgewotI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE0LCAwKQorICAgIGlmIChn dGtfYWRqdXN0bWVudF9nZXRfdmFsdWUobV9hZGp1c3RtZW50KSAhPSBtX2N1cnJlbnRQb3MpCiAg ICAgICAgIGd0a19hZGp1c3RtZW50X3NldF92YWx1ZShtX2FkanVzdG1lbnQsIG1fY3VycmVudFBv cyk7Ci0jZWxzZQotICAgICAgICBtX2FkanVzdG1lbnQtPnZhbHVlID0gbV9jdXJyZW50UG9zOwot ICAgICAgICBndGtfYWRqdXN0bWVudF92YWx1ZV9jaGFuZ2VkKG1fYWRqdXN0bWVudCk7Ci0jZW5k aWYKLSAgICB9CiB9CiAKIHZvaWQgU2Nyb2xsYmFyR3RrOjp1cGRhdGVUaHVtYlByb3BvcnRpb24o KQogewotI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE0LCAwKQogICAgIGd0a19hZGp1c3RtZW50 X2NvbmZpZ3VyZShtX2FkanVzdG1lbnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGd0 a19hZGp1c3RtZW50X2dldF92YWx1ZShtX2FkanVzdG1lbnQpLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBndGtfYWRqdXN0bWVudF9nZXRfbG93ZXIobV9hZGp1c3RtZW50KSwKQEAgLTE3 MCwxMyArMTYzLDYgQEAgdm9pZCBTY3JvbGxiYXJHdGs6OnVwZGF0ZVRodW1iUHJvcG9ydGlvbigp CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fbGluZVN0ZXAsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1fcGFnZVN0ZXAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1fdmlzaWJsZVNpemUpOwotI2Vsc2UKLSAgICBtX2FkanVzdG1lbnQtPnN0ZXBfaW5jcmVtZW50 ID0gbV9saW5lU3RlcDsKLSAgICBtX2FkanVzdG1lbnQtPnBhZ2VfaW5jcmVtZW50ID0gbV9wYWdl U3RlcDsKLSAgICBtX2FkanVzdG1lbnQtPnBhZ2Vfc2l6ZSA9IG1fdmlzaWJsZVNpemU7Ci0gICAg bV9hZGp1c3RtZW50LT51cHBlciA9IG1fdG90YWxTaXplOwotICAgIGd0a19hZGp1c3RtZW50X2No YW5nZWQobV9hZGp1c3RtZW50KTsKLSNlbmRpZgogfQogCiB2b2lkIFNjcm9sbGJhckd0azo6c2V0 RnJhbWVSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCi0tIAoxLjcuMQoK 61044 2010-07-09 07:31:18 -0700 2010-08-02 14:14:37 -0700 Use signal connections for disconnecting signals, instead of matching 0001-Use-signal-connection-IDs-for-disconnecting.patch text/plain 5330 gustavo RnJvbSA1NDYyYWNjMWFlYjM5MWYxMjFhMGYyMjE1Mjc3NTU1ODA3OTM0NmMyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IEZyaSwgOSBKdWwgMjAxMCAxMToyMDozOCAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIFVz ZSBzaWduYWwgY29ubmVjdGlvbiBJRHMgZm9yIGRpc2Nvbm5lY3RpbmcKCi0tLQogV2ViQ29yZS9D aGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICB8ICAgMTggKysrKysrKysrKysrKysrKysrCiBX ZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsuY3BwIHwgICAzMCArKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0KIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5oICAg fCAgICAyICsrCiAzIGZpbGVzIGNoYW5nZWQsIDQzIGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCBjOTBmNTU1Li40MTc2ODU3IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtNSw2ICs1LDI0IEBACiAgICAgICAgIFtHVEtdIE1pc2Mg aW1wcm92ZW1lbnRzIHRvIHRoZSBzY3JvbGxpbmcgY29kZQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE5MjYKIAorICAgICAgICBEaXNjb25uZWN0IGZy b20gc2lnbmFscyB1c2luZyB0aGUgY29ubmVjdGlvbiBJRHMgaW5zdGVhZCBvZiBtb3JlCisgICAg ICAgIGxpYmVyYWwgbWF0Y2hpbmcuIEFsc28gZGlzY29ubmVjdCBmcm9tIHRoZSBzY3JvbGxiYXIn cworICAgICAgICBzY3JvbGwtZXZlbnQgc2lnbmFsIG9uIGRlc3RydWN0aW9uLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5jcHA6CisgICAgICAgIChTY3JvbGxiYXJHdGs6 OlNjcm9sbGJhckd0ayk6CisgICAgICAgIChTY3JvbGxiYXJHdGs6On5TY3JvbGxiYXJHdGspOgor ICAgICAgICAoU2Nyb2xsYmFyR3RrOjphdHRhY2hBZGp1c3RtZW50KToKKyAgICAgICAgKFNjcm9s bGJhckd0azo6ZGV0YWNoQWRqdXN0bWVudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Njcm9s bGJhckd0ay5oOgorCisyMDEwLTA3LTA5ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZv Lm5vcm9uaGFAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtHVEtdIE1pc2MgaW1wcm92ZW1lbnRzIHRvIHRoZSBzY3JvbGxp bmcgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDE5MjYKKwogICAgICAgICBSZWZhY3RvciBjb2RlIHRoYXQgdXNlcyBkZXByZWNhdGVkIHdheXMg b2YgZGVhbGluZyB3aXRoIHRoZQogICAgICAgICBhZGp1c3RtZW50cyB0byB1c2UgdGhlIEd0a1Zl cnNpb25pbmcgaW5mcmFzdHJ1Y3R1cmUuCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL1Njcm9sbGJhckd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsu Y3BwCmluZGV4IGIwNTdjYjAuLmM0MDdlMjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL1Njcm9sbGJhckd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFy R3RrLmNwcApAQCAtNTIsMTQgKzUyLDE3IEBAIFNjcm9sbGJhckd0azo6U2Nyb2xsYmFyR3RrKFNj cm9sbGJhckNsaWVudCogY2xpZW50LCBTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICBTY3JvbGxiYXJDb250cm9sU2l6ZSBjb250cm9sU2l6ZSkK ICAgICA6IFNjcm9sbGJhcihjbGllbnQsIG9yaWVudGF0aW9uLCBjb250cm9sU2l6ZSkKICAgICAs IG1fYWRqdXN0bWVudChHVEtfQURKVVNUTUVOVChndGtfYWRqdXN0bWVudF9uZXcoMC4wLCAwLjAs IDAuMCwgMC4wLCAwLjAsIDAuMCkpKQorICAgICwgbV92YWx1ZUNoYW5nZWRJRCgwKQorICAgICwg bV9zY3JvbGxFdmVudElEKDApCiB7CiAgICAgR3RrV2lkZ2V0KiBzY3JvbGxCYXIgPSBvcmllbnRh dGlvbiA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyID8KICAgICAgICAgICAgICAgICAgICAgICAgICAg IGd0a19oc2Nyb2xsYmFyX25ldyhtX2FkanVzdG1lbnQpOgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgZ3RrX3ZzY3JvbGxiYXJfbmV3KG1fYWRqdXN0bWVudCk7CiAgICAgZ3RrX3dpZGdldF9z aG93KHNjcm9sbEJhcik7CiAgICAgZ19vYmplY3RfcmVmKG1fYWRqdXN0bWVudCk7Ci0gICAgZ19z aWduYWxfY29ubmVjdChtX2FkanVzdG1lbnQsICJ2YWx1ZS1jaGFuZ2VkIiwgR19DQUxMQkFDSyhT Y3JvbGxiYXJHdGs6Omd0a1ZhbHVlQ2hhbmdlZCksIHRoaXMpOwotICAgIGdfc2lnbmFsX2Nvbm5l Y3Qoc2Nyb2xsQmFyLCAic2Nyb2xsLWV2ZW50IiwgR19DQUxMQkFDSyhndGtTY3JvbGxFdmVudENh bGxiYWNrKSwgdGhpcyk7CisKKyAgICBtX3ZhbHVlQ2hhbmdlZElEID0gZ19zaWduYWxfY29ubmVj dChtX2FkanVzdG1lbnQsICJ2YWx1ZS1jaGFuZ2VkIiwgR19DQUxMQkFDSyhTY3JvbGxiYXJHdGs6 Omd0a1ZhbHVlQ2hhbmdlZCksIHRoaXMpOworICAgIG1fc2Nyb2xsRXZlbnRJRCA9IGdfc2lnbmFs X2Nvbm5lY3Qoc2Nyb2xsQmFyLCAic2Nyb2xsLWV2ZW50IiwgR19DQUxMQkFDSyhndGtTY3JvbGxF dmVudENhbGxiYWNrKSwgdGhpcyk7CiAKICAgICBzZXRQbGF0Zm9ybVdpZGdldChzY3JvbGxCYXIp OwogCkBAIC03OSw5ICs4MiwxMiBAQCBTY3JvbGxiYXJHdGs6OlNjcm9sbGJhckd0ayhTY3JvbGxi YXJDbGllbnQqIGNsaWVudCwgU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YQogU2Nyb2xsYmFy R3RrOjpTY3JvbGxiYXJHdGsoU2Nyb2xsYmFyQ2xpZW50KiBjbGllbnQsIFNjcm9sbGJhck9yaWVu dGF0aW9uIG9yaWVudGF0aW9uLCBHdGtBZGp1c3RtZW50KiBhZGp1c3RtZW50KQogICAgIDogU2Ny b2xsYmFyKGNsaWVudCwgb3JpZW50YXRpb24sIFJlZ3VsYXJTY3JvbGxiYXIpCiAgICAgLCBtX2Fk anVzdG1lbnQoYWRqdXN0bWVudCkKKyAgICAsIG1fdmFsdWVDaGFuZ2VkSUQoMCkKKyAgICAsIG1f c2Nyb2xsRXZlbnRJRCgwKQogewogICAgIGdfb2JqZWN0X3JlZihtX2FkanVzdG1lbnQpOwotICAg IGdfc2lnbmFsX2Nvbm5lY3QobV9hZGp1c3RtZW50LCAidmFsdWUtY2hhbmdlZCIsIEdfQ0FMTEJB Q0soU2Nyb2xsYmFyR3RrOjpndGtWYWx1ZUNoYW5nZWQpLCB0aGlzKTsKKworICAgIG1fdmFsdWVD aGFuZ2VkSUQgPSBnX3NpZ25hbF9jb25uZWN0KG1fYWRqdXN0bWVudCwgInZhbHVlLWNoYW5nZWQi LCBHX0NBTExCQUNLKFNjcm9sbGJhckd0azo6Z3RrVmFsdWVDaGFuZ2VkKSwgdGhpcyk7CiAKICAg ICAvLyBXZSBoYXZlIG5vdGhpbmcgdG8gc2hvdyBhcyB3ZSBhcmUgc29sZWx5IG9wZXJhdGluZyBv biB0aGUgR3RrQWRqdXN0bWVudAogICAgIHJlc2l6ZSgwLCAwKTsKQEAgLTg5LDggKzk1LDEzIEBA IFNjcm9sbGJhckd0azo6U2Nyb2xsYmFyR3RrKFNjcm9sbGJhckNsaWVudCogY2xpZW50LCBTY3Jv bGxiYXJPcmllbnRhdGlvbiBvcmllbnRhCiAKIFNjcm9sbGJhckd0azo6flNjcm9sbGJhckd0aygp CiB7Ci0gICAgaWYgKG1fYWRqdXN0bWVudCkKLSAgICAgICAgZGV0YWNoQWRqdXN0bWVudCgpOwor ICAgIGlmIChtX3Njcm9sbEV2ZW50SUQpIHsKKyAgICAgICAgQVNTRVJUKHBsYXRmb3JtV2lkZ2V0 KCkpOworICAgICAgICBnX3NpZ25hbF9oYW5kbGVyX2Rpc2Nvbm5lY3QocGxhdGZvcm1XaWRnZXQo KSwgbV9zY3JvbGxFdmVudElEKTsKKyAgICAgICAgbV9zY3JvbGxFdmVudElEID0gMDsKKyAgICB9 CisKKyAgICBkZXRhY2hBZGp1c3RtZW50KCk7CiB9CiAKIHZvaWQgU2Nyb2xsYmFyR3RrOjphdHRh Y2hBZGp1c3RtZW50KEd0a0FkanVzdG1lbnQqIGFkanVzdG1lbnQpCkBAIC0xMDQsNyArMTE1LDkg QEAgdm9pZCBTY3JvbGxiYXJHdGs6OmF0dGFjaEFkanVzdG1lbnQoR3RrQWRqdXN0bWVudCogYWRq dXN0bWVudCkKICAgICBtX2FkanVzdG1lbnQgPSBhZGp1c3RtZW50OwogCiAgICAgZ19vYmplY3Rf cmVmKG1fYWRqdXN0bWVudCk7Ci0gICAgZ19zaWduYWxfY29ubmVjdChtX2FkanVzdG1lbnQsICJ2 YWx1ZS1jaGFuZ2VkIiwgR19DQUxMQkFDSyhTY3JvbGxiYXJHdGs6Omd0a1ZhbHVlQ2hhbmdlZCks IHRoaXMpOworCisgICAgQVNTRVJUKCFtX3ZhbHVlQ2hhbmdlZElEKTsKKyAgICBtX3ZhbHVlQ2hh bmdlZElEID0gZ19zaWduYWxfY29ubmVjdChtX2FkanVzdG1lbnQsICJ2YWx1ZS1jaGFuZ2VkIiwg R19DQUxMQkFDSyhTY3JvbGxiYXJHdGs6Omd0a1ZhbHVlQ2hhbmdlZCksIHRoaXMpOwogCiAgICAg dXBkYXRlVGh1bWJQcm9wb3J0aW9uKCk7CiAgICAgdXBkYXRlVGh1bWJQb3NpdGlvbigpOwpAQCAt MTE1LDcgKzEyOCwxMCBAQCB2b2lkIFNjcm9sbGJhckd0azo6ZGV0YWNoQWRqdXN0bWVudCgpCiAg ICAgaWYgKCFtX2FkanVzdG1lbnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGdfc2lnbmFsX2hh bmRsZXJzX2Rpc2Nvbm5lY3RfYnlfZnVuYyhHX09CSkVDVChtX2FkanVzdG1lbnQpLCAoZ3BvaW50 ZXIpU2Nyb2xsYmFyR3RrOjpndGtWYWx1ZUNoYW5nZWQsIHRoaXMpOworICAgIGlmIChtX3ZhbHVl Q2hhbmdlZElEKSB7CisgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJfZGlzY29ubmVjdChtX2FkanVz dG1lbnQsIG1fdmFsdWVDaGFuZ2VkSUQpOworICAgICAgICBtX3ZhbHVlQ2hhbmdlZElEID0gMDsK KyAgICB9CiAKICAgICBnX29iamVjdF91bnJlZihtX2FkanVzdG1lbnQpOwogICAgIG1fYWRqdXN0 bWVudCA9IDA7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsu aCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5oCmluZGV4IGUwMmJiNTAuLmY2 MzkxYTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5oCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5oCkBAIC02Niw2ICs2Niw4IEBA IHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgZ3RrVmFsdWVDaGFuZ2VkKEd0a0FkanVzdG1lbnQq LCBTY3JvbGxiYXJHdGsqKTsKICAgICBJbnRQb2ludCBnZXRMb2NhdGlvbkluUGFyZW50V2luZG93 KGNvbnN0IEludFJlY3QmKTsKICAgICBHdGtBZGp1c3RtZW50KiBtX2FkanVzdG1lbnQ7CisgICAg dW5zaWduZWQgaW50IG1fdmFsdWVDaGFuZ2VkSUQ7CisgICAgdW5zaWduZWQgaW50IG1fc2Nyb2xs RXZlbnRJRDsKIH07CiAKIH0KLS0gCjEuNy4xCgo= 61223 2010-07-12 06:46:36 -0700 2010-08-11 07:44:05 -0700 make ScrollView and Scrollbar GtkVersioning users 0001-Make-ScrollViewGtk-and-ScrollbarGtk-use-GtkVersionin.patch text/plain 9034 gustavo RnJvbSAxMTBhN2UyMmM1ZjNjYjRhODhmMjk2NWY4NzVmZjRkNTFhNjE3ZDFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IEZyaSwgOSBKdWwgMjAxMCAxMDoyNDo1OSAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIE1h a2UgU2Nyb2xsVmlld0d0ayBhbmQgU2Nyb2xsYmFyR3RrIHVzZSBHdGtWZXJzaW9uaW5nIGluZnJh c3RydWN0dXJlCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgIHwg ICAxOSArKysrKysrKysrKysKIFdlYkNvcmUvR05VbWFrZWZpbGUuYW0gICAgICAgICAgICAgICAg IHwgICAgMSArCiBXZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmNwcCB8ICAgNTAg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0 a1ZlcnNpb25pbmcuaCAgIHwgICAgNSArKysKIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbFZp ZXdHdGsuY3BwIHwgICAyNCArLS0tLS0tLS0tLS0tLS0KIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL1Nj cm9sbGJhckd0ay5jcHAgIHwgICAzMCArKystLS0tLS0tLS0tLS0tLS0tCiA2IGZpbGVzIGNoYW5n ZWQsIDgxIGluc2VydGlvbnMoKyksIDQ4IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0 IFdlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuY3BwCgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2NmI5ZGVjLi44ZTcxY2Uw IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIyIEBACisyMDEwLTA3LTA5ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0 YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIE1pc2MgaW1wcm92ZW1lbnRzIHRvIHRoZSBzY3Jv bGxpbmcgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDE5MjYKKworICAgICAgICBSZWZhY3RvciBjb2RlIHRoYXQgdXNlcyBkZXByZWNhdGVkIHdh eXMgb2YgZGVhbGluZyB3aXRoIHRoZQorICAgICAgICBhZGp1c3RtZW50cyB0byB1c2UgdGhlIEd0 a1ZlcnNpb25pbmcgaW5mcmFzdHJ1Y3R1cmUuCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbToK KyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5jcHA6IEFkZGVkLgorICAgICAg ICAqIHBsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3Rr L1Njcm9sbFZpZXdHdGsuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsu Y3BwOgorICAgICAgICAoU2Nyb2xsYmFyR3RrOjpkZXRhY2hBZGp1c3RtZW50KToKKyAgICAgICAg KFNjcm9sbGJhckd0azo6dXBkYXRlVGh1bWJQb3NpdGlvbik6CisgICAgICAgIChTY3JvbGxiYXJH dGs6OnVwZGF0ZVRodW1iUHJvcG9ydGlvbik6CisKIDIwMTAtMDctMDggIEVyaWsgQXJ2aWRzc29u ICA8YXJ2QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBPamFuIFZhZmFpLgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbSBiL1dlYkNvcmUvR05VbWFrZWZpbGUu YW0KaW5kZXggNDJiMjU5OS4uYTZlZjliYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9HTlVtYWtlZmls ZS5hbQorKysgYi9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtCkBAIC0yMjE2LDYgKzIyMTYsNyBAQCB3 ZWJjb3JlZ3RrX3NvdXJjZXMgKz0gXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3RrL2d0a2RyYXdpbmcu aCBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrUGx1Z2luV2lkZ2V0LmNwcCBcCiAJV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvR3RrUGx1Z2luV2lkZ2V0LmggXAorCVdlYkNvcmUvcGxhdGZvcm0vZ3Rr L0d0a1ZlcnNpb25pbmcuY3BwIFwKIAlXZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5n LmggXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3RrL0tleUV2ZW50R3RrLmNwcCBcCiAJV2ViQ29yZS9w bGF0Zm9ybS9ndGsvS1VSTEd0ay5jcHAgXApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvR3RrVmVyc2lvbmluZy5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5n LmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lNzczNGE4Ci0tLSAvZGV2 L251bGwKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5jcHAKQEAgLTAs MCArMSw1MCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMCBDb2xsYWJvcmEgTHRkLgorICoK KyAqICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUg aXQgYW5kL29yCisgKiAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJh cnkgR2VuZXJhbCBQdWJsaWMKKyAqICBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBT b2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqICB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2Us IG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICogIFRoaXMgbGli cmFyeSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAor ICogIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdh cnJhbnR5IG9mCisgKiAgTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAqICBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vu c2UgZm9yIG1vcmUgZGV0YWlscy4KKyAqCisgKiAgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEg Y29weSBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorICogIGFsb25n IHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdy aXRlIHRvCisgKiAgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmts aW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwKKyAqICBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4K KyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiR3RrVmVyc2lvbmluZy5oIgor CisjaW5jbHVkZSA8Z3RrL2d0ay5oPgorCisjaWYgIUdUS19DSEVDS19WRVJTSU9OKDIsIDE0LCAw KQordm9pZCBndGtfYWRqdXN0bWVudF9zZXRfdmFsdWUoR3RrQWRqdXN0bWVudCogYWRqdXNtZW50 LCBnZG91YmxlIHZhbHVlKQoreworICAgICAgICBtX2FkanVzdG1lbnQtPnZhbHVlID0gbV9jdXJy ZW50UG9zOworICAgICAgICBndGtfYWRqdXN0bWVudF92YWx1ZV9jaGFuZ2VkKG1fYWRqdXN0bWVu dCk7Cit9CisKK3ZvaWQgZ3RrX2FkanVzdG1lbnRfY29uZmlndXJlKEd0a0FkanVzdG1lbnQqIGFk anVzdG1lbnQsIGdkb3VibGUgdmFsdWUsIGdkb3VibGUgbG93ZXIsIGdkb3VibGUgdXBwZXIsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnZG91YmxlIHN0ZXBJbmNyZW1lbnQsIGdkb3Vi bGUgcGFnZUluY3JlbWVudCwgZ2RvdWJsZSBwYWdlU2l6ZSkKK3sKKyAgICBnX29iamVjdF9mcmVl emVfbm90aWZ5KEdfT0JKRUNUKGFkanVzdG1lbnQpKTsKKworICAgIGdfb2JqZWN0X3NldChhZGp1 c3RtZW50LAorICAgICAgICAgICAgICAgICAibG93ZXIiLCBsb3dlciwKKyAgICAgICAgICAgICAg ICAgInVwcGVyIiwgdXBwZXIsCisgICAgICAgICAgICAgICAgICJzdGVwLWluY3JlbWVudCIsIHN0 ZXBJbmNyZW1lbnQsCisgICAgICAgICAgICAgICAgICJwYWdlLWluY3JlbWVudCIsIHBhZ2VJbmNy ZW1lbnQsCisgICAgICAgICAgICAgICAgICJwYWdlLXNpemUiLCBwYWdlU2l6ZSwKKyAgICAgICAg ICAgICAgICAgTlVMTCk7CisKKyAgICBnX29iamVjdF90aGF3X25vdGlmeShHX09CSkVDVChhZGp1 c3RtZW50KSk7CisKKyAgICBndGtfYWRqdXN0bWVudF9jaGFuZ2VkKGFkanVzdG1lbnQpOworICAg IGd0a19hZGp1c3RtZW50X3ZhbHVlX2NoYW5nZWQoYWRqdXN0bWVudCk7Cit9CisjZW5kaWYKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaCBiL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaAppbmRleCA4ODVkNjlmLi4zYTFiMzk4IDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCkBAIC01Niw2ICs1NiwxMSBAQAogI2RlZmlu ZSBndGtfc2VsZWN0aW9uX2RhdGFfZ2V0X2xlbmd0aChkYXRhKSAoZGF0YSktPmxlbmd0aAogI2Rl ZmluZSBndGtfc2VsZWN0aW9uX2RhdGFfZ2V0X2RhdGEoZGF0YSkgKGRhdGEpLT5kYXRhCiAjZGVm aW5lIGd0a19hZGp1c3RtZW50X3NldF9wYWdlX3NpemUoYWRqLCB2YWx1ZSkgKGFkaiktPnBhZ2Vf c2l6ZSA9IHZhbHVlCisKK3ZvaWQgZ3RrX2FkanVzdG1lbnRfY29uZmlndXJlKEd0a0FkanVzdG1l bnQqIGFkanVzdG1lbnQsIGdkb3VibGUgdmFsdWUsIGdkb3VibGUgbG93ZXIsIGdkb3VibGUgdXBw ZXIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnZG91YmxlIHN0ZXBJbmNyZW1lbnQs IGdkb3VibGUgcGFnZUluY3JlbWVudCwgZ2RvdWJsZSBwYWdlU2l6ZSk7CisKK3ZvaWQgZ3RrX2Fk anVzdG1lbnRfc2V0X3ZhbHVlKEd0a0FkanVzdG1lbnQqIGFkanVzbWVudCwgZ2RvdWJsZSB2YWx1 ZSk7CiAjZW5kaWYgLy8gR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTQsIDApCiAKICNlbmRpZiAvLyBH dGtWZXJzaW9uaW5nX2gKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbFZp ZXdHdGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5jcHAKaW5kZXgg ZTcwNWZlMC4uODcxYTBiZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xs Vmlld0d0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5jcHAK QEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lVmll dy5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgorI2luY2x1ZGUgIkd0a1ZlcnNpb25p bmcuaCIKICNpbmNsdWRlICJIb3N0V2luZG93LmgiCiAjaW5jbHVkZSAiSW50UmVjdC5oIgogI2lu Y2x1ZGUgIlBhZ2UuaCIKQEAgLTcyLDI5ICs3Myw2IEBAIFBhc3NSZWZQdHI8U2Nyb2xsYmFyPiBT Y3JvbGxWaWV3OjpjcmVhdGVTY3JvbGxiYXIoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRp CiAgICAgICAgIHJldHVybiBTY3JvbGxiYXI6OmNyZWF0ZU5hdGl2ZVNjcm9sbGJhcih0aGlzLCBv cmllbnRhdGlvbiwgUmVndWxhclNjcm9sbGJhcik7CiB9CiAKLSNpZiAhR1RLX0NIRUNLX1ZFUlNJ T04oMiwgMTQsIDApCi0jZGVmaW5lIGd0a19hZGp1c3RtZW50X2NvbmZpZ3VyZSBBZGp1c3RtZW50 Q29uZmlndXJlCi0KLXN0YXRpYyB2b2lkIEFkanVzdG1lbnRDb25maWd1cmUoR3RrQWRqdXN0bWVu dCogYWRqdXN0bWVudCwgZ2RvdWJsZSB2YWx1ZSwgZ2RvdWJsZSBsb3dlciwgZ2RvdWJsZSB1cHBl ciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2RvdWJsZSBzdGVwSW5jcmVtZW50 LCBnZG91YmxlIHBhZ2VJbmNyZW1lbnQsIGdkb3VibGUgcGFnZVNpemUpCi17Ci0gICAgZ19vYmpl Y3RfZnJlZXplX25vdGlmeShHX09CSkVDVChhZGp1c3RtZW50KSk7Ci0KLSAgICBnX29iamVjdF9z ZXQoYWRqdXN0bWVudCwKLSAgICAgICAgICAgICAgICAgImxvd2VyIiwgbG93ZXIsCi0gICAgICAg ICAgICAgICAgICJ1cHBlciIsIHVwcGVyLAotICAgICAgICAgICAgICAgICAic3RlcC1pbmNyZW1l bnQiLCBzdGVwSW5jcmVtZW50LAotICAgICAgICAgICAgICAgICAicGFnZS1pbmNyZW1lbnQiLCBw YWdlSW5jcmVtZW50LAotICAgICAgICAgICAgICAgICAicGFnZS1zaXplIiwgcGFnZVNpemUsCi0g ICAgICAgICAgICAgICAgIE5VTEwpOwotCi0gICAgZ19vYmplY3RfdGhhd19ub3RpZnkoR19PQkpF Q1QoYWRqdXN0bWVudCkpOwotCi0gICAgZ3RrX2FkanVzdG1lbnRfY2hhbmdlZChhZGp1c3RtZW50 KTsKLSAgICBndGtfYWRqdXN0bWVudF92YWx1ZV9jaGFuZ2VkKGFkanVzdG1lbnQpOwotfQotI2Vu ZGlmCi0KIC8qCiAgKiBUaGUgZm9sbG93aW5nIGlzIGFzc3VtZWQ6CiAgKiAgIChoYWRqICYmIHZh ZGopIHx8ICghaGFkaiAmJiAhdmFkaikKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1Njcm9sbGJhckd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsuY3Bw CmluZGV4IDgwODFmYjguLjNiODZlYzkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1Njcm9sbGJhckd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyR3Rr LmNwcApAQCAtMSw2ICsxLDcgQEAKIC8qCiAgKiAgQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA5IEhv bGdlciBIYW5zIFBldGVyIEZyZXl0aGVyIHplY2tlQHNlbGZpc2gub3JnCiAgKiAgQ29weXJpZ2h0 IChDKSAyMDEwIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSA8Z25zQGdub21lLm9yZz4KKyAqICBDb3B5 cmlnaHQgKEMpIDIwMTAgQ29sbGFib3JhIEx0ZC4KICAqCiAgKiAgVGhpcyBsaWJyYXJ5IGlzIGZy ZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogIG1vZGlmeSBp dCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKQEAgLTIw LDEwICsyMSwxMCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNjcm9sbGJhckd0 ay5oIgogCisjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCisjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0 LmgiCiAjaW5jbHVkZSAiR3RrVmVyc2lvbmluZy5oIgogI2luY2x1ZGUgIkludFJlY3QuaCIKLSNp bmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKLSNpbmNsdWRlICJGcmFtZVZpZXcuaCIKICNpbmNs dWRlICJTY3JvbGxiYXJUaGVtZS5oIgogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgpAQCAtMTIwLDE1 ICsxMjEsOCBAQCB2b2lkIFNjcm9sbGJhckd0azo6ZGV0YWNoQWRqdXN0bWVudCgpCiAgICAgLy8g Rm9yIHRoZSBjYXNlIHdoZXJlIHdlIG9ubHkgb3BlcmF0ZSBvbiB0aGUgR3RrQWRqdXN0bWVudCBp dCBpcyBiZXN0IHRvCiAgICAgLy8gcmVzZXQgdGhlIHZhbHVlcyBzbyB0aGF0IHRoZSBzdXJyb3Vu ZGluZyBzY3JvbGxiYXIgZ2V0cyB1cGRhdGVkLCBvcgogICAgIC8vIGUuZy4gZm9yIGEgR3RrU2Ny b2xsZWRXaW5kb3cgdGhlIHNjcm9sbGJhciBnZXRzIGhpZGRlbi4KLSNpZiBHVEtfQ0hFQ0tfVkVS U0lPTigyLCAxNCwgMCkKICAgICBndGtfYWRqdXN0bWVudF9jb25maWd1cmUobV9hZGp1c3RtZW50 LCAwLCAwLCAwLCAwLCAwLCAwKTsKLSNlbHNlCi0gICAgbV9hZGp1c3RtZW50LT5sb3dlciA9IDA7 Ci0gICAgbV9hZGp1c3RtZW50LT51cHBlciA9IDA7Ci0gICAgbV9hZGp1c3RtZW50LT52YWx1ZSA9 IDA7Ci0gICAgZ3RrX2FkanVzdG1lbnRfY2hhbmdlZChtX2FkanVzdG1lbnQpOwotICAgIGd0a19h ZGp1c3RtZW50X3ZhbHVlX2NoYW5nZWQobV9hZGp1c3RtZW50KTsKLSNlbmRpZgorCiAgICAgZ19v YmplY3RfdW5yZWYobV9hZGp1c3RtZW50KTsKICAgICBtX2FkanVzdG1lbnQgPSAwOwogfQpAQCAt MTYyLDE5ICsxNTYsMTIgQEAgdm9pZCBTY3JvbGxiYXJHdGs6OmZyYW1lUmVjdHNDaGFuZ2VkKCkK IAogdm9pZCBTY3JvbGxiYXJHdGs6OnVwZGF0ZVRodW1iUG9zaXRpb24oKQogewotICAgIGlmIChn dGtfYWRqdXN0bWVudF9nZXRfdmFsdWUobV9hZGp1c3RtZW50KSAhPSBtX2N1cnJlbnRQb3MpIHsK LSNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxNCwgMCkKKyAgICBpZiAoZ3RrX2FkanVzdG1lbnRf Z2V0X3ZhbHVlKG1fYWRqdXN0bWVudCkgIT0gbV9jdXJyZW50UG9zKQogICAgICAgICBndGtfYWRq dXN0bWVudF9zZXRfdmFsdWUobV9hZGp1c3RtZW50LCBtX2N1cnJlbnRQb3MpOwotI2Vsc2UKLSAg ICAgICAgbV9hZGp1c3RtZW50LT52YWx1ZSA9IG1fY3VycmVudFBvczsKLSAgICAgICAgZ3RrX2Fk anVzdG1lbnRfdmFsdWVfY2hhbmdlZChtX2FkanVzdG1lbnQpOwotI2VuZGlmCi0gICAgfQogfQog CiB2b2lkIFNjcm9sbGJhckd0azo6dXBkYXRlVGh1bWJQcm9wb3J0aW9uKCkKIHsKLSNpZiBHVEtf Q0hFQ0tfVkVSU0lPTigyLCAxNCwgMCkKICAgICBndGtfYWRqdXN0bWVudF9jb25maWd1cmUobV9h ZGp1c3RtZW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBndGtfYWRqdXN0bWVudF9n ZXRfdmFsdWUobV9hZGp1c3RtZW50KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ3Rr X2FkanVzdG1lbnRfZ2V0X2xvd2VyKG1fYWRqdXN0bWVudCksCkBAIC0xODIsMTMgKzE2OSw2IEBA IHZvaWQgU2Nyb2xsYmFyR3RrOjp1cGRhdGVUaHVtYlByb3BvcnRpb24oKQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBtX2xpbmVTdGVwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtX3BhZ2VTdGVwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX3Zpc2libGVTaXpl KTsKLSNlbHNlCi0gICAgbV9hZGp1c3RtZW50LT5zdGVwX2luY3JlbWVudCA9IG1fbGluZVN0ZXA7 Ci0gICAgbV9hZGp1c3RtZW50LT5wYWdlX2luY3JlbWVudCA9IG1fcGFnZVN0ZXA7Ci0gICAgbV9h ZGp1c3RtZW50LT5wYWdlX3NpemUgPSBtX3Zpc2libGVTaXplOwotICAgIG1fYWRqdXN0bWVudC0+ dXBwZXIgPSBtX3RvdGFsU2l6ZTsKLSAgICBndGtfYWRqdXN0bWVudF9jaGFuZ2VkKG1fYWRqdXN0 bWVudCk7Ci0jZW5kaWYKIH0KIAogdm9pZCBTY3JvbGxiYXJHdGs6OnNldEZyYW1lUmVjdChjb25z dCBJbnRSZWN0JiByZWN0KQotLSAKMS43LjEKCg==