35132 2010-02-18 14:37:06 -0800 Mouse cursor sometimes flickers over Flash content 2010-02-19 17:23:49 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 ap ap oldest_to_newest 191739 0 ap 2010-02-18 14:37:06 -0800 WebKit sometimes changes mouse cursor over Netscape plug-ins, even though those are supposed to be in control of cursor. 1. EventHandler sets cursor before dispatching events to plug-in. 2. SetCursor overrides in WEbHTML view are currently ineffective, to AppKit resets the mouse pointer to default once it cannot find an appropriate cursor rect. This causes flickering - and I actually saw the cursor disappear on google.com/finance. The problems are most visible with Flash 10.1 beta. <rdar://problem/7664353> 191953 1 49085 ap 2010-02-19 10:00:45 -0800 Created attachment 49085 proposed fix Did some brief testing on Windows, and this doesn't seem to break things. 192088 2 49085 mjs 2010-02-19 16:02:54 -0800 Comment on attachment 49085 proposed fix r=me 192123 3 ap 2010-02-19 17:23:49 -0800 Committed <http://trac.webkit.org/changeset/55041>. 49085 2010-02-19 10:00:45 -0800 2010-02-19 16:02:54 -0800 proposed fix PluginMouseFlicker.txt text/plain 12785 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDk4OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMDItMTggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1MTMyCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS83NjY0MzUzPiBNb3VzZSBjdXJzb3Igc29tZXRpbWVzIGZsaWNrZXJzIG92 ZXIgRmxhc2ggY29udGVudCAoMzUxMzIpCisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5j cHA6IChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlTW92ZUV2ZW50KTogRG9uJ3Qg c2V0IG1vdXNlCisgICAgICAgIHBvaW50ZXIgd2hlbiBhYm92ZSBhIHBsdWctaW4gb3IgYXBwbGV0 IHRvIHByZXZlbnQgZmxpY2tlci4KKwogMjAxMC0wMi0xOCAgVmFuZ2VsaXMgS29ra2V2aXMgIDx2 YW5nZWxpc0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2Vy LgpJbmRleDogV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAJKHJldmlzaW9uIDU0OTcwKQorKysgV2ViQ29yZS9w YWdlL0V2ZW50SGFuZGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzOTYsOCArMTM5NiwxOCBA QCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VNb3ZlRXZlbnQoCiAgICAgICAgICAgICBz Y3JvbGxiYXItPm1vdXNlTW92ZWQobW91c2VFdmVudCk7IC8vIEhhbmRsZSBob3ZlciBlZmZlY3Rz IG9uIHBsYXRmb3JtcyB0aGF0IHN1cHBvcnQgdmlzdWFsIGZlZWRiYWNrIG9uIHNjcm9sbGJhciBo b3ZlcmluZy4KICAgICAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCkpIHsKICAg ICAgICAgICAgIGlmICgoIW1fcmVzaXplTGF5ZXIgfHwgIW1fcmVzaXplTGF5ZXItPmluUmVzaXpl TW9kZSgpKSAmJiAhcGFnZS0+bWFpbkZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5wYW5TY3JvbGxJ blByb2dyZXNzKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gbV9m cmFtZS0+dmlldygpKQotICAgICAgICAgICAgICAgICAgICB2aWV3LT5zZXRDdXJzb3Ioc2VsZWN0 Q3Vyc29yKG1ldiwgc2Nyb2xsYmFyKSk7CisgICAgICAgICAgICAgICAgLy8gUGx1Z2lucyBzZXQg Y3Vyc29yIG9uIHRoZWlyIG93bi4gVGhlIG9ubHkgY2FzZSBXZWJLaXQgaW50ZXJ2ZW5lcyBpcyBy ZXNldHRpbmcgY3Vyc29yIHRvIGFycm93IG9uIG1vdXNlIGVudGVyLAorICAgICAgICAgICAgICAg IC8vIGluIGNhc2UgdGhlIHBhcnRpY3VsYXIgcGx1Z2luIGRvZXNuJ3QgbWFuaXB1bGF0ZSBjdXJz b3IgYXQgYWxsLiBUaHVzLCAgZXZlbiBhIENTUyBjdXJzb3Igc2V0IG9uIGJvZHkgaGFzIG5vCisg ICAgICAgICAgICAgICAgLy8gZWZmZWN0IG9uIHBsdWdpbnMgKHdoaWNoIG1hdGNoZXMgRmlyZWZv eCkuCisgICAgICAgICAgICAgICAgYm9vbCBvdmVyUGx1Z2luRWxlbWVudCA9IGZhbHNlOworICAg ICAgICAgICAgICAgIGlmIChtZXYudGFyZ2V0Tm9kZSgpICYmIG1ldi50YXJnZXROb2RlKCktPmlz SFRNTEVsZW1lbnQoKSkgeworICAgICAgICAgICAgICAgICAgICBIVE1MRWxlbWVudCogZWwgPSBz dGF0aWNfY2FzdDxIVE1MRWxlbWVudCo+KG1ldi50YXJnZXROb2RlKCkpOworICAgICAgICAgICAg ICAgICAgICBvdmVyUGx1Z2luRWxlbWVudCA9IGVsLT5oYXNUYWdOYW1lKGFwcGxldFRhZykgfHwg ZWwtPmhhc1RhZ05hbWUob2JqZWN0VGFnKSB8fCBlbC0+aGFzVGFnTmFtZShlbWJlZFRhZyk7Cisg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGlmICghb3ZlclBsdWdpbkVsZW1lbnQp IHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKEZyYW1lVmlldyogdmlldyA9IG1fZnJhbWUtPnZp ZXcoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHZpZXctPnNldEN1cnNvcihzZWxlY3RDdXJz b3IobWV2LCBzY3JvbGxiYXIpKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KICAgICB9CkluZGV4OiBXZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gNTQ5ODgpCisrKyBXZWJLaXQvbWFjL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEwLTAyLTE4ICBBbGV4 ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zNTEzMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzY2NDM1Mz4gTW91c2UgY3Vy c29yIHNvbWV0aW1lcyBmbGlja2VycyBvdmVyIEZsYXNoIGNvbnRlbnQgKDM1MTMyKQorCisgICAg ICAgICogUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpbkV2ZW50SGFuZGxlckNhcmJvbi5tbToKKyAg ICAgICAgKFdlYk5ldHNjYXBlUGx1Z2luRXZlbnRIYW5kbGVyQ2FyYm9uOjptb3VzZU1vdmVkKTog U2VuZCBhZGp1c3RDdXJzb3IgZXZlbnRzIG9uIGV2ZXJ5IG1vdXNlCisgICAgICAgIG1vdmUuIFRo aXMgbWF0Y2hlcyBGaXJlZm94LCBhbmQgaXMgYWN0dWFsbHkgcmVxdWlyZWQgZm9yIHBsdWctaW5z IHRvIG1hbmlwdWxhdGUgY3Vyc29yIHdpaG91dAorICAgICAgICByZXNvcnRpbmcgdG8gdGVjaG5p cXVlcyBzdWNoIGFzIGZhc3QgZmlyaW5nIHRpbWVycy4KKworICAgICAgICAqIFBsdWdpbnMvV2Vi TmV0c2NhcGVQbHVnaW5WaWV3Lm1tOgorICAgICAgICAoLVtXZWJOZXRzY2FwZVBsdWdpblZpZXcg aGFuZGxlTW91c2VFbnRlcmVkOl0pOiBTb21lIHBsdWctaW5zIGhhbmRsZSBtb3VzZSBjdXJzb3Ig aW50ZXJuYWxseSwKKyAgICAgICAgYnV0IHRob3NlIHRoYXQgZG9uJ3QganVzdCBuZWVkIHRvIGdl dCBhbiBhcnJvdyBjdXJzb3IgKG1hdGNoaW5nIEZpcmVmb3gpLiBUaGlzIG1lYW5zIHRoYXQKKyAg ICAgICAgZS5nLiBhIHBsdWdpbiBpbnNpZGUgPEE+IHdvbid0IGdldCBhIGZpbmdlciBtb3VzZSBw b2ludGVyLgorCisgICAgICAgICogUGx1Z2lucy9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcu bW06CisgICAgICAgICgtW1dlYk5ldHNjYXBlUGx1Z2luVmlldyBoYW5kbGVNb3VzZUVudGVyZWQ6 XSk6CisgICAgICAgICgtW1dlYk5ldHNjYXBlUGx1Z2luVmlldyBoYW5kbGVNb3VzZUV4aXRlZDpd KToKKyAgICAgICAgSW1wbGVtZW50IHRoaXMgYmVoYXZpb3IgaGVyZSwgdG9vLiBBbHNvLCBvdXQg b2YgcHJvY2VzcyBjb2RlIGRpZG4ndCByZXNldCBtb3VzZSBwb2ludGVyIG9uCisgICAgICAgIG1v dXNlIGV4aXQsIHdoaWNoIGl0IG5lZWRlZCB0byBkby4KKworICAgICAgICAqIFdlYlZpZXcvV2Vi SFRNTFZpZXcubW06CisgICAgICAgIChuZWVkc0N1cnNvclJlY3RzU3VwcG9ydEF0UG9pbnQpOgor ICAgICAgICAoc2V0Q3Vyc29yKToKKyAgICAgICAgKHJlc2V0Q3Vyc29yUmVjdHMpOgorICAgICAg ICBNYWtlIHN1cmUgdGhhdCB0aGUgc2FtZSB3b3JrYXJvdW5kIHdlIGhhdmUgZm9yIFdlYiBjb250 ZW50IGFsc28gYXBwbGllcyB0byBOZXRzY2FwZSBwbHVnLWlucywKKyAgICAgICAgYXMgQXBwS2l0 IHdvdWxkIHJlc2V0IHRoZSBtb3VzZSBwb2ludGVyIHRvIGFycm93IGlmIGdpdmVuIGEgY2hhbmNl LgorICAgICAgICAoK1tXZWJIVE1MVmlld1ByaXZhdGUgaW5pdGlhbGl6ZV0pOiBSZW5hbWVkIHNl dEN1cnNvcklNUCBvbiBMZW9wYXJkIGFuZCBoaWdoZXIgdG8gcHJldmVudAorICAgICAgICBjb25m dXNpb24gLSB0aGUgbWV0aG9kIHdlIG92ZXJyaWRlIGlzIGNvbXBsZXRlbHkgZGlmZmVyZW50Lgor ICAgICAgICAoLVtXZWJIVE1MVmlldyBoaXRUZXN0Ol0pOiBBZGRlZCBhIEZJWE1FIGFib3V0IGEg bGlrZWx5IGJ1Zy4KKwogMjAxMC0wMi0xNyAgRG1pdHJ5IFRpdG92ICA8ZGltaWNoQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbiwgRGFyaW4gRmlzaGVyLCBT aW1vbiBIYXVzbWFubi4KSW5kZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdp bkV2ZW50SGFuZGxlckNhcmJvbi5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1BsdWdpbnMv V2ViTmV0c2NhcGVQbHVnaW5FdmVudEhhbmRsZXJDYXJib24ubW0JKHJldmlzaW9uIDU0OTcwKQor KysgV2ViS2l0L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luRXZlbnRIYW5kbGVyQ2FyYm9u Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xOTksOCArMTk5LDE3IEBAIHZvaWQgV2ViTmV0c2NhcGVQ bHVnaW5FdmVudEhhbmRsZXJDYXJib24KIHsKIH0KIAotdm9pZCBXZWJOZXRzY2FwZVBsdWdpbkV2 ZW50SGFuZGxlckNhcmJvbjo6bW91c2VNb3ZlZChOU0V2ZW50KikKK3ZvaWQgV2ViTmV0c2NhcGVQ bHVnaW5FdmVudEhhbmRsZXJDYXJib246Om1vdXNlTW92ZWQoTlNFdmVudCogdGhlRXZlbnQpCiB7 CisgICAgRXZlbnRSZWNvcmQgZXZlbnQ7CisgICAgCisgICAgZ2V0Q2FyYm9uRXZlbnQoJmV2ZW50 LCB0aGVFdmVudCk7CisgICAgZXZlbnQud2hhdCA9IGFkanVzdEN1cnNvckV2ZW50OworICAgIAor ICAgIEJPT0wgYWNjZXB0ZWRFdmVudDsKKyAgICBhY2NlcHRlZEV2ZW50ID0gc2VuZEV2ZW50KCZl dmVudCk7CisgICAgCisgICAgTE9HKFBsdWdpbkV2ZW50cywgIk5QUF9IYW5kbGVFdmVudChtb3Vz ZU1vdmVkKTogJWQiLCBhY2NlcHRlZEV2ZW50KTsKIH0KIAogdm9pZCBXZWJOZXRzY2FwZVBsdWdp bkV2ZW50SGFuZGxlckNhcmJvbjo6a2V5RG93bihOU0V2ZW50ICp0aGVFdmVudCkKSW5kZXg6IFdl YktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblZpZXcubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luVmlldy5tbQkocmV2aXNpb24gNTQ5 NzApCisrKyBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5WaWV3Lm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC03NTQsNiArNzU0LDkgQEAgc3RhdGljIGlubGluZSB2b2lkIGdldE5QUmVj dChjb25zdCBOU1JlYwogICAgIGlmICghX2lzU3RhcnRlZCkKICAgICAgICAgcmV0dXJuOwogCisg ICAgLy8gU2V0IGN1cnNvciB0byBhcnJvdy4gUGx1Z2lucyBvZnRlbiBoYW5kbGUgY3Vyc29yIGlu dGVybmFsbHksIGJ1dCB0aG9zZSB0aGF0IGRvbid0IHdpbGwganVzdCBnZXQgdGhpcyBkZWZhdWx0 IG9uZS4KKyAgICBbW05TQ3Vyc29yIGFycm93Q3Vyc29yXSBzZXRdOworCiAgICAgX2V2ZW50SGFu ZGxlci0+bW91c2VFbnRlcmVkKHRoZUV2ZW50KTsKIH0KIApJbmRleDogV2ViS2l0L21hYy9QbHVn aW5zL0hvc3RlZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcubW0J KHJldmlzaW9uIDU0OTcwKQorKysgV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9XZWJIb3N0ZWRO ZXRzY2FwZVBsdWdpblZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTI4Nyw2ICsyODcsOSBAQCBl eHRlcm4gIkMiIHsKIAogLSAodm9pZCloYW5kbGVNb3VzZUVudGVyZWQ6KE5TRXZlbnQgKilldmVu dAogeworICAgIC8vIFNldCBjdXJzb3IgdG8gYXJyb3cuIFBsdWdpbnMgb2Z0ZW4gaGFuZGxlIGN1 cnNvciBpbnRlcm5hbGx5LCBidXQgdGhvc2UgdGhhdCBkb24ndCB3aWxsIGp1c3QgZ2V0IHRoaXMg ZGVmYXVsdCBvbmUuCisgICAgW1tOU0N1cnNvciBhcnJvd0N1cnNvcl0gc2V0XTsKKwogICAgIGlm IChfaXNTdGFydGVkICYmIF9wcm94eSkKICAgICAgICAgX3Byb3h5LT5tb3VzZUV2ZW50KHNlbGYs IGV2ZW50LCBOUENvY29hRXZlbnRNb3VzZUVudGVyZWQpOwogfQpAQCAtMjk1LDYgKzI5OCwxMSBA QCBleHRlcm4gIkMiIHsKIHsKICAgICBpZiAoX2lzU3RhcnRlZCAmJiBfcHJveHkpCiAgICAgICAg IF9wcm94eS0+bW91c2VFdmVudChzZWxmLCBldmVudCwgTlBDb2NvYUV2ZW50TW91c2VFeGl0ZWQp OworCisgICAgLy8gU2V0IGN1cnNvciBiYWNrIHRvIGFycm93IGN1cnNvci4gIEJlY2F1c2UgTlND dXJzb3IgZG9lc24ndCBrbm93IGFib3V0IGNoYW5nZXMgdGhhdCB0aGUgcGx1Z2luIG1hZGUsIHdl IGNvdWxkIGdldCBjb25mdXNlZCBhYm91dCB3aGF0IHdlIHRoaW5rIHRoZQorICAgIC8vIGN1cnJl bnQgY3Vyc29yIGlzIG90aGVyd2lzZS4gIFRoZXJlZm9yZSB3ZSBoYXZlIG5vIGNob2ljZSBidXQg dG8gdW5jb25kaXRpb25hbGx5IHJlc2V0IHRoZSBjdXJzb3Igd2hlbiB0aGUgbW91c2UgZXhpdHMg dGhlIHBsdWdpbi4KKyAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgam9iIG9mIHBsdWdpbiBo b3N0LCBzZWUgPHJkYXI6Ly9wcm9ibGVtLzc2NTQ0MzQ+LgorICAgIFtbTlNDdXJzb3IgYXJyb3dD dXJzb3JdIHNldF07CiB9CiAKIC0gKHZvaWQpc2Nyb2xsV2hlZWw6KE5TRXZlbnQgKilldmVudApJ bmRleDogV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkocmV2aXNpb24gNTQ5NzApCisrKyBXZWJL aXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTE0OCwyNiAr MTQ4LDUyIEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAtIChCT09MKXJlY2VpdmVkVW5oYW5kbGVk Q29tbWFuZDsKIEBlbmQKIAotc3RhdGljIElNUCBvbGRTZXRDdXJzb3JJTVAgPSBOVUxMOworLy8g aWYgWUVTLCBkbyB0aGUgc3RhbmRhcmQgTlNWaWV3IGhpdCB0ZXN0ICh3aGljaCBjYW4ndCBnaXZl IHRoZSByaWdodCByZXN1bHQgd2hlbiBIVE1MIG92ZXJsYXBzIGEgdmlldykKK3N0YXRpYyBCT09M IGZvcmNlTlNWaWV3SGl0VGVzdDsKIAotI2lmZGVmIEJVSUxESU5HX09OX1RJR0VSCisvLyBpZiBZ RVMsIGRvIHRoZSAidG9wIFdlYkhUTUxWaWV3IiBoaXQgdGVzdCAod2hpY2ggd2UnZCBsaWtlIHRv IGRvIGFsbCB0aGUgdGltZSBidXQgY2FuJ3QgYmVjYXVzZSBvZiBKYXZhIHJlcXVpcmVtZW50cyBb c2VlIGJ1ZyA0MzQ5NzIxXSkKK3N0YXRpYyBCT09MIGZvcmNlV2ViSFRNTFZpZXdIaXRUZXN0Owor CitzdGF0aWMgV2ViSFRNTFZpZXcgKmxhc3RIaXRWaWV3OwogCi1zdGF0aWMgSU1QIG9sZFJlc2V0 Q3Vyc29yUmVjdHNJTVAgPSBOVUxMOworc3RhdGljIGJvb2wgbmVlZHNDdXJzb3JSZWN0c1N1cHBv cnRBdFBvaW50KE5TV2luZG93KiB3aW5kb3csIE5TUG9pbnQgcG9pbnQpCit7CisgICAgZm9yY2VO U1ZpZXdIaXRUZXN0ID0gWUVTOworICAgIE5TVmlldyogdmlldyA9IFtbd2luZG93IF93ZWJfYm9y ZGVyVmlld10gaGl0VGVzdDpwb2ludF07CisgICAgZm9yY2VOU1ZpZXdIaXRUZXN0ID0gTk87CisK KyAgICAvLyBXZWJIVE1MVmlldyBkb2Vzbid0IHVzZSBjdXJzb3IgcmVjdHMuCisgICAgaWYgKFt2 aWV3IGlzS2luZE9mQ2xhc3M6W1dlYkhUTUxWaWV3IGNsYXNzXV0pCisgICAgICAgIHJldHVybiBm YWxzZTsKKworICAgIC8vIE5laXRoZXIgZG8gTlBBUEkgcGx1Zy1pbnMuCisgICAgaWYgKFt2aWV3 IGlzS2luZE9mQ2xhc3M6W1dlYkJhc2VOZXRzY2FwZVBsdWdpblZpZXcgY2xhc3NdXSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgLy8gTm9uLVdlYiBjb250ZW50LCBXZWJQREZWaWV3LCBh bmQgV2ViS2l0IHBsdWctaW5zIHVzZSBub3JtYWwgY3Vyc29yIGhhbmRsaW5nLgorICAgIHJldHVy biB0cnVlOworfQorCisjaWZuZGVmIEJVSUxESU5HX09OX1RJR0VSCisKK3N0YXRpYyBJTVAgb2xk U2V0Q3Vyc29yRm9yTW91c2VMb2NhdGlvbklNUDsKKworLy8gT3ZlcnJpZGluZyBhbiBpbnRlcm5h bCBtZXRob2QgaXMgYSBoYWNrOyA8cmRhcjovL3Byb2JsZW0vNzY2Mjk4Nz4gdHJhY2tzIGZpbmRp bmcgYSBiZXR0ZXIgc29sdXRpb24uCitzdGF0aWMgdm9pZCBzZXRDdXJzb3IoTlNXaW5kb3cqIHNl bGYsIFNFTCBjbWQsIE5TUG9pbnQgcG9pbnQpCit7CisgICAgaWYgKG5lZWRzQ3Vyc29yUmVjdHNT dXBwb3J0QXRQb2ludChzZWxmLCBwb2ludCkpCisgICAgICAgIG9sZFNldEN1cnNvckZvck1vdXNl TG9jYXRpb25JTVAoc2VsZiwgY21kLCBwb2ludCk7Cit9CisKKyNlbHNlCisKK3N0YXRpYyBJTVAg b2xkUmVzZXRDdXJzb3JSZWN0c0lNUDsKK3N0YXRpYyBJTVAgb2xkU2V0Q3Vyc29ySU1QOwogc3Rh dGljIEJPT0wgY2FuU2V0Q3Vyc29yID0gWUVTOwogCiBzdGF0aWMgdm9pZCByZXNldEN1cnNvclJl Y3RzKE5TV2luZG93KiBzZWxmLCBTRUwgY21kKQogewotICAgIE5TUG9pbnQgcG9pbnQgPSBbc2Vs ZiBtb3VzZUxvY2F0aW9uT3V0c2lkZU9mRXZlbnRTdHJlYW1dOwotICAgIE5TVmlldyogdmlldyA9 IFtbc2VsZiBfd2ViX2JvcmRlclZpZXddIGhpdFRlc3Q6cG9pbnRdOwotICAgIGlmIChbdmlldyBp c0tpbmRPZkNsYXNzOltXZWJIVE1MVmlldyBjbGFzc11dKSB7Ci0gICAgICAgIFdlYkhUTUxWaWV3 ICpodG1sVmlldyA9IChXZWJIVE1MVmlldyopdmlldzsKLSAgICAgICAgTlNQb2ludCBsb2NhbFBv aW50ID0gW2h0bWxWaWV3IGNvbnZlcnRQb2ludDpwb2ludCBmcm9tVmlldzpuaWxdOwotICAgICAg ICBOU0RpY3Rpb25hcnkgKmRpY3QgPSBbaHRtbFZpZXcgZWxlbWVudEF0UG9pbnQ6bG9jYWxQb2lu dCBhbGxvd1NoYWRvd0NvbnRlbnQ6Tk9dOwotICAgICAgICBET01FbGVtZW50ICplbGVtZW50ID0g W2RpY3Qgb2JqZWN0Rm9yS2V5OldlYkVsZW1lbnRET01Ob2RlS2V5XTsKLSAgICAgICAgaWYgKCFb ZWxlbWVudCBpc0tpbmRPZkNsYXNzOltET01IVE1MQXBwbGV0RWxlbWVudCBjbGFzc11dICYmICFb ZWxlbWVudCBpc0tpbmRPZkNsYXNzOltET01IVE1MT2JqZWN0RWxlbWVudCBjbGFzc11dICYmCi0g ICAgICAgICAgICAhW2VsZW1lbnQgaXNLaW5kT2ZDbGFzczpbRE9NSFRNTEVtYmVkRWxlbWVudCBj bGFzc11dKQotICAgICAgICAgICAgY2FuU2V0Q3Vyc29yID0gTk87Ci0gICAgfQorICAgIGNhblNl dEN1cnNvciA9IG5lZWRzQ3Vyc29yUmVjdHNTdXBwb3J0QXRQb2ludChzZWxmLCBbc2VsZiBtb3Vz ZUxvY2F0aW9uT3V0c2lkZU9mRXZlbnRTdHJlYW1dKTsKICAgICBvbGRSZXNldEN1cnNvclJlY3Rz SU1QKHNlbGYsIGNtZCk7CiAgICAgY2FuU2V0Q3Vyc29yID0gWUVTOwogfQpAQCAtMTc4LDIzICsy MDQsNiBAQCBzdGF0aWMgdm9pZCBzZXRDdXJzb3IoTlNDdXJzb3IqIHNlbGYsIFNFCiAgICAgICAg IG9sZFNldEN1cnNvcklNUChzZWxmLCBjbWQpOwogfQogCi0jZWxzZQotCi1zdGF0aWMgdm9pZCBz ZXRDdXJzb3IoTlNXaW5kb3cqIHNlbGYsIFNFTCBjbWQsIE5TUG9pbnQgcG9pbnQpCi17Ci0gICAg TlNWaWV3KiB2aWV3ID0gW1tzZWxmIF93ZWJfYm9yZGVyVmlld10gaGl0VGVzdDpwb2ludF07Ci0g ICAgaWYgKFt2aWV3IGlzS2luZE9mQ2xhc3M6W1dlYkhUTUxWaWV3IGNsYXNzXV0pIHsKLSAgICAg ICAgV2ViSFRNTFZpZXcgKmh0bWxWaWV3ID0gKFdlYkhUTUxWaWV3Kil2aWV3OwotICAgICAgICBO U1BvaW50IGxvY2FsUG9pbnQgPSBbaHRtbFZpZXcgY29udmVydFBvaW50OnBvaW50IGZyb21WaWV3 Om5pbF07Ci0gICAgICAgIE5TRGljdGlvbmFyeSAqZGljdCA9IFtodG1sVmlldyBlbGVtZW50QXRQ b2ludDpsb2NhbFBvaW50IGFsbG93U2hhZG93Q29udGVudDpOT107Ci0gICAgICAgIERPTUVsZW1l bnQgKmVsZW1lbnQgPSBbZGljdCBvYmplY3RGb3JLZXk6V2ViRWxlbWVudERPTU5vZGVLZXldOwot ICAgICAgICBpZiAoIVtlbGVtZW50IGlzS2luZE9mQ2xhc3M6W0RPTUhUTUxBcHBsZXRFbGVtZW50 IGNsYXNzXV0gJiYgIVtlbGVtZW50IGlzS2luZE9mQ2xhc3M6W0RPTUhUTUxPYmplY3RFbGVtZW50 IGNsYXNzXV0gJiYKLSAgICAgICAgICAgICFbZWxlbWVudCBpc0tpbmRPZkNsYXNzOltET01IVE1M RW1iZWRFbGVtZW50IGNsYXNzXV0pCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIG9s ZFNldEN1cnNvcklNUChzZWxmLCBjbWQsIHBvaW50KTsKLX0KLQogI2VuZGlmCiAKIGV4dGVybiAi QyIgewpAQCAtMjk0LDE0ICszMDMsNiBAQCBleHRlcm4gTlNTdHJpbmcgKk5TVGV4dElucHV0UmVw bGFjZW1lbnRSCiBAaW1wbGVtZW50YXRpb24gV2ViQ29yZVNjcm9sbFZpZXcKIEBlbmQKIAotLy8g aWYgWUVTLCBkbyB0aGUgc3RhbmRhcmQgTlNWaWV3IGhpdCB0ZXN0ICh3aGljaCBjYW4ndCBnaXZl IHRoZSByaWdodCByZXN1bHQgd2hlbiBIVE1MIG92ZXJsYXBzIGEgdmlldykKLXN0YXRpYyBCT09M IGZvcmNlTlNWaWV3SGl0VGVzdDsKLQotLy8gaWYgWUVTLCBkbyB0aGUgInRvcCBXZWJIVE1MVmll dyIgaGl0IHRlc3QgKHdoaWNoIHdlJ2QgbGlrZSB0byBkbyBhbGwgdGhlIHRpbWUgYnV0IGNhbid0 IGJlY2F1c2Ugb2YgSmF2YSByZXF1aXJlbWVudHMgW3NlZSBidWcgNDM0OTcyMV0pCi1zdGF0aWMg Qk9PTCBmb3JjZVdlYkhUTUxWaWV3SGl0VGVzdDsKLQotc3RhdGljIFdlYkhUTUxWaWV3ICpsYXN0 SGl0VmlldzsKLQogLy8gV2UgbmVlZCB0aGlzIHRvIGJlIGFibGUgdG8gc2FmZWx5IHJlZmVyZW5j ZSB0aGUgQ2FjaGVkSW1hZ2UgZm9yIHRoZSBwcm9taXNlZCBkcmFnIGRhdGEKIHN0YXRpYyBDYWNo ZWRSZXNvdXJjZUNsaWVudCogcHJvbWlzZWREYXRhQ2xpZW50KCkKIHsKQEAgLTQ5MCwyMCArNDkx LDIxIEBAIHN0YXRpYyBOU0NlbGxTdGF0ZVZhbHVlIGtpdChUcmlTdGF0ZSBzdGEKICNpZm5kZWYg QlVJTERJTkdfT05fVElHRVIKICAgICBXZWJDb3JlT2JqQ0ZpbmFsaXplT25NYWluVGhyZWFkKHNl bGYpOwogI2VuZGlmCi0KKyAgICAKKyNpZm5kZWYgQlVJTERJTkdfT05fVElHRVIKKyAgICBpZiAo IW9sZFNldEN1cnNvckZvck1vdXNlTG9jYXRpb25JTVApIHsKKyAgICAgICAgTWV0aG9kIHNldEN1 cnNvck1ldGhvZCA9IGNsYXNzX2dldEluc3RhbmNlTWV0aG9kKFtOU1dpbmRvdyBjbGFzc10sIEBz ZWxlY3Rvcihfc2V0Q3Vyc29yRm9yTW91c2VMb2NhdGlvbjopKTsKKyAgICAgICAgQVNTRVJUKHNl dEN1cnNvck1ldGhvZCk7CisgICAgICAgIG9sZFNldEN1cnNvckZvck1vdXNlTG9jYXRpb25JTVAg PSBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24oc2V0Q3Vyc29yTWV0aG9kLCAoSU1QKXNldEN1cnNv cik7CisgICAgICAgIEFTU0VSVChvbGRTZXRDdXJzb3JGb3JNb3VzZUxvY2F0aW9uSU1QKTsKKyAg ICB9CisjZWxzZQogICAgIGlmICghb2xkU2V0Q3Vyc29ySU1QKSB7Ci0jaWZkZWYgQlVJTERJTkdf T05fVElHRVIKICAgICAgICAgTWV0aG9kIHNldEN1cnNvck1ldGhvZCA9IGNsYXNzX2dldEluc3Rh bmNlTWV0aG9kKFtOU0N1cnNvciBjbGFzc10sIEBzZWxlY3RvcihzZXQpKTsKLSNlbHNlCi0gICAg ICAgIE1ldGhvZCBzZXRDdXJzb3JNZXRob2QgPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChbTlNX aW5kb3cgY2xhc3NdLCBAc2VsZWN0b3IoX3NldEN1cnNvckZvck1vdXNlTG9jYXRpb246KSk7Ci0j ZW5kaWYKICAgICAgICAgQVNTRVJUKHNldEN1cnNvck1ldGhvZCk7Ci0KICAgICAgICAgb2xkU2V0 Q3Vyc29ySU1QID0gbWV0aG9kX3NldEltcGxlbWVudGF0aW9uKHNldEN1cnNvck1ldGhvZCwgKElN UClzZXRDdXJzb3IpOwogICAgICAgICBBU1NFUlQob2xkU2V0Q3Vyc29ySU1QKTsKICAgICB9Ci0g ICAgCi0jaWZkZWYgQlVJTERJTkdfT05fVElHRVIKICAgICBpZiAoIW9sZFJlc2V0Q3Vyc29yUmVj dHNJTVApIHsKICAgICAgICAgTWV0aG9kIHJlc2V0Q3Vyc29yUmVjdHNNZXRob2QgPSBjbGFzc19n ZXRJbnN0YW5jZU1ldGhvZChbTlNXaW5kb3cgY2xhc3NdLCBAc2VsZWN0b3IocmVzZXRDdXJzb3JS ZWN0cykpOwogICAgICAgICBBU1NFUlQocmVzZXRDdXJzb3JSZWN0c01ldGhvZCk7CkBAIC0xNDIx LDYgKzE0MjMsNyBAQCBzdGF0aWMgdm9pZCBfdXBkYXRlTW91c2VvdmVyVGltZXJDYWxsYmFjCiAg ICAgZWxzZSBpZiAoZm9yY2VXZWJIVE1MVmlld0hpdFRlc3QpCiAgICAgICAgIGNhcHR1cmVIaXRz T25TdWJ2aWV3cyA9IFlFUzsKICAgICBlbHNlIHsKKyAgICAgICAgLy8gRklYTUU6IFdoeSBkb2Vz bid0IHRoaXMgaW5jbHVkZSBtb3VzZSBlbnRlcmVkL2V4aXRlZCBldmVudHMsIG9yIG90aGVyIG1v dXNlIGJ1dHRvbiBldmVudHM/CiAgICAgICAgIE5TRXZlbnQgKmV2ZW50ID0gW1tzZWxmIHdpbmRv d10gY3VycmVudEV2ZW50XTsKICAgICAgICAgY2FwdHVyZUhpdHNPblN1YnZpZXdzID0gIShbZXZl bnQgdHlwZV0gPT0gTlNNb3VzZU1vdmVkCiAgICAgICAgICAgICB8fCBbZXZlbnQgdHlwZV0gPT0g TlNSaWdodE1vdXNlRG93bgo=