43787 2010-08-10 05:48:12 -0700 [v8] Web Inspector: get rid of utility context 2010-08-10 09:14:29 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys abarth bweinstein eric joepeck keishi pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 262639 0 yurys 2010-08-10 05:48:12 -0700 [v8] Web Inspector: get rid of utility context 262640 1 64005 yurys 2010-08-10 05:50:07 -0700 Created attachment 64005 Patch 262652 2 yurys 2010-08-10 06:30:42 -0700 Committed r65069 262703 3 webkit.review.bot 2010-08-10 09:14:29 -0700 http://trac.webkit.org/changeset/65069 might have broken Qt Linux Release minimal The following changes are on the blame list: http://trac.webkit.org/changeset/65072 http://trac.webkit.org/changeset/65069 http://trac.webkit.org/changeset/65070 http://trac.webkit.org/changeset/65071 64005 2010-08-10 05:50:07 -0700 2010-08-10 05:55:15 -0700 Patch bug-43787-20100810165005.patch text/plain 15547 yurys ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDdlNWY4MmMxZmJiZWFiZGJlYmY2Yzk3ZmY5MjAzYTQyZmEyZWUxY2Uu LmE5NDM1NzQ0MDhkYTA3NGE0MjQ3YWI2OTQyZDJmOTQ4YWYzNzU3NGQgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDI1IEBACiAyMDEwLTA4LTEwICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hy b21pdW0ub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFt2OF0gV2ViIEluc3BlY3RvcjogZ2V0IHJpZCBvZiB1dGlsaXR5IGNvbnRleHQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzNzg3CisKKyAgICAg ICAgKiBwdWJsaWMvV2ViRGV2VG9vbHNBZ2VudENsaWVudC5oOgorICAgICAgICAqIHNyYy9EZWJ1 Z2dlckFnZW50SW1wbC5jcHA6CisgICAgICAgICogc3JjL0RlYnVnZ2VyQWdlbnRJbXBsLmg6Cisg ICAgICAgICogc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 KToKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNBZ2VudEltcGw6On5XZWJEZXZUb29sc0Fn ZW50SW1wbCk6CisgICAgICAgIChXZWJLaXQ6OldlYkRldlRvb2xzQWdlbnRJbXBsOjphdHRhY2gp OgorICAgICAgICAoV2ViS2l0OjpXZWJEZXZUb29sc0FnZW50SW1wbDo6ZGV0YWNoKToKKyAgICAg ICAgKFdlYktpdDo6V2ViRGV2VG9vbHNBZ2VudEltcGw6OmZyb250ZW5kTG9hZGVkKToKKyAgICAg ICAgKFdlYktpdDo6V2ViRGV2VG9vbHNBZ2VudEltcGw6OnNldFJ1bnRpbWVGZWF0dXJlRW5hYmxl ZCk6CisgICAgICAgIChXZWJLaXQ6OldlYkRldlRvb2xzQWdlbnRJbXBsOjpzZXRBcHVBZ2VudEVu YWJsZWQpOgorICAgICAgICAqIHNyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5oOgorCisyMDEwLTA4 LTEwICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJl dmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCiAKICAgICAgICAgV2ViIEluc3BlY3RvciwgQ2hyb21p dW06IHJlbG9hZGluZyBvZiBpbnNwZWN0ZWQgcGFnZSBoaXRzIGFzc2VydCBpbiBJbnNwZWN0b3JD b250cm9sbGVyOjplbmFibGVEZWJ1Z2dlckZyb21Gcm9udGVuZCgpCmRpZmYgLS1naXQgYS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzQWdlbnRDbGllbnQuaCBiL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNBZ2VudENsaWVudC5oCmluZGV4IDA4YmRkNThlODM2MmE2 MTY4YTM3M2NkMWU1YjBkZDRjYzQ4NWE3ODYuLmVjMDEzYWM0MDY1YWE3MTAyMjAyY2JkZDUxNDQ0 ZTU5NjFkMDRhMDkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9v bHNBZ2VudENsaWVudC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNB Z2VudENsaWVudC5oCkBAIC01NCw3ICs1NCw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQg cnVudGltZUZlYXR1cmVTdGF0ZUNoYW5nZWQoY29uc3QgV2ViU3RyaW5nJiBmZWF0dXJlLCBib29s IGVuYWJsZWQpIHsgfQogCiAgICAgdmlydHVhbCBXZWJDU3RyaW5nIGluamVjdGVkU2NyaXB0U291 cmNlKCkgeyByZXR1cm4gV2ViQ1N0cmluZygpOyB9Ci0gICAgdmlydHVhbCBXZWJDU3RyaW5nIGlu amVjdGVkU2NyaXB0RGlzcGF0Y2hlclNvdXJjZSgpIHsgcmV0dXJuIFdlYkNTdHJpbmcoKTsgfQog ICAgIHZpcnR1YWwgV2ViQ1N0cmluZyBkZWJ1Z2dlclNjcmlwdFNvdXJjZSgpIHsgcmV0dXJuIFdl YkNTdHJpbmcoKTsgfQogCiAgICAgY2xhc3MgV2ViS2l0Q2xpZW50TWVzc2FnZUxvb3AgewpkaWZm IC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9EZWJ1Z2dlckFnZW50SW1wbC5jcHAgYi9XZWJL aXQvY2hyb21pdW0vc3JjL0RlYnVnZ2VyQWdlbnRJbXBsLmNwcAppbmRleCA1MmU4N2U3YjA1ZDM0 NWE5ZjBkMTRkNDA2YjIwZThlODRlYzMzMWZhLi40NmM2ZTdjNDk3NjkyZjZhZGFhZjVmNDliYzY0 YjJjYmZkMTMwODBhIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL0RlYnVnZ2VyQWdl bnRJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL0RlYnVnZ2VyQWdlbnRJbXBsLmNw cApAQCAtMzIsMjIgKzMyLDEwIEBACiAjaW5jbHVkZSAiRGVidWdnZXJBZ2VudEltcGwuaCIKIAog I2luY2x1ZGUgIkRlYnVnZ2VyQWdlbnRNYW5hZ2VyLmgiCi0jaW5jbHVkZSAiRG9jdW1lbnQuaCIK LSNpbmNsdWRlICJGcmFtZS5oIgotI2luY2x1ZGUgIlBhZ2UuaCIKLSNpbmNsdWRlICJTY3JpcHRE ZWJ1Z1NlcnZlci5oIgotI2luY2x1ZGUgIlY4QmluZGluZy5oIgogI2luY2x1ZGUgIldlYkRldlRv b2xzQWdlbnRDbGllbnQuaCIKICNpbmNsdWRlICJXZWJEZXZUb29sc0FnZW50SW1wbC5oIgogI2lu Y2x1ZGUgIldlYlZpZXdJbXBsLmgiCi0jaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KLSNpbmNsdWRl IDx3dGYvUmVmUHRyLmg+Ci0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCi11c2luZyBXZWJDb3Jl OjpET01XaW5kb3c7Ci11c2luZyBXZWJDb3JlOjpEb2N1bWVudDsKLXVzaW5nIFdlYkNvcmU6OkZy YW1lOwotdXNpbmcgV2ViQ29yZTo6UGFnZTsKIHVzaW5nIFdURjo6U3RyaW5nOwogCiBuYW1lc3Bh Y2UgV2ViS2l0IHsKQEAgLTc1LDU4ICs2Myw2IEBAIHZvaWQgRGVidWdnZXJBZ2VudEltcGw6OmRl YnVnZ2VyT3V0cHV0KGNvbnN0IFN0cmluZyYgY29tbWFuZCkKICAgICBtX3dlYmRldnRvb2xzQWdl bnQtPmZvcmNlUmVwYWludCgpOwogfQogCi1TdHJpbmcgRGVidWdnZXJBZ2VudEltcGw6OmV4ZWN1 dGVVdGlsaXR5RnVuY3Rpb24oCi0gICAgdjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCwK LSAgICBpbnQgY2FsbElkLAotICAgIGNvbnN0IGNoYXIqIG9iamVjdCwKLSAgICBjb25zdCBTdHJp bmcgJmZ1bmN0aW9uTmFtZSwKLSAgICBjb25zdCBTdHJpbmcmIGpzb25BcmdzLAotICAgIGJvb2wg YXN5bmMsCi0gICAgU3RyaW5nKiBleGNlcHRpb24pCi17Ci0gICAgdjg6OkhhbmRsZVNjb3BlIHNj b3BlOwotICAgIEFTU0VSVCghY29udGV4dC5Jc0VtcHR5KCkpOwotICAgIGlmIChjb250ZXh0Lklz RW1wdHkoKSkgewotICAgICAgICAqZXhjZXB0aW9uID0gIk5vIHdpbmRvdyBjb250ZXh0LiI7Ci0g ICAgICAgIHJldHVybiAiIjsKLSAgICB9Ci0gICAgdjg6OkNvbnRleHQ6OlNjb3BlIGNvbnRleHRT Y29wZShjb250ZXh0KTsKLQotICAgIERlYnVnZ2VyQWdlbnRNYW5hZ2VyOjpVdGlsaXR5Q29udGV4 dFNjb3BlIHV0aWxpdHlTY29wZTsKLQotICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZGlzcGF0 Y2hPYmplY3QgPSB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KAotICAgICAgICBjb250ZXh0 LT5HbG9iYWwoKS0+R2V0KHY4OjpTdHJpbmc6Ok5ldyhvYmplY3QpKSk7Ci0KLSAgICB2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4gZGlzcGF0Y2hGdW5jdGlvbiA9IGRpc3BhdGNoT2JqZWN0LT5HZXQodjg6 OlN0cmluZzo6TmV3KCJkaXNwYXRjaCIpKTsKLSAgICBBU1NFUlQoZGlzcGF0Y2hGdW5jdGlvbi0+ SXNGdW5jdGlvbigpKTsKLSAgICB2ODo6SGFuZGxlPHY4OjpGdW5jdGlvbj4gZnVuY3Rpb24gPSB2 ODo6SGFuZGxlPHY4OjpGdW5jdGlvbj46OkNhc3QoZGlzcGF0Y2hGdW5jdGlvbik7Ci0KLSAgICB2 ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGZ1bmN0aW9uTmFtZVdyYXBwZXIgPSB2ODo6SGFuZGxlPHY4 OjpTdHJpbmc+KAotICAgICAgICB2ODo6U3RyaW5nOjpOZXcoZnVuY3Rpb25OYW1lLnV0ZjgoKS5k YXRhKCkpKTsKLSAgICB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGpzb25BcmdzV3JhcHBlciA9IHY4 OjpIYW5kbGU8djg6OlN0cmluZz4oCi0gICAgICAgIHY4OjpTdHJpbmc6Ok5ldyhqc29uQXJncy51 dGY4KCkuZGF0YSgpKSk7Ci0gICAgdjg6OkhhbmRsZTx2ODo6TnVtYmVyPiBjYWxsSWRXcmFwcGVy ID0gdjg6OkhhbmRsZTx2ODo6TnVtYmVyPigKLSAgICAgICAgdjg6Ok51bWJlcjo6TmV3KGFzeW5j ID8gY2FsbElkIDogMCkpOwotCi0gICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGFyZ3NbXSA9IHsK LSAgICAgICAgZnVuY3Rpb25OYW1lV3JhcHBlciwKLSAgICAgICAganNvbkFyZ3NXcmFwcGVyLAot ICAgICAgICBjYWxsSWRXcmFwcGVyCi0gICAgfTsKLQotICAgIHY4OjpUcnlDYXRjaCB0cnlDYXRj aDsKLSAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gcmVzT2JqID0gZnVuY3Rpb24tPkNhbGwoY29u dGV4dC0+R2xvYmFsKCksIDMsIGFyZ3MpOwotICAgIGlmICh0cnlDYXRjaC5IYXNDYXVnaHQoKSkg ewotICAgICAgICB2ODo6TG9jYWw8djg6Ok1lc3NhZ2U+IG1lc3NhZ2UgPSB0cnlDYXRjaC5NZXNz YWdlKCk7Ci0gICAgICAgIGlmIChtZXNzYWdlLklzRW1wdHkoKSkKLSAgICAgICAgICAgICpleGNl cHRpb24gPSAiVW5rbm93biBleGNlcHRpb24iOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICAq ZXhjZXB0aW9uID0gV2ViQ29yZTo6dG9XZWJDb3JlU3RyaW5nKG1lc3NhZ2UtPkdldCgpKTsKLSAg ICAgICAgcmV0dXJuICIiOwotICAgIH0KLSAgICByZXR1cm4gV2ViQ29yZTo6dG9XZWJDb3JlU3Ry aW5nV2l0aE51bGxDaGVjayhyZXNPYmopOwotfQotCiBXZWJDb3JlOjpQYWdlKiBEZWJ1Z2dlckFn ZW50SW1wbDo6cGFnZSgpCiB7CiAgICAgcmV0dXJuIG1fd2ViVmlld0ltcGwtPnBhZ2UoKTsKZGlm ZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvRGVidWdnZXJBZ2VudEltcGwuaCBiL1dlYktp dC9jaHJvbWl1bS9zcmMvRGVidWdnZXJBZ2VudEltcGwuaAppbmRleCA2OTlkNmRlYzk2ODg2MDQ2 ZmE1M2I0NGJhYzVkZmY4NjdhNzQ1OWE2Li5hOGZjYzRlNmY0MzMwYzMxZWM2ZTI0M2Q1ZWI2ZWRh ZTY4YTQxYmFkIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL0RlYnVnZ2VyQWdlbnRJ bXBsLmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9EZWJ1Z2dlckFnZW50SW1wbC5oCkBAIC0z MSwxNSArMzEsOSBAQAogI2lmbmRlZiBEZWJ1Z2dlckFnZW50SW1wbF9oCiAjZGVmaW5lIERlYnVn Z2VyQWdlbnRJbXBsX2gKIAotI2luY2x1ZGUgPHY4Lmg+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQu aD4KLSNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgotI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5o PgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7Ci1jbGFzcyBEb2N1bWVudDsKLWNsYXNzIEZyYW1lOwot Y2xhc3MgTm9kZTsKIGNsYXNzIFBhZ2U7CiB9CiAKQEAgLTYyLDE5ICs1Niw2IEBAIHB1YmxpYzoK IAogICAgIGJvb2wgYXV0b0NvbnRpbnVlT25FeGNlcHRpb24oKSB7IHJldHVybiBtX2F1dG9Db250 aW51ZU9uRXhjZXB0aW9uOyB9CiAKLSAgICAvLyBFeGVjdXRlcyBmdW5jdGlvbiB3aXRoIHRoZSBn aXZlbiBuYW1lIGluIHRoZSB1dGlsaXR5IGNvbnRleHQuIFBhc3NlcyBub2RlCi0gICAgLy8gYW5k IGpzb24gYXJncyBhcyBwYXJhbWV0ZXJzLiBOb3RlIHRoYXQgdGhlIGZ1bmN0aW9uIGNhbGxlZCBt dXN0IGJlCi0gICAgLy8gaW1wbGVtZW50ZWQgaW4gdGhlIGluamVjdF9kaXNwYXRjaC5qcyBmaWxl LgotICAgIFdURjo6U3RyaW5nIGV4ZWN1dGVVdGlsaXR5RnVuY3Rpb24oCi0gICAgICAgIHY4OjpI YW5kbGU8djg6OkNvbnRleHQ+IGNvbnRleHQsCi0gICAgICAgIGludCBjYWxsSWQsCi0gICAgICAg IGNvbnN0IGNoYXIqIG9iamVjdCwKLSAgICAgICAgY29uc3QgV1RGOjpTdHJpbmcmIGZ1bmN0aW9u TmFtZSwKLSAgICAgICAgY29uc3QgV1RGOjpTdHJpbmcmIGpzb25BcmdzLAotICAgICAgICBib29s IGFzeW5jLAotICAgICAgICBXVEY6OlN0cmluZyogZXhjZXB0aW9uKTsKLQotCiAgICAgV2ViQ29y ZTo6UGFnZSogcGFnZSgpOwogICAgIFdlYkRldlRvb2xzQWdlbnRJbXBsKiB3ZWJkZXZ0b29sc0Fn ZW50KCkgeyByZXR1cm4gbV93ZWJkZXZ0b29sc0FnZW50OyB9CiAKZGlmZiAtLWdpdCBhL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwIGIvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKaW5kZXggN2E4MjVjOGU4ZjAwNDU1ZTBmNmNl NWUzOTM0YWU0NzA5ZjNkMWJmNi4uNGRlNTYyNGNhNDhmMzRiMDE5ZjhiN2JiNTgzMzdkNzRmYWRi Njg5OSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1w bC5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAK QEAgLTMxLDE3ICszMSwxMSBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYkRl dlRvb2xzQWdlbnRJbXBsLmgiCiAKLSNpbmNsdWRlICJCb3VuZE9iamVjdC5oIgogI2luY2x1ZGUg IkRlYnVnZ2VyQWdlbnRJbXBsLmgiCiAjaW5jbHVkZSAiRGVidWdnZXJBZ2VudE1hbmFnZXIuaCIK LSNpbmNsdWRlICJEb2N1bWVudC5oIgotI2luY2x1ZGUgIkV2ZW50TGlzdGVuZXIuaCIKICNpbmNs dWRlICJJbmplY3RlZFNjcmlwdEhvc3QuaCIKLSNpbmNsdWRlICJJbnNwZWN0b3JCYWNrZW5kLmgi CiAjaW5jbHVkZSAiSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIuaCIKICNpbmNsdWRlICJJbnNw ZWN0b3JDb250cm9sbGVyLmgiCi0jaW5jbHVkZSAiSW5zcGVjdG9yUmVzb3VyY2UuaCIKLSNpbmNs dWRlICJOb2RlLmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlBhZ2VHcm91cC5oIgog I2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCkBAIC00OSw4ICs0Myw2IEBACiAjaW5jbHVkZSAi UmVzb3VyY2VSZXF1ZXN0LmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXNwb25zZS5oIgogI2luY2x1 ZGUgIlNjcmlwdERlYnVnU2VydmVyLmgiCi0jaW5jbHVkZSAiU2NyaXB0U3RhdGUuaCIKLSNpbmNs dWRlICJTY3JpcHRWYWx1ZS5oIgogI2luY2x1ZGUgIlY4QmluZGluZy5oIgogI2luY2x1ZGUgIlY4 UHJveHkuaCIKICNpbmNsdWRlICJWOFV0aWxpdGllcy5oIgpAQCAtNjgsMjEgKzYwLDE1IEBACiAj aW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CiAjaW5jbHVkZSA8d3RmL093blB0ci5oPgogCi11 c2luZyBXZWJDb3JlOjpEb2N1bWVudDsKIHVzaW5nIFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOwog dXNpbmcgV2ViQ29yZTo6RnJhbWVMb2FkZXI7CiB1c2luZyBXZWJDb3JlOjpJbmplY3RlZFNjcmlw dEhvc3Q7Ci11c2luZyBXZWJDb3JlOjpJbnNwZWN0b3JCYWNrZW5kOwogdXNpbmcgV2ViQ29yZTo6 SW5zcGVjdG9yQ29udHJvbGxlcjsKLXVzaW5nIFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlOwog dXNpbmcgV2ViQ29yZTo6Tm9kZTsKIHVzaW5nIFdlYkNvcmU6OlBhZ2U7CiB1c2luZyBXZWJDb3Jl OjpSZXNvdXJjZUVycm9yOwogdXNpbmcgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0OwogdXNpbmcg V2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTsKLXVzaW5nIFdlYkNvcmU6OlNhZmVBbGxvY2F0aW9u OwotdXNpbmcgV2ViQ29yZTo6U2NyaXB0U3RhdGU7Ci11c2luZyBXZWJDb3JlOjpTY3JpcHRWYWx1 ZTsKIHVzaW5nIFdURjo6U3RyaW5nOwogdXNpbmcgV2ViQ29yZTo6VjhET01XcmFwcGVyOwogdXNp bmcgV2ViQ29yZTo6VjhQcm94eTsKQEAgLTkxLDEzICs3Nyw2IEBAIG5hbWVzcGFjZSBXZWJLaXQg ewogCiBuYW1lc3BhY2UgewogCi12b2lkIEluc3BlY3RvckJhY2tlbmRXZWFrUmVmZXJlbmNlQ2Fs bGJhY2sodjg6OlBlcnNpc3RlbnQ8djg6OlZhbHVlPiBvYmplY3QsIHZvaWQqIHBhcmFtZXRlcikK LXsKLSAgICBJbnNwZWN0b3JCYWNrZW5kKiBiYWNrZW5kID0gc3RhdGljX2Nhc3Q8SW5zcGVjdG9y QmFja2VuZCo+KHBhcmFtZXRlcik7Ci0gICAgYmFja2VuZC0+ZGVyZWYoKTsKLSAgICBvYmplY3Qu RGlzcG9zZSgpOwotfQotCiBzdGF0aWMgY29uc3QgY2hhciBrRnJvbnRlbmRDb25uZWN0ZWRGZWF0 dXJlTmFtZVtdID0gImZyb250ZW5kLWNvbm5lY3RlZCI7CiBzdGF0aWMgY29uc3QgY2hhciBrUmVz b3VyY2VUcmFja2luZ0ZlYXR1cmVOYW1lW10gPSAicmVzb3VyY2UtdHJhY2tpbmciOwogc3RhdGlj IGNvbnN0IGNoYXIga1RpbWVsaW5lRmVhdHVyZU5hbWVbXSA9ICJ0aW1lbGluZS1wcm9maWxlciI7 CkBAIC0yMDcsMTUgKzE4Niw2IEBAIFdlYkRldlRvb2xzQWdlbnRJbXBsOjp+V2ViRGV2VG9vbHNB Z2VudEltcGwoKQogewogICAgIERlYnVnZ2VyQWdlbnRNYW5hZ2VyOjpvbldlYlZpZXdDbG9zZWQo bV93ZWJWaWV3SW1wbCk7CiAgICAgQ2xpZW50TWVzc2FnZUxvb3BBZGFwdGVyOjppbnNwZWN0ZWRW aWV3Q2xvc2VkKG1fd2ViVmlld0ltcGwpOwotICAgIGRpc3Bvc2VVdGlsaXR5Q29udGV4dCgpOwot fQotCi12b2lkIFdlYkRldlRvb2xzQWdlbnRJbXBsOjpkaXNwb3NlVXRpbGl0eUNvbnRleHQoKQot ewotICAgIGlmICghbV91dGlsaXR5Q29udGV4dC5Jc0VtcHR5KCkpIHsKLSAgICAgICAgbV91dGls aXR5Q29udGV4dC5EaXNwb3NlKCk7Ci0gICAgICAgIG1fdXRpbGl0eUNvbnRleHQuQ2xlYXIoKTsK LSAgICB9CiB9CiAKIHZvaWQgV2ViRGV2VG9vbHNBZ2VudEltcGw6OmF0dGFjaCgpCkBAIC0yMjgs MzIgKzE5OCwzMiBAQCB2b2lkIFdlYkRldlRvb2xzQWdlbnRJbXBsOjphdHRhY2goKQogCiAgICAg bV9kZWJ1Z2dlckFnZW50SW1wbC5zZXQoCiAgICAgICAgIG5ldyBEZWJ1Z2dlckFnZW50SW1wbCht X3dlYlZpZXdJbXBsLCB0aGlzLCBtX2NsaWVudCkpOwotICAgIGNyZWF0ZUluc3BlY3RvckZyb250 ZW5kUHJveHkoKTsKLQotICAgIC8vIEFsbG93IGNvbnRyb2xsZXIgdG8gc2VuZCBtZXNzYWdlcyB0 byB0aGUgZnJvbnRlbmQuCi0gICAgSW5zcGVjdG9yQ29udHJvbGxlciogaWMgPSBpbnNwZWN0b3JD b250cm9sbGVyKCk7CisgICAgV2ViQ1N0cmluZyBkZWJ1Z2dlclNjcmlwdEpzID0gbV9jbGllbnQt PmRlYnVnZ2VyU2NyaXB0U291cmNlKCk7CisgICAgV2ViQ29yZTo6U2NyaXB0RGVidWdTZXJ2ZXI6 OnNoYXJlZCgpLnNldERlYnVnZ2VyU2NyaXB0U291cmNlKAorICAgICAgICBXVEY6OlN0cmluZyhk ZWJ1Z2dlclNjcmlwdEpzLmRhdGEoKSwgZGVidWdnZXJTY3JpcHRKcy5sZW5ndGgoKSkpOwogCi0g ICAgeyAvLyBUT0RPKHl1cnlzKTogdGhlIHNvdXJjZSBzaG91bGQgaGF2ZSBhbHJlYWR5IGJlZW4g cHVzaGVkIGJ5IHRoZSBmcm9udGVuZC4KLSAgICAgICAgdjg6OkhhbmRsZVNjb3BlIHNjb3BlOwot ICAgICAgICB2ODo6Q29udGV4dDo6U2NvcGUgY29udGV4dFNjb3BlKG1fdXRpbGl0eUNvbnRleHQp OwotICAgICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gY29uc3RydWN0b3JWYWx1ZSA9IG1fdXRp bGl0eUNvbnRleHQtPkdsb2JhbCgpLT5HZXQoCi0gICAgICAgICAgICB2ODo6U3RyaW5nOjpOZXco ImluamVjdGVkU2NyaXB0Q29uc3RydWN0b3IiKSk7Ci0gICAgICAgIGlmIChjb25zdHJ1Y3RvclZh bHVlLT5Jc0Z1bmN0aW9uKCkpIHsKLSAgICAgICAgICAgIFN0cmluZyBzb3VyY2UgPSBXZWJDb3Jl Ojp0b1dlYkNvcmVTdHJpbmcoY29uc3RydWN0b3JWYWx1ZSk7Ci0gICAgICAgICAgICBpYy0+aW5q ZWN0ZWRTY3JpcHRIb3N0KCktPnNldEluamVjdGVkU2NyaXB0U291cmNlKCIoIiArIHNvdXJjZSAr ICIpIik7Ci0gICAgICAgIH0KKyAgICAvLyBUT0RPKHl1cnlzKTogdGhlIHNvdXJjZSBzaG91bGQg aGF2ZSBhbHJlYWR5IGJlZW4gcHVzaGVkIGJ5IHRoZSBmcm9udGVuZC4KKyAgICBXZWJDU3RyaW5n IGluamVjdGVkU2NyaXB0SnMgPSBtX2NsaWVudC0+aW5qZWN0ZWRTY3JpcHRTb3VyY2UoKTsKKyAg ICBTdHJpbmcgaW5qZWN0ZWRTY3JpcHRTb3VyY2UgPSBTdHJpbmc6OmZyb21VVEY4KGluamVjdGVk U2NyaXB0SnMuZGF0YSgpLCBpbmplY3RlZFNjcmlwdEpzLmxlbmd0aCgpKTsKKyAgICBjb25zdCBj aGFyKiB2YXJEZWZpbml0aW9uID0gInZhciBpbmplY3RlZFNjcmlwdENvbnN0cnVjdG9yID0gIjsK KyAgICBpbnQgcG9zID0gaW5qZWN0ZWRTY3JpcHRTb3VyY2UuZmluZCh2YXJEZWZpbml0aW9uKTsK KyAgICBpZiAocG9zID09IC0xKSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg ICAgICByZXR1cm47CiAgICAgfQorICAgIHBvcyArPSBTdHJpbmcodmFyRGVmaW5pdGlvbikubGVu Z3RoKCk7CisgICAgaW5qZWN0ZWRTY3JpcHRTb3VyY2UgPSBpbmplY3RlZFNjcmlwdFNvdXJjZS5z dWJzdHJpbmcocG9zKTsKKyAgICBpbnNwZWN0b3JDb250cm9sbGVyKCktPmluamVjdGVkU2NyaXB0 SG9zdCgpLT5zZXRJbmplY3RlZFNjcmlwdFNvdXJjZShpbmplY3RlZFNjcmlwdFNvdXJjZSk7CiAg ICAgbV9hdHRhY2hlZCA9IHRydWU7CiB9CiAKIHZvaWQgV2ViRGV2VG9vbHNBZ2VudEltcGw6OmRl dGFjaCgpCiB7CiAgICAgLy8gUHJldmVudCBjb250cm9sbGVyIGZyb20gc2VuZGluZyBtZXNzYWdl cyB0byB0aGUgZnJvbnRlbmQuCi0gICAgSW5zcGVjdG9yQ29udHJvbGxlciogaWMgPSBtX3dlYlZp ZXdJbXBsLT5wYWdlKCktPmluc3BlY3RvckNvbnRyb2xsZXIoKTsKKyAgICBJbnNwZWN0b3JDb250 cm9sbGVyKiBpYyA9IGluc3BlY3RvckNvbnRyb2xsZXIoKTsKICAgICBpYy0+ZGlzY29ubmVjdEZy b250ZW5kKCk7CiAgICAgaWMtPmhpZGVIaWdobGlnaHQoKTsKICAgICBpYy0+Y2xvc2UoKTsKLSAg ICBkaXNwb3NlVXRpbGl0eUNvbnRleHQoKTsKICAgICBtX2RlYnVnZ2VyQWdlbnRJbXBsLnNldCgw KTsKICAgICBtX2F0dGFjaGVkID0gZmFsc2U7CiAgICAgbV9hcHVBZ2VudEVuYWJsZWQgPSBmYWxz ZTsKQEAgLTI2MSw4ICsyMzEsNyBAQCB2b2lkIFdlYkRldlRvb2xzQWdlbnRJbXBsOjpkZXRhY2go KQogCiB2b2lkIFdlYkRldlRvb2xzQWdlbnRJbXBsOjpmcm9udGVuZExvYWRlZCgpCiB7Ci0gICAg SW5zcGVjdG9yQ29udHJvbGxlciogaWMgPSBpbnNwZWN0b3JDb250cm9sbGVyKCk7Ci0gICAgaWMt PmNvbm5lY3RGcm9udGVuZCgpOworICAgIGluc3BlY3RvckNvbnRyb2xsZXIoKS0+Y29ubmVjdEZy b250ZW5kKCk7CiAgICAgbV9jbGllbnQtPnJ1bnRpbWVGZWF0dXJlU3RhdGVDaGFuZ2VkKGtGcm9u dGVuZENvbm5lY3RlZEZlYXR1cmVOYW1lLCB0cnVlKTsKIH0KIApAQCAtMjk5LDcgKzI2OCw3IEBA IHZvaWQgV2ViRGV2VG9vbHNBZ2VudEltcGw6OnNldFJ1bnRpbWVGZWF0dXJlRW5hYmxlZChjb25z dCBXZWJTdHJpbmcmIGZlYXR1cmUsIGJvCiAgICAgZWxzZSBpZiAoZmVhdHVyZSA9PSBrVGltZWxp bmVGZWF0dXJlTmFtZSkKICAgICAgICAgc2V0VGltZWxpbmVQcm9maWxpbmdFbmFibGVkKGVuYWJs ZWQpOwogICAgIGVsc2UgaWYgKGZlYXR1cmUgPT0ga1Jlc291cmNlVHJhY2tpbmdGZWF0dXJlTmFt ZSkgewotICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyKiBpYyA9IG1fd2ViVmlld0ltcGwtPnBh Z2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpOworICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVy KiBpYyA9IGluc3BlY3RvckNvbnRyb2xsZXIoKTsKICAgICAgICAgaWYgKGVuYWJsZWQpCiAgICAg ICAgICAgaWMtPmVuYWJsZVJlc291cmNlVHJhY2tpbmcoZmFsc2UgLyogbm90IHN0aWNreSAqLywg ZmFsc2UgLyogbm8gcmVsb2FkICovKTsKICAgICAgICAgZWxzZQpAQCAtMzA4LDQ1ICsyNzcsMTAg QEAgdm9pZCBXZWJEZXZUb29sc0FnZW50SW1wbDo6c2V0UnVudGltZUZlYXR1cmVFbmFibGVkKGNv bnN0IFdlYlN0cmluZyYgZmVhdHVyZSwgYm8KICAgICAgICAgZnJvbnRlbmRMb2FkZWQoKTsKIH0K IAotdm9pZCBXZWJEZXZUb29sc0FnZW50SW1wbDo6Y29tcGlsZVV0aWxpdHlTY3JpcHRzKCkKLXsK LSAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7Ci0gICAgdjg6OkNvbnRleHQ6OlNjb3Bl IGNvbnRleHRTY29wZShtX3V0aWxpdHlDb250ZXh0KTsKLSAgICAvLyBJbmplY3QgamF2YXNjcmlw dCBpbnRvIHRoZSBjb250ZXh0LgotICAgIFdlYkNTdHJpbmcgaW5qZWN0ZWRTY3JpcHRKcyA9IG1f Y2xpZW50LT5pbmplY3RlZFNjcmlwdFNvdXJjZSgpOwotICAgIHY4OjpTY3JpcHQ6OkNvbXBpbGUo djg6OlN0cmluZzo6TmV3KAotICAgICAgICBpbmplY3RlZFNjcmlwdEpzLmRhdGEoKSwKLSAgICAg ICAgaW5qZWN0ZWRTY3JpcHRKcy5sZW5ndGgoKSkpLT5SdW4oKTsKLSAgICBXZWJDU3RyaW5nIGlu amVjdERpc3BhdGNoSnMgPSBtX2NsaWVudC0+aW5qZWN0ZWRTY3JpcHREaXNwYXRjaGVyU291cmNl KCk7Ci0gICAgdjg6OlNjcmlwdDo6Q29tcGlsZSh2ODo6U3RyaW5nOjpOZXcoCi0gICAgICAgIGlu amVjdERpc3BhdGNoSnMuZGF0YSgpLAotICAgICAgICBpbmplY3REaXNwYXRjaEpzLmxlbmd0aCgp KSktPlJ1bigpOwotfQotCi12b2lkIFdlYkRldlRvb2xzQWdlbnRJbXBsOjppbml0RGV2VG9vbHNB Z2VudEhvc3QoKQotewotICAgIEJvdW5kT2JqZWN0IGRldnRvb2xzQWdlbnRIb3N0KG1fdXRpbGl0 eUNvbnRleHQsIHRoaXMsICJEZXZUb29sc0FnZW50SG9zdCIpOwotICAgIGRldnRvb2xzQWdlbnRI b3N0LmFkZFByb3RvRnVuY3Rpb24oCi0gICAgICAgICJkaXNwYXRjaCIsCi0gICAgICAgIFdlYkRl dlRvb2xzQWdlbnRJbXBsOjpqc0Rpc3BhdGNoT25DbGllbnQpOwotICAgIGRldnRvb2xzQWdlbnRI b3N0LmJ1aWxkKCk7Ci19Ci0KLXZvaWQgV2ViRGV2VG9vbHNBZ2VudEltcGw6OmNyZWF0ZUluc3Bl Y3RvckZyb250ZW5kUHJveHkoKQotewotICAgIGRpc3Bvc2VVdGlsaXR5Q29udGV4dCgpOwotICAg IG1fdXRpbGl0eUNvbnRleHQgPSB2ODo6Q29udGV4dDo6TmV3KCk7Ci0gICAgY29tcGlsZVV0aWxp dHlTY3JpcHRzKCk7Ci0gICAgaW5pdERldlRvb2xzQWdlbnRIb3N0KCk7Ci0gICAgV2ViQ1N0cmlu ZyBkZWJ1Z2dlclNjcmlwdEpzID0gbV9jbGllbnQtPmRlYnVnZ2VyU2NyaXB0U291cmNlKCk7Ci0g ICAgV2ViQ29yZTo6U2NyaXB0RGVidWdTZXJ2ZXI6OnNoYXJlZCgpLnNldERlYnVnZ2VyU2NyaXB0 U291cmNlKAotICAgICAgICBXVEY6OlN0cmluZyhkZWJ1Z2dlclNjcmlwdEpzLmRhdGEoKSwgZGVi dWdnZXJTY3JpcHRKcy5sZW5ndGgoKSkpOwotfQotCiB2b2lkIFdlYkRldlRvb2xzQWdlbnRJbXBs OjpzZXRBcHVBZ2VudEVuYWJsZWQoYm9vbCBlbmFibGVkKQogewogICAgIG1fYXB1QWdlbnRFbmFi bGVkID0gZW5hYmxlZDsKLSAgICBJbnNwZWN0b3JDb250cm9sbGVyKiBpYyA9IG1fd2ViVmlld0lt cGwtPnBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpOworICAgIEluc3BlY3RvckNvbnRyb2xs ZXIqIGljID0gaW5zcGVjdG9yQ29udHJvbGxlcigpOwogICAgIGlmIChlbmFibGVkKSB7CiAgICAg ICAgIG1fcmVzb3VyY2VUcmFja2luZ1dhc0VuYWJsZWQgPSBpYy0+cmVzb3VyY2VUcmFja2luZ0Vu YWJsZWQoKTsKICAgICAgICAgaWMtPnN0YXJ0VGltZWxpbmVQcm9maWxlcigpOwpAQCAtMzY3LDMy ICszMDEsNiBAQCB2b2lkIFdlYkRldlRvb2xzQWdlbnRJbXBsOjpzZXRBcHVBZ2VudEVuYWJsZWQo Ym9vbCBlbmFibGVkKQogICAgICAgICBlbmFibGVkKTsKIH0KIAotLy8gc3RhdGljCi12ODo6SGFu ZGxlPHY4OjpWYWx1ZT4gV2ViRGV2VG9vbHNBZ2VudEltcGw6OmpzRGlzcGF0Y2hPbkNsaWVudChj b25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQotewotICAgIHY4OjpUcnlDYXRjaCBleGNlcHRpb25D YXRjaGVyOwotICAgIFN0cmluZyBtZXNzYWdlID0gV2ViQ29yZTo6dG9XZWJDb3JlU3RyaW5nV2l0 aE51bGxDaGVjayhhcmdzWzBdKTsKLSAgICBpZiAobWVzc2FnZS5pc0VtcHR5KCkgfHwgZXhjZXB0 aW9uQ2F0Y2hlci5IYXNDYXVnaHQoKSkKLSAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsK LQotICAgIFdlYkRldlRvb2xzQWdlbnRJbXBsKiBhZ2VudCA9IHN0YXRpY19jYXN0PFdlYkRldlRv b2xzQWdlbnRJbXBsKj4odjg6OkV4dGVybmFsOjpDYXN0KCphcmdzLkRhdGEoKSktPlZhbHVlKCkp OwotCi0gICAgaWYgKCFhZ2VudC0+bV9hcHVBZ2VudEVuYWJsZWQpIHsKLSAgICAgICAgYWdlbnQt Pm1fY2xpZW50LT5zZW5kTWVzc2FnZVRvSW5zcGVjdG9yRnJvbnRlbmQobWVzc2FnZSk7Ci0gICAg ICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7Ci0gICAgfQotCi0gICAgU3RyaW5nIG1ldGhvZCA9 IFdlYkNvcmU6OnRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsQ2hlY2soYXJnc1sxXSk7Ci0gICAgaWYg KG1ldGhvZC5pc0VtcHR5KCkgfHwgZXhjZXB0aW9uQ2F0Y2hlci5IYXNDYXVnaHQoKSkKLSAgICAg ICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKLQotICAgIGlmIChtZXRob2QgIT0gInVwZGF0ZVJl c291cmNlIiAmJiBtZXRob2QgIT0gImFkZFJlc291cmNlIikKLSAgICAgICAgcmV0dXJuIHY4OjpV bmRlZmluZWQoKTsKLQotICAgIGFnZW50LT5tX2NsaWVudC0+c2VuZERpc3BhdGNoVG9BUFUobWVz c2FnZSk7Ci0gICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKLX0KLQogV2ViQ29yZTo6SW5zcGVj dG9yQ29udHJvbGxlciogV2ViRGV2VG9vbHNBZ2VudEltcGw6Omluc3BlY3RvckNvbnRyb2xsZXIo KQogewogICAgIGlmIChQYWdlKiBwYWdlID0gbV93ZWJWaWV3SW1wbC0+cGFnZSgpKQpkaWZmIC0t Z2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5oIGIvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5oCmluZGV4IDkxMTMxNmVlYTc2ZWJk NTg5YzQwMDFiYjIzNmZjNmFmYzFiYjhhM2MuLmEwZDI2NDczNjgyY2EwNWMyYzg4YWVmYzE3YTA2 YzRiYjhkMWUxNTcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNB Z2VudEltcGwuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBs LmgKQEAgLTEwNCwxMyArMTA0LDYgQEAgcHVibGljOgogICAgIGludCBob3N0SWQoKSB7IHJldHVy biBtX2hvc3RJZDsgfQogCiBwcml2YXRlOgotICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4ganNEaXNwYXRjaE9uQ2xpZW50KGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpOwotCi0gICAg dm9pZCBkaXNwb3NlVXRpbGl0eUNvbnRleHQoKTsKLQotICAgIHZvaWQgY29tcGlsZVV0aWxpdHlT Y3JpcHRzKCk7Ci0gICAgdm9pZCBpbml0RGV2VG9vbHNBZ2VudEhvc3QoKTsKLSAgICB2b2lkIGNy ZWF0ZUluc3BlY3RvckZyb250ZW5kUHJveHkoKTsKICAgICB2b2lkIHNldEFwdUFnZW50RW5hYmxl ZChib29sIGVuYWJsZWQpOwogCiAgICAgV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlciogaW5z cGVjdG9yQ29udHJvbGxlcigpOwpAQCAtMTIyLDkgKzExNSw2IEBAIHByaXZhdGU6CiAgICAgYm9v bCBtX2FwdUFnZW50RW5hYmxlZDsKICAgICBib29sIG1fcmVzb3VyY2VUcmFja2luZ1dhc0VuYWJs ZWQ7CiAgICAgYm9vbCBtX2F0dGFjaGVkOwotICAgIC8vIFRPRE8ocGZlbGRtYW4pOiBUaGlzIHNo b3VsZCBub3QgYmUgbmVlZGVkIG9uY2UgR0Mgc3R5bGVzIGlzc3VlIGlzIGZpeGVkCi0gICAgLy8g Zm9yIG1hdGNoaW5nIHJ1bGVzLgotICAgIHY4OjpQZXJzaXN0ZW50PHY4OjpDb250ZXh0PiBtX3V0 aWxpdHlDb250ZXh0OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==