14912 2007-08-09 05:04:10 -0700 REGRESSION: text inputs are not scrolled to make inline input visible 2007-08-13 10:43:02 -0700 1 1 1 Unclassified WebKit Text 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED InRadar P1 Normal --- 1 ap darin oliver oldest_to_newest 2776 0 ap 2007-08-09 05:04:10 -0700 To reproduce, type a lot of garbage in "Summary" text of this bug using Kotoeri Hiragana. As you type, the insertion point will move outside the field. AppKit text input fields scroll to make the insertion point visible (there's a special Carbon Event parameter that an IM can pass to request some part of the text to be visible; I don't know if AppKit uses it, or just follows the insertion point). 2574 1 mrowe 2007-08-10 20:26:27 -0700 <rdar://problem/5403724> 2420 2 15947 darin 2007-08-12 19:19:21 -0700 Created attachment 15947 patch 2423 3 15947 sullivan 2007-08-12 19:46:38 -0700 Comment on attachment 15947 patch r=me 2425 4 darin 2007-08-12 20:15:18 -0700 r25027 2426 5 ap 2007-08-12 21:12:05 -0700 (In reply to comment #0) > (there's a special Carbon Event parameter that an IM can pass to request > some part of the text to be visible; I don't know if AppKit uses it, or just > follows the insertion point). For the record, the parameter is kEventParamTextInputSendPinRng, and the landed patch doesn't use it. * A TextRange record that specifies a start offset and an end * offset that should be scrolled into view if the text * specified by these offsets is not already in view. The * fHiliteStyle field of the TextRange records is ignored in * this parameter. This parameter is optional and may not be * present in all instances of this event. 2429 6 oliver 2007-08-12 21:21:34 -0700 Unfortunately we don't get raw carbon events, so there's not a whole lot we can do... 2401 7 darin 2007-08-13 10:43:02 -0700 (In reply to comment #5) > (In reply to comment #0) > > (there's a special Carbon Event parameter that an IM can pass to request > > some part of the text to be visible; I don't know if AppKit uses it, or just > > follows the insertion point). > > For the record, the parameter is kEventParamTextInputSendPinRng, and the landed > patch doesn't use it. If we find that this is passed through AppKit in some form, we could some day change our code to base the scrolling on this instead of scrolling every time. For now I think we're OK. 15947 2007-08-12 19:19:21 -0700 2007-08-12 19:46:38 -0700 patch InputMethodScrollAsYouTypePatch.txt text/plain 10116 darin SW5kZXg6IEphdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gMjUwMjQpCisrKyBKYXZhU2NyaXB0Q29yZS9K YXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBA IC0xMzY0LDcgKzEzNjQsNiBAQAogCQkwODY3RDY5MEZFODQwMjhGQzAyQUFDMDcgLyogUHJvamVj dCBvYmplY3QgKi8gPSB7CiAJCQlpc2EgPSBQQlhQcm9qZWN0OwogCQkJYnVpbGRDb25maWd1cmF0 aW9uTGlzdCA9IDE0OUMyNzcxMDg5MDJBRkUwMDhBOUVGQyAvKiBCdWlsZCBjb25maWd1cmF0aW9u IGxpc3QgZm9yIFBCWFByb2plY3QgIkphdmFTY3JpcHRDb3JlIiAqLzsKLQkJCWNvbXBhdGliaWxp dHlWZXJzaW9uID0gIlhjb2RlIDIuNCI7CiAJCQloYXNTY2FubmVkRm9yRW5jb2RpbmdzID0gMTsK IAkJCW1haW5Hcm91cCA9IDA4NjdENjkxRkU4NDAyOEZDMDJBQUMwNyAvKiBKYXZhU2NyaXB0Q29y ZSAqLzsKIAkJCXByb2R1Y3RSZWZHcm91cCA9IDAzNDc2OERGRkYzOEE1MDQxMURCOUM4QiAvKiBQ cm9kdWN0cyAqLzsKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTAyNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMDctMDgtMTIgIERhcmluIEFkbGVyICA8ZGFy aW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIC0gZml4IDxyZGFyOi8vcHJvYmxlbS81NDAzNzI0PiBSRUdSRVNTSU9OOiB0ZXh0IGlu cHV0cyBhcmUgbm90IHNjcm9sbGVkIHRvIG1ha2UgaW5saW5lIGlucHV0IHZpc2libGUgKDE0OTEy KQorCisgICAgICAgICogZWRpdGluZy9FZGl0b3IuaDogTWFkZSBzZXRJZ25vcmVNYXJrZWRUZXh0 U2VsZWN0aW9uQ2hhbmdlIG5vIGxvbmdlciBpbmxpbmUuCisgICAgICAgIEl0IG5vdyBoYXMgYSBz aWRlIGVmZmVjdCBvZiByZXZlYWxpbmcgdGhlIHNlbGVjdGlvbiB3aGVuIHlvdSBzZXQgaXQgdG8g ZmFsc2UuCisgICAgICAgIEFkZGVkIHByaXZhdGUgcmV2ZWFsU2VsZWN0aW9uQWZ0ZXJFZGl0aW5n T3BlcmF0aW9uIGhlbHBlci4KKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpFZGl0b3I6OmRlbGV0ZVJhbmdlKTogQ2FsbHMgcmV2ZWFsU2VsZWN0aW9uQWZ0 ZXJFZGl0aW5nT3BlcmF0aW9uIGluc3RlYWQKKyAgICAgICAgb2YgY2FsbGluZyBtX2ZyYW1lLT5y ZXZlYWxTZWxlY3Rpb24gZGlyZWN0bHkuCisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OnJlcGxh Y2VTZWxlY3Rpb25XaXRoRnJhZ21lbnQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkVkaXRv cjo6aW5zZXJ0T3JkZXJlZExpc3QpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6 aW5zZXJ0VW5vcmRlcmVkTGlzdCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpp bmNyZWFzZVNlbGVjdGlvbkxpc3RMZXZlbCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RWRp dG9yOjppbmNyZWFzZVNlbGVjdGlvbkxpc3RMZXZlbE9yZGVyZWQpOiBEaXR0by4KKyAgICAgICAg KFdlYkNvcmU6OkVkaXRvcjo6aW5jcmVhc2VTZWxlY3Rpb25MaXN0TGV2ZWxVbm9yZGVyZWQpOiBE aXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6ZGVjcmVhc2VTZWxlY3Rpb25MaXN0TGV2 ZWwpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6aW5zZXJ0TGluZUJyZWFrKTog RGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6Omluc2VydFBhcmFncmFwaFNlcGFyYXRv cik6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpyZXBsYWNlTWFya2VkVGV4dCk6 IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpyZXZlYWxTZWxlY3Rpb25BZnRlckVk aXRpbmdPcGVyYXRpb24pOiBBZGRlZC4gQ2FsbHMgcmV2ZWFsU2VsZWN0aW9uLAorICAgICAgICB1 bmxlc3Mgd2UgYXJlIGluIHRoZSBpZ25vcmVNYXJrZWRUZXh0U2VsZWN0aW9uQ2hhbmdlIHN0YXRl LiBJZiB3ZSBhcmUgaW4gdGhhdCBzdGF0ZSwKKyAgICAgICAgd2UncmUgaW4gdGhlIG1pZGRsZSBv ZiBhIGNvbXBvc2l0ZSBlZGl0aW5nIG9wZXJhdGlvbiBhbmQgd2Ugc2hvdWxkbid0IHRyeSB0byBz Y3JvbGwKKyAgICAgICAgdG8gcmV2ZWFsIHRoZSBzZWxlY3Rpb24gdW50aWwgdGhlIG9wZXJhdGlv biBpcyBkb25lLgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpzZXRJZ25vcmVNYXJrZWRUZXh0 U2VsZWN0aW9uQ2hhbmdlKTogTWFkZSBubyBsb25nZXIgaW5saW5lLiBJZgorICAgICAgICBjaGFu Z2luZyB0aGUgc3RhdGUgZnJvbSB0cnVlIHRvIGZhbHNlLCB0aGVuIGNhbGxzIHJldmVhbFNlbGVj dGlvbkFmdGVyRWRpdGluZ09wZXJhdGlvbi4KKworICAgICAgICAqIFdlYkNvcmUuZXhwOiBBZGQg bmV3IGVudHJ5IHBvaW50IGZvciBuby1sb25nZXItaW5saW5lIHNldHRlciBmdW5jdGlvbi4KKwog MjAwNy0wOC0xMSAgTWl0eiBQZXR0ZWwgIDxtaXR6QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGFyaW4uCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUuZXhwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvV2ViQ29yZS5leHAJKHJldmlzaW9uIDI1MDI0KQorKysgV2ViQ29yZS9XZWJDb3Jl LmV4cAkod29ya2luZyBjb3B5KQpAQCAtNDEyLDYgKzQxMiw3IEBAIF9fWk43V2ViQ29yZTZFZGl0 b3IzMGRlbGV0ZVNlbGVjdGlvbldpdGgKIF9fWk43V2ViQ29yZTZFZGl0b3IzMmd1ZXNzZXNGb3JV bmdyYW1tYXRpY2FsU2VsZWN0aW9uRXYKIF9fWk43V2ViQ29yZTZFZGl0b3IzM2luY3JlYXNlU2Vs ZWN0aW9uTGlzdExldmVsT3JkZXJlZEV2CiBfX1pON1dlYkNvcmU2RWRpdG9yMzNpbnNlcnRUZXh0 V2l0aG91dFNlbmRpbmdUZXh0RXZlbnRFUktOU182U3RyaW5nRWJQTlNfNUV2ZW50RQorX19aTjdX ZWJDb3JlNkVkaXRvcjM0c2V0SWdub3JlTWFya2VkVGV4dFNlbGVjdGlvbkNoYW5nZUViCiBfX1pO N1dlYkNvcmU2RWRpdG9yMzVpbmNyZWFzZVNlbGVjdGlvbkxpc3RMZXZlbFVub3JkZXJlZEV2CiBf X1pON1dlYkNvcmU2RWRpdG9yM2N1dEV2CiBfX1pON1dlYkNvcmU2RWRpdG9yNGNvcHlFdgpJbmRl eDogV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0 aW5nL0VkaXRvci5jcHAJKHJldmlzaW9uIDI1MDI0KQorKysgV2ViQ29yZS9lZGl0aW5nL0VkaXRv ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MSw3ICsyNTEsNyBAQCB2b2lkIEVkaXRvcjo6ZGVs ZXRlUmFuZ2UoUmFuZ2UqIHJhbmdlLCBiCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICAgICAgaWYgKG1fZnJhbWUtPmRvY3VtZW50KCkpIHsKICAgICAgICAgICAgICAgICBUeXBpbmdD b21tYW5kOjpkZWxldGVLZXlQcmVzc2VkKG1fZnJhbWUtPmRvY3VtZW50KCksIHNtYXJ0RGVsZXRl LCBncmFudWxhcml0eSk7Ci0gICAgICAgICAgICAgICAgbV9mcmFtZS0+cmV2ZWFsU2VsZWN0aW9u KFJlbmRlckxheWVyOjpnQWxpZ25Ub0VkZ2VJZk5lZWRlZCk7CisgICAgICAgICAgICAgICAgcmV2 ZWFsU2VsZWN0aW9uQWZ0ZXJFZGl0aW5nT3BlcmF0aW9uKCk7CiAgICAgICAgICAgICB9CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBmb3J3YXJkRGVsZXRlS2V5QWN0aW9uOgpAQCAt MjYwLDcgKzI2MCw3IEBAIHZvaWQgRWRpdG9yOjpkZWxldGVSYW5nZShSYW5nZSogcmFuZ2UsIGIK ICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICBpZiAobV9mcmFtZS0+ZG9jdW1l bnQoKSkgewogICAgICAgICAgICAgICAgIFR5cGluZ0NvbW1hbmQ6OmZvcndhcmREZWxldGVLZXlQ cmVzc2VkKG1fZnJhbWUtPmRvY3VtZW50KCksIHNtYXJ0RGVsZXRlLCBncmFudWxhcml0eSk7Ci0g ICAgICAgICAgICAgICAgbV9mcmFtZS0+cmV2ZWFsU2VsZWN0aW9uKFJlbmRlckxheWVyOjpnQWxp Z25Ub0VkZ2VJZk5lZWRlZCk7CisgICAgICAgICAgICAgICAgcmV2ZWFsU2VsZWN0aW9uQWZ0ZXJF ZGl0aW5nT3BlcmF0aW9uKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKICAg ICB9CkBAIC0zNjcsNyArMzY3LDcgQEAgdm9pZCBFZGl0b3I6OnJlcGxhY2VTZWxlY3Rpb25XaXRo RnJhZ21lbgogICAgICAgICByZXR1cm47CiAgICAgCiAgICAgYXBwbHlDb21tYW5kKG5ldyBSZXBs YWNlU2VsZWN0aW9uQ29tbWFuZChtX2ZyYW1lLT5kb2N1bWVudCgpLCBmcmFnbWVudCwgc2VsZWN0 UmVwbGFjZW1lbnQsIHNtYXJ0UmVwbGFjZSwgbWF0Y2hTdHlsZSkpOwotICAgIG1fZnJhbWUtPnJl dmVhbFNlbGVjdGlvbihSZW5kZXJMYXllcjo6Z0FsaWduVG9FZGdlSWZOZWVkZWQpOworICAgIHJl dmVhbFNlbGVjdGlvbkFmdGVyRWRpdGluZ09wZXJhdGlvbigpOwogfQogCiB2b2lkIEVkaXRvcjo6 cmVwbGFjZVNlbGVjdGlvbldpdGhUZXh0KGNvbnN0IFN0cmluZyYgdGV4dCwgYm9vbCBzZWxlY3RS ZXBsYWNlbWVudCwgYm9vbCBzbWFydFJlcGxhY2UpCkBAIC01NDYsNyArNTQ2LDcgQEAgUGFzc1Jl ZlB0cjxOb2RlPiBFZGl0b3I6Omluc2VydE9yZGVyZWRMaQogICAgICAgICByZXR1cm4gMDsKICAg ICAgICAgCiAgICAgUmVmUHRyPE5vZGU+IG5ld0xpc3QgPSBJbnNlcnRMaXN0Q29tbWFuZDo6aW5z ZXJ0TGlzdChtX2ZyYW1lLT5kb2N1bWVudCgpLCBJbnNlcnRMaXN0Q29tbWFuZDo6T3JkZXJlZExp c3QpOwotICAgIG1fZnJhbWUtPnJldmVhbFNlbGVjdGlvbihSZW5kZXJMYXllcjo6Z0FsaWduVG9F ZGdlSWZOZWVkZWQpOworICAgIHJldmVhbFNlbGVjdGlvbkFmdGVyRWRpdGluZ09wZXJhdGlvbigp OwogICAgIHJldHVybiBuZXdMaXN0OwogfQogCkBAIC01NTYsNyArNTU2LDcgQEAgUGFzc1JlZlB0 cjxOb2RlPiBFZGl0b3I6Omluc2VydFVub3JkZXJlZAogICAgICAgICByZXR1cm4gMDsKICAgICAg ICAgCiAgICAgUmVmUHRyPE5vZGU+IG5ld0xpc3QgPSBJbnNlcnRMaXN0Q29tbWFuZDo6aW5zZXJ0 TGlzdChtX2ZyYW1lLT5kb2N1bWVudCgpLCBJbnNlcnRMaXN0Q29tbWFuZDo6VW5vcmRlcmVkTGlz dCk7Ci0gICAgbV9mcmFtZS0+cmV2ZWFsU2VsZWN0aW9uKFJlbmRlckxheWVyOjpnQWxpZ25Ub0Vk Z2VJZk5lZWRlZCk7CisgICAgcmV2ZWFsU2VsZWN0aW9uQWZ0ZXJFZGl0aW5nT3BlcmF0aW9uKCk7 CiAgICAgcmV0dXJuIG5ld0xpc3Q7CiB9CiAKQEAgLTU3Niw3ICs1NzYsNyBAQCBQYXNzUmVmUHRy PE5vZGU+IEVkaXRvcjo6aW5jcmVhc2VTZWxlY3RpCiAgICAgICAgIHJldHVybiAwOwogICAgIAog ICAgIFJlZlB0cjxOb2RlPiBuZXdMaXN0ID0gSW5jcmVhc2VTZWxlY3Rpb25MaXN0TGV2ZWxDb21t YW5kOjppbmNyZWFzZVNlbGVjdGlvbkxpc3RMZXZlbChtX2ZyYW1lLT5kb2N1bWVudCgpKTsKLSAg ICBtX2ZyYW1lLT5yZXZlYWxTZWxlY3Rpb24oUmVuZGVyTGF5ZXI6OmdBbGlnblRvRWRnZUlmTmVl ZGVkKTsKKyAgICByZXZlYWxTZWxlY3Rpb25BZnRlckVkaXRpbmdPcGVyYXRpb24oKTsKICAgICBy ZXR1cm4gbmV3TGlzdDsKIH0KIApAQCAtNTg2LDcgKzU4Niw3IEBAIFBhc3NSZWZQdHI8Tm9kZT4g RWRpdG9yOjppbmNyZWFzZVNlbGVjdGkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgCiAgICAgUGFz c1JlZlB0cjxOb2RlPiBuZXdMaXN0ID0gSW5jcmVhc2VTZWxlY3Rpb25MaXN0TGV2ZWxDb21tYW5k OjppbmNyZWFzZVNlbGVjdGlvbkxpc3RMZXZlbE9yZGVyZWQobV9mcmFtZS0+ZG9jdW1lbnQoKSk7 Ci0gICAgbV9mcmFtZS0+cmV2ZWFsU2VsZWN0aW9uKFJlbmRlckxheWVyOjpnQWxpZ25Ub0VkZ2VJ Zk5lZWRlZCk7CisgICAgcmV2ZWFsU2VsZWN0aW9uQWZ0ZXJFZGl0aW5nT3BlcmF0aW9uKCk7CiAg ICAgcmV0dXJuIG5ld0xpc3Q7CiB9CiAKQEAgLTU5Niw3ICs1OTYsNyBAQCBQYXNzUmVmUHRyPE5v ZGU+IEVkaXRvcjo6aW5jcmVhc2VTZWxlY3RpCiAgICAgICAgIHJldHVybiAwOwogICAgIAogICAg IFBhc3NSZWZQdHI8Tm9kZT4gbmV3TGlzdCA9IEluY3JlYXNlU2VsZWN0aW9uTGlzdExldmVsQ29t bWFuZDo6aW5jcmVhc2VTZWxlY3Rpb25MaXN0TGV2ZWxVbm9yZGVyZWQobV9mcmFtZS0+ZG9jdW1l bnQoKSk7Ci0gICAgbV9mcmFtZS0+cmV2ZWFsU2VsZWN0aW9uKFJlbmRlckxheWVyOjpnQWxpZ25U b0VkZ2VJZk5lZWRlZCk7CisgICAgcmV2ZWFsU2VsZWN0aW9uQWZ0ZXJFZGl0aW5nT3BlcmF0aW9u KCk7CiAgICAgcmV0dXJuIG5ld0xpc3Q7CiB9CiAKQEAgLTYwNiw3ICs2MDYsNyBAQCB2b2lkIEVk aXRvcjo6ZGVjcmVhc2VTZWxlY3Rpb25MaXN0TGV2ZWwoCiAgICAgICAgIHJldHVybjsKICAgICAK ICAgICBEZWNyZWFzZVNlbGVjdGlvbkxpc3RMZXZlbENvbW1hbmQ6OmRlY3JlYXNlU2VsZWN0aW9u TGlzdExldmVsKG1fZnJhbWUtPmRvY3VtZW50KCkpOwotICAgIG1fZnJhbWUtPnJldmVhbFNlbGVj dGlvbihSZW5kZXJMYXllcjo6Z0FsaWduVG9FZGdlSWZOZWVkZWQpOworICAgIHJldmVhbFNlbGVj dGlvbkFmdGVyRWRpdGluZ09wZXJhdGlvbigpOwogfQogCiB2b2lkIEVkaXRvcjo6cmVtb3ZlRm9y bWF0dGluZ0FuZFN0eWxlKCkKQEAgLTE0NDgsNyArMTQ0OCw3IEBAIGJvb2wgRWRpdG9yOjppbnNl cnRMaW5lQnJlYWsoKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIFR5cGluZ0NvbW1hbmQ6 Omluc2VydExpbmVCcmVhayhtX2ZyYW1lLT5kb2N1bWVudCgpKTsKLSAgICBtX2ZyYW1lLT5yZXZl YWxTZWxlY3Rpb24oUmVuZGVyTGF5ZXI6OmdBbGlnblRvRWRnZUlmTmVlZGVkKTsKKyAgICByZXZl YWxTZWxlY3Rpb25BZnRlckVkaXRpbmdPcGVyYXRpb24oKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0K IApAQCAtMTQ2NCw3ICsxNDY0LDcgQEAgYm9vbCBFZGl0b3I6Omluc2VydFBhcmFncmFwaFNlcGFy YXRvcigpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgVHlwaW5nQ29tbWFuZDo6aW5zZXJ0 UGFyYWdyYXBoU2VwYXJhdG9yKG1fZnJhbWUtPmRvY3VtZW50KCkpOwotICAgIG1fZnJhbWUtPnJl dmVhbFNlbGVjdGlvbihSZW5kZXJMYXllcjo6Z0FsaWduVG9FZGdlSWZOZWVkZWQpOworICAgIHJl dmVhbFNlbGVjdGlvbkFmdGVyRWRpdGluZ09wZXJhdGlvbigpOwogICAgIHJldHVybiB0cnVlOwog fQogCkBAIC0xNzExLDcgKzE3MTEsNyBAQCB2b2lkIEVkaXRvcjo6cmVwbGFjZU1hcmtlZFRleHQo Y29uc3QgU3RyCiAgICAgaWYgKCF0ZXh0LmlzRW1wdHkoKSkKICAgICAgICAgVHlwaW5nQ29tbWFu ZDo6aW5zZXJ0VGV4dChtX2ZyYW1lLT5kb2N1bWVudCgpLCB0ZXh0LCB0cnVlKTsKICAgICAKLSAg ICBtX2ZyYW1lLT5yZXZlYWxTZWxlY3Rpb24oUmVuZGVyTGF5ZXI6OmdBbGlnblRvRWRnZUlmTmVl ZGVkKTsKKyAgICByZXZlYWxTZWxlY3Rpb25BZnRlckVkaXRpbmdPcGVyYXRpb24oKTsKIH0KIAog dm9pZCBFZGl0b3I6Omlnbm9yZVNwZWxsaW5nKCkKQEAgLTIyODcsNCArMjI4NywyMiBAQCBQYXNz UmVmUHRyPFJhbmdlPiBFZGl0b3I6OnJhbmdlRm9yUG9pbnQoCiAgICAgcmV0dXJuIHNlbGVjdGlv bi50b1JhbmdlKCk7CiB9CiAKK3ZvaWQgRWRpdG9yOjpyZXZlYWxTZWxlY3Rpb25BZnRlckVkaXRp bmdPcGVyYXRpb24oKQoreworICAgIGlmIChtX2lnbm9yZU1hcmtlZFRleHRTZWxlY3Rpb25DaGFu Z2UpCisgICAgICAgIHJldHVybjsKKworICAgIG1fZnJhbWUtPnJldmVhbFNlbGVjdGlvbihSZW5k ZXJMYXllcjo6Z0FsaWduVG9FZGdlSWZOZWVkZWQpOworfQorCit2b2lkIEVkaXRvcjo6c2V0SWdu b3JlTWFya2VkVGV4dFNlbGVjdGlvbkNoYW5nZShib29sIGlnbm9yZSkKK3sKKyAgICBpZiAobV9p Z25vcmVNYXJrZWRUZXh0U2VsZWN0aW9uQ2hhbmdlID09IGlnbm9yZSkKKyAgICAgICAgcmV0dXJu OworCisgICAgbV9pZ25vcmVNYXJrZWRUZXh0U2VsZWN0aW9uQ2hhbmdlID0gaWdub3JlOworICAg IGlmICghaWdub3JlKQorICAgICAgICByZXZlYWxTZWxlY3Rpb25BZnRlckVkaXRpbmdPcGVyYXRp b24oKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9lZGl0aW5n L0VkaXRvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9FZGl0b3IuaAkocmV2aXNp b24gMjUwMjQpCisrKyBXZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgJKHdvcmtpbmcgY29weSkKQEAg LTE5OSw3ICsxOTksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXBsYWNlTWFya2VkVGV4dChjb25z dCBTdHJpbmcmKTsKIAogICAgIGJvb2wgaWdub3JlTWFya2VkVGV4dFNlbGVjdGlvbkNoYW5nZSgp IGNvbnN0IHsgcmV0dXJuIG1faWdub3JlTWFya2VkVGV4dFNlbGVjdGlvbkNoYW5nZTsgfQotICAg IHZvaWQgc2V0SWdub3JlTWFya2VkVGV4dFNlbGVjdGlvbkNoYW5nZShib29sIGlnbm9yZSkgeyBt X2lnbm9yZU1hcmtlZFRleHRTZWxlY3Rpb25DaGFuZ2UgPSBpZ25vcmU7IH0KKyAgICB2b2lkIHNl dElnbm9yZU1hcmtlZFRleHRTZWxlY3Rpb25DaGFuZ2UoYm9vbCBpZ25vcmUpOwogCiAjaWYgUExB VEZPUk0oTUFDKQogICAgIE5TU3RyaW5nKiB1c2VyVmlzaWJsZVN0cmluZyhOU1VSTCopOwpAQCAt MjA5LDYgKzIwOSw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiAgICAgUGFzc1JlZlB0cjxSYW5nZT4g cmFuZ2VGb3JQb2ludChjb25zdCBJbnRQb2ludCYgd2luZG93UG9pbnQpOworCiBwcml2YXRlOgog ICAgIEZyYW1lKiBtX2ZyYW1lOwogICAgIE93blB0cjxEZWxldGVCdXR0b25Db250cm9sbGVyPiBt X2RlbGV0ZUJ1dHRvbkNvbnRyb2xsZXI7CkBAIC0yMjYsNiArMjI3LDcgQEAgcHJpdmF0ZToKICAg ICB2b2lkIHJlcGxhY2VTZWxlY3Rpb25XaXRoRnJhZ21lbnQoUGFzc1JlZlB0cjxEb2N1bWVudEZy YWdtZW50PiwgYm9vbCBzZWxlY3RSZXBsYWNlbWVudCwgYm9vbCBzbWFydFJlcGxhY2UsIGJvb2wg bWF0Y2hTdHlsZSk7CiAgICAgdm9pZCByZXBsYWNlU2VsZWN0aW9uV2l0aFRleHQoY29uc3QgU3Ry aW5nJiwgYm9vbCBzZWxlY3RSZXBsYWNlbWVudCwgYm9vbCBzbWFydFJlcGxhY2UpOwogICAgIHZv aWQgd3JpdGVTZWxlY3Rpb25Ub1Bhc3RlYm9hcmQoUGFzdGVib2FyZCopOworICAgIHZvaWQgcmV2 ZWFsU2VsZWN0aW9uQWZ0ZXJFZGl0aW5nT3BlcmF0aW9uKCk7CiAKICNpZiBQTEFURk9STShNQUMp CiAgICAgdm9pZCBhZGRUb0tpbGxSaW5nKFJhbmdlKiwgYm9vbCBwcmVwZW5kKTsKSW5kZXg6IFdl YktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDI1MDI0KQorKysg V2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBA IC0xMzE5LDcgKzEzMTksNiBAQAogCQkwODY3RDY5MEZFODQwMjhGQzAyQUFDMDcgLyogUHJvamVj dCBvYmplY3QgKi8gPSB7CiAJCQlpc2EgPSBQQlhQcm9qZWN0OwogCQkJYnVpbGRDb25maWd1cmF0 aW9uTGlzdCA9IDE0OUMyODMyMDg5MDJCMEYwMDhBOUVGQyAvKiBCdWlsZCBjb25maWd1cmF0aW9u IGxpc3QgZm9yIFBCWFByb2plY3QgIldlYktpdCIgKi87Ci0JCQljb21wYXRpYmlsaXR5VmVyc2lv biA9ICJYY29kZSAyLjQiOwogCQkJaGFzU2Nhbm5lZEZvckVuY29kaW5ncyA9IDE7CiAJCQlrbm93 blJlZ2lvbnMgPSAoCiAJCQkJRW5nbGlzaCwK