96450 2012-09-11 16:55:10 -0700 [Scoped Style] NodeRareData::m_numberOfScopedHTMLStyleChildren could be replaced with a node flag. 2012-09-12 09:54:35 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 72352 59827 1 morrita morrita webcomponents-bugzilla webkit.review.bot oldest_to_newest 717734 0 morrita 2012-09-11 16:55:10 -0700 Since this member is hit frequently in StyleResolver, this looks worth killed by a bit flag, which is much efficient. 717801 1 163493 morrita 2012-09-11 18:41:50 -0700 Created attachment 163493 Patch 717874 2 163493 dglazkov 2012-09-11 20:38:30 -0700 Comment on attachment 163493 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163493&action=review > Source/WebCore/ChangeLog:10 > + Instead of tracking the number of certain node, this chagne compute the number chagne->change > Source/WebCore/html/HTMLStyleElement.cpp:128 > + // Note: We cannot rely on the 'scoped' element still being present when this method is invoked. I think he meant 'scoped' _attribute_? 717876 3 163493 buildbot 2012-09-11 20:42:23 -0700 Comment on attachment 163493 Patch Attachment 163493 did not pass win-ews (win): Output: http://queues.webkit.org/results/13832193 717890 4 163493 buildbot 2012-09-11 21:17:15 -0700 Comment on attachment 163493 Patch Attachment 163493 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/13827484 718435 5 morrita 2012-09-12 09:11:14 -0700 Dimitri, thank for taking a look at such a late at night! I'll address the points and land the change. (In reply to comment #2) > (From update of attachment 163493 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=163493&action=review > > > Source/WebCore/ChangeLog:10 > > + Instead of tracking the number of certain node, this chagne compute the number > > chagne->change Will fix. hmm. > > > Source/WebCore/html/HTMLStyleElement.cpp:128 > > + // Note: We cannot rely on the 'scoped' element still being present when this method is invoked. > > I think he meant 'scoped' _attribute_? Well, I just moved this around. But yes, it looks. Will fix. 718441 6 163646 morrita 2012-09-12 09:21:06 -0700 Created attachment 163646 Patch for landing 718474 7 163646 webkit.review.bot 2012-09-12 09:54:32 -0700 Comment on attachment 163646 Patch for landing Clearing flags on attachment: 163646 Committed r128331: <http://trac.webkit.org/changeset/128331> 718475 8 webkit.review.bot 2012-09-12 09:54:35 -0700 All reviewed patches have been landed. Closing bug. 163493 2012-09-11 18:41:50 -0700 2012-09-12 09:21:02 -0700 Patch bug-96450-20120912104124.patch text/plain 8900 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzI1NTUxOGIyOWE1MmQ4 ZmVjYzI3ZDYwN2QzNjA5ZWNiZjBhODlhYi4uNGZkNmE1NDRmNGEwMWNiNDIyOWVlZGFlN2EzZDQ2 MjFjYWNlY2RmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDEyLTA5LTExIE1PUklU QSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CisKKyAgICAgICAgW1Njb3BlZCBTdHlsZV0g Tm9kZVJhcmVEYXRhOjptX251bWJlck9mU2NvcGVkSFRNTFN0eWxlQ2hpbGRyZW4gY291bGQgYmUg cmVwbGFjZWQgd2l0aCBhIG5vZGUgZmxhZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTk2NDUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgZ2V0cyByaWQgb2YgTm9kZVJhcmVEYXRhOjpt X251bWJlck9mU2NvcGVkSFRNTFN0eWxlQ2hpbGRyZW4KKyAgICAgICAgYnkgcmVwbGFjaW5nIGl0 IHdpdGggYSBOb2RlIGZsYWcgY2FsbGVkIEhhc1Njb3BlZEhUTUxTdHlsZUNoaWxkRmxhZy4KKyAg ICAgICAgSW5zdGVhZCBvZiB0cmFja2luZyB0aGUgbnVtYmVyIG9mIGNlcnRhaW4gbm9kZSwgdGhp cyBjaGFnbmUgY29tcHV0ZSB0aGUgbnVtYmVyCisgICAgICAgIHdoZW4gbmVjZXNzYXJ5LgorCisg ICAgICAgIE5vdyB3ZSBubyBsb25nZXIgbmVlZCB0byBoaXQgcmFyZURhdGEoKSBmb3IgZWFjaCBo YXNTY29wZWRIVE1MU3R5bGVDaGlsZCgpIGNhbGwuCisgICAgICAgIE5vdGUgdGhhdCBiZWNhdXNl IHN1Y2ggYSByZS1jb3VudGluZyBvY2N1cnMgb25seSB3aGVuIHRoZSBzY29wZWQgPHN0eWxlPiBl bGVtZW50cworICAgICAgICBsZWF2ZSB0aGUgdHJlZSwgdGhlIHBlcmZvcm1hbmNlIGltcGFjdCBp cyBuZWdsaWdpYmxlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gQ292ZXJlZCBieSBleGlzdGlu ZyB0ZXN0cy4KKworICAgICAgICAqIGRvbS9Ob2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgor ICAgICAgICAqIGRvbS9Ob2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpoYXNTY29wZWRI VE1MU3R5bGVDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpzZXRIYXNTY29wZWRIVE1M U3R5bGVDaGlsZCk6CisgICAgICAgIChOb2RlKToKKyAgICAgICAgKiBkb20vTm9kZVJhcmVEYXRh Lmg6CisgICAgICAgIChXZWJDb3JlOjpOb2RlUmFyZURhdGE6Ok5vZGVSYXJlRGF0YSk6CisgICAg ICAgIChOb2RlUmFyZURhdGEpOgorICAgICAgICAqIGh0bWwvSFRNTFN0eWxlRWxlbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MU3R5bGVFbGVtZW50Ojppc1JlZ2lzdGVyZWRBc1Njb3Bl ZCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnJlZ2lzdGVy U2NvcGVkSFRNTFN0eWxlQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6dW5yZWdpc3Rl clNjb3BlZEhUTUxTdHlsZUNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6Om51bWJlck9m U2NvcGVkSFRNTFN0eWxlQ2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFN0eWxlRWxl bWVudDo6dW5yZWdpc3RlcldpdGhTY29waW5nTm9kZSk6CisgICAgICAgICogaHRtbC9IVE1MU3R5 bGVFbGVtZW50Lmg6CisgICAgICAgIChIVE1MU3R5bGVFbGVtZW50KToKKwogMjAxMi0wOS0xMSAg QW5kcmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRWxlbWVudEF0dHJp YnV0ZURhdGE6IFVzZSBzdWJjbGFzc2VzIHRvIG1hbmFnZSB2YXJ5aW5nIG9iamVjdCBsYXlvdXRz LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwIGIvU291cmNlL1dlYkNv cmUvZG9tL05vZGUuY3BwCmluZGV4IDg4YjVlMDVmZWU1MzhhZTg3M2IwMGQxMzNmNTcyMDU0Y2Nj YzMwODQuLjM1M2QyODNkMDM4ZjFhZDFlNGUxMzlhY2Q0YThiMzQ2YzUzYTE4Y2MgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v Tm9kZS5jcHAKQEAgLTI1MzUsNDAgKzI1MzUsNiBAQCB2b2lkIE5vZGU6Om5vdGlmeU11dGF0aW9u T2JzZXJ2ZXJzTm9kZVdpbGxEZXRhY2goKQogfQogI2VuZGlmIC8vIEVOQUJMRShNVVRBVElPTl9P QlNFUlZFUlMpCiAKLSNpZiBFTkFCTEUoU1RZTEVfU0NPUEVEKQotYm9vbCBOb2RlOjpoYXNTY29w ZWRIVE1MU3R5bGVDaGlsZCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGhhc1JhcmVEYXRhKCkgJiYg cmFyZURhdGEoKS0+aGFzU2NvcGVkSFRNTFN0eWxlQ2hpbGQoKTsKLX0KLQotc2l6ZV90IE5vZGU6 Om51bWJlck9mU2NvcGVkSFRNTFN0eWxlQ2hpbGRyZW4oKSBjb25zdAotewotICAgIHJldHVybiBo YXNSYXJlRGF0YSgpID8gcmFyZURhdGEoKS0+bnVtYmVyT2ZTY29wZWRIVE1MU3R5bGVDaGlsZHJl bigpIDogMDsKLX0KLQotdm9pZCBOb2RlOjpyZWdpc3RlclNjb3BlZEhUTUxTdHlsZUNoaWxkKCkK LXsKLSAgICBlbnN1cmVSYXJlRGF0YSgpLT5yZWdpc3RlclNjb3BlZEhUTUxTdHlsZUNoaWxkKCk7 Ci19Ci0KLXZvaWQgTm9kZTo6dW5yZWdpc3RlclNjb3BlZEhUTUxTdHlsZUNoaWxkKCkKLXsKLSAg ICBBU1NFUlQoaGFzUmFyZURhdGEoKSk7Ci0gICAgaWYgKGhhc1JhcmVEYXRhKCkpCi0gICAgICAg IHJhcmVEYXRhKCktPnVucmVnaXN0ZXJTY29wZWRIVE1MU3R5bGVDaGlsZCgpOwotfQotI2Vsc2UK LWJvb2wgTm9kZTo6aGFzU2NvcGVkSFRNTFN0eWxlQ2hpbGQoKSBjb25zdAotewotICAgIHJldHVy biAwOwotfQotCi1zaXplX3QgTm9kZTo6bnVtYmVyT2ZTY29wZWRIVE1MU3R5bGVDaGlsZHJlbigp IGNvbnN0Ci17Ci0gICAgcmV0dXJuIDA7Ci19Ci0jZW5kaWYKLQogdm9pZCBOb2RlOjpoYW5kbGVM b2NhbEV2ZW50cyhFdmVudCogZXZlbnQpCiB7CiAgICAgaWYgKCFoYXNSYXJlRGF0YSgpIHx8ICFy YXJlRGF0YSgpLT5ldmVudFRhcmdldERhdGEoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Ob2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oCmluZGV4IGU5ZDdkNTMwOTI3 ZGQ2ZTdmNTYxMmI4YzcyNzhjOTc4NzM2MTc3NzguLjE0MDI2MTBhMmU3OWEwMjQyN2QzYWRjMDJh NTdmOWNmNzc5NzBlNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaApAQCAtMzQ5LDYgKzM0OSw5IEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldEhhc0F0dHJMaXN0KCkgeyBzZXRGbGFnKEhhc0F0dHJMaXN0RmxhZyk7IH0K ICAgICB2b2lkIGNsZWFySGFzQXR0ckxpc3QoKSB7IGNsZWFyRmxhZyhIYXNBdHRyTGlzdEZsYWcp OyB9CiAKKyAgICBib29sIGhhc1Njb3BlZEhUTUxTdHlsZUNoaWxkKCkgY29uc3QgeyByZXR1cm4g Z2V0RmxhZyhIYXNTY29wZWRIVE1MU3R5bGVDaGlsZEZsYWcpOyB9CisgICAgdm9pZCBzZXRIYXNT Y29wZWRIVE1MU3R5bGVDaGlsZChib29sIGZsYWcpIHsgc2V0RmxhZyhmbGFnLCBIYXNTY29wZWRI VE1MU3R5bGVDaGlsZEZsYWcpOyB9CisKICAgICBlbnVtIFNob3VsZFNldEF0dGFjaGVkIHsKICAg ICAgICAgU2V0QXR0YWNoZWQsCiAgICAgICAgIERvTm90U2V0QXR0YWNoZWQKQEAgLTY1OCwxMSAr NjYxLDggQEAgcHVibGljOgogICAgIHZvaWQgbm90aWZ5TXV0YXRpb25PYnNlcnZlcnNOb2RlV2ls bERldGFjaCgpOwogI2VuZGlmIC8vIEVOQUJMRShNVVRBVElPTl9PQlNFUlZFUlMpCiAKLSNpZiBF TkFCTEUoU1RZTEVfU0NPUEVEKQogICAgIHZvaWQgcmVnaXN0ZXJTY29wZWRIVE1MU3R5bGVDaGls ZCgpOwogICAgIHZvaWQgdW5yZWdpc3RlclNjb3BlZEhUTUxTdHlsZUNoaWxkKCk7Ci0jZW5kaWYK LSAgICBib29sIGhhc1Njb3BlZEhUTUxTdHlsZUNoaWxkKCkgY29uc3Q7CiAgICAgc2l6ZV90IG51 bWJlck9mU2NvcGVkSFRNTFN0eWxlQ2hpbGRyZW4oKSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9p ZCByZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKikgY29uc3Q7CkBAIC03MTAsMTAg KzcxMCwxMSBAQCBwcml2YXRlOgogI2VuZGlmCiAgICAgICAgIEluTmFtZWRGbG93RmxhZyA9IDEg PDwgMjYsCiAgICAgICAgIEhhc0F0dHJMaXN0RmxhZyA9IDEgPDwgMjcsCi0gICAgICAgIEhhc0N1 c3RvbUNhbGxiYWNrc0ZsYWcgPSAxIDw8IDI4CisgICAgICAgIEhhc0N1c3RvbUNhbGxiYWNrc0Zs YWcgPSAxIDw8IDI4LAorICAgICAgICBIYXNTY29wZWRIVE1MU3R5bGVDaGlsZEZsYWcgPSAxIDw8 IDI5CiAgICAgfTsKIAotICAgIC8vIDQgYml0cyByZW1haW5pbmcKKyAgICAvLyAzIGJpdHMgcmVt YWluaW5nCiAKICAgICBib29sIGdldEZsYWcoTm9kZUZsYWdzIG1hc2spIGNvbnN0IHsgcmV0dXJu IG1fbm9kZUZsYWdzICYgbWFzazsgfQogICAgIHZvaWQgc2V0RmxhZyhib29sIGYsIE5vZGVGbGFn cyBtYXNrKSBjb25zdCB7IG1fbm9kZUZsYWdzID0gKG1fbm9kZUZsYWdzICYgfm1hc2spIHwgKC0o aW50MzJfdClmICYgbWFzayk7IH0gCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9k ZVJhcmVEYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJhcmVEYXRhLmgKaW5kZXggMWZk ZWJiNmQyMTg3MzQ4NTQ0YzgzMjBlMmM1NWQ2YmQ4NzA5NzdmNC4uNjczYTExMjMxNGY4NTFlYzg2 ZjY1NTk4ZTRhNTcwMjJlMDE3M2VlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05v ZGVSYXJlRGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmFyZURhdGEuaApAQCAt MTg2LDkgKzE4Niw2IEBAIHB1YmxpYzoKICAgICAgICAgLCBtX3RhYkluZGV4V2FzU2V0RXhwbGlj aXRseShmYWxzZSkKICAgICAgICAgLCBtX2lzRm9jdXNlZChmYWxzZSkKICAgICAgICAgLCBtX25l ZWRzRm9jdXNBcHBlYXJhbmNlVXBkYXRlU29vbkFmdGVyQXR0YWNoKGZhbHNlKQotI2lmIEVOQUJM RShTVFlMRV9TQ09QRUQpCi0gICAgICAgICwgbV9udW1iZXJPZlNjb3BlZEhUTUxTdHlsZUNoaWxk cmVuKDApCi0jZW5kaWYKICAgICB7CiAgICAgfQogCkBAIC0zMTEsMzAgKzMwOCw2IEBAIHB1Ymxp YzoKICAgICB9CiAjZW5kaWYKIAotI2lmIEVOQUJMRShTVFlMRV9TQ09QRUQpCi0gICAgdm9pZCBy ZWdpc3RlclNjb3BlZEhUTUxTdHlsZUNoaWxkKCkKLSAgICB7Ci0gICAgICAgICsrbV9udW1iZXJP ZlNjb3BlZEhUTUxTdHlsZUNoaWxkcmVuOwotICAgIH0KLQotICAgIHZvaWQgdW5yZWdpc3RlclNj b3BlZEhUTUxTdHlsZUNoaWxkKCkKLSAgICB7Ci0gICAgICAgIEFTU0VSVChtX251bWJlck9mU2Nv cGVkSFRNTFN0eWxlQ2hpbGRyZW4gPiAwKTsKLSAgICAgICAgaWYgKG1fbnVtYmVyT2ZTY29wZWRI VE1MU3R5bGVDaGlsZHJlbiA+IDApCi0gICAgICAgICAgICAtLW1fbnVtYmVyT2ZTY29wZWRIVE1M U3R5bGVDaGlsZHJlbjsKLSAgICB9Ci0KLSAgICBib29sIGhhc1Njb3BlZEhUTUxTdHlsZUNoaWxk KCkgY29uc3QKLSAgICB7Ci0gICAgICAgIHJldHVybiBtX251bWJlck9mU2NvcGVkSFRNTFN0eWxl Q2hpbGRyZW47Ci0gICAgfQotCi0gICAgc2l6ZV90IG51bWJlck9mU2NvcGVkSFRNTFN0eWxlQ2hp bGRyZW4oKSBjb25zdAotICAgIHsKLSAgICAgICAgcmV0dXJuIG1fbnVtYmVyT2ZTY29wZWRIVE1M U3R5bGVDaGlsZHJlbjsKLSAgICB9Ci0jZW5kaWYKLQogICAgIGJvb2wgaXNGb2N1c2VkKCkgY29u c3QgeyByZXR1cm4gbV9pc0ZvY3VzZWQ7IH0KICAgICB2b2lkIHNldEZvY3VzZWQoYm9vbCBmb2N1 c2VkKSB7IG1faXNGb2N1c2VkID0gZm9jdXNlZDsgfQogCkBAIC0zNjQsMTAgKzMzNyw2IEBAIHBy aXZhdGU6CiAgICAgbXV0YWJsZSBSZWZQdHI8RE9NU2V0dGFibGVUb2tlbkxpc3Q+IG1faXRlbVJl ZjsKICAgICBtdXRhYmxlIFJlZlB0cjxET01TZXR0YWJsZVRva2VuTGlzdD4gbV9pdGVtVHlwZTsK ICNlbmRpZgotCi0jaWYgRU5BQkxFKFNUWUxFX1NDT1BFRCkKLSAgICBzaXplX3QgbV9udW1iZXJP ZlNjb3BlZEhUTUxTdHlsZUNoaWxkcmVuOwotI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU3R5bGVFbGVtZW50LmNwcAppbmRleCAyNjk5 MGE1ZGYyODRhOTdjNmEyNDFmNWM3MGEyOGViOGQ4NzdlOTE4Li42MTI2ZTExNTA3MmM3YmE1MDYw YjIzYzY1YTBkODE2MThmMjAwNDY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxTdHlsZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN0eWxlRWxl bWVudC5jcHAKQEAgLTEyMyw2ICsxMjMsNDIgQEAgdm9pZCBIVE1MU3R5bGVFbGVtZW50OjpmaW5p c2hQYXJzaW5nQ2hpbGRyZW4oKQogfQogCiAjaWYgRU5BQkxFKFNUWUxFX1NDT1BFRCkKK2lubGlu ZSBib29sIEhUTUxTdHlsZUVsZW1lbnQ6OmlzUmVnaXN0ZXJlZEFzU2NvcGVkKCkgY29uc3QKK3sK KyAgICAvLyBOb3RlOiBXZSBjYW5ub3QgcmVseSBvbiB0aGUgJ3Njb3BlZCcgZWxlbWVudCBzdGls bCBiZWluZyBwcmVzZW50IHdoZW4gdGhpcyBtZXRob2QgaXMgaW52b2tlZC4KKyAgICAvLyBUaGVy ZWZvcmUgd2UgY2Fubm90IHJlbHkgb24gc2NvcGVkKCkhCisgICAgaWYgKG1fc2NvcGVkU3R5bGVS ZWdpc3RyYXRpb25TdGF0ZSA9PSBOb3RSZWdpc3RlcmVkKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgaWYgKCFDb250ZXh0RmVhdHVyZXM6OnN0eWxlU2NvcGVkRW5hYmxlZChkb2N1bWVudCgp KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiB0cnVlOworfQorCisvLyBUaGVz ZSB0aHJlZSBOb2RlIG1ldGhvZHMgYXJlIHBsYWNlZCBoZXJlIHRvCisvLyBtYWtlIHRoZSBoZWFk ZXIgaW5jbHVzaW9uIGRlcGVuZGVuY3kgc2FuZS4KKworaW5saW5lIHZvaWQgTm9kZTo6cmVnaXN0 ZXJTY29wZWRIVE1MU3R5bGVDaGlsZCgpCit7CisgICAgc2V0SGFzU2NvcGVkSFRNTFN0eWxlQ2hp bGQodHJ1ZSk7Cit9CisKK2lubGluZSB2b2lkIE5vZGU6OnVucmVnaXN0ZXJTY29wZWRIVE1MU3R5 bGVDaGlsZCgpCit7CisgICAgQVNTRVJUKGhhc1Njb3BlZEhUTUxTdHlsZUNoaWxkKCkpOworICAg IHNldEhhc1Njb3BlZEhUTUxTdHlsZUNoaWxkKG51bWJlck9mU2NvcGVkSFRNTFN0eWxlQ2hpbGRy ZW4oKSk7Cit9CisKK3NpemVfdCBOb2RlOjpudW1iZXJPZlNjb3BlZEhUTUxTdHlsZUNoaWxkcmVu KCkgY29uc3QKK3sKKyAgICBzaXplX3QgY291bnQgPSAwOworICAgIGZvciAoTm9kZSogY2hpbGQg PSBmaXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7Cisg ICAgICAgIGlmIChjaGlsZC0+aGFzVGFnTmFtZShzdHlsZVRhZykgJiYgc3RhdGljX2Nhc3Q8SFRN TFN0eWxlRWxlbWVudCo+KGNoaWxkKS0+aXNSZWdpc3RlcmVkQXNTY29wZWQoKSkKKyAgICAgICAg ICAgIGNvdW50Kys7CisgICAgfQorCisgICAgcmV0dXJuIGNvdW50OworfQorCiB2b2lkIEhUTUxT dHlsZUVsZW1lbnQ6OnJlZ2lzdGVyV2l0aFNjb3BpbmdOb2RlKGJvb2wgc2NvcGVkKQogewogICAg IC8vIE5vdGU6IFdlIGNhbm5vdCByZWx5IG9uIHRoZSAnc2NvcGVkJyBlbGVtZW50IGFscmVhZHkg YmVpbmcgcHJlc2VudCB3aGVuIHRoaXMgbWV0aG9kIGlzIGludm9rZWQuCkBAIC0xNTQsMTIgKzE5 MCw4IEBAIHZvaWQgSFRNTFN0eWxlRWxlbWVudDo6cmVnaXN0ZXJXaXRoU2NvcGluZ05vZGUoYm9v bCBzY29wZWQpCiAKIHZvaWQgSFRNTFN0eWxlRWxlbWVudDo6dW5yZWdpc3RlcldpdGhTY29waW5n Tm9kZShDb250YWluZXJOb2RlKiBzY29wZSkKIHsKLSAgICAvLyBOb3RlOiBXZSBjYW5ub3QgcmVs eSBvbiB0aGUgJ3Njb3BlZCcgZWxlbWVudCBzdGlsbCBiZWluZyBwcmVzZW50IHdoZW4gdGhpcyBt ZXRob2QgaXMgaW52b2tlZC4KLSAgICAvLyBUaGVyZWZvcmUgd2UgY2Fubm90IHJlbHkgb24gc2Nv cGVkKCkhCiAgICAgQVNTRVJUKG1fc2NvcGVkU3R5bGVSZWdpc3RyYXRpb25TdGF0ZSAhPSBOb3RS ZWdpc3RlcmVkIHx8ICFDb250ZXh0RmVhdHVyZXM6OnN0eWxlU2NvcGVkRW5hYmxlZChkb2N1bWVu dCgpKSk7Ci0gICAgaWYgKG1fc2NvcGVkU3R5bGVSZWdpc3RyYXRpb25TdGF0ZSA9PSBOb3RSZWdp c3RlcmVkKQotICAgICAgICByZXR1cm47Ci0gICAgaWYgKCFDb250ZXh0RmVhdHVyZXM6OnN0eWxl U2NvcGVkRW5hYmxlZChkb2N1bWVudCgpKSkKKyAgICBpZiAoIWlzUmVnaXN0ZXJlZEFzU2NvcGVk KCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIEFTU0VSVChzY29wZSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFN0eWxlRWxlbWVudC5oCmluZGV4IDYzYTgyYzRlZWZmZGU1NzE3YmQ3Zjg3YzU4M2Mz OWY0ZDVjNTZkZDIuLjg0NzZjNjQ4Zjg5YzM0ODk0NzVjZjY2ZWQ5N2YwYmRlZjNiZmQ3MjIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN0eWxlRWxlbWVudC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN0eWxlRWxlbWVudC5oCkBAIC00NSw2ICs0NSw3IEBAIHB1 YmxpYzoKICAgICBib29sIHNjb3BlZCgpIGNvbnN0OwogICAgIHZvaWQgc2V0U2NvcGVkKGJvb2wp OwogICAgIEVsZW1lbnQqIHNjb3BpbmdFbGVtZW50KCkgY29uc3Q7CisgICAgYm9vbCBpc1JlZ2lz dGVyZWRBc1Njb3BlZCgpIGNvbnN0OwogI2VuZGlmCiAKICAgICB1c2luZyBTdHlsZUVsZW1lbnQ6 OnNoZWV0Owo= 163646 2012-09-12 09:21:06 -0700 2012-09-12 09:54:32 -0700 Patch for landing bug-96450-20120913012039.patch text/plain 9255 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDMyZjk4Y2I4Y2E0ZDMy NGU5NTViMjc2MjBiZDgyMzdmNjFmNjc0Yi4uOWNiYmVhZTEyNDg5NTIxY2EzYzA4ZDlhMTNlNzI2 MzkzNTQ1YTVjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDEyLTA5LTExIE1PUklU QSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CisKKyAgICAgICAgW1Njb3BlZCBTdHlsZV0g Tm9kZVJhcmVEYXRhOjptX251bWJlck9mU2NvcGVkSFRNTFN0eWxlQ2hpbGRyZW4gY291bGQgYmUg cmVwbGFjZWQgd2l0aCBhIG5vZGUgZmxhZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTk2NDUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBH bGF6a292LgorCisgICAgICAgIFRoaXMgY2hhbmdlIGdldHMgcmlkIG9mIE5vZGVSYXJlRGF0YTo6 bV9udW1iZXJPZlNjb3BlZEhUTUxTdHlsZUNoaWxkcmVuCisgICAgICAgIGJ5IHJlcGxhY2luZyBp dCB3aXRoIGEgTm9kZSBmbGFnIGNhbGxlZCBIYXNTY29wZWRIVE1MU3R5bGVDaGlsZEZsYWcuCisg ICAgICAgIEluc3RlYWQgb2YgdHJhY2tpbmcgdGhlIG51bWJlciBvZiBjZXJ0YWluIG5vZGUsIHRo aXMgY2hhZ25lIGNvbXB1dGUgdGhlIG51bWJlcgorICAgICAgICB3aGVuIG5lY2Vzc2FyeS4KKwor ICAgICAgICBOb3cgd2Ugbm8gbG9uZ2VyIG5lZWQgdG8gaGl0IHJhcmVEYXRhKCkgZm9yIGVhY2gg aGFzU2NvcGVkSFRNTFN0eWxlQ2hpbGQoKSBjYWxsLgorICAgICAgICBOb3RlIHRoYXQgYmVjYXVz ZSBzdWNoIGEgcmUtY291bnRpbmcgb2NjdXJzIG9ubHkgd2hlbiB0aGUgc2NvcGVkIDxzdHlsZT4g ZWxlbWVudHMKKyAgICAgICAgbGVhdmUgdGhlIHRyZWUsIHRoZSBwZXJmb3JtYW5jZSBpbXBhY3Qg aXMgbmVnbGlnaWJsZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIENvdmVyZWQgYnkgZXhpc3Rp bmcgdGVzdHMuCisKKyAgICAgICAgKiBkb20vTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlKToK KyAgICAgICAgKiBkb20vTm9kZS5oOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6aGFzU2NvcGVk SFRNTFN0eWxlQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6c2V0SGFzU2NvcGVkSFRN TFN0eWxlQ2hpbGQpOgorICAgICAgICAoTm9kZSk6CisgICAgICAgICogZG9tL05vZGVSYXJlRGF0 YS5oOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZVJhcmVEYXRhOjpOb2RlUmFyZURhdGEpOgorICAg ICAgICAoTm9kZVJhcmVEYXRhKToKKyAgICAgICAgKiBodG1sL0hUTUxTdHlsZUVsZW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SFRNTFN0eWxlRWxlbWVudDo6aXNSZWdpc3RlcmVkQXNTY29w ZWQpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpyZWdpc3Rl clNjb3BlZEhUTUxTdHlsZUNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnVucmVnaXN0 ZXJTY29wZWRIVE1MU3R5bGVDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpudW1iZXJP ZlNjb3BlZEhUTUxTdHlsZUNoaWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTdHlsZUVs ZW1lbnQ6OnVucmVnaXN0ZXJXaXRoU2NvcGluZ05vZGUpOgorICAgICAgICAqIGh0bWwvSFRNTFN0 eWxlRWxlbWVudC5oOgorICAgICAgICAoSFRNTFN0eWxlRWxlbWVudCk6CisKIDIwMTItMDktMTIg IERvbWluaWMgTWF6em9uaSAgPGRtYXp6b25pQGdvb2dsZS5jb20+CiAKICAgICAgICAgQVg6IFJl ZmFjdG9yIG1vc3QgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCBjb2RlIGludG8gQWNjZXNzaWJp bGl0eU5vZGVPYmplY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAppbmRleCA4OGI1ZTA1ZmVlNTM4YWU4NzNiMDBk MTMzZjU3MjA1NGNjY2MzMDg0Li4zNTNkMjgzZDAzOGYxYWQxZTRlMTM5YWNkNGE4YjM0NmM1M2Ex OGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL05vZGUuY3BwCkBAIC0yNTM1LDQwICsyNTM1LDYgQEAgdm9pZCBOb2RlOjpu b3RpZnlNdXRhdGlvbk9ic2VydmVyc05vZGVXaWxsRGV0YWNoKCkKIH0KICNlbmRpZiAvLyBFTkFC TEUoTVVUQVRJT05fT0JTRVJWRVJTKQogCi0jaWYgRU5BQkxFKFNUWUxFX1NDT1BFRCkKLWJvb2wg Tm9kZTo6aGFzU2NvcGVkSFRNTFN0eWxlQ2hpbGQoKSBjb25zdAotewotICAgIHJldHVybiBoYXNS YXJlRGF0YSgpICYmIHJhcmVEYXRhKCktPmhhc1Njb3BlZEhUTUxTdHlsZUNoaWxkKCk7Ci19Ci0K LXNpemVfdCBOb2RlOjpudW1iZXJPZlNjb3BlZEhUTUxTdHlsZUNoaWxkcmVuKCkgY29uc3QKLXsK LSAgICByZXR1cm4gaGFzUmFyZURhdGEoKSA/IHJhcmVEYXRhKCktPm51bWJlck9mU2NvcGVkSFRN TFN0eWxlQ2hpbGRyZW4oKSA6IDA7Ci19Ci0KLXZvaWQgTm9kZTo6cmVnaXN0ZXJTY29wZWRIVE1M U3R5bGVDaGlsZCgpCi17Ci0gICAgZW5zdXJlUmFyZURhdGEoKS0+cmVnaXN0ZXJTY29wZWRIVE1M U3R5bGVDaGlsZCgpOwotfQotCi12b2lkIE5vZGU6OnVucmVnaXN0ZXJTY29wZWRIVE1MU3R5bGVD aGlsZCgpCi17Ci0gICAgQVNTRVJUKGhhc1JhcmVEYXRhKCkpOwotICAgIGlmIChoYXNSYXJlRGF0 YSgpKQotICAgICAgICByYXJlRGF0YSgpLT51bnJlZ2lzdGVyU2NvcGVkSFRNTFN0eWxlQ2hpbGQo KTsKLX0KLSNlbHNlCi1ib29sIE5vZGU6Omhhc1Njb3BlZEhUTUxTdHlsZUNoaWxkKCkgY29uc3QK LXsKLSAgICByZXR1cm4gMDsKLX0KLQotc2l6ZV90IE5vZGU6Om51bWJlck9mU2NvcGVkSFRNTFN0 eWxlQ2hpbGRyZW4oKSBjb25zdAotewotICAgIHJldHVybiAwOwotfQotI2VuZGlmCi0KIHZvaWQg Tm9kZTo6aGFuZGxlTG9jYWxFdmVudHMoRXZlbnQqIGV2ZW50KQogewogICAgIGlmICghaGFzUmFy ZURhdGEoKSB8fCAhcmFyZURhdGEoKS0+ZXZlbnRUYXJnZXREYXRhKCkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaAppbmRl eCBlOWQ3ZDUzMDkyN2RkNmU3ZjU2MTJiOGM3Mjc4Yzk3ODczNjE3Nzc4Li4xNDAyNjEwYTJlNzlh MDI0MjdkM2FkYzAyYTU3ZjljZjc3OTcwZTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k b20vTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKQEAgLTM0OSw2ICszNDks OSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRIYXNBdHRyTGlzdCgpIHsgc2V0RmxhZyhIYXNBdHRy TGlzdEZsYWcpOyB9CiAgICAgdm9pZCBjbGVhckhhc0F0dHJMaXN0KCkgeyBjbGVhckZsYWcoSGFz QXR0ckxpc3RGbGFnKTsgfQogCisgICAgYm9vbCBoYXNTY29wZWRIVE1MU3R5bGVDaGlsZCgpIGNv bnN0IHsgcmV0dXJuIGdldEZsYWcoSGFzU2NvcGVkSFRNTFN0eWxlQ2hpbGRGbGFnKTsgfQorICAg IHZvaWQgc2V0SGFzU2NvcGVkSFRNTFN0eWxlQ2hpbGQoYm9vbCBmbGFnKSB7IHNldEZsYWcoZmxh ZywgSGFzU2NvcGVkSFRNTFN0eWxlQ2hpbGRGbGFnKTsgfQorCiAgICAgZW51bSBTaG91bGRTZXRB dHRhY2hlZCB7CiAgICAgICAgIFNldEF0dGFjaGVkLAogICAgICAgICBEb05vdFNldEF0dGFjaGVk CkBAIC02NTgsMTEgKzY2MSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIG5vdGlmeU11dGF0aW9uT2Jz ZXJ2ZXJzTm9kZVdpbGxEZXRhY2goKTsKICNlbmRpZiAvLyBFTkFCTEUoTVVUQVRJT05fT0JTRVJW RVJTKQogCi0jaWYgRU5BQkxFKFNUWUxFX1NDT1BFRCkKICAgICB2b2lkIHJlZ2lzdGVyU2NvcGVk SFRNTFN0eWxlQ2hpbGQoKTsKICAgICB2b2lkIHVucmVnaXN0ZXJTY29wZWRIVE1MU3R5bGVDaGls ZCgpOwotI2VuZGlmCi0gICAgYm9vbCBoYXNTY29wZWRIVE1MU3R5bGVDaGlsZCgpIGNvbnN0Owog ICAgIHNpemVfdCBudW1iZXJPZlNjb3BlZEhUTUxTdHlsZUNoaWxkcmVuKCkgY29uc3Q7CiAKICAg ICB2aXJ0dWFsIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyopIGNvbnN0 OwpAQCAtNzEwLDEwICs3MTAsMTEgQEAgcHJpdmF0ZToKICNlbmRpZgogICAgICAgICBJbk5hbWVk Rmxvd0ZsYWcgPSAxIDw8IDI2LAogICAgICAgICBIYXNBdHRyTGlzdEZsYWcgPSAxIDw8IDI3LAot ICAgICAgICBIYXNDdXN0b21DYWxsYmFja3NGbGFnID0gMSA8PCAyOAorICAgICAgICBIYXNDdXN0 b21DYWxsYmFja3NGbGFnID0gMSA8PCAyOCwKKyAgICAgICAgSGFzU2NvcGVkSFRNTFN0eWxlQ2hp bGRGbGFnID0gMSA8PCAyOQogICAgIH07CiAKLSAgICAvLyA0IGJpdHMgcmVtYWluaW5nCisgICAg Ly8gMyBiaXRzIHJlbWFpbmluZwogCiAgICAgYm9vbCBnZXRGbGFnKE5vZGVGbGFncyBtYXNrKSBj b25zdCB7IHJldHVybiBtX25vZGVGbGFncyAmIG1hc2s7IH0KICAgICB2b2lkIHNldEZsYWcoYm9v bCBmLCBOb2RlRmxhZ3MgbWFzaykgY29uc3QgeyBtX25vZGVGbGFncyA9IChtX25vZGVGbGFncyAm IH5tYXNrKSB8ICgtKGludDMyX3QpZiAmIG1hc2spOyB9IApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZG9tL05vZGVSYXJlRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGVSYXJlRGF0 YS5oCmluZGV4IDFmZGViYjZkMjE4NzM0ODU0NGM4MzIwZTJjNTVkNmJkODcwOTc3ZjQuLjY3M2Ex MTIzMTRmODUxZWM4NmY2NTU5OGU0YTU3MDIyZTAxNzNlZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9Ob2RlUmFyZURhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJh cmVEYXRhLmgKQEAgLTE4Niw5ICsxODYsNiBAQCBwdWJsaWM6CiAgICAgICAgICwgbV90YWJJbmRl eFdhc1NldEV4cGxpY2l0bHkoZmFsc2UpCiAgICAgICAgICwgbV9pc0ZvY3VzZWQoZmFsc2UpCiAg ICAgICAgICwgbV9uZWVkc0ZvY3VzQXBwZWFyYW5jZVVwZGF0ZVNvb25BZnRlckF0dGFjaChmYWxz ZSkKLSNpZiBFTkFCTEUoU1RZTEVfU0NPUEVEKQotICAgICAgICAsIG1fbnVtYmVyT2ZTY29wZWRI VE1MU3R5bGVDaGlsZHJlbigwKQotI2VuZGlmCiAgICAgewogICAgIH0KIApAQCAtMzExLDMwICsz MDgsNiBAQCBwdWJsaWM6CiAgICAgfQogI2VuZGlmCiAKLSNpZiBFTkFCTEUoU1RZTEVfU0NPUEVE KQotICAgIHZvaWQgcmVnaXN0ZXJTY29wZWRIVE1MU3R5bGVDaGlsZCgpCi0gICAgewotICAgICAg ICArK21fbnVtYmVyT2ZTY29wZWRIVE1MU3R5bGVDaGlsZHJlbjsKLSAgICB9Ci0KLSAgICB2b2lk IHVucmVnaXN0ZXJTY29wZWRIVE1MU3R5bGVDaGlsZCgpCi0gICAgewotICAgICAgICBBU1NFUlQo bV9udW1iZXJPZlNjb3BlZEhUTUxTdHlsZUNoaWxkcmVuID4gMCk7Ci0gICAgICAgIGlmIChtX251 bWJlck9mU2NvcGVkSFRNTFN0eWxlQ2hpbGRyZW4gPiAwKQotICAgICAgICAgICAgLS1tX251bWJl ck9mU2NvcGVkSFRNTFN0eWxlQ2hpbGRyZW47Ci0gICAgfQotCi0gICAgYm9vbCBoYXNTY29wZWRI VE1MU3R5bGVDaGlsZCgpIGNvbnN0Ci0gICAgewotICAgICAgICByZXR1cm4gbV9udW1iZXJPZlNj b3BlZEhUTUxTdHlsZUNoaWxkcmVuOwotICAgIH0KLQotICAgIHNpemVfdCBudW1iZXJPZlNjb3Bl ZEhUTUxTdHlsZUNoaWxkcmVuKCkgY29uc3QKLSAgICB7Ci0gICAgICAgIHJldHVybiBtX251bWJl ck9mU2NvcGVkSFRNTFN0eWxlQ2hpbGRyZW47Ci0gICAgfQotI2VuZGlmCi0KICAgICBib29sIGlz Rm9jdXNlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNGb2N1c2VkOyB9CiAgICAgdm9pZCBzZXRGb2N1 c2VkKGJvb2wgZm9jdXNlZCkgeyBtX2lzRm9jdXNlZCA9IGZvY3VzZWQ7IH0KIApAQCAtMzY0LDEw ICszMzcsNiBAQCBwcml2YXRlOgogICAgIG11dGFibGUgUmVmUHRyPERPTVNldHRhYmxlVG9rZW5M aXN0PiBtX2l0ZW1SZWY7CiAgICAgbXV0YWJsZSBSZWZQdHI8RE9NU2V0dGFibGVUb2tlbkxpc3Q+ IG1faXRlbVR5cGU7CiAjZW5kaWYKLQotI2lmIEVOQUJMRShTVFlMRV9TQ09QRUQpCi0gICAgc2l6 ZV90IG1fbnVtYmVyT2ZTY29wZWRIVE1MU3R5bGVDaGlsZHJlbjsKLSNlbmRpZgogfTsKIAogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M U3R5bGVFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN0eWxlRWxlbWVudC5j cHAKaW5kZXggMjY5OTBhNWRmMjg0YTk3YzZhMjQxZjVjNzBhMjhlYjhkODc3ZTkxOC4uOWJmYzkx YTQzNTYzZTcyMmFlOGY2NDQ3YTRmYzIzMjA2Yjk0ZTg1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MU3R5bGVFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxTdHlsZUVsZW1lbnQuY3BwCkBAIC0xMjMsNiArMTIzLDQyIEBAIHZvaWQgSFRNTFN0eWxl RWxlbWVudDo6ZmluaXNoUGFyc2luZ0NoaWxkcmVuKCkKIH0KIAogI2lmIEVOQUJMRShTVFlMRV9T Q09QRUQpCitpbmxpbmUgYm9vbCBIVE1MU3R5bGVFbGVtZW50Ojppc1JlZ2lzdGVyZWRBc1Njb3Bl ZCgpIGNvbnN0Cit7CisgICAgLy8gTm90ZTogV2UgY2Fubm90IHJlbHkgb24gdGhlICdzY29wZWQn IGF0dHJpYnV0ZSBzdGlsbCBiZWluZyBwcmVzZW50IHdoZW4gdGhpcyBtZXRob2QgaXMgaW52b2tl ZC4KKyAgICAvLyBUaGVyZWZvcmUgd2UgY2Fubm90IHJlbHkgb24gc2NvcGVkKCkhCisgICAgaWYg KG1fc2NvcGVkU3R5bGVSZWdpc3RyYXRpb25TdGF0ZSA9PSBOb3RSZWdpc3RlcmVkKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFDb250ZXh0RmVhdHVyZXM6OnN0eWxlU2NvcGVkRW5h YmxlZChkb2N1bWVudCgpKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiB0cnVl OworfQorCisvLyBUaGVzZSB0aHJlZSBOb2RlIG1ldGhvZHMgYXJlIHBsYWNlZCBoZXJlIHRvCisv LyBtYWtlIHRoZSBoZWFkZXIgaW5jbHVzaW9uIGRlcGVuZGVuY3kgc2FuZS4KKworaW5saW5lIHZv aWQgTm9kZTo6cmVnaXN0ZXJTY29wZWRIVE1MU3R5bGVDaGlsZCgpCit7CisgICAgc2V0SGFzU2Nv cGVkSFRNTFN0eWxlQ2hpbGQodHJ1ZSk7Cit9CisKK2lubGluZSB2b2lkIE5vZGU6OnVucmVnaXN0 ZXJTY29wZWRIVE1MU3R5bGVDaGlsZCgpCit7CisgICAgQVNTRVJUKGhhc1Njb3BlZEhUTUxTdHls ZUNoaWxkKCkpOworICAgIHNldEhhc1Njb3BlZEhUTUxTdHlsZUNoaWxkKG51bWJlck9mU2NvcGVk SFRNTFN0eWxlQ2hpbGRyZW4oKSk7Cit9CisKK3NpemVfdCBOb2RlOjpudW1iZXJPZlNjb3BlZEhU TUxTdHlsZUNoaWxkcmVuKCkgY29uc3QKK3sKKyAgICBzaXplX3QgY291bnQgPSAwOworICAgIGZv ciAoTm9kZSogY2hpbGQgPSBmaXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0 U2libGluZygpKSB7CisgICAgICAgIGlmIChjaGlsZC0+aGFzVGFnTmFtZShzdHlsZVRhZykgJiYg c3RhdGljX2Nhc3Q8SFRNTFN0eWxlRWxlbWVudCo+KGNoaWxkKS0+aXNSZWdpc3RlcmVkQXNTY29w ZWQoKSkKKyAgICAgICAgICAgIGNvdW50Kys7CisgICAgfQorCisgICAgcmV0dXJuIGNvdW50Owor fQorCiB2b2lkIEhUTUxTdHlsZUVsZW1lbnQ6OnJlZ2lzdGVyV2l0aFNjb3BpbmdOb2RlKGJvb2wg c2NvcGVkKQogewogICAgIC8vIE5vdGU6IFdlIGNhbm5vdCByZWx5IG9uIHRoZSAnc2NvcGVkJyBl bGVtZW50IGFscmVhZHkgYmVpbmcgcHJlc2VudCB3aGVuIHRoaXMgbWV0aG9kIGlzIGludm9rZWQu CkBAIC0xNTQsMTIgKzE5MCw4IEBAIHZvaWQgSFRNTFN0eWxlRWxlbWVudDo6cmVnaXN0ZXJXaXRo U2NvcGluZ05vZGUoYm9vbCBzY29wZWQpCiAKIHZvaWQgSFRNTFN0eWxlRWxlbWVudDo6dW5yZWdp c3RlcldpdGhTY29waW5nTm9kZShDb250YWluZXJOb2RlKiBzY29wZSkKIHsKLSAgICAvLyBOb3Rl OiBXZSBjYW5ub3QgcmVseSBvbiB0aGUgJ3Njb3BlZCcgZWxlbWVudCBzdGlsbCBiZWluZyBwcmVz ZW50IHdoZW4gdGhpcyBtZXRob2QgaXMgaW52b2tlZC4KLSAgICAvLyBUaGVyZWZvcmUgd2UgY2Fu bm90IHJlbHkgb24gc2NvcGVkKCkhCiAgICAgQVNTRVJUKG1fc2NvcGVkU3R5bGVSZWdpc3RyYXRp b25TdGF0ZSAhPSBOb3RSZWdpc3RlcmVkIHx8ICFDb250ZXh0RmVhdHVyZXM6OnN0eWxlU2NvcGVk RW5hYmxlZChkb2N1bWVudCgpKSk7Ci0gICAgaWYgKG1fc2NvcGVkU3R5bGVSZWdpc3RyYXRpb25T dGF0ZSA9PSBOb3RSZWdpc3RlcmVkKQotICAgICAgICByZXR1cm47Ci0gICAgaWYgKCFDb250ZXh0 RmVhdHVyZXM6OnN0eWxlU2NvcGVkRW5hYmxlZChkb2N1bWVudCgpKSkKKyAgICBpZiAoIWlzUmVn aXN0ZXJlZEFzU2NvcGVkKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIEFTU0VSVChzY29wZSk7 CkBAIC0xNzMsNiArMjA1LDExIEBAIHZvaWQgSFRNTFN0eWxlRWxlbWVudDo6dW5yZWdpc3Rlcldp dGhTY29waW5nTm9kZShDb250YWluZXJOb2RlKiBzY29wZSkKIAogICAgIG1fc2NvcGVkU3R5bGVS ZWdpc3RyYXRpb25TdGF0ZSA9IE5vdFJlZ2lzdGVyZWQ7CiB9CisjZWxzZQorc2l6ZV90IE5vZGU6 Om51bWJlck9mU2NvcGVkSFRNTFN0eWxlQ2hpbGRyZW4oKSBjb25zdAoreworICAgIHJldHVybiAw OworfQogI2VuZGlmCiAKIE5vZGU6Okluc2VydGlvbk5vdGlmaWNhdGlvblJlcXVlc3QgSFRNTFN0 eWxlRWxlbWVudDo6aW5zZXJ0ZWRJbnRvKENvbnRhaW5lck5vZGUqIGluc2VydGlvblBvaW50KQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU3R5bGVFbGVtZW50LmggYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1lbnQuaAppbmRleCA2M2E4MmM0ZWVmZmRlNTcx N2JkN2Y4N2M1ODNjMzlmNGQ1YzU2ZGQyLi44NDc2YzY0OGY4OWMzNDg5NDc1Y2Y2NmVkOTdmMGJk ZWYzYmZkNzIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1l bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1lbnQuaApAQCAtNDUs NiArNDUsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBzY29wZWQoKSBjb25zdDsKICAgICB2b2lkIHNl dFNjb3BlZChib29sKTsKICAgICBFbGVtZW50KiBzY29waW5nRWxlbWVudCgpIGNvbnN0OworICAg IGJvb2wgaXNSZWdpc3RlcmVkQXNTY29wZWQoKSBjb25zdDsKICNlbmRpZgogCiAgICAgdXNpbmcg U3R5bGVFbGVtZW50OjpzaGVldDsK