71850 2011-11-08 13:05:41 -0800 Web Inspector: Extract ApplicationCacheModel from ApplicationCacheItemsView. 2011-11-09 05:02:22 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 64581 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo michaeln pfeldman pmuellr rik timothy yurys oldest_to_newest 498384 0 vsevik 2011-11-08 13:05:41 -0800 Extract ApplicationCacheModel from ApplicationCacheItemsView. This is needed for https://bugs.webkit.org/show_bug.cgi?id=64581 (Web Inspector: ApplicationCache UI is confusing and incorrect.) 498394 1 114143 vsevik 2011-11-08 13:26:19 -0800 Created attachment 114143 Patch 498421 2 114143 joepeck 2011-11-08 14:03:52 -0800 Comment on attachment 114143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114143&action=review > Source/WebCore/WebCore.vcproj/WebCore.vcproj:68574 > RelativePath="..\inspector\front-end\ApplicationCacheItemsView.js" > > > </File> > + <File > + RelativePath="..\inspector\front-end\ApplicationCacheModel.js" > + > > + </File> Just an observation, this file uses tabs instead of spaces. 498625 3 114143 pfeldman 2011-11-08 20:43:23 -0800 Comment on attachment 114143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114143&action=review > Source/WebCore/inspector/front-end/inspector.js:347 > + this.applicationCacheModel = new WebInspector.ApplicationCacheModel(); We should not run appcache initialization code + request appcaches on load and should not make applicationCacheModel instance public. I'd suggest that you keep the private pointer to it in the view + create it lazily. 498822 4 114249 vsevik 2011-11-09 04:33:59 -0800 Created attachment 114249 Patch 498823 5 vsevik 2011-11-09 04:36:02 -0800 (In reply to comment #3) > (From update of attachment 114143 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=114143&action=review > > > Source/WebCore/inspector/front-end/inspector.js:347 > > + this.applicationCacheModel = new WebInspector.ApplicationCacheModel(); > > We should not run appcache initialization code + request appcaches on load and should not make applicationCacheModel instance public. I'd suggest that you keep the private pointer to it in the view + create it lazily. Done. > Just an observation, this file uses tabs instead of spaces. Fixed, thanks for spotting that! 498838 6 vsevik 2011-11-09 05:02:22 -0800 Committed r99689: <http://trac.webkit.org/changeset/99689> 114143 2011-11-08 13:26:19 -0800 2011-11-09 04:33:51 -0800 Patch bug-71850-20111109012617.patch text/plain 11142 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTk1NDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2NDBhZjFhOWE3NzQwMWRm MjRjZDI2MTk5YTY5MjY4NTk5ZDVmNTI1Li44MTQzZTkwMTcyNmViOTMzOTk0MmI2MDNhZmZmYzk2 YTY3Y2U4YTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMTEtMDggIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogRXh0cmFjdCBBcHBsaWNhdGlvbkNhY2hlTW9kZWwgZnJvbSBBcHBsaWNhdGlvbkNhY2hlSXRl bXNWaWV3LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzE4NTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFdlYkNvcmUuZ3lwaToKKyAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajoK KyAgICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2g6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcucHJvdG90eXBlLl91cGRhdGUp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZU1vZGVsLmpz OiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlTW9kZWwpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVNb2RlbC5wcm90b3R5cGUuZ2V0 QXBwbGljYXRpb25DYWNoZXNBc3luYyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRp b25DYWNoZURpc3BhdGNoZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2Fj aGVEaXNwYXRjaGVyLnByb3RvdHlwZS51cGRhdGVBcHBsaWNhdGlvbkNhY2hlU3RhdHVzKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRGlzcGF0Y2hlci5wcm90b3R5cGUu dXBkYXRlTmV0d29ya1N0YXRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktp dC5xcmM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbDoKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKwogMjAxMS0xMS0wOCAg Tmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBOb3Qg cmV2aWV3ZWQuIEZpeCBidWlsZCwgYnkgcmVtb3ZpbmcgYW4gdW51c2VkIHZhcmlhYmxlLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpIGIvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS5neXBpCmluZGV4IGQ1ODhjYzE2Y2YyYWI3YjVkOGZiZWZmNzBiMThiMDMzNjE4NmI5OTMu LmMyZDlhNDA5NTkwZWQ4MDM5MjNiNDM5ZDhlNDhkMmRjNzhlNWVlNDYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5 cGkKQEAgLTYyNzIsNiArNjI3Miw3IEBACiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuaHRtbCcsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZh bmNlZFNlYXJjaENvbnRyb2xsZXIuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1l bmQvQXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldy5qcycsCisgICAgICAgICAgICAnaW5zcGVjdG9y L2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlTW9kZWwuanMnLAogICAgICAgICAgICAgJ2luc3Bl Y3Rvci9mcm9udC1lbmQvQXVkaXRDYXRlZ29yaWVzLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0 b3IvZnJvbnQtZW5kL0F1ZGl0Rm9ybWF0dGVycy5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9y L2Zyb250LWVuZC9BdWRpdExhdW5jaGVyVmlldy5qcycsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCmluZGV4IDM1NmIwMjBkZTUwYzg0ODFkMGM0ZjFkYjE0 ODM2ZGMwNGQzNzljNTIuLmJkMjhlYjkzMzJiMzU1MDJmZmZhMjg3M2Q5NGQ4MTRiOGIxNzU5NzUg MTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9q CisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCkBAIC02 ODU2OCw2ICs2ODU2OCwxMCBAQAogCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9u dC1lbmRcQXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldy5qcyIKIAkJCQkJPgogCQkJCTwvRmlsZT4K KyAgICAgICAgICAgICAgICA8RmlsZQorICAgICAgICAgICAgICAgICAgICBSZWxhdGl2ZVBhdGg9 Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcQXBwbGljYXRpb25DYWNoZU1vZGVsLmpzIgorICAgICAg ICAgICAgICAgICAgICA+CisgICAgICAgICAgICAgICAgPC9GaWxlPgogCQkJCTxGaWxlCiAJCQkJ CVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxBdWRpdENhdGVnb3JpZXMuanMi CiAJCQkJCT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZy b250LWVuZC5zaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5z aAppbmRleCBlMTIzNmM0N2VmMzQ5NDkzMzE1ZTEwOTNjODU1OWRmZWI4ZWVjYTRlLi4xZTFkN2Uy OWE3OGU5ZjhiZGM3ZWM0NGYwOWNmMDA0ZWQ1ZDM3ZTczIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2gKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoCkBAIC00NSw3ICs0NSw4IEBAIGphdmEgLWph ciB+L2Nsb3N1cmUvY29tcGlsZXIuamFyIC0tc3VtbWFyeV9kZXRhaWxfbGV2ZWwgMyAtLWNvbXBp bGF0aW9uX2xldmVsIFNJCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Vc2VyTWV0cmljcy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9IYW5kbGVyUmVnaXN0cnkuanMgXAogICAgICAgICAtLWpzIFNvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5q cyBcCi0gICAgLS1tb2R1bGUganNtb2R1bGVfc2RrOjI1OmpzbW9kdWxlX2NvbW1vbiBcCisgICAg LS1tb2R1bGUganNtb2R1bGVfc2RrOjI2OmpzbW9kdWxlX2NvbW1vbiBcCisgICAgICAgIC0tanMg U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlTW9kZWwu anMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29t cGlsZXJTb3VyY2VNYXBwaW5nLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU291cmNlTWFwcGluZ1Byb3ZpZGVyLmpzIFwKICAgICAg ICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNb2RlbC5q cyBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxp Y2F0aW9uQ2FjaGVJdGVtc1ZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0FwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcuanMKaW5kZXggOWIzOThlNDQ0ZjI5YjEzYWEz OWRmNmFjM2Y2OTA5ZGE4ZWZmZjA2Ny4uZDk1ZTYzNjk0YmRmZWU4NGIyNDJjNTgwOThmNjAyYzRi ZjFlZTYwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9B cHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldy5qcwpAQCAtMTQ5LDcgKzE0OSw3 IEBAIFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsK IAogICAgIF91cGRhdGU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5B cHBsaWNhdGlvbkNhY2hlRGlzcGF0Y2hlci5nZXRBcHBsaWNhdGlvbkNhY2hlc0FzeW5jKHRoaXMu X3VwZGF0ZUNhbGxiYWNrLmJpbmQodGhpcykpOworICAgICAgICBXZWJJbnNwZWN0b3IuYXBwbGlj YXRpb25DYWNoZU1vZGVsLmdldEFwcGxpY2F0aW9uQ2FjaGVzQXN5bmModGhpcy5fdXBkYXRlQ2Fs bGJhY2suYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIF91cGRhdGVDYWxsYmFjazogZnVuY3Rp b24oYXBwbGljYXRpb25DYWNoZXMpCkBAIC0yNzQsMzcgKzI3NCwzIEBAIFdlYkluc3BlY3Rvci5B cHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKIH0KIAogV2ViSW5zcGVjdG9y LkFwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3Bl Y3Rvci5WaWV3LnByb3RvdHlwZTsKLQotLyoqCi0gKiBAY29uc3RydWN0b3IKLSAqIEBpbXBsZW1l bnRzIHtBcHBsaWNhdGlvbkNhY2hlQWdlbnQuRGlzcGF0Y2hlcn0KLSAqLwotV2ViSW5zcGVjdG9y LkFwcGxpY2F0aW9uQ2FjaGVEaXNwYXRjaGVyID0gZnVuY3Rpb24oKQotewotfQotCi1XZWJJbnNw ZWN0b3IuQXBwbGljYXRpb25DYWNoZURpc3BhdGNoZXIuZ2V0QXBwbGljYXRpb25DYWNoZXNBc3lu YyA9IGZ1bmN0aW9uKGNhbGxiYWNrKQotewotICAgIGZ1bmN0aW9uIG15Y2FsbGJhY2soZXJyb3Is IGFwcGxpY2F0aW9uQ2FjaGVzKQotICAgIHsKLSAgICAgICAgLy8gRklYTUU6IEN1cnJlbnRseSwg dGhpcyBsaXN0IG9ubHkgcmV0dXJucyBhIHNpbmdsZSBhcHBsaWNhdGlvbiBjYWNoZS4KLSAgICAg ICAgaWYgKCFlcnJvciAmJiBhcHBsaWNhdGlvbkNhY2hlcykKLSAgICAgICAgICAgIGNhbGxiYWNr KGFwcGxpY2F0aW9uQ2FjaGVzKTsKLSAgICB9Ci0KLSAgICBBcHBsaWNhdGlvbkNhY2hlQWdlbnQu Z2V0QXBwbGljYXRpb25DYWNoZXMobXljYWxsYmFjayk7Ci19Ci0KLVdlYkluc3BlY3Rvci5BcHBs aWNhdGlvbkNhY2hlRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7Ci0gICAgdXBkYXRlQXBwbGljYXRp b25DYWNoZVN0YXR1czogZnVuY3Rpb24oc3RhdHVzKQotICAgIHsKLSAgICAgICAgV2ViSW5zcGVj dG9yLnBhbmVscy5yZXNvdXJjZXMudXBkYXRlQXBwbGljYXRpb25DYWNoZVN0YXR1cyhzdGF0dXMp OwotICAgIH0sCi0KLSAgICB1cGRhdGVOZXR3b3JrU3RhdGU6IGZ1bmN0aW9uKGlzTm93T25saW5l KQotICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMudXBkYXRlTmV0 d29ya1N0YXRlKGlzTm93T25saW5lKTsKLSAgICB9Ci19Ci0KLUluc3BlY3RvckJhY2tlbmQucmVn aXN0ZXJBcHBsaWNhdGlvbkNhY2hlRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkFwcGxpY2F0 aW9uQ2FjaGVEaXNwYXRjaGVyKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVNb2RlbC5qcwpuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5m YTA3YjAxNzA0ZTM1YzBkNmFiOGQ2ZTYwODE5ZjdhM2U1N2FiZmZlCi0tLSAvZGV2L251bGwKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlTW9k ZWwuanMKQEAgLTAsMCArMSw4NCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMSBHb29nbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z IGFyZQorICogbWV0OgorICoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBt dXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKgorICogMi4gUmVkaXN0 cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29w eXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFs cyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdB UkUgSVMgUFJPVklERUQgQlkgR09PR0xFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMKKyAqICJB UyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBC VVQgTk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVND TEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBHT09HTEUgSU5DLgorICogT1IgSVRTIENPTlRSSUJV VE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorICog U1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywg QlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBP UiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVT UyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBM SUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQK KyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdB WSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisvKioKKyAqIEBjb25zdHJ1 Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5PYmplY3R9CisgKi8KK1dlYkluc3BlY3Rv ci5BcHBsaWNhdGlvbkNhY2hlTW9kZWwgPSBmdW5jdGlvbigpCit7CisgICAgSW5zcGVjdG9yQmFj a2VuZC5yZWdpc3RlckFwcGxpY2F0aW9uQ2FjaGVEaXNwYXRjaGVyKG5ldyBXZWJJbnNwZWN0b3Iu QXBwbGljYXRpb25DYWNoZURpc3BhdGNoZXIodGhpcykpOworfQorCitXZWJJbnNwZWN0b3IuQXBw bGljYXRpb25DYWNoZU1vZGVsLnByb3RvdHlwZSA9IHsKKyAgICBnZXRBcHBsaWNhdGlvbkNhY2hl c0FzeW5jOiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAgIGZ1bmN0aW9uIG15Y2Fs bGJhY2soZXJyb3IsIGFwcGxpY2F0aW9uQ2FjaGVzKQorICAgICAgICB7CisgICAgICAgICAgICAv LyBGSVhNRTogQ3VycmVudGx5LCB0aGlzIGxpc3Qgb25seSByZXR1cm5zIGEgc2luZ2xlIGFwcGxp Y2F0aW9uIGNhY2hlLgorICAgICAgICAgICAgaWYgKCFlcnJvciAmJiBhcHBsaWNhdGlvbkNhY2hl cykKKyAgICAgICAgICAgICAgICBjYWxsYmFjayhhcHBsaWNhdGlvbkNhY2hlcyk7CisgICAgICAg IH0KKworICAgICAgICBBcHBsaWNhdGlvbkNhY2hlQWdlbnQuZ2V0QXBwbGljYXRpb25DYWNoZXMo bXljYWxsYmFjayk7CisgICAgfQorfQorCitXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZU1v ZGVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsK KworLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBpbXBsZW1lbnRzIHtBcHBsaWNhdGlvbkNhY2hl QWdlbnQuRGlzcGF0Y2hlcn0KKyAqLworV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVEaXNw YXRjaGVyID0gZnVuY3Rpb24oYXBwbGljYXRpb25DYWNoZU1vZGVsKQoreworICAgIHRoaXMuX2Fw cGxpY2F0aW9uQ2FjaGVNb2RlbCA9IGFwcGxpY2F0aW9uQ2FjaGVNb2RlbDsKK30KKworV2ViSW5z cGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVEaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKKyAgICAvKioK KyAgICAgKiBAcGFyYW0ge251bWJlcn0gc3RhdHVzCisgICAgICovCisgICAgdXBkYXRlQXBwbGlj YXRpb25DYWNoZVN0YXR1czogZnVuY3Rpb24oc3RhdHVzKQorICAgIHsKKyAgICAgICAgV2ViSW5z cGVjdG9yLnBhbmVscy5yZXNvdXJjZXMudXBkYXRlQXBwbGljYXRpb25DYWNoZVN0YXR1cyhzdGF0 dXMpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGlzTm93T25s aW5lCisgICAgICovCisgICAgdXBkYXRlTmV0d29ya1N0YXRlOiBmdW5jdGlvbihpc05vd09ubGlu ZSkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLnVwZGF0ZU5l dHdvcmtTdGF0ZShpc05vd09ubGluZSk7CisgICAgfQorfQorCisvKioKKyAqIEB0eXBlIHtXZWJJ bnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZU1vZGVsfQorICovCitXZWJJbnNwZWN0b3IuYXBwbGlj YXRpb25DYWNoZU1vZGVsID0gbnVsbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvV2ViS2l0LnFyYwppbmRleCA2MmZmYTEyZjcxZGI3MDA5NmJjZDBjN2Q2NDEwMDZiZmEy ZTkyOWI5Li4wNWI4YmIxM2QzMTM5MDAzNjEyZGE4MTJjN2E4MzNlMjU1ZGYyZTA0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCkBAIC0zLDYgKzMs NyBAQAogICAgIDxmaWxlPmluc3BlY3Rvci5odG1sPC9maWxlPgogICAgIDxmaWxlPkFkdmFuY2Vk U2VhcmNoQ29udHJvbGxlci5qczwvZmlsZT4KICAgICA8ZmlsZT5BcHBsaWNhdGlvbkNhY2hlSXRl bXNWaWV3LmpzPC9maWxlPgorICAgIDxmaWxlPkFwcGxpY2F0aW9uQ2FjaGVNb2RlbC5qczwvZmls ZT4KICAgICA8ZmlsZT5BdWRpdENhdGVnb3JpZXMuanM8L2ZpbGU+CiAgICAgPGZpbGU+QXVkaXRG b3JtYXR0ZXJzLmpzPC9maWxlPgogICAgIDxmaWxlPkF1ZGl0TGF1bmNoZXJWaWV3LmpzPC9maWxl PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuaHRtbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0 bWwKaW5kZXggOWRmOWQ4NDRmYzgxN2JkZGZkNjc0ODUwMjI0MjhjMmY0NGFhZWZiZC4uNzEyZWFl YzQ3ZGQ4YzY1YWRiOWI2NzBjNmM4NTg3NjY0ZDVlNmE4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCkBAIC03OCw2ICs3OCw3IEBA IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU2hvd01v cmVEYXRhR3JpZE5vZGUuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZh c2NyaXB0IiBzcmM9IkNvb2tpZXNUYWJsZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBl PSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iQ29va2llSXRlbXNWaWV3LmpzIj48L3NjcmlwdD4KKyAg ICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJBcHBsaWNhdGlvbkNhY2hlTW9k ZWwuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9 IkFwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlw ZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNjcmlwdC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlw dCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU2lkZWJhclBhbmUuanMiPjwvc2NyaXB0Pgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRl eCBiZmZkZjcwYTVjN2YzYWRkMzA4ODc1NWU1MjFjOTI1YThjMmU2NWZiLi4xZTkxNWVhYzE1NWY3 Yzc5Y2Y1OTU0ZTIyZmFiMWM2NzkzODRkOWE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtMzQ0LDYgKzM0NCw4IEBAIFdlYkluc3Bl Y3Rvci5kb0xvYWRlZERvbmUgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5kb21BZ2VudCA9IG5ldyBX ZWJJbnNwZWN0b3IuRE9NQWdlbnQoKTsKICAgICBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRD b250ZXh0TWFuYWdlcih0aGlzLnJlc291cmNlVHJlZU1vZGVsLCB0aGlzLmNvbnNvbGVWaWV3KTsK IAorICAgIHRoaXMuYXBwbGljYXRpb25DYWNoZU1vZGVsID0gbmV3IFdlYkluc3BlY3Rvci5BcHBs aWNhdGlvbkNhY2hlTW9kZWwoKTsKKyAgICAKICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVy SW5zcGVjdG9yRGlzcGF0Y2hlcih0aGlzKTsKIAogICAgIHRoaXMuY3NzTW9kZWwgPSBuZXcgV2Vi SW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwoKTsK 114249 2011-11-09 04:33:59 -0800 2011-11-09 05:00:57 -0800 Patch bug-71850-20111109163357.patch text/plain 15255 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTk2ODYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNmRlMjY3ZTI1YzkzYzIw MTJkZjIyZWI4NGIyM2RjNTE1NGVhOTExLi43ZGI2YzI5ZTZmYjg2YjU0NTc3NDgzNGVjMTc1YWQx MWRmZTMxNTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzMgQEAKIDIwMTEtMTEtMDkgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogRXh0cmFjdCBBcHBsaWNhdGlvbkNhY2hlTW9kZWwgZnJvbSBBcHBsaWNhdGlvbkNhY2hlSXRl bXNWaWV3LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzE4NTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFdlYkNvcmUuZ3lwaToKKyAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajoK KyAgICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2g6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcucHJvdG90eXBlLl91cGRhdGUpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZU1vZGVsLmpzOiBBZGRl ZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlTW9kZWwpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVNb2RlbC5wcm90b3R5cGUuZ2V0QXBwbGlj YXRpb25DYWNoZXNBc3luYyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNo ZURpc3BhdGNoZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVEaXNw YXRjaGVyLnByb3RvdHlwZS51cGRhdGVBcHBsaWNhdGlvbkNhY2hlU3RhdHVzKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRGlzcGF0Y2hlci5wcm90b3R5cGUudXBkYXRl TmV0d29ya1N0YXRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1Bh bmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS53 YXNTaG93bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBl LnJlc2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUu X3BvcHVsYXRlUmVzb3VyY2VUcmVlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQ YW5lbC5wcm90b3R5cGUuc2hvd0FwcGxpY2F0aW9uQ2FjaGUpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5faW5pdGlhbGl6ZUFwcGxpY2F0aW9uQ2FjaGVN b2RlbCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWw6CisKKzIwMTEtMTEtMDkgIFZz ZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogUmVzb3VyY2VzUGFuZWwgc2hvdWxkIHN1cHBvcnQgYWRkaW5nIHN1YnRpdGxlIHRvIGFu eSBCYXNlU3RvcmFnZVRyZWVFbGVtZW50LgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzE4NDgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS5neXBpIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCmluZGV4IDQ3MGY1ZWZkMjM4 N2JlMmYyYTIwODAwOWUxYzQ4Y2EyNWQ0NWY4MjMuLmFjODJjY2I4MjgyODAwNmQzNWIwMzIzNTQ2 ZGI0YTRmZjBkMmViZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQor KysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKQEAgLTYyNzQsNiArNjI3NCw3IEBACiAg ICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCcsCiAgICAgICAg ICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNlZFNlYXJjaENvbnRyb2xsZXIuanMnLAog ICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZUl0ZW1zVmll dy5qcycsCisgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hl TW9kZWwuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRDYXRlZ29y aWVzLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0Rm9ybWF0dGVy cy5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdExhdW5jaGVyVmll dy5qcycsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3Jl LnZjcHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCmlu ZGV4IDA1OTZkNDlkODJhYzZjOTM0YTY1MmE0NzA0YmViNTMwMTUzMzM1N2EuLmZlN2I0NWY4ODg0 NzE4ODRkN2ZiOTk5N2VmMjNkNDNiZDZmZWJhNDAgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCkBAIC02ODU3Myw2ICs2ODU3MywxMCBAQAogCQkJCQk+ CiAJCQkJPC9GaWxlPgogCQkJCTxGaWxlCisJCQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9y XGZyb250LWVuZFxBcHBsaWNhdGlvbkNhY2hlTW9kZWwuanMiCisJCQkJCT4KKwkJCQk8L0ZpbGU+ CisJCQkJPEZpbGUKIAkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXEF1 ZGl0Q2F0ZWdvcmllcy5qcyIKIAkJCQkJPgogCQkJCTwvRmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaAppbmRleCBlMTIzNmM0N2VmMzQ5NDkzMzE1 ZTEwOTNjODU1OWRmZWI4ZWVjYTRlLi4xZTFkN2UyOWE3OGU5ZjhiZGM3ZWM0NGYwOWNmMDA0ZWQ1 ZDM3ZTczIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9u dC1lbmQuc2gKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5k LnNoCkBAIC00NSw3ICs0NSw4IEBAIGphdmEgLWphciB+L2Nsb3N1cmUvY29tcGlsZXIuamFyIC0t c3VtbWFyeV9kZXRhaWxfbGV2ZWwgMyAtLWNvbXBpbGF0aW9uX2xldmVsIFNJCiAgICAgICAgIC0t anMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Vc2VyTWV0cmljcy5qcyBcCiAg ICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IYW5kbGVyUmVn aXN0cnkuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qcyBcCi0gICAgLS1tb2R1bGUganNtb2R1bGVf c2RrOjI1OmpzbW9kdWxlX2NvbW1vbiBcCisgICAgLS1tb2R1bGUganNtb2R1bGVfc2RrOjI2Ompz bW9kdWxlX2NvbW1vbiBcCisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9BcHBsaWNhdGlvbkNhY2hlTW9kZWwuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTb3VyY2VNYXBwaW5nLmpzIFwKICAg ICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU291 cmNlTWFwcGluZ1Byb3ZpZGVyLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNb2RlbC5qcyBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVJdGVtc1Zp ZXcuanMKaW5kZXggOWIzOThlNDQ0ZjI5YjEzYWEzOWRmNmFjM2Y2OTA5ZGE4ZWZmZjA2Ny4uYTc4 ZTE3NDRlMWY2MzI3ODg2ZDQxNGMwMjFiYzY4MGVjMTcwYjQzNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNo ZUl0ZW1zVmlldy5qcwpAQCAtMjcsOSArMjcsMTEgQEAKICAqIEBjb25zdHJ1Y3RvcgogICogQGV4 dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3fQogICovCi1XZWJJbnNwZWN0b3IuQXBwbGljYXRpb25D YWNoZUl0ZW1zVmlldyA9IGZ1bmN0aW9uKHRyZWVFbGVtZW50LCBhcHBjYWNoZURvbWFpbikKK1dl Ykluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3ID0gZnVuY3Rpb24obW9kZWwsIHRy ZWVFbGVtZW50LCBhcHBjYWNoZURvbWFpbikKIHsKICAgICBXZWJJbnNwZWN0b3IuVmlldy5jYWxs KHRoaXMpOworICAgIAorICAgIHRoaXMuX21vZGVsID0gbW9kZWw7CiAKICAgICB0aGlzLmVsZW1l bnQuYWRkU3R5bGVDbGFzcygic3RvcmFnZS12aWV3Iik7CiAgICAgdGhpcy5lbGVtZW50LmFkZFN0 eWxlQ2xhc3MoInRhYmxlIik7CkBAIC0xNDksNyArMTUxLDcgQEAgV2ViSW5zcGVjdG9yLkFwcGxp Y2F0aW9uQ2FjaGVJdGVtc1ZpZXcucHJvdG90eXBlID0gewogCiAgICAgX3VwZGF0ZTogZnVuY3Rp b24oKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVEaXNwYXRj aGVyLmdldEFwcGxpY2F0aW9uQ2FjaGVzQXN5bmModGhpcy5fdXBkYXRlQ2FsbGJhY2suYmluZCh0 aGlzKSk7CisgICAgICAgIHRoaXMuX21vZGVsLmdldEFwcGxpY2F0aW9uQ2FjaGVzQXN5bmModGhp cy5fdXBkYXRlQ2FsbGJhY2suYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIF91cGRhdGVDYWxs YmFjazogZnVuY3Rpb24oYXBwbGljYXRpb25DYWNoZXMpCkBAIC0yNzQsMzcgKzI3NiwzIEBAIFdl Ykluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKIH0KIAog V2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcucHJvdG90eXBlLl9fcHJvdG9f XyA9IFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZTsKLQotLyoqCi0gKiBAY29uc3RydWN0b3IK LSAqIEBpbXBsZW1lbnRzIHtBcHBsaWNhdGlvbkNhY2hlQWdlbnQuRGlzcGF0Y2hlcn0KLSAqLwot V2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVEaXNwYXRjaGVyID0gZnVuY3Rpb24oKQotewot fQotCi1XZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZURpc3BhdGNoZXIuZ2V0QXBwbGljYXRp b25DYWNoZXNBc3luYyA9IGZ1bmN0aW9uKGNhbGxiYWNrKQotewotICAgIGZ1bmN0aW9uIG15Y2Fs bGJhY2soZXJyb3IsIGFwcGxpY2F0aW9uQ2FjaGVzKQotICAgIHsKLSAgICAgICAgLy8gRklYTUU6 IEN1cnJlbnRseSwgdGhpcyBsaXN0IG9ubHkgcmV0dXJucyBhIHNpbmdsZSBhcHBsaWNhdGlvbiBj YWNoZS4KLSAgICAgICAgaWYgKCFlcnJvciAmJiBhcHBsaWNhdGlvbkNhY2hlcykKLSAgICAgICAg ICAgIGNhbGxiYWNrKGFwcGxpY2F0aW9uQ2FjaGVzKTsKLSAgICB9Ci0KLSAgICBBcHBsaWNhdGlv bkNhY2hlQWdlbnQuZ2V0QXBwbGljYXRpb25DYWNoZXMobXljYWxsYmFjayk7Ci19Ci0KLVdlYklu c3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7Ci0gICAgdXBk YXRlQXBwbGljYXRpb25DYWNoZVN0YXR1czogZnVuY3Rpb24oc3RhdHVzKQotICAgIHsKLSAgICAg ICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMudXBkYXRlQXBwbGljYXRpb25DYWNoZVN0 YXR1cyhzdGF0dXMpOwotICAgIH0sCi0KLSAgICB1cGRhdGVOZXR3b3JrU3RhdGU6IGZ1bmN0aW9u KGlzTm93T25saW5lKQotICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJj ZXMudXBkYXRlTmV0d29ya1N0YXRlKGlzTm93T25saW5lKTsKLSAgICB9Ci19Ci0KLUluc3BlY3Rv ckJhY2tlbmQucmVnaXN0ZXJBcHBsaWNhdGlvbkNhY2hlRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVj dG9yLkFwcGxpY2F0aW9uQ2FjaGVEaXNwYXRjaGVyKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlTW9kZWwuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVNb2RlbC5qcwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi4xYjAxYzYyY2I3ZWE3ZmU4NTE4NmRmOTlmNmE1MTk5NTgxOTEyZDY5Ci0tLSAv ZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BcHBsaWNh dGlvbkNhY2hlTW9kZWwuanMKQEAgLTAsMCArMSw3OSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykg MjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zIGFyZQorICogbWV0OgorICoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBz b3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKgor ICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBh Ym92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90 aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlzdHJpYnV0aW9uLgorICoKKyAq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgR09PR0xFIElOQy4gQU5EIElUUyBDT05UUklC VVRPUlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQ T1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBHT09HTEUgSU5DLgorICogT1Ig SVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMg KElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJ VFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAq IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJ VFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisvKioK KyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5PYmplY3R9CisgKi8K K1dlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlTW9kZWwgPSBmdW5jdGlvbigpCit7CisgICAg SW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckFwcGxpY2F0aW9uQ2FjaGVEaXNwYXRjaGVyKG5ldyBX ZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZURpc3BhdGNoZXIodGhpcykpOworfQorCitXZWJJ bnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZU1vZGVsLnByb3RvdHlwZSA9IHsKKyAgICBnZXRBcHBs aWNhdGlvbkNhY2hlc0FzeW5jOiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAgIGZ1 bmN0aW9uIG15Y2FsbGJhY2soZXJyb3IsIGFwcGxpY2F0aW9uQ2FjaGVzKQorICAgICAgICB7Cisg ICAgICAgICAgICAvLyBGSVhNRTogQ3VycmVudGx5LCB0aGlzIGxpc3Qgb25seSByZXR1cm5zIGEg c2luZ2xlIGFwcGxpY2F0aW9uIGNhY2hlLgorICAgICAgICAgICAgaWYgKCFlcnJvciAmJiBhcHBs aWNhdGlvbkNhY2hlcykKKyAgICAgICAgICAgICAgICBjYWxsYmFjayhhcHBsaWNhdGlvbkNhY2hl cyk7CisgICAgICAgIH0KKworICAgICAgICBBcHBsaWNhdGlvbkNhY2hlQWdlbnQuZ2V0QXBwbGlj YXRpb25DYWNoZXMobXljYWxsYmFjayk7CisgICAgfQorfQorCitXZWJJbnNwZWN0b3IuQXBwbGlj YXRpb25DYWNoZU1vZGVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0 LnByb3RvdHlwZTsKKworLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBpbXBsZW1lbnRzIHtBcHBs aWNhdGlvbkNhY2hlQWdlbnQuRGlzcGF0Y2hlcn0KKyAqLworV2ViSW5zcGVjdG9yLkFwcGxpY2F0 aW9uQ2FjaGVEaXNwYXRjaGVyID0gZnVuY3Rpb24oYXBwbGljYXRpb25DYWNoZU1vZGVsKQorewor ICAgIHRoaXMuX2FwcGxpY2F0aW9uQ2FjaGVNb2RlbCA9IGFwcGxpY2F0aW9uQ2FjaGVNb2RlbDsK K30KKworV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVEaXNwYXRjaGVyLnByb3RvdHlwZSA9 IHsKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gc3RhdHVzCisgICAgICovCisgICAg dXBkYXRlQXBwbGljYXRpb25DYWNoZVN0YXR1czogZnVuY3Rpb24oc3RhdHVzKQorICAgIHsKKyAg ICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMudXBkYXRlQXBwbGljYXRpb25DYWNo ZVN0YXR1cyhzdGF0dXMpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge2Jvb2xl YW59IGlzTm93T25saW5lCisgICAgICovCisgICAgdXBkYXRlTmV0d29ya1N0YXRlOiBmdW5jdGlv bihpc05vd09ubGluZSkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3Vy Y2VzLnVwZGF0ZU5ldHdvcmtTdGF0ZShpc05vd09ubGluZSk7CisgICAgfQorfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKaW5k ZXggNDJkN2MxMmRlOGQzZTc2OGIwMjczYmM1M2QwZjMwMGYyYWMxZDRhZC4uYjBmZmQwOGJmZTBl NjIxZTYxZjFjMGU2ZWUzNWFmNmY5NjUyODA5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC0xMDgsNyArMTA4LDE0 IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgd2FzU2hv d246IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5 cGUud2FzU2hvd24uY2FsbCh0aGlzKTsKLSAgICAgICAgdGhpcy5fcG9wdWxhdGVSZXNvdXJjZVRy ZWUoKTsKKyAgICAgICAgaWYgKCF0aGlzLl9pbml0aWFsaXplZCkgeworICAgICAgICAgICAgdGhp cy5fcG9wdWxhdGVSZXNvdXJjZVRyZWUoKTsKKyAgICAgICAgICAgIHRoaXMuX2luaXRpYWxpemVB cHBsaWNhdGlvbkNhY2hlTW9kZWwoKTsKKworICAgICAgICAgICAgdGhpcy5faW5pdERlZmF1bHRT ZWxlY3Rpb24oKTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgdGhpcy5faW5pdGlhbGl6ZWQg PSB0cnVlOworICAgICAgICB9CiAgICAgfSwKIAogICAgIF9vbkxvYWRFdmVudEZpcmVkOiBmdW5j dGlvbigpCkBAIC0xMTgsNyArMTI1LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnBy b3RvdHlwZSA9IHsKIAogICAgIF9pbml0RGVmYXVsdFNlbGVjdGlvbjogZnVuY3Rpb24oKQogICAg IHsKLSAgICAgICAgaWYgKCF0aGlzLl90cmVlRWxlbWVudEZvckZyYW1lSWQpCisgICAgICAgIGlm ICghdGhpcy5faW5pdGlhbGl6ZWQpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdmFy IGl0ZW1VUkwgPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MucmVzb3VyY2VzTGFzdFNlbGVjdGVkSXRl bS5nZXQoKTsKQEAgLTEzNyw2ICsxNDQsOSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwu cHJvdG90eXBlID0gewogCiAgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7CisgICAgICAgIHRo aXMucmVzb3VyY2VzTGlzdFRyZWVFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CisgICAgICAgIHRo aXMuX3RyZWVFbGVtZW50Rm9yRnJhbWVJZCA9IHt9OworCiAgICAgICAgIHRoaXMuX29yaWdpbnMg PSB7fTsKICAgICAgICAgdGhpcy5fZG9tYWlucyA9IHt9OwogICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IHRoaXMuX2RhdGFiYXNlcy5sZW5ndGg7ICsraSkgewpAQCAtMTc3LDE2ICsxODcsMTMg QEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9wb3B1 bGF0ZVJlc291cmNlVHJlZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3Ry ZWVFbGVtZW50Rm9yRnJhbWVJZCkKLSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICB0aGlz Ll90cmVlRWxlbWVudEZvckZyYW1lSWQgPSB7fTsKICAgICAgICAgV2ViSW5zcGVjdG9yLnJlc291 cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1v ZGVsLkV2ZW50VHlwZXMuRnJhbWVBZGRlZCwgdGhpcy5fZnJhbWVBZGRlZCwgdGhpcyk7CiAgICAg ICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkZyYW1lTmF2aWdhdGVkLCB0aGlz Ll9mcmFtZU5hdmlnYXRlZCwgdGhpcyk7CiAgICAgICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRy ZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5F dmVudFR5cGVzLkZyYW1lRGV0YWNoZWQsIHRoaXMuX2ZyYW1lRGV0YWNoZWQsIHRoaXMpOwogICAg ICAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5SZXNvdXJjZUFkZGVkLCB0aGlz Ll9yZXNvdXJjZUFkZGVkLCB0aGlzKTsKICAgICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJl ZU1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2 ZW50VHlwZXMuQ2FjaGVkUmVzb3VyY2VzTG9hZGVkLCB0aGlzLl9jYWNoZWRSZXNvdXJjZXNMb2Fk ZWQsIHRoaXMpOwotICAgICAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5XaWxs TG9hZENhY2hlZFJlc291cmNlcywgdGhpcy5fcmVzZXRSZXNvdXJjZXNUcmVlLCB0aGlzKTsKKyAg ICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2Vi SW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuV2lsbExvYWRDYWNoZWRSZXNv dXJjZXMsIHRoaXMucmVzZXQsIHRoaXMpOwogCiAgICAgICAgIGZ1bmN0aW9uIHBvcHVsYXRlRnJh bWUoZnJhbWVJZCkKICAgICAgICAgewpAQCAtMjAxLDggKzIwOCw2IEBAIFdlYkluc3BlY3Rvci5S ZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdGhpcy5fcmVzb3Vy Y2VBZGRlZCh7ZGF0YTpyZXNvdXJjZXNbaV19KTsKICAgICAgICAgfQogICAgICAgICBwb3B1bGF0 ZUZyYW1lLmNhbGwodGhpcywgIiIpOwotCi0gICAgICAgIHRoaXMuX2luaXREZWZhdWx0U2VsZWN0 aW9uKCk7CiAgICAgfSwKIAogICAgIF9mcmFtZUFkZGVkOiBmdW5jdGlvbihldmVudCkKQEAgLTI1 OSwxMyArMjY0LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIGZyYW1lVHJlZUVsZW1lbnQuZnJhbWVOYXZpZ2F0ZWQoZXZlbnQuZGF0YS5m cmFtZSk7CiAgICAgfSwKIAotICAgIF9yZXNldFJlc291cmNlc1RyZWU6IGZ1bmN0aW9uKCkKLSAg ICB7Ci0gICAgICAgIHRoaXMucmVzb3VyY2VzTGlzdFRyZWVFbGVtZW50LnJlbW92ZUNoaWxkcmVu KCk7Ci0gICAgICAgIHRoaXMuX3RyZWVFbGVtZW50Rm9yRnJhbWVJZCA9IHt9OwotICAgICAgICB0 aGlzLnJlc2V0KCk7Ci0gICAgfSwKLQogICAgIF9jYWNoZWRSZXNvdXJjZXNMb2FkZWQ6IGZ1bmN0 aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX2luaXREZWZhdWx0U2VsZWN0aW9uKCk7CkBAIC00 ODYsNyArNDg0LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsK ICAgICB7CiAgICAgICAgIHZhciB2aWV3ID0gdGhpcy5fYXBwbGljYXRpb25DYWNoZVZpZXc7CiAg ICAgICAgIGlmICghdmlldykgewotICAgICAgICAgICAgdmlldyA9IG5ldyBXZWJJbnNwZWN0b3Iu QXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldyh0cmVlRWxlbWVudCwgYXBwY2FjaGVEb21haW4pOwor ICAgICAgICAgICAgdmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUl0ZW1z Vmlldyh0aGlzLl9hcHBsaWNhdGlvbkNhY2hlTW9kZWwsIHRyZWVFbGVtZW50LCBhcHBjYWNoZURv bWFpbik7CiAgICAgICAgICAgICB0aGlzLl9hcHBsaWNhdGlvbkNhY2hlVmlldyA9IHZpZXc7CiAg ICAgICAgIH0KIApAQCAtNTY4LDYgKzU2NiwxMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFu ZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgZG9tU3RvcmFnZS5fZG9tU3RvcmFnZVZpZXcu dXBkYXRlKCk7CiAgICAgfSwKIAorICAgIF9pbml0aWFsaXplQXBwbGljYXRpb25DYWNoZU1vZGVs OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl9hcHBsaWNhdGlvbkNhY2hlTW9kZWwg PSBuZXcgV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVNb2RlbCgpOworICAgIH0sCisgICAg CiAgICAgdXBkYXRlQXBwbGljYXRpb25DYWNoZVN0YXR1czogZnVuY3Rpb24oc3RhdHVzKQogICAg IHsKICAgICAgICAgdGhpcy5fY2FjaGVkQXBwbGljYXRpb25DYWNoZVZpZXdTdGF0dXMgPSBzdGF0 dXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktp dC5xcmMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKaW5k ZXggNjJmZmExMmY3MWRiNzAwOTZiY2QwYzdkNjQxMDA2YmZhMmU5MjliOS4uMDViOGJiMTNkMzEz OTAwMzYxMmRhODEyYzdhODMzZTI1NWRmMmUwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYwpAQCAtMyw2ICszLDcgQEAKICAgICA8ZmlsZT5pbnNw ZWN0b3IuaHRtbDwvZmlsZT4KICAgICA8ZmlsZT5BZHZhbmNlZFNlYXJjaENvbnRyb2xsZXIuanM8 L2ZpbGU+CiAgICAgPGZpbGU+QXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldy5qczwvZmlsZT4KKyAg ICA8ZmlsZT5BcHBsaWNhdGlvbkNhY2hlTW9kZWwuanM8L2ZpbGU+CiAgICAgPGZpbGU+QXVkaXRD YXRlZ29yaWVzLmpzPC9maWxlPgogICAgIDxmaWxlPkF1ZGl0Rm9ybWF0dGVycy5qczwvZmlsZT4K ICAgICA8ZmlsZT5BdWRpdExhdW5jaGVyVmlldy5qczwvZmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCmluZGV4IDlkZjlkODQ0ZmM4 MTdiZGRmZDY3NDg1MDIyNDI4YzJmNDRhYWVmYmQuLjcxMmVhZWM0N2RkOGM2NWFkYjliNjcwYzZj ODU4NzY2NGQ1ZTZhOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmh0bWwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuaHRtbApAQCAtNzgsNiArNzgsNyBAQCBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICAgIDxzY3Jp cHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNob3dNb3JlRGF0YUdyaWROb2RlLmpzIj48 L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJDb29raWVz VGFibGUuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBz cmM9IkNvb2tpZUl0ZW1zVmlldy5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0 L2phdmFzY3JpcHQiIHNyYz0iQXBwbGljYXRpb25DYWNoZU1vZGVsLmpzIj48L3NjcmlwdD4KICAg ICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJBcHBsaWNhdGlvbkNhY2hlSXRl bXNWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIg c3JjPSJTY3JpcHQuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2Ny aXB0IiBzcmM9IlNpZGViYXJQYW5lLmpzIj48L3NjcmlwdD4K