97203 2012-09-20 05:55:46 -0700 Web Inspector: [Canvas] support 2D canvas instrumentation from the inspector C++ code 2012-09-24 06:01:16 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 96746 97338 97331 0 aandrey aandrey abarth apavlov bweinstein haraken japhet joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 724455 0 aandrey 2012-09-20 05:55:46 -0700 Patch to follow. 724459 1 164903 aandrey 2012-09-20 06:03:53 -0700 Created attachment 164903 Patch 725440 2 164903 yurys 2012-09-21 05:33:57 -0700 Comment on attachment 164903 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164903&action=review > Source/WebCore/inspector/InspectorCanvasInstrumentation.h:46 > + if (canvasAgent && canvasAgent->enabled()) You shouldn't check if the agent is enabled here, it should only set itself in instrumentingAgents when it is enabled instead. 725444 3 aandrey 2012-09-21 05:43:57 -0700 (In reply to comment #2) > (From update of attachment 164903 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=164903&action=review > > > Source/WebCore/inspector/InspectorCanvasInstrumentation.h:46 > > + if (canvasAgent && canvasAgent->enabled()) > > You shouldn't check if the agent is enabled here, it should only set itself in instrumentingAgents when it is enabled instead. Thanks. Will address this in https://bugs.webkit.org/show_bug.cgi?id=97331 725448 4 164903 webkit.review.bot 2012-09-21 05:51:57 -0700 Comment on attachment 164903 Patch Clearing flags on attachment: 164903 Committed r129219: <http://trac.webkit.org/changeset/129219> 725449 5 webkit.review.bot 2012-09-21 05:52:02 -0700 All reviewed patches have been landed. Closing bug. 725498 6 webkit.review.bot 2012-09-21 07:18:51 -0700 Re-opened since this is blocked by 97338 726517 7 165345 aandrey 2012-09-24 03:41:07 -0700 Created attachment 165345 Try again to land 726589 8 165345 webkit.review.bot 2012-09-24 06:01:12 -0700 Comment on attachment 165345 Try again to land Clearing flags on attachment: 165345 Committed r129353: <http://trac.webkit.org/changeset/129353> 726590 9 webkit.review.bot 2012-09-24 06:01:16 -0700 All reviewed patches have been landed. Closing bug. 164903 2012-09-20 06:03:53 -0700 2012-09-24 03:41:01 -0700 Patch bug-97203-20120920170318.patch text/plain 12052 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGI2MjdiMDJmOWY0Mzg1 NGU0OTIwNTk0ZjEwYTIxN2YxYjNkN2Q3NS4uNjgyMDUwZWI2ZGYxNzA5Zjg4NjBlMmVhZmI4N2Yz YjAzZjk5MjI3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA5LTIwICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIHN1cHBvcnQgMkQgY2FudmFzIGluc3RydW1lbnRhdGlvbiBmcm9tIHRoZSBp bnNwZWN0b3IgQysrIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTk3MjAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW1wbGVtZW50cyB3cmFwcGluZyBhIDJEIGNhbnZhcyBjb250ZXh0IHRocm91Z2gg dGhlIGluamVjdGVkIGNhbnZhcyBtb2R1bGUgc2NyaXB0IGZhY2lsaXR5LgorCisgICAgICAgICog YmluZGluZ3MvanMvSlNIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpKU0hUTUxDYW52YXNFbGVtZW50OjpnZXRDb250ZXh0KToKKyAgICAgICAgKiBiaW5kaW5n cy92OC9jdXN0b20vVjhIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpWOEhUTUxDYW52YXNFbGVtZW50OjpnZXRDb250ZXh0Q2FsbGJhY2spOgorICAgICAgICAq IGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZTo6d3JhcENhbnZhczJEQ29udGV4dCk6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVkU2NyaXB0Q2FudmFz TW9kdWxlOjp3cmFwV2ViR0xDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVkU2Ny aXB0Q2FudmFzTW9kdWxlOjpjYWxsV3JhcENvbnRleHRGdW5jdGlvbik6CisgICAgICAgICogaW5z cGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlLmg6CisgICAgICAgIChJbmplY3RlZFNj cmlwdENhbnZhc01vZHVsZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhc0Fn ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNhbnZhc0FnZW50Ojp3cmFwQ2Fu dmFzMkRSZW5kZXJpbmdDb250ZXh0Rm9ySW5zdHJ1bWVudGF0aW9uKToKKyAgICAgICAgKFdlYkNv cmUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDYW52YXNBZ2VudC5oOgorICAgICAg ICAoSW5zcGVjdG9yQ2FudmFzQWdlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JD YW52YXNJbnN0cnVtZW50YXRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6d3JhcENhbnZhczJEUmVuZGVyaW5nQ29udGV4dEZvckluc3RydW1lbnRhdGlv bik6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChJbnNwZWN0b3JJbnN0cnVtZW50YXRpb24pOgorCiAy MDEyLTA5LTE5ICBKb25hdGhhbiBEb25nICA8am9uYXRoYW4uZG9uZ0B0b3JjaG1vYmlsZS5jb20u Y24+CiAKICAgICAgICAgW0JsYWNrQmVycnldIHJlbW92ZSBzdGF0aWNfY2FzdCB3aGljaCB3aWxs IGNhdXNlIHZpZGVvIGNyYXNoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0hUTUxDYW52YXNFbGVtZW50Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTSFRNTENhbnZhc0VsZW1lbnRDdXN0b20uY3BwCmluZGV4IDU1NmJkZjc1ZmI0YThjOGJm ZWU5ZGZhYjAwZmRlOWM2ZGUwOWZkNTkuLjcyYmYzODZhMDY0ZjM2NDY1YzQ1YTIwNTEwMDkxOGJj ZDExZGMwNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTENh bnZhc0VsZW1lbnRDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pT SFRNTENhbnZhc0VsZW1lbnRDdXN0b20uY3BwCkBAIC0yOSwxMSArMjksMTEgQEAKIAogI2luY2x1 ZGUgIkNhbnZhc0NvbnRleHRBdHRyaWJ1dGVzLmgiCiAjaW5jbHVkZSAiSFRNTENhbnZhc0VsZW1l bnQuaCIKKyNpbmNsdWRlICJJbnNwZWN0b3JDYW52YXNJbnN0cnVtZW50YXRpb24uaCIKICNpbmNs dWRlICJKU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5oIgorI2luY2x1ZGUgIlNjcmlwdE9iamVj dC5oIgogI2lmIEVOQUJMRShXRUJHTCkKLSNpbmNsdWRlICJJbnNwZWN0b3JDYW52YXNJbnN0cnVt ZW50YXRpb24uaCIKICNpbmNsdWRlICJKU1dlYkdMUmVuZGVyaW5nQ29udGV4dC5oIgotI2luY2x1 ZGUgIlNjcmlwdE9iamVjdC5oIgogI2luY2x1ZGUgIldlYkdMQ29udGV4dEF0dHJpYnV0ZXMuaCIK ICNlbmRpZgogI2luY2x1ZGUgPHd0Zi9HZXRQdHIuaD4KQEAgLTc4LDE0ICs3OCwxOCBAQCBKU1Zh bHVlIEpTSFRNTENhbnZhc0VsZW1lbnQ6OmdldENvbnRleHQoRXhlY1N0YXRlKiBleGVjKQogICAg IGlmICghY29udGV4dCkKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogICAgIEpTVmFsdWUganNW YWx1ZSA9IHRvSlMoZXhlYywgZ2xvYmFsT2JqZWN0KCksIFdURjo6Z2V0UHRyKGNvbnRleHQpKTsK KyAgICBpZiAoSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpoYXNGcm9udGVuZHMoKSkgeworICAg ICAgICBTY3JpcHRPYmplY3QgY29udGV4dE9iamVjdChleGVjLCBqc1ZhbHVlLmdldE9iamVjdCgp KTsKKyAgICAgICAgU2NyaXB0T2JqZWN0IHdyYXBwZWQ7CisgICAgICAgIGlmIChjb250ZXh0LT5p czJkKCkpCisgICAgICAgICAgICB3cmFwcGVkID0gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3 cmFwQ2FudmFzMkRSZW5kZXJpbmdDb250ZXh0Rm9ySW5zdHJ1bWVudGF0aW9uKGNhbnZhcy0+ZG9j dW1lbnQoKSwgY29udGV4dE9iamVjdCk7CiAjaWYgRU5BQkxFKFdFQkdMKQotICAgIGlmIChjb250 ZXh0LT5pczNkKCkgJiYgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpoYXNGcm9udGVuZHMoKSkg ewotICAgICAgICBTY3JpcHRPYmplY3QgZ2xDb250ZXh0KGV4ZWMsIGpzVmFsdWUuZ2V0T2JqZWN0 KCkpOwotICAgICAgICBTY3JpcHRPYmplY3Qgd3JhcHBlZCA9IEluc3BlY3Rvckluc3RydW1lbnRh dGlvbjo6d3JhcFdlYkdMUmVuZGVyaW5nQ29udGV4dEZvckluc3RydW1lbnRhdGlvbihjYW52YXMt PmRvY3VtZW50KCksIGdsQ29udGV4dCk7CisgICAgICAgIGVsc2UgaWYgKGNvbnRleHQtPmlzM2Qo KSkKKyAgICAgICAgICAgIHdyYXBwZWQgPSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndyYXBX ZWJHTFJlbmRlcmluZ0NvbnRleHRGb3JJbnN0cnVtZW50YXRpb24oY2FudmFzLT5kb2N1bWVudCgp LCBjb250ZXh0T2JqZWN0KTsKKyNlbmRpZgogICAgICAgICBpZiAoIXdyYXBwZWQuaGFzTm9WYWx1 ZSgpKQogICAgICAgICAgICAgcmV0dXJuIHdyYXBwZWQuanNWYWx1ZSgpOwogICAgIH0KLSNlbmRp ZgogICAgIHJldHVybiBqc1ZhbHVlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHAK aW5kZXggMGIxNTcyNzljY2QxYWFiOTUyMjcwZjVmODk1MmQ3NzQwZWViM2Y5MS4uYTZmYjIyYTQ0 MWI5NGYwOGY1Y2JhNTU1ZTk5OGU3ZTA2MmJiNTM0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTENhbnZhc0VsZW1lbnRDdXN0b20uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxDYW52YXNFbGVtZW50Q3Vz dG9tLmNwcApAQCAtMzUsMTIgKzM1LDEyIEBACiAjaW5jbHVkZSAiQ2FudmFzQ29udGV4dEF0dHJp YnV0ZXMuaCIKICNpbmNsdWRlICJDYW52YXNSZW5kZXJpbmdDb250ZXh0LmgiCiAjaW5jbHVkZSAi SFRNTENhbnZhc0VsZW1lbnQuaCIKKyNpbmNsdWRlICJJbnNwZWN0b3JDYW52YXNJbnN0cnVtZW50 YXRpb24uaCIKICNpbmNsdWRlICJXZWJHTENvbnRleHRBdHRyaWJ1dGVzLmgiCiAjaW5jbHVkZSAi VjhCaW5kaW5nLmgiCiAjaW5jbHVkZSAiVjhDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuaCIKICNp bmNsdWRlICJWOE5vZGUuaCIKICNpZiBFTkFCTEUoV0VCR0wpCi0jaW5jbHVkZSAiSW5zcGVjdG9y Q2FudmFzSW5zdHJ1bWVudGF0aW9uLmgiCiAjaW5jbHVkZSAiVjhXZWJHTFJlbmRlcmluZ0NvbnRl eHQuaCIKICNlbmRpZgogI2luY2x1ZGUgPHd0Zi9NYXRoRXh0cmFzLmg+CkBAIC04NSw5ICs4NSwx NyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhIVE1MQ2FudmFzRWxlbWVudDo6Z2V0Q29udGV4 dENhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudAogICAgIENhbnZhc1JlbmRlcmluZ0NvbnRleHQq IHJlc3VsdCA9IGltcC0+Z2V0Q29udGV4dChjb250ZXh0SWQsIGF0dHJzLmdldCgpKTsKICAgICBp ZiAoIXJlc3VsdCkKICAgICAgICAgcmV0dXJuIHY4OjpOdWxsKGFyZ3MuR2V0SXNvbGF0ZSgpKTsK LQotICAgIGlmIChyZXN1bHQtPmlzMmQoKSkKLSAgICAgICAgcmV0dXJuIHRvVjgoc3RhdGljX2Nh c3Q8Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEKj4ocmVzdWx0KSwgYXJncy5Ib2xkZXIoKSwgYXJn cy5HZXRJc29sYXRlKCkpOworICAgIGVsc2UgaWYgKHJlc3VsdC0+aXMyZCgpKSB7CisgICAgICAg IHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2OFJlc3VsdCA9IHRvVjgoc3RhdGljX2Nhc3Q8Q2FudmFz UmVuZGVyaW5nQ29udGV4dDJEKj4ocmVzdWx0KSwgYXJncy5Ib2xkZXIoKSwgYXJncy5HZXRJc29s YXRlKCkpOworICAgICAgICBpZiAoSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpoYXNGcm9udGVu ZHMoKSkgeworICAgICAgICAgICAgU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlID0gU2NyaXB0U3Rh dGU6OmZvckNvbnRleHQodjg6OkNvbnRleHQ6OkdldEN1cnJlbnQoKSk7CisgICAgICAgICAgICBT Y3JpcHRPYmplY3QgY29udGV4dChzY3JpcHRTdGF0ZSwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6 Q2FzdCh2OFJlc3VsdCkpOworICAgICAgICAgICAgU2NyaXB0T2JqZWN0IHdyYXBwZWQgPSBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OndyYXBDYW52YXMyRFJlbmRlcmluZ0NvbnRleHRGb3JJbnN0 cnVtZW50YXRpb24oaW1wLT5kb2N1bWVudCgpLCBjb250ZXh0KTsKKyAgICAgICAgICAgIGlmICgh d3JhcHBlZC5oYXNOb1ZhbHVlKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIHdyYXBwZWQudjhW YWx1ZSgpOworICAgICAgICB9CisgICAgICAgIHJldHVybiB2OFJlc3VsdDsKKyAgICB9CiAjaWYg RU5BQkxFKFdFQkdMKQogICAgIGVsc2UgaWYgKHJlc3VsdC0+aXMzZCgpKSB7CiAgICAgICAgIC8v IDNEIGNhbnZhcyBjb250ZXh0cyBjYW4gaG9sZCBvbiB0byBsb3RzIG9mIEdQVSByZXNvdXJjZXMs IGFuZCB3ZSB3YW50IHRvIHRha2UgYW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGUuY3BwCmluZGV4IGRiMjc4ZDk3NmVjM2Y3 NTUxZjM3YmUzYzk0ZjkzY2U3MjU1MTYyOGMuLmIxZjFkY2EyNzU4Zjk5N2VmMjU1ZDg2ZjlmNzFl ZjE5MzFlZjdlMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3Rl ZFNjcmlwdENhbnZhc01vZHVsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu amVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlLmNwcApAQCAtNTksMjAgKzU5LDMwIEBAIFN0cmluZyBJ bmplY3RlZFNjcmlwdENhbnZhc01vZHVsZTo6c291cmNlKCkgY29uc3QKICAgICByZXR1cm4gU3Ry aW5nKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KEluamVjdGVkU2NyaXB0Q2FudmFzTW9k dWxlU291cmNlX2pzKSwgc2l6ZW9mKEluamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291cmNlX2pz KSk7CiB9CiAKK1NjcmlwdE9iamVjdCBJbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZTo6d3JhcENh bnZhczJEQ29udGV4dChjb25zdCBTY3JpcHRPYmplY3QmIGNvbnRleHQpCit7CisgICAgcmV0dXJu IGNhbGxXcmFwQ29udGV4dEZ1bmN0aW9uKCJ3cmFwQ2FudmFzMkRDb250ZXh0IiwgY29udGV4dCk7 Cit9CisKICNpZiBFTkFCTEUoV0VCR0wpCiBTY3JpcHRPYmplY3QgSW5qZWN0ZWRTY3JpcHRDYW52 YXNNb2R1bGU6OndyYXBXZWJHTENvbnRleHQoY29uc3QgU2NyaXB0T2JqZWN0JiBnbENvbnRleHQp CiB7Ci0gICAgU2NyaXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9uKGluamVjdGVkU2NyaXB0T2JqZWN0 KCksICJ3cmFwV2ViR0xDb250ZXh0Iik7Ci0gICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoZ2xD b250ZXh0KTsKKyAgICByZXR1cm4gY2FsbFdyYXBDb250ZXh0RnVuY3Rpb24oIndyYXBXZWJHTENv bnRleHQiLCBnbENvbnRleHQpOworfQorI2VuZGlmIC8vIEVOQUJMRShXRUJHTCkKKworU2NyaXB0 T2JqZWN0IEluamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlOjpjYWxsV3JhcENvbnRleHRGdW5jdGlv bihjb25zdCBTdHJpbmcmIGZ1bmN0aW9uTmFtZSwgY29uc3QgU2NyaXB0T2JqZWN0JiBjb250ZXh0 KQoreworICAgIFNjcmlwdEZ1bmN0aW9uQ2FsbCBmdW5jdGlvbihpbmplY3RlZFNjcmlwdE9iamVj dCgpLCBmdW5jdGlvbk5hbWUpOworICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50KGNvbnRleHQp OwogICAgIGJvb2wgaGFkRXhjZXB0aW9uID0gZmFsc2U7CiAgICAgU2NyaXB0VmFsdWUgcmVzdWx0 VmFsdWUgPSBjYWxsRnVuY3Rpb25XaXRoRXZhbEVuYWJsZWQoZnVuY3Rpb24sIGhhZEV4Y2VwdGlv bik7CiAgICAgaWYgKGhhZEV4Y2VwdGlvbiB8fCByZXN1bHRWYWx1ZS5oYXNOb1ZhbHVlKCkgfHwg IXJlc3VsdFZhbHVlLmlzT2JqZWN0KCkpIHsKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CiAgICAgICAgIHJldHVybiBTY3JpcHRPYmplY3QoKTsKICAgICB9Ci0gICAgcmV0dXJuIFNjcmlw dE9iamVjdChnbENvbnRleHQuc2NyaXB0U3RhdGUoKSwgcmVzdWx0VmFsdWUpOworICAgIHJldHVy biBTY3JpcHRPYmplY3QoY29udGV4dC5zY3JpcHRTdGF0ZSgpLCByZXN1bHRWYWx1ZSk7CiB9Ci0j ZW5kaWYgLy8gRU5BQkxFKFdFQkdMKQogCiB2b2lkIEluamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxl OjpjYXB0dXJlRnJhbWUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBTdHJpbmcqIHRyYWNlTG9n SWQpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3Jp cHRDYW52YXNNb2R1bGUuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlw dENhbnZhc01vZHVsZS5oCmluZGV4IDRkZTIyMzY2MDljY2M3NzRkNjZkNmNiYTlkZjYwYTI5ZjY1 MWQ5MmQuLjJlOTYwYWE2ZTVjYWM3NWU1NjM0ZTFlZDFiNjQzNjAxZDcxZjRjYzYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVs ZS5oCkBAIC01MCwxNCArNTAsMTggQEAgcHVibGljOgogCiAgICAgc3RhdGljIEluamVjdGVkU2Ny aXB0Q2FudmFzTW9kdWxlIG1vZHVsZUZvclN0YXRlKEluamVjdGVkU2NyaXB0TWFuYWdlciosIFNj cmlwdFN0YXRlKik7CiAKKyAgICBTY3JpcHRPYmplY3Qgd3JhcENhbnZhczJEQ29udGV4dChjb25z dCBTY3JpcHRPYmplY3QmKTsKICNpZiBFTkFCTEUoV0VCR0wpCi0gICAgU2NyaXB0T2JqZWN0IHdy YXBXZWJHTENvbnRleHQoY29uc3QgU2NyaXB0T2JqZWN0JiBnbENvbnRleHQpOworICAgIFNjcmlw dE9iamVjdCB3cmFwV2ViR0xDb250ZXh0KGNvbnN0IFNjcmlwdE9iamVjdCYpOwogI2VuZGlmCiAK ICAgICB2b2lkIGNhcHR1cmVGcmFtZShFcnJvclN0cmluZyosIFN0cmluZyopOwogICAgIHZvaWQg ZHJvcFRyYWNlTG9nKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCB0cmFj ZUxvZyhFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYsIFJlZlB0cjxUeXBlQnVpbGRlcjo6Q2Fu dmFzOjpUcmFjZUxvZz4qKTsKICAgICB2b2lkIHJlcGxheVRyYWNlTG9nKEVycm9yU3RyaW5nKiwg Y29uc3QgU3RyaW5nJiwgaW50LCBTdHJpbmcqKTsKKworcHJpdmF0ZToKKyAgICBTY3JpcHRPYmpl Y3QgY2FsbFdyYXBDb250ZXh0RnVuY3Rpb24oY29uc3QgU3RyaW5nJiwgY29uc3QgU2NyaXB0T2Jq ZWN0Jik7CiB9OwogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JDYW52YXNBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ2FudmFzQWdlbnQuY3BwCmluZGV4IGRmZjI5Mzg0NWQ0ZTQzMWQ3OTA2MThlMzZmMDk2 ODc1YjZiOTE4OTguLjVlM2ZmY2JjMzhmNzc2MTE0NTY3MjdiMTAzNjNkNGU4NTNjYmRlYmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDYW52YXNBZ2VudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhc0FnZW50LmNw cApAQCAtMTMwLDYgKzEzMCwyMCBAQCB2b2lkIEluc3BlY3RvckNhbnZhc0FnZW50OjpyZXBsYXlU cmFjZUxvZyhFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZwogICAgICAgICBt b2R1bGUucmVwbGF5VHJhY2VMb2coZXJyb3JTdHJpbmcsIHRyYWNlTG9nSWQsIHN0ZXBObywgcmVz dWx0KTsKIH0KIAorU2NyaXB0T2JqZWN0IEluc3BlY3RvckNhbnZhc0FnZW50Ojp3cmFwQ2FudmFz MkRSZW5kZXJpbmdDb250ZXh0Rm9ySW5zdHJ1bWVudGF0aW9uKGNvbnN0IFNjcmlwdE9iamVjdCYg Y29udGV4dCkKK3sKKyAgICBpZiAoY29udGV4dC5oYXNOb1ZhbHVlKCkpIHsKKyAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBTY3JpcHRPYmplY3QoKTsKKyAgICB9 CisgICAgSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGUgbW9kdWxlID0gSW5qZWN0ZWRTY3JpcHRD YW52YXNNb2R1bGU6Om1vZHVsZUZvclN0YXRlKG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLCBjb250 ZXh0LnNjcmlwdFN0YXRlKCkpOworICAgIGlmIChtb2R1bGUuaGFzTm9WYWx1ZSgpKSB7CisgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gU2NyaXB0T2JqZWN0KCk7 CisgICAgfQorICAgIHJldHVybiBtb2R1bGUud3JhcENhbnZhczJEQ29udGV4dChjb250ZXh0KTsK K30KKwogI2lmIEVOQUJMRShXRUJHTCkKIFNjcmlwdE9iamVjdCBJbnNwZWN0b3JDYW52YXNBZ2Vu dDo6d3JhcFdlYkdMUmVuZGVyaW5nQ29udGV4dEZvckluc3RydW1lbnRhdGlvbihjb25zdCBTY3Jp cHRPYmplY3QmIGdsQ29udGV4dCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JDYW52YXNBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNhbnZhc0FnZW50LmgKaW5kZXggZjQ2MGM2NDEwMDIxOTAwNjcwODBmZGJmMjA0Zjlh ZmVkOTVkOWJjOC4uZTg2ODYxOWQ2ZTU5YWEyMjA5OGMwNDJkYmMyNjBhN2NkMWFmZWI1MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhc0FnZW50LmgK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhc0FnZW50LmgKQEAg LTY2LDYgKzY2LDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBlbmFibGVkKCkgeyByZXR1cm4gbV9l bmFibGVkOyB9CiAKKyAgICBTY3JpcHRPYmplY3Qgd3JhcENhbnZhczJEUmVuZGVyaW5nQ29udGV4 dEZvckluc3RydW1lbnRhdGlvbihjb25zdCBTY3JpcHRPYmplY3QmKTsKICNpZiBFTkFCTEUoV0VC R0wpCiAgICAgU2NyaXB0T2JqZWN0IHdyYXBXZWJHTFJlbmRlcmluZ0NvbnRleHRGb3JJbnN0cnVt ZW50YXRpb24oY29uc3QgU2NyaXB0T2JqZWN0Jik7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDYW52YXNJbnN0cnVtZW50YXRpb24uaCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDYW52YXNJbnN0cnVtZW50YXRpb24uaApp bmRleCA1OTA0Yjg3ODk0MmMzYzIzZTkwNTAyN2NjMGY1MWI3NjIxNTQyOTUwLi43ODNhMTQ2M2U2 YTViYTFiMWFlNjRjYWFjNmU0NWU0MGNjNDEyMzdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFzSW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhc0luc3RydW1lbnRhdGlvbi5oCkBAIC0z OCw2ICszOCwxOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK1NjcmlwdE9iamVjdCBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OndyYXBDYW52YXMyRFJlbmRlcmluZ0NvbnRleHRGb3JJbnN0 cnVtZW50YXRpb24oRG9jdW1lbnQqIGRvY3VtZW50LCBjb25zdCBTY3JpcHRPYmplY3QmIGNvbnRl eHQpCit7CisjaWYgRU5BQkxFKElOU1BFQ1RPUikKKyAgICBpZiAoSW5zdHJ1bWVudGluZ0FnZW50 cyogaW5zdHJ1bWVudGluZ0FnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHNGb3JEb2N1bWVudChk b2N1bWVudCkpIHsKKyAgICAgICAgSW5zcGVjdG9yQ2FudmFzQWdlbnQqIGNhbnZhc0FnZW50ID0g aW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yQ2FudmFzQWdlbnQoKTsKKyAgICAgICAgaWYg KGNhbnZhc0FnZW50ICYmIGNhbnZhc0FnZW50LT5lbmFibGVkKCkpCisgICAgICAgICAgICByZXR1 cm4gY2FudmFzQWdlbnQtPndyYXBDYW52YXMyRFJlbmRlcmluZ0NvbnRleHRGb3JJbnN0cnVtZW50 YXRpb24oY29udGV4dCk7CisgICAgfQorI2VuZGlmCisgICAgcmV0dXJuIFNjcmlwdE9iamVjdCgp OworfQorCiAjaWYgRU5BQkxFKFdFQkdMKQogU2NyaXB0T2JqZWN0IEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6d3JhcFdlYkdMUmVuZGVyaW5nQ29udGV4dEZvckluc3RydW1lbnRhdGlvbihEb2N1 bWVudCogZG9jdW1lbnQsIGNvbnN0IFNjcmlwdE9iamVjdCYgZ2xDb250ZXh0KQogewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5o IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCmlu ZGV4IDIxN2Q5OGQwMmI2YThhOWI1ODJmNGFmNjBhYjlkZTZlZmM0MzNjMDkuLjQwMGM0NDNiODRh OTBkYWUwYmQ1ZjA4ODhhY2UyNmE4M2NkZjc4YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKQEAgLTI1MSw2ICsyNTEsNyBA QCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgZGlkUmVjZWl2ZVdlYlNvY2tldEZyYW1lRXJyb3Io RG9jdW1lbnQqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZXJyb3JN ZXNzYWdlKTsKICNlbmRpZgogCisgICAgc3RhdGljIFNjcmlwdE9iamVjdCB3cmFwQ2FudmFzMkRS ZW5kZXJpbmdDb250ZXh0Rm9ySW5zdHJ1bWVudGF0aW9uKERvY3VtZW50KiwgY29uc3QgU2NyaXB0 T2JqZWN0Jik7CiAjaWYgRU5BQkxFKFdFQkdMKQogICAgIHN0YXRpYyBTY3JpcHRPYmplY3Qgd3Jh cFdlYkdMUmVuZGVyaW5nQ29udGV4dEZvckluc3RydW1lbnRhdGlvbihEb2N1bWVudCosIGNvbnN0 IFNjcmlwdE9iamVjdCYpOwogI2VuZGlmCg== 165345 2012-09-24 03:41:07 -0700 2012-09-24 06:01:11 -0700 Try again to land bug-97203-20120924144028.patch text/plain 12839 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGVmMGM1NWQzODU1Mzlh MTUxYjY1ZDgwZTIwN2UzNWZjMzE0ZmVmMi4uOTdkODVkMzgyZmIzZDIzMTUyZDc3YTQxN2VjYzYz NzAyYWMzN2M2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA5LTIwICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIHN1cHBvcnQgMkQgY2FudmFzIGluc3RydW1lbnRhdGlvbiBmcm9tIHRoZSBp bnNwZWN0b3IgQysrIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTk3MjAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW1wbGVtZW50cyB3cmFwcGluZyBhIDJEIGNhbnZhcyBjb250ZXh0IHRocm91Z2gg dGhlIGluamVjdGVkIGNhbnZhcyBtb2R1bGUgc2NyaXB0IGZhY2lsaXR5LgorCisgICAgICAgICog YmluZGluZ3MvanMvSlNIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpKU0hUTUxDYW52YXNFbGVtZW50OjpnZXRDb250ZXh0KToKKyAgICAgICAgKiBiaW5kaW5n cy92OC9jdXN0b20vVjhIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpWOEhUTUxDYW52YXNFbGVtZW50OjpnZXRDb250ZXh0Q2FsbGJhY2spOgorICAgICAgICAq IGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZTo6d3JhcENhbnZhczJEQ29udGV4dCk6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVkU2NyaXB0Q2FudmFz TW9kdWxlOjp3cmFwV2ViR0xDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVkU2Ny aXB0Q2FudmFzTW9kdWxlOjpjYWxsV3JhcENvbnRleHRGdW5jdGlvbik6CisgICAgICAgICogaW5z cGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlLmg6CisgICAgICAgIChJbmplY3RlZFNj cmlwdENhbnZhc01vZHVsZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhc0Fn ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNhbnZhc0FnZW50Ojp3cmFwQ2Fu dmFzMkRSZW5kZXJpbmdDb250ZXh0Rm9ySW5zdHJ1bWVudGF0aW9uKToKKyAgICAgICAgKFdlYkNv cmUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDYW52YXNBZ2VudC5oOgorICAgICAg ICAoSW5zcGVjdG9yQ2FudmFzQWdlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JD YW52YXNJbnN0cnVtZW50YXRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6d3JhcENhbnZhczJEUmVuZGVyaW5nQ29udGV4dEZvckluc3RydW1lbnRhdGlv bik6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChJbnNwZWN0b3JJbnN0cnVtZW50YXRpb24pOgorCiAy MDEyLTA5LTI0ICBBbmRyZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFtUZXh0RWRpdG9yXSBMaW5lIG51bWJlcnMgb3V0IG9mIHN5bmMg YWZ0ZXIgY2xvc2luZyBicmVha3BvaW50IGNvbmRpdGlvbiBlZGl0b3IKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTENhbnZhc0VsZW1lbnRDdXN0b20uY3BwIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHAK aW5kZXggNTU2YmRmNzVmYjRhOGM4YmZlZTlkZmFiMDBmZGU5YzZkZTA5ZmQ1OS4uNzJiZjM4NmEw NjRmMzY0NjVjNDVhMjA1MTAwOTE4YmNkMTFkYzA1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSlNIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvSlNIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHAKQEAgLTI5 LDExICsyOSwxMSBAQAogCiAjaW5jbHVkZSAiQ2FudmFzQ29udGV4dEF0dHJpYnV0ZXMuaCIKICNp bmNsdWRlICJIVE1MQ2FudmFzRWxlbWVudC5oIgorI2luY2x1ZGUgIkluc3BlY3RvckNhbnZhc0lu c3RydW1lbnRhdGlvbi5oIgogI2luY2x1ZGUgIkpTQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmgi CisjaW5jbHVkZSAiU2NyaXB0T2JqZWN0LmgiCiAjaWYgRU5BQkxFKFdFQkdMKQotI2luY2x1ZGUg Ikluc3BlY3RvckNhbnZhc0luc3RydW1lbnRhdGlvbi5oIgogI2luY2x1ZGUgIkpTV2ViR0xSZW5k ZXJpbmdDb250ZXh0LmgiCi0jaW5jbHVkZSAiU2NyaXB0T2JqZWN0LmgiCiAjaW5jbHVkZSAiV2Vi R0xDb250ZXh0QXR0cmlidXRlcy5oIgogI2VuZGlmCiAjaW5jbHVkZSA8d3RmL0dldFB0ci5oPgpA QCAtNzgsMTQgKzc4LDE4IEBAIEpTVmFsdWUgSlNIVE1MQ2FudmFzRWxlbWVudDo6Z2V0Q29udGV4 dChFeGVjU3RhdGUqIGV4ZWMpCiAgICAgaWYgKCFjb250ZXh0KQogICAgICAgICByZXR1cm4ganNO dWxsKCk7CiAgICAgSlNWYWx1ZSBqc1ZhbHVlID0gdG9KUyhleGVjLCBnbG9iYWxPYmplY3QoKSwg V1RGOjpnZXRQdHIoY29udGV4dCkpOworICAgIGlmIChJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 Omhhc0Zyb250ZW5kcygpKSB7CisgICAgICAgIFNjcmlwdE9iamVjdCBjb250ZXh0T2JqZWN0KGV4 ZWMsIGpzVmFsdWUuZ2V0T2JqZWN0KCkpOworICAgICAgICBTY3JpcHRPYmplY3Qgd3JhcHBlZDsK KyAgICAgICAgaWYgKGNvbnRleHQtPmlzMmQoKSkKKyAgICAgICAgICAgIHdyYXBwZWQgPSBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OndyYXBDYW52YXMyRFJlbmRlcmluZ0NvbnRleHRGb3JJbnN0 cnVtZW50YXRpb24oY2FudmFzLT5kb2N1bWVudCgpLCBjb250ZXh0T2JqZWN0KTsKICNpZiBFTkFC TEUoV0VCR0wpCi0gICAgaWYgKGNvbnRleHQtPmlzM2QoKSAmJiBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246Omhhc0Zyb250ZW5kcygpKSB7Ci0gICAgICAgIFNjcmlwdE9iamVjdCBnbENvbnRleHQo ZXhlYywganNWYWx1ZS5nZXRPYmplY3QoKSk7Ci0gICAgICAgIFNjcmlwdE9iamVjdCB3cmFwcGVk ID0gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3cmFwV2ViR0xSZW5kZXJpbmdDb250ZXh0Rm9y SW5zdHJ1bWVudGF0aW9uKGNhbnZhcy0+ZG9jdW1lbnQoKSwgZ2xDb250ZXh0KTsKKyAgICAgICAg ZWxzZSBpZiAoY29udGV4dC0+aXMzZCgpKQorICAgICAgICAgICAgd3JhcHBlZCA9IEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6d3JhcFdlYkdMUmVuZGVyaW5nQ29udGV4dEZvckluc3RydW1lbnRh dGlvbihjYW52YXMtPmRvY3VtZW50KCksIGNvbnRleHRPYmplY3QpOworI2VuZGlmCiAgICAgICAg IGlmICghd3JhcHBlZC5oYXNOb1ZhbHVlKCkpCiAgICAgICAgICAgICByZXR1cm4gd3JhcHBlZC5q c1ZhbHVlKCk7CiAgICAgfQotI2VuZGlmCiAgICAgcmV0dXJuIGpzVmFsdWU7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxDYW52YXNFbGVt ZW50Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxD YW52YXNFbGVtZW50Q3VzdG9tLmNwcAppbmRleCAwYjE1NzI3OWNjZDFhYWI5NTIyNzBmNWY4OTUy ZDc3NDBlZWIzZjkxLi5hNmZiMjJhNDQxYjk0ZjA4ZjVjYmE1NTVlOTk4ZTdlMDYyYmI1MzQyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MQ2FudmFz RWxlbWVudEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4SFRNTENhbnZhc0VsZW1lbnRDdXN0b20uY3BwCkBAIC0zNSwxMiArMzUsMTIgQEAKICNpbmNs dWRlICJDYW52YXNDb250ZXh0QXR0cmlidXRlcy5oIgogI2luY2x1ZGUgIkNhbnZhc1JlbmRlcmlu Z0NvbnRleHQuaCIKICNpbmNsdWRlICJIVE1MQ2FudmFzRWxlbWVudC5oIgorI2luY2x1ZGUgIklu c3BlY3RvckNhbnZhc0luc3RydW1lbnRhdGlvbi5oIgogI2luY2x1ZGUgIldlYkdMQ29udGV4dEF0 dHJpYnV0ZXMuaCIKICNpbmNsdWRlICJWOEJpbmRpbmcuaCIKICNpbmNsdWRlICJWOENhbnZhc1Jl bmRlcmluZ0NvbnRleHQyRC5oIgogI2luY2x1ZGUgIlY4Tm9kZS5oIgogI2lmIEVOQUJMRShXRUJH TCkKLSNpbmNsdWRlICJJbnNwZWN0b3JDYW52YXNJbnN0cnVtZW50YXRpb24uaCIKICNpbmNsdWRl ICJWOFdlYkdMUmVuZGVyaW5nQ29udGV4dC5oIgogI2VuZGlmCiAjaW5jbHVkZSA8d3RmL01hdGhF eHRyYXMuaD4KQEAgLTg1LDkgKzg1LDE3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOEhUTUxD YW52YXNFbGVtZW50OjpnZXRDb250ZXh0Q2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50CiAgICAg Q2FudmFzUmVuZGVyaW5nQ29udGV4dCogcmVzdWx0ID0gaW1wLT5nZXRDb250ZXh0KGNvbnRleHRJ ZCwgYXR0cnMuZ2V0KCkpOwogICAgIGlmICghcmVzdWx0KQogICAgICAgICByZXR1cm4gdjg6Ok51 bGwoYXJncy5HZXRJc29sYXRlKCkpOwotCi0gICAgaWYgKHJlc3VsdC0+aXMyZCgpKQotICAgICAg ICByZXR1cm4gdG9WOChzdGF0aWNfY2FzdDxDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQqPihyZXN1 bHQpLCBhcmdzLkhvbGRlcigpLCBhcmdzLkdldElzb2xhdGUoKSk7CisgICAgZWxzZSBpZiAocmVz dWx0LT5pczJkKCkpIHsKKyAgICAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHY4UmVzdWx0ID0g dG9WOChzdGF0aWNfY2FzdDxDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQqPihyZXN1bHQpLCBhcmdz LkhvbGRlcigpLCBhcmdzLkdldElzb2xhdGUoKSk7CisgICAgICAgIGlmIChJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246Omhhc0Zyb250ZW5kcygpKSB7CisgICAgICAgICAgICBTY3JpcHRTdGF0ZSog c2NyaXB0U3RhdGUgPSBTY3JpcHRTdGF0ZTo6Zm9yQ29udGV4dCh2ODo6Q29udGV4dDo6R2V0Q3Vy cmVudCgpKTsKKyAgICAgICAgICAgIFNjcmlwdE9iamVjdCBjb250ZXh0KHNjcmlwdFN0YXRlLCB2 ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KHY4UmVzdWx0KSk7CisgICAgICAgICAgICBTY3Jp cHRPYmplY3Qgd3JhcHBlZCA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d3JhcENhbnZhczJE UmVuZGVyaW5nQ29udGV4dEZvckluc3RydW1lbnRhdGlvbihpbXAtPmRvY3VtZW50KCksIGNvbnRl eHQpOworICAgICAgICAgICAgaWYgKCF3cmFwcGVkLmhhc05vVmFsdWUoKSkKKyAgICAgICAgICAg ICAgICByZXR1cm4gd3JhcHBlZC52OFZhbHVlKCk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJu IHY4UmVzdWx0OworICAgIH0KICNpZiBFTkFCTEUoV0VCR0wpCiAgICAgZWxzZSBpZiAocmVzdWx0 LT5pczNkKCkpIHsKICAgICAgICAgLy8gM0QgY2FudmFzIGNvbnRleHRzIGNhbiBob2xkIG9uIHRv IGxvdHMgb2YgR1BVIHJlc291cmNlcywgYW5kIHdlIHdhbnQgdG8gdGFrZSBhbgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZS5j cHAKaW5kZXggZGIyNzhkOTc2ZWMzZjc1NTFmMzdiZTNjOTRmOTNjZTcyNTUxNjI4Yy4uYjFmMWRj YTI3NThmOTk3ZWYyNTVkODZmOWY3MWVmMTkzMWVmN2UwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGUuY3BwCkBAIC01 OSwyMCArNTksMzAgQEAgU3RyaW5nIEluamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlOjpzb3VyY2Uo KSBjb25zdAogICAgIHJldHVybiBTdHJpbmcocmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4o SW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3VyY2VfanMpLCBzaXplb2YoSW5qZWN0ZWRTY3Jp cHRDYW52YXNNb2R1bGVTb3VyY2VfanMpKTsKIH0KIAorU2NyaXB0T2JqZWN0IEluamVjdGVkU2Ny aXB0Q2FudmFzTW9kdWxlOjp3cmFwQ2FudmFzMkRDb250ZXh0KGNvbnN0IFNjcmlwdE9iamVjdCYg Y29udGV4dCkKK3sKKyAgICByZXR1cm4gY2FsbFdyYXBDb250ZXh0RnVuY3Rpb24oIndyYXBDYW52 YXMyRENvbnRleHQiLCBjb250ZXh0KTsKK30KKwogI2lmIEVOQUJMRShXRUJHTCkKIFNjcmlwdE9i amVjdCBJbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZTo6d3JhcFdlYkdMQ29udGV4dChjb25zdCBT Y3JpcHRPYmplY3QmIGdsQ29udGV4dCkKIHsKLSAgICBTY3JpcHRGdW5jdGlvbkNhbGwgZnVuY3Rp b24oaW5qZWN0ZWRTY3JpcHRPYmplY3QoKSwgIndyYXBXZWJHTENvbnRleHQiKTsKLSAgICBmdW5j dGlvbi5hcHBlbmRBcmd1bWVudChnbENvbnRleHQpOworICAgIHJldHVybiBjYWxsV3JhcENvbnRl eHRGdW5jdGlvbigid3JhcFdlYkdMQ29udGV4dCIsIGdsQ29udGV4dCk7Cit9CisjZW5kaWYgLy8g RU5BQkxFKFdFQkdMKQorCitTY3JpcHRPYmplY3QgSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGU6 OmNhbGxXcmFwQ29udGV4dEZ1bmN0aW9uKGNvbnN0IFN0cmluZyYgZnVuY3Rpb25OYW1lLCBjb25z dCBTY3JpcHRPYmplY3QmIGNvbnRleHQpCit7CisgICAgU2NyaXB0RnVuY3Rpb25DYWxsIGZ1bmN0 aW9uKGluamVjdGVkU2NyaXB0T2JqZWN0KCksIGZ1bmN0aW9uTmFtZSk7CisgICAgZnVuY3Rpb24u YXBwZW5kQXJndW1lbnQoY29udGV4dCk7CiAgICAgYm9vbCBoYWRFeGNlcHRpb24gPSBmYWxzZTsK ICAgICBTY3JpcHRWYWx1ZSByZXN1bHRWYWx1ZSA9IGNhbGxGdW5jdGlvbldpdGhFdmFsRW5hYmxl ZChmdW5jdGlvbiwgaGFkRXhjZXB0aW9uKTsKICAgICBpZiAoaGFkRXhjZXB0aW9uIHx8IHJlc3Vs dFZhbHVlLmhhc05vVmFsdWUoKSB8fCAhcmVzdWx0VmFsdWUuaXNPYmplY3QoKSkgewogICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIFNjcmlwdE9iamVjdCgpOwog ICAgIH0KLSAgICByZXR1cm4gU2NyaXB0T2JqZWN0KGdsQ29udGV4dC5zY3JpcHRTdGF0ZSgpLCBy ZXN1bHRWYWx1ZSk7CisgICAgcmV0dXJuIFNjcmlwdE9iamVjdChjb250ZXh0LnNjcmlwdFN0YXRl KCksIHJlc3VsdFZhbHVlKTsKIH0KLSNlbmRpZiAvLyBFTkFCTEUoV0VCR0wpCiAKIHZvaWQgSW5q ZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGU6OmNhcHR1cmVGcmFtZShFcnJvclN0cmluZyogZXJyb3JT dHJpbmcsIFN0cmluZyogdHJhY2VMb2dJZCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZS5oIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlLmgKaW5kZXggNGRlMjIzNjYwOWNj Yzc3NGQ2NmQ2Y2JhOWRmNjBhMjlmNjUxZDkyZC4uMmU5NjBhYTZlNWNhYzc1ZTU2MzRlMWVkMWI2 NDM2MDFkNzFmNGNjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVj dGVkU2NyaXB0Q2FudmFzTW9kdWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu amVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlLmgKQEAgLTUwLDE0ICs1MCwxOCBAQCBwdWJsaWM6CiAK ICAgICBzdGF0aWMgSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGUgbW9kdWxlRm9yU3RhdGUoSW5q ZWN0ZWRTY3JpcHRNYW5hZ2VyKiwgU2NyaXB0U3RhdGUqKTsKIAorICAgIFNjcmlwdE9iamVjdCB3 cmFwQ2FudmFzMkRDb250ZXh0KGNvbnN0IFNjcmlwdE9iamVjdCYpOwogI2lmIEVOQUJMRShXRUJH TCkKLSAgICBTY3JpcHRPYmplY3Qgd3JhcFdlYkdMQ29udGV4dChjb25zdCBTY3JpcHRPYmplY3Qm IGdsQ29udGV4dCk7CisgICAgU2NyaXB0T2JqZWN0IHdyYXBXZWJHTENvbnRleHQoY29uc3QgU2Ny aXB0T2JqZWN0Jik7CiAjZW5kaWYKIAogICAgIHZvaWQgY2FwdHVyZUZyYW1lKEVycm9yU3RyaW5n KiwgU3RyaW5nKik7CiAgICAgdm9pZCBkcm9wVHJhY2VMb2coRXJyb3JTdHJpbmcqLCBjb25zdCBT dHJpbmcmKTsKICAgICB2b2lkIHRyYWNlTG9nKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiwg UmVmUHRyPFR5cGVCdWlsZGVyOjpDYW52YXM6OlRyYWNlTG9nPiopOwogICAgIHZvaWQgcmVwbGF5 VHJhY2VMb2coRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmLCBpbnQsIFN0cmluZyopOworCitw cml2YXRlOgorICAgIFNjcmlwdE9iamVjdCBjYWxsV3JhcENvbnRleHRGdW5jdGlvbihjb25zdCBT dHJpbmcmLCBjb25zdCBTY3JpcHRPYmplY3QmKTsKIH07CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291cmNl LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxl U291cmNlLmpzCmluZGV4IDY3ODBhZjNjNDE1MjVjOThlNzZiZGI4MDM1NzBlZWMzYjhjYjc3YjIu LjYxMTUwYmVlNDYyM2ZiMWJkYWFiZWYyODAwZGRlYjc0NDM4YTAwNWYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1 bGVTb3VyY2UuanMKQEAgLTE5OTIsNiArMTk5MiwxNiBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHJldHVybiBwcm94eTsKICAgICB9LAogCisgICAgLyoqCisgICAgICog QHBhcmFtIHtDYW52YXNSZW5kZXJpbmdDb250ZXh0MkR9IGNvbnRleHQKKyAgICAgKiBAcmV0dXJu IHtPYmplY3R9CisgICAgICovCisgICAgd3JhcENhbnZhczJEQ29udGV4dDogZnVuY3Rpb24oY29u dGV4dCkKKyAgICB7CisgICAgICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgd3JhcHBpbmcgMkQgY29u dGV4dC4KKyAgICAgICAgcmV0dXJuIGNvbnRleHQ7CisgICAgfSwgICAgCisKICAgICBjYXB0dXJl RnJhbWU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciBpZCA9IHRoaXMuX21ha2VUcmFj ZUxvZ0lkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q2FudmFzQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZh c0FnZW50LmNwcAppbmRleCBkZmYyOTM4NDVkNGU0MzFkNzkwNjE4ZTM2ZjA5Njg3NWI2YjkxODk4 Li41ZTNmZmNiYzM4Zjc3NjExNDU2NzI3YjEwMzYzZDRlODUzY2JkZWJjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFzQWdlbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDYW52YXNBZ2VudC5jcHAKQEAgLTEzMCw2 ICsxMzAsMjAgQEAgdm9pZCBJbnNwZWN0b3JDYW52YXNBZ2VudDo6cmVwbGF5VHJhY2VMb2coRXJy b3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcKICAgICAgICAgbW9kdWxlLnJlcGxh eVRyYWNlTG9nKGVycm9yU3RyaW5nLCB0cmFjZUxvZ0lkLCBzdGVwTm8sIHJlc3VsdCk7CiB9CiAK K1NjcmlwdE9iamVjdCBJbnNwZWN0b3JDYW52YXNBZ2VudDo6d3JhcENhbnZhczJEUmVuZGVyaW5n Q29udGV4dEZvckluc3RydW1lbnRhdGlvbihjb25zdCBTY3JpcHRPYmplY3QmIGNvbnRleHQpCit7 CisgICAgaWYgKGNvbnRleHQuaGFzTm9WYWx1ZSgpKSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOworICAgICAgICByZXR1cm4gU2NyaXB0T2JqZWN0KCk7CisgICAgfQorICAgIEluamVj dGVkU2NyaXB0Q2FudmFzTW9kdWxlIG1vZHVsZSA9IEluamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxl Ojptb2R1bGVGb3JTdGF0ZShtX2luamVjdGVkU2NyaXB0TWFuYWdlciwgY29udGV4dC5zY3JpcHRT dGF0ZSgpKTsKKyAgICBpZiAobW9kdWxlLmhhc05vVmFsdWUoKSkgeworICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIFNjcmlwdE9iamVjdCgpOworICAgIH0KKyAg ICByZXR1cm4gbW9kdWxlLndyYXBDYW52YXMyRENvbnRleHQoY29udGV4dCk7Cit9CisKICNpZiBF TkFCTEUoV0VCR0wpCiBTY3JpcHRPYmplY3QgSW5zcGVjdG9yQ2FudmFzQWdlbnQ6OndyYXBXZWJH TFJlbmRlcmluZ0NvbnRleHRGb3JJbnN0cnVtZW50YXRpb24oY29uc3QgU2NyaXB0T2JqZWN0JiBn bENvbnRleHQpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ2FudmFzQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDYW52 YXNBZ2VudC5oCmluZGV4IGY0NjBjNjQxMDAyMTkwMDY3MDgwZmRiZjIwNGY5YWZlZDk1ZDliYzgu LmU4Njg2MTlkNmU1OWFhMjIwOThjMDQyZGJjMjYwYTdjZDFhZmViNTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDYW52YXNBZ2VudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDYW52YXNBZ2VudC5oCkBAIC02Niw2ICs2Niw3 IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgZW5hYmxlZCgpIHsgcmV0dXJuIG1fZW5hYmxlZDsgfQog CisgICAgU2NyaXB0T2JqZWN0IHdyYXBDYW52YXMyRFJlbmRlcmluZ0NvbnRleHRGb3JJbnN0cnVt ZW50YXRpb24oY29uc3QgU2NyaXB0T2JqZWN0Jik7CiAjaWYgRU5BQkxFKFdFQkdMKQogICAgIFNj cmlwdE9iamVjdCB3cmFwV2ViR0xSZW5kZXJpbmdDb250ZXh0Rm9ySW5zdHJ1bWVudGF0aW9uKGNv bnN0IFNjcmlwdE9iamVjdCYpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFzSW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFzSW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggNTkwNGI4 Nzg5NDJjM2MyM2U5MDUwMjdjYzBmNTFiNzYyMTU0Mjk1MC4uNzgzYTE0NjNlNmE1YmExYjFhZTY0 Y2FhYzZlNDVlNDBjYzQxMjM3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckNhbnZhc0luc3RydW1lbnRhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDYW52YXNJbnN0cnVtZW50YXRpb24uaApAQCAtMzgsNiArMzgsMTgg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitTY3JpcHRPYmplY3QgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOjp3cmFwQ2FudmFzMkRSZW5kZXJpbmdDb250ZXh0Rm9ySW5zdHJ1bWVudGF0aW9u KERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgU2NyaXB0T2JqZWN0JiBjb250ZXh0KQoreworI2lm IEVOQUJMRShJTlNQRUNUT1IpCisgICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1l bnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yRG9jdW1lbnQoZG9jdW1lbnQpKSB7 CisgICAgICAgIEluc3BlY3RvckNhbnZhc0FnZW50KiBjYW52YXNBZ2VudCA9IGluc3RydW1lbnRp bmdBZ2VudHMtPmluc3BlY3RvckNhbnZhc0FnZW50KCk7CisgICAgICAgIGlmIChjYW52YXNBZ2Vu dCAmJiBjYW52YXNBZ2VudC0+ZW5hYmxlZCgpKQorICAgICAgICAgICAgcmV0dXJuIGNhbnZhc0Fn ZW50LT53cmFwQ2FudmFzMkRSZW5kZXJpbmdDb250ZXh0Rm9ySW5zdHJ1bWVudGF0aW9uKGNvbnRl eHQpOworICAgIH0KKyNlbmRpZgorICAgIHJldHVybiBTY3JpcHRPYmplY3QoKTsKK30KKwogI2lm IEVOQUJMRShXRUJHTCkKIFNjcmlwdE9iamVjdCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Ondy YXBXZWJHTFJlbmRlcmluZ0NvbnRleHRGb3JJbnN0cnVtZW50YXRpb24oRG9jdW1lbnQqIGRvY3Vt ZW50LCBjb25zdCBTY3JpcHRPYmplY3QmIGdsQ29udGV4dCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAppbmRleCAyMTdkOThk MDJiNmE4YTliNTgyZjRhZjYwYWI5ZGU2ZWZjNDMzYzA5Li40MDBjNDQzYjg0YTkwZGFlMGJkNWYw ODg4YWNlMjZhODNjZGY3OGE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCkBAIC0yNTEsNiArMjUxLDcgQEAgcHVibGljOgog ICAgIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVXZWJTb2NrZXRGcmFtZUVycm9yKERvY3VtZW50Kiwg dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7CiAj ZW5kaWYKIAorICAgIHN0YXRpYyBTY3JpcHRPYmplY3Qgd3JhcENhbnZhczJEUmVuZGVyaW5nQ29u dGV4dEZvckluc3RydW1lbnRhdGlvbihEb2N1bWVudCosIGNvbnN0IFNjcmlwdE9iamVjdCYpOwog I2lmIEVOQUJMRShXRUJHTCkKICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IHdyYXBXZWJHTFJlbmRl cmluZ0NvbnRleHRGb3JJbnN0cnVtZW50YXRpb24oRG9jdW1lbnQqLCBjb25zdCBTY3JpcHRPYmpl Y3QmKTsKICNlbmRpZgo=