64569 2011-07-14 16:03:25 -0700 Support "Jump to Selection" in WebKit2 on Mac 2011-09-14 09:52:17 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 adachan adachan andersca sam oldest_to_newest 437384 0 adachan 2011-07-14 16:03:25 -0700 To do this, we need to implement the CenterSelectionInVisibleArea editor command in WebCore. <rdar://problem/9732174> 437407 1 100893 adachan 2011-07-14 16:36:12 -0700 Created attachment 100893 Patch 437940 2 adachan 2011-07-15 13:17:15 -0700 I forgot that besides scrolling the selection into view, I also need to flash the find indicator (bounce the yellow bubble around the selection) when that command is triggered. I'm going to send a new patch, and since the find indicator is not part of WebCore, I might as well just handle everything within WebKit. 437943 3 101032 adachan 2011-07-15 13:18:11 -0700 Created attachment 101032 Patch (2nd version) 467089 4 adachan 2011-09-14 09:52:17 -0700 Committed: http://trac.webkit.org/changeset/91108 100893 2011-07-14 16:36:12 -0700 2011-07-15 13:18:11 -0700 Patch 64569.patch.txt text/plain 5107 adachan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxMDMxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDctMTQgIEFkYSBDaGFu ICA8YWRhY2hhbkBhcHBsZS5jb20+CisKKyAgICAgICAgSW1wbGVtZW50ICJKdW1wIHRvIFNlbGVj dGlvbiIgaW4gV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjQ1NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBJbXBsZW1lbnQgYSAiQ2VudGVyU2VsZWN0aW9uSW5WaXNpYmxlQXJlYSIgZWRpdG9y IGNvbW1hbmQsIHdoaWNoIGlzIHVzZWQgZm9yIAorICAgICAgICB0aGUgIkp1bXAgdG8gU2VsZWN0 aW9uIiBtZW51IGl0ZW0gb24gdGhlIE1hYy4KKworICAgICAgICAqIGVkaXRpbmcvRWRpdG9yQ29t bWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpleGVjdXRlQ2VudGVyU2VsZWN0aW9uSW5WaXNp YmxlQXJlYSk6IENhbGwgcmV2ZWFsU2VsZWN0aW9uKCkgdG8gc2Nyb2xsIHRoZSBzZWxlY3Rpb24g aW50bworICAgICAgICB2aWV3IGFuZCBjZW50ZXIgaXQuCisgICAgICAgIChXZWJDb3JlOjplbmFi bGVkQ2VudGVyU2VsZWN0aW9uSW5WaXNpYmxlQXJlYSk6IEVuYWJsZSB0aGUgY29tbWFuZCBpZiB0 aGVyZSdzIGEgc2VsZWN0aW9uIHJhbmdlIG9yCisgICAgICAgIGlmIHRoZSBpbnNlcnRpb24gcG9p bnQgaXMgaW5zaWRlIGFuIGVkaXRhYmxlIGFyZWEuCisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVD b21tYW5kTWFwKTogQWRkIHRoZSAiQ2VudGVyU2VsZWN0aW9uSW5WaXNpYmxlQXJlYSIgY29tbWFu ZC4KKwogMjAxMS0wNy0xNCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAg ICAgICAgUkVHUkVTU0lPTjogU2hvdWxkIG5vdCBkaXNwYXRjaCBkaWRGaXJzdFZpc3VhbGx5Tm9u RW1wdHlMYXlvdXQgZm9yIHRoZSBpbml0aWFsIGVtcHR5IGRvY3VtZW50CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0VkaXRvckNvbW1hbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvRWRpdG9yQ29tbWFuZC5jcHAJKHJldmlzaW9uIDkxMDI4KQorKysgU291 cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3JDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjgwLDYgKzI4MCwxMiBAQCBzdGF0aWMgYm9vbCBleGVjdXRlQmFja0NvbG9yKEZyYW1lKiBmcmFt CiAgICAgcmV0dXJuIGV4ZWN1dGVBcHBseVN0eWxlKGZyYW1lLCBzb3VyY2UsIEVkaXRBY3Rpb25T ZXRCYWNrZ3JvdW5kQ29sb3IsIENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yLCB2YWx1ZSk7CiB9 CiAKK3N0YXRpYyBib29sIGV4ZWN1dGVDZW50ZXJTZWxlY3Rpb25JblZpc2libGVBcmVhKEZyYW1l KiBmcmFtZSwgRXZlbnQqLCBFZGl0b3JDb21tYW5kU291cmNlLCBjb25zdCBTdHJpbmcmKQorewor ICAgIGZyYW1lLT5zZWxlY3Rpb24oKS0+cmV2ZWFsU2VsZWN0aW9uKFNjcm9sbEFsaWdubWVudDo6 YWxpZ25DZW50ZXJBbHdheXMpOworICAgIHJldHVybiB0cnVlOworfQorCiBzdGF0aWMgYm9vbCBl eGVjdXRlQ29weShGcmFtZSogZnJhbWUsIEV2ZW50KiwgRWRpdG9yQ29tbWFuZFNvdXJjZSwgY29u c3QgU3RyaW5nJikKIHsKICAgICBmcmFtZS0+ZWRpdG9yKCktPmNvcHkoKTsKQEAgLTExOTAsNiAr MTE5NiwxMSBAQCBzdGF0aWMgYm9vbCBlbmFibGVDYXJldEluRWRpdGFibGVUZXh0KEZyCiAgICAg cmV0dXJuIHNlbGVjdGlvbi5pc0NhcmV0KCkgJiYgc2VsZWN0aW9uLmlzQ29udGVudEVkaXRhYmxl KCk7CiB9CiAKK3N0YXRpYyBib29sIGVuYWJsZWRDZW50ZXJTZWxlY3Rpb25JblZpc2libGVBcmVh KEZyYW1lKiBmcmFtZSwgRXZlbnQqLCBFZGl0b3JDb21tYW5kU291cmNlKQoreworICAgIHJldHVy biBmcmFtZS0+c2VsZWN0aW9uKCktPmlzUmFuZ2UoKSB8fCAoZnJhbWUtPnNlbGVjdGlvbigpLT5p c0NvbnRlbnRFZGl0YWJsZSgpICYmIGZyYW1lLT5zZWxlY3Rpb24oKS0+aXNDYXJldCgpKTsKK30K Kwogc3RhdGljIGJvb2wgZW5hYmxlZENvcHkoRnJhbWUqIGZyYW1lLCBFdmVudCosIEVkaXRvckNv bW1hbmRTb3VyY2UpCiB7CiAgICAgcmV0dXJuIGZyYW1lLT5lZGl0b3IoKS0+Y2FuREhUTUxDb3B5 KCkgfHwgZnJhbWUtPmVkaXRvcigpLT5jYW5Db3B5KCk7CkBAIC0xNDExLDYgKzE0MjIsNyBAQCBz dGF0aWMgY29uc3QgQ29tbWFuZE1hcCYgY3JlYXRlQ29tbWFuZE1hCiAgICAgICAgIHsgIkJhY2tD b2xvciIsIHsgZXhlY3V0ZUJhY2tDb2xvciwgc3VwcG9ydGVkLCBlbmFibGVkSW5SaWNobHlFZGl0 YWJsZVRleHQsIHN0YXRlTm9uZSwgdmFsdWVCYWNrQ29sb3IsIG5vdFRleHRJbnNlcnRpb24sIGRv Tm90QWxsb3dFeGVjdXRpb25XaGVuRGlzYWJsZWQgfSB9LAogICAgICAgICB7ICJCYWNrd2FyZERl bGV0ZSIsIHsgZXhlY3V0ZURlbGV0ZUJhY2t3YXJkLCBzdXBwb3J0ZWRGcm9tTWVudU9yS2V5Qmlu ZGluZywgZW5hYmxlZEluRWRpdGFibGVUZXh0LCBzdGF0ZU5vbmUsIHZhbHVlTnVsbCwgbm90VGV4 dEluc2VydGlvbiwgZG9Ob3RBbGxvd0V4ZWN1dGlvbldoZW5EaXNhYmxlZCB9IH0sIC8vIEZJWE1F OiByZW1vdmUgQmFja3dhcmREZWxldGUgd2hlbiBTYWZhcmkgZm9yIFdpbmRvd3Mgc3RvcHMgdXNp bmcgaXQuCiAgICAgICAgIHsgIkJvbGQiLCB7IGV4ZWN1dGVUb2dnbGVCb2xkLCBzdXBwb3J0ZWQs IGVuYWJsZWRJblJpY2hseUVkaXRhYmxlVGV4dCwgc3RhdGVCb2xkLCB2YWx1ZU51bGwsIG5vdFRl eHRJbnNlcnRpb24sIGRvTm90QWxsb3dFeGVjdXRpb25XaGVuRGlzYWJsZWQgfSB9LAorICAgICAg ICB7ICJDZW50ZXJTZWxlY3Rpb25JblZpc2libGVBcmVhIiwgeyBleGVjdXRlQ2VudGVyU2VsZWN0 aW9uSW5WaXNpYmxlQXJlYSwgc3VwcG9ydGVkRnJvbU1lbnVPcktleUJpbmRpbmcsIGVuYWJsZWRD ZW50ZXJTZWxlY3Rpb25JblZpc2libGVBcmVhLCBzdGF0ZU5vbmUsIHZhbHVlTnVsbCwgbm90VGV4 dEluc2VydGlvbiwgZG9Ob3RBbGxvd0V4ZWN1dGlvbldoZW5EaXNhYmxlZCB9IH0sCiAgICAgICAg IHsgIkNvcHkiLCB7IGV4ZWN1dGVDb3B5LCBzdXBwb3J0ZWRDb3B5Q3V0LCBlbmFibGVkQ29weSwg c3RhdGVOb25lLCB2YWx1ZU51bGwsIG5vdFRleHRJbnNlcnRpb24sIGFsbG93RXhlY3V0aW9uV2hl bkRpc2FibGVkIH0gfSwKICAgICAgICAgeyAiQ3JlYXRlTGluayIsIHsgZXhlY3V0ZUNyZWF0ZUxp bmssIHN1cHBvcnRlZCwgZW5hYmxlZEluUmljaGx5RWRpdGFibGVUZXh0LCBzdGF0ZU5vbmUsIHZh bHVlTnVsbCwgbm90VGV4dEluc2VydGlvbiwgZG9Ob3RBbGxvd0V4ZWN1dGlvbldoZW5EaXNhYmxl ZCB9IH0sCiAgICAgICAgIHsgIkN1dCIsIHsgZXhlY3V0ZUN1dCwgc3VwcG9ydGVkQ29weUN1dCwg ZW5hYmxlZEN1dCwgc3RhdGVOb25lLCB2YWx1ZU51bGwsIG5vdFRleHRJbnNlcnRpb24sIGFsbG93 RXhlY3V0aW9uV2hlbkRpc2FibGVkIH0gfSwKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxMDMx KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTMgQEAKKzIwMTEtMDctMTQgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgSW1wbGVtZW50ICJKdW1wIHRvIFNlbGVjdGlvbiIgaW4gV2ViS2l0MgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQ1NjkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dL Vmlldy5tbTogQWRkIHN1cHBvcnQgZm9yIHRoZSBjZW50ZXJTZWxlY3Rpb25JblZpc2libGVBcmVh OgorICAgICAgICBzZWxlY3RvciBjb21tYW5kLgorCiAyMDExLTA3LTE0ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRl cnMgQ2FybHNzb24uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1Zp ZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tW aWV3Lm1tCShyZXZpc2lvbiA5MTAyOCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDI4LDYgKzQyOCw3IEBAIFdFQkNPUkVf Q09NTUFORChhbGlnbkNlbnRlcikKIFdFQkNPUkVfQ09NTUFORChhbGlnbkp1c3RpZmllZCkKIFdF QkNPUkVfQ09NTUFORChhbGlnbkxlZnQpCiBXRUJDT1JFX0NPTU1BTkQoYWxpZ25SaWdodCkKK1dF QkNPUkVfQ09NTUFORChjZW50ZXJTZWxlY3Rpb25JblZpc2libGVBcmVhKQogV0VCQ09SRV9DT01N QU5EKGNvcHkpCiBXRUJDT1JFX0NPTU1BTkQoY3V0KQogV0VCQ09SRV9DT01NQU5EKGRlbGV0ZSkK QEAgLTU2OSw3ICs1NzAsNiBAQCBpbmRpdmlkdWFsIG1ldGhvZHMgaGVyZSB3aXRoIE1hYy1zcGVj aWZpCiBFZGl0aW5nLXJlbGF0ZWQgbWV0aG9kcyBzdGlsbCB1bmltcGxlbWVudGVkIHRoYXQgYXJl IGltcGxlbWVudGVkIGluIFdlYktpdDE6CiAKIC0gKHZvaWQpY2FwaXRhbGl6ZVdvcmQ6KGlkKXNl bmRlcjsKLS0gKHZvaWQpY2VudGVyU2VsZWN0aW9uSW5WaXNpYmxlQXJlYTooaWQpc2VuZGVyOwog LSAodm9pZCljaGFuZ2VGb250OihpZClzZW5kZXI7CiAtICh2b2lkKWNvbXBsZXRlOihpZClzZW5k ZXI7CiAtICh2b2lkKWNvcHlGb250OihpZClzZW5kZXI7Cg== 101032 2011-07-15 13:18:11 -0700 2011-07-15 13:22:34 -0700 Patch (2nd version) 64569.patch.txt text/plain 5312 adachan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxMDk3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMTUgIEFkYSBDaGFu ICA8YWRhY2hhbkBhcHBsZS5jb20+CisKKyAgICAgICAgSW1wbGVtZW50ICJKdW1wIHRvIFNlbGVj dGlvbiIgaW4gV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjQ1NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3 IGNlbnRlclNlbGVjdGlvbkluVmlzaWJsZUFyZWE6XSk6IENhbGwgV2ViUGFnZVByb3h5OjpjZW50 ZXJTZWxlY3Rpb25JblZpc2libGVBcmVhKCkuCisgICAgICAgICgtW1dLVmlldyB2YWxpZGF0ZVVz ZXJJbnRlcmZhY2VJdGVtOl0pOiBFbmFibGUgdGhlIGNlbnRlclNlbGVjdGlvbkluVmlzaWJsZUFy ZWE6IHNlbGVjdG9yIGlmIHRoZXJlJ3MgYSBzZWxlY3Rpb24KKyAgICAgICAgcmFuZ2Ugb3IgaWYg dGhlcmUncyBhbiBpbnNlcnRpb24gcG9pbnQgaW4gYW4gZWRpdGFibGUgYXJlYS4KKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0 OjpGaW5kQ29udHJvbGxlcjo6c2hvd0ZpbmRJbmRpY2F0b3JJblNlbGVjdGlvbik6IENhbGwgdXBk YXRlRmluZEluZGljYXRvcigpIHRvIHNob3cgdGhlIGZpbmQgaW5kaWNhdG9yLgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5oOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Y2VudGVy U2VsZWN0aW9uSW5WaXNpYmxlQXJlYSk6IFVzZSB0aGUgc2VsZWN0aW9uIGluIHRoZSBmb2N1c2Vk IG9yIG1haW4gZnJhbWUuCisgICAgICAgIEFmdGVyIHNjcm9sbGluZyB0aGUgc2VsZWN0aW9uIGlu dG8gdmlldywgZmxhc2ggdGhlIGZpbmQgaW5kaWNhdG9yLgorCiAyMDExLTA3LTE1ICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTjogTW91c2UgY3Vy c29yIGRvZXNu4oCZdCBoaWRlIHdoZW4gZnVsbCBzY3JlZW4gdmlkZW8gSFVEIGhpZGVzCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCShyZXZpc2lvbiA5 MTAyOCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkod29y a2luZyBjb3B5KQpAQCAtNTM2LDYgKzUzNiwxMSBAQCAtIChCT09MKXdyaXRlU2VsZWN0aW9uVG9Q YXN0ZWJvYXJkOihOU1BhCiAgICAgcmV0dXJuIF9kYXRhLT5fcGFnZS0+d3JpdGVTZWxlY3Rpb25U b1Bhc3RlYm9hcmQoW3Bhc3RlYm9hcmQgbmFtZV0sIHBhc3RlYm9hcmRUeXBlcyk7CiB9CiAKKy0g KHZvaWQpY2VudGVyU2VsZWN0aW9uSW5WaXNpYmxlQXJlYTooaWQpc2VuZGVyIAoreyAKKyAgICBf ZGF0YS0+X3BhZ2UtPmNlbnRlclNlbGVjdGlvbkluVmlzaWJsZUFyZWEoKTsKK30KKwogLy8gVGhp cyBtZXRob2QgaXMgbmVlZGVkIHRvIHN1cHBvcnQgTWFjIE9TIFggc2VydmljZXMuCiAKIC0gKGlk KXZhbGlkUmVxdWVzdG9yRm9yU2VuZFR5cGU6KE5TU3RyaW5nICopc2VuZFR5cGUgcmV0dXJuVHlw ZTooTlNTdHJpbmcgKilyZXR1cm5UeXBlCkBAIC01NjksNyArNTc0LDYgQEAgaW5kaXZpZHVhbCBt ZXRob2RzIGhlcmUgd2l0aCBNYWMtc3BlY2lmaQogRWRpdGluZy1yZWxhdGVkIG1ldGhvZHMgc3Rp bGwgdW5pbXBsZW1lbnRlZCB0aGF0IGFyZSBpbXBsZW1lbnRlZCBpbiBXZWJLaXQxOgogCiAtICh2 b2lkKWNhcGl0YWxpemVXb3JkOihpZClzZW5kZXI7Ci0tICh2b2lkKWNlbnRlclNlbGVjdGlvbklu VmlzaWJsZUFyZWE6KGlkKXNlbmRlcjsKIC0gKHZvaWQpY2hhbmdlRm9udDooaWQpc2VuZGVyOwog LSAodm9pZCljb21wbGV0ZTooaWQpc2VuZGVyOwogLSAodm9pZCljb3B5Rm9udDooaWQpc2VuZGVy OwpAQCAtNjk3LDYgKzcwMSwxMCBAQCAtIChCT09MKXZhbGlkYXRlVXNlckludGVyZmFjZUl0ZW06 KGlkIDxOCiAgICAgCiAgICAgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3Ioc3RvcFNwZWFraW5nOikp CiAgICAgICAgIHJldHVybiBbTlNBcHAgaXNTcGVha2luZ107CisgICAgCisgICAgLy8gVGhlIGNl bnRlclNlbGVjdGlvbkluVmlzaWJsZUFyZWE6IHNlbGVjdG9yIGlzIGVuYWJsZWQgaWYgdGhlcmUn cyBhIHNlbGVjdGlvbiByYW5nZSBvciBpZiB0aGVyZSdzIGFuIGluc2VydGlvbiBwb2ludCBpbiBh biBlZGl0YWJsZSBhcmVhLgorICAgIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKGNlbnRlclNlbGVj dGlvbkluVmlzaWJsZUFyZWE6KSkKKyAgICAgICAgcmV0dXJuIF9kYXRhLT5fcGFnZS0+ZWRpdG9y U3RhdGUoKS5zZWxlY3Rpb25Jc1JhbmdlIHx8IChfZGF0YS0+X3BhZ2UtPmVkaXRvclN0YXRlKCku aXNDb250ZW50RWRpdGFibGUgJiYgIV9kYXRhLT5fcGFnZS0+ZWRpdG9yU3RhdGUoKS5zZWxlY3Rp b25Jc05vbmUpOwogCiAgICAgLy8gTmV4dCwgaGFuZGxlIGVkaXRvciBjb21tYW5kcy4gU3RhcnQg YnkgcmV0dXJuaW5nIFlFUyBmb3IgYW55dGhpbmcgdGhhdCBpcyBub3QgYW4gZWRpdG9yIGNvbW1h bmQuCiAgICAgLy8gUmV0dXJuaW5nIFlFUyBpcyB0aGUgZGVmYXVsdCB0aGluZyB0byBkbyBpbiBh biBBcHBLaXQgdmFsaWRhdGUgbWV0aG9kIGZvciBhbnkgc2VsZWN0b3IgdGhhdCBpcyBub3QgcmVj b2duaXplZC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29u dHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL0ZpbmRDb250cm9sbGVyLmNwcAkocmV2aXNpb24gOTEwMjgpCisrKyBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5TWVzc2FnZXMuaCIKICNpbmNs dWRlICJXZWJQcm9jZXNzLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9Eb2N1bWVudE1hcmtlckNvbnRy b2xsZXIuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0ZvY3VzQ29udHJvbGxlci5oPgogI2luY2x1ZGUg PFdlYkNvcmUvRnJhbWUuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lVmlldy5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+CkBAIC0yMjMsNiArMjI0LDE1IEBAIHZvaWQg RmluZENvbnRyb2xsZXI6OmhpZGVGaW5kSW5kaWNhdG9yKCkKICAgICBtX2lzU2hvd2luZ0ZpbmRJ bmRpY2F0b3IgPSBmYWxzZTsKIH0KIAordm9pZCBGaW5kQ29udHJvbGxlcjo6c2hvd0ZpbmRJbmRp Y2F0b3JJblNlbGVjdGlvbigpCit7CisgICAgRnJhbWUqIHNlbGVjdGVkRnJhbWUgPSBtX3dlYlBh Z2UtPmNvcmVQYWdlKCktPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JNYWluRnJhbWUoKTsK KyAgICBpZiAoIXNlbGVjdGVkRnJhbWUpCisgICAgICAgIHJldHVybjsKKyAgICAKKyAgICB1cGRh dGVGaW5kSW5kaWNhdG9yKHNlbGVjdGVkRnJhbWUsIGZhbHNlKTsKK30KKwogVmVjdG9yPEludFJl Y3Q+IEZpbmRDb250cm9sbGVyOjpyZWN0c0ZvclRleHRNYXRjaGVzKCkKIHsKICAgICBWZWN0b3I8 SW50UmVjdD4gcmVjdHM7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv RmluZENvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuaAkocmV2aXNpb24gOTEwMjgpCisrKyBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpA QCAtNTMsNiArNTMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBjb3VudFN0cmluZ01hdGNoZXMoY29u c3QgU3RyaW5nJiwgRmluZE9wdGlvbnMsIHVuc2lnbmVkIG1heE1hdGNoQ291bnQpOwogICAgIAog ICAgIHZvaWQgaGlkZUZpbmRJbmRpY2F0b3IoKTsKKyAgICB2b2lkIHNob3dGaW5kSW5kaWNhdG9y SW5TZWxlY3Rpb24oKTsKIAogcHJpdmF0ZToKICAgICAvLyBQYWdlT3ZlcmxheTo6Q2xpZW50LgpJ bmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAko cmV2aXNpb24gOTEwMjgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMzUsMTEgKzEyMzUsMTIgQEAgdm9pZCBXZWJQ YWdlOjpzY3JvbGxCeSh1aW50MzJfdCBzY3JvbGxEaQogCiB2b2lkIFdlYlBhZ2U6OmNlbnRlclNl bGVjdGlvbkluVmlzaWJsZUFyZWEoKQogewotICAgIEZyYW1lKiBjb3JlRnJhbWUgPSBtX21haW5G cmFtZS0+Y29yZUZyYW1lKCk7Ci0gICAgaWYgKCFjb3JlRnJhbWUpCisgICAgRnJhbWUqIGZyYW1l ID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCk7CisgICAg aWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwotCi0gICAgY29yZUZyYW1lLT5zZWxlY3Rpb24o KS0+cmV2ZWFsU2VsZWN0aW9uKFNjcm9sbEFsaWdubWVudDo6YWxpZ25DZW50ZXJBbHdheXMpOwor ICAgIAorICAgIGZyYW1lLT5zZWxlY3Rpb24oKS0+cmV2ZWFsU2VsZWN0aW9uKFNjcm9sbEFsaWdu bWVudDo6YWxpZ25DZW50ZXJBbHdheXMpOworICAgIG1fZmluZENvbnRyb2xsZXIuc2hvd0ZpbmRJ bmRpY2F0b3JJblNlbGVjdGlvbigpOwogfQogCiB2b2lkIFdlYlBhZ2U6OnNldEFjdGl2ZShib29s IGlzQWN0aXZlKQo=