35396 2010-02-25 10:18:33 -0800 Qt/Mac: Revert null timer removal (r51105) 2010-02-26 18:43:20 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 1 girish webkit-unassigned ap commit-queue vestbo oldest_to_newest 193798 0 girish 2010-02-25 10:18:33 -0800 r51105 removed the null timer event of the carbon event model. This however breaks the flash of many sites (the ball in http://www.communitymx.com/content/source/E5141/wmodetrans.htm bounces slowly for example). 193800 1 girish 2010-02-25 10:22:16 -0800 First off, I apologize for the lack of time for me in working on this bug (especially since I was the initial committer). That said, I have a patch at http://qt.gitorious.org/~girish/qt/girishs-qt/commit/c8483ce0bdc38ba40a7d673340f6f4f04b7bc439. The patch is known to work (it is more than a simple 'revert' since trunk has changed a bit). If someone has the time, please go ahead and get this committed. 193912 2 ap 2010-02-25 16:03:30 -0800 PluginViewMac could use a much better name. Looking at this bug, I began to wonder how this change didn't break Safari behavior. 193976 3 girish 2010-02-25 18:35:59 -0800 Alexey, I think the intent is to make PluginViewMac, the common plugin implementation used across all ports. To be clear : This task is Qt specific. PluginViewMac is not used by Safari. 194096 4 49583 luiz 2010-02-26 07:58:34 -0800 Created attachment 49583 Applying patch suggested by Girish Ramakrishnan in bug comment #1. 194099 5 girish 2010-02-26 08:06:14 -0800 Attachment 1 looks good to me. Only suggestion I had was to modify the ChangeLog to state why we are reverting it. 194108 6 49586 luiz 2010-02-26 08:21:13 -0800 Created attachment 49586 Applying patch suggested by Girish Ramakrishnan in bug comment #1. 194113 7 49586 kenneth 2010-02-26 08:30:56 -0800 Comment on attachment 49586 Applying patch suggested by Girish Ramakrishnan in bug comment #1. LGTM, but it would be nice with an explanation to why that 22 constant is used. It was just moved around in this code, so I won't r- it because of that. 194392 8 49586 commit-queue 2010-02-26 18:43:15 -0800 Comment on attachment 49586 Applying patch suggested by Girish Ramakrishnan in bug comment #1. Clearing flags on attachment: 49586 Committed r55332: <http://trac.webkit.org/changeset/55332> 194393 9 commit-queue 2010-02-26 18:43:20 -0800 All reviewed patches have been landed. Closing bug. 49583 2010-02-26 07:58:34 -0800 2010-02-26 08:21:13 -0800 Applying patch suggested by Girish Ramakrishnan in bug comment #1. 0001-Qt-Mac-Revert-null-timer-removal-r51105.patch text/plain 6149 luiz RnJvbSA3ZWJlOWJiYzM1ZGY1YTU1MzgxMTNjYmJhOThmYzYyZDMwYjFlOTZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IEZyaSwgMjYgRmViIDIwMTAgMTI6MzI6NTkgLTAzMDAKU3ViamVjdDogW1BB VENIXSBRdC9NYWM6IFJldmVydCBudWxsIHRpbWVyIHJlbW92YWwgKHI1MTEwNSkKIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTM5NgoKUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCgpBcHBseWluZyBwYXRjaCBzdWdnZXN0ZWQgYnkgR2lyaXNoIFJhbWFrcmlzaG5h biBpbiBidWcgY29tbWVudCAjMS4KCiogcGx1Z2lucy9QbHVnaW5WaWV3Lmg6CiogcGx1Z2lucy9t YWMvUGx1Z2luVmlld01hYy5jcHA6CihXZWJDb3JlOjpQbHVnaW5WaWV3OjpwbGF0Zm9ybVN0YXJ0 KToKKFdlYkNvcmU6OlBsdWdpblZpZXc6OmhhbmRsZU1vdXNlRXZlbnQpOgooV2ViQ29yZTo6UGx1 Z2luVmlldzo6bnVsbEV2ZW50VGltZXJGaXJlZCk6CihXZWJDb3JlOjpQbHVnaW5WaWV3Ojptb3Vz ZVBvc0ZvclBsdWdpbik6Ci0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICB8ICAgMTYgKysrKysrKysKIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmggICAgICAgICAg fCAgICA0ICsrCiBXZWJDb3JlL3BsdWdpbnMvbWFjL1BsdWdpblZpZXdNYWMuY3BwIHwgICA2MiAr KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA2NiBpbnNl cnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDNkZDQxY2UuLjU4YTdjYmYgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTAtMDItMjYgIEx1aXogQWdvc3RpbmkgIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3NzYS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUXQv TWFjOiBSZXZlcnQgbnVsbCB0aW1lciByZW1vdmFsIChyNTExMDUpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTM5NgorCisgICAgICAgIEFwcGx5aW5n IHBhdGNoIHN1Z2dlc3RlZCBieSBHaXJpc2ggUmFtYWtyaXNobmFuIGluIGJ1ZyBjb21tZW50ICMx LgorCisgICAgICAgICogcGx1Z2lucy9QbHVnaW5WaWV3Lmg6CisgICAgICAgICogcGx1Z2lucy9t YWMvUGx1Z2luVmlld01hYy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpwbGF0 Zm9ybVN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OmhhbmRsZU1vdXNlRXZl bnQpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6bnVsbEV2ZW50VGltZXJGaXJlZCk6 CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3Ojptb3VzZVBvc0ZvclBsdWdpbik6CisKIDIw MTAtMDItMjQgIEFyaXlhIEhpZGF5YXQgIDxhcml5YS5oaWRheWF0QGdtYWlsLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmggYi9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmll dy5oCmluZGV4IGM1Y2MwMTIuLmYzZWFjOWEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGx1Z2lucy9Q bHVnaW5WaWV3LmgKKysrIGIvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuaApAQCAtMzM5LDYg KzMzOSw3IEBAIHByaXZhdGU6CiAgICAgICAgIHZvaWQgc2V0TlBXaW5kb3dJZk5lZWRlZCgpOwog I2VsaWYgZGVmaW5lZChYUF9NQUNPU1gpCiAgICAgICAgIE5QX0NHQ29udGV4dCBtX25wQ2dDb250 ZXh0OworICAgICAgICBPd25QdHI8VGltZXI8UGx1Z2luVmlldz4gPiBtX251bGxFdmVudFRpbWVy OwogICAgICAgICBOUERyYXdpbmdNb2RlbCBtX2RyYXdpbmdNb2RlbDsKICAgICAgICAgTlBFdmVu dE1vZGVsIG1fZXZlbnRNb2RlbDsKICAgICAgICAgQ0dDb250ZXh0UmVmIG1fY29udGV4dFJlZjsK QEAgLTM0Nyw4ICszNDgsMTEgQEAgcHJpdmF0ZToKICAgICAgICAgUVBpeG1hcCBtX3BpeG1hcDsK ICNlbmRpZgogCisgICAgICAgIFBvaW50IG1fbGFzdE1vdXNlUG9zOwogICAgICAgICB2b2lkIHNl dE5QV2luZG93SWZOZWVkZWQoKTsKKyAgICAgICAgdm9pZCBudWxsRXZlbnRUaW1lckZpcmVkKFRp bWVyPFBsdWdpblZpZXc+Kik7CiAgICAgICAgIFBvaW50IGdsb2JhbE1vdXNlUG9zRm9yUGx1Z2lu KCkgY29uc3Q7CisgICAgICAgIFBvaW50IG1vdXNlUG9zRm9yUGx1Z2luKE1vdXNlRXZlbnQqIGV2 ZW50ID0gMCkgY29uc3Q7CiAjZW5kaWYKIAogI2lmIGRlZmluZWQoWFBfVU5JWCkgJiYgRU5BQkxF KE5FVFNDQVBFX1BMVUdJTl9BUEkpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsdWdpbnMvbWFjL1Bs dWdpblZpZXdNYWMuY3BwIGIvV2ViQ29yZS9wbHVnaW5zL21hYy9QbHVnaW5WaWV3TWFjLmNwcApp bmRleCBkNDE1ZDhmLi44MmI2ZjNmIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsdWdpbnMvbWFjL1Bs dWdpblZpZXdNYWMuY3BwCisrKyBiL1dlYkNvcmUvcGx1Z2lucy9tYWMvUGx1Z2luVmlld01hYy5j cHAKQEAgLTIxOSw2ICsyMTksMTIgQEAgYm9vbCBQbHVnaW5WaWV3OjpwbGF0Zm9ybVN0YXJ0KCkK IAogICAgIHNob3coKTsKIAorICAgIC8vIFRPRE86IEltcGxlbWVudCBudWxsIHRpbWVyIHRocm90 dGxpbmcgZGVwZW5kaW5nIG9uIHBsdWdpbiBhY3RpdmF0aW9uCisgICAgbV9udWxsRXZlbnRUaW1l ci5zZXQobmV3IFRpbWVyPFBsdWdpblZpZXc+KHRoaXMsICZQbHVnaW5WaWV3OjpudWxsRXZlbnRU aW1lckZpcmVkKSk7CisgICAgbV9udWxsRXZlbnRUaW1lci0+c3RhcnRSZXBlYXRpbmcoMC4wMik7 CisKKyAgICBtX2xhc3RNb3VzZVBvcy5oID0gbV9sYXN0TW91c2VQb3MudiA9IDA7CisKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KIApAQCAtNTc4LDcgKzU4NCw5IEBAIHZvaWQgUGx1Z2luVmlldzo6aGFu ZGxlTW91c2VFdmVudChNb3VzZUV2ZW50KiBldmVudCkKICAgICBFdmVudFJlY29yZCByZWNvcmQ7 CiAKICAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkubW91c2Vtb3ZlRXZlbnQp IHsKLSAgICAgICAgcmVjb3JkLndoYXQgPSBudWxsRXZlbnQ7CisgICAgICAgIC8vIE1vdXNlIG1v dmVtZW50IGlzIGhhbmRsZWQgYnkgbnVsbCB0aW1lciBldmVudHMKKyAgICAgICAgbV9sYXN0TW91 c2VQb3MgPSBtb3VzZVBvc0ZvclBsdWdpbihldmVudCk7CisgICAgICAgIHJldHVybjsKICAgICB9 IGVsc2UgaWYgKGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNlb3ZlckV2ZW50KSB7 CiAgICAgICAgIHJlY29yZC53aGF0ID0gYWRqdXN0Q3Vyc29yRXZlbnQ7CiAgICAgfSBlbHNlIGlm IChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZW91dEV2ZW50KSB7CkBAIC01OTQs MjEgKzYwMiw3IEBAIHZvaWQgUGx1Z2luVmlldzo6aGFuZGxlTW91c2VFdmVudChNb3VzZUV2ZW50 KiBldmVudCkKICAgICB9IGVsc2UgewogICAgICAgICByZXR1cm47CiAgICAgfQotCi0gICAgaWYg KHBsYXRmb3JtUGx1Z2luV2lkZ2V0KCkpIHsKLSAgICAgICAgcmVjb3JkLndoZXJlID0gZ2xvYmFs TW91c2VQb3NGb3JQbHVnaW4oKTsKLSAgICB9IGVsc2UgewotICAgICAgICBpZiAoZXZlbnQtPmJ1 dHRvbigpID09IDIpIHsKLSAgICAgICAgICAgIC8vIGFsd2F5cyBwYXNzIHRoZSBnbG9iYWwgcG9z aXRpb24gZm9yIHJpZ2h0LWNsaWNrIHNpbmNlIEZsYXNoIHVzZXMgaXQgdG8gcG9zaXRpb24gdGhl IGNvbnRleHQgbWVudQotICAgICAgICAgICAgcmVjb3JkLndoZXJlID0gZ2xvYmFsTW91c2VQb3NG b3JQbHVnaW4oKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIEludFBvaW50IHBvc3Ra b29tUG9zID0gcm91bmRlZEludFBvaW50KG1fZWxlbWVudC0+cmVuZGVyZXIoKS0+YWJzb2x1dGVU b0xvY2FsKGV2ZW50LT5hYnNvbHV0ZUxvY2F0aW9uKCkpKTsKLSAgICAgICAgICAgIHJlY29yZC53 aGVyZS5oID0gcG9zdFpvb21Qb3MueCgpICsgbV93aW5kb3dSZWN0LngoKTsKLSAgICAgICAgICAg IC8vIFRoZSBudW1iZXIgMjIgaXMgdGhlIGhlaWdodCBvZiB0aGUgdGl0bGUgYmFyLiBBcyB0byB3 aHkgaXQgZmlndXJlcyBpbiB0aGUgY2FsY3VsYXRpb24gYmVsb3cgCi0gICAgICAgICAgICAvLyBp cyBsZWZ0IGFzIGFuIGV4ZXJjaXNlIHRvIHRoZSByZWFkZXIgOi0pCi0gICAgICAgICAgICByZWNv cmQud2hlcmUudiA9IHBvc3Rab29tUG9zLnkoKSArIG1fd2luZG93UmVjdC55KCkgLSAyMjsKLSAg ICAgICAgfQotICAgIH0KKyAgICByZWNvcmQud2hlcmUgPSBtb3VzZVBvc0ZvclBsdWdpbihldmVu dCk7CiAgICAgcmVjb3JkLm1vZGlmaWVycyA9IG1vZGlmaWVyc0ZvckV2ZW50KGV2ZW50KTsKIAog ICAgIGlmICghZXZlbnQtPmJ1dHRvbkRvd24oKSkKQEAgLTcwMCw2ICs2OTQsMjIgQEAgdm9pZCBQ bHVnaW5WaWV3OjpoYW5kbGVLZXlib2FyZEV2ZW50KEtleWJvYXJkRXZlbnQqIGV2ZW50KQogICAg ICAgICBldmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKIH0KIAordm9pZCBQbHVnaW5WaWV3Ojpu dWxsRXZlbnRUaW1lckZpcmVkKFRpbWVyPFBsdWdpblZpZXc+KikKK3sKKyAgICBFdmVudFJlY29y ZCByZWNvcmQ7CisKKyAgICByZWNvcmQud2hhdCA9IG51bGxFdmVudDsKKyAgICByZWNvcmQubWVz c2FnZSA9IDA7CisgICAgcmVjb3JkLndoZW4gPSBUaWNrQ291bnQoKTsKKyAgICByZWNvcmQud2hl cmUgPSBtX2xhc3RNb3VzZVBvczsKKyAgICByZWNvcmQubW9kaWZpZXJzID0gR2V0Q3VycmVudEtl eU1vZGlmaWVycygpOworICAgIGlmICghQnV0dG9uKCkpCisgICAgICAgIHJlY29yZC5tb2RpZmll cnMgfD0gYnRuU3RhdGU7CisKKyAgICBpZiAoIWRpc3BhdGNoTlBFdmVudChyZWNvcmQpKQorICAg ICAgICBMT0coRXZlbnRzLCAiUGx1Z2luVmlldzo6bnVsbEV2ZW50VGltZXJGaXJlZCgpOiBOdWxs IGV2ZW50IG5vdCBhY2NlcHRlZCIpOworfQorCiBzdGF0aWMgaW50IG1vZGlmaWVyc0ZvckV2ZW50 KFVJRXZlbnRXaXRoS2V5U3RhdGUqIGV2ZW50KQogewogICAgIGludCBtb2RpZmllcnMgPSAwOwpA QCAtNzU2LDYgKzc2NiwyNiBAQCBQb2ludCBQbHVnaW5WaWV3OjpnbG9iYWxNb3VzZVBvc0ZvclBs dWdpbigpIGNvbnN0CiAgICAgcmV0dXJuIHBvczsKIH0KIAorUG9pbnQgUGx1Z2luVmlldzo6bW91 c2VQb3NGb3JQbHVnaW4oTW91c2VFdmVudCogZXZlbnQpIGNvbnN0Cit7CisgICAgQVNTRVJUKGV2 ZW50KTsKKyAgICBpZiAocGxhdGZvcm1QbHVnaW5XaWRnZXQoKSkKKyAgICAgICAgcmV0dXJuIGds b2JhbE1vdXNlUG9zRm9yUGx1Z2luKCk7CisKKyAgICBpZiAoZXZlbnQtPmJ1dHRvbigpID09IDIp IHsKKyAgICAgICAgLy8gYWx3YXlzIHBhc3MgdGhlIGdsb2JhbCBwb3NpdGlvbiBmb3IgcmlnaHQt Y2xpY2sgc2luY2UgRmxhc2ggdXNlcyBpdCB0byBwb3NpdGlvbiB0aGUgY29udGV4dCBtZW51Cisg ICAgICAgIHJldHVybiBnbG9iYWxNb3VzZVBvc0ZvclBsdWdpbigpOworICAgIH0KKworICAgIFBv aW50IHBvczsKKyAgICBJbnRQb2ludCBwb3N0Wm9vbVBvcyA9IHJvdW5kZWRJbnRQb2ludChtX2Vs ZW1lbnQtPnJlbmRlcmVyKCktPmFic29sdXRlVG9Mb2NhbChldmVudC0+YWJzb2x1dGVMb2NhdGlv bigpKSk7CisgICAgcG9zLmggPSBwb3N0Wm9vbVBvcy54KCkgKyBtX3dpbmRvd1JlY3QueCgpOwor ICAgIC8vIFRoZSBudW1iZXIgMjIgaXMgdGhlIGhlaWdodCBvZiB0aGUgdGl0bGUgYmFyLiBBcyB0 byB3aHkgaXQgZmlndXJlcyBpbiB0aGUgY2FsY3VsYXRpb24gYmVsb3cKKyAgICAvLyBpcyBsZWZ0 IGFzIGFuIGV4ZXJjaXNlIHRvIHRoZSByZWFkZXIgOi0pCisgICAgcG9zLnYgPSBwb3N0Wm9vbVBv cy55KCkgKyBtX3dpbmRvd1JlY3QueSgpIC0gMjI7CisgICAgcmV0dXJuIHBvczsKK30KKwogYm9v bCBQbHVnaW5WaWV3OjpkaXNwYXRjaE5QRXZlbnQoTlBFdmVudCYgZXZlbnQpCiB7CiAgICAgUGx1 Z2luVmlldzo6c2V0Q3VycmVudFBsdWdpblZpZXcodGhpcyk7Ci0tIAoxLjYuMy4zCgo= 49586 2010-02-26 08:21:13 -0800 2010-02-26 18:43:15 -0800 Applying patch suggested by Girish Ramakrishnan in bug comment #1. 0001-Qt-Mac-Revert-null-timer-removal-r51105.patch text/plain 6396 luiz RnJvbSBkYjg1OGJjZjRhYjQ4NDU4NzBkZDMwMGE5NTUzMDU4MGI0NTFlNjM3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IEZyaSwgMjYgRmViIDIwMTAgMTM6MTY6MzMgLTAzMDAKU3ViamVjdDogW1BB VENIXSBRdC9NYWM6IFJldmVydCBudWxsIHRpbWVyIHJlbW92YWwgKHI1MTEwNSkKIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTM5NgoKUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCgpyNTExMDUgcmVtb3ZlZCB0aGUgbnVsbCB0aW1lciBldmVudCBvZiB0aGUgY2Fy Ym9uIGV2ZW50IG1vZGVsLiBUaGlzIGhvd2V2ZXIKYnJlYWtzIHRoZSBmbGFzaCBvZiBtYW55IHNp dGVzLgoKQXBwbHlpbmcgcGF0Y2ggc3VnZ2VzdGVkIGJ5IEdpcmlzaCBSYW1ha3Jpc2huYW4gaW4g YnVnIGNvbW1lbnQgIzEuCgoqIHBsdWdpbnMvUGx1Z2luVmlldy5oOgoqIHBsdWdpbnMvbWFjL1Bs dWdpblZpZXdNYWMuY3BwOgooV2ViQ29yZTo6UGx1Z2luVmlldzo6cGxhdGZvcm1TdGFydCk6CihX ZWJDb3JlOjpQbHVnaW5WaWV3OjpoYW5kbGVNb3VzZUV2ZW50KToKKFdlYkNvcmU6OlBsdWdpblZp ZXc6Om51bGxFdmVudFRpbWVyRmlyZWQpOgooV2ViQ29yZTo6UGx1Z2luVmlldzo6bW91c2VQb3NG b3JQbHVnaW4pOgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgfCAg IDE5ICsrKysrKysrKysKIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmggICAgICAgICAgfCAg ICA0ICsrCiBXZWJDb3JlL3BsdWdpbnMvbWFjL1BsdWdpblZpZXdNYWMuY3BwIHwgICA2MiArKysr KysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA2OSBpbnNlcnRp b25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBi L1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDNkZDQxY2UuLjIxMTRiOWIgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAK KzIwMTAtMDItMjYgIEx1aXogQWdvc3RpbmkgIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3NzYS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUXQvTWFj OiBSZXZlcnQgbnVsbCB0aW1lciByZW1vdmFsIChyNTExMDUpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTM5NgorCisgICAgICAgIHI1MTEwNSByZW1v dmVkIHRoZSBudWxsIHRpbWVyIGV2ZW50IG9mIHRoZSBjYXJib24gZXZlbnQgbW9kZWwuIFRoaXMg aG93ZXZlcgorICAgICAgICBicmVha3MgdGhlIGZsYXNoIG9mIG1hbnkgc2l0ZXMuICAgICAgICAK KworICAgICAgICBBcHBseWluZyBwYXRjaCBzdWdnZXN0ZWQgYnkgR2lyaXNoIFJhbWFrcmlzaG5h biBpbiBidWcgY29tbWVudCAjMS4KKworICAgICAgICAqIHBsdWdpbnMvUGx1Z2luVmlldy5oOgor ICAgICAgICAqIHBsdWdpbnMvbWFjL1BsdWdpblZpZXdNYWMuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UGx1Z2luVmlldzo6cGxhdGZvcm1TdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5W aWV3OjpoYW5kbGVNb3VzZUV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6Om51 bGxFdmVudFRpbWVyRmlyZWQpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6bW91c2VQ b3NGb3JQbHVnaW4pOgorCiAyMDEwLTAyLTI0ICBBcml5YSBIaWRheWF0ICA8YXJpeWEuaGlkYXlh dEBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3Rp YW5zZW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oIGIvV2ViQ29y ZS9wbHVnaW5zL1BsdWdpblZpZXcuaAppbmRleCBjNWNjMDEyLi5mM2VhYzlhIDEwMDY0NAotLS0g YS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oCisrKyBiL1dlYkNvcmUvcGx1Z2lucy9QbHVn aW5WaWV3LmgKQEAgLTMzOSw2ICszMzksNyBAQCBwcml2YXRlOgogICAgICAgICB2b2lkIHNldE5Q V2luZG93SWZOZWVkZWQoKTsKICNlbGlmIGRlZmluZWQoWFBfTUFDT1NYKQogICAgICAgICBOUF9D R0NvbnRleHQgbV9ucENnQ29udGV4dDsKKyAgICAgICAgT3duUHRyPFRpbWVyPFBsdWdpblZpZXc+ ID4gbV9udWxsRXZlbnRUaW1lcjsKICAgICAgICAgTlBEcmF3aW5nTW9kZWwgbV9kcmF3aW5nTW9k ZWw7CiAgICAgICAgIE5QRXZlbnRNb2RlbCBtX2V2ZW50TW9kZWw7CiAgICAgICAgIENHQ29udGV4 dFJlZiBtX2NvbnRleHRSZWY7CkBAIC0zNDcsOCArMzQ4LDExIEBAIHByaXZhdGU6CiAgICAgICAg IFFQaXhtYXAgbV9waXhtYXA7CiAjZW5kaWYKIAorICAgICAgICBQb2ludCBtX2xhc3RNb3VzZVBv czsKICAgICAgICAgdm9pZCBzZXROUFdpbmRvd0lmTmVlZGVkKCk7CisgICAgICAgIHZvaWQgbnVs bEV2ZW50VGltZXJGaXJlZChUaW1lcjxQbHVnaW5WaWV3PiopOwogICAgICAgICBQb2ludCBnbG9i YWxNb3VzZVBvc0ZvclBsdWdpbigpIGNvbnN0OworICAgICAgICBQb2ludCBtb3VzZVBvc0ZvclBs dWdpbihNb3VzZUV2ZW50KiBldmVudCA9IDApIGNvbnN0OwogI2VuZGlmCiAKICNpZiBkZWZpbmVk KFhQX1VOSVgpICYmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wbHVnaW5zL21hYy9QbHVnaW5WaWV3TWFjLmNwcCBiL1dlYkNvcmUvcGx1Z2lucy9tYWMv UGx1Z2luVmlld01hYy5jcHAKaW5kZXggZDQxNWQ4Zi4uODJiNmYzZiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbHVnaW5zL21hYy9QbHVnaW5WaWV3TWFjLmNwcAorKysgYi9XZWJDb3JlL3BsdWdpbnMv bWFjL1BsdWdpblZpZXdNYWMuY3BwCkBAIC0yMTksNiArMjE5LDEyIEBAIGJvb2wgUGx1Z2luVmll dzo6cGxhdGZvcm1TdGFydCgpCiAKICAgICBzaG93KCk7CiAKKyAgICAvLyBUT0RPOiBJbXBsZW1l bnQgbnVsbCB0aW1lciB0aHJvdHRsaW5nIGRlcGVuZGluZyBvbiBwbHVnaW4gYWN0aXZhdGlvbgor ICAgIG1fbnVsbEV2ZW50VGltZXIuc2V0KG5ldyBUaW1lcjxQbHVnaW5WaWV3Pih0aGlzLCAmUGx1 Z2luVmlldzo6bnVsbEV2ZW50VGltZXJGaXJlZCkpOworICAgIG1fbnVsbEV2ZW50VGltZXItPnN0 YXJ0UmVwZWF0aW5nKDAuMDIpOworCisgICAgbV9sYXN0TW91c2VQb3MuaCA9IG1fbGFzdE1vdXNl UG9zLnYgPSAwOworCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTU3OCw3ICs1ODQsOSBAQCB2 b2lkIFBsdWdpblZpZXc6OmhhbmRsZU1vdXNlRXZlbnQoTW91c2VFdmVudCogZXZlbnQpCiAgICAg RXZlbnRSZWNvcmQgcmVjb3JkOwogCiAgICAgaWYgKGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1l cygpLm1vdXNlbW92ZUV2ZW50KSB7Ci0gICAgICAgIHJlY29yZC53aGF0ID0gbnVsbEV2ZW50Owor ICAgICAgICAvLyBNb3VzZSBtb3ZlbWVudCBpcyBoYW5kbGVkIGJ5IG51bGwgdGltZXIgZXZlbnRz CisgICAgICAgIG1fbGFzdE1vdXNlUG9zID0gbW91c2VQb3NGb3JQbHVnaW4oZXZlbnQpOworICAg ICAgICByZXR1cm47CiAgICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMo KS5tb3VzZW92ZXJFdmVudCkgewogICAgICAgICByZWNvcmQud2hhdCA9IGFkanVzdEN1cnNvckV2 ZW50OwogICAgIH0gZWxzZSBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkubW91c2Vv dXRFdmVudCkgewpAQCAtNTk0LDIxICs2MDIsNyBAQCB2b2lkIFBsdWdpblZpZXc6OmhhbmRsZU1v dXNlRXZlbnQoTW91c2VFdmVudCogZXZlbnQpCiAgICAgfSBlbHNlIHsKICAgICAgICAgcmV0dXJu OwogICAgIH0KLQotICAgIGlmIChwbGF0Zm9ybVBsdWdpbldpZGdldCgpKSB7Ci0gICAgICAgIHJl Y29yZC53aGVyZSA9IGdsb2JhbE1vdXNlUG9zRm9yUGx1Z2luKCk7Ci0gICAgfSBlbHNlIHsKLSAg ICAgICAgaWYgKGV2ZW50LT5idXR0b24oKSA9PSAyKSB7Ci0gICAgICAgICAgICAvLyBhbHdheXMg cGFzcyB0aGUgZ2xvYmFsIHBvc2l0aW9uIGZvciByaWdodC1jbGljayBzaW5jZSBGbGFzaCB1c2Vz IGl0IHRvIHBvc2l0aW9uIHRoZSBjb250ZXh0IG1lbnUKLSAgICAgICAgICAgIHJlY29yZC53aGVy ZSA9IGdsb2JhbE1vdXNlUG9zRm9yUGx1Z2luKCk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAg ICAgICBJbnRQb2ludCBwb3N0Wm9vbVBvcyA9IHJvdW5kZWRJbnRQb2ludChtX2VsZW1lbnQtPnJl bmRlcmVyKCktPmFic29sdXRlVG9Mb2NhbChldmVudC0+YWJzb2x1dGVMb2NhdGlvbigpKSk7Ci0g ICAgICAgICAgICByZWNvcmQud2hlcmUuaCA9IHBvc3Rab29tUG9zLngoKSArIG1fd2luZG93UmVj dC54KCk7Ci0gICAgICAgICAgICAvLyBUaGUgbnVtYmVyIDIyIGlzIHRoZSBoZWlnaHQgb2YgdGhl IHRpdGxlIGJhci4gQXMgdG8gd2h5IGl0IGZpZ3VyZXMgaW4gdGhlIGNhbGN1bGF0aW9uIGJlbG93 IAotICAgICAgICAgICAgLy8gaXMgbGVmdCBhcyBhbiBleGVyY2lzZSB0byB0aGUgcmVhZGVyIDot KQotICAgICAgICAgICAgcmVjb3JkLndoZXJlLnYgPSBwb3N0Wm9vbVBvcy55KCkgKyBtX3dpbmRv d1JlY3QueSgpIC0gMjI7Ci0gICAgICAgIH0KLSAgICB9CisgICAgcmVjb3JkLndoZXJlID0gbW91 c2VQb3NGb3JQbHVnaW4oZXZlbnQpOwogICAgIHJlY29yZC5tb2RpZmllcnMgPSBtb2RpZmllcnNG b3JFdmVudChldmVudCk7CiAKICAgICBpZiAoIWV2ZW50LT5idXR0b25Eb3duKCkpCkBAIC03MDAs NiArNjk0LDIyIEBAIHZvaWQgUGx1Z2luVmlldzo6aGFuZGxlS2V5Ym9hcmRFdmVudChLZXlib2Fy ZEV2ZW50KiBldmVudCkKICAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7CiB9CiAK K3ZvaWQgUGx1Z2luVmlldzo6bnVsbEV2ZW50VGltZXJGaXJlZChUaW1lcjxQbHVnaW5WaWV3Piop Cit7CisgICAgRXZlbnRSZWNvcmQgcmVjb3JkOworCisgICAgcmVjb3JkLndoYXQgPSBudWxsRXZl bnQ7CisgICAgcmVjb3JkLm1lc3NhZ2UgPSAwOworICAgIHJlY29yZC53aGVuID0gVGlja0NvdW50 KCk7CisgICAgcmVjb3JkLndoZXJlID0gbV9sYXN0TW91c2VQb3M7CisgICAgcmVjb3JkLm1vZGlm aWVycyA9IEdldEN1cnJlbnRLZXlNb2RpZmllcnMoKTsKKyAgICBpZiAoIUJ1dHRvbigpKQorICAg ICAgICByZWNvcmQubW9kaWZpZXJzIHw9IGJ0blN0YXRlOworCisgICAgaWYgKCFkaXNwYXRjaE5Q RXZlbnQocmVjb3JkKSkKKyAgICAgICAgTE9HKEV2ZW50cywgIlBsdWdpblZpZXc6Om51bGxFdmVu dFRpbWVyRmlyZWQoKTogTnVsbCBldmVudCBub3QgYWNjZXB0ZWQiKTsKK30KKwogc3RhdGljIGlu dCBtb2RpZmllcnNGb3JFdmVudChVSUV2ZW50V2l0aEtleVN0YXRlKiBldmVudCkKIHsKICAgICBp bnQgbW9kaWZpZXJzID0gMDsKQEAgLTc1Niw2ICs3NjYsMjYgQEAgUG9pbnQgUGx1Z2luVmlldzo6 Z2xvYmFsTW91c2VQb3NGb3JQbHVnaW4oKSBjb25zdAogICAgIHJldHVybiBwb3M7CiB9CiAKK1Bv aW50IFBsdWdpblZpZXc6Om1vdXNlUG9zRm9yUGx1Z2luKE1vdXNlRXZlbnQqIGV2ZW50KSBjb25z dAoreworICAgIEFTU0VSVChldmVudCk7CisgICAgaWYgKHBsYXRmb3JtUGx1Z2luV2lkZ2V0KCkp CisgICAgICAgIHJldHVybiBnbG9iYWxNb3VzZVBvc0ZvclBsdWdpbigpOworCisgICAgaWYgKGV2 ZW50LT5idXR0b24oKSA9PSAyKSB7CisgICAgICAgIC8vIGFsd2F5cyBwYXNzIHRoZSBnbG9iYWwg cG9zaXRpb24gZm9yIHJpZ2h0LWNsaWNrIHNpbmNlIEZsYXNoIHVzZXMgaXQgdG8gcG9zaXRpb24g dGhlIGNvbnRleHQgbWVudQorICAgICAgICByZXR1cm4gZ2xvYmFsTW91c2VQb3NGb3JQbHVnaW4o KTsKKyAgICB9CisKKyAgICBQb2ludCBwb3M7CisgICAgSW50UG9pbnQgcG9zdFpvb21Qb3MgPSBy b3VuZGVkSW50UG9pbnQobV9lbGVtZW50LT5yZW5kZXJlcigpLT5hYnNvbHV0ZVRvTG9jYWwoZXZl bnQtPmFic29sdXRlTG9jYXRpb24oKSkpOworICAgIHBvcy5oID0gcG9zdFpvb21Qb3MueCgpICsg bV93aW5kb3dSZWN0LngoKTsKKyAgICAvLyBUaGUgbnVtYmVyIDIyIGlzIHRoZSBoZWlnaHQgb2Yg dGhlIHRpdGxlIGJhci4gQXMgdG8gd2h5IGl0IGZpZ3VyZXMgaW4gdGhlIGNhbGN1bGF0aW9uIGJl bG93CisgICAgLy8gaXMgbGVmdCBhcyBhbiBleGVyY2lzZSB0byB0aGUgcmVhZGVyIDotKQorICAg IHBvcy52ID0gcG9zdFpvb21Qb3MueSgpICsgbV93aW5kb3dSZWN0LnkoKSAtIDIyOworICAgIHJl dHVybiBwb3M7Cit9CisKIGJvb2wgUGx1Z2luVmlldzo6ZGlzcGF0Y2hOUEV2ZW50KE5QRXZlbnQm IGV2ZW50KQogewogICAgIFBsdWdpblZpZXc6OnNldEN1cnJlbnRQbHVnaW5WaWV3KHRoaXMpOwot LSAKMS42LjMuMwoK