87144 2012-05-22 10:14:54 -0700 Web Inspector: provide content-related actions on the sources panel. 2012-05-22 10:41:02 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 630496 0 pfeldman 2012-05-22 10:14:54 -0700 Now that the authoring focus moved to the Source panel, context menu actions should follow: - refactored context menu actions to be provider-based - edited call sites to add applicable actions. 630510 1 143325 pfeldman 2012-05-22 10:22:53 -0700 Created attachment 143325 Patch 630526 2 pfeldman 2012-05-22 10:41:02 -0700 Committed r117999: <http://trac.webkit.org/changeset/117999> 143325 2012-05-22 10:22:53 -0700 2012-05-22 10:36:15 -0700 Patch bug-87144-20120522212251.patch text/plain 21898 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3OTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjY1MDJjMjYzZmVkMjJh M2FjNTgwNzQ0MWViZDI0YWI0NjhkNzMzZC4uNTM2NDQ4YTJkYjMwY2VmNTZiZGQ1MmM0ZTA3YjQ4 Mzc4OTgxOTMwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUwIEBACiAyMDEyLTA1LTIyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHByb3ZpZGUgY29udGVudC1yZWxhdGVkIGFjdGlvbnMgb24gdGhlIHNvdXJjZXMgcGFuZWwu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzE0NAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vdyB0aGF0 IHRoZSBhdXRob3JpbmcgZm9jdXMgbW92ZWQgdG8gdGhlIFNvdXJjZSBwYW5lbCwgY29udGV4dCBt ZW51IGFjdGlvbnMgc2hvdWxkIGZvbGxvdzoKKyAgICAgICAgLSByZWZhY3RvcmVkIGNvbnRleHQg bWVudSBhY3Rpb25zIHRvIGJlIHByb3ZpZGVyLWJhc2VkCisgICAgICAgIC0gZWRpdGVkIGNhbGwg c2l0ZXMgdG8gYWRkIGFwcGxpY2FibGUgYWN0aW9ucy4KKworICAgICAgICAqIEVuZ2xpc2gubHBy b2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Nv bnRleHRNZW51LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51LnByb3RvdHlw ZS5hcHBlbmRBcHBsaWNhYmxlSXRlbXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv SGFuZGxlclJlZ2lzdHJ5LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhhbmRsZXJSZWdpc3Ry eS5wcm90b3R5cGUudW5yZWdpc3RlckhhbmRsZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhh bmRsZXJSZWdpc3RyeS5wcm90b3R5cGUuYXBwZW5kQXBwbGljYWJsZUl0ZW1zLmRvU2F2ZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuSGFuZGxlclJlZ2lzdHJ5LnByb3RvdHlwZS5hcHBlbmRBcHBs aWNhYmxlSXRlbXMuc2F2ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGFuZGxlclJlZ2lzdHJ5 LnByb3RvdHlwZS5hcHBlbmRBcHBsaWNhYmxlSXRlbXMpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUucG9wdWxhdGVUZXh0QXJlYUNvbnRleHRN ZW51KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUuaGFuZGxlQ29udGV4 dE1lbnUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJhc2VOYXZpZ2F0b3JUcmVlRWxlbWVudC5w cm90b3R5cGUub25hdHRhY2gpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29y a1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5zZWFyY2hDYW5jZWxlZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5hcHBlbmRBcHBsaWNh YmxlSXRlbXMucmV2ZWFsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJv dG90eXBlLmFwcGVuZEFwcGxpY2FibGVJdGVtcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3Vy Y2VGcmFtZS5wcm90b3R5cGUuX2NvbnRlbnRDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZVNvdXJjZUZyYW1lLnByb3RvdHlwZS5wb3B1bGF0ZVRleHRBcmVhQ29udGV4dE1l bnUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZS5f aGFuZGxlQ29udGV4dE1lbnVFdmVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3Rv dHlwZS5hcHBlbmRBcHBsaWNhYmxlSXRlbXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJv dG90eXBlLnBvcHVsYXRlVGV4dEFyZWFDb250ZXh0TWVudSk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRWaWV3 ZXIucHJvdG90eXBlLl9jb250ZXh0TWVudSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9VSVV0aWxzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qczoK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5fZG9Mb2FkZWREb25lV2l0aENhcGFiaWxpdGllcy5nZXQgaWYpOgorCisyMDEy LTA1LTIyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IG1ha2UgIkdvIHRvIHNvdXJjZSIgc2hvcnRjdXQgYWNjZXNzaWJsZSBm cm9tIGFsbCBwYW5lbHMuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04NzEzMgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanMKaW5kZXggNzM1NzJmMzIzNGEzZmYwMzZkZjNjNjlhYzYwNzQ3YmJmNmI4 ZDI3Yi4uNDFjZDhkY2QxZmUyZDhjMjdmMWI1MjFmYmUzZjczN2ZiYjRiNTE2ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtMjc3 LDggKzI3Nyw4IEBAIGxvY2FsaXplZFN0cmluZ3NbIk9iamVjdHMiXSA9ICJPYmplY3RzIjsKIGxv Y2FsaXplZFN0cmluZ3NbIk9mZmxpbmUiXSA9ICJPZmZsaW5lIjsKIGxvY2FsaXplZFN0cmluZ3Nb Ik9ubGluZSJdID0gIk9ubGluZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJPbmx5IGVuYWJsZSBmb3Ig dGhpcyBzZXNzaW9uIl0gPSAiT25seSBlbmFibGUgZm9yIHRoaXMgc2Vzc2lvbiI7Ci1sb2NhbGl6 ZWRTdHJpbmdzWyJPcGVuIGluIE5ldHdvcmsgUGFuZWwiXSA9ICJPcGVuIGluIE5ldHdvcmsgUGFu ZWwiOwotbG9jYWxpemVkU3RyaW5nc1siT3BlbiBpbiBuZXR3b3JrIHBhbmVsIl0gPSAiT3BlbiBp biBuZXR3b3JrIHBhbmVsIjsKK2xvY2FsaXplZFN0cmluZ3NbIlJldmVhbCBpbiBOZXR3b3JrIFBh bmVsIl0gPSAiUmV2ZWFsIGluIE5ldHdvcmsgUGFuZWwiOworbG9jYWxpemVkU3RyaW5nc1siUmV2 ZWFsIGluIG5ldHdvcmsgcGFuZWwiXSA9ICJSZXZlYWwgaW4gbmV0d29yayBwYW5lbCI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJPcGVuIExpbmsgaW4gTmV3IFRhYiJdID0gIk9wZW4gTGluayBpbiBOZXcg VGFiIjsKIGxvY2FsaXplZFN0cmluZ3NbIk9wZW4gbGluayBpbiBuZXcgdGFiIl0gPSAiT3BlbiBs aW5rIGluIG5ldyB0YWIiOwogbG9jYWxpemVkU3RyaW5nc1siT3BlbiBMaW5rIGluIFJlc291cmNl cyBQYW5lbCJdID0gIk9wZW4gTGluayBpbiBSZXNvdXJjZXMgUGFuZWwiOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoCmluZGV4IDMzZDQ5YTQyZTVjYzA1 OTNlYjA5NWExOWZlZDJhOTQ1ZTllMDY5NzMuLmU3NTYwYmZhZTU3YzQyYTQzYzk2YTE4ZDViY2I2 MGQzODJlMDU1YjYgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxl LWZyb250LWVuZC5zaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9u dC1lbmQuc2gKQEAgLTM5LDUgKzM5LDYgQEAgamF2YSAtamFyIH4vY2xvc3VyZS9jb21waWxlci5q YXJcCiAgICAgLS13YXJuaW5nX2xldmVsIFZFUkJPU0VcCiAgICAgLS1sYW5ndWFnZV9pbiBFQ01B U0NSSVBUNVwKICAgICAtLWFjY2VwdF9jb25zdF9rZXl3b3JkXAorICAgIC0tbW9kdWxlIGluamVj dGVkX3NjcmlwdDoxXAogICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVk U2NyaXB0U291cmNlLmpzXAogICAgIC0tZXh0ZXJucyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5qZWN0ZWRTY3JpcHRFeHRlcm5zLmpzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnRleHRNZW51LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db250ZXh0TWVudS5qcwppbmRleCAxNWFjMGJiNzExNTAzY2NiZjI1MDkzNzM5 MjExMzg3YmNhMjZhNTI5Li5hZmJkNDNmZDczZjdjYjBiYTFhNzE3OTNkMjVkNjQ3NTYyMjVmZGQ4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRleHRN ZW51LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29udGV4dE1l bnUuanMKQEAgLTEwMSw3ICsxMDEsOSBAQCBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUucHJvdG90 eXBlID0gewogICAgIHsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBXZWJJbnNwZWN0b3Iu Q29udGV4dE1lbnUuX3Byb3ZpZGVycy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgdmFyIHBy b3ZpZGVyID0gV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51Ll9wcm92aWRlcnNbaV07CisgICAgICAg ICAgICB0aGlzLmFwcGVuZFNlcGFyYXRvcigpOwogICAgICAgICAgICAgcHJvdmlkZXIuYXBwZW5k QXBwbGljYWJsZUl0ZW1zKHRoaXMsIHRhcmdldCk7CisgICAgICAgICAgICB0aGlzLmFwcGVuZFNl cGFyYXRvcigpOwogICAgICAgICB9CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IYW5kbGVyUmVnaXN0cnkuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hhbmRsZXJSZWdpc3RyeS5qcwppbmRleCBkYWMzYWFiM2Rm YjJmZjEzMzc0MzJjNDU3ZTNhMDkyZTM1NDM0NDY5Li40MmQ2ZTY4MWRmN2Y5NmY2NmE3Mjg5NjRh N2UyYmRkNzRiOGM0YjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0hhbmRsZXJSZWdpc3RyeS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0hhbmRsZXJSZWdpc3RyeS5qcwpAQCAtMzEsNiArMzEsNyBAQAogLyoqCiAgKiBA Y29uc3RydWN0b3IKICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuT2JqZWN0fQorICogQGltcGxl bWVudHMge1dlYkluc3BlY3Rvci5Db250ZXh0TWVudS5Qcm92aWRlcn0KICAqLwogV2ViSW5zcGVj dG9yLkhhbmRsZXJSZWdpc3RyeSA9IGZ1bmN0aW9uKHNldHRpbmcpCiB7CkBAIC0zOCw2ICszOSw3 IEBAIFdlYkluc3BlY3Rvci5IYW5kbGVyUmVnaXN0cnkgPSBmdW5jdGlvbihzZXR0aW5nKQogICAg IHRoaXMuX2hhbmRsZXJzID0ge307CiAgICAgdGhpcy5fc2V0dGluZyA9IHNldHRpbmc7CiAgICAg dGhpcy5fYWN0aXZlSGFuZGxlciA9IHRoaXMuX3NldHRpbmcuZ2V0KCk7CisgICAgV2ViSW5zcGVj dG9yLkNvbnRleHRNZW51LnJlZ2lzdGVyUHJvdmlkZXIodGhpcyk7CiB9CiAKIFdlYkluc3BlY3Rv ci5IYW5kbGVyUmVnaXN0cnkucHJvdG90eXBlID0gewpAQCAtODYsNiArODgsNTEgQEAgV2ViSW5z cGVjdG9yLkhhbmRsZXJSZWdpc3RyeS5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBkZWxl dGUgdGhpcy5faGFuZGxlcnNbbmFtZV07CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5IYW5kbGVyUmVnaXN0cnkuRXZlbnRUeXBlcy5IYW5kbGVyc1Vw ZGF0ZWQpOworICAgIH0sCisKKyAgICAvKiogCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3Iu Q29udGV4dE1lbnV9IGNvbnRleHRNZW51CisgICAgICogQHBhcmFtIHtPYmplY3R9IHRhcmdldAor ICAgICAqLworICAgIGFwcGVuZEFwcGxpY2FibGVJdGVtczogZnVuY3Rpb24oY29udGV4dE1lbnUs IHRhcmdldCkKKyAgICB7CisgICAgICAgIGlmICghKHRhcmdldCBpbnN0YW5jZW9mIFdlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGUgfHwgdGFyZ2V0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291 cmNlKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdmFyIGNvbnRlbnRQcm92aWRlciA9 IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLkNvbnRlbnRQcm92aWRlcn0gKi8gdGFyZ2V0OworICAg ICAgICBpZiAoIWNvbnRlbnRQcm92aWRlci5jb250ZW50VVJMKCkpCisgICAgICAgICAgICByZXR1 cm47CisKKyAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3Iub3Blbkxp bmtFeHRlcm5hbGx5TGFiZWwoKSwgV2ViSW5zcGVjdG9yLm9wZW5SZXNvdXJjZS5iaW5kKFdlYklu c3BlY3RvciwgY29udGVudFByb3ZpZGVyLmNvbnRlbnRVUkwoKSwgZmFsc2UpKTsKKyAgICAgICAg Ly8gU2tpcCAwdGggaGFuZGxlciwgYXMgaXQncyAnVXNlIGRlZmF1bHQgcGFuZWwnIG9uZS4KKyAg ICAgICAgZm9yICh2YXIgaSA9IDE7IGkgPCB0aGlzLmhhbmRsZXJOYW1lcy5sZW5ndGg7ICsraSkg eworICAgICAgICAgICAgdmFyIGhhbmRsZXIgPSB0aGlzLmhhbmRsZXJOYW1lc1tpXTsKKyAgICAg ICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYklu c3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiT3BlbiB1c2luZyAlcyIgOiAiT3Bl biBVc2luZyAlcyIsIGhhbmRsZXIpLAorICAgICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hUb0hh bmRsZXIuYmluZCh0aGlzLCBoYW5kbGVyLCB7IHVybDogY29udGVudFByb3ZpZGVyLmNvbnRlbnRV UkwoKSB9KSk7CisgICAgICAgIH0KKyAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJ bnNwZWN0b3IuY29weUxpbmtBZGRyZXNzTGFiZWwoKSwgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNv cHlUZXh0LmJpbmQoSW5zcGVjdG9yRnJvbnRlbmRIb3N0LCBjb250ZW50UHJvdmlkZXIuY29udGVu dFVSTCgpKSk7CisKKyAgICAgICAgaWYgKCFJbnNwZWN0b3JGcm9udGVuZEhvc3QuY2FuU2F2ZSgp IHx8ICFjb250ZW50UHJvdmlkZXIuY29udGVudFVSTCgpKQorICAgICAgICAgICAgcmV0dXJuOwor CisgICAgICAgIHZhciBjb250ZW50VHlwZSA9IGNvbnRlbnRQcm92aWRlci5jb250ZW50VHlwZSgp OworICAgICAgICBpZiAoY29udGVudFR5cGUgIT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVz LkRvY3VtZW50ICYmCisgICAgICAgICAgICBjb250ZW50VHlwZSAhPT0gV2ViSW5zcGVjdG9yLnJl c291cmNlVHlwZXMuU3R5bGVzaGVldCAmJgorICAgICAgICAgICAgY29udGVudFR5cGUgIT09IFdl Ykluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLlNjcmlwdCkKKyAgICAgICAgICAgIHJldHVybjsKKwor ICAgICAgICBmdW5jdGlvbiBkb1NhdmUoZm9yY2VTYXZlQXMsIGNvbnRlbnQpCisgICAgICAgIHsK KyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5maWxlTWFuYWdlci5zYXZlKGNvbnRlbnRQcm92aWRl ci5jb250ZW50VVJMKCksIGNvbnRlbnQsIGZvcmNlU2F2ZUFzKTsKKyAgICAgICAgfQorCisgICAg ICAgIGZ1bmN0aW9uIHNhdmUoZm9yY2VTYXZlQXMpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNv bnRlbnRQcm92aWRlci5yZXF1ZXN0Q29udGVudChkb1NhdmUuYmluZCh0aGlzLCBmb3JjZVNhdmVB cykpOworICAgICAgICB9CisKKyAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kU2VwYXJhdG9yKCk7 CisgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJT YXZlIiksIHNhdmUuYmluZCh0aGlzLCBmYWxzZSkpOworICAgICAgICBjb250ZXh0TWVudS5hcHBl bmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVu dVRpdGxlcygpID8gIlNhdmUgYXMuLi4iIDogIlNhdmUgQXMuLi4iKSwgc2F2ZS5iaW5kKHRoaXMs IHRydWUpKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmF2aWdhdG9yVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTmF2aWdhdG9yVmlldy5qcwppbmRleCBkMzAzNzlhZGIzOWQ4NTA0MWRhYjY1NTVk OTNmNWUzNWRjNTVjNjRlLi42MjFhZTE4OGJjZWFkZDI5M2JmZTZiMDVkODdkMzdmODY3OTU1MDgx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRv clZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0 b3JWaWV3LmpzCkBAIC0zNDQsNyArMzQ0LDkgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcu cHJvdG90eXBlID0gewogCiAgICAgaGFuZGxlQ29udGV4dE1lbnU6IGZ1bmN0aW9uKGV2ZW50LCB1 aVNvdXJjZUNvZGUpCiAgICAgewotICAgICAgICAvLyBPdmVycmlkZW4uCisgICAgICAgIHZhciBj b250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgY29u dGV4dE1lbnUuYXBwZW5kQXBwbGljYWJsZUl0ZW1zKHVpU291cmNlQ29kZSk7CisgICAgICAgIGNv bnRleHRNZW51LnNob3coZXZlbnQpOwogICAgIH0KIH0KIApAQCAtNDcwLDcgKzQ3Miw2IEBAIFdl Ykluc3BlY3Rvci5CYXNlTmF2aWdhdG9yVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl90aXRsZVRleHROb2RlLnRleHRDb250ZW50ID0gdGhpcy5fdGl0bGVUZXh0OwogICAg ICAgICB0aGlzLnRpdGxlRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl90aXRsZVRleHROb2RlKTsK ICAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy50aXRsZUVsZW1l bnQpOwotICAgICAgICAKICAgICAgICAgdGhpcy5leHBhbmQoKTsKICAgICB9LAogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4 IGM0YWNkYWQ3YWUxM2U4YjMxZDFjOWVjMTU0ODQwYTI1MjVlNDk0MDQuLmVlYmVjMGI5NTllZjJl Y2Q4N2E5ZmIyMjgwOTkwMjhkOGYyMjE5YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBAIC0xMjI4LDYgKzEyMjgsNyBAQCBX ZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcuRXZlbnRUeXBlcyA9IHsKIC8qKgogICogQGNvbnN0 cnVjdG9yCiAgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlBhbmVsfQorICogQGltcGxlbWVudHMg e1dlYkluc3BlY3Rvci5Db250ZXh0TWVudS5Qcm92aWRlcn0KICAqLwogV2ViSW5zcGVjdG9yLk5l dHdvcmtQYW5lbCA9IGZ1bmN0aW9uKCkKIHsKQEAgLTEyNjIsNiArMTI2Myw3IEBAIFdlYkluc3Bl Y3Rvci5OZXR3b3JrUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgICAgIHJldHVybiB0aGlzLnZpc2li bGVWaWV3OwogICAgIH0KICAgICBXZWJJbnNwZWN0b3IuR29Ub0xpbmVEaWFsb2cuaW5zdGFsbCh0 aGlzLCB2aWV3R2V0dGVyLmJpbmQodGhpcykpOworICAgIFdlYkluc3BlY3Rvci5Db250ZXh0TWVu dS5yZWdpc3RlclByb3ZpZGVyKHRoaXMpOwogfQogCiBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVs LnByb3RvdHlwZSA9IHsKQEAgLTE0MzcsNiArMTQzOSwyMyBAQCBXZWJJbnNwZWN0b3IuTmV0d29y a1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICBzZWFyY2hDYW5jZWxlZDogZnVuY3Rpb24oKQogICAg IHsKICAgICAgICAgdGhpcy5fbmV0d29ya0xvZ1ZpZXcuc2VhcmNoQ2FuY2VsZWQoKTsKKyAgICB9 LAorCisgICAgLyoqIAorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkNvbnRleHRNZW51fSBj b250ZXh0TWVudQorICAgICAqIEBwYXJhbSB7T2JqZWN0fSB0YXJnZXQKKyAgICAgKi8KKyAgICBh cHBlbmRBcHBsaWNhYmxlSXRlbXM6IGZ1bmN0aW9uKGNvbnRleHRNZW51LCB0YXJnZXQpCisgICAg eworICAgICAgICBpZiAoISh0YXJnZXQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuTmV0d29ya1Jl cXVlc3QpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGZ1bmN0aW9uIHJldmVhbCgp CisgICAgICAgIHsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5pbnNwZWN0b3JWaWV3LnNldEN1 cnJlbnRQYW5lbCh0aGlzKTsKKyAgICAgICAgICAgIHRoaXMucmV2ZWFsQW5kSGlnaGxpZ2h0UmVx dWVzdCgvKiogQHR5cGUge1dlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdH0gKi8gdGFyZ2V0KTsK KyAgICAgICAgfQorICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5V SVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygpID8gIlJldmVhbCBp biBuZXR3b3JrIHBhbmVsIiA6ICJSZXZlYWwgaW4gTmV0d29yayBQYW5lbCIpLCByZXZlYWwuYmlu ZCh0aGlzKSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzCmluZGV4IDczZGNlOGY3NWMxOWQ2NzJkYmI5YzZlYmNl ZWYzNWVlZWRiYWRjYjEuLjFhY2VmN2YyZTY4ZDBkYmIyNjZjM2YyMjAwMzZmOTE4ZmJmMTliY2Eg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VW aWV3LmpzCkBAIC05Niw2ICs5NiwxMyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VGcmFt ZS5wcm90b3R5cGUgPSB7CiAgICAgX2NvbnRlbnRDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKICAg ICB7CiAgICAgICAgIHRoaXMuc2V0Q29udGVudCh0aGlzLl9yZXNvdXJjZS5jb250ZW50LCBmYWxz ZSwgdGhpcy5fcmVzb3VyY2UuY2Fub25pY2FsTWltZVR5cGUoKSk7CisgICAgfSwKKworICAgIHBv cHVsYXRlVGV4dEFyZWFDb250ZXh0TWVudTogZnVuY3Rpb24oY29udGV4dE1lbnUsIGxpbmVOdW1i ZXIpCisgICAgeworICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRBcHBsaWNhYmxlSXRlbXModGhp cy5fcmVzb3VyY2UpOworICAgICAgICBpZiAodGhpcy5fcmVzb3VyY2UucmVxdWVzdCkKKyAgICAg ICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEFwcGxpY2FibGVJdGVtcyh0aGlzLl9yZXNvdXJjZS5y ZXF1ZXN0KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IGM3MTE5MDMzMDEwMmU1MjQ0MDVjM2Q0 MWY2M2M0YmM0NWNjOTQ5MGQuLjhhNGM3NzEzZGZlMGQyYzI5NGIxNzRjNTU0OWUwYzc1NTMxZTRh MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZXNQYW5lbC5qcwpAQCAtMTE4OCw0NyArMTE4OCwxMiBAQCBXZWJJbnNwZWN0b3IuRnJhbWVS ZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICBfaGFuZGxlQ29udGV4dE1lbnVF dmVudDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBu ZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KCk7Ci0gICAgICAgIGNvbnRleHRNZW51LmFwcGVu ZEl0ZW0oV2ViSW5zcGVjdG9yLm9wZW5MaW5rRXh0ZXJuYWxseUxhYmVsKCksIFdlYkluc3BlY3Rv ci5vcGVuUmVzb3VyY2UuYmluZChXZWJJbnNwZWN0b3IsIHRoaXMuX3Jlc291cmNlLnVybCwgZmFs c2UpKTsKLSAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuY29weUxp bmtBZGRyZXNzTGFiZWwoKSwgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNvcHlUZXh0LmJpbmQoSW5z cGVjdG9yRnJvbnRlbmRIb3N0LCB0aGlzLl9yZXNvdXJjZS51cmwpKTsKLSAgICAgICAgdGhpcy5f YXBwZW5kT3BlbkluTmV0d29ya1BhbmVsQWN0aW9uKGNvbnRleHRNZW51LCBldmVudCk7Ci0gICAg ICAgIFdlYkluc3BlY3Rvci5wb3B1bGF0ZVJlc291cmNlQ29udGV4dE1lbnUoY29udGV4dE1lbnUs IHRoaXMuX3Jlc291cmNlLnVybCwgbnVsbCk7Ci0gICAgICAgIHRoaXMuX2FwcGVuZFNhdmVBc0Fj dGlvbihjb250ZXh0TWVudSwgZXZlbnQpOworICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRBcHBs aWNhYmxlSXRlbXModGhpcy5fcmVzb3VyY2UpOworICAgICAgICBpZiAodGhpcy5fcmVzb3VyY2Uu cmVxdWVzdCkKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEFwcGxpY2FibGVJdGVtcyh0 aGlzLl9yZXNvdXJjZS5yZXF1ZXN0KTsKICAgICAgICAgY29udGV4dE1lbnUuc2hvdyhldmVudCk7 CiAgICAgfSwKIAotICAgIF9hcHBlbmRPcGVuSW5OZXR3b3JrUGFuZWxBY3Rpb246IGZ1bmN0aW9u KGNvbnRleHRNZW51LCBldmVudCkKLSAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fcmVzb3VyY2Uu cmVxdWVzdCkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBjb250ZXh0TWVudS5hcHBl bmRJdGVtKFdlYkluc3BlY3Rvci5vcGVuSW5OZXR3b3JrUGFuZWxMYWJlbCgpLCBXZWJJbnNwZWN0 b3Iub3BlblJlcXVlc3RJbk5ldHdvcmtQYW5lbC5iaW5kKFdlYkluc3BlY3RvciwgdGhpcy5fcmVz b3VyY2UucmVxdWVzdCkpOwotICAgIH0sCi0KLSAgICBfYXBwZW5kU2F2ZUFzQWN0aW9uOiBmdW5j dGlvbihjb250ZXh0TWVudSwgZXZlbnQpCi0gICAgewotICAgICAgICBpZiAoIUluc3BlY3RvckZy b250ZW5kSG9zdC5jYW5TYXZlKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgaWYg KHRoaXMuX3Jlc291cmNlLnR5cGUgIT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLkRvY3Vt ZW50ICYmCi0gICAgICAgICAgICB0aGlzLl9yZXNvdXJjZS50eXBlICE9PSBXZWJJbnNwZWN0b3Iu cmVzb3VyY2VUeXBlcy5TdHlsZXNoZWV0ICYmCi0gICAgICAgICAgICB0aGlzLl9yZXNvdXJjZS50 eXBlICE9PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TY3JpcHQpCi0gICAgICAgICAgICBy ZXR1cm47Ci0KLSAgICAgICAgZnVuY3Rpb24gZG9TYXZlKGZvcmNlU2F2ZUFzLCBjb250ZW50KQot ICAgICAgICB7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IuZmlsZU1hbmFnZXIuc2F2ZSh0aGlz Ll9yZXNvdXJjZS51cmwsIGNvbnRlbnQsIGZvcmNlU2F2ZUFzKTsKLSAgICAgICAgfQotCi0gICAg ICAgIGZ1bmN0aW9uIHNhdmUoZm9yY2VTYXZlQXMpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHRo aXMuX3Jlc291cmNlLnJlcXVlc3RDb250ZW50KGRvU2F2ZS5iaW5kKHRoaXMsIGZvcmNlU2F2ZUFz KSk7Ci0gICAgICAgIH0KLQotICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsK LSAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNh dmUiKSwgc2F2ZS5iaW5kKHRoaXMsIGZhbHNlKSk7Ci0gICAgICAgIGNvbnRleHRNZW51LmFwcGVu ZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51 VGl0bGVzKCkgPyAiU2F2ZSBhcy4uLiIgOiAiU2F2ZSBBcy4uLiIpLCBzYXZlLmJpbmQodGhpcywg dHJ1ZSkpOwotICAgIH0sCi0KICAgICBfc2V0QnViYmxlVGV4dDogZnVuY3Rpb24oeCkKICAgICB7 CiAgICAgICAgIGlmICghdGhpcy5fYnViYmxlRWxlbWVudCkgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCBhYzlkYzllMjI2 MmU0OTc4OGVkOWY1N2YzNTJlNTU4YjcxNjUwYWMyLi5jZDg2NDNiMDAyNjllNTdiN2ZkMzNkMTE4 OWMyNDA2YWUzMjYwM2Y2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMTA2MCwxMSArMTA2MCwxMyBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBhcHBlbmRBcHBsaWNh YmxlSXRlbXM6IGZ1bmN0aW9uKGNvbnRleHRNZW51LCB0YXJnZXQpCiAgICAgewotICAgICAgICBp ZiAodGFyZ2V0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZSkgewotICAgICAg ICAgICAgY29udGV4dE1lbnUuYXBwZW5kU2VwYXJhdG9yKCk7Ci0gICAgICAgICAgICBjb250ZXh0 TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmV2aXNpb24gaGlzdG9yeS4u LiIpLCB0aGlzLl9zaG93TG9jYWxIaXN0b3J5LmJpbmQodGhpcywgLyoqIEB0eXBlIHtXZWJJbnNw ZWN0b3IuVUlTb3VyY2VDb2RlfSAqLyB0YXJnZXQpKTsKLSAgICAgICAgICAgIGNvbnRleHRNZW51 LmFwcGVuZFNlcGFyYXRvcigpOwotICAgICAgICB9CisgICAgICAgIGlmICghKHRhcmdldCBpbnN0 YW5jZW9mIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUpKQorICAgICAgICAgICAgcmV0dXJuOwor CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGV9ICovIHRhcmdldDsKKyAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlJldmlzaW9uIGhpc3RvcnkuLi4iKSwgdGhpcy5fc2hvd0xvY2Fs SGlzdG9yeS5iaW5kKHRoaXMsIHVpU291cmNlQ29kZSkpOworICAgICAgICBpZiAodWlTb3VyY2VD b2RlLnJlc291cmNlKCkgJiYgdWlTb3VyY2VDb2RlLnJlc291cmNlKCkucmVxdWVzdCkKKyAgICAg ICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEFwcGxpY2FibGVJdGVtcyh1aVNvdXJjZUNvZGUucmVz b3VyY2UoKS5yZXF1ZXN0KTsKICAgICB9LAogCiAgICAgc2hvd0dvVG9Tb3VyY2VEaWFsb2c6IGZ1 bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZUZyYW1lLmpzCmluZGV4IDhlZGMzZjRiOTJjOThkOTdlZWY5YTFkYjZmZDFkOTA5M2NiMzUxNmUu LmU0MDg5ZjlhOGJjM2QwYTZjMjgyMTQwMTZlODk1OGMzNTcxNTJlNTIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtNDYwLDkg KzQ2MCw2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBw b3B1bGF0ZVRleHRBcmVhQ29udGV4dE1lbnU6IGZ1bmN0aW9uKGNvbnRleHRNZW51LCBsaW5lTnVt YmVyKQogICAgIHsKLSAgICAgICAgaWYgKCF3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuaXNDb2xsYXBz ZWQpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIFdlYkluc3BlY3Rvci5wb3B1bGF0ZVJl c291cmNlQ29udGV4dE1lbnUoY29udGV4dE1lbnUsIHRoaXMuX3VybCwgbGluZU51bWJlcik7CiAg ICAgfSwKIAogICAgIGluaGVyaXRTY3JvbGxQb3NpdGlvbnM6IGZ1bmN0aW9uKHNvdXJjZUZyYW1l KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmll d2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpz CmluZGV4IDMyZWY3YmM1NTFiMWZhOWI4NjYyZmQ0ZmU0ZmRiMzRmMmI4NThlODguLmVmNDRjNDNj Y2QyZTBkNmZmZDM4ZTAwZGI1NWU0ZmZkMTBlZjE2ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKQEAgLTI5MCwxMSArMjkwLDYgQEAg V2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGFyZ2V0 ID0gdGhpcy5fbWFpblBhbmVsLl9lbmNsb3NpbmdMaW5lUm93T3JTZWxmKGV2ZW50LnRhcmdldCk7 CiAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5wb3B1bGF0ZVRleHRBcmVhQ29udGV4dE1lbnUo Y29udGV4dE1lbnUsIHRhcmdldCAmJiB0YXJnZXQubGluZU51bWJlcik7CiAgICAgICAgIH0KLSAg ICAgICAgaWYgKHRoaXMuX3VybCkgewotICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRl bShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNhdmUiKSwgV2ViSW5zcGVjdG9yLmZpbGVNYW5hZ2Vy LnNhdmUuYmluZChXZWJJbnNwZWN0b3IsIHRoaXMuX3VybCwgdGhpcy5fdGV4dE1vZGVsLnRleHQs IGZhbHNlKSk7Ci0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rv ci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygpID8gIlNhdmUg YXMuLi4iIDogIlNhdmUgQXMuLi4iKSwgV2ViSW5zcGVjdG9yLmZpbGVNYW5hZ2VyLnNhdmUuYmlu ZChXZWJJbnNwZWN0b3IsIHRoaXMuX3VybCwgdGhpcy5fdGV4dE1vZGVsLnRleHQsIHRydWUpKTsK LSAgICAgICAgfQotCiAgICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQpOwogICAgIH0sCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlVdGlscy5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlVdGlscy5qcwppbmRleCBl OWUwNDliZjQ4M2NlNzZjMWU5ZDY2OTQ0YWQ5NTRjOGIwNWU0NDYwLi5jOGQ0M2UyMTJlMTkzZDlm MWRiODJiYWVjYzlhMGRmY2I2ZDc5ZmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1VJVXRpbHMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9VSVV0aWxzLmpzCkBAIC00OTIsMTEgKzQ5Miw2IEBAIFdlYkluc3BlY3Rvci5v cGVuTGlua0V4dGVybmFsbHlMYWJlbCA9IGZ1bmN0aW9uKCkKICAgICByZXR1cm4gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiT3Bl biBsaW5rIGluIG5ldyB0YWIiIDogIk9wZW4gTGluayBpbiBOZXcgVGFiIik7CiB9CiAKLVdlYklu c3BlY3Rvci5vcGVuSW5OZXR3b3JrUGFuZWxMYWJlbCA9IGZ1bmN0aW9uKCkKLXsKLSAgICByZXR1 cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0 bGVzKCkgPyAiT3BlbiBpbiBuZXR3b3JrIHBhbmVsIiA6ICJPcGVuIGluIE5ldHdvcmsgUGFuZWwi KTsKLX0KLQogV2ViSW5zcGVjdG9yLmNvcHlMaW5rQWRkcmVzc0xhYmVsID0gZnVuY3Rpb24oKQog ewogICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2Vy Q2FzZU1lbnVUaXRsZXMoKSA/ICJDb3B5IGxpbmsgYWRkcmVzcyIgOiAiQ29weSBMaW5rIEFkZHJl c3MiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvZXh0 ZXJucy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qcwpp bmRleCAxZjlmODgzNGZiYTk2MjAwMWE5M2RmMmUwODIwNjgwN2ZiYmI4YTU5Li5mNzA1NWMyZmM4 OTlmZTY1NmIyYThlNTMxMWU3YmNlYzI1Y2I4OTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2V4dGVybnMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9leHRlcm5zLmpzCkBAIC0xNDcsMTEgKzE0Nyw2IEBAIFdlYkluc3Bl Y3Rvci5hZGRNYWluRXZlbnRMaXN0ZW5lcnMgPSBmdW5jdGlvbihkb2MpIHt9CiAKIFdlYkluc3Bl Y3Rvci5vcGVuUmVzb3VyY2UgPSBmdW5jdGlvbih1cmwsIGV4dGVybmFsKSB7fQogCi0vKiogQHBh cmFtIHtXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3R9IHJlcXVlc3QgKi8KLVdlYkluc3BlY3Rv ci5vcGVuUmVxdWVzdEluTmV0d29ya1BhbmVsID0gZnVuY3Rpb24ocmVxdWVzdCkge30KLQotV2Vi SW5zcGVjdG9yLnBvcHVsYXRlUmVzb3VyY2VDb250ZXh0TWVudSA9IGZ1bmN0aW9uKGNvbnRleHRN ZW51LCB1cmwsIHByZWZlcnJlZExpbmVOdW1iZXIpIHt9Ci0KIC8qKgogICogQHBhcmFtIHtzdHJp bmd9IGV4cHJlc3Npb24KICAqIEBwYXJhbSB7Ym9vbGVhbj19IHNob3dSZXN1bHRPbmx5CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IGI5 Zjk2MjJlYWEyZWNhOWFiNjg5NTU2NWI4ZmY0NDcyNDBkOGM1Y2YuLjE3ZmFiN2NkMGNiMWFlNmQw YjdlMmJlNWM5MGI4Yjk3MDI2MTQzYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC00NDYsNiArNDQ2LDExIEBAIFdlYkluc3BlY3Rv ci5fZG9Mb2FkZWREb25lV2l0aENhcGFiaWxpdGllcyA9IGZ1bmN0aW9uKCkKICAgICBpZiAodGhp cy5fem9vbUxldmVsKQogICAgICAgICB0aGlzLl9yZXF1ZXN0Wm9vbSgpOwogCisgICAgdmFyIGF1 dG9zZWxlY3RQYW5lbCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiYSBwYW5lbCBjaG9zZW4gYXV0 b21hdGljYWxseSIpOworICAgIHZhciBvcGVuQW5jaG9yTG9jYXRpb25TZXR0aW5nID0gV2ViSW5z cGVjdG9yLnNldHRpbmdzLmNyZWF0ZVNldHRpbmcoIm9wZW5MaW5rSGFuZGxlciIsIGF1dG9zZWxl Y3RQYW5lbCk7CisgICAgdGhpcy5vcGVuQW5jaG9yTG9jYXRpb25SZWdpc3RyeSA9IG5ldyBXZWJJ bnNwZWN0b3IuSGFuZGxlclJlZ2lzdHJ5KG9wZW5BbmNob3JMb2NhdGlvblNldHRpbmcpOworICAg IHRoaXMub3BlbkFuY2hvckxvY2F0aW9uUmVnaXN0cnkucmVnaXN0ZXJIYW5kbGVyKGF1dG9zZWxl Y3RQYW5lbCwgZnVuY3Rpb24oKSB7IHJldHVybiBmYWxzZTsgfSk7CisKICAgICB0aGlzLl9jcmVh dGVQYW5lbHMoKTsKICAgICB0aGlzLl9jcmVhdGVHbG9iYWxTdGF0dXNCYXJJdGVtcygpOwogCkBA IC00NjMsMTEgKzQ2OCw2IEBAIFdlYkluc3BlY3Rvci5fZG9Mb2FkZWREb25lV2l0aENhcGFiaWxp dGllcyA9IGZ1bmN0aW9uKCkKICAgICBlcnJvcldhcm5pbmdDb3VudC5hZGRFdmVudExpc3RlbmVy KCJjbGljayIsIHRoaXMuc2hvd0NvbnNvbGUuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMu X3VwZGF0ZUVycm9yQW5kV2FybmluZ0NvdW50cygpOwogCi0gICAgdmFyIGF1dG9zZWxlY3RQYW5l bCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiYSBwYW5lbCBjaG9zZW4gYXV0b21hdGljYWxseSIp OwotICAgIHZhciBvcGVuQW5jaG9yTG9jYXRpb25TZXR0aW5nID0gV2ViSW5zcGVjdG9yLnNldHRp bmdzLmNyZWF0ZVNldHRpbmcoIm9wZW5MaW5rSGFuZGxlciIsIGF1dG9zZWxlY3RQYW5lbCk7Ci0g ICAgdGhpcy5vcGVuQW5jaG9yTG9jYXRpb25SZWdpc3RyeSA9IG5ldyBXZWJJbnNwZWN0b3IuSGFu ZGxlclJlZ2lzdHJ5KG9wZW5BbmNob3JMb2NhdGlvblNldHRpbmcpOwotICAgIHRoaXMub3BlbkFu Y2hvckxvY2F0aW9uUmVnaXN0cnkucmVnaXN0ZXJIYW5kbGVyKGF1dG9zZWxlY3RQYW5lbCwgZnVu Y3Rpb24oKSB7IHJldHVybiBmYWxzZTsgfSk7Ci0KICAgICB0aGlzLmV4dGVuc2lvblNlcnZlci5p bml0RXh0ZW5zaW9ucygpOwogCiAgICAgdGhpcy5jb25zb2xlLmVuYWJsZUFnZW50KCk7CkBAIC02 NjMsMTIgKzY2Myw2IEBAIFdlYkluc3BlY3Rvci5vcGVuUmVzb3VyY2UgPSBmdW5jdGlvbihyZXNv dXJjZVVSTCwgaW5SZXNvdXJjZXNQYW5lbCkKICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0 Lm9wZW5Jbk5ld1RhYihyZXNvdXJjZVVSTCk7CiB9CiAKLVdlYkluc3BlY3Rvci5vcGVuUmVxdWVz dEluTmV0d29ya1BhbmVsID0gZnVuY3Rpb24ocmVxdWVzdCkKLXsKLSAgICBXZWJJbnNwZWN0b3Iu c2hvd1BhbmVsKCJuZXR3b3JrIik7Ci0gICAgV2ViSW5zcGVjdG9yLnBhbmVscy5uZXR3b3JrLnJl dmVhbEFuZEhpZ2hsaWdodFJlcXVlc3QocmVxdWVzdCk7Ci19Ci0KIFdlYkluc3BlY3Rvci5fcmVn aXN0ZXJTaG9ydGN1dHMgPSBmdW5jdGlvbigpCiB7CiAgICAgdmFyIHNob3J0Y3V0ID0gV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQ7CkBAIC05NjksMTcgKzk2Myw2IEBAIFdlYkluc3BlY3Rv ci51cGRhdGVGb2N1c2VkTm9kZSA9IGZ1bmN0aW9uKG5vZGVJZCkKICAgICB0aGlzLnBhbmVscy5l bGVtZW50cy5yZXZlYWxBbmRTZWxlY3ROb2RlKG5vZGVJZCk7CiB9CiAKLVdlYkluc3BlY3Rvci5w b3B1bGF0ZVJlc291cmNlQ29udGV4dE1lbnUgPSBmdW5jdGlvbihjb250ZXh0TWVudSwgdXJsLCBw cmVmZXJyZWRMaW5lTnVtYmVyKQotewotICAgIHZhciByZWdpc3RyeSA9IFdlYkluc3BlY3Rvci5v cGVuQW5jaG9yTG9jYXRpb25SZWdpc3RyeTsKLSAgICAvLyBTa2lwIDB0aCBoYW5kbGVyLCBhcyBp dCdzICdVc2UgZGVmYXVsdCBwYW5lbCcgb25lLgotICAgIGZvciAodmFyIGkgPSAxOyBpIDwgcmVn aXN0cnkuaGFuZGxlck5hbWVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgIHZhciBoYW5kbGVyID0g cmVnaXN0cnkuaGFuZGxlck5hbWVzW2ldOwotICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVt KFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxl cygpID8gIk9wZW4gdXNpbmcgJXMiIDogIk9wZW4gVXNpbmcgJXMiLCBoYW5kbGVyKSwKLSAgICAg ICAgICAgIHJlZ2lzdHJ5LmRpc3BhdGNoVG9IYW5kbGVyLmJpbmQocmVnaXN0cnksIGhhbmRsZXIs IHsgdXJsOiB1cmwsIHByZWZlcnJlZExpbmVOdW1iZXI6IHByZWZlcnJlZExpbmVOdW1iZXIgfSkp OwotICAgIH0KLX0KLQogV2ViSW5zcGVjdG9yLl9zaG93QW5jaG9yTG9jYXRpb24gPSBmdW5jdGlv bihhbmNob3IpCiB7CiAgICAgaWYgKFdlYkluc3BlY3Rvci5vcGVuQW5jaG9yTG9jYXRpb25SZWdp c3RyeS5kaXNwYXRjaCh7IHVybDogYW5jaG9yLmhyZWYsIGxpbmVOdW1iZXI6IGFuY2hvci5saW5l TnVtYmVyfSkpCg==