159503 2016-07-06 19:30:50 -0700 Document.title setter does not work for SVG documents 2016-07-06 22:56:14 -0700 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar, WebExposed P2 Normal --- 1 cdumez cdumez cdumez darin rniwa sabouhallawa webkit-bug-importer oldest_to_newest 1208502 0 cdumez 2016-07-06 19:30:50 -0700 Document.title setter does not work for SVG documents: https://html.spec.whatwg.org/multipage/dom.html#document.title It works in Firefox and Chrome. Test case: http://w3c-test.org/html/dom/documents/dom-tree-accessors/document.title-09.html 1208503 1 webkit-bug-importer 2016-07-06 19:31:22 -0700 <rdar://problem/27212313> 1208511 2 282983 cdumez 2016-07-06 20:11:46 -0700 Created attachment 282983 Patch 1208527 3 282983 rniwa 2016-07-06 20:58:10 -0700 Comment on attachment 282983 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=282983&action=review > Source/WebCore/dom/Document.cpp:1660 > + if (is<SVGSVGElement>(documentElement())) > + m_titleElement = childrenOfType<SVGTitleElement>(*documentElement()).first(); > + else { > + if (m_titleElement) { > + if (isHTMLDocument() || isXHTMLDocument()) > + m_titleElement = descendantsOfType<HTMLTitleElement>(*this).first(); > + } else > + m_titleElement = newTitleElement; > + } Why don't we fix SVGTitleElement::insertedInto and SVGTitleElement::removedFrom so that we can use the same code path for SVG and HTML documents? We already have code to call titleElementAdded/titleElementRemoved so we just need to check that its parent is the document element of the SVG document. > Source/WebCore/svg/SVGTitleElement.cpp:77 > + // which causes SVGTitleElement::childrenChanged(), which ends up Document::setTitle(). ends up *calling* Document::setTitle() or *invoking* 1208548 4 282983 cdumez 2016-07-06 22:52:30 -0700 Comment on attachment 282983 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=282983&action=review >> Source/WebCore/dom/Document.cpp:1660 >> + } > > Why don't we fix SVGTitleElement::insertedInto and SVGTitleElement::removedFrom so that we can use the same code path for SVG and HTML documents? > We already have code to call titleElementAdded/titleElementRemoved so we just need to check that its parent is the document element of the SVG document. Sadly, this is not that easy. I tried to do what you suggest but I cannot get all the tests to pass. Here one issue: - When adding a HTMLTitleElement to a SVGDocument's whose document element is a SVGSVGElement, we would expect this title to be ignored. However, if we move the is<SVGSVGElement>(documentElement()) from Document::updateTitleElement() to SVGTitleElement::insertedInto(), it no longer gets ignored. We could add a !is<SVGSVGElement>(documentElement()) check to HTMLTitleElement::insertedInto() but this would be uglier IMHO. Note that I also tried adding a (isHTMLDocument() || isXHTMLDocument()) check to HTMLTitleElement::insertedInto() but this caused another test to fail because the HTMLTitleElement should not get ignored if added to a SVGDocument whose document element is not a SVGSVGElement. Anyway, I suggest landing the patch as is for now. We can think if there is a better way to factor this later as it does not seem trivial. 1208549 5 282991 cdumez 2016-07-06 22:54:06 -0700 Created attachment 282991 Patch 1208550 6 282991 cdumez 2016-07-06 22:56:08 -0700 Comment on attachment 282991 Patch Clearing flags on attachment: 282991 Committed r202895: <http://trac.webkit.org/changeset/202895> 1208551 7 cdumez 2016-07-06 22:56:14 -0700 All reviewed patches have been landed. Closing bug. 282983 2016-07-06 20:11:46 -0700 2016-07-06 22:54:03 -0700 Patch bug-159503-20160706201113.patch text/plain 9595 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyODg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGVjODI2Y2U5NGE4YzYw YWI5NjkwYjFkOGY1MWNiMDlkYmZiMDljZC4uYzczZjJhOGQxY2M2NmQ1NTUxN2M3NTdjYzJjOTE3 NGFhNDFlZTU4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQxIEBACiAyMDE2LTA3LTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRG9jdW1lbnQudGl0bGUgc2V0 dGVyIGRvZXMgbm90IHdvcmsgZm9yIFNWRyBkb2N1bWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTUwMworICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMjcyMTIzMTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRG9jdW1lbnQudGl0bGUgc2V0dGVyIHNob3VsZCB3b3JrIGZvciBTVkcgZG9jdW1lbnRz OgorICAgICAgICAtIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlwYWdlL2RvbS5o dG1sI2RvY3VtZW50LnRpdGxlCisKKyAgICAgICAgVGhpcyBwYXRjaCBhbGlnbnMgb3VyIGJlaGF2 aW9yIHdpdGggdGhlIHNwZWNpZmljYXRpb24KKyAgICAgICAgYW5kIHdpdGggRmlyZWZveCAvIENo cm9tZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHJlYmFzZWxpbmVkIGV4aXN0aW5nIHRlc3Qu CisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnQ6OnNldFRpdGxlKToKKyAgICAgICAgLSBSZXZlcnNlIHRoZSBpZiBjb25kaXRpb25zIGZvciBj bGFyaXR5LgorICAgICAgICAtIElmIHRoZSBkb2N1bWVudCBlbGVtZW50IGlzIGFuIFNWRyBzdmcg ZWxlbWVudCwgY3JlYXRlIGEKKyAgICAgICAgICBTVkdUaXRsZUVsZW1lbnQgYW5kIGluc2VydCBp dCBhcyBmaXJzdCBjaGlsZCBvZiB0aGUKKyAgICAgICAgICBkb2N1bWVudCBlbGVtZW50LgorICAg ICAgICAtIENhbGwgU1ZHVGl0bGVFbGVtZW50OjpzZXRUZXh0KCkgaW5zdGVhZCBvZgorICAgICAg ICAgIEhUTUxUaXRsZUVsZW1lbnQ6OnNldFRleHQoKSBhdCB0aGUgZW5kIG9mIHRoZSBtZXRob2Qg aWYKKyAgICAgICAgICBtX3RpdGxlRWxlbWVudCBpcyBhIFNWR1RpdGxlRWxlbWVudC4KKworICAg ICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnVwZGF0ZVRpdGxlRWxlbWVudCk6CisgICAgICAgIC0g SWYgZG9jdW1lbnQgZWxlbWVudCBpcyBhbiBTVkcgc3ZnIGVsZW1lbnQsIHVzZSB0aGUgZmlyc3QK KyAgICAgICAgICBjaGlsZCBvZiB0aGUgZG9jdW1lbnQgZWxlbWVudCB0aGF0IGlzIGEgU1ZHVGl0 bGVFbGVtZW50LgorCisgICAgICAgICogc3ZnL1NWR1RpdGxlRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTVkdUaXRsZUVsZW1lbnQ6OnNldFRleHQpOgorICAgICAgICAqIHN2Zy9TVkdU aXRsZUVsZW1lbnQuaDoKKyAgICAgICAgQWRkIFNWR1RpdGxlRWxlbWVudDo6c2V0VGV4dCgpIG1l dGhvZCB0aGF0IGRvZXMgdGhlIHNhbWUKKyAgICAgICAgdGhpbmcgYXMgSFRNTFRpdGxlRWxlbWVu dDo6c2V0VGV4dCgpLgorCisyMDE2LTA3LTA2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CisKICAgICAgICAgW1dLMl1bQ29jb2FdIERpc2FibGUgUmVzb3VyY2VSZXNwb25zZSBsYXp5 IGluaXRpYWxpemF0aW9uCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTk0OTcKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI3MjA5MDY2PgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKaW5kZXggMTg5MTUwMDc1YmM1MzU3NmVhZWI4MTY2MzE1NjRlMWZhZWMw OGVkNi4uYTAyZDRhYWJjMmY2OTAyN2E5NjMzNGMwMDcxMzQ5YjFlYmZlODk1ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwCkBAIC0zLDcgKzMsNyBAQAogICogICAgICAgICAgIChDKSAxOTk5IEFu dHRpIEtvaXZpc3RvIChrb2l2aXN0b0BrZGUub3JnKQogICogICAgICAgICAgIChDKSAyMDAxIERp cmsgTXVlbGxlciAobXVlbGxlckBrZGUub3JnKQogICogICAgICAgICAgIChDKSAyMDA2IEFsZXhl eSBQcm9za3VyeWFrb3YgKGFwQHdlYmtpdC5vcmcpCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDQtMjAx NSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDQt MjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIw MDgsIDIwMDkgVG9yY2ggTW9iaWxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4gKGh0dHA6Ly93 d3cudG9yY2htb2JpbGUuY29tLykKICAqIENvcHlyaWdodCAoQykgMjAwOCwgMjAwOSwgMjAxMSwg MjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAy MDEwIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKQpAQCAtMTQ2 LDYgKzE0Niw3IEBACiAjaW5jbHVkZSAiU1ZHRWxlbWVudC5oIgogI2luY2x1ZGUgIlNWR0VsZW1l bnRGYWN0b3J5LmgiCiAjaW5jbHVkZSAiU1ZHTmFtZXMuaCIKKyNpbmNsdWRlICJTVkdTVkdFbGVt ZW50LmgiCiAjaW5jbHVkZSAiU1ZHVGl0bGVFbGVtZW50LmgiCiAjaW5jbHVkZSAiU1ZHWm9vbUV2 ZW50LmgiCiAjaW5jbHVkZSAiU2NoZW1lUmVnaXN0cnkuaCIKQEAgLTE2MjAsMzMgKzE2MjEsNDMg QEAgdm9pZCBEb2N1bWVudDo6dXBkYXRlVGl0bGVGcm9tVGl0bGVFbGVtZW50KCkKIAogdm9pZCBE b2N1bWVudDo6c2V0VGl0bGUoY29uc3QgU3RyaW5nJiB0aXRsZSkKIHsKLSAgICBpZiAoIWlzSFRN TERvY3VtZW50KCkgJiYgIWlzWEhUTUxEb2N1bWVudCgpKQorICAgIGlmICghbV90aXRsZUVsZW1l bnQpIHsKKyAgICAgICAgaWYgKGlzSFRNTERvY3VtZW50KCkgfHwgaXNYSFRNTERvY3VtZW50KCkp IHsKKyAgICAgICAgICAgIGF1dG8qIGhlYWRFbGVtZW50ID0gaGVhZCgpOworICAgICAgICAgICAg aWYgKCFoZWFkRWxlbWVudCkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBt X3RpdGxlRWxlbWVudCA9IEhUTUxUaXRsZUVsZW1lbnQ6OmNyZWF0ZShIVE1MTmFtZXM6OnRpdGxl VGFnLCAqdGhpcyk7CisgICAgICAgICAgICBoZWFkRWxlbWVudC0+YXBwZW5kQ2hpbGQoKm1fdGl0 bGVFbGVtZW50KTsKKyAgICAgICAgfSBlbHNlIGlmIChpc1NWR0RvY3VtZW50KCkpIHsKKyAgICAg ICAgICAgIGF1dG8qIGVsZW1lbnQgPSBkb2N1bWVudEVsZW1lbnQoKTsKKyAgICAgICAgICAgIGlm ICghaXM8U1ZHU1ZHRWxlbWVudD4oZWxlbWVudCkpCisgICAgICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICAgICAgbV90aXRsZUVsZW1lbnQgPSBTVkdUaXRsZUVsZW1lbnQ6OmNyZWF0ZShTVkdO YW1lczo6dGl0bGVUYWcsICp0aGlzKTsKKyAgICAgICAgICAgIGVsZW1lbnQtPmluc2VydEJlZm9y ZSgqbV90aXRsZUVsZW1lbnQsIGVsZW1lbnQtPmZpcnN0Q2hpbGQoKSk7CisgICAgICAgIH0KKyAg ICB9IGVsc2UgaWYgKCFpc0hUTUxEb2N1bWVudCgpICYmICFpc1hIVE1MRG9jdW1lbnQoKSAmJiAh aXNTVkdEb2N1bWVudCgpKQogICAgICAgICBtX3RpdGxlRWxlbWVudCA9IG51bGxwdHI7Ci0gICAg ZWxzZSBpZiAoIW1fdGl0bGVFbGVtZW50KSB7Ci0gICAgICAgIGF1dG8qIGhlYWRFbGVtZW50ID0g aGVhZCgpOwotICAgICAgICBpZiAoIWhlYWRFbGVtZW50KQotICAgICAgICAgICAgcmV0dXJuOwot ICAgICAgICBtX3RpdGxlRWxlbWVudCA9IGNyZWF0ZUVsZW1lbnQodGl0bGVUYWcsIGZhbHNlKTsK LSAgICAgICAgaGVhZEVsZW1lbnQtPmFwcGVuZENoaWxkKCptX3RpdGxlRWxlbWVudCwgQVNTRVJU X05PX0VYQ0VQVElPTik7Ci0gICAgfQogCiAgICAgLy8gVGhlIERPTSBBUEkgaGFzIG5vIG1ldGhv ZCBvZiBzcGVjaWZ5aW5nIGRpcmVjdGlvbiwgc28gYXNzdW1lIExUUi4KICAgICB1cGRhdGVUaXRs ZShTdHJpbmdXaXRoRGlyZWN0aW9uKHRpdGxlLCBMVFIpKTsKIAogICAgIGlmIChpczxIVE1MVGl0 bGVFbGVtZW50PihtX3RpdGxlRWxlbWVudC5nZXQoKSkpCiAgICAgICAgIGRvd25jYXN0PEhUTUxU aXRsZUVsZW1lbnQ+KCptX3RpdGxlRWxlbWVudCkuc2V0VGV4dCh0aXRsZSk7CisgICAgZWxzZSBp ZiAoaXM8U1ZHVGl0bGVFbGVtZW50PihtX3RpdGxlRWxlbWVudC5nZXQoKSkpCisgICAgICAgIGRv d25jYXN0PFNWR1RpdGxlRWxlbWVudD4oKm1fdGl0bGVFbGVtZW50KS5zZXRUZXh0KHRpdGxlKTsK IH0KIAogdm9pZCBEb2N1bWVudDo6dXBkYXRlVGl0bGVFbGVtZW50KEVsZW1lbnQqIG5ld1RpdGxl RWxlbWVudCkKIHsKLSAgICAvLyBPbmx5IGFsbG93IHRoZSBmaXJzdCB0aXRsZSBlbGVtZW50IGlu IHRyZWUgb3JkZXIgdG8gY2hhbmdlIHRoZSB0aXRsZSAtLSBvdGhlcnMgaGF2ZSBubyBlZmZlY3Qu Ci0gICAgaWYgKG1fdGl0bGVFbGVtZW50KSB7Ci0gICAgICAgIGlmIChpc0hUTUxEb2N1bWVudCgp IHx8IGlzWEhUTUxEb2N1bWVudCgpKQotICAgICAgICAgICAgbV90aXRsZUVsZW1lbnQgPSBkZXNj ZW5kYW50c09mVHlwZTxIVE1MVGl0bGVFbGVtZW50PigqdGhpcykuZmlyc3QoKTsKLSAgICAgICAg ZWxzZSBpZiAoaXNTVkdEb2N1bWVudCgpKQotICAgICAgICAgICAgbV90aXRsZUVsZW1lbnQgPSBk ZXNjZW5kYW50c09mVHlwZTxTVkdUaXRsZUVsZW1lbnQ+KCp0aGlzKS5maXJzdCgpOwotICAgIH0g ZWxzZQotICAgICAgICBtX3RpdGxlRWxlbWVudCA9IG5ld1RpdGxlRWxlbWVudDsKKyAgICBpZiAo aXM8U1ZHU1ZHRWxlbWVudD4oZG9jdW1lbnRFbGVtZW50KCkpKQorICAgICAgICBtX3RpdGxlRWxl bWVudCA9IGNoaWxkcmVuT2ZUeXBlPFNWR1RpdGxlRWxlbWVudD4oKmRvY3VtZW50RWxlbWVudCgp KS5maXJzdCgpOworICAgIGVsc2UgeworICAgICAgICBpZiAobV90aXRsZUVsZW1lbnQpIHsKKyAg ICAgICAgICAgIGlmIChpc0hUTUxEb2N1bWVudCgpIHx8IGlzWEhUTUxEb2N1bWVudCgpKQorICAg ICAgICAgICAgICAgIG1fdGl0bGVFbGVtZW50ID0gZGVzY2VuZGFudHNPZlR5cGU8SFRNTFRpdGxl RWxlbWVudD4oKnRoaXMpLmZpcnN0KCk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgbV90 aXRsZUVsZW1lbnQgPSBuZXdUaXRsZUVsZW1lbnQ7CisgICAgfQogCiAgICAgdXBkYXRlVGl0bGVG cm9tVGl0bGVFbGVtZW50KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZH VGl0bGVFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdUaXRsZUVsZW1lbnQuY3Bw CmluZGV4IDgyZDdkY2UxZjhmNWE5ZWRjYjNlMTAyZWQ0M2ZmNTU0ZjA5Y2M5NjcuLmVlMmI1ZjMx ODBlYWNmYmNmOTE2MWRkNjU0MjhhMWExM2NmNjIxZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3N2Zy9TVkdUaXRsZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdU aXRsZUVsZW1lbnQuY3BwCkBAIC0xLDYgKzEsNyBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAw NCwgMjAwNSBOaWtvbGFzIFppbW1lcm1hbm4gPHppbW1lcm1hbm5Aa2RlLm9yZz4KICAqIENvcHly aWdodCAoQykgMjAwNCwgMjAwNSwgMjAwNiBSb2IgQnVpcyA8YnVpc0BrZGUub3JnPgorICogQ29w eXJpZ2h0IChDKSAyMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBU aGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5k L29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5l cmFsIFB1YmxpYwpAQCAtMjMsNiArMjQsNyBAQAogCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNp bmNsdWRlICJTVkdOYW1lcy5oIgorI2luY2x1ZGUgIlRleHQuaCIKIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCkBAIC02MSw0ICs2MywyNSBAQCB2b2lkIFNWR1RpdGxlRWxlbWVudDo6Y2hpbGRyZW5D aGFuZ2VkKGNvbnN0IENoaWxkQ2hhbmdlJiBjaGFuZ2UpCiAgICAgZG9jdW1lbnQoKS50aXRsZUVs ZW1lbnRUZXh0Q2hhbmdlZCgqdGhpcyk7CiB9CiAKK3ZvaWQgU1ZHVGl0bGVFbGVtZW50OjpzZXRU ZXh0KGNvbnN0IFN0cmluZyYgdmFsdWUpCit7CisgICAgUmVmPFNWR1RpdGxlRWxlbWVudD4gcHJv dGVjdGVkVGhpcygqdGhpcyk7CisKKyAgICBpZiAoIXZhbHVlLmlzRW1wdHkoKSAmJiBoYXNPbmVD aGlsZCgpICYmIGlzPFRleHQ+KCpmaXJzdENoaWxkKCkpKSB7CisgICAgICAgIGRvd25jYXN0PFRl eHQ+KCpmaXJzdENoaWxkKCkpLnNldERhdGEodmFsdWUpOworICAgICAgICByZXR1cm47CisgICAg fQorCisgICAgLy8gV2UgbWFrZSBhIGNvcHkgaGVyZSBiZWNhdXNlIGVudGl0eSBvZiAidmFsdWUi IGFyZ3VtZW50IGNhbiBiZSBEb2N1bWVudDo6bV90aXRsZSwKKyAgICAvLyB3aGljaCBnb2VzIGVt cHR5IGR1cmluZyByZW1vdmVDaGlsZHJlbigpIGludm9jYXRpb24gYmVsb3csCisgICAgLy8gd2hp Y2ggY2F1c2VzIFNWR1RpdGxlRWxlbWVudDo6Y2hpbGRyZW5DaGFuZ2VkKCksIHdoaWNoIGVuZHMg dXAgRG9jdW1lbnQ6OnNldFRpdGxlKCkuCisgICAgU3RyaW5nIHZhbHVlQ29weSh2YWx1ZSk7CisK KyAgICBpZiAoaGFzQ2hpbGROb2RlcygpKQorICAgICAgICByZW1vdmVDaGlsZHJlbigpOworCisg ICAgaWYgKCF2YWx1ZUNvcHkuaXNFbXB0eSgpKQorICAgICAgICBhcHBlbmRDaGlsZChkb2N1bWVu dCgpLmNyZWF0ZVRleHROb2RlKHZhbHVlQ29weSksIElHTk9SRV9FWENFUFRJT04pOworfQorCiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVGl0bGVFbGVtZW50LmggYi9Tb3Vy Y2UvV2ViQ29yZS9zdmcvU1ZHVGl0bGVFbGVtZW50LmgKaW5kZXggZjYxNmEzZThkNmMwYTEwNmUx NDFjOWU0OWFhNzQ2YTdjZGUwNzA1MS4uOTc2N2FiNzE4NzY5ZTY4YzE2ZjkyMzM4YjE2ODllOWJi YzY2OGZiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RpdGxlRWxlbWVudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdUaXRsZUVsZW1lbnQuaApAQCAtMzAsNiArMzAs OCBAQCBjbGFzcyBTVkdUaXRsZUVsZW1lbnQgZmluYWwgOiBwdWJsaWMgU1ZHRWxlbWVudCB7CiBw dWJsaWM6CiAgICAgc3RhdGljIFJlZjxTVkdUaXRsZUVsZW1lbnQ+IGNyZWF0ZShjb25zdCBRdWFs aWZpZWROYW1lJiwgRG9jdW1lbnQmKTsKIAorICAgIHZvaWQgc2V0VGV4dChjb25zdCBTdHJpbmcm KTsKKwogcHJpdmF0ZToKICAgICBTVkdUaXRsZUVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYs IERvY3VtZW50Jik7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDY4NWYyZTY1 ZWQ5NDllZmY1Y2Y5ZTZhYjUyMzNlMjA4OWMzNjkyZGYuLjQ5YzI1YzlmNjc3YmU0NGJkZWZmYmJm MmQzMzQzMTFhNDM1Y2RkOTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSw1 ICsxLDE3IEBACiAyMDE2LTA3LTA2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK KyAgICAgICAgRG9jdW1lbnQudGl0bGUgc2V0dGVyIGRvZXMgbm90IHdvcmsgZm9yIFNWRyBkb2N1 bWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 OTUwMworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjcyMTIzMTM+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmViYXNlbGluZSBXM0MgdGVzdCBub3cg dGhhdCBhbGwgY2hlY2tzIGFyZSBwYXNzaW5nLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRl c3RzL2h0bWwvZG9tL2RvY3VtZW50cy9kb20tdHJlZS1hY2Nlc3NvcnMvZG9jdW1lbnQudGl0bGUt MDktZXhwZWN0ZWQudHh0OgorCisyMDE2LTA3LTA2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CisKICAgICAgICAgRG9jdW1lbnQuYm9keSBzaG91bGQgcmV0dXJuIHRoZSBmaXJzdCBj aGlsZCBvZiB0aGUgaHRtbCBlbGVtZW50IHRoYXQgaXMgZWl0aGVyIGEgYm9keSAvIGZyYW1lc2V0 IGVsZW1lbnQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1OTQ4OAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2h0bWwvZG9tL2RvY3VtZW50cy9kb20tdHJlZS1hY2Nlc3NvcnMvZG9jdW1lbnQu dGl0bGUtMDktZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9odG1sL2RvbS9kb2N1bWVudHMvZG9tLXRyZWUtYWNjZXNzb3JzL2RvY3VtZW50 LnRpdGxlLTA5LWV4cGVjdGVkLnR4dAppbmRleCA4ZjRhNGM3OTcyOTJiMDBkZTAwZmNlZDJlMTZh ZjMyMjQ1ZWYxYzdmLi5jNmUyZDJmOWQxOGNhOTJhMjQ2MmI3ZTFiYmVhN2M5Y2Q0MDNhMmMyIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0 bWwvZG9tL2RvY3VtZW50cy9kb20tdHJlZS1hY2Nlc3NvcnMvZG9jdW1lbnQudGl0bGUtMDktZXhw ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvaHRtbC9kb20vZG9jdW1lbnRzL2RvbS10cmVlLWFjY2Vzc29ycy9kb2N1bWVudC50aXRsZS0w OS1leHBlY3RlZC50eHQKQEAgLTEsNyArMSw3IEBACiAKLUZBSUwgTm8gdGl0bGUgZWxlbWVudCBp biBTVkcgZG9jdW1lbnQgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgInRpdGxlIiBidXQgZ290ICJ4 LWNoaWxkIgotRkFJTCBUaXRsZSBlbGVtZW50IGluIFNWRyBkb2N1bWVudCBhc3NlcnRfZXF1YWxz OiBleHBlY3RlZCAiZm9vYmFyIiBidXQgZ290ICJmb28iCi1GQUlMIFRpdGxlIGVsZW1lbnQgbm90 IGNoaWxkIG9mIFNWRyByb290IGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICIiIGJ1dCBnb3QgImZv byIKLUZBSUwgVGl0bGUgZWxlbWVudCBub3QgaW4gU1ZHIG5hbWVzcGFjZSBhc3NlcnRfZXF1YWxz OiBleHBlY3RlZCAiIiBidXQgZ290ICJmb28iCi1GQUlMIFJvb3QgZWxlbWVudCBub3QgbmFtZWQg InN2ZyIgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIiIgYnV0IGdvdCAiZm9vIgorUEFTUyBObyB0 aXRsZSBlbGVtZW50IGluIFNWRyBkb2N1bWVudCAKK1BBU1MgVGl0bGUgZWxlbWVudCBpbiBTVkcg ZG9jdW1lbnQgCitQQVNTIFRpdGxlIGVsZW1lbnQgbm90IGNoaWxkIG9mIFNWRyByb290IAorUEFT UyBUaXRsZSBlbGVtZW50IG5vdCBpbiBTVkcgbmFtZXNwYWNlIAorUEFTUyBSb290IGVsZW1lbnQg bm90IG5hbWVkICJzdmciIAogCg== 282991 2016-07-06 22:54:06 -0700 2016-07-06 22:56:08 -0700 Patch bug-159503-20160706225334.patch text/plain 10370 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyODg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGVjODI2Y2U5NGE4YzYw YWI5NjkwYjFkOGY1MWNiMDlkYmZiMDljZC4uZjA0ZWUyY2Y4OTNlOWEyODk0OTAzZjg3NzA5YWFj YWUxZDc1YjU4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQxIEBACiAyMDE2LTA3LTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRG9jdW1lbnQudGl0bGUgc2V0 dGVyIGRvZXMgbm90IHdvcmsgZm9yIFNWRyBkb2N1bWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTUwMworICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMjcyMTIzMTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAg ICAgIERvY3VtZW50LnRpdGxlIHNldHRlciBzaG91bGQgd29yayBmb3IgU1ZHIGRvY3VtZW50czoK KyAgICAgICAgLSBodHRwczovL2h0bWwuc3BlYy53aGF0d2cub3JnL211bHRpcGFnZS9kb20uaHRt bCNkb2N1bWVudC50aXRsZQorCisgICAgICAgIFRoaXMgcGF0Y2ggYWxpZ25zIG91ciBiZWhhdmlv ciB3aXRoIHRoZSBzcGVjaWZpY2F0aW9uCisgICAgICAgIGFuZCB3aXRoIEZpcmVmb3ggLyBDaHJv bWUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCByZWJhc2VsaW5lZCBleGlzdGluZyB0ZXN0Lgor CisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50 OjpzZXRUaXRsZSk6CisgICAgICAgIC0gUmV2ZXJzZSB0aGUgaWYgY29uZGl0aW9ucyBmb3IgY2xh cml0eS4KKyAgICAgICAgLSBJZiB0aGUgZG9jdW1lbnQgZWxlbWVudCBpcyBhbiBTVkcgc3ZnIGVs ZW1lbnQsIGNyZWF0ZSBhCisgICAgICAgICAgU1ZHVGl0bGVFbGVtZW50IGFuZCBpbnNlcnQgaXQg YXMgZmlyc3QgY2hpbGQgb2YgdGhlCisgICAgICAgICAgZG9jdW1lbnQgZWxlbWVudC4KKyAgICAg ICAgLSBDYWxsIFNWR1RpdGxlRWxlbWVudDo6c2V0VGV4dCgpIGluc3RlYWQgb2YKKyAgICAgICAg ICBIVE1MVGl0bGVFbGVtZW50OjpzZXRUZXh0KCkgYXQgdGhlIGVuZCBvZiB0aGUgbWV0aG9kIGlm CisgICAgICAgICAgbV90aXRsZUVsZW1lbnQgaXMgYSBTVkdUaXRsZUVsZW1lbnQuCisKKyAgICAg ICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVUaXRsZUVsZW1lbnQpOgorICAgICAgICAtIElm IGRvY3VtZW50IGVsZW1lbnQgaXMgYW4gU1ZHIHN2ZyBlbGVtZW50LCB1c2UgdGhlIGZpcnN0Cisg ICAgICAgICAgY2hpbGQgb2YgdGhlIGRvY3VtZW50IGVsZW1lbnQgdGhhdCBpcyBhIFNWR1RpdGxl RWxlbWVudC4KKworICAgICAgICAqIHN2Zy9TVkdUaXRsZUVsZW1lbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U1ZHVGl0bGVFbGVtZW50OjpzZXRUZXh0KToKKyAgICAgICAgKiBzdmcvU1ZHVGl0 bGVFbGVtZW50Lmg6CisgICAgICAgIEFkZCBTVkdUaXRsZUVsZW1lbnQ6OnNldFRleHQoKSBtZXRo b2QgdGhhdCBkb2VzIHRoZSBzYW1lCisgICAgICAgIHRoaW5nIGFzIEhUTUxUaXRsZUVsZW1lbnQ6 OnNldFRleHQoKS4KKworMjAxNi0wNy0wNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgorCiAgICAgICAgIFtXSzJdW0NvY29hXSBEaXNhYmxlIFJlc291cmNlUmVzcG9uc2UgbGF6eSBp bml0aWFsaXphdGlvbgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTU5NDk3CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNzIwOTA2Nj4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwCmluZGV4IDE4OTE1MDA3NWJjNTM1NzZlYWViODE2NjMxNTY0ZTFmYWVjMDhl ZDYuLmEwMmQ0YWFiYzJmNjkwMjdhOTYzMzRjMDA3MTM0OWIxZWJmZTg5NWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcApAQCAtMyw3ICszLDcgQEAKICAqICAgICAgICAgICAoQykgMTk5OSBBbnR0 aSBLb2l2aXN0byAoa29pdmlzdG9Aa2RlLm9yZykKICAqICAgICAgICAgICAoQykgMjAwMSBEaXJr IE11ZWxsZXIgKG11ZWxsZXJAa2RlLm9yZykKICAqICAgICAgICAgICAoQykgMjAwNiBBbGV4ZXkg UHJvc2t1cnlha292IChhcEB3ZWJraXQub3JnKQotICogQ29weXJpZ2h0IChDKSAyMDA0LTIwMTUg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA0LTIw MTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA4 LCAyMDA5IFRvcmNoIE1vYmlsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIChodHRwOi8vd3d3 LnRvcmNobW9iaWxlLmNvbS8pCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDgsIDIwMDksIDIwMTEsIDIw MTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAx MCBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykKQEAgLTE0Niw2 ICsxNDYsNyBAQAogI2luY2x1ZGUgIlNWR0VsZW1lbnQuaCIKICNpbmNsdWRlICJTVkdFbGVtZW50 RmFjdG9yeS5oIgogI2luY2x1ZGUgIlNWR05hbWVzLmgiCisjaW5jbHVkZSAiU1ZHU1ZHRWxlbWVu dC5oIgogI2luY2x1ZGUgIlNWR1RpdGxlRWxlbWVudC5oIgogI2luY2x1ZGUgIlNWR1pvb21FdmVu dC5oIgogI2luY2x1ZGUgIlNjaGVtZVJlZ2lzdHJ5LmgiCkBAIC0xNjIwLDMzICsxNjIxLDQzIEBA IHZvaWQgRG9jdW1lbnQ6OnVwZGF0ZVRpdGxlRnJvbVRpdGxlRWxlbWVudCgpCiAKIHZvaWQgRG9j dW1lbnQ6OnNldFRpdGxlKGNvbnN0IFN0cmluZyYgdGl0bGUpCiB7Ci0gICAgaWYgKCFpc0hUTUxE b2N1bWVudCgpICYmICFpc1hIVE1MRG9jdW1lbnQoKSkKKyAgICBpZiAoIW1fdGl0bGVFbGVtZW50 KSB7CisgICAgICAgIGlmIChpc0hUTUxEb2N1bWVudCgpIHx8IGlzWEhUTUxEb2N1bWVudCgpKSB7 CisgICAgICAgICAgICBhdXRvKiBoZWFkRWxlbWVudCA9IGhlYWQoKTsKKyAgICAgICAgICAgIGlm ICghaGVhZEVsZW1lbnQpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgbV90 aXRsZUVsZW1lbnQgPSBIVE1MVGl0bGVFbGVtZW50OjpjcmVhdGUoSFRNTE5hbWVzOjp0aXRsZVRh ZywgKnRoaXMpOworICAgICAgICAgICAgaGVhZEVsZW1lbnQtPmFwcGVuZENoaWxkKCptX3RpdGxl RWxlbWVudCk7CisgICAgICAgIH0gZWxzZSBpZiAoaXNTVkdEb2N1bWVudCgpKSB7CisgICAgICAg ICAgICBhdXRvKiBlbGVtZW50ID0gZG9jdW1lbnRFbGVtZW50KCk7CisgICAgICAgICAgICBpZiAo IWlzPFNWR1NWR0VsZW1lbnQ+KGVsZW1lbnQpKQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgICAgIG1fdGl0bGVFbGVtZW50ID0gU1ZHVGl0bGVFbGVtZW50OjpjcmVhdGUoU1ZHTmFt ZXM6OnRpdGxlVGFnLCAqdGhpcyk7CisgICAgICAgICAgICBlbGVtZW50LT5pbnNlcnRCZWZvcmUo Km1fdGl0bGVFbGVtZW50LCBlbGVtZW50LT5maXJzdENoaWxkKCkpOworICAgICAgICB9CisgICAg fSBlbHNlIGlmICghaXNIVE1MRG9jdW1lbnQoKSAmJiAhaXNYSFRNTERvY3VtZW50KCkgJiYgIWlz U1ZHRG9jdW1lbnQoKSkKICAgICAgICAgbV90aXRsZUVsZW1lbnQgPSBudWxscHRyOwotICAgIGVs c2UgaWYgKCFtX3RpdGxlRWxlbWVudCkgewotICAgICAgICBhdXRvKiBoZWFkRWxlbWVudCA9IGhl YWQoKTsKLSAgICAgICAgaWYgKCFoZWFkRWxlbWVudCkKLSAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgbV90aXRsZUVsZW1lbnQgPSBjcmVhdGVFbGVtZW50KHRpdGxlVGFnLCBmYWxzZSk7Ci0g ICAgICAgIGhlYWRFbGVtZW50LT5hcHBlbmRDaGlsZCgqbV90aXRsZUVsZW1lbnQsIEFTU0VSVF9O T19FWENFUFRJT04pOwotICAgIH0KIAogICAgIC8vIFRoZSBET00gQVBJIGhhcyBubyBtZXRob2Qg b2Ygc3BlY2lmeWluZyBkaXJlY3Rpb24sIHNvIGFzc3VtZSBMVFIuCiAgICAgdXBkYXRlVGl0bGUo U3RyaW5nV2l0aERpcmVjdGlvbih0aXRsZSwgTFRSKSk7CiAKICAgICBpZiAoaXM8SFRNTFRpdGxl RWxlbWVudD4obV90aXRsZUVsZW1lbnQuZ2V0KCkpKQogICAgICAgICBkb3duY2FzdDxIVE1MVGl0 bGVFbGVtZW50PigqbV90aXRsZUVsZW1lbnQpLnNldFRleHQodGl0bGUpOworICAgIGVsc2UgaWYg KGlzPFNWR1RpdGxlRWxlbWVudD4obV90aXRsZUVsZW1lbnQuZ2V0KCkpKQorICAgICAgICBkb3du Y2FzdDxTVkdUaXRsZUVsZW1lbnQ+KCptX3RpdGxlRWxlbWVudCkuc2V0VGV4dCh0aXRsZSk7CiB9 CiAKIHZvaWQgRG9jdW1lbnQ6OnVwZGF0ZVRpdGxlRWxlbWVudChFbGVtZW50KiBuZXdUaXRsZUVs ZW1lbnQpCiB7Ci0gICAgLy8gT25seSBhbGxvdyB0aGUgZmlyc3QgdGl0bGUgZWxlbWVudCBpbiB0 cmVlIG9yZGVyIHRvIGNoYW5nZSB0aGUgdGl0bGUgLS0gb3RoZXJzIGhhdmUgbm8gZWZmZWN0Lgot ICAgIGlmIChtX3RpdGxlRWxlbWVudCkgewotICAgICAgICBpZiAoaXNIVE1MRG9jdW1lbnQoKSB8 fCBpc1hIVE1MRG9jdW1lbnQoKSkKLSAgICAgICAgICAgIG1fdGl0bGVFbGVtZW50ID0gZGVzY2Vu ZGFudHNPZlR5cGU8SFRNTFRpdGxlRWxlbWVudD4oKnRoaXMpLmZpcnN0KCk7Ci0gICAgICAgIGVs c2UgaWYgKGlzU1ZHRG9jdW1lbnQoKSkKLSAgICAgICAgICAgIG1fdGl0bGVFbGVtZW50ID0gZGVz Y2VuZGFudHNPZlR5cGU8U1ZHVGl0bGVFbGVtZW50PigqdGhpcykuZmlyc3QoKTsKLSAgICB9IGVs c2UKLSAgICAgICAgbV90aXRsZUVsZW1lbnQgPSBuZXdUaXRsZUVsZW1lbnQ7CisgICAgaWYgKGlz PFNWR1NWR0VsZW1lbnQ+KGRvY3VtZW50RWxlbWVudCgpKSkKKyAgICAgICAgbV90aXRsZUVsZW1l bnQgPSBjaGlsZHJlbk9mVHlwZTxTVkdUaXRsZUVsZW1lbnQ+KCpkb2N1bWVudEVsZW1lbnQoKSku Zmlyc3QoKTsKKyAgICBlbHNlIHsKKyAgICAgICAgaWYgKG1fdGl0bGVFbGVtZW50KSB7CisgICAg ICAgICAgICBpZiAoaXNIVE1MRG9jdW1lbnQoKSB8fCBpc1hIVE1MRG9jdW1lbnQoKSkKKyAgICAg ICAgICAgICAgICBtX3RpdGxlRWxlbWVudCA9IGRlc2NlbmRhbnRzT2ZUeXBlPEhUTUxUaXRsZUVs ZW1lbnQ+KCp0aGlzKS5maXJzdCgpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIG1fdGl0 bGVFbGVtZW50ID0gbmV3VGl0bGVFbGVtZW50OworICAgIH0KIAogICAgIHVwZGF0ZVRpdGxlRnJv bVRpdGxlRWxlbWVudCgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M VGl0bGVFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRpdGxlRWxlbWVudC5j cHAKaW5kZXggZDE0NzNjZTIzY2U3MzdkYjMzYTMyMzNmNmZkMDE4ZDM3ZjczNTFkZS4uYjk0MDMz NmQwMDMyNjA0YjJiM2IzNTczNWY2YTcxYzAzMzEyMTFhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MVGl0bGVFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxUaXRsZUVsZW1lbnQuY3BwCkBAIC0xMDAsNyArMTAwLDcgQEAgdm9pZCBIVE1MVGl0bGVF bGVtZW50OjpzZXRUZXh0KGNvbnN0IFN0cmluZyYgdmFsdWUpCiAKICAgICAvLyBXZSBtYWtlIGEg Y29weSBoZXJlIGJlY2F1c2UgZW50aXR5IG9mICJ2YWx1ZSIgYXJndW1lbnQgY2FuIGJlIERvY3Vt ZW50OjptX3RpdGxlLAogICAgIC8vIHdoaWNoIGdvZXMgZW1wdHkgZHVyaW5nIHJlbW92ZUNoaWxk cmVuKCkgaW52b2NhdGlvbiBiZWxvdywKLSAgICAvLyB3aGljaCBjYXVzZXMgSFRNTFRpdGxlRWxl bWVudDo6Y2hpbGRyZW5DaGFuZ2VkKCksIHdoaWNoIGVuZHMgdXAgRG9jdW1lbnQ6OnNldFRpdGxl KCkuCisgICAgLy8gd2hpY2ggY2F1c2VzIEhUTUxUaXRsZUVsZW1lbnQ6OmNoaWxkcmVuQ2hhbmdl ZCgpLCB3aGljaCBlbmRzIHVwIGNhbGxpbmcgRG9jdW1lbnQ6OnNldFRpdGxlKCkuCiAgICAgU3Ry aW5nIHZhbHVlQ29weSh2YWx1ZSk7CiAKICAgICBpZiAoaGFzQ2hpbGROb2RlcygpKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RpdGxlRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9zdmcvU1ZHVGl0bGVFbGVtZW50LmNwcAppbmRleCA4MmQ3ZGNlMWY4ZjVhOWVkY2IzZTEw MmVkNDNmZjU1NGYwOWNjOTY3Li4wYWE0NDExYzFjNDQ1YzdlOTgyODkxZDEyMDg5MjA0YjhmNGVm ZjE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVGl0bGVFbGVtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVGl0bGVFbGVtZW50LmNwcApAQCAtMSw2ICsxLDcg QEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDUgTmlrb2xhcyBaaW1tZXJtYW5uIDx6 aW1tZXJtYW5uQGtkZS5vcmc+CiAgKiBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDUsIDIwMDYgUm9i IEJ1aXMgPGJ1aXNAa2RlLm9yZz4KKyAqIENvcHlyaWdodCAoQykgMjAxNiBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7 IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0 ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKQEAgLTIzLDYgKzI0LDcgQEAK IAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiU1ZHTmFtZXMuaCIKKyNpbmNsdWRl ICJUZXh0LmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNjEsNCArNjMsMjUgQEAgdm9p ZCBTVkdUaXRsZUVsZW1lbnQ6OmNoaWxkcmVuQ2hhbmdlZChjb25zdCBDaGlsZENoYW5nZSYgY2hh bmdlKQogICAgIGRvY3VtZW50KCkudGl0bGVFbGVtZW50VGV4dENoYW5nZWQoKnRoaXMpOwogfQog Cit2b2lkIFNWR1RpdGxlRWxlbWVudDo6c2V0VGV4dChjb25zdCBTdHJpbmcmIHZhbHVlKQorewor ICAgIFJlZjxTVkdUaXRsZUVsZW1lbnQ+IHByb3RlY3RlZFRoaXMoKnRoaXMpOworCisgICAgaWYg KCF2YWx1ZS5pc0VtcHR5KCkgJiYgaGFzT25lQ2hpbGQoKSAmJiBpczxUZXh0PigqZmlyc3RDaGls ZCgpKSkgeworICAgICAgICBkb3duY2FzdDxUZXh0PigqZmlyc3RDaGlsZCgpKS5zZXREYXRhKHZh bHVlKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIC8vIFdlIG1ha2UgYSBjb3B5IGhl cmUgYmVjYXVzZSBlbnRpdHkgb2YgInZhbHVlIiBhcmd1bWVudCBjYW4gYmUgRG9jdW1lbnQ6Om1f dGl0bGUsCisgICAgLy8gd2hpY2ggZ29lcyBlbXB0eSBkdXJpbmcgcmVtb3ZlQ2hpbGRyZW4oKSBp bnZvY2F0aW9uIGJlbG93LAorICAgIC8vIHdoaWNoIGNhdXNlcyBTVkdUaXRsZUVsZW1lbnQ6OmNo aWxkcmVuQ2hhbmdlZCgpLCB3aGljaCBlbmRzIHVwIGNhbGxpbmcgRG9jdW1lbnQ6OnNldFRpdGxl KCkuCisgICAgU3RyaW5nIHZhbHVlQ29weSh2YWx1ZSk7CisKKyAgICBpZiAoaGFzQ2hpbGROb2Rl cygpKQorICAgICAgICByZW1vdmVDaGlsZHJlbigpOworCisgICAgaWYgKCF2YWx1ZUNvcHkuaXNF bXB0eSgpKQorICAgICAgICBhcHBlbmRDaGlsZChkb2N1bWVudCgpLmNyZWF0ZVRleHROb2RlKHZh bHVlQ29weSksIElHTk9SRV9FWENFUFRJT04pOworfQorCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9zdmcvU1ZHVGl0bGVFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVGl0 bGVFbGVtZW50LmgKaW5kZXggZjYxNmEzZThkNmMwYTEwNmUxNDFjOWU0OWFhNzQ2YTdjZGUwNzA1 MS4uOTc2N2FiNzE4NzY5ZTY4YzE2ZjkyMzM4YjE2ODllOWJiYzY2OGZiOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvc3ZnL1NWR1RpdGxlRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdUaXRsZUVsZW1lbnQuaApAQCAtMzAsNiArMzAsOCBAQCBjbGFzcyBTVkdUaXRsZUVs ZW1lbnQgZmluYWwgOiBwdWJsaWMgU1ZHRWxlbWVudCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFJl ZjxTVkdUaXRsZUVsZW1lbnQ+IGNyZWF0ZShjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1lbnQm KTsKIAorICAgIHZvaWQgc2V0VGV4dChjb25zdCBTdHJpbmcmKTsKKwogcHJpdmF0ZToKICAgICBT VkdUaXRsZUVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50Jik7CiAKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDY4NWYyZTY1ZWQ5NDllZmY1Y2Y5ZTZhYjUyMzNl MjA4OWMzNjkyZGYuLmFkMzcxNjgwMTM0OWU2NDcyY2RkNzJmZjA1MDg0ZGQyNDZiMjg5MTYgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE2LTA3LTA2 ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRG9jdW1lbnQudGl0 bGUgc2V0dGVyIGRvZXMgbm90IHdvcmsgZm9yIFNWRyBkb2N1bWVudHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTUwMworICAgICAgICA8cmRhcjov L3Byb2JsZW0vMjcyMTIzMTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgor CisgICAgICAgIFJlYmFzZWxpbmUgVzNDIHRlc3Qgbm93IHRoYXQgYWxsIGNoZWNrcyBhcmUgcGFz c2luZy4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2RvbS9kb2N1bWVudHMv ZG9tLXRyZWUtYWNjZXNzb3JzL2RvY3VtZW50LnRpdGxlLTA5LWV4cGVjdGVkLnR4dDoKKworMjAx Ni0wNy0wNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAgIERvY3Vt ZW50LmJvZHkgc2hvdWxkIHJldHVybiB0aGUgZmlyc3QgY2hpbGQgb2YgdGhlIGh0bWwgZWxlbWVu dCB0aGF0IGlzIGVpdGhlciBhIGJvZHkgLyBmcmFtZXNldCBlbGVtZW50CiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk0ODgKIApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2RvbS9kb2N1 bWVudHMvZG9tLXRyZWUtYWNjZXNzb3JzL2RvY3VtZW50LnRpdGxlLTA5LWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9kb20vZG9j dW1lbnRzL2RvbS10cmVlLWFjY2Vzc29ycy9kb2N1bWVudC50aXRsZS0wOS1leHBlY3RlZC50eHQK aW5kZXggOGY0YTRjNzk3MjkyYjAwZGUwMGZjZWQyZTE2YWYzMjI0NWVmMWM3Zi4uYzZlMmQyZjlk MThjYTkyYTI0NjJiN2UxYmJlYTdjOWNkNDAzYTJjMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2RvbS9kb2N1bWVudHMvZG9tLXRy ZWUtYWNjZXNzb3JzL2RvY3VtZW50LnRpdGxlLTA5LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvZG9tL2RvY3VtZW50cy9k b20tdHJlZS1hY2Nlc3NvcnMvZG9jdW1lbnQudGl0bGUtMDktZXhwZWN0ZWQudHh0CkBAIC0xLDcg KzEsNyBAQAogCi1GQUlMIE5vIHRpdGxlIGVsZW1lbnQgaW4gU1ZHIGRvY3VtZW50IGFzc2VydF9l cXVhbHM6IGV4cGVjdGVkICJ0aXRsZSIgYnV0IGdvdCAieC1jaGlsZCIKLUZBSUwgVGl0bGUgZWxl bWVudCBpbiBTVkcgZG9jdW1lbnQgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgImZvb2JhciIgYnV0 IGdvdCAiZm9vIgotRkFJTCBUaXRsZSBlbGVtZW50IG5vdCBjaGlsZCBvZiBTVkcgcm9vdCBhc3Nl cnRfZXF1YWxzOiBleHBlY3RlZCAiIiBidXQgZ290ICJmb28iCi1GQUlMIFRpdGxlIGVsZW1lbnQg bm90IGluIFNWRyBuYW1lc3BhY2UgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIiIgYnV0IGdvdCAi Zm9vIgotRkFJTCBSb290IGVsZW1lbnQgbm90IG5hbWVkICJzdmciIGFzc2VydF9lcXVhbHM6IGV4 cGVjdGVkICIiIGJ1dCBnb3QgImZvbyIKK1BBU1MgTm8gdGl0bGUgZWxlbWVudCBpbiBTVkcgZG9j dW1lbnQgCitQQVNTIFRpdGxlIGVsZW1lbnQgaW4gU1ZHIGRvY3VtZW50IAorUEFTUyBUaXRsZSBl bGVtZW50IG5vdCBjaGlsZCBvZiBTVkcgcm9vdCAKK1BBU1MgVGl0bGUgZWxlbWVudCBub3QgaW4g U1ZHIG5hbWVzcGFjZSAKK1BBU1MgUm9vdCBlbGVtZW50IG5vdCBuYW1lZCAic3ZnIiAKIAo=