42883 2010-07-23 01:49:02 -0700 Chromium DevTools: migrate from utility context-based injected script dispatch to upstream schema. 2010-07-23 05:58:45 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman abarth eric webkit-ews webkit.review.bot yurys oldest_to_newest 255263 0 pfeldman 2010-07-23 01:49:02 -0700 Patch to follow. 255264 1 62396 pfeldman 2010-07-23 01:50:25 -0700 Created attachment 62396 [PATCH] Proposed change. 255305 2 62414 pfeldman 2010-07-23 04:50:35 -0700 Created attachment 62414 [PATCH] Tests fixed. 255312 3 62414 yurys 2010-07-23 04:55:00 -0700 Comment on attachment 62414 [PATCH] Tests fixed. WebCore/inspector/front-end/InjectedScriptAccess.js:40 + else { You don't need "else" since you return from the "if" branch. WebCore/bindings/v8/ScriptProfile.cpp:43 + v8::HandleScope scope; This shouldn't be necessary, please check. 255314 4 webkit-ews 2010-07-23 04:55:23 -0700 Attachment 62414 did not build on qt: Build output: http://queues.webkit.org/results/3567387 255315 5 eric 2010-07-23 04:55:59 -0700 Attachment 62414 did not build on mac: Build output: http://queues.webkit.org/results/3580339 255331 6 webkit.review.bot 2010-07-23 05:16:31 -0700 http://trac.webkit.org/changeset/63963 might have broken Qt Linux Release minimal and Qt Linux ARMv5 Release 255341 7 pfeldman 2010-07-23 05:58:45 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/bindings/v8/ScriptProfile.cpp M WebCore/inspector/InspectorController.cpp M WebCore/inspector/front-end/InjectedScriptAccess.js M WebKit/chromium/ChangeLog M WebKit/chromium/src/ToolsAgent.h M WebKit/chromium/src/WebDevToolsAgentImpl.cpp M WebKit/chromium/src/WebDevToolsAgentImpl.h M WebKit/chromium/src/js/DevToolsHostStub.js M WebKit/chromium/src/js/InspectorControllerImpl.js Committed r63965 62396 2010-07-23 01:50:25 -0700 2010-07-23 04:50:35 -0700 [PATCH] Proposed change. dispatch_is text/plain 5019 pfeldman ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDkyZGIzMWYuLjFjYjU4NmYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE5IEBACisyMDEwLTA3LTIzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENocm9t aXVtIERldlRvb2xzOiBtaWdyYXRlIGZyb20gdXRpbGl0eSBjb250ZXh0LWJhc2VkIGluamVjdGVk CisgICAgICAgIHNjcmlwdCBkaXNwYXRjaCB0byB1cHN0cmVhbSBzY2hlbWEuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyODgzCisKKyAgICAgICAg KiBzcmMvVG9vbHNBZ2VudC5oOgorICAgICAgICAqIHNyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5j cHA6CisgICAgICAgICogc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmg6CisgICAgICAgICogc3Jj L2pzL0RldlRvb2xzSG9zdFN0dWIuanM6CisgICAgICAgICogc3JjL2pzL0luc3BlY3RvckNvbnRy b2xsZXJJbXBsLmpzOgorICAgICAgICAoZGV2dG9vbHMuSW5zcGVjdG9yQmFja2VuZEltcGwpOgor CiAyMDEwLTA3LTIzICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTaGluaWNoaXJvIEhhbWFqaS4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJv bWl1bS9zcmMvVG9vbHNBZ2VudC5oIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9Ub29sc0FnZW50LmgK aW5kZXggZDg3OGFlYS4uYzlhMTVkNSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9U b29sc0FnZW50LmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9Ub29sc0FnZW50LmgKQEAgLTQx LDExICs0MSw2IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogICAgIC8qIERpc3BhdGNoZXMgZ2l2ZW4g ZnVuY3Rpb24gb24gdGhlIEluc3BlY3RvckNvbnRyb2xsZXIgb2JqZWN0ICovIFwKICAgICBNRVRI T0QyKGRpc3BhdGNoT25JbnNwZWN0b3JDb250cm9sbGVyLCBpbnQgLyogY2FsbF9pZCAqLywgXAog ICAgICAgICBTdHJpbmcgLyogbWVzc2FnZSAqLykgXAotICAgIFwKLSAgICAvKiBEaXNwYXRjaGVz IGdpdmVuIGZ1bmN0aW9uIG9uIHRoZSBJbmplY3RlZFNjcmlwdCBvYmplY3QgKi8gXAotICAgIE1F VEhPRDUoZGlzcGF0Y2hPbkluamVjdGVkU2NyaXB0LCBpbnQgLyogY2FsbF9pZCAqLywgXAotICAg ICAgICBpbnQgLyogaW5qZWN0ZWRfc2NyaXB0X2lkICovLCBTdHJpbmcgLyogZnVuY3Rpb25fbmFt ZSAqLywgXAotICAgICAgICBTdHJpbmcgLyoganNvbl9hcmdzICovLCBib29sIC8qIGFzeW5jICov KQogCiBERUZJTkVfUlBDX0NMQVNTKFRvb2xzQWdlbnQsIFRPT0xTX0FHRU5UX1NUUlVDVCkKIApk aWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAg Yi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcAppbmRleCA2MjM4 ZGQyLi4zZDc5ZTBjIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xz QWdlbnRJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJ bXBsLmNwcApAQCAtMzE2LDE2ICszMTYsNiBAQCB2b2lkIFdlYkRldlRvb2xzQWdlbnRJbXBsOjpk aXNwYXRjaE9uSW5zcGVjdG9yQ29udHJvbGxlcihpbnQgY2FsbElkLCBjb25zdCBTdHJpbgogICAg IG1fdG9vbHNBZ2VudERlbGVnYXRlU3R1Yi0+ZGlkRGlzcGF0Y2hPbihjYWxsSWQsICIiLCBleGNl cHRpb24pOwogfQogCi12b2lkIFdlYkRldlRvb2xzQWdlbnRJbXBsOjpkaXNwYXRjaE9uSW5qZWN0 ZWRTY3JpcHQoaW50IGNhbGxJZCwgaW50IGluamVjdGVkU2NyaXB0SWQsIGNvbnN0IFN0cmluZyYg ZnVuY3Rpb25OYW1lLCBjb25zdCBTdHJpbmcmIGpzb25BcmdzLCBib29sIGFzeW5jKQotewotICAg IGluc3BlY3RvckNvbnRyb2xsZXIoKS0+aW5zcGVjdG9yQmFja2VuZCgpLT5kaXNwYXRjaE9uSW5q ZWN0ZWRTY3JpcHQoCi0gICAgICAgIGNhbGxJZCwKLSAgICAgICAgaW5qZWN0ZWRTY3JpcHRJZCwK LSAgICAgICAgZnVuY3Rpb25OYW1lLAotICAgICAgICBqc29uQXJncywKLSAgICAgICAgYXN5bmMp OwotfQotCiB2b2lkIFdlYkRldlRvb2xzQWdlbnRJbXBsOjpkaXNwYXRjaE1lc3NhZ2VGcm9tRnJv bnRlbmQoY29uc3QgV2ViRGV2VG9vbHNNZXNzYWdlRGF0YSYgZGF0YSkKIHsKICAgICBpZiAoVG9v bHNBZ2VudERpc3BhdGNoOjpkaXNwYXRjaCh0aGlzLCBkYXRhKSkKZGlmZiAtLWdpdCBhL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuaCBiL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuaAppbmRleCBiZWI1Y2ZhLi4xYmI3MWEzIDEwMDY0NAot LS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmgKKysrIGIvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5oCkBAIC03Myw3ICs3Myw2IEBA IHB1YmxpYzoKIAogICAgIC8vIFRvb2xzQWdlbnQgaW1wbGVtZW50YXRpb24uCiAgICAgdmlydHVh bCB2b2lkIGRpc3BhdGNoT25JbnNwZWN0b3JDb250cm9sbGVyKGludCBjYWxsSWQsIGNvbnN0IFdl YkNvcmU6OlN0cmluZyYgbWVzc2FnZSk7Ci0gICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoT25Jbmpl Y3RlZFNjcmlwdChpbnQgY2FsbElkLCBpbnQgaW5qZWN0ZWRTY3JpcHRJZCwgY29uc3QgV2ViQ29y ZTo6U3RyaW5nJiBmdW5jdGlvbk5hbWUsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYganNvbkFyZ3Ms IGJvb2wgYXN5bmMpOwogCiAgICAgLy8gV2ViRGV2VG9vbHNBZ2VudFByaXZhdGUgaW1wbGVtZW50 YXRpb24uCiAgICAgdmlydHVhbCB2b2lkIGRpZENsZWFyV2luZG93T2JqZWN0KFdlYkZyYW1lSW1w bCogZnJhbWUpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9EZXZUb29sc0hv c3RTdHViLmpzIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9EZXZUb29sc0hvc3RTdHViLmpzCmlu ZGV4IGEyZjM1NmYuLjUyYjI4YmIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvanMv RGV2VG9vbHNIb3N0U3R1Yi5qcworKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL0RldlRvb2xz SG9zdFN0dWIuanMKQEAgLTM3LDcgKzM3LDYgQEAgaWYgKCF3aW5kb3dbIlJlbW90ZURlYnVnZ2Vy Q29tbWFuZEV4ZWN1dG9yIl0pIHsKICAgICB3aW5kb3dbIlJlbW90ZURlYnVnZ2VyQ29tbWFuZEV4 ZWN1dG9yIl0gPSB7fTsKICAgICB3aW5kb3dbIlJlbW90ZVByb2ZpbGVyQWdlbnQiXSA9IHt9Owog ICAgIHdpbmRvd1siUmVtb3RlVG9vbHNBZ2VudCJdID0gewotICAgICAgICBkaXNwYXRjaE9uSW5q ZWN0ZWRTY3JpcHQ6IGZ1bmN0aW9uKCkge30sCiAgICAgICAgIGRpc3BhdGNoT25JbnNwZWN0b3JD b250cm9sbGVyOiBmdW5jdGlvbigpIHt9CiAgICAgfTsKIH0KZGlmZiAtLWdpdCBhL1dlYktpdC9j aHJvbWl1bS9zcmMvanMvSW5zcGVjdG9yQ29udHJvbGxlckltcGwuanMgYi9XZWJLaXQvY2hyb21p dW0vc3JjL2pzL0luc3BlY3RvckNvbnRyb2xsZXJJbXBsLmpzCmluZGV4IDMwZWRkOWUuLmJlZDAw OWUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvanMvSW5zcGVjdG9yQ29udHJvbGxl ckltcGwuanMKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9JbnNwZWN0b3JDb250cm9sbGVy SW1wbC5qcwpAQCAtNDksNiArNDksNyBAQCBkZXZ0b29scy5JbnNwZWN0b3JCYWNrZW5kSW1wbCA9 IGZ1bmN0aW9uKCkKICAgICB0aGlzLmluc3RhbGxJbnNwZWN0b3JDb250cm9sbGVyRGVsZWdhdGVf KCJkaXNhYmxlUmVzb3VyY2VUcmFja2luZyIpOwogICAgIHRoaXMuaW5zdGFsbEluc3BlY3RvckNv bnRyb2xsZXJEZWxlZ2F0ZV8oImRpc2FibGVTZWFyY2hpbmdGb3JOb2RlIik7CiAgICAgdGhpcy5p bnN0YWxsSW5zcGVjdG9yQ29udHJvbGxlckRlbGVnYXRlXygiZGlzYWJsZVRpbWVsaW5lIik7Cisg ICAgdGhpcy5pbnN0YWxsSW5zcGVjdG9yQ29udHJvbGxlckRlbGVnYXRlXygiZGlzcGF0Y2hPbklu amVjdGVkU2NyaXB0Iik7CiAgICAgdGhpcy5pbnN0YWxsSW5zcGVjdG9yQ29udHJvbGxlckRlbGVn YXRlXygiZW5hYmxlTW9uaXRvcmluZ1hIUiIpOwogICAgIHRoaXMuaW5zdGFsbEluc3BlY3RvckNv bnRyb2xsZXJEZWxlZ2F0ZV8oImVuYWJsZVJlc291cmNlVHJhY2tpbmciKTsKICAgICB0aGlzLmlu c3RhbGxJbnNwZWN0b3JDb250cm9sbGVyRGVsZWdhdGVfKCJlbmFibGVTZWFyY2hpbmdGb3JOb2Rl Iik7CkBAIC0xMjYsMTggKzEyNyw2IEBAIGRldnRvb2xzLkluc3BlY3RvckJhY2tlbmRJbXBsLnBy b3RvdHlwZS5wYXVzZSA9IGZ1bmN0aW9uKCkKIAogCiAvKioKLSAqIEBvdmVycmlkZQotICovCi1k ZXZ0b29scy5JbnNwZWN0b3JCYWNrZW5kSW1wbC5wcm90b3R5cGUuZGlzcGF0Y2hPbkluamVjdGVk U2NyaXB0ID0gZnVuY3Rpb24oY2FsbElkLCBpbmplY3RlZFNjcmlwdElkLCBtZXRob2ROYW1lLCBh cmdzU3RyaW5nLCBhc3luYykKLXsKLSAgICAvLyBFbmNvZGUgaW5qZWN0ZWRTY3JpcHRJZCBpbnRv IGNhbGxJZAotICAgIGlmICh0eXBlb2YgaW5qZWN0ZWRTY3JpcHRJZCAhPT0gIm51bWJlciIpCi0g ICAgICAgIGluamVjdGVkU2NyaXB0SWQgPSAwOwotICAgIFJlbW90ZVRvb2xzQWdlbnQuZGlzcGF0 Y2hPbkluamVjdGVkU2NyaXB0KGNhbGxJZCwgaW5qZWN0ZWRTY3JpcHRJZCwgbWV0aG9kTmFtZSwg YXJnc1N0cmluZywgYXN5bmMpOwotfTsKLQotCi0vKioKICAqIEluc3RhbGxzIGRlbGVnYXRpbmcg aGFuZGxlciBpbnRvIHRoZSBpbnNwZWN0b3IgY29udHJvbGxlci4KICAqIEBwYXJhbSB7c3RyaW5n fSBtZXRob2ROYW1lIE1ldGhvZCB0byBpbnN0YWxsIGRlbGVnYXRpbmcgaGFuZGxlciBmb3IuCiAg Ki8K 62414 2010-07-23 04:50:35 -0700 2010-07-23 04:55:00 -0700 [PATCH] Tests fixed. dispatch_on_is text/plain 7966 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NWI1Y2ZhOS4uNGRjMDRmMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wNy0yMyAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBDaHJvbWl1bSBEZXZUb29sczogbWlncmF0ZSBmcm9tIHV0aWxp dHkgY29udGV4dC1iYXNlZCBpbmplY3RlZAorICAgICAgICBzY3JpcHQgZGlzcGF0Y2ggdG8gdXBz dHJlYW0gc2NoZW1hLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00Mjg4MworCisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0UHJvZmlsZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRQcm9maWxlOjp0aXRsZSk6CisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yQ29udHJvbGxlcjo6Z2V0UHJvZmlsZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9JbmplY3RlZFNjcmlwdEFjY2Vzcy5qczoKKyAgICAgICAgKEluamVjdGVkU2NyaXB0QWNjZXNz LmdldCBpZik6CisgICAgICAgIChJbmplY3RlZFNjcmlwdEFjY2Vzcyk6CisKIDIwMTAtMDctMjIg IElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdFByb2ZpbGUuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRQcm9maWxlLmNw cAppbmRleCBiZWFmZWExLi4zYjcxZDVmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdFByb2ZpbGUuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0UHJvZmls ZS5jcHAKQEAgLTQwLDYgKzQwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBTdHJpbmcgU2Ny aXB0UHJvZmlsZTo6dGl0bGUoKSBjb25zdAogeworICAgIHY4OjpIYW5kbGVTY29wZSBzY29wZTsK ICAgICByZXR1cm4gdG9XZWJDb3JlU3RyaW5nKG1fcHJvZmlsZS0+R2V0VGl0bGUoKSk7CiB9CiAK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggZjc0MmRmMC4u OTFiYTE4NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxl ci5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAg LTc5LDYgKzc5LDcgQEAKICNpbmNsdWRlICJTY3JpcHRPYmplY3QuaCIKICNpbmNsdWRlICJTY3Jp cHRQcm9maWxlLmgiCiAjaW5jbHVkZSAiU2NyaXB0UHJvZmlsZXIuaCIKKyNpbmNsdWRlICJTY3Jp cHRTY29wZS5oIgogI2luY2x1ZGUgIlNjcmlwdFNvdXJjZUNvZGUuaCIKICNpbmNsdWRlICJTY3Jp cHRTdHJpbmcuaCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgpAQCAtMTU2MCwxMiArMTU2 MSwxNCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmdldFByb2ZpbGUobG9uZyBjYWxsSWQs IHVuc2lnbmVkIHVpZCkKICAgICBpZiAoIW1fZnJvbnRlbmQpCiAgICAgICAgIHJldHVybjsKICAg ICBQcm9maWxlc01hcDo6aXRlcmF0b3IgaXQgPSBtX3Byb2ZpbGVzLmZpbmQodWlkKTsKLSAgICBp ZiAoaXQgIT0gbV9wcm9maWxlcy5lbmQoKSkKKyAgICBpZiAoaXQgIT0gbV9wcm9maWxlcy5lbmQo KSkgewogI2lmIFVTRShKU0MpCiAgICAgICAgIG1fZnJvbnRlbmQtPmRpZEdldFByb2ZpbGUoY2Fs bElkLCB0b0pTKG1fZnJvbnRlbmQtPnNjcmlwdFN0YXRlKCksIGl0LT5zZWNvbmQuZ2V0KCkpKTsK ICNlbHNlCisgICAgICAgIFNjcmlwdFNjb3BlIHNjb3BlKG1fZnJvbnRlbmQtPnNjcmlwdFN0YXRl KCkpOwogICAgICAgICBtX2Zyb250ZW5kLT5kaWRHZXRQcm9maWxlKGNhbGxJZCwgdG9WOChpdC0+ c2Vjb25kLmdldCgpKSk7CiAjZW5kaWYKKyAgICB9CiB9CiAKIFNjcmlwdE9iamVjdCBJbnNwZWN0 b3JDb250cm9sbGVyOjpjcmVhdGVQcm9maWxlSGVhZGVyKGNvbnN0IFNjcmlwdFByb2ZpbGUmIHBy b2ZpbGUpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRT Y3JpcHRBY2Nlc3MuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3Jp cHRBY2Nlc3MuanMKaW5kZXggMGU0Y2MyZS4uN2VhMTQ5ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0QWNjZXNzLmpzCisrKyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdEFjY2Vzcy5qcwpAQCAtMzUsNyArMzUs MTIgQEAgZnVuY3Rpb24gSW5qZWN0ZWRTY3JpcHRBY2Nlc3MoaW5qZWN0ZWRTY3JpcHRJZCkgewog CiBJbmplY3RlZFNjcmlwdEFjY2Vzcy5nZXQgPSBmdW5jdGlvbihpbmplY3RlZFNjcmlwdElkKQog ewotICAgIHJldHVybiBuZXcgSW5qZWN0ZWRTY3JpcHRBY2Nlc3MoaW5qZWN0ZWRTY3JpcHRJZCk7 CisgICAgaWYgKHR5cGVvZiBpbmplY3RlZFNjcmlwdElkID09PSAibnVtYmVyIikKKyAgICAgICAg cmV0dXJuIG5ldyBJbmplY3RlZFNjcmlwdEFjY2VzcyhpbmplY3RlZFNjcmlwdElkKTsKKyAgICBl bHNlIHsKKyAgICAgICAgY29uc29sZS5lcnJvcigiQWNjZXNzIHRvIGluamVjdGVkIHNjcmlwdCB3 aXRoIG5vIGlkIik7CisgICAgICAgIGNvbnNvbGUudHJhY2UoKTsKKyAgICB9CiB9CiAKIEluamVj dGVkU2NyaXB0QWNjZXNzLmdldERlZmF1bHQgPSBmdW5jdGlvbigpCmRpZmYgLS1naXQgYS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA5 MmRiMzFmLi4xY2I1ODZmIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisr KyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNy0y MyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaHJvbWl1bSBEZXZUb29sczogbWln cmF0ZSBmcm9tIHV0aWxpdHkgY29udGV4dC1iYXNlZCBpbmplY3RlZAorICAgICAgICBzY3JpcHQg ZGlzcGF0Y2ggdG8gdXBzdHJlYW0gc2NoZW1hLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mjg4MworCisgICAgICAgICogc3JjL1Rvb2xzQWdlbnQu aDoKKyAgICAgICAgKiBzcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwOgorICAgICAgICAqIHNy Yy9XZWJEZXZUb29sc0FnZW50SW1wbC5oOgorICAgICAgICAqIHNyYy9qcy9EZXZUb29sc0hvc3RT dHViLmpzOgorICAgICAgICAqIHNyYy9qcy9JbnNwZWN0b3JDb250cm9sbGVySW1wbC5qczoKKyAg ICAgICAgKGRldnRvb2xzLkluc3BlY3RvckJhY2tlbmRJbXBsKToKKwogMjAxMC0wNy0yMyAgS2Vu dCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2hp bmljaGlybyBIYW1hamkuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1Rvb2xzQWdl bnQuaCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvVG9vbHNBZ2VudC5oCmluZGV4IGQ4NzhhZWEuLmM5 YTE1ZDUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvVG9vbHNBZ2VudC5oCisrKyBi L1dlYktpdC9jaHJvbWl1bS9zcmMvVG9vbHNBZ2VudC5oCkBAIC00MSwxMSArNDEsNiBAQCBuYW1l c3BhY2UgV2ViS2l0IHsKICAgICAvKiBEaXNwYXRjaGVzIGdpdmVuIGZ1bmN0aW9uIG9uIHRoZSBJ bnNwZWN0b3JDb250cm9sbGVyIG9iamVjdCAqLyBcCiAgICAgTUVUSE9EMihkaXNwYXRjaE9uSW5z cGVjdG9yQ29udHJvbGxlciwgaW50IC8qIGNhbGxfaWQgKi8sIFwKICAgICAgICAgU3RyaW5nIC8q IG1lc3NhZ2UgKi8pIFwKLSAgICBcCi0gICAgLyogRGlzcGF0Y2hlcyBnaXZlbiBmdW5jdGlvbiBv biB0aGUgSW5qZWN0ZWRTY3JpcHQgb2JqZWN0ICovIFwKLSAgICBNRVRIT0Q1KGRpc3BhdGNoT25J bmplY3RlZFNjcmlwdCwgaW50IC8qIGNhbGxfaWQgKi8sIFwKLSAgICAgICAgaW50IC8qIGluamVj dGVkX3NjcmlwdF9pZCAqLywgU3RyaW5nIC8qIGZ1bmN0aW9uX25hbWUgKi8sIFwKLSAgICAgICAg U3RyaW5nIC8qIGpzb25fYXJncyAqLywgYm9vbCAvKiBhc3luYyAqLykKIAogREVGSU5FX1JQQ19D TEFTUyhUb29sc0FnZW50LCBUT09MU19BR0VOVF9TVFJVQ1QpCiAKZGlmZiAtLWdpdCBhL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwIGIvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKaW5kZXggNjIzOGRkMi4uM2Q3OWUwYyAxMDA2 NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKKysr IGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKQEAgLTMxNiwx NiArMzE2LDYgQEAgdm9pZCBXZWJEZXZUb29sc0FnZW50SW1wbDo6ZGlzcGF0Y2hPbkluc3BlY3Rv ckNvbnRyb2xsZXIoaW50IGNhbGxJZCwgY29uc3QgU3RyaW4KICAgICBtX3Rvb2xzQWdlbnREZWxl Z2F0ZVN0dWItPmRpZERpc3BhdGNoT24oY2FsbElkLCAiIiwgZXhjZXB0aW9uKTsKIH0KIAotdm9p ZCBXZWJEZXZUb29sc0FnZW50SW1wbDo6ZGlzcGF0Y2hPbkluamVjdGVkU2NyaXB0KGludCBjYWxs SWQsIGludCBpbmplY3RlZFNjcmlwdElkLCBjb25zdCBTdHJpbmcmIGZ1bmN0aW9uTmFtZSwgY29u c3QgU3RyaW5nJiBqc29uQXJncywgYm9vbCBhc3luYykKLXsKLSAgICBpbnNwZWN0b3JDb250cm9s bGVyKCktPmluc3BlY3RvckJhY2tlbmQoKS0+ZGlzcGF0Y2hPbkluamVjdGVkU2NyaXB0KAotICAg ICAgICBjYWxsSWQsCi0gICAgICAgIGluamVjdGVkU2NyaXB0SWQsCi0gICAgICAgIGZ1bmN0aW9u TmFtZSwKLSAgICAgICAganNvbkFyZ3MsCi0gICAgICAgIGFzeW5jKTsKLX0KLQogdm9pZCBXZWJE ZXZUb29sc0FnZW50SW1wbDo6ZGlzcGF0Y2hNZXNzYWdlRnJvbUZyb250ZW5kKGNvbnN0IFdlYkRl dlRvb2xzTWVzc2FnZURhdGEmIGRhdGEpCiB7CiAgICAgaWYgKFRvb2xzQWdlbnREaXNwYXRjaDo6 ZGlzcGF0Y2godGhpcywgZGF0YSkpCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkRldlRvb2xzQWdlbnRJbXBsLmggYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdl bnRJbXBsLmgKaW5kZXggYmViNWNmYS4uMWJiNzFhMyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViRGV2VG9vbHNBZ2VudEltcGwuaApAQCAtNzMsNyArNzMsNiBAQCBwdWJsaWM6CiAKICAgICAv LyBUb29sc0FnZW50IGltcGxlbWVudGF0aW9uLgogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaE9u SW5zcGVjdG9yQ29udHJvbGxlcihpbnQgY2FsbElkLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIG1l c3NhZ2UpOwotICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaE9uSW5qZWN0ZWRTY3JpcHQoaW50IGNh bGxJZCwgaW50IGluamVjdGVkU2NyaXB0SWQsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgZnVuY3Rp b25OYW1lLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIGpzb25BcmdzLCBib29sIGFzeW5jKTsKIAog ICAgIC8vIFdlYkRldlRvb2xzQWdlbnRQcml2YXRlIGltcGxlbWVudGF0aW9uLgogICAgIHZpcnR1 YWwgdm9pZCBkaWRDbGVhcldpbmRvd09iamVjdChXZWJGcmFtZUltcGwqIGZyYW1lKTsKZGlmZiAt LWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvanMvRGV2VG9vbHNIb3N0U3R1Yi5qcyBiL1dlYktp dC9jaHJvbWl1bS9zcmMvanMvRGV2VG9vbHNIb3N0U3R1Yi5qcwppbmRleCBhMmYzNTZmLi41MmIy OGJiIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL0RldlRvb2xzSG9zdFN0dWIu anMKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9EZXZUb29sc0hvc3RTdHViLmpzCkBAIC0z Nyw3ICszNyw2IEBAIGlmICghd2luZG93WyJSZW1vdGVEZWJ1Z2dlckNvbW1hbmRFeGVjdXRvciJd KSB7CiAgICAgd2luZG93WyJSZW1vdGVEZWJ1Z2dlckNvbW1hbmRFeGVjdXRvciJdID0ge307CiAg ICAgd2luZG93WyJSZW1vdGVQcm9maWxlckFnZW50Il0gPSB7fTsKICAgICB3aW5kb3dbIlJlbW90 ZVRvb2xzQWdlbnQiXSA9IHsKLSAgICAgICAgZGlzcGF0Y2hPbkluamVjdGVkU2NyaXB0OiBmdW5j dGlvbigpIHt9LAogICAgICAgICBkaXNwYXRjaE9uSW5zcGVjdG9yQ29udHJvbGxlcjogZnVuY3Rp b24oKSB7fQogICAgIH07CiB9CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL0lu c3BlY3RvckNvbnRyb2xsZXJJbXBsLmpzIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9JbnNwZWN0 b3JDb250cm9sbGVySW1wbC5qcwppbmRleCAzMGVkZDllLi5iZWQwMDllIDEwMDY0NAotLS0gYS9X ZWJLaXQvY2hyb21pdW0vc3JjL2pzL0luc3BlY3RvckNvbnRyb2xsZXJJbXBsLmpzCisrKyBiL1dl YktpdC9jaHJvbWl1bS9zcmMvanMvSW5zcGVjdG9yQ29udHJvbGxlckltcGwuanMKQEAgLTQ5LDYg KzQ5LDcgQEAgZGV2dG9vbHMuSW5zcGVjdG9yQmFja2VuZEltcGwgPSBmdW5jdGlvbigpCiAgICAg dGhpcy5pbnN0YWxsSW5zcGVjdG9yQ29udHJvbGxlckRlbGVnYXRlXygiZGlzYWJsZVJlc291cmNl VHJhY2tpbmciKTsKICAgICB0aGlzLmluc3RhbGxJbnNwZWN0b3JDb250cm9sbGVyRGVsZWdhdGVf KCJkaXNhYmxlU2VhcmNoaW5nRm9yTm9kZSIpOwogICAgIHRoaXMuaW5zdGFsbEluc3BlY3RvckNv bnRyb2xsZXJEZWxlZ2F0ZV8oImRpc2FibGVUaW1lbGluZSIpOworICAgIHRoaXMuaW5zdGFsbElu c3BlY3RvckNvbnRyb2xsZXJEZWxlZ2F0ZV8oImRpc3BhdGNoT25JbmplY3RlZFNjcmlwdCIpOwog ICAgIHRoaXMuaW5zdGFsbEluc3BlY3RvckNvbnRyb2xsZXJEZWxlZ2F0ZV8oImVuYWJsZU1vbml0 b3JpbmdYSFIiKTsKICAgICB0aGlzLmluc3RhbGxJbnNwZWN0b3JDb250cm9sbGVyRGVsZWdhdGVf KCJlbmFibGVSZXNvdXJjZVRyYWNraW5nIik7CiAgICAgdGhpcy5pbnN0YWxsSW5zcGVjdG9yQ29u dHJvbGxlckRlbGVnYXRlXygiZW5hYmxlU2VhcmNoaW5nRm9yTm9kZSIpOwpAQCAtMTI2LDE4ICsx MjcsNiBAQCBkZXZ0b29scy5JbnNwZWN0b3JCYWNrZW5kSW1wbC5wcm90b3R5cGUucGF1c2UgPSBm dW5jdGlvbigpCiAKIAogLyoqCi0gKiBAb3ZlcnJpZGUKLSAqLwotZGV2dG9vbHMuSW5zcGVjdG9y QmFja2VuZEltcGwucHJvdG90eXBlLmRpc3BhdGNoT25JbmplY3RlZFNjcmlwdCA9IGZ1bmN0aW9u KGNhbGxJZCwgaW5qZWN0ZWRTY3JpcHRJZCwgbWV0aG9kTmFtZSwgYXJnc1N0cmluZywgYXN5bmMp Ci17Ci0gICAgLy8gRW5jb2RlIGluamVjdGVkU2NyaXB0SWQgaW50byBjYWxsSWQKLSAgICBpZiAo dHlwZW9mIGluamVjdGVkU2NyaXB0SWQgIT09ICJudW1iZXIiKQotICAgICAgICBpbmplY3RlZFNj cmlwdElkID0gMDsKLSAgICBSZW1vdGVUb29sc0FnZW50LmRpc3BhdGNoT25JbmplY3RlZFNjcmlw dChjYWxsSWQsIGluamVjdGVkU2NyaXB0SWQsIG1ldGhvZE5hbWUsIGFyZ3NTdHJpbmcsIGFzeW5j KTsKLX07Ci0KLQotLyoqCiAgKiBJbnN0YWxscyBkZWxlZ2F0aW5nIGhhbmRsZXIgaW50byB0aGUg aW5zcGVjdG9yIGNvbnRyb2xsZXIuCiAgKiBAcGFyYW0ge3N0cmluZ30gbWV0aG9kTmFtZSBNZXRo b2QgdG8gaW5zdGFsbCBkZWxlZ2F0aW5nIGhhbmRsZXIgZm9yLgogICovCg==