41942 2010-07-09 01:53:06 -0700 Add setInsertionMode setter in preparation for "in foreign content" mode 2010-07-09 02:01:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 eric eric abarth oldest_to_newest 248837 0 eric 2010-07-09 01:53:06 -0700 Add setInsertionMode setter in preparation for "in foreign content" mode 248838 1 61016 eric 2010-07-09 01:55:54 -0700 Created attachment 61016 Patch 248839 2 61016 abarth 2010-07-09 01:57:50 -0700 Comment on attachment 61016 Patch Please add a comment about not assigning to m_insertionMode directory. We should move the insertion mode constellation of state into its own object. 248843 3 eric 2010-07-09 02:01:27 -0700 Committed r62919: <http://trac.webkit.org/changeset/62919> 61016 2010-07-09 01:55:54 -0700 2010-07-09 01:57:50 -0700 Patch bug-41942-20100709015553.patch text/plain 13318 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWUzNzMzZjI3OTJjMmU1MzdhZjU4MmQwMGZlNjllOWMwMDhhNTAxNS4uNzQ0YzhhNGRhZTg3Yjk2 ZGI2MmNkOTU5ZjZkOGI5NjBkYWQ0MTM5ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNiBAQAorIDIwMTAtMDctMDkgIEVy aWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzZXRJbnNlcnRpb25Nb2RlIHNldHRlciBpbiBwcmVw YXJhdGlvbiBmb3IgImluIGZvcmVpZ24gY29udGVudCIgbW9kZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE5NDIKKworICAgICAgICAiaW4gZm9yZWln biBjb250ZW50IiBtb2RlIG5lZWRzIHRvIGJlIGFibGUgdG8gdXNlIGEgZmFrZQorICAgICAgICBp bnNlcnRpb24gbW9kZSBmb3IgcHJvY2Vzc2luZy4gIFdlIG5lZWQgdG8gYmUgYWJsZSB0byBzYXZl IHRoZQorICAgICAgICBvcmlnaW5hbCBpbnNlcnRpb24gbW9kZSwgc2V0IGEgZmFrZSBvbmUsIGFu ZCB0aGVuIHJlc3RvcmUgdGhlIG9yaWdpbmFsCisgICAgICAgIGlmIGl0IHdhc24ndCBjaGFuZ2Vk LiAgVG8gZGV0ZWN0IGNoYW5nZXMsIHdlIG5lZWQgYWxsIGNhbGxzaXRlcyB0bworICAgICAgICB1 c2UgYSBzZXRJbnNlcnRpb25Nb2RlIGFjY2Vzc29yIGluc3RlYWQgb2YgbV9pbnNlcnRpb25Nb2Rl ID0KKworICAgICAgICBObyBmdW5jdGlvbmFsIGNoYW5nZXMsIHRodXMgbm8gdGVzdHMuCisKKyAg ICAgICAgKiBodG1sL0hUTUxUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M VHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZ0ZvckluQm9keSk6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NDb2xncm91cEVuZFRhZ0ZvckluQ29sdW1uR3JvdXAp OgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWdGb3JJ blRhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0 VGFnKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0JvZHlFbmRU YWdGb3JJbkJvZHkpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpzZXRJbnNl cnRpb25Nb2RlQW5kRW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJv Y2Vzc0VuZFRhZ0ZvckluVGFibGVCb2R5KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVp bGRlcjo6cHJvY2Vzc0VuZFRhZ0ZvckluQ2VsbCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJl ZUJ1aWxkZXI6OnByb2Nlc3NDYXB0aW9uRW5kVGFnRm9ySW5DYXB0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1RyRW5kVGFnRm9ySW5Sb3cpOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kVGFnKToKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0NoYXJhY3Rlcik6CisgICAgICAgIChXZWJD b3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NEZWZhdWx0Rm9ySW5UYWJsZVRleHRNb2RlKToK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0dlbmVyaWNSQ0RBVEFT dGFydFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NHZW5l cmljUmF3VGV4dFN0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6 cHJvY2Vzc1NjcmlwdFN0YXJ0VGFnKToKKwogMjAxMC0wNy0wOSAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxU cmVlQnVpbGRlci5jcHAKaW5kZXggZDhkMjAyNDQzZWI2Mzc0ZmI5MTUwOWUxOTkwZDg2MzY4MDMw YTIwZi4uZmViMmI1YjAxMTBjYWM5MjkwYjBjMDdiYTVlMzY5ZDhmZmJjZTlkOSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKKysrIGIvV2ViQ29yZS9odG1sL0hU TUxUcmVlQnVpbGRlci5jcHAKQEAgLTY5MCw3ICs2OTAsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRl cjo6cHJvY2Vzc1N0YXJ0VGFnRm9ySW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAg ICAgIG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wSFRNTEJvZHlFbGVtZW50KCk7CiAgICAgICAg IEFTU0VSVChtX3RyZWUub3BlbkVsZW1lbnRzKCktPnRvcCgpID09IG1fdHJlZS5vcGVuRWxlbWVu dHMoKS0+aHRtbEVsZW1lbnQoKSk7CiAgICAgICAgIG1fdHJlZS5pbnNlcnRIVE1MRWxlbWVudCh0 b2tlbik7Ci0gICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9IEluRnJhbWVzZXRNb2RlOworICAgICAg ICBzZXRJbnNlcnRpb25Nb2RlKEluRnJhbWVzZXRNb2RlKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KICAgICBpZiAodG9rZW4ubmFtZSgpID09IGFkZHJlc3NUYWcKQEAgLTgxMSw3ICs4MTEsNyBA QCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnRm9ySW5Cb2R5KEF0b21pY0hU TUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBwcm9jZXNzRmFrZUVuZFRhZyhwVGFnKTsKICAg ICAgICAgbV90cmVlLmluc2VydEhUTUxFbGVtZW50KHRva2VuKTsKICAgICAgICAgbV9mcmFtZXNl dE9rID0gZmFsc2U7Ci0gICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9IEluVGFibGVNb2RlOworICAg ICAgICBzZXRJbnNlcnRpb25Nb2RlKEluVGFibGVNb2RlKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KICAgICBpZiAodG9rZW4ubmFtZSgpID09IGltYWdlVGFnKSB7CkBAIC04NTYsNyArODU2LDcg QEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZ0ZvckluQm9keShBdG9taWNI VE1MVG9rZW4mIHRva2VuKQogICAgICAgICBtX3Rva2VuaXplci0+c2V0U3RhdGUoSFRNTFRva2Vu aXplcjo6UkNEQVRBU3RhdGUpOwogICAgICAgICBtX29yaWdpbmFsSW5zZXJ0aW9uTW9kZSA9IG1f aW5zZXJ0aW9uTW9kZTsKICAgICAgICAgbV9mcmFtZXNldE9rID0gZmFsc2U7Ci0gICAgICAgIG1f aW5zZXJ0aW9uTW9kZSA9IFRleHRNb2RlOworICAgICAgICBzZXRJbnNlcnRpb25Nb2RlKFRleHRN b2RlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAodG9rZW4ubmFtZSgpID09IHht cFRhZykgewpAQCAtODg5LDkgKzg4OSw5IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNz U3RhcnRUYWdGb3JJbkJvZHkoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgICAgICB8 fCBtX2luc2VydGlvbk1vZGUgPT0gSW5UYWJsZUJvZHlNb2RlCiAgICAgICAgICAgICAgfHwgbV9p bnNlcnRpb25Nb2RlID09IEluUm93TW9kZQogICAgICAgICAgICAgIHx8IG1faW5zZXJ0aW9uTW9k ZSA9PSBJbkNlbGxNb2RlKQotICAgICAgICAgICAgbV9pbnNlcnRpb25Nb2RlID0gSW5TZWxlY3RJ blRhYmxlTW9kZTsKKyAgICAgICAgICAgIHNldEluc2VydGlvbk1vZGUoSW5TZWxlY3RJblRhYmxl TW9kZSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9IEluU2Vs ZWN0TW9kZTsKKyAgICAgICAgICAgIHNldEluc2VydGlvbk1vZGUoSW5TZWxlY3RNb2RlKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAodG9rZW4ubmFtZSgpID09IG9wdGdyb3VwVGFn IHx8IHRva2VuLm5hbWUoKSA9PSBvcHRpb25UYWcpIHsKQEAgLTk0Myw3ICs5NDMsNyBAQCBib29s IEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0NvbGdyb3VwRW5kVGFnRm9ySW5Db2x1bW5Hcm91cCgp CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAgICAgbV90cmVlLm9wZW5FbGVtZW50cygp LT5wb3AoKTsKLSAgICBtX2luc2VydGlvbk1vZGUgPSBJblRhYmxlTW9kZTsKKyAgICBzZXRJbnNl cnRpb25Nb2RlKEluVGFibGVNb2RlKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtOTY4LDEz ICs5NjgsMTMgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZ0ZvckluVGFi bGUoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygp LT5wb3BVbnRpbFRhYmxlU2NvcGVNYXJrZXIoKTsKICAgICAgICAgbV90cmVlLmFjdGl2ZUZvcm1h dHRpbmdFbGVtZW50cygpLT5hcHBlbmRNYXJrZXIoKTsKICAgICAgICAgbV90cmVlLmluc2VydEhU TUxFbGVtZW50KHRva2VuKTsKLSAgICAgICAgbV9pbnNlcnRpb25Nb2RlID0gSW5DYXB0aW9uTW9k ZTsKKyAgICAgICAgc2V0SW5zZXJ0aW9uTW9kZShJbkNhcHRpb25Nb2RlKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KICAgICBpZiAodG9rZW4ubmFtZSgpID09IGNvbGdyb3VwVGFnKSB7CiAgICAg ICAgIG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wVW50aWxUYWJsZVNjb3BlTWFya2VyKCk7CiAg ICAgICAgIG1fdHJlZS5pbnNlcnRIVE1MRWxlbWVudCh0b2tlbik7Ci0gICAgICAgIG1faW5zZXJ0 aW9uTW9kZSA9IEluQ29sdW1uR3JvdXBNb2RlOworICAgICAgICBzZXRJbnNlcnRpb25Nb2RlKElu Q29sdW1uR3JvdXBNb2RlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAodG9rZW4u bmFtZSgpID09IGNvbFRhZykgewpAQCAtOTg2LDcgKzk4Niw3IEBAIHZvaWQgSFRNTFRyZWVCdWls ZGVyOjpwcm9jZXNzU3RhcnRUYWdGb3JJblRhYmxlKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAg ICAgaWYgKGlzVGFibGVCb2R5Q29udGV4dFRhZyh0b2tlbi5uYW1lKCkpKSB7CiAgICAgICAgIG1f dHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wVW50aWxUYWJsZVNjb3BlTWFya2VyKCk7CiAgICAgICAg IG1fdHJlZS5pbnNlcnRIVE1MRWxlbWVudCh0b2tlbik7Ci0gICAgICAgIG1faW5zZXJ0aW9uTW9k ZSA9IEluVGFibGVCb2R5TW9kZTsKKyAgICAgICAgc2V0SW5zZXJ0aW9uTW9kZShJblRhYmxlQm9k eU1vZGUpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmIChpc1RhYmxlQ2VsbENvbnRl eHRUYWcodG9rZW4ubmFtZSgpKQpAQCAtMTA3NSw3ICsxMDc1LDcgQEAgdm9pZCBIVE1MVHJlZUJ1 aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICBp ZiAodG9rZW4ubmFtZSgpID09IGJvZHlUYWcpIHsKICAgICAgICAgICAgIG1fZnJhbWVzZXRPayA9 IGZhbHNlOwogICAgICAgICAgICAgbV90cmVlLmluc2VydEhUTUxCb2R5RWxlbWVudCh0b2tlbik7 Ci0gICAgICAgICAgICBtX2luc2VydGlvbk1vZGUgPSBJbkJvZHlNb2RlOworICAgICAgICAgICAg c2V0SW5zZXJ0aW9uTW9kZShJbkJvZHlNb2RlKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQogICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGZyYW1lc2V0VGFnKSB7CkBAIC0xMTQ4 LDcgKzExNDgsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnKEF0b21p Y0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gdHJUYWcpIHsK ICAgICAgICAgICAgIG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wVW50aWxUYWJsZUJvZHlTY29w ZU1hcmtlcigpOyAvLyBIb3cgaXMgdGhlcmUgZXZlciBhbnl0aGluZyB0byBwb3A/CiAgICAgICAg ICAgICBtX3RyZWUuaW5zZXJ0SFRNTEVsZW1lbnQodG9rZW4pOwotICAgICAgICAgICAgbV9pbnNl cnRpb25Nb2RlID0gSW5Sb3dNb2RlOworICAgICAgICAgICAgc2V0SW5zZXJ0aW9uTW9kZShJblJv d01vZGUpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmIChpc1Rh YmxlQ2VsbENvbnRleHRUYWcodG9rZW4ubmFtZSgpKSkgewpAQCAtMTE3OCw3ICsxMTc4LDcgQEAg dm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdG9taWNIVE1MVG9rZW4mIHRv a2VuKQogICAgICAgICBpZiAoaXNUYWJsZUNlbGxDb250ZXh0VGFnKHRva2VuLm5hbWUoKSkpIHsK ICAgICAgICAgICAgIG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wVW50aWxUYWJsZVJvd1Njb3Bl TWFya2VyKCk7CiAgICAgICAgICAgICBtX3RyZWUuaW5zZXJ0SFRNTEVsZW1lbnQodG9rZW4pOwot ICAgICAgICAgICAgbV9pbnNlcnRpb25Nb2RlID0gSW5DZWxsTW9kZTsKKyAgICAgICAgICAgIHNl dEluc2VydGlvbk1vZGUoSW5DZWxsTW9kZSk7CiAgICAgICAgICAgICBtX3RyZWUuYWN0aXZlRm9y bWF0dGluZ0VsZW1lbnRzKCktPmFwcGVuZE1hcmtlcigpOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CkBAIC0xMjIwLDcgKzEyMjAsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJv Y2Vzc1N0YXJ0VGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBtX3RyZWUu aW5zZXJ0SFRNTEh0bWxTdGFydFRhZ0luQm9keSh0b2tlbik7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KLSAgICAgICAgbV9pbnNlcnRpb25Nb2RlID0gSW5Cb2R5TW9kZTsKKyAgICAg ICAgc2V0SW5zZXJ0aW9uTW9kZShJbkJvZHlNb2RlKTsKICAgICAgICAgcHJvY2Vzc1N0YXJ0VGFn KHRva2VuKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBJbkhlYWROb3NjcmlwdE1vZGU6CkBA IC0xMzU5LDcgKzEzNTksNyBAQCBib29sIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0JvZHlFbmRU YWdGb3JJbkJvZHkoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIH0KICAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIG1faW5zZXJ0aW9uTW9kZSA9IEFm dGVyQm9keU1vZGU7CisgICAgc2V0SW5zZXJ0aW9uTW9kZShBZnRlckJvZHlNb2RlKTsKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMTUyMywxMCArMTUyMywxMCBAQCB2b2lkIEhUTUxUcmVlQnVp bGRlcjo6Y2FsbFRoZUFkb3B0aW9uQWdlbmN5KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAKIHZv aWQgSFRNTFRyZWVCdWlsZGVyOjpzZXRJbnNlcnRpb25Nb2RlQW5kRW5kKEluc2VydGlvbk1vZGUg bmV3SW5zZXJ0aW9uTW9kZSwgYm9vbCBmb3JlaWduKQogewotICAgIG1faW5zZXJ0aW9uTW9kZSA9 IG5ld0luc2VydGlvbk1vZGU7CisgICAgc2V0SW5zZXJ0aW9uTW9kZShuZXdJbnNlcnRpb25Nb2Rl KTsKICAgICBpZiAoZm9yZWlnbikgewogICAgICAgICBtX3NlY29uZGFyeUluc2VydGlvbk1vZGUg PSBtX2luc2VydGlvbk1vZGU7Ci0gICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9IEluRm9yZWlnbkNv bnRlbnRNb2RlOworICAgICAgICBzZXRJbnNlcnRpb25Nb2RlKEluRm9yZWlnbkNvbnRlbnRNb2Rl KTsKICAgICB9CiB9CiAKQEAgLTE2MDIsNyArMTYwMiw3IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVy Ojpwcm9jZXNzRW5kVGFnRm9ySW5UYWJsZUJvZHkoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAg ICAgICAgfQogICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPnBvcFVudGlsVGFibGVCb2R5 U2NvcGVNYXJrZXIoKTsKICAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3AoKTsKLSAg ICAgICAgbV9pbnNlcnRpb25Nb2RlID0gSW5UYWJsZU1vZGU7CisgICAgICAgIHNldEluc2VydGlv bk1vZGUoSW5UYWJsZU1vZGUpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmICh0b2tl bi5uYW1lKCkgPT0gdGFibGVUYWcpIHsKQEAgLTE2NzgsNyArMTY3OCw3IEBAIHZvaWQgSFRNTFRy ZWVCdWlsZGVyOjpwcm9jZXNzRW5kVGFnRm9ySW5DZWxsKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4p CiAgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKICAgICAgICAgbV90cmVlLm9wZW5FbGVt ZW50cygpLT5wb3BVbnRpbFBvcHBlZCh0b2tlbi5uYW1lKCkpOwogICAgICAgICBtX3RyZWUuYWN0 aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCktPmNsZWFyVG9MYXN0TWFya2VyKCk7Ci0gICAgICAgIG1f aW5zZXJ0aW9uTW9kZSA9IEluUm93TW9kZTsKKyAgICAgICAgc2V0SW5zZXJ0aW9uTW9kZShJblJv d01vZGUpOwogICAgICAgICBBU1NFUlQobV90cmVlLmN1cnJlbnRFbGVtZW50KCktPmhhc1RhZ05h bWUodHJUYWcpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTE4NTAsNyArMTg1MCw3IEBA IGJvb2wgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzQ2FwdGlvbkVuZFRhZ0ZvckluQ2FwdGlvbigp CiAgICAgLy8gRklYTUU6IHBhcnNlIGVycm9yIGlmICghbV90cmVlLmN1cnJlbnRFbGVtZW50KCkt Pmhhc1RhZ05hbWUoY2FwdGlvblRhZykpCiAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3BV bnRpbFBvcHBlZChjYXB0aW9uVGFnLmxvY2FsTmFtZSgpKTsKICAgICBtX3RyZWUuYWN0aXZlRm9y bWF0dGluZ0VsZW1lbnRzKCktPmNsZWFyVG9MYXN0TWFya2VyKCk7Ci0gICAgbV9pbnNlcnRpb25N b2RlID0gSW5UYWJsZU1vZGU7CisgICAgc2V0SW5zZXJ0aW9uTW9kZShJblRhYmxlTW9kZSk7CiAg ICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTE4NjQsNyArMTg2NCw3IEBAIGJvb2wgSFRNTFRyZWVC dWlsZGVyOjpwcm9jZXNzVHJFbmRUYWdGb3JJblJvdygpCiAgICAgbV90cmVlLm9wZW5FbGVtZW50 cygpLT5wb3BVbnRpbFRhYmxlUm93U2NvcGVNYXJrZXIoKTsKICAgICBBU1NFUlQobV90cmVlLmN1 cnJlbnRFbGVtZW50KCktPmhhc1RhZ05hbWUodHJUYWcpKTsKICAgICBtX3RyZWUub3BlbkVsZW1l bnRzKCktPnBvcCgpOwotICAgIG1faW5zZXJ0aW9uTW9kZSA9IEluVGFibGVCb2R5TW9kZTsKKyAg ICBzZXRJbnNlcnRpb25Nb2RlKEluVGFibGVCb2R5TW9kZSk7CiAgICAgcmV0dXJuIHRydWU7CiB9 CiAKQEAgLTIwMTYsMTQgKzIwMTYsMTQgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NF bmRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgICAgICAgICBwYXJzZUVycm9y KHRva2VuKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICBtX2luc2VydGlvbk1vZGUgPSBBZnRlckFmdGVyQm9keU1vZGU7CisgICAgICAgICAgICBz ZXRJbnNlcnRpb25Nb2RlKEFmdGVyQWZ0ZXJCb2R5TW9kZSk7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KICAgICAgICAgLy8gRmFsbCB0aHJvdWdoLgogICAgIGNhc2UgQWZ0ZXJBZnRl ckJvZHlNb2RlOgogICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEFmdGVyQm9keU1v ZGUgfHwgaW5zZXJ0aW9uTW9kZSgpID09IEFmdGVyQWZ0ZXJCb2R5TW9kZSk7CiAgICAgICAgIHBh cnNlRXJyb3IodG9rZW4pOwotICAgICAgICBtX2luc2VydGlvbk1vZGUgPSBJbkJvZHlNb2RlOwor ICAgICAgICBzZXRJbnNlcnRpb25Nb2RlKEluQm9keU1vZGUpOwogICAgICAgICBwcm9jZXNzRW5k VGFnKHRva2VuKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBJbkhlYWROb3NjcmlwdE1vZGU6 CkBAIC0yMDQ5LDExICsyMDQ5LDExIEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5k VGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBBU1NFUlQobV90cmVlLmN1 cnJlbnRFbGVtZW50KCktPmhhc1RhZ05hbWUoc2NyaXB0VGFnKSk7CiAgICAgICAgICAgICBtX3Nj cmlwdFRvUHJvY2VzcyA9IG1fdHJlZS5jdXJyZW50RWxlbWVudCgpOwogICAgICAgICAgICAgbV90 cmVlLm9wZW5FbGVtZW50cygpLT5wb3AoKTsKLSAgICAgICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9 IG1fb3JpZ2luYWxJbnNlcnRpb25Nb2RlOworICAgICAgICAgICAgc2V0SW5zZXJ0aW9uTW9kZSht X29yaWdpbmFsSW5zZXJ0aW9uTW9kZSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0K ICAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3AoKTsKLSAgICAgICAgbV9pbnNlcnRp b25Nb2RlID0gbV9vcmlnaW5hbEluc2VydGlvbk1vZGU7CisgICAgICAgIHNldEluc2VydGlvbk1v ZGUobV9vcmlnaW5hbEluc2VydGlvbk1vZGUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIElu RnJhbWVzZXRNb2RlOgogICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEluRnJhbWVz ZXRNb2RlKTsKQEAgLTIwNjQsMTQgKzIwNjQsMTQgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnBy b2Nlc3NFbmRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wKCk7CiAgICAgICAgICAgICBpZiAoIW1f aXNQYXJzaW5nRnJhZ21lbnQgJiYgIW1fdHJlZS5jdXJyZW50RWxlbWVudCgpLT5oYXNUYWdOYW1l KGZyYW1lc2V0VGFnKSkKLSAgICAgICAgICAgICAgICBtX2luc2VydGlvbk1vZGUgPSBBZnRlckZy YW1lc2V0TW9kZTsKKyAgICAgICAgICAgICAgICBzZXRJbnNlcnRpb25Nb2RlKEFmdGVyRnJhbWVz ZXRNb2RlKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBicmVhazsK ICAgICBjYXNlIEFmdGVyRnJhbWVzZXRNb2RlOgogICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9k ZSgpID09IEFmdGVyRnJhbWVzZXRNb2RlKTsKICAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBo dG1sVGFnKSB7Ci0gICAgICAgICAgICBtX2luc2VydGlvbk1vZGUgPSBBZnRlckFmdGVyRnJhbWVz ZXRNb2RlOworICAgICAgICAgICAgc2V0SW5zZXJ0aW9uTW9kZShBZnRlckFmdGVyRnJhbWVzZXRN b2RlKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICAvLyBGYWxsIHRo cm91Z2guCkBAIC0yMjI3LDcgKzIyMjcsNyBAQCBSZXByb2Nlc3NCdWZmZXI6CiAgICAgICAgIEFT U0VSVChpbnNlcnRpb25Nb2RlKCkgPT0gSW5UYWJsZU1vZGUgfHwgaW5zZXJ0aW9uTW9kZSgpID09 IEluVGFibGVCb2R5TW9kZSB8fCBpbnNlcnRpb25Nb2RlKCkgPT0gSW5Sb3dNb2RlKTsKICAgICAg ICAgQVNTRVJUKG1fcGVuZGluZ1RhYmxlQ2hhcmFjdGVycy5pc0VtcHR5KCkpOwogICAgICAgICBt X29yaWdpbmFsSW5zZXJ0aW9uTW9kZSA9IG1faW5zZXJ0aW9uTW9kZTsKLSAgICAgICAgbV9pbnNl cnRpb25Nb2RlID0gSW5UYWJsZVRleHRNb2RlOworICAgICAgICBzZXRJbnNlcnRpb25Nb2RlKElu VGFibGVUZXh0TW9kZSk7CiAgICAgICAgIC8vIEZhbGwgdGhyb3VnaC4KICAgICB9CiAgICAgY2Fz ZSBJblRhYmxlVGV4dE1vZGU6IHsKQEAgLTIyNTEsNyArMjI1MSw3IEBAIFJlcHJvY2Vzc0J1ZmZl cjoKICAgICBjYXNlIEFmdGVyQWZ0ZXJCb2R5TW9kZTogewogICAgICAgICBBU1NFUlQoaW5zZXJ0 aW9uTW9kZSgpID09IEFmdGVyQm9keU1vZGUgfHwgaW5zZXJ0aW9uTW9kZSgpID09IEFmdGVyQWZ0 ZXJCb2R5TW9kZSk7CiAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwotICAgICAgICBtX2luc2Vy dGlvbk1vZGUgPSBJbkJvZHlNb2RlOworICAgICAgICBzZXRJbnNlcnRpb25Nb2RlKEluQm9keU1v ZGUpOwogICAgICAgICBnb3RvIFJlcHJvY2Vzc0J1ZmZlcjsKICAgICAgICAgYnJlYWs7CiAgICAg fQpAQCAtMjQyOCwxMSArMjQyOCwxMSBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0Rl ZmF1bHRGb3JJblRhYmxlVGV4dE1vZGUoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAg bV90cmVlLnJlY29uc3RydWN0VGhlQWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCk7CiAgICAgICAg IG1fdHJlZS5pbnNlcnRUZXh0Tm9kZShjaGFyYWN0ZXJzKTsKICAgICAgICAgbV9mcmFtZXNldE9r ID0gZmFsc2U7Ci0gICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9IG1fb3JpZ2luYWxJbnNlcnRpb25N b2RlOworICAgICAgICBzZXRJbnNlcnRpb25Nb2RlKG1fb3JpZ2luYWxJbnNlcnRpb25Nb2RlKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBtX3RyZWUuaW5zZXJ0VGV4dE5vZGUoY2hhcmFj dGVycyk7Ci0gICAgbV9pbnNlcnRpb25Nb2RlID0gbV9vcmlnaW5hbEluc2VydGlvbk1vZGU7Cisg ICAgc2V0SW5zZXJ0aW9uTW9kZShtX29yaWdpbmFsSW5zZXJ0aW9uTW9kZSk7CiB9CiAKIGJvb2wg SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWdGb3JJbkhlYWQoQXRvbWljSFRNTFRva2Vu JiB0b2tlbikKQEAgLTI0ODUsNyArMjQ4NSw3IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9j ZXNzR2VuZXJpY1JDREFUQVN0YXJ0VGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgbV90 cmVlLmluc2VydEhUTUxFbGVtZW50KHRva2VuKTsKICAgICBtX3Rva2VuaXplci0+c2V0U3RhdGUo SFRNTFRva2VuaXplcjo6UkNEQVRBU3RhdGUpOwogICAgIG1fb3JpZ2luYWxJbnNlcnRpb25Nb2Rl ID0gbV9pbnNlcnRpb25Nb2RlOwotICAgIG1faW5zZXJ0aW9uTW9kZSA9IFRleHRNb2RlOworICAg IHNldEluc2VydGlvbk1vZGUoVGV4dE1vZGUpOwogfQogCiB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6 cHJvY2Vzc0dlbmVyaWNSYXdUZXh0U3RhcnRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKQEAg LTI0OTQsNyArMjQ5NCw3IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzR2VuZXJpY1Jh d1RleHRTdGFydFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgIG1fdHJlZS5pbnNlcnRI VE1MRWxlbWVudCh0b2tlbik7CiAgICAgbV90b2tlbml6ZXItPnNldFN0YXRlKEhUTUxUb2tlbml6 ZXI6OlJBV1RFWFRTdGF0ZSk7CiAgICAgbV9vcmlnaW5hbEluc2VydGlvbk1vZGUgPSBtX2luc2Vy dGlvbk1vZGU7Ci0gICAgbV9pbnNlcnRpb25Nb2RlID0gVGV4dE1vZGU7CisgICAgc2V0SW5zZXJ0 aW9uTW9kZShUZXh0TW9kZSk7CiB9CiAKIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU2Ny aXB0U3RhcnRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKQEAgLTI1MDMsNyArMjUwMyw3IEBA IHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU2NyaXB0U3RhcnRUYWcoQXRvbWljSFRNTFRv a2VuJiB0b2tlbikKICAgICBtX3RyZWUuaW5zZXJ0U2NyaXB0RWxlbWVudCh0b2tlbik7CiAgICAg bV90b2tlbml6ZXItPnNldFN0YXRlKEhUTUxUb2tlbml6ZXI6OlNjcmlwdERhdGFTdGF0ZSk7CiAg ICAgbV9vcmlnaW5hbEluc2VydGlvbk1vZGUgPSBtX2luc2VydGlvbk1vZGU7Ci0gICAgbV9pbnNl cnRpb25Nb2RlID0gVGV4dE1vZGU7CisgICAgc2V0SW5zZXJ0aW9uTW9kZShUZXh0TW9kZSk7CiB9 CiAKIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpmaW5pc2hlZCgpCg==