79351 2012-02-23 02:10:58 -0800 [Shadow DOM] Make Node::showTreeForThis dump multiple shadow roots. 2012-02-24 04:01:58 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hayato hayato dglazkov dominicc morrita rolandsteiner shinyak webkit.review.bot oldest_to_newest 562973 0 hayato 2012-02-23 02:10:58 -0800 Make Node::showTreeForThis (and showTreeForThisAcrossFrame) dump multiple shadow roots. The current implementation dumps only the first shadow root. Which is not useful for debugging an element which has multiple shadow roots. 562975 1 128439 hayato 2012-02-23 02:13:39 -0800 Created attachment 128439 dump multi 562980 2 hayato 2012-02-23 02:18:15 -0800 The sample output is here: * DIV 0x7fffe377c080 CLASS=shadowHost #shadow-root 0x7fffe4221400 #shadow-root 0x7fffe3793000 DIV 0x7fffe3794300 CLASS=class1 DIV 0x7fffe3794180 CLASS=class3 SHADOW 0x7fffe3794200 CLASS=shadow DIV 0x7fffe3794280 CLASS=class3 DIV 0x7fffe377c200 CLASS=class1 DIV 0x7fffe377c100 CLASS=class2 CONTENT 0x7fffe37a45a0 CLASS=content DIV 0x7fffe377c180 CLASS=class2 DIV 0x7fffe3812880 CLASS=lightChild1 DIV 0x7fffe377c000 CLASS=lightChild2 The younger shadowRoot is displayed as a child of olderShadowRoot, which fits my mental model. It also matchs the relation between shadowHost and shadowRoot. A child is always rendered earlier than the parent. 563002 3 128448 hayato 2012-02-23 03:04:01 -0800 Created attachment 128448 dump multi 563004 4 hayato 2012-02-23 03:06:20 -0800 I wrongly committed the parts of this patch with http://trac.webkit.org/changeset/108605. Which was unintentional. This patch includes the updated version. 563154 5 128448 dglazkov 2012-02-23 09:12:34 -0800 Comment on attachment 128448 dump multi ok. Would love to have something more sophisticated in the future, like an ASCII-drawn tree stack, but this is totally fine. 563806 6 128448 webkit.review.bot 2012-02-23 18:38:02 -0800 Comment on attachment 128448 dump multi Rejecting attachment 128448 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 ERROR: /mnt/git/webkit-commit-queue/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/11608585 563841 7 hayato 2012-02-23 19:30:41 -0800 Let me update the ChageLog, which misses a reviewer line. (In reply to comment #6) > (From update of attachment 128448 [details]) > Rejecting attachment 128448 [details] from commit-queue. > > Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 > > ERROR: /mnt/git/webkit-commit-queue/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). > > Full output: http://queues.webkit.org/results/11608585 563853 8 128634 hayato 2012-02-23 19:50:29 -0800 Created attachment 128634 Patch for landing 564179 9 webkit.review.bot 2012-02-24 03:59:45 -0800 The commit-queue encountered the following flaky tests while processing attachment 128634: perf/object-keys.html bug 63769 (author: ojan@chromium.org) The commit-queue is continuing to process your patch. 564180 10 128634 webkit.review.bot 2012-02-24 04:01:53 -0800 Comment on attachment 128634 Patch for landing Clearing flags on attachment: 128634 Committed r108770: <http://trac.webkit.org/changeset/108770> 564181 11 webkit.review.bot 2012-02-24 04:01:58 -0800 All reviewed patches have been landed. Closing bug. 128439 2012-02-23 02:13:39 -0800 2012-02-23 03:03:55 -0800 dump multi bug-79351-20120223191338.patch text/plain 5176 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4MzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2YxNDMxNDZiN2QwMmNl NTYxYTQ4ODFjYjYzYjFmNzA4YWRlNzM1Zi4uODAwNWY1MWQ2NGQ1NzMzNjIzODM5NjJlNzc5MjEy Mzc4M2NjMmNhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTIzICBIYXlh dG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KKworICAgICAgICBNYWtlIE5vZGU6OnNob3dU cmVlRm9yVGhpcyAoYW5kIE5vZGU6OnNob3dUcmVlRm9yVGhpc0Fjcm9zc0ZyYW1lKSBkdW1wIG11 bHRpcGxlIHNoYWRvdyByb290cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc5MzUxCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoZXNlIHV0 aWxpdHkgZnVuY3Rpb25zIGFyZSBvbmx5IGF2YWlsYWJsZSBpbiBkZWJ1ZyBidWlsZC4KKyAgICAg ICAgSSBtYW51YWxseSB0ZXN0ZWQgaW4gR0RCIHNlc3Npb24uCisKKyAgICAgICAgKiBkb20vTm9k ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpvbGRlc3RTaGFkb3dSb290Rm9yKToKKyAgICAgICAg KFdlYkNvcmU6OnRyYXZlcnNlVHJlZUFuZE1hcmspOgorICAgICAgICAoV2ViQ29yZTo6cGFyZW50 T3JIb3N0T3JGcmFtZU93bmVyKToKKyAgICAgICAgKFdlYkNvcmU6OnNob3dTdWJUcmVlQWNyb3Nz RnJhbWUpOgorICAgICAgICAqIGRvbS9TaGFkb3dSb290Lmg6CisgICAgICAgIChXZWJDb3JlOjp0 b1NoYWRvd1Jvb3QpOgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMDItMjEgIEphbWVzIFJv Ymluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBTY3JvbGxpbmdDb29yZGlu YXRvcjo6Y29vcmRpbmF0ZXNTY3JvbGxpbmdGb3JGcmFtZVZpZXcgc2hvdWxkIGJlIGNvbmRpdGlv bmFsIG9uIGNvbXBvc2l0aW5nIGJlaW5nIGFjdGl2ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZG9tL05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IDA5Yjkx NTU0ODM1MTNjZGI2MzFmYjBmZWU1NTVjYWUyZjJkZjdiYjguLjJlZGIwNWRmMTUwMjM1YmYyYTJm NmU4ZjE2YjZhYWE0MmNkN2YwN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2Rl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKQEAgLTgwOSw5ICs4MDksOSBA QCBib29sIE5vZGU6Omhhc05vbkVtcHR5Qm91bmRpbmdCb3goKSBjb25zdAogICAgIHJldHVybiBm YWxzZTsKIH0KIAotaW5saW5lIHN0YXRpYyBTaGFkb3dSb290KiBzaGFkb3dSb290KE5vZGUqIG5v ZGUpCitpbmxpbmUgc3RhdGljIFNoYWRvd1Jvb3QqIG9sZGVzdFNoYWRvd1Jvb3RGb3IoY29uc3Qg Tm9kZSogbm9kZSkKIHsKLSAgICByZXR1cm4gbm9kZS0+aXNFbGVtZW50Tm9kZSgpICYmIHRvRWxl bWVudChub2RlKS0+aGFzU2hhZG93Um9vdCgpID8gdG9FbGVtZW50KG5vZGUpLT5zaGFkb3dSb290 TGlzdCgpLT55b3VuZ2VzdFNoYWRvd1Jvb3QoKSA6IDA7CisgICAgcmV0dXJuIG5vZGUtPmlzRWxl bWVudE5vZGUoKSAmJiB0b0VsZW1lbnQobm9kZSktPmhhc1NoYWRvd1Jvb3QoKSA/IHRvRWxlbWVu dChub2RlKS0+c2hhZG93Um9vdExpc3QoKS0+b2xkZXN0U2hhZG93Um9vdCgpIDogMDsKIH0KIAog aW5saW5lIHZvaWQgTm9kZTo6c2V0U3R5bGVDaGFuZ2UoU3R5bGVDaGFuZ2VUeXBlIGNoYW5nZVR5 cGUpCkBAIC0yMjcwLDEyICsyMjcwLDExIEBAIHN0YXRpYyB2b2lkIHRyYXZlcnNlVHJlZUFuZE1h cmsoY29uc3QgU3RyaW5nJiBiYXNlSW5kZW50LCBjb25zdCBOb2RlKiByb290Tm9kZSwKICAgICAg ICAgZnByaW50ZihzdGRlcnIsICIlcyIsIGluZGVudC51dGY4KCkuZGF0YSgpKTsKICAgICAgICAg bm9kZS0+c2hvd05vZGUoKTsKIAotICAgICAgICBDb250YWluZXJOb2RlKiByb290Tm9kZSA9IHNo YWRvd1Jvb3QoY29uc3RfY2FzdDxOb2RlKj4obm9kZSkpOwotCi0gICAgICAgIGlmIChyb290Tm9k ZSkgewotICAgICAgICAgICAgaW5kZW50ICs9ICJcdCI7Ci0gICAgICAgICAgICB0cmF2ZXJzZVRy ZWVBbmRNYXJrKGluZGVudCwgcm9vdE5vZGUsIG1hcmtlZE5vZGUxLCBtYXJrZWRMYWJlbDEsIG1h cmtlZE5vZGUyLCBtYXJrZWRMYWJlbDIpOwotICAgICAgICB9CisgICAgICAgIGlmIChub2RlLT5p c1NoYWRvd1Jvb3QoKSkgeworICAgICAgICAgICAgaWYgKFNoYWRvd1Jvb3QqIHlvdW5nZXJTaGFk b3dSb290ID0gdG9TaGFkb3dSb290KG5vZGUpLT55b3VuZ2VyU2hhZG93Um9vdCgpKQorICAgICAg ICAgICAgICAgIHRyYXZlcnNlVHJlZUFuZE1hcmsoaW5kZW50ICsgIlx0IiwgeW91bmdlclNoYWRv d1Jvb3QsIG1hcmtlZE5vZGUxLCBtYXJrZWRMYWJlbDEsIG1hcmtlZE5vZGUyLCBtYXJrZWRMYWJl bDIpOworICAgICAgICB9IGVsc2UgaWYgKFNoYWRvd1Jvb3QqIG9sZGVzdFNoYWRvd1Jvb3QgPSBv bGRlc3RTaGFkb3dSb290Rm9yKG5vZGUpKQorICAgICAgICAgICAgdHJhdmVyc2VUcmVlQW5kTWFy ayhpbmRlbnQgKyAiXHQiLCBvbGRlc3RTaGFkb3dSb290LCBtYXJrZWROb2RlMSwgbWFya2VkTGFi ZWwxLCBtYXJrZWROb2RlMiwgbWFya2VkTGFiZWwyKTsKICAgICB9CiB9CiAKQEAgLTIzMDUsNyAr MjMwNCw3IEBAIHZvaWQgTm9kZTo6Zm9ybWF0Rm9yRGVidWdnZXIoY2hhciogYnVmZmVyLCB1bnNp Z25lZCBsZW5ndGgpIGNvbnN0CiAgICAgc3RybmNweShidWZmZXIsIHJlc3VsdC51dGY4KCkuZGF0 YSgpLCBsZW5ndGggLSAxKTsKIH0KIAotc3RhdGljIENvbnRhaW5lck5vZGUqIHBhcmVudE9ySG9z dE9yRnJhbWVPd25lcihOb2RlKiBub2RlKQorc3RhdGljIENvbnRhaW5lck5vZGUqIHBhcmVudE9y SG9zdE9yRnJhbWVPd25lcihjb25zdCBOb2RlKiBub2RlKQogewogICAgIENvbnRhaW5lck5vZGUq IHBhcmVudCA9IG5vZGUtPnBhcmVudE9ySG9zdE5vZGUoKTsKICAgICBpZiAoIXBhcmVudCAmJiBu b2RlLT5kb2N1bWVudCgpICYmIG5vZGUtPmRvY3VtZW50KCktPmZyYW1lKCkpCkBAIC0yMzEzLDE1 ICsyMzEyLDE4IEBAIHN0YXRpYyBDb250YWluZXJOb2RlKiBwYXJlbnRPckhvc3RPckZyYW1lT3du ZXIoTm9kZSogbm9kZSkKICAgICByZXR1cm4gcGFyZW50OwogfQogCi1zdGF0aWMgdm9pZCBzaG93 U3ViVHJlZUFjcm9zc0ZyYW1lKE5vZGUqIG5vZGUsIGNvbnN0IE5vZGUqIG1hcmtlZE5vZGUsIGNv bnN0IFN0cmluZyYgaW5kZW50KQorc3RhdGljIHZvaWQgc2hvd1N1YlRyZWVBY3Jvc3NGcmFtZShj b25zdCBOb2RlKiBub2RlLCBjb25zdCBOb2RlKiBtYXJrZWROb2RlLCBjb25zdCBTdHJpbmcmIGlu ZGVudCkKIHsKICAgICBpZiAobm9kZSA9PSBtYXJrZWROb2RlKQogICAgICAgICBmcHV0cygiKiIs IHN0ZGVycik7CiAgICAgZnB1dHMoaW5kZW50LnV0ZjgoKS5kYXRhKCksIHN0ZGVycik7CiAgICAg bm9kZS0+c2hvd05vZGUoKTsKICAgICBpZiAobm9kZS0+aXNGcmFtZU93bmVyRWxlbWVudCgpKQot ICAgICAgICBzaG93U3ViVHJlZUFjcm9zc0ZyYW1lKHN0YXRpY19jYXN0PEhUTUxGcmFtZU93bmVy RWxlbWVudCo+KG5vZGUpLT5jb250ZW50RG9jdW1lbnQoKSwgbWFya2VkTm9kZSwgaW5kZW50ICsg Ilx0Iik7Ci0gICAgaWYgKFNoYWRvd1Jvb3QqIHNoYWRvdyA9IHNoYWRvd1Jvb3Qobm9kZSkpCisg ICAgICAgIHNob3dTdWJUcmVlQWNyb3NzRnJhbWUoc3RhdGljX2Nhc3Q8Y29uc3QgSFRNTEZyYW1l T3duZXJFbGVtZW50Kj4obm9kZSktPmNvbnRlbnREb2N1bWVudCgpLCBtYXJrZWROb2RlLCBpbmRl bnQgKyAiXHQiKTsKKyAgICBlbHNlIGlmIChub2RlLT5pc1NoYWRvd1Jvb3QoKSkgeworICAgICAg ICBpZiAoU2hhZG93Um9vdCogeW91bmdlclNoYWRvd1Jvb3QgPSB0b1NoYWRvd1Jvb3Qobm9kZSkt PnlvdW5nZXJTaGFkb3dSb290KCkpCisgICAgICAgICAgICBzaG93U3ViVHJlZUFjcm9zc0ZyYW1l KHlvdW5nZXJTaGFkb3dSb290LCBtYXJrZWROb2RlLCBpbmRlbnQgKyAiXHQiKTsKKyAgICB9IGVs c2UgaWYgKFNoYWRvd1Jvb3QqIHNoYWRvdyA9IG9sZGVzdFNoYWRvd1Jvb3RGb3Iobm9kZSkpCiAg ICAgICAgIHNob3dTdWJUcmVlQWNyb3NzRnJhbWUoc2hhZG93LCBtYXJrZWROb2RlLCBpbmRlbnQg KyAiXHQiKTsKICAgICBmb3IgKE5vZGUqIGNoaWxkID0gbm9kZS0+Zmlyc3RDaGlsZCgpOyBjaGls ZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkKICAgICAgICAgc2hvd1N1YlRyZWVBY3Jv c3NGcmFtZShjaGlsZCwgbWFya2VkTm9kZSwgaW5kZW50ICsgIlx0Iik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Um9vdC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRv d1Jvb3QuaAppbmRleCBkNDc1ZjI0ODI1M2EwZDFhMDg1YjY3Nzg0ZTcwZjY3YWQ5M2FjODdjLi5l NzdmY2E1Zjk5YjY3MzhmNTNjYjY5OTYxZjk2ZDA0Yjg5MDMwOWMwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vU2hhZG93Um9vdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TaGFk b3dSb290LmgKQEAgLTEwNSwxMCArMTA1LDE1IEBAIGlubGluZSBib29sIFNoYWRvd1Jvb3Q6Om5l ZWRzUmVhdHRhY2hIb3N0Q2hpbGRyZW5BbmRTaGFkb3coKQogICAgIHJldHVybiBtX25lZWRzUmVj YWxjdWxhdGVDb250ZW50IHx8IGhhc0NvbnRlbnRFbGVtZW50KCk7CiB9CiAKLWlubGluZSBTaGFk b3dSb290KiB0b1NoYWRvd1Jvb3QoTm9kZSogbm9kZSkKK2lubGluZSBjb25zdCBTaGFkb3dSb290 KiB0b1NoYWRvd1Jvb3QoY29uc3QgTm9kZSogbm9kZSkKIHsKICAgICBBU1NFUlQoIW5vZGUgfHwg bm9kZS0+aXNTaGFkb3dSb290KCkpOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDxTaGFkb3dSb290 Kj4obm9kZSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PGNvbnN0IFNoYWRvd1Jvb3QqPihub2Rl KTsKK30KKworaW5saW5lIFNoYWRvd1Jvb3QqIHRvU2hhZG93Um9vdChOb2RlKiBub2RlKQorewor ICAgIHJldHVybiBjb25zdF9jYXN0PFNoYWRvd1Jvb3QqPih0b1NoYWRvd1Jvb3Qoc3RhdGljX2Nh c3Q8Y29uc3QgTm9kZSo+KG5vZGUpKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlCg== 128448 2012-02-23 03:04:01 -0800 2012-02-23 19:50:22 -0800 dump multi bug-79351-20120223200400.patch text/plain 5927 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTdkNDY4ZDQyODkxMzc5 YjNlNjA3MTU2N2ViMzNhNmYwZTY4ZWM1ZS4uNWEwZjQ2ZTMwZTczMTY2ODgyMmE1NTM4YzdkMzU1 ZTUzMzcxZmVlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAyLTIzICBIYXlh dG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KKworICAgICAgICBNYWtlIE5vZGU6OnNob3dU cmVlRm9yVGhpcyAoYW5kIE5vZGU6OnNob3dUcmVlRm9yVGhpc0Fjcm9zc0ZyYW1lKSBkdW1wIG11 bHRpcGxlIHNoYWRvdyByb290cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc5MzUxCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoZXNlIHV0 aWxpdHkgZnVuY3Rpb25zIGFyZSBvbmx5IGF2YWlsYWJsZSBpbiBkZWJ1ZyBidWlsZC4KKyAgICAg ICAgSSBtYW51YWxseSB0ZXN0ZWQgaW4gR0RCIHNlc3Npb24uCisKKyAgICAgICAgKiBkb20vTm9k ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpvbGRlc3RTaGFkb3dSb290Rm9yKToKKyAgICAgICAg KFdlYkNvcmU6OnRyYXZlcnNlVHJlZUFuZE1hcmspOgorICAgICAgICAoV2ViQ29yZTo6cGFyZW50 T3JIb3N0T3JGcmFtZU93bmVyKToKKyAgICAgICAgKFdlYkNvcmU6OnNob3dTdWJUcmVlQWNyb3Nz RnJhbWUpOgorICAgICAgICAqIGRvbS9TaGFkb3dSb290Lmg6CisgICAgICAgIChXZWJDb3JlOjpT aGFkb3dSb290Ojp5b3VuZ2VyU2hhZG93Um9vdCk6CisgICAgICAgIChXZWJDb3JlOjpTaGFkb3dS b290OjpvbGRlclNoYWRvd1Jvb3QpOgorICAgICAgICAoV2ViQ29yZTo6dG9TaGFkb3dSb290KToK KyAgICAgICAgKFdlYkNvcmUpOgorCiAyMDEyLTAyLTIyICBJZ29yIE9saXZlaXJhICA8aWdvci5v QHNpc2Euc2Ftc3VuZy5jb20+CiAKICAgICAgICAgRXZlcnkgY2FsbCB0byBSZW5kZXJPYmplY3Q6 OnNldEFuaW1hdGFibGVTdHlsZSgpIGl0ZXJhdGVzIHRocm91Z2ggYWxsIG1fY29tcG9zaXRlQW5p bWF0aW9uczogcG90ZW50aWFsbHkgTyhOXjIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k b20vTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKaW5kZXggZDkzMWRlYmY2 NjI3MTY2MDU1NTc3YmFlNjlkMjQ5YTNkNzFhZTViOS4uMmU5YzYxYTdlMWQwMzAxMjU4OTAzMjZj M2IzNTQwMzc4NmUzNGYyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcApAQCAtODA5LDcgKzgwOSw3IEBAIGJv b2wgTm9kZTo6aGFzTm9uRW1wdHlCb3VuZGluZ0JveCgpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNl OwogfQogCi1pbmxpbmUgc3RhdGljIFNoYWRvd1Jvb3QqIG9sZGVzdFNoYWRvd1Jvb3QoTm9kZSog bm9kZSkKK2lubGluZSBzdGF0aWMgU2hhZG93Um9vdCogb2xkZXN0U2hhZG93Um9vdEZvcihjb25z dCBOb2RlKiBub2RlKQogewogICAgIHJldHVybiBub2RlLT5pc0VsZW1lbnROb2RlKCkgJiYgdG9F bGVtZW50KG5vZGUpLT5oYXNTaGFkb3dSb290KCkgPyB0b0VsZW1lbnQobm9kZSktPnNoYWRvd1Jv b3RMaXN0KCktPm9sZGVzdFNoYWRvd1Jvb3QoKSA6IDA7CiB9CkBAIC0yMjY5LDEyICsyMjY5LDEx IEBAIHN0YXRpYyB2b2lkIHRyYXZlcnNlVHJlZUFuZE1hcmsoY29uc3QgU3RyaW5nJiBiYXNlSW5k ZW50LCBjb25zdCBOb2RlKiByb290Tm9kZSwKICAgICAgICAgICAgIGluZGVudCArPSAiXHQiOwog ICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIiVzIiwgaW5kZW50LnV0ZjgoKS5kYXRhKCkpOwogICAg ICAgICBub2RlLT5zaG93Tm9kZSgpOwotCiAgICAgICAgIGlmIChub2RlLT5pc1NoYWRvd1Jvb3Qo KSkgewotICAgICAgICAgICAgaWYgKFNoYWRvd1Jvb3QqIHlvdW5nZXJTaGFkb3dSb290ID0gdG9T aGFkb3dSb290KGNvbnN0X2Nhc3Q8Tm9kZSo+KG5vZGUpKS0+eW91bmdlclNoYWRvd1Jvb3QoKSkK KyAgICAgICAgICAgIGlmIChTaGFkb3dSb290KiB5b3VuZ2VyU2hhZG93Um9vdCA9IHRvU2hhZG93 Um9vdChub2RlKS0+eW91bmdlclNoYWRvd1Jvb3QoKSkKICAgICAgICAgICAgICAgICB0cmF2ZXJz ZVRyZWVBbmRNYXJrKGluZGVudCArICJcdCIsIHlvdW5nZXJTaGFkb3dSb290LCBtYXJrZWROb2Rl MSwgbWFya2VkTGFiZWwxLCBtYXJrZWROb2RlMiwgbWFya2VkTGFiZWwyKTsKLSAgICAgICAgfSBl bHNlIGlmIChTaGFkb3dSb290KiByb290Tm9kZSA9IG9sZGVzdFNoYWRvd1Jvb3QoY29uc3RfY2Fz dDxOb2RlKj4obm9kZSkpKQotICAgICAgICAgICAgdHJhdmVyc2VUcmVlQW5kTWFyayhpbmRlbnQg KyAiXHQiLCByb290Tm9kZSwgbWFya2VkTm9kZTEsIG1hcmtlZExhYmVsMSwgbWFya2VkTm9kZTIs IG1hcmtlZExhYmVsMik7CisgICAgICAgIH0gZWxzZSBpZiAoU2hhZG93Um9vdCogb2xkZXN0U2hh ZG93Um9vdCA9IG9sZGVzdFNoYWRvd1Jvb3RGb3Iobm9kZSkpCisgICAgICAgICAgICB0cmF2ZXJz ZVRyZWVBbmRNYXJrKGluZGVudCArICJcdCIsIG9sZGVzdFNoYWRvd1Jvb3QsIG1hcmtlZE5vZGUx LCBtYXJrZWRMYWJlbDEsIG1hcmtlZE5vZGUyLCBtYXJrZWRMYWJlbDIpOwogICAgIH0KIH0KIApA QCAtMjMwNCw3ICsyMzAzLDcgQEAgdm9pZCBOb2RlOjpmb3JtYXRGb3JEZWJ1Z2dlcihjaGFyKiBi dWZmZXIsIHVuc2lnbmVkIGxlbmd0aCkgY29uc3QKICAgICBzdHJuY3B5KGJ1ZmZlciwgcmVzdWx0 LnV0ZjgoKS5kYXRhKCksIGxlbmd0aCAtIDEpOwogfQogCi1zdGF0aWMgQ29udGFpbmVyTm9kZSog cGFyZW50T3JIb3N0T3JGcmFtZU93bmVyKE5vZGUqIG5vZGUpCitzdGF0aWMgQ29udGFpbmVyTm9k ZSogcGFyZW50T3JIb3N0T3JGcmFtZU93bmVyKGNvbnN0IE5vZGUqIG5vZGUpCiB7CiAgICAgQ29u dGFpbmVyTm9kZSogcGFyZW50ID0gbm9kZS0+cGFyZW50T3JIb3N0Tm9kZSgpOwogICAgIGlmICgh cGFyZW50ICYmIG5vZGUtPmRvY3VtZW50KCkgJiYgbm9kZS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSkK QEAgLTIzMTIsMTkgKzIzMTEsMjEgQEAgc3RhdGljIENvbnRhaW5lck5vZGUqIHBhcmVudE9ySG9z dE9yRnJhbWVPd25lcihOb2RlKiBub2RlKQogICAgIHJldHVybiBwYXJlbnQ7CiB9CiAKLXN0YXRp YyB2b2lkIHNob3dTdWJUcmVlQWNyb3NzRnJhbWUoTm9kZSogbm9kZSwgY29uc3QgTm9kZSogbWFy a2VkTm9kZSwgY29uc3QgU3RyaW5nJiBpbmRlbnQpCitzdGF0aWMgdm9pZCBzaG93U3ViVHJlZUFj cm9zc0ZyYW1lKGNvbnN0IE5vZGUqIG5vZGUsIGNvbnN0IE5vZGUqIG1hcmtlZE5vZGUsIGNvbnN0 IFN0cmluZyYgaW5kZW50KQogewogICAgIGlmIChub2RlID09IG1hcmtlZE5vZGUpCiAgICAgICAg IGZwdXRzKCIqIiwgc3RkZXJyKTsKICAgICBmcHV0cyhpbmRlbnQudXRmOCgpLmRhdGEoKSwgc3Rk ZXJyKTsKICAgICBub2RlLT5zaG93Tm9kZSgpOwotICAgIGlmIChub2RlLT5pc0ZyYW1lT3duZXJF bGVtZW50KCkpCi0gICAgICAgIHNob3dTdWJUcmVlQWNyb3NzRnJhbWUoc3RhdGljX2Nhc3Q8SFRN TEZyYW1lT3duZXJFbGVtZW50Kj4obm9kZSktPmNvbnRlbnREb2N1bWVudCgpLCBtYXJrZWROb2Rl LCBpbmRlbnQgKyAiXHQiKTsKLSAgICBpZiAobm9kZS0+aXNTaGFkb3dSb290KCkpIHsKLSAgICAg ICAgaWYgKFNoYWRvd1Jvb3QqIHlvdW5nZXJTaGFkb3dSb290ID0gdG9TaGFkb3dSb290KG5vZGUp LT55b3VuZ2VyU2hhZG93Um9vdCgpKQotICAgICAgICAgICAgc2hvd1N1YlRyZWVBY3Jvc3NGcmFt ZSh5b3VuZ2VyU2hhZG93Um9vdCwgbWFya2VkTm9kZSwgaW5kZW50ICsgIlx0Iik7Ci0gICAgfSBl bHNlIGlmIChTaGFkb3dSb290KiBzaGFkb3dSb290ID0gb2xkZXN0U2hhZG93Um9vdChub2RlKSkK LSAgICAgICAgc2hvd1N1YlRyZWVBY3Jvc3NGcmFtZShzaGFkb3dSb290LCBtYXJrZWROb2RlLCBp bmRlbnQgKyAiXHQiKTsKKyAgICAgaWYgKG5vZGUtPmlzU2hhZG93Um9vdCgpKSB7CisgICAgICAg ICBpZiAoU2hhZG93Um9vdCogeW91bmdlclNoYWRvd1Jvb3QgPSB0b1NoYWRvd1Jvb3Qobm9kZSkt PnlvdW5nZXJTaGFkb3dSb290KCkpCisgICAgICAgICAgICAgc2hvd1N1YlRyZWVBY3Jvc3NGcmFt ZSh5b3VuZ2VyU2hhZG93Um9vdCwgbWFya2VkTm9kZSwgaW5kZW50ICsgIlx0Iik7CisgICAgIH0g ZWxzZSB7CisgICAgICAgICBpZiAobm9kZS0+aXNGcmFtZU93bmVyRWxlbWVudCgpKQorICAgICAg ICAgICAgIHNob3dTdWJUcmVlQWNyb3NzRnJhbWUoc3RhdGljX2Nhc3Q8Y29uc3QgSFRNTEZyYW1l T3duZXJFbGVtZW50Kj4obm9kZSktPmNvbnRlbnREb2N1bWVudCgpLCBtYXJrZWROb2RlLCBpbmRl bnQgKyAiXHQiKTsKKyAgICAgICAgIGlmIChTaGFkb3dSb290KiBvbGRlc3RTaGFkb3dSb290ID0g b2xkZXN0U2hhZG93Um9vdEZvcihub2RlKSkKKyAgICAgICAgICAgICBzaG93U3ViVHJlZUFjcm9z c0ZyYW1lKG9sZGVzdFNoYWRvd1Jvb3QsIG1hcmtlZE5vZGUsIGluZGVudCArICJcdCIpOworICAg ICB9CiAgICAgZm9yIChOb2RlKiBjaGlsZCA9IG5vZGUtPmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNo aWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpCiAgICAgICAgIHNob3dTdWJUcmVlQWNyb3NzRnJh bWUoY2hpbGQsIG1hcmtlZE5vZGUsIGluZGVudCArICJcdCIpOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL1NoYWRvd1Jvb3QuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TaGFkb3dS b290LmgKaW5kZXggZDNiZjM1MTI2NGNmZDMyYjZmZTNjMTQ1NDdiOGFmZDUwZWJjMTZkMy4uNTU0 ODM0ZmZiOWY0NTNkZjFjOGZjN2RlMWU2ZTA1NmI4Yzc1YjUzYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL1NoYWRvd1Jvb3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93 Um9vdC5oCkBAIC03MSw4ICs3MSw4IEBAIHB1YmxpYzoKIAogICAgIEVsZW1lbnQqIGhvc3QoKSBj b25zdCB7IHJldHVybiBzaGFkb3dIb3N0KCk7IH0KIAotICAgIFNoYWRvd1Jvb3QqIHlvdW5nZXJT aGFkb3dSb290KCkgeyByZXR1cm4gcHJldigpOyB9Ci0gICAgU2hhZG93Um9vdCogb2xkZXJTaGFk b3dSb290KCkgeyByZXR1cm4gbmV4dCgpOyB9CisgICAgU2hhZG93Um9vdCogeW91bmdlclNoYWRv d1Jvb3QoKSBjb25zdCB7IHJldHVybiBwcmV2KCk7IH0KKyAgICBTaGFkb3dSb290KiBvbGRlclNo YWRvd1Jvb3QoKSBjb25zdCB7IHJldHVybiBuZXh0KCk7IH0KIAogcHJpdmF0ZToKICAgICBTaGFk b3dSb290KERvY3VtZW50Kik7CkBAIC0xMDAsMTAgKzEwMCwxNSBAQCBpbmxpbmUgYm9vbCBTaGFk b3dSb290OjpuZWVkc1JlYXR0YWNoSG9zdENoaWxkcmVuQW5kU2hhZG93KCkKICAgICByZXR1cm4g bV9uZWVkc1JlY2FsY3VsYXRlQ29udGVudCB8fCBoYXNDb250ZW50RWxlbWVudCgpOwogfQogCi1p bmxpbmUgU2hhZG93Um9vdCogdG9TaGFkb3dSb290KE5vZGUqIG5vZGUpCitpbmxpbmUgY29uc3Qg U2hhZG93Um9vdCogdG9TaGFkb3dSb290KGNvbnN0IE5vZGUqIG5vZGUpCiB7CiAgICAgQVNTRVJU KCFub2RlIHx8IG5vZGUtPmlzU2hhZG93Um9vdCgpKTsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8 U2hhZG93Um9vdCo+KG5vZGUpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxjb25zdCBTaGFkb3dS b290Kj4obm9kZSk7Cit9CisKK2lubGluZSBTaGFkb3dSb290KiB0b1NoYWRvd1Jvb3QoTm9kZSog bm9kZSkKK3sKKyAgICByZXR1cm4gY29uc3RfY2FzdDxTaGFkb3dSb290Kj4odG9TaGFkb3dSb290 KHN0YXRpY19jYXN0PGNvbnN0IE5vZGUqPihub2RlKSkpOwogfQogCiB9IC8vIG5hbWVzcGFjZQo= 128634 2012-02-23 19:50:29 -0800 2012-02-24 04:01:53 -0800 Patch for landing bug-79351-20120224125027.patch text/plain 5967 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTdkNDY4ZDQyODkxMzc5 YjNlNjA3MTU2N2ViMzNhNmYwZTY4ZWM1ZS4uNmZkOTAyYzAzNzc2MjIzNTlmOGM3ZTg1ZjkwMjMw NGViZmQyM2ZjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAyLTIzICBIYXlh dG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KKworICAgICAgICBNYWtlIE5vZGU6OnNob3dU cmVlRm9yVGhpcyAoYW5kIE5vZGU6OnNob3dUcmVlRm9yVGhpc0Fjcm9zc0ZyYW1lKSBkdW1wIG11 bHRpcGxlIHNoYWRvdyByb290cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc5MzUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292 LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGVzZSB1dGlsaXR5IGZ1bmN0aW9ucyBh cmUgb25seSBhdmFpbGFibGUgaW4gZGVidWcgYnVpbGQuCisgICAgICAgIEkgbWFudWFsbHkgdGVz dGVkIGluIEdEQiBzZXNzaW9uLgorCisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6b2xkZXN0U2hhZG93Um9vdEZvcik6CisgICAgICAgIChXZWJDb3JlOjp0cmF2ZXJz ZVRyZWVBbmRNYXJrKToKKyAgICAgICAgKFdlYkNvcmU6OnBhcmVudE9ySG9zdE9yRnJhbWVPd25l cik6CisgICAgICAgIChXZWJDb3JlOjpzaG93U3ViVHJlZUFjcm9zc0ZyYW1lKToKKyAgICAgICAg KiBkb20vU2hhZG93Um9vdC5oOgorICAgICAgICAoV2ViQ29yZTo6U2hhZG93Um9vdDo6eW91bmdl clNoYWRvd1Jvb3QpOgorICAgICAgICAoV2ViQ29yZTo6U2hhZG93Um9vdDo6b2xkZXJTaGFkb3dS b290KToKKyAgICAgICAgKFdlYkNvcmU6OnRvU2hhZG93Um9vdCk6CisgICAgICAgIChXZWJDb3Jl KToKKwogMjAxMi0wMi0yMiAgSWdvciBPbGl2ZWlyYSAgPGlnb3Iub0BzaXNhLnNhbXN1bmcuY29t PgogCiAgICAgICAgIEV2ZXJ5IGNhbGwgdG8gUmVuZGVyT2JqZWN0OjpzZXRBbmltYXRhYmxlU3R5 bGUoKSBpdGVyYXRlcyB0aHJvdWdoIGFsbCBtX2NvbXBvc2l0ZUFuaW1hdGlvbnM6IHBvdGVudGlh bGx5IE8oTl4yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IGQ5MzFkZWJmNjYyNzE2NjA1NTU3N2JhZTY5 ZDI0OWEzZDcxYWU1YjkuLjJlOWM2MWE3ZTFkMDMwMTI1ODkwMzI2YzNiMzU0MDM3ODZlMzRmMmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vTm9kZS5jcHAKQEAgLTgwOSw3ICs4MDksNyBAQCBib29sIE5vZGU6Omhhc05vbkVt cHR5Qm91bmRpbmdCb3goKSBjb25zdAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotaW5saW5lIHN0 YXRpYyBTaGFkb3dSb290KiBvbGRlc3RTaGFkb3dSb290KE5vZGUqIG5vZGUpCitpbmxpbmUgc3Rh dGljIFNoYWRvd1Jvb3QqIG9sZGVzdFNoYWRvd1Jvb3RGb3IoY29uc3QgTm9kZSogbm9kZSkKIHsK ICAgICByZXR1cm4gbm9kZS0+aXNFbGVtZW50Tm9kZSgpICYmIHRvRWxlbWVudChub2RlKS0+aGFz U2hhZG93Um9vdCgpID8gdG9FbGVtZW50KG5vZGUpLT5zaGFkb3dSb290TGlzdCgpLT5vbGRlc3RT aGFkb3dSb290KCkgOiAwOwogfQpAQCAtMjI2OSwxMiArMjI2OSwxMSBAQCBzdGF0aWMgdm9pZCB0 cmF2ZXJzZVRyZWVBbmRNYXJrKGNvbnN0IFN0cmluZyYgYmFzZUluZGVudCwgY29uc3QgTm9kZSog cm9vdE5vZGUsCiAgICAgICAgICAgICBpbmRlbnQgKz0gIlx0IjsKICAgICAgICAgZnByaW50Zihz dGRlcnIsICIlcyIsIGluZGVudC51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgbm9kZS0+c2hvd05v ZGUoKTsKLQogICAgICAgICBpZiAobm9kZS0+aXNTaGFkb3dSb290KCkpIHsKLSAgICAgICAgICAg IGlmIChTaGFkb3dSb290KiB5b3VuZ2VyU2hhZG93Um9vdCA9IHRvU2hhZG93Um9vdChjb25zdF9j YXN0PE5vZGUqPihub2RlKSktPnlvdW5nZXJTaGFkb3dSb290KCkpCisgICAgICAgICAgICBpZiAo U2hhZG93Um9vdCogeW91bmdlclNoYWRvd1Jvb3QgPSB0b1NoYWRvd1Jvb3Qobm9kZSktPnlvdW5n ZXJTaGFkb3dSb290KCkpCiAgICAgICAgICAgICAgICAgdHJhdmVyc2VUcmVlQW5kTWFyayhpbmRl bnQgKyAiXHQiLCB5b3VuZ2VyU2hhZG93Um9vdCwgbWFya2VkTm9kZTEsIG1hcmtlZExhYmVsMSwg bWFya2VkTm9kZTIsIG1hcmtlZExhYmVsMik7Ci0gICAgICAgIH0gZWxzZSBpZiAoU2hhZG93Um9v dCogcm9vdE5vZGUgPSBvbGRlc3RTaGFkb3dSb290KGNvbnN0X2Nhc3Q8Tm9kZSo+KG5vZGUpKSkK LSAgICAgICAgICAgIHRyYXZlcnNlVHJlZUFuZE1hcmsoaW5kZW50ICsgIlx0Iiwgcm9vdE5vZGUs IG1hcmtlZE5vZGUxLCBtYXJrZWRMYWJlbDEsIG1hcmtlZE5vZGUyLCBtYXJrZWRMYWJlbDIpOwor ICAgICAgICB9IGVsc2UgaWYgKFNoYWRvd1Jvb3QqIG9sZGVzdFNoYWRvd1Jvb3QgPSBvbGRlc3RT aGFkb3dSb290Rm9yKG5vZGUpKQorICAgICAgICAgICAgdHJhdmVyc2VUcmVlQW5kTWFyayhpbmRl bnQgKyAiXHQiLCBvbGRlc3RTaGFkb3dSb290LCBtYXJrZWROb2RlMSwgbWFya2VkTGFiZWwxLCBt YXJrZWROb2RlMiwgbWFya2VkTGFiZWwyKTsKICAgICB9CiB9CiAKQEAgLTIzMDQsNyArMjMwMyw3 IEBAIHZvaWQgTm9kZTo6Zm9ybWF0Rm9yRGVidWdnZXIoY2hhciogYnVmZmVyLCB1bnNpZ25lZCBs ZW5ndGgpIGNvbnN0CiAgICAgc3RybmNweShidWZmZXIsIHJlc3VsdC51dGY4KCkuZGF0YSgpLCBs ZW5ndGggLSAxKTsKIH0KIAotc3RhdGljIENvbnRhaW5lck5vZGUqIHBhcmVudE9ySG9zdE9yRnJh bWVPd25lcihOb2RlKiBub2RlKQorc3RhdGljIENvbnRhaW5lck5vZGUqIHBhcmVudE9ySG9zdE9y RnJhbWVPd25lcihjb25zdCBOb2RlKiBub2RlKQogewogICAgIENvbnRhaW5lck5vZGUqIHBhcmVu dCA9IG5vZGUtPnBhcmVudE9ySG9zdE5vZGUoKTsKICAgICBpZiAoIXBhcmVudCAmJiBub2RlLT5k b2N1bWVudCgpICYmIG5vZGUtPmRvY3VtZW50KCktPmZyYW1lKCkpCkBAIC0yMzEyLDE5ICsyMzEx LDIxIEBAIHN0YXRpYyBDb250YWluZXJOb2RlKiBwYXJlbnRPckhvc3RPckZyYW1lT3duZXIoTm9k ZSogbm9kZSkKICAgICByZXR1cm4gcGFyZW50OwogfQogCi1zdGF0aWMgdm9pZCBzaG93U3ViVHJl ZUFjcm9zc0ZyYW1lKE5vZGUqIG5vZGUsIGNvbnN0IE5vZGUqIG1hcmtlZE5vZGUsIGNvbnN0IFN0 cmluZyYgaW5kZW50KQorc3RhdGljIHZvaWQgc2hvd1N1YlRyZWVBY3Jvc3NGcmFtZShjb25zdCBO b2RlKiBub2RlLCBjb25zdCBOb2RlKiBtYXJrZWROb2RlLCBjb25zdCBTdHJpbmcmIGluZGVudCkK IHsKICAgICBpZiAobm9kZSA9PSBtYXJrZWROb2RlKQogICAgICAgICBmcHV0cygiKiIsIHN0ZGVy cik7CiAgICAgZnB1dHMoaW5kZW50LnV0ZjgoKS5kYXRhKCksIHN0ZGVycik7CiAgICAgbm9kZS0+ c2hvd05vZGUoKTsKLSAgICBpZiAobm9kZS0+aXNGcmFtZU93bmVyRWxlbWVudCgpKQotICAgICAg ICBzaG93U3ViVHJlZUFjcm9zc0ZyYW1lKHN0YXRpY19jYXN0PEhUTUxGcmFtZU93bmVyRWxlbWVu dCo+KG5vZGUpLT5jb250ZW50RG9jdW1lbnQoKSwgbWFya2VkTm9kZSwgaW5kZW50ICsgIlx0Iik7 Ci0gICAgaWYgKG5vZGUtPmlzU2hhZG93Um9vdCgpKSB7Ci0gICAgICAgIGlmIChTaGFkb3dSb290 KiB5b3VuZ2VyU2hhZG93Um9vdCA9IHRvU2hhZG93Um9vdChub2RlKS0+eW91bmdlclNoYWRvd1Jv b3QoKSkKLSAgICAgICAgICAgIHNob3dTdWJUcmVlQWNyb3NzRnJhbWUoeW91bmdlclNoYWRvd1Jv b3QsIG1hcmtlZE5vZGUsIGluZGVudCArICJcdCIpOwotICAgIH0gZWxzZSBpZiAoU2hhZG93Um9v dCogc2hhZG93Um9vdCA9IG9sZGVzdFNoYWRvd1Jvb3Qobm9kZSkpCi0gICAgICAgIHNob3dTdWJU cmVlQWNyb3NzRnJhbWUoc2hhZG93Um9vdCwgbWFya2VkTm9kZSwgaW5kZW50ICsgIlx0Iik7Cisg ICAgIGlmIChub2RlLT5pc1NoYWRvd1Jvb3QoKSkgeworICAgICAgICAgaWYgKFNoYWRvd1Jvb3Qq IHlvdW5nZXJTaGFkb3dSb290ID0gdG9TaGFkb3dSb290KG5vZGUpLT55b3VuZ2VyU2hhZG93Um9v dCgpKQorICAgICAgICAgICAgIHNob3dTdWJUcmVlQWNyb3NzRnJhbWUoeW91bmdlclNoYWRvd1Jv b3QsIG1hcmtlZE5vZGUsIGluZGVudCArICJcdCIpOworICAgICB9IGVsc2UgeworICAgICAgICAg aWYgKG5vZGUtPmlzRnJhbWVPd25lckVsZW1lbnQoKSkKKyAgICAgICAgICAgICBzaG93U3ViVHJl ZUFjcm9zc0ZyYW1lKHN0YXRpY19jYXN0PGNvbnN0IEhUTUxGcmFtZU93bmVyRWxlbWVudCo+KG5v ZGUpLT5jb250ZW50RG9jdW1lbnQoKSwgbWFya2VkTm9kZSwgaW5kZW50ICsgIlx0Iik7CisgICAg ICAgICBpZiAoU2hhZG93Um9vdCogb2xkZXN0U2hhZG93Um9vdCA9IG9sZGVzdFNoYWRvd1Jvb3RG b3Iobm9kZSkpCisgICAgICAgICAgICAgc2hvd1N1YlRyZWVBY3Jvc3NGcmFtZShvbGRlc3RTaGFk b3dSb290LCBtYXJrZWROb2RlLCBpbmRlbnQgKyAiXHQiKTsKKyAgICAgfQogICAgIGZvciAoTm9k ZSogY2hpbGQgPSBub2RlLT5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0 U2libGluZygpKQogICAgICAgICBzaG93U3ViVHJlZUFjcm9zc0ZyYW1lKGNoaWxkLCBtYXJrZWRO b2RlLCBpbmRlbnQgKyAiXHQiKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9T aGFkb3dSb290LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Um9vdC5oCmluZGV4IGQzYmYz NTEyNjRjZmQzMmI2ZmUzYzE0NTQ3YjhhZmQ1MGViYzE2ZDMuLjU1NDgzNGZmYjlmNDUzZGYxYzhm YzdkZTFlNmUwNTZiOGM3NWI1M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TaGFk b3dSb290LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd1Jvb3QuaApAQCAtNzEsOCAr NzEsOCBAQCBwdWJsaWM6CiAKICAgICBFbGVtZW50KiBob3N0KCkgY29uc3QgeyByZXR1cm4gc2hh ZG93SG9zdCgpOyB9CiAKLSAgICBTaGFkb3dSb290KiB5b3VuZ2VyU2hhZG93Um9vdCgpIHsgcmV0 dXJuIHByZXYoKTsgfQotICAgIFNoYWRvd1Jvb3QqIG9sZGVyU2hhZG93Um9vdCgpIHsgcmV0dXJu IG5leHQoKTsgfQorICAgIFNoYWRvd1Jvb3QqIHlvdW5nZXJTaGFkb3dSb290KCkgY29uc3QgeyBy ZXR1cm4gcHJldigpOyB9CisgICAgU2hhZG93Um9vdCogb2xkZXJTaGFkb3dSb290KCkgY29uc3Qg eyByZXR1cm4gbmV4dCgpOyB9CiAKIHByaXZhdGU6CiAgICAgU2hhZG93Um9vdChEb2N1bWVudCop OwpAQCAtMTAwLDEwICsxMDAsMTUgQEAgaW5saW5lIGJvb2wgU2hhZG93Um9vdDo6bmVlZHNSZWF0 dGFjaEhvc3RDaGlsZHJlbkFuZFNoYWRvdygpCiAgICAgcmV0dXJuIG1fbmVlZHNSZWNhbGN1bGF0 ZUNvbnRlbnQgfHwgaGFzQ29udGVudEVsZW1lbnQoKTsKIH0KIAotaW5saW5lIFNoYWRvd1Jvb3Qq IHRvU2hhZG93Um9vdChOb2RlKiBub2RlKQoraW5saW5lIGNvbnN0IFNoYWRvd1Jvb3QqIHRvU2hh ZG93Um9vdChjb25zdCBOb2RlKiBub2RlKQogewogICAgIEFTU0VSVCghbm9kZSB8fCBub2RlLT5p c1NoYWRvd1Jvb3QoKSk7Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0PFNoYWRvd1Jvb3QqPihub2Rl KTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Y29uc3QgU2hhZG93Um9vdCo+KG5vZGUpOworfQor CitpbmxpbmUgU2hhZG93Um9vdCogdG9TaGFkb3dSb290KE5vZGUqIG5vZGUpCit7CisgICAgcmV0 dXJuIGNvbnN0X2Nhc3Q8U2hhZG93Um9vdCo+KHRvU2hhZG93Um9vdChzdGF0aWNfY2FzdDxjb25z dCBOb2RlKj4obm9kZSkpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UK