123176 2013-10-22 15:26:23 -0700 Rename deleteLineBoxTree to deleteLines 2013-10-22 15:36:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 942436 0 koivisto 2013-10-22 15:26:23 -0700 make more generic for the future 942441 1 214892 koivisto 2013-10-22 15:30:07 -0700 Created attachment 214892 patch 942445 2 koivisto 2013-10-22 15:36:18 -0700 https://trac.webkit.org/r157824 214892 2013-10-22 15:30:07 -0700 2013-10-22 15:33:44 -0700 patch delete-lines.patch text/plain 10244 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzgyMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTEwLTIyICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgZGVsZXRlTGluZUJv eFRyZWUgdG8gZGVsZXRlTGluZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyMzE3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJlbmRlckJsb2NrOjpkZWxldGVMaW5lQm94VHJlZSAtPiBSZW5kZXJCbG9j azo6ZGVsZXRlTGluZXMKKyAgICAgICAgUmVuZGVySW5saW5lOjpkZWxldGVMaW5lQm94VHJlZSAt PiBSZW5kZXJJbmxpbmU6OmRlbGV0ZUxpbmVzCisKIDIwMTMtMTAtMjIgIFpvbHRhbiBIb3J2YXRo ICA8em9sdGFuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0NTUyBTaGFwZXNdIE1hdGNoIGFkanVz dExvZ2ljYWxMaW5lVG9wQW5kTG9naWNhbEhlaWdodElmTmVlZGVkJ3MgaW1wbGVtZW50YXRpb24g d2l0aCBCbGluaydzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAJKHJldmlzaW9uIDE1NzgxNSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUwMiw3ICs1MDIsNyBAQCB2b2lkIFJlbmRlckJs b2NrOjpzcGxpdEJsb2NrcyhSZW5kZXJCbG9jCiAgICAgLy8gSWYgd2UgYXJlIG1vdmluZyBpbmxp bmUgY2hpbGRyZW4gZnJvbSB8dGhpc3wgdG8gY2xvbmVCbG9jaywgdGhlbiB3ZSBuZWVkCiAgICAg Ly8gdG8gY2xlYXIgb3VyIGxpbmUgYm94IHRyZWUuCiAgICAgaWYgKGJlZm9yZUNoaWxkICYmIGNo aWxkcmVuSW5saW5lKCkpCi0gICAgICAgIGRlbGV0ZUxpbmVCb3hUcmVlKCk7CisgICAgICAgIGRl bGV0ZUxpbmVzKCk7CiAKICAgICAvLyBOb3cgdGFrZSBhbGwgb2YgdGhlIGNoaWxkcmVuIGZyb20g YmVmb3JlQ2hpbGQgdG8gdGhlIGVuZCBhbmQgcmVtb3ZlCiAgICAgLy8gdGhlbSBmcm9tIHx0aGlz fCBhbmQgcGxhY2UgdGhlbSBpbiB0aGUgY2xvbmUuCkBAIC01NjYsNyArNTY2LDcgQEAgdm9pZCBS ZW5kZXJCbG9jazo6c3BsaXRGbG93KFJlbmRlck9iamVjdAogICAgIFJlbmRlckJsb2NrKiBibG9j ayA9IGNvbnRhaW5pbmdDb2x1bW5zQmxvY2soKTsKICAgICAKICAgICAvLyBEZWxldGUgb3VyIGxp bmUgYm94ZXMgYmVmb3JlIHdlIGRvIHRoZSBpbmxpbmUgc3BsaXQgaW50byBjb250aW51YXRpb25z LgotICAgIGJsb2NrLT5kZWxldGVMaW5lQm94VHJlZSgpOworICAgIGJsb2NrLT5kZWxldGVMaW5l cygpOwogICAgIAogICAgIGJvb2wgbWFkZU5ld0JlZm9yZUJsb2NrID0gZmFsc2U7CiAgICAgaWYg KGJsb2NrLT5pc0Fub255bW91c0NvbHVtbnNCbG9jaygpKSB7CkBAIC02MjQsNyArNjI0LDcgQEAg dm9pZCBSZW5kZXJCbG9jazo6bWFrZUNoaWxkcmVuQW5vbnltb3VzQwogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIHNvIHRoYXQgd2UgZG9uJ3QgaGF2ZSB0byBwYXRjaCBhbGwgb2Yg dGhlIHJlc3Qgb2YgdGhlIGNvZGUgbGF0ZXIgb24uCiAgICAgCiAgICAgLy8gRGVsZXRlIHRoZSBi bG9jaydzIGxpbmUgYm94ZXMgYmVmb3JlIHdlIGRvIHRoZSBzcGxpdC4KLSAgICBibG9jay0+ZGVs ZXRlTGluZUJveFRyZWUoKTsKKyAgICBibG9jay0+ZGVsZXRlTGluZXMoKTsKIAogICAgIGlmIChi ZWZvcmVDaGlsZCAmJiBiZWZvcmVDaGlsZC0+cGFyZW50KCkgIT0gdGhpcykKICAgICAgICAgYmVm b3JlQ2hpbGQgPSBzcGxpdEFub255bW91c0JveGVzQXJvdW5kQ2hpbGQoYmVmb3JlQ2hpbGQpOwpA QCAtODg2LDcgKzg4Niw3IEBAIHN0YXRpYyB2b2lkIGdldElubGluZVJ1bihSZW5kZXJPYmplY3Qq IHMKICAgICB9IHdoaWxlICghc2F3SW5saW5lKTsKIH0KIAotdm9pZCBSZW5kZXJCbG9jazo6ZGVs ZXRlTGluZUJveFRyZWUoKQordm9pZCBSZW5kZXJCbG9jazo6ZGVsZXRlTGluZXMoKQogewogICAg IGlmIChBWE9iamVjdENhY2hlKiBjYWNoZSA9IGRvY3VtZW50KCkuZXhpc3RpbmdBWE9iamVjdENh Y2hlKCkpCiAgICAgICAgIGNhY2hlLT5yZWNvbXB1dGVJc0lnbm9yZWQodGhpcyk7CkBAIC05MTAs NyArOTEwLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6bWFrZUNoaWxkcmVuTm9uSW5saW5lKAogICAg IGlmICghY2hpbGQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGRlbGV0ZUxpbmVCb3hUcmVlKCk7 CisgICAgZGVsZXRlTGluZXMoKTsKIAogICAgIC8vIFNpbmNlIHdlIGFyZSBnb2luZyB0byBoYXZl IGJsb2NrIGNoaWxkcmVuLCB3ZSBoYXZlIHRvIG1vdmUKICAgICAvLyBiYWNrIHRoZSBydW4taW4g dG8gaXRzIG9yaWdpbmFsIHBsYWNlLgpAQCAtMTA0NSw3ICsxMDQ1LDcgQEAgdm9pZCBSZW5kZXJC bG9jazo6Y29sbGFwc2VBbm9ueW1vdXNCb3hDaAogICAgIHBhcmVudC0+cmVtb3ZlQ2hpbGRJbnRl cm5hbCgqY2hpbGQsIGNoaWxkLT5oYXNMYXllcigpID8gTm90aWZ5Q2hpbGRyZW4gOiBEb250Tm90 aWZ5Q2hpbGRyZW4pOwogICAgIGNoaWxkLT5tb3ZlQWxsQ2hpbGRyZW5UbyhwYXJlbnQsIG5leHRT aWJsaW5nLCBjaGlsZC0+aGFzTGF5ZXIoKSk7CiAgICAgLy8gRGVsZXRlIHRoZSBub3ctZW1wdHkg YmxvY2sncyBsaW5lcyBhbmQgbnVrZSBpdC4KLSAgICBjaGlsZC0+ZGVsZXRlTGluZUJveFRyZWUo KTsKKyAgICBjaGlsZC0+ZGVsZXRlTGluZXMoKTsKICAgICBpZiAoY2hpbGRGbG93VGhyZWFkICYm IGNoaWxkRmxvd1RocmVhZC0+aXNSZW5kZXJOYW1lZEZsb3dUaHJlYWQoKSkKICAgICAgICAgdG9S ZW5kZXJOYW1lZEZsb3dUaHJlYWQoY2hpbGRGbG93VGhyZWFkKS0+cmVtb3ZlRmxvd0NoaWxkSW5m byhjaGlsZCk7CiAgICAgY2hpbGQtPmRlc3Ryb3koKTsKQEAgLTExMDYsNyArMTEwNiw3IEBAIHZv aWQgUmVuZGVyQmxvY2s6OnJlbW92ZUNoaWxkKFJlbmRlck9iamUKICAgICAgICAgICAgIG5leHRC bG9jay0+bW92ZUFsbENoaWxkcmVuSW5jbHVkaW5nRmxvYXRzVG8ocHJldkJsb2NrLCBuZXh0Qmxv Y2stPmhhc0xheWVyKCkgfHwgcHJldkJsb2NrLT5oYXNMYXllcigpKTsKICAgICAgICAgICAgIAog ICAgICAgICAgICAgLy8gRGVsZXRlIHRoZSBub3ctZW1wdHkgYmxvY2sncyBsaW5lcyBhbmQgbnVr ZSBpdC4KLSAgICAgICAgICAgIG5leHRCbG9jay0+ZGVsZXRlTGluZUJveFRyZWUoKTsKKyAgICAg ICAgICAgIG5leHRCbG9jay0+ZGVsZXRlTGluZXMoKTsKICAgICAgICAgICAgIG5leHRCbG9jay0+ ZGVzdHJveSgpOwogICAgICAgICAgICAgbmV4dCA9IDA7CiAgICAgICAgIH0KQEAgLTExMzUsNyAr MTEzNSw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnJlbW92ZUNoaWxkKFJlbmRlck9iamUKICAgICBp ZiAoIWZpcnN0Q2hpbGQoKSkgewogICAgICAgICAvLyBJZiB0aGlzIHdhcyBvdXIgbGFzdCBjaGls ZCBiZSBzdXJlIHRvIGNsZWFyIG91dCBvdXIgbGluZSBib3hlcy4KICAgICAgICAgaWYgKGNoaWxk cmVuSW5saW5lKCkpCi0gICAgICAgICAgICBkZWxldGVMaW5lQm94VHJlZSgpOworICAgICAgICAg ICAgZGVsZXRlTGluZXMoKTsKIAogICAgICAgICAvLyBJZiB3ZSBhcmUgYW4gZW1wdHkgYW5vbnlt b3VzIGJsb2NrIGluIHRoZSBjb250aW51YXRpb24gY2hhaW4sCiAgICAgICAgIC8vIHdlIG5lZWQg dG8gcmVtb3ZlIG91cnNlbGYgYW5kIGZpeCB0aGUgY29udGludWF0aW9uIGNoYWluLgpAQCAtMTY0 NCw5ICsxNjQ0LDkgQEAgc3RhdGljIHZvaWQgZGVzdHJveVJ1bkluKFJlbmRlckJveE1vZGVsTwog ICAgIC8vIERlbGV0ZSBvdXIgbGluZSBib3ggdHJlZS4gVGhpcyBpcyBuZWVkZWQgYXMgb3VyIGNo aWxkcmVuIGdvdCBtb3ZlZAogICAgIC8vIGFuZCBvdXIgbGluZSBib3ggdHJlZSBpcyBubyBsb25n ZXIgdmFsaWQuCiAgICAgaWYgKHJ1bkluLT5pc1JlbmRlckJsb2NrKCkpCi0gICAgICAgIHRvUmVu ZGVyQmxvY2socnVuSW4pLT5kZWxldGVMaW5lQm94VHJlZSgpOworICAgICAgICB0b1JlbmRlckJs b2NrKHJ1bkluKS0+ZGVsZXRlTGluZXMoKTsKICAgICBlbHNlIGlmIChydW5Jbi0+aXNSZW5kZXJJ bmxpbmUoKSkKLSAgICAgICAgdG9SZW5kZXJJbmxpbmUocnVuSW4pLT5kZWxldGVMaW5lQm94VHJl ZSgpOworICAgICAgICB0b1JlbmRlcklubGluZShydW5JbiktPmRlbGV0ZUxpbmVzKCk7CiAgICAg ZWxzZQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIApJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHJldmlzaW9uIDE1NzgxNSkKKysrIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTAsNyArMTEw LDcgQEAgcHVibGljOgogICAgIExheW91dFVuaXQgbWluTGluZUhlaWdodEZvclJlcGxhY2VkUmVu ZGVyZXIoYm9vbCBpc0ZpcnN0TGluZSwgTGF5b3V0VW5pdCByZXBsYWNlZEhlaWdodCkgY29uc3Q7 CiAKICAgICAvLyBGSVhNRS1CTE9DS0ZMT1c6IFJlbW92ZSB2aXJ0dWFsaXphaW9uIHdoZW4gYWxs IGNhbGxlcnMgaGF2ZSBtb3ZlZCB0byBSZW5kZXJCbG9ja0Zsb3cKLSAgICB2aXJ0dWFsIHZvaWQg ZGVsZXRlTGluZUJveFRyZWUoKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGVsZXRlTGluZXMoKTsKIAog ICAgIHZpcnR1YWwgdm9pZCBhZGRDaGlsZChSZW5kZXJPYmplY3QqIG5ld0NoaWxkLCBSZW5kZXJP YmplY3QqIGJlZm9yZUNoaWxkID0gMCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHJlbW92 ZUNoaWxkKFJlbmRlck9iamVjdCYpIE9WRVJSSURFOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAJKHJldmlzaW9uIDE1NzgxNSkKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNjExLDE0ICsxNjExLDE0IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpzdHlsZVdpbGxDaGFu Z2UoU3QKICAgICBSZW5kZXJCbG9jazo6c3R5bGVXaWxsQ2hhbmdlKGRpZmYsIG5ld1N0eWxlKTsK IH0KIAotdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmRlbGV0ZUxpbmVCb3hUcmVlKCkKK3ZvaWQgUmVu ZGVyQmxvY2tGbG93OjpkZWxldGVMaW5lcygpCiB7CiAgICAgaWYgKGNvbnRhaW5zRmxvYXRzKCkp CiAgICAgICAgIG1fZmxvYXRpbmdPYmplY3RzLT5jbGVhckxpbmVCb3hUcmVlUG9pbnRlcnMoKTsK IAogICAgIG1fbGluZUJveGVzLmRlbGV0ZUxpbmVCb3hUcmVlKHJlbmRlckFyZW5hKCkpOwogCi0g ICAgUmVuZGVyQmxvY2s6OmRlbGV0ZUxpbmVCb3hUcmVlKCk7CisgICAgUmVuZGVyQmxvY2s6OmRl bGV0ZUxpbmVzKCk7CiB9CiAKIHZvaWQgUmVuZGVyQmxvY2tGbG93Ojptb3ZlQWxsQ2hpbGRyZW5J bmNsdWRpbmdGbG9hdHNUbyhSZW5kZXJCbG9jayogdG9CbG9jaywgYm9vbCBmdWxsUmVtb3ZlSW5z ZXJ0KQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaAko cmV2aXNpb24gMTU3ODE1KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr Rmxvdy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNDksNyArMjQ5LDcgQEAgcHVibGljOgogICAgIGJv b2wgY29udGFpbnNGbG9hdHMoKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBtX2Zsb2F0aW5nT2Jq ZWN0cyAmJiAhbV9mbG9hdGluZ09iamVjdHMtPnNldCgpLmlzRW1wdHkoKTsgfQogICAgIGJvb2wg Y29udGFpbnNGbG9hdChSZW5kZXJCb3gqKSBjb25zdDsKIAotICAgIHZpcnR1YWwgdm9pZCBkZWxl dGVMaW5lQm94VHJlZSgpIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBkZWxldGVMaW5lcygp IE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlT3ZlcmZsb3coTGF5b3V0VW5pdCBv bGRDbGllbnRBZnRlckVkZ2UsIGJvb2wgcmVjb21wdXRlRmxvYXRzID0gZmFsc2UpIE9WRVJSSURF OwogCiAgICAgdm9pZCByZW1vdmVGbG9hdGluZ09iamVjdHMoKTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGdWxsU2NyZWVuLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnVsbFNjcmVlbi5jcHAJKHJldmlzaW9uIDE1NzgxNSkK KysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGdWxsU2NyZWVuLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTIzLDcgKzEyMyw3IEBAIFJlbmRlckZ1bGxTY3JlZW4qIFJlbmRlckZ1bGxT Y3JlZW46OndyYXAKICAgICAgICAgICAgIEFTU0VSVChjb250YWluaW5nQmxvY2spOwogICAgICAg ICAgICAgLy8gU2luY2Ugd2UgYXJlIG1vdmluZyB0aGUgfG9iamVjdHwgdG8gYSBuZXcgcGFyZW50 IHxmdWxsc2NyZWVuUmVuZGVyZXJ8LAogICAgICAgICAgICAgLy8gdGhlIGxpbmUgYm94IHRyZWUg dW5kZXJuZWF0aCBvdXIgfGNvbnRhaW5pbmdCbG9ja3wgaXMgbm90IGxvbmdlciB2YWxpZC4KLSAg ICAgICAgICAgIGNvbnRhaW5pbmdCbG9jay0+ZGVsZXRlTGluZUJveFRyZWUoKTsKKyAgICAgICAg ICAgIGNvbnRhaW5pbmdCbG9jay0+ZGVsZXRlTGluZXMoKTsKIAogICAgICAgICAgICAgcGFyZW50 LT5hZGRDaGlsZChmdWxsc2NyZWVuUmVuZGVyZXIsIG9iamVjdCk7CiAgICAgICAgICAgICBvYmpl Y3QtPnJlbW92ZUZyb21QYXJlbnQoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJJbmxpbmUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJJbmxpbmUuY3BwCShyZXZpc2lvbiAxNTc4MTUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVySW5saW5lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQxLDcgKzQ0MSw3IEBA IHZvaWQgUmVuZGVySW5saW5lOjpzcGxpdEZsb3coUmVuZGVyT2JqZWMKICAgICBSZW5kZXJCbG9j ayogYmxvY2sgPSBjb250YWluaW5nQmxvY2soKTsKICAgICAKICAgICAvLyBEZWxldGUgb3VyIGxp bmUgYm94ZXMgYmVmb3JlIHdlIGRvIHRoZSBpbmxpbmUgc3BsaXQgaW50byBjb250aW51YXRpb25z LgotICAgIGJsb2NrLT5kZWxldGVMaW5lQm94VHJlZSgpOworICAgIGJsb2NrLT5kZWxldGVMaW5l cygpOwogICAgIAogICAgIGJvb2wgbWFkZU5ld0JlZm9yZUJsb2NrID0gZmFsc2U7CiAgICAgaWYg KGJsb2NrLT5pc0Fub255bW91c0Jsb2NrKCkgJiYgKCFibG9jay0+cGFyZW50KCkgfHwgIWJsb2Nr LT5wYXJlbnQoKS0+Y3JlYXRlc0Fub255bW91c1dyYXBwZXIoKSkpIHsKQEAgLTEzMzksNyArMTMz OSw3IEBAIHZvaWQgUmVuZGVySW5saW5lOjpkaXJ0eUxpbmVCb3hlcyhib29sIGYKICAgICAgICAg bV9saW5lQm94ZXMuZGlydHlMaW5lQm94ZXMoKTsKIH0KIAotdm9pZCBSZW5kZXJJbmxpbmU6OmRl bGV0ZUxpbmVCb3hUcmVlKCkKK3ZvaWQgUmVuZGVySW5saW5lOjpkZWxldGVMaW5lcygpCiB7CiAg ICAgbV9saW5lQm94ZXMuZGVsZXRlTGluZUJveFRyZWUocmVuZGVyQXJlbmEoKSk7CiB9CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5oCShyZXZpc2lvbiAxNTc4MTUp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmgJKHdvcmtpbmcgY29w eSkKQEAgLTU4LDcgKzU4LDcgQEAgcHVibGljOgogICAgIElubGluZUZsb3dCb3gqIGNyZWF0ZUFu ZEFwcGVuZElubGluZUZsb3dCb3goKTsKIAogICAgIHZvaWQgZGlydHlMaW5lQm94ZXMoYm9vbCBm dWxsTGF5b3V0KTsKLSAgICB2b2lkIGRlbGV0ZUxpbmVCb3hUcmVlKCk7CisgICAgdm9pZCBkZWxl dGVMaW5lcygpOwogCiAgICAgUmVuZGVyTGluZUJveExpc3QmIGxpbmVCb3hlcygpIHsgcmV0dXJu IG1fbGluZUJveGVzOyB9CiAgICAgY29uc3QgUmVuZGVyTGluZUJveExpc3QmIGxpbmVCb3hlcygp IGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveGVzOyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyUnVieUJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJSdWJ5QmFzZS5jcHAJKHJldmlzaW9uIDE1NzgxNSkKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSdWJ5QmFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEx Nyw3ICsxMTcsNyBAQCB2b2lkIFJlbmRlclJ1YnlCYXNlOjptb3ZlQmxvY2tDaGlsZHJlbihSCiAg ICAgICAgIFJlbmRlckJsb2NrKiBhbm9uQmxvY2tIZXJlID0gdG9SZW5kZXJCbG9jayhmaXJzdENo aWxkSGVyZSk7CiAgICAgICAgIFJlbmRlckJsb2NrKiBhbm9uQmxvY2tUaGVyZSA9IHRvUmVuZGVy QmxvY2sobGFzdENoaWxkVGhlcmUpOwogICAgICAgICBhbm9uQmxvY2tIZXJlLT5tb3ZlQWxsQ2hp bGRyZW5Ubyhhbm9uQmxvY2tUaGVyZSwgdHJ1ZSk7Ci0gICAgICAgIGFub25CbG9ja0hlcmUtPmRl bGV0ZUxpbmVCb3hUcmVlKCk7CisgICAgICAgIGFub25CbG9ja0hlcmUtPmRlbGV0ZUxpbmVzKCk7 CiAgICAgICAgIGFub25CbG9ja0hlcmUtPmRlc3Ryb3koKTsKICAgICB9CiAgICAgLy8gTW92ZSBh bGwgcmVtYWluaW5nIGNoaWxkcmVuIG5vcm1hbGx5LgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclJ1YnlSdW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJSdWJ5UnVuLmNwcAkocmV2aXNpb24gMTU3ODE1KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1YnlSdW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODUs MTQgKzE4NSwxNCBAQCB2b2lkIFJlbmRlclJ1YnlSdW46OnJlbW92ZUNoaWxkKFJlbmRlck9iCiAg ICAgICAgIFJlbmRlckJsb2NrKiBiYXNlID0gcnVieUJhc2UoKTsKICAgICAgICAgaWYgKGJhc2Ug JiYgIWJhc2UtPmZpcnN0Q2hpbGQoKSkgewogICAgICAgICAgICAgUmVuZGVyQmxvY2tGbG93Ojpy ZW1vdmVDaGlsZCgqYmFzZSk7Ci0gICAgICAgICAgICBiYXNlLT5kZWxldGVMaW5lQm94VHJlZSgp OworICAgICAgICAgICAgYmFzZS0+ZGVsZXRlTGluZXMoKTsKICAgICAgICAgICAgIGJhc2UtPmRl c3Ryb3koKTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIElmIGFueSBvZiB0aGUgYWJvdmUgbGVh dmVzIHRoZSBydW4gZW1wdHksIGRlc3Ryb3kgaXQgYXMgd2VsbC4KICAgICAgICAgaWYgKGlzRW1w dHkoKSkgewogICAgICAgICAgICAgcGFyZW50KCktPnJlbW92ZUNoaWxkKCp0aGlzKTsKLSAgICAg ICAgICAgIGRlbGV0ZUxpbmVCb3hUcmVlKCk7CisgICAgICAgICAgICBkZWxldGVMaW5lcygpOwog ICAgICAgICAgICAgZGVzdHJveSgpOwogICAgICAgICB9CiAgICAgfQo=