142146 2015-03-01 09:03:29 -0800 BreakingContext cleanup 2015-03-03 11:13:37 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue dino esprehn+autocc glenn jonlee kondapallykalyan simon.fraser thorton zalan oldest_to_newest 1073153 0 mmaxfield 2015-03-01 09:03:29 -0800 BreakingContext cleanup 1073155 1 247631 mmaxfield 2015-03-01 09:05:57 -0800 Created attachment 247631 Patch 1073161 2 247634 mmaxfield 2015-03-01 10:14:34 -0800 Created attachment 247634 Patch 1073163 3 247631 zalan 2015-03-01 10:20:10 -0800 Comment on attachment 247631 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=247631&action=review > Source/WebCore/rendering/line/BreakingContextInlineHeaders.h:1052 > if (m_lineBreak == m_resolver.position()) { > if (!m_lineBreak.renderer() || !m_lineBreak.renderer()->isBR()) { > // we just add as much as possible > - if (m_blockStyle.whiteSpace() == PRE && !m_current.offset()) { > - m_lineBreak.moveTo(m_lastObject, m_lastObject->isText() ? m_lastObject->length() : 0); > - } else if (m_lineBreak.renderer()) { > + if (m_blockStyle.whiteSpace() == PRE && !m_current.offset()) > + commitLineBreakAtCurrentWidth(*m_lastObject, m_lastObject->isText() ? m_lastObject->length() : 0); > + else if (m_lineBreak.renderer()) { > // Don't ever break in the middle of a word if we can help it. > // There's no room at all. We just have to be on this line, > // even though we'll spill out. > - m_lineBreak.moveTo(m_current.renderer(), m_current.offset()); > + commitLineBreakAtCurrentWidth(*m_current.renderer(), m_current.offset()); So the extra m_width.commit() here (by calling commitLineBreakAtCurrentWidth()) does not change behavior? 1073242 4 247631 mmaxfield 2015-03-01 18:10:15 -0800 Comment on attachment 247631 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=247631&action=review >> Source/WebCore/rendering/line/BreakingContextInlineHeaders.h:1052 >> + commitLineBreakAtCurrentWidth(*m_current.renderer(), m_current.offset()); > > So the extra m_width.commit() here (by calling commitLineBreakAtCurrentWidth()) does not change behavior? No - this function only ever gets called at the very end of LineBreaker::nextLineBreak(), where the LineWidth immediately gets destroyed. 1073721 5 mmaxfield 2015-03-03 11:13:37 -0800 Committed r180944: <http://trac.webkit.org/changeset/180944> 247631 2015-03-01 09:05:57 -0800 2015-03-01 10:20:10 -0800 Patch bug-142146-20150301090541.patch text/plain 6621 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzcxMmFkMmVjMTExMzFm OTJiMWI0MDk2MjhiZTg3NzU4MjdmYzllMS4uYzk1NzRjMDE3NTJhODUxZTMyNjM2OGYxNDhhNGM1 YzM3ZDMxZjQyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTAzLTAxICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQnJlYWtpbmdD b250ZXh0IGNsZWFudXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0MjE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIDEuIFVzaW5nIGNvbW1pdExpbmVCcmVha0F0Q3VycmVudFdpZHRoKCkgaW5zdGVhZCBv ZiBkaXJlY3RseQorICAgICAgICB1cGRhdGluZyBtX3dpZHRoIGFuZCBtX2xpbmVCcmVhaywgYmVj YXVzZSB0aGUgbmFtZSBtYWtlcyB0aGUKKyAgICAgICAgaW50ZW50IG1vcmUgY2xlYXIuCisgICAg ICAgIDIuIFJlbW92aW5nIGR1cGxpY2F0ZSBmdW5jdGlvbiBMaW5lQnJlYWtlcjo6bmV4dFNlZ21l bnRCcmVhaygpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJl aGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHJlbmRlcmluZy9saW5lL0JyZWFraW5nQ29udGV4 dElubGluZUhlYWRlcnMuaDoKKyAgICAgICAgKFdlYkNvcmU6OkJyZWFraW5nQ29udGV4dDo6aGFu ZGxlUmVwbGFjZWQpOgorICAgICAgICAoV2ViQ29yZTo6QnJlYWtpbmdDb250ZXh0OjpoYW5kbGVU ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkJyZWFraW5nQ29udGV4dDo6Y29tbWl0QW5kVXBkYXRl TGluZUJyZWFrSWZOZWVkZWQpOgorICAgICAgICAoV2ViQ29yZTo6QnJlYWtpbmdDb250ZXh0Ojpo YW5kbGVFbmRPZkxpbmUpOgorICAgICAgICAqIHJlbmRlcmluZy9saW5lL0xpbmVCcmVha2VyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxpbmVCcmVha2VyOjpuZXh0TGluZUJyZWFrKTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkxpbmVCcmVha2VyOjpuZXh0U2VnbWVudEJyZWFrKTogRGVs ZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvbGluZS9MaW5lQnJlYWtlci5oOgorCiAyMDE1LTAy LTI4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFZp ZXdwb3J0IHVuaXRzIHNob3VsZCBub3QgZGlydHkgc3R5bGUganVzdCBiZWZvcmUgd2UgZG8gbGF5 b3V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0Nv bnRleHRJbmxpbmVIZWFkZXJzLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVh a2luZ0NvbnRleHRJbmxpbmVIZWFkZXJzLmgKaW5kZXggMGYzZjhmNThmYzYzODI5YzFhMTc0ZmNk N2FkMzM4NGRmMGZiNDE4Yi4uM2IxMmNkZTRmZTk5YjQyM2NhY2M2Yjk4MzNkYjI1NmU0NjM2ZDAz NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250 ZXh0SW5saW5lSGVhZGVycy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0Jy ZWFraW5nQ29udGV4dElubGluZUhlYWRlcnMuaApAQCAtNDI0LDggKzQyNCw3IEBAIGlubGluZSB2 b2lkIEJyZWFraW5nQ29udGV4dDo6aGFuZGxlUmVwbGFjZWQoKQogICAgIC8vIEJyZWFrIG9uIHJl cGxhY2VkIGVsZW1lbnRzIGlmIGVpdGhlciBoYXMgbm9ybWFsIHdoaXRlLXNwYWNlLgogICAgIGlm ICgobV9hdXRvV3JhcCB8fCBSZW5kZXJTdHlsZTo6YXV0b1dyYXAobV9sYXN0V1MpKSAmJiAoIW1f Y3VycmVudC5yZW5kZXJlcigpLT5pc0ltYWdlKCkgfHwgbV9hbGxvd0ltYWdlc1RvQnJlYWspCiAg ICAgICAgICYmICghbV9jdXJyZW50LnJlbmRlcmVyKCktPmlzUnVieVJ1bigpIHx8IGRvd25jYXN0 PFJlbmRlclJ1YnlSdW4+KG1fY3VycmVudC5yZW5kZXJlcigpKS0+Y2FuQnJlYWtCZWZvcmUobV9y ZW5kZXJUZXh0SW5mby5tX2xpbmVCcmVha0l0ZXJhdG9yKSkpIHsKLSAgICAgICAgbV93aWR0aC5j b21taXQoKTsKLSAgICAgICAgbV9saW5lQnJlYWsubW92ZVRvU3RhcnRPZihtX2N1cnJlbnQucmVu ZGVyZXIoKSk7CisgICAgICAgIGNvbW1pdExpbmVCcmVha0F0Q3VycmVudFdpZHRoKCptX2N1cnJl bnQucmVuZGVyZXIoKSk7CiAgICAgfQogCiAgICAgaWYgKG1faWdub3JpbmdTcGFjZXMpCkBAIC04 MTQsOSArODEzLDggQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdv cmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICAgICAgICAgIH0KIAog ICAgICAgICAgICAgaWYgKG1fYXV0b1dyYXAgJiYgYmV0d2VlbldvcmRzKSB7Ci0gICAgICAgICAg ICAgICAgbV93aWR0aC5jb21taXQoKTsKKyAgICAgICAgICAgICAgICBjb21taXRMaW5lQnJlYWtB dEN1cnJlbnRXaWR0aCgqbV9jdXJyZW50LnJlbmRlcmVyKCksIG1fY3VycmVudC5vZmZzZXQoKSwg bV9jdXJyZW50Lm5leHRCcmVha2FibGVQb3NpdGlvbigpKTsKICAgICAgICAgICAgICAgICB3cmFw VyA9IDA7Ci0gICAgICAgICAgICAgICAgbV9saW5lQnJlYWsubW92ZVRvKG1fY3VycmVudC5yZW5k ZXJlcigpLCBtX2N1cnJlbnQub2Zmc2V0KCksIG1fY3VycmVudC5uZXh0QnJlYWthYmxlUG9zaXRp b24oKSk7CiAgICAgICAgICAgICAgICAgLy8gQXV0by13cmFwcGluZyB0ZXh0IHNob3VsZCBub3Qg d3JhcCBpbiB0aGUgbWlkZGxlIG9mIGEgd29yZCBvbmNlIGl0IGhhcyBoYWQgYW4KICAgICAgICAg ICAgICAgICAvLyBvcHBvcnR1bml0eSB0byBicmVhayBhZnRlciBhIHdvcmQuCiAgICAgICAgICAg ICAgICAgYnJlYWtXb3JkcyA9IGZhbHNlOwpAQCAtMTAxMSw4ICsxMDA5LDcgQEAgaW5saW5lIHZv aWQgQnJlYWtpbmdDb250ZXh0Ojpjb21taXRBbmRVcGRhdGVMaW5lQnJlYWtJZk5lZWRlZCgpCiAg ICAgaWYgKCFtX2N1cnJlbnQucmVuZGVyZXIoKS0+aXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRp b25lZCgpKSB7CiAgICAgICAgIG1fbGFzdE9iamVjdCA9IG1fY3VycmVudC5yZW5kZXJlcigpOwog ICAgICAgICBpZiAobV9sYXN0T2JqZWN0LT5pc1JlcGxhY2VkKCkgJiYgbV9hdXRvV3JhcCAmJiAh bV9sYXN0T2JqZWN0LT5pc1J1YnlSdW4oKSAmJiAoIW1fbGFzdE9iamVjdC0+aXNJbWFnZSgpIHx8 IG1fYWxsb3dJbWFnZXNUb0JyZWFrKSAmJiAoIWlzPFJlbmRlckxpc3RNYXJrZXI+KCptX2xhc3RP YmplY3QpIHx8IGRvd25jYXN0PFJlbmRlckxpc3RNYXJrZXI+KCptX2xhc3RPYmplY3QpLmlzSW5z aWRlKCkpKSB7Ci0gICAgICAgICAgICBtX3dpZHRoLmNvbW1pdCgpOwotICAgICAgICAgICAgbV9s aW5lQnJlYWsubW92ZVRvU3RhcnRPZihtX25leHRPYmplY3QpOworICAgICAgICAgICAgY29tbWl0 TGluZUJyZWFrQXRDdXJyZW50V2lkdGgoKm1fbmV4dE9iamVjdCk7CiAgICAgICAgIH0KICAgICB9 CiB9CkBAIC0xMDQ2LDEzICsxMDQzLDEzIEBAIGlubGluZSBJbmxpbmVJdGVyYXRvciBCcmVha2lu Z0NvbnRleHQ6OmhhbmRsZUVuZE9mTGluZSgpCiAgICAgaWYgKG1fbGluZUJyZWFrID09IG1fcmVz b2x2ZXIucG9zaXRpb24oKSkgewogICAgICAgICBpZiAoIW1fbGluZUJyZWFrLnJlbmRlcmVyKCkg fHwgIW1fbGluZUJyZWFrLnJlbmRlcmVyKCktPmlzQlIoKSkgewogICAgICAgICAgICAgLy8gd2Ug anVzdCBhZGQgYXMgbXVjaCBhcyBwb3NzaWJsZQotICAgICAgICAgICAgaWYgKG1fYmxvY2tTdHls ZS53aGl0ZVNwYWNlKCkgPT0gUFJFICYmICFtX2N1cnJlbnQub2Zmc2V0KCkpIHsKLSAgICAgICAg ICAgICAgICBtX2xpbmVCcmVhay5tb3ZlVG8obV9sYXN0T2JqZWN0LCBtX2xhc3RPYmplY3QtPmlz VGV4dCgpID8gbV9sYXN0T2JqZWN0LT5sZW5ndGgoKSA6IDApOwotICAgICAgICAgICAgfSBlbHNl IGlmIChtX2xpbmVCcmVhay5yZW5kZXJlcigpKSB7CisgICAgICAgICAgICBpZiAobV9ibG9ja1N0 eWxlLndoaXRlU3BhY2UoKSA9PSBQUkUgJiYgIW1fY3VycmVudC5vZmZzZXQoKSkKKyAgICAgICAg ICAgICAgICBjb21taXRMaW5lQnJlYWtBdEN1cnJlbnRXaWR0aCgqbV9sYXN0T2JqZWN0LCBtX2xh c3RPYmplY3QtPmlzVGV4dCgpID8gbV9sYXN0T2JqZWN0LT5sZW5ndGgoKSA6IDApOworICAgICAg ICAgICAgZWxzZSBpZiAobV9saW5lQnJlYWsucmVuZGVyZXIoKSkgewogICAgICAgICAgICAgICAg IC8vIERvbid0IGV2ZXIgYnJlYWsgaW4gdGhlIG1pZGRsZSBvZiBhIHdvcmQgaWYgd2UgY2FuIGhl bHAgaXQuCiAgICAgICAgICAgICAgICAgLy8gVGhlcmUncyBubyByb29tIGF0IGFsbC4gV2UganVz dCBoYXZlIHRvIGJlIG9uIHRoaXMgbGluZSwKICAgICAgICAgICAgICAgICAvLyBldmVuIHRob3Vn aCB3ZSdsbCBzcGlsbCBvdXQuCi0gICAgICAgICAgICAgICAgbV9saW5lQnJlYWsubW92ZVRvKG1f Y3VycmVudC5yZW5kZXJlcigpLCBtX2N1cnJlbnQub2Zmc2V0KCkpOworICAgICAgICAgICAgICAg IGNvbW1pdExpbmVCcmVha0F0Q3VycmVudFdpZHRoKCptX2N1cnJlbnQucmVuZGVyZXIoKSwgbV9j dXJyZW50Lm9mZnNldCgpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICAvLyBt YWtlIHN1cmUgd2UgY29uc3VtZSBhdCBsZWFzdCBvbmUgY2hhci9vYmplY3QuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5lQnJlYWtlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5lQnJlYWtlci5jcHAKaW5kZXggYjY4NTdiNmY0Mzdh ZDUyNmE1ODcxYThmNDAyYzQ3MmYwYjc2NTg1OC4uOWIyYjMwNmFiZWYwM2FkOTBkNWI1ZjAyODMz NTA3NTg4YmY3M2NkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUv TGluZUJyZWFrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0xpbmVC cmVha2VyLmNwcApAQCAtNzksMTEgKzc5LDYgQEAgdm9pZCBMaW5lQnJlYWtlcjo6c2tpcExlYWRp bmdXaGl0ZXNwYWNlKElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIExpbmVJbmZvJgogCiBJ bmxpbmVJdGVyYXRvciBMaW5lQnJlYWtlcjo6bmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2 ZXImIHJlc29sdmVyLCBMaW5lSW5mbyYgbGluZUluZm8sIFJlbmRlclRleHRJbmZvJiByZW5kZXJU ZXh0SW5mbywgRmxvYXRpbmdPYmplY3QqIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIHVuc2ln bmVkIGNvbnNlY3V0aXZlSHlwaGVuYXRlZExpbmVzLCBXb3JkTWVhc3VyZW1lbnRzJiB3b3JkTWVh c3VyZW1lbnRzKQogewotICAgIHJldHVybiBuZXh0U2VnbWVudEJyZWFrKHJlc29sdmVyLCBsaW5l SW5mbywgcmVuZGVyVGV4dEluZm8sIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIGNvbnNlY3V0 aXZlSHlwaGVuYXRlZExpbmVzLCB3b3JkTWVhc3VyZW1lbnRzKTsKLX0KLQotSW5saW5lSXRlcmF0 b3IgTGluZUJyZWFrZXI6Om5leHRTZWdtZW50QnJlYWsoSW5saW5lQmlkaVJlc29sdmVyJiByZXNv bHZlciwgTGluZUluZm8mIGxpbmVJbmZvLCBSZW5kZXJUZXh0SW5mbyYgcmVuZGVyVGV4dEluZm8s IEZsb2F0aW5nT2JqZWN0KiBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCB1bnNpZ25lZCBjb25z ZWN1dGl2ZUh5cGhlbmF0ZWRMaW5lcywgV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50 cykKLXsKICAgICByZXNldCgpOwogCiAgICAgQVNTRVJUKHJlc29sdmVyLnBvc2l0aW9uKCkucm9v dCgpID09ICZtX2Jsb2NrKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9s aW5lL0xpbmVCcmVha2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5lQnJl YWtlci5oCmluZGV4IDgwMjVlMTlmNGQ0N2Y2NmFjZWMyY2Q3M2MyODQ4ZGQ4NzM1YzI4MDkuLmFh ZTJlMmFkNTEzMmJhNDY5ZmU0MjE1NTc1ZTEyMGEwMDQwMzk3OGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0xpbmVCcmVha2VyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL2xpbmUvTGluZUJyZWFrZXIuaApAQCAtNjQsNyArNjQsNiBAQCBwdWJsaWM6 CiBwcml2YXRlOgogICAgIHZvaWQgcmVzZXQoKTsKIAotICAgIElubGluZUl0ZXJhdG9yIG5leHRT ZWdtZW50QnJlYWsoSW5saW5lQmlkaVJlc29sdmVyJiwgTGluZUluZm8mLCBSZW5kZXJUZXh0SW5m byYsIEZsb2F0aW5nT2JqZWN0KiBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCB1bnNpZ25lZCBj b25zZWN1dGl2ZUh5cGhlbmF0ZWRMaW5lcywgV29yZE1lYXN1cmVtZW50cyYpOwogICAgIHZvaWQg c2tpcFRyYWlsaW5nV2hpdGVzcGFjZShJbmxpbmVJdGVyYXRvciYsIGNvbnN0IExpbmVJbmZvJik7 CiAgICAgdm9pZCBza2lwTGVhZGluZ1doaXRlc3BhY2UoSW5saW5lQmlkaVJlc29sdmVyJiwgTGlu ZUluZm8mLCBGbG9hdGluZ09iamVjdCogbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgTGluZVdp ZHRoJik7CiAK 247634 2015-03-01 10:14:34 -0800 2015-03-03 11:09:41 -0800 Patch bug-142146-20150301101418.patch text/plain 10013 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzcxMmFkMmVjMTExMzFm OTJiMWI0MDk2MjhiZTg3NzU4MjdmYzllMS4uMGYzYjdlMDgwODRiZWRmNTBiOTIyYzYxN2Q5ODE0 MGU5ODIzMDgyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE1LTAzLTAxICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQnJlYWtpbmdD b250ZXh0IGNsZWFudXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0MjE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIDEuIFVzZSBjb21taXRMaW5lQnJlYWtBdEN1cnJlbnRXaWR0aCgpIGluc3RlYWQgb2Yg ZGlyZWN0bHkKKyAgICAgICAgdXBkYXRpbmcgbV93aWR0aCBhbmQgbV9saW5lQnJlYWssIGJlY2F1 c2UgdGhlIG5hbWUgbWFrZXMgdGhlCisgICAgICAgIGludGVudCBjbGVhcmVyLgorICAgICAgICAy LiBSZW1vdmUgZHVwbGljYXRlIGZ1bmN0aW9uIExpbmVCcmVha2VyOjpuZXh0U2VnbWVudEJyZWFr KCkuCisgICAgICAgIDMuIGxpbmVTdHlsZSgpIHRha2VzIGNhcmUgb2YgaW5zcGVjdGluZyBSZW5k ZXJUZXh0J3MgcGFyZW50J3MKKyAgICAgICAgc3R5bGUuCisgICAgICAgIDQuIEFkZCBGSVhNRSB0 byBCcmVha2luZ0NvbnRleHQ6OmluaXRpYWxpemVGb3JDdXJyZW50T2JqZWN0KCkKKyAgICAgICAg YmVjYXVzZSBpdCBzZWVtcyBsaWtlIHdlIGFyZSBpZ25vcmluZyBmaXJzdC1saW5lIHN0eWxlIGZv cgorICAgICAgICBzb21lIHByb3BlcnRpZXMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1 c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL2xp bmUvQnJlYWtpbmdDb250ZXh0SW5saW5lSGVhZGVycy5oOgorICAgICAgICAoV2ViQ29yZTo6QnJl YWtpbmdDb250ZXh0OjpCcmVha2luZ0NvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6QnJlYWtp bmdDb250ZXh0Ojppbml0aWFsaXplRm9yQ3VycmVudE9iamVjdCk6CisgICAgICAgIChXZWJDb3Jl OjpCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVJlcGxhY2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkJy ZWFraW5nQ29udGV4dDo6aGFuZGxlVGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpCcmVha2luZ0Nv bnRleHQ6OmNvbW1pdEFuZFVwZGF0ZUxpbmVCcmVha0lmTmVlZGVkKToKKyAgICAgICAgKFdlYkNv cmU6OkJyZWFraW5nQ29udGV4dDo6aGFuZGxlRW5kT2ZMaW5lKToKKyAgICAgICAgKiByZW5kZXJp bmcvbGluZS9MaW5lQnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMaW5lQnJlYWtlcjo6 bmV4dExpbmVCcmVhayk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMaW5lQnJlYWtlcjo6 bmV4dFNlZ21lbnRCcmVhayk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL2xpbmUvTGlu ZUJyZWFrZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvbGluZS9MaW5lSW5saW5lSGVhZGVycy5o OgorICAgICAgICAoV2ViQ29yZTo6bGluZVN0eWxlKToKKwogMjAxNS0wMi0yOCAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBWaWV3cG9ydCB1bml0cyBz aG91bGQgbm90IGRpcnR5IHN0eWxlIGp1c3QgYmVmb3JlIHdlIGRvIGxheW91dApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0SW5saW5lSGVh ZGVycy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0SW5s aW5lSGVhZGVycy5oCmluZGV4IDBmM2Y4ZjU4ZmM2MzgyOWMxYTE3NGZjZDdhZDMzODRkZjBmYjQx OGIuLjdkOTBlY2VmNzAzNWYyZDk3ZTE1ZDQ2NDBjZDIwODE1N2UxNGZkMTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0JyZWFraW5nQ29udGV4dElubGluZUhlYWRl cnMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHRJ bmxpbmVIZWFkZXJzLmgKQEAgLTcxLDggKzcxLDggQEAgcHVibGljOgogICAgICAgICAsIG1fbGlu ZUJyZWFrKHJlc29sdmVyLnBvc2l0aW9uKCkpCiAgICAgICAgICwgbV9ibG9jayhibG9jaykKICAg ICAgICAgLCBtX2xhc3RPYmplY3QobV9jdXJyZW50LnJlbmRlcmVyKCkpCi0gICAgICAgICwgbV9u ZXh0T2JqZWN0KDApCi0gICAgICAgICwgbV9jdXJyZW50U3R5bGUoMCkKKyAgICAgICAgLCBtX25l eHRPYmplY3QobnVsbHB0cikKKyAgICAgICAgLCBtX2N1cnJlbnRTdHlsZShudWxscHRyKQogICAg ICAgICAsIG1fYmxvY2tTdHlsZShibG9jay5zdHlsZSgpKQogICAgICAgICAsIG1fbGluZUluZm8o aW5MaW5lSW5mbykKICAgICAgICAgLCBtX3JlbmRlclRleHRJbmZvKGluUmVuZGVyVGV4dEluZm8p CkBAIC0xNDQsNyArMTQ0LDcgQEAgcHJpdmF0ZToKICAgICBSZW5kZXJPYmplY3QqIG1fbGFzdE9i amVjdDsKICAgICBSZW5kZXJPYmplY3QqIG1fbmV4dE9iamVjdDsKIAotICAgIFJlbmRlclN0eWxl KiBtX2N1cnJlbnRTdHlsZTsKKyAgICBjb25zdCBSZW5kZXJTdHlsZSogbV9jdXJyZW50U3R5bGU7 CiAKICAgICAvLyBGaXJlZm94IGFuZCBPcGVyYSB3aWxsIGFsbG93IGEgdGFibGUgY2VsbCB0byBn cm93IHRvIGZpdCBhbiBpbWFnZSBpbnNpZGUgaXQgdW5kZXIKICAgICAvLyB2ZXJ5IHNwZWNpZmlj IGNpcmN1bXN0YW5jZXMgKGluIG9yZGVyIHRvIG1hdGNoIGNvbW1vbiBXaW5JRSByZW5kZXJpbmdz KS4KQEAgLTE5NCw3ICsxOTQsNyBAQCBpbmxpbmUgdm9pZCBCcmVha2luZ0NvbnRleHQ6OmluaXRp YWxpemVGb3JDdXJyZW50T2JqZWN0KCkKIHsKICAgICBtX2hhZFVuY29tbWl0dGVkV2lkdGhCZWZv cmVDdXJyZW50ID0gISFtX3dpZHRoLnVuY29tbWl0dGVkV2lkdGgoKTsKIAotICAgIG1fY3VycmVu dFN0eWxlID0gJm1fY3VycmVudC5yZW5kZXJlcigpLT5zdHlsZSgpOworICAgIG1fY3VycmVudFN0 eWxlID0gJm1fY3VycmVudC5yZW5kZXJlcigpLT5zdHlsZSgpOyAvLyBGSVhNRTogU2hvdWxkIHRo aXMgYmUgJmxpbmVTdHlsZSgqbV9jdXJyZW50LnJlbmRlcmVyKCksIG1fbGluZUluZm8pOyA/CiAK ICAgICBBU1NFUlQobV9jdXJyZW50U3R5bGUpOwogCkBAIC00MjQsOCArNDI0LDcgQEAgaW5saW5l IHZvaWQgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVSZXBsYWNlZCgpCiAgICAgLy8gQnJlYWsgb24g cmVwbGFjZWQgZWxlbWVudHMgaWYgZWl0aGVyIGhhcyBub3JtYWwgd2hpdGUtc3BhY2UuCiAgICAg aWYgKChtX2F1dG9XcmFwIHx8IFJlbmRlclN0eWxlOjphdXRvV3JhcChtX2xhc3RXUykpICYmICgh bV9jdXJyZW50LnJlbmRlcmVyKCktPmlzSW1hZ2UoKSB8fCBtX2FsbG93SW1hZ2VzVG9CcmVhaykK ICAgICAgICAgJiYgKCFtX2N1cnJlbnQucmVuZGVyZXIoKS0+aXNSdWJ5UnVuKCkgfHwgZG93bmNh c3Q8UmVuZGVyUnVieVJ1bj4obV9jdXJyZW50LnJlbmRlcmVyKCkpLT5jYW5CcmVha0JlZm9yZSht X3JlbmRlclRleHRJbmZvLm1fbGluZUJyZWFrSXRlcmF0b3IpKSkgewotICAgICAgICBtX3dpZHRo LmNvbW1pdCgpOwotICAgICAgICBtX2xpbmVCcmVhay5tb3ZlVG9TdGFydE9mKG1fY3VycmVudC5y ZW5kZXJlcigpKTsKKyAgICAgICAgY29tbWl0TGluZUJyZWFrQXRDdXJyZW50V2lkdGgoKm1fY3Vy cmVudC5yZW5kZXJlcigpKTsKICAgICB9CiAKICAgICBpZiAobV9pZ25vcmluZ1NwYWNlcykKQEAg LTYxOCw3ICs2MTcsNyBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQo V29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9vbAogICAgICAgICB9CiAgICAg fQogCi0gICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlID0gbGluZVN0eWxlKCpyZW5kZXJUZXh0 LnBhcmVudCgpLCBtX2xpbmVJbmZvKTsKKyAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUgPSBs aW5lU3R5bGUocmVuZGVyVGV4dCwgbV9saW5lSW5mbyk7CiAgICAgY29uc3QgRm9udENhc2NhZGUm IGZvbnQgPSBzdHlsZS5mb250Q2FzY2FkZSgpOwogICAgIGJvb2wgaXNGaXhlZFBpdGNoID0gZm9u dC5pc0ZpeGVkUGl0Y2goKTsKICAgICBib29sIGNhbkh5cGhlbmF0ZSA9IHN0eWxlLmh5cGhlbnMo KSA9PSBIeXBoZW5zQXV0byAmJiBXZWJDb3JlOjpjYW5IeXBoZW5hdGUoc3R5bGUubG9jYWxlKCkp OwpAQCAtODA3LDE2ICs4MDYsMTUgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5k bGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICAgICAg ICAgIGlmIChjID09ICdcbicgJiYgbV9wcmVzZXJ2ZXNOZXdsaW5lKSB7CiAgICAgICAgICAgICAg ICAgaWYgKCFzdG9wcGVkSWdub3JpbmdTcGFjZXMgJiYgbV9jdXJyZW50Lm9mZnNldCgpKQogICAg ICAgICAgICAgICAgICAgICBlbnN1cmVDaGFyYWN0ZXJHZXRzTGluZUJveChtX2xpbmVNaWRwb2lu dFN0YXRlLCBtX2N1cnJlbnQpOwotICAgICAgICAgICAgICAgIG1fbGluZUJyZWFrLm1vdmVUbyht X2N1cnJlbnQucmVuZGVyZXIoKSwgbV9jdXJyZW50Lm9mZnNldCgpLCBtX2N1cnJlbnQubmV4dEJy ZWFrYWJsZVBvc2l0aW9uKCkpOworICAgICAgICAgICAgICAgIGNvbW1pdExpbmVCcmVha0F0Q3Vy cmVudFdpZHRoKCptX2N1cnJlbnQucmVuZGVyZXIoKSwgbV9jdXJyZW50Lm9mZnNldCgpLCBtX2N1 cnJlbnQubmV4dEJyZWFrYWJsZVBvc2l0aW9uKCkpOwogICAgICAgICAgICAgICAgIG1fbGluZUJy ZWFrLmluY3JlbWVudCgpOwogICAgICAgICAgICAgICAgIG1fbGluZUluZm8uc2V0UHJldmlvdXNM aW5lQnJva2VDbGVhbmx5KHRydWUpOwogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAobV9hdXRvV3JhcCAmJiBiZXR3ZWVuV29yZHMp IHsKLSAgICAgICAgICAgICAgICBtX3dpZHRoLmNvbW1pdCgpOworICAgICAgICAgICAgICAgIGNv bW1pdExpbmVCcmVha0F0Q3VycmVudFdpZHRoKCptX2N1cnJlbnQucmVuZGVyZXIoKSwgbV9jdXJy ZW50Lm9mZnNldCgpLCBtX2N1cnJlbnQubmV4dEJyZWFrYWJsZVBvc2l0aW9uKCkpOwogICAgICAg ICAgICAgICAgIHdyYXBXID0gMDsKLSAgICAgICAgICAgICAgICBtX2xpbmVCcmVhay5tb3ZlVG8o bV9jdXJyZW50LnJlbmRlcmVyKCksIG1fY3VycmVudC5vZmZzZXQoKSwgbV9jdXJyZW50Lm5leHRC cmVha2FibGVQb3NpdGlvbigpKTsKICAgICAgICAgICAgICAgICAvLyBBdXRvLXdyYXBwaW5nIHRl eHQgc2hvdWxkIG5vdCB3cmFwIGluIHRoZSBtaWRkbGUgb2YgYSB3b3JkIG9uY2UgaXQgaGFzIGhh ZCBhbgogICAgICAgICAgICAgICAgIC8vIG9wcG9ydHVuaXR5IHRvIGJyZWFrIGFmdGVyIGEgd29y ZC4KICAgICAgICAgICAgICAgICBicmVha1dvcmRzID0gZmFsc2U7CkBAIC0xMDExLDggKzEwMDks NyBAQCBpbmxpbmUgdm9pZCBCcmVha2luZ0NvbnRleHQ6OmNvbW1pdEFuZFVwZGF0ZUxpbmVCcmVh a0lmTmVlZGVkKCkKICAgICBpZiAoIW1fY3VycmVudC5yZW5kZXJlcigpLT5pc0Zsb2F0aW5nT3JP dXRPZkZsb3dQb3NpdGlvbmVkKCkpIHsKICAgICAgICAgbV9sYXN0T2JqZWN0ID0gbV9jdXJyZW50 LnJlbmRlcmVyKCk7CiAgICAgICAgIGlmIChtX2xhc3RPYmplY3QtPmlzUmVwbGFjZWQoKSAmJiBt X2F1dG9XcmFwICYmICFtX2xhc3RPYmplY3QtPmlzUnVieVJ1bigpICYmICghbV9sYXN0T2JqZWN0 LT5pc0ltYWdlKCkgfHwgbV9hbGxvd0ltYWdlc1RvQnJlYWspICYmICghaXM8UmVuZGVyTGlzdE1h cmtlcj4oKm1fbGFzdE9iamVjdCkgfHwgZG93bmNhc3Q8UmVuZGVyTGlzdE1hcmtlcj4oKm1fbGFz dE9iamVjdCkuaXNJbnNpZGUoKSkpIHsKLSAgICAgICAgICAgIG1fd2lkdGguY29tbWl0KCk7Ci0g ICAgICAgICAgICBtX2xpbmVCcmVhay5tb3ZlVG9TdGFydE9mKG1fbmV4dE9iamVjdCk7CisgICAg ICAgICAgICBjb21taXRMaW5lQnJlYWtBdEN1cnJlbnRXaWR0aCgqbV9uZXh0T2JqZWN0KTsKICAg ICAgICAgfQogICAgIH0KIH0KQEAgLTEwNDYsMTMgKzEwNDMsMTMgQEAgaW5saW5lIElubGluZUl0 ZXJhdG9yIEJyZWFraW5nQ29udGV4dDo6aGFuZGxlRW5kT2ZMaW5lKCkKICAgICBpZiAobV9saW5l QnJlYWsgPT0gbV9yZXNvbHZlci5wb3NpdGlvbigpKSB7CiAgICAgICAgIGlmICghbV9saW5lQnJl YWsucmVuZGVyZXIoKSB8fCAhbV9saW5lQnJlYWsucmVuZGVyZXIoKS0+aXNCUigpKSB7CiAgICAg ICAgICAgICAvLyB3ZSBqdXN0IGFkZCBhcyBtdWNoIGFzIHBvc3NpYmxlCi0gICAgICAgICAgICBp ZiAobV9ibG9ja1N0eWxlLndoaXRlU3BhY2UoKSA9PSBQUkUgJiYgIW1fY3VycmVudC5vZmZzZXQo KSkgewotICAgICAgICAgICAgICAgIG1fbGluZUJyZWFrLm1vdmVUbyhtX2xhc3RPYmplY3QsIG1f bGFzdE9iamVjdC0+aXNUZXh0KCkgPyBtX2xhc3RPYmplY3QtPmxlbmd0aCgpIDogMCk7Ci0gICAg ICAgICAgICB9IGVsc2UgaWYgKG1fbGluZUJyZWFrLnJlbmRlcmVyKCkpIHsKKyAgICAgICAgICAg IGlmIChtX2Jsb2NrU3R5bGUud2hpdGVTcGFjZSgpID09IFBSRSAmJiAhbV9jdXJyZW50Lm9mZnNl dCgpKQorICAgICAgICAgICAgICAgIGNvbW1pdExpbmVCcmVha0F0Q3VycmVudFdpZHRoKCptX2xh c3RPYmplY3QsIG1fbGFzdE9iamVjdC0+aXNUZXh0KCkgPyBtX2xhc3RPYmplY3QtPmxlbmd0aCgp IDogMCk7CisgICAgICAgICAgICBlbHNlIGlmIChtX2xpbmVCcmVhay5yZW5kZXJlcigpKSB7CiAg ICAgICAgICAgICAgICAgLy8gRG9uJ3QgZXZlciBicmVhayBpbiB0aGUgbWlkZGxlIG9mIGEgd29y ZCBpZiB3ZSBjYW4gaGVscCBpdC4KICAgICAgICAgICAgICAgICAvLyBUaGVyZSdzIG5vIHJvb20g YXQgYWxsLiBXZSBqdXN0IGhhdmUgdG8gYmUgb24gdGhpcyBsaW5lLAogICAgICAgICAgICAgICAg IC8vIGV2ZW4gdGhvdWdoIHdlJ2xsIHNwaWxsIG91dC4KLSAgICAgICAgICAgICAgICBtX2xpbmVC cmVhay5tb3ZlVG8obV9jdXJyZW50LnJlbmRlcmVyKCksIG1fY3VycmVudC5vZmZzZXQoKSk7Cisg ICAgICAgICAgICAgICAgY29tbWl0TGluZUJyZWFrQXRDdXJyZW50V2lkdGgoKm1fY3VycmVudC5y ZW5kZXJlcigpLCBtX2N1cnJlbnQub2Zmc2V0KCkpOwogICAgICAgICAgICAgfQogICAgICAgICB9 CiAgICAgICAgIC8vIG1ha2Ugc3VyZSB3ZSBjb25zdW1lIGF0IGxlYXN0IG9uZSBjaGFyL29iamVj dC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0xpbmVCcmVha2Vy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0xpbmVCcmVha2VyLmNwcAppbmRl eCBiNjg1N2I2ZjQzN2FkNTI2YTU4NzFhOGY0MDJjNDcyZjBiNzY1ODU4Li45YjJiMzA2YWJlZjAz YWQ5MGQ1YjVmMDI4MzM1MDc1ODhiZjczY2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvbGluZS9MaW5lQnJlYWtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL2xpbmUvTGluZUJyZWFrZXIuY3BwCkBAIC03OSwxMSArNzksNiBAQCB2b2lkIExpbmVCcmVh a2VyOjpza2lwTGVhZGluZ1doaXRlc3BhY2UoSW5saW5lQmlkaVJlc29sdmVyJiByZXNvbHZlciwg TGluZUluZm8mCiAKIElubGluZUl0ZXJhdG9yIExpbmVCcmVha2VyOjpuZXh0TGluZUJyZWFrKElu bGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIExpbmVJbmZvJiBsaW5lSW5mbywgUmVuZGVyVGV4 dEluZm8mIHJlbmRlclRleHRJbmZvLCBGbG9hdGluZ09iamVjdCogbGFzdEZsb2F0RnJvbVByZXZp b3VzTGluZSwgdW5zaWduZWQgY29uc2VjdXRpdmVIeXBoZW5hdGVkTGluZXMsIFdvcmRNZWFzdXJl bWVudHMmIHdvcmRNZWFzdXJlbWVudHMpCiB7Ci0gICAgcmV0dXJuIG5leHRTZWdtZW50QnJlYWso cmVzb2x2ZXIsIGxpbmVJbmZvLCByZW5kZXJUZXh0SW5mbywgbGFzdEZsb2F0RnJvbVByZXZpb3Vz TGluZSwgY29uc2VjdXRpdmVIeXBoZW5hdGVkTGluZXMsIHdvcmRNZWFzdXJlbWVudHMpOwotfQot Ci1JbmxpbmVJdGVyYXRvciBMaW5lQnJlYWtlcjo6bmV4dFNlZ21lbnRCcmVhayhJbmxpbmVCaWRp UmVzb2x2ZXImIHJlc29sdmVyLCBMaW5lSW5mbyYgbGluZUluZm8sIFJlbmRlclRleHRJbmZvJiBy ZW5kZXJUZXh0SW5mbywgRmxvYXRpbmdPYmplY3QqIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUs IHVuc2lnbmVkIGNvbnNlY3V0aXZlSHlwaGVuYXRlZExpbmVzLCBXb3JkTWVhc3VyZW1lbnRzJiB3 b3JkTWVhc3VyZW1lbnRzKQotewogICAgIHJlc2V0KCk7CiAKICAgICBBU1NFUlQocmVzb2x2ZXIu cG9zaXRpb24oKS5yb290KCkgPT0gJm1fYmxvY2spOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL2xpbmUvTGluZUJyZWFrZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9saW5lL0xpbmVCcmVha2VyLmgKaW5kZXggODAyNWUxOWY0ZDQ3ZjY2YWNlYzJjZDczYzI4NDhk ZDg3MzVjMjgwOS4uYWFlMmUyYWQ1MTMyYmE0NjlmZTQyMTU1NzVlMTIwYTAwNDAzOTc4YyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvTGluZUJyZWFrZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5lQnJlYWtlci5oCkBAIC02NCw3ICs2 NCw2IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgdm9pZCByZXNldCgpOwogCi0gICAgSW5saW5l SXRlcmF0b3IgbmV4dFNlZ21lbnRCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImLCBMaW5lSW5mbyYs IFJlbmRlclRleHRJbmZvJiwgRmxvYXRpbmdPYmplY3QqIGxhc3RGbG9hdEZyb21QcmV2aW91c0xp bmUsIHVuc2lnbmVkIGNvbnNlY3V0aXZlSHlwaGVuYXRlZExpbmVzLCBXb3JkTWVhc3VyZW1lbnRz Jik7CiAgICAgdm9pZCBza2lwVHJhaWxpbmdXaGl0ZXNwYWNlKElubGluZUl0ZXJhdG9yJiwgY29u c3QgTGluZUluZm8mKTsKICAgICB2b2lkIHNraXBMZWFkaW5nV2hpdGVzcGFjZShJbmxpbmVCaWRp UmVzb2x2ZXImLCBMaW5lSW5mbyYsIEZsb2F0aW5nT2JqZWN0KiBsYXN0RmxvYXRGcm9tUHJldmlv dXNMaW5lLCBMaW5lV2lkdGgmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL2xpbmUvTGluZUlubGluZUhlYWRlcnMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9s aW5lL0xpbmVJbmxpbmVIZWFkZXJzLmgKaW5kZXggOGNiYjMwNDY1MDdkZWEyMmNmNmNhNjhlYzEw ODhjZmMyMjcwNWQ1Yi4uNWZjZTE1MTgxZjhjMjVjMGFhZTEzNTQ0ZDJiYTUzNjUyZDZjODc3NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvTGluZUlubGluZUhlYWRl cnMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5lSW5saW5lSGVhZGVy cy5oCkBAIC00Myw3ICs0Myw3IEBAIGlubGluZSBib29sIGhhc0lubGluZURpcmVjdGlvbkJvcmRl cnNQYWRkaW5nT3JNYXJnaW4oY29uc3QgUmVuZGVySW5saW5lJiBmbG93KQogICAgIHJldHVybiBz aG91bGRBcHBseUVuZEJvcmRlclBhZGRpbmdPck1hcmdpbiAmJiAoZmxvdy5ib3JkZXJFbmQoKSB8 fCBmbG93Lm1hcmdpbkVuZCgpIHx8IGZsb3cucGFkZGluZ0VuZCgpKTsKIH0KIAotaW5saW5lIGNv bnN0IFJlbmRlclN0eWxlJiBsaW5lU3R5bGUoY29uc3QgUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIs IGNvbnN0IExpbmVJbmZvJiBsaW5lSW5mbykKK2lubGluZSBjb25zdCBSZW5kZXJTdHlsZSYgbGlu ZVN0eWxlKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIsIGNvbnN0IExpbmVJbmZvJiBsaW5l SW5mbykKIHsKICAgICByZXR1cm4gbGluZUluZm8uaXNGaXJzdExpbmUoKSA/IHJlbmRlcmVyLmZp cnN0TGluZVN0eWxlKCkgOiByZW5kZXJlci5zdHlsZSgpOwogfQo=