79908 2012-02-29 07:14:32 -0800 Web Inspector: enable Profiles panel for workers 2012-02-29 07:42:25 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 567593 0 yurys 2012-02-29 07:14:32 -0800 Profiler should work in worker inspector. 567596 1 129444 yurys 2012-02-29 07:16:53 -0800 Created attachment 129444 Patch 567617 2 yurys 2012-02-29 07:42:25 -0800 Committed r109214: <http://trac.webkit.org/changeset/109214> 129444 2012-02-29 07:16:53 -0800 2012-02-29 07:28:39 -0800 Patch bug-79908-20120229191649.patch text/plain 21944 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODdjOTUwMTZiZGEwN2Vh ZTE3MWEzYTJmMWFmYjUwYjYxZmRiZjkxOC4uN2MxOGY2ZmJlZGViNzkxODk3YTM4YTc4ZTNkMjBi MjNlMzE1MmE2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYyIEBACisyMDEyLTAyLTI5ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGVuYWJsZSBQcm9maWxlcyBwYW5lbCBmb3Igd29ya2VycworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk5MDgKKworICAgICAgICBJbnRyb2R1Y2Vk IHdvcmtlciBwcm9maWxlciBhZ2VudC4gRW5hYmxlZCBzY3JpcHQgcHJvZmlsaW5nIGZvcgorICAg ICAgICB3b3JrZXJzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0UHJvZmlsZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U2NyaXB0UHJvZmlsZXI6OnN0YXJ0Rm9yUGFnZSk6CisgICAgICAgIChXZWJDb3JlKToKKyAg ICAgICAgKFdlYkNvcmU6OlNjcmlwdFByb2ZpbGVyOjpzdGFydEZvcldvcmtlckNvbnRleHQpOgor ICAgICAgICAoV2ViQ29yZTo6U2NyaXB0UHJvZmlsZXI6OnN0b3BGb3JQYWdlKToKKyAgICAgICAg KFdlYkNvcmU6OlNjcmlwdFByb2ZpbGVyOjpzdG9wRm9yV29ya2VyQ29udGV4dCk6CisgICAgICAg ICogYmluZGluZ3MvanMvU2NyaXB0UHJvZmlsZXIuaDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAg ICAgICAoU2NyaXB0UHJvZmlsZXIpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1NjcmlwdFByb2Zp bGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdFByb2ZpbGVyOjpzdGFydEZvclBhZ2Up OgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRQcm9maWxlcjo6 c3RhcnRGb3JXb3JrZXJDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdFByb2ZpbGVy OjpzdG9wRm9yUGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRQcm9maWxlcjo6c3RvcEZv cldvcmtlckNvbnRleHQpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1NjcmlwdFByb2ZpbGVyLmg6 CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFNjcmlwdFByb2ZpbGVyKToKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3Jl KToKKyAgICAgICAgKFBhZ2VQcm9maWxlckFnZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VQ cm9maWxlckFnZW50OjpQYWdlUHJvZmlsZXJBZ2VudCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdl UHJvZmlsZXJBZ2VudDo6flBhZ2VQcm9maWxlckFnZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBh Z2VQcm9maWxlckFnZW50OjpzdGFydFByb2ZpbGluZyk6CisgICAgICAgIChXZWJDb3JlOjpQYWdl UHJvZmlsZXJBZ2VudDo6c3RvcFByb2ZpbGluZyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JQcm9maWxlckFnZW50OjpjcmVhdGUpOgorICAgICAgICAoV29ya2VyUHJvZmlsZXJBZ2VudCk6 CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJQcm9maWxlckFnZW50OjpXb3JrZXJQcm9maWxlckFn ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclByb2ZpbGVyQWdlbnQ6On5Xb3JrZXJQcm9m aWxlckFnZW50KToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclByb2ZpbGVyQWdlbnQ6OnN0YXJ0 UHJvZmlsaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclByb2ZpbGVyQWdlbnQ6OnN0b3BQ cm9maWxpbmcpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUHJvZmlsZXJBZ2VudDo6SW5z cGVjdG9yUHJvZmlsZXJBZ2VudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQcm9maWxl ckFnZW50OjpzdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQcm9maWxlckFnZW50 OjpzdG9wKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5oOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChJbnNwZWN0b3JQcm9maWxlckFnZW50KToKKyAg ICAgICAgKiBpbnNwZWN0b3IvV29ya2VySW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpXb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyOjpXb3JrZXJJbnNwZWN0b3JDb250 cm9sbGVyKToKKyAgICAgICAgKFdlYkNvcmU6Oldvcmtlckluc3BlY3RvckNvbnRyb2xsZXI6OmNv bm5lY3RGcm9udGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJJbnNwZWN0b3JDb250cm9s bGVyOjpkaXNjb25uZWN0RnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VySW5zcGVj dG9yQ29udHJvbGxlcjo6cmVzdG9yZUluc3BlY3RvclN0YXRlRnJvbUNvb2tpZSk6CisgICAgICAg ICogaW5zcGVjdG9yL1dvcmtlckluc3BlY3RvckNvbnRyb2xsZXIuaDoKKyAgICAgICAgKFdlYkNv cmUpOgorICAgICAgICAoV29ya2VySW5zcGVjdG9yQ29udHJvbGxlcik6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9jcmVhdGVQYW5l bHMpOgorCiAyMDEyLTAyLTI4ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1vdmUgRE9NIGNvdW50ZXIgZ3JhcGhzIG91dCBv ZiBleHBlcmltZW50YWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1Nj cmlwdFByb2ZpbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFByb2Zp bGVyLmNwcAppbmRleCBhNjNmZTRkOWVjZDJmYTdmZWNjMjM3NDlkMmEyM2RlZDIxMzQ1OWM5Li43 OTA3MzliMjFmY2UyODlhNGU4YTdlZGZkZjc5NzVhNGM2MmY1NjFlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRQcm9maWxlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvU2NyaXB0UHJvZmlsZXIuY3BwCkBAIC0zMCw5ICszMCwxMyBAQAog CiAjaW5jbHVkZSAiU2NyaXB0UHJvZmlsZXIuaCIKIAorI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5j bHVkZSAiR0NDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiSlNET01CaW5kaW5nLmgiCisjaW5jbHVk ZSAiSlNET01XaW5kb3cuaCIKKyNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiU2NyaXB0T2Jq ZWN0LmgiCisjaW5jbHVkZSAiU2NyaXB0U3RhdGUuaCIKICNpbmNsdWRlIDxwcm9maWxlci9Qcm9m aWxlci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC01MiwxMiArNTYsMzggQEAgdm9pZCBT Y3JpcHRQcm9maWxlcjo6c3RhcnQoU2NyaXB0U3RhdGUqIHN0YXRlLCBjb25zdCBTdHJpbmcmIHRp dGxlKQogICAgIEpTQzo6UHJvZmlsZXI6OnByb2ZpbGVyKCktPnN0YXJ0UHJvZmlsaW5nKHN0YXRl LCBzdHJpbmdUb1VTdHJpbmcodGl0bGUpKTsKIH0KIAordm9pZCBTY3JpcHRQcm9maWxlcjo6c3Rh cnRGb3JQYWdlKFBhZ2UqIGluc3BlY3RlZFBhZ2UsIGNvbnN0IFN0cmluZyYgdGl0bGUpCit7Cisg ICAgSlNDOjpFeGVjU3RhdGUqIHNjcmlwdFN0YXRlID0gdG9KU0RPTVdpbmRvdyhpbnNwZWN0ZWRQ YWdlLT5tYWluRnJhbWUoKSwgZGVidWdnZXJXb3JsZCgpKS0+Z2xvYmFsRXhlYygpOworICAgIHN0 YXJ0KHNjcmlwdFN0YXRlLCB0aXRsZSk7Cit9CisKKyNpZiBFTkFCTEUoV09SS0VSUykKK3ZvaWQg U2NyaXB0UHJvZmlsZXI6OnN0YXJ0Rm9yV29ya2VyQ29udGV4dChXb3JrZXJDb250ZXh0KiBjb250 ZXh0LCBjb25zdCBTdHJpbmcmIHRpdGxlKQoreworICAgIHN0YXJ0KHNjcmlwdFN0YXRlRnJvbVdv cmtlckNvbnRleHQoY29udGV4dCksIHRpdGxlKTsKK30KKyNlbmRpZgorCiBQYXNzUmVmUHRyPFNj cmlwdFByb2ZpbGU+IFNjcmlwdFByb2ZpbGVyOjpzdG9wKFNjcmlwdFN0YXRlKiBzdGF0ZSwgY29u c3QgU3RyaW5nJiB0aXRsZSkKIHsKICAgICBSZWZQdHI8SlNDOjpQcm9maWxlPiBwcm9maWxlID0g SlNDOjpQcm9maWxlcjo6cHJvZmlsZXIoKS0+c3RvcFByb2ZpbGluZyhzdGF0ZSwgc3RyaW5nVG9V U3RyaW5nKHRpdGxlKSk7CiAgICAgcmV0dXJuIFNjcmlwdFByb2ZpbGU6OmNyZWF0ZShwcm9maWxl KTsKIH0KIAorUGFzc1JlZlB0cjxTY3JpcHRQcm9maWxlPiBTY3JpcHRQcm9maWxlcjo6c3RvcEZv clBhZ2UoUGFnZSogaW5zcGVjdGVkUGFnZSwgY29uc3QgU3RyaW5nJiB0aXRsZSkKK3sKKyAgICBK U0M6OkV4ZWNTdGF0ZSogc2NyaXB0U3RhdGUgPSB0b0pTRE9NV2luZG93KGluc3BlY3RlZFBhZ2Ut Pm1haW5GcmFtZSgpLCBkZWJ1Z2dlcldvcmxkKCkpLT5nbG9iYWxFeGVjKCk7CisgICAgcmV0dXJu IHN0b3Aoc2NyaXB0U3RhdGUsIHRpdGxlKTsKK30KKworI2lmIEVOQUJMRShXT1JLRVJTKQorUGFz c1JlZlB0cjxTY3JpcHRQcm9maWxlPiBTY3JpcHRQcm9maWxlcjo6c3RvcEZvcldvcmtlckNvbnRl eHQoV29ya2VyQ29udGV4dCogY29udGV4dCwgY29uc3QgU3RyaW5nJiB0aXRsZSkKK3sKKyAgICBy ZXR1cm4gc3RvcChzY3JpcHRTdGF0ZUZyb21Xb3JrZXJDb250ZXh0KGNvbnRleHQpLCB0aXRsZSk7 Cit9CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRU5BQkxF KEpBVkFTQ1JJUFRfREVCVUdHRVIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9TY3JpcHRQcm9maWxlci5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0 UHJvZmlsZXIuaAppbmRleCBhMjFlYWRhNGM1ZDg4NjdhMzBmY2I0M2ExNGFlNTZkMjY2ZjM1MmNk Li5lZmVkMDMxYTcxYWIzZjczZWJkNDZmYmE4MmI5ODEwNWMyZTg3YjBmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRQcm9maWxlci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFByb2ZpbGVyLmgKQEAgLTM3LDcgKzM3LDkgQEAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgRE9NV3JhcHBlclZpc2l0b3I7CitjbGFzcyBQYWdl OwogY2xhc3MgU2NyaXB0T2JqZWN0OworY2xhc3MgV29ya2VyQ29udGV4dDsKIAogY2xhc3MgU2Ny aXB0UHJvZmlsZXIgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFNjcmlwdFByb2ZpbGVyKTsK QEAgLTU0LDcgKzU2LDE1IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBjb2xsZWN0R2FyYmFn ZSgpOwogICAgIHN0YXRpYyBTY3JpcHRPYmplY3Qgb2JqZWN0QnlIZWFwT2JqZWN0SWQodW5zaWdu ZWQgaWQpOwogICAgIHN0YXRpYyB2b2lkIHN0YXJ0KFNjcmlwdFN0YXRlKiBzdGF0ZSwgY29uc3Qg U3RyaW5nJiB0aXRsZSk7CisgICAgc3RhdGljIHZvaWQgc3RhcnRGb3JQYWdlKFBhZ2UqLCBjb25z dCBTdHJpbmcmIHRpdGxlKTsKKyNpZiBFTkFCTEUoV09SS0VSUykKKyAgICBzdGF0aWMgdm9pZCBz dGFydEZvcldvcmtlckNvbnRleHQoV29ya2VyQ29udGV4dCosIGNvbnN0IFN0cmluZyYgdGl0bGUp OworI2VuZGlmCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U2NyaXB0UHJvZmlsZT4gc3RvcChTY3Jp cHRTdGF0ZSogc3RhdGUsIGNvbnN0IFN0cmluZyYgdGl0bGUpOworICAgIHN0YXRpYyBQYXNzUmVm UHRyPFNjcmlwdFByb2ZpbGU+IHN0b3BGb3JQYWdlKFBhZ2UqLCBjb25zdCBTdHJpbmcmIHRpdGxl KTsKKyNpZiBFTkFCTEUoV09SS0VSUykKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxTY3JpcHRQcm9m aWxlPiBzdG9wRm9yV29ya2VyQ29udGV4dChXb3JrZXJDb250ZXh0KiwgY29uc3QgU3RyaW5nJiB0 aXRsZSk7CisjZW5kaWYKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTY3JpcHRIZWFwU25hcHNob3Q+ IHRha2VIZWFwU25hcHNob3QoY29uc3QgU3RyaW5nJiwgSGVhcFNuYXBzaG90UHJvZ3Jlc3MqKSB7 IHJldHVybiAwOyB9CiAgICAgc3RhdGljIGJvb2wgY2F1c2VzUmVjb21waWxhdGlvbigpIHsgcmV0 dXJuIHRydWU7IH0KICAgICBzdGF0aWMgYm9vbCBpc1NhbXBsaW5nKCkgeyByZXR1cm4gZmFsc2U7 IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFByb2ZpbGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFByb2ZpbGVyLmNwcAppbmRl eCBhN2Y2NWZhZjI3OTIxM2VjNGU2YmYzMzFkMzQ4ZjZmNGQwMmVkMWIzLi41Njc2OTM3NDI0MTIy MjQzZmQ2OWVhZTAxZTY5OGM0ZjA0YjA5MzM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9TY3JpcHRQcm9maWxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvU2NyaXB0UHJvZmlsZXIuY3BwCkBAIC00OSw2ICs0OSwxOCBAQCB2b2lkIFNjcmlwdFBy b2ZpbGVyOjpzdGFydChTY3JpcHRTdGF0ZSogc3RhdGUsIGNvbnN0IFN0cmluZyYgdGl0bGUpCiAg ICAgdjg6OkNwdVByb2ZpbGVyOjpTdGFydFByb2ZpbGluZyh2OFN0cmluZyh0aXRsZSkpOwogfQog Cit2b2lkIFNjcmlwdFByb2ZpbGVyOjpzdGFydEZvclBhZ2UoUGFnZSosIGNvbnN0IFN0cmluZyYg dGl0bGUpCit7CisgICAgcmV0dXJuIHN0YXJ0KDAsIHRpdGxlKTsKK30KKworI2lmIEVOQUJMRShX T1JLRVJTKQordm9pZCBTY3JpcHRQcm9maWxlcjo6c3RhcnRGb3JXb3JrZXJDb250ZXh0KFdvcmtl ckNvbnRleHQqLCBjb25zdCBTdHJpbmcmIHRpdGxlKQoreworICAgIHJldHVybiBzdGFydCgwLCB0 aXRsZSk7Cit9CisjZW5kaWYKKwogUGFzc1JlZlB0cjxTY3JpcHRQcm9maWxlPiBTY3JpcHRQcm9m aWxlcjo6c3RvcChTY3JpcHRTdGF0ZSogc3RhdGUsIGNvbnN0IFN0cmluZyYgdGl0bGUpCiB7CiAg ICAgdjg6OkhhbmRsZVNjb3BlIGhzOwpAQCAtNTgsNiArNzAsMjAgQEAgUGFzc1JlZlB0cjxTY3Jp cHRQcm9maWxlPiBTY3JpcHRQcm9maWxlcjo6c3RvcChTY3JpcHRTdGF0ZSogc3RhdGUsIGNvbnN0 IFN0cmluZyYKICAgICByZXR1cm4gcHJvZmlsZSA/IFNjcmlwdFByb2ZpbGU6OmNyZWF0ZShwcm9m aWxlKSA6IDA7CiB9CiAKK1Bhc3NSZWZQdHI8U2NyaXB0UHJvZmlsZT4gU2NyaXB0UHJvZmlsZXI6 OnN0b3BGb3JQYWdlKFBhZ2UqLCBjb25zdCBTdHJpbmcmIHRpdGxlKQoreworICAgIC8vIFVzZSBu dWxsIHNjcmlwdCBzdGF0ZSB0byBhdm9pZCBmaWx0ZXJpbmcgYnkgY29udGV4dCBzZWN1cml0eSB0 b2tlbi4KKyAgICAvLyBBbGwgZnVuY3Rpb25zIGZyb20gYWxsIGlmcmFtZXMgc2hvdWxkIGJlIHZp c2libGUgZnJvbSBJbnNwZWN0b3IgVUkuCisgICAgcmV0dXJuIHN0b3AoMCwgdGl0bGUpOworfQor CisjaWYgRU5BQkxFKFdPUktFUlMpCitQYXNzUmVmUHRyPFNjcmlwdFByb2ZpbGU+IFNjcmlwdFBy b2ZpbGVyOjpzdG9wRm9yV29ya2VyQ29udGV4dChXb3JrZXJDb250ZXh0KiwgY29uc3QgU3RyaW5n JiB0aXRsZSkKK3sKKyAgICByZXR1cm4gc3RvcCgwLCB0aXRsZSk7Cit9CisjZW5kaWYKKwogdm9p ZCBTY3JpcHRQcm9maWxlcjo6Y29sbGVjdEdhcmJhZ2UoKQogewogICAgIHY4OjpWODo6TG93TWVt b3J5Tm90aWZpY2F0aW9uKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9TY3JpcHRQcm9maWxlci5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0UHJv ZmlsZXIuaAppbmRleCA4ZThhMTYxNDRkZWM4OTA5YjVkMWM4Mjc3NDYyYjhhZDJlZTU0ODkzLi41 ZDNiOTY4YTI3NmVhODMwMDJmMTIzNDgzZjZlZDU0YzZjMDViZmJkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRQcm9maWxlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFByb2ZpbGVyLmgKQEAgLTQxLDcgKzQxLDkgQEAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgRE9NV3JhcHBlclZpc2l0b3I7CitjbGFzcyBQYWdlOwog Y2xhc3MgU2NyaXB0T2JqZWN0OworY2xhc3MgV29ya2VyQ29udGV4dDsKIAogY2xhc3MgU2NyaXB0 UHJvZmlsZXIgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFNjcmlwdFByb2ZpbGVyKTsKQEAg LTU4LDcgKzYwLDE1IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBjb2xsZWN0R2FyYmFnZSgp OwogICAgIHN0YXRpYyBTY3JpcHRPYmplY3Qgb2JqZWN0QnlIZWFwT2JqZWN0SWQodW5zaWduZWQg aWQpOwogICAgIHN0YXRpYyB2b2lkIHN0YXJ0KFNjcmlwdFN0YXRlKiBzdGF0ZSwgY29uc3QgU3Ry aW5nJiB0aXRsZSk7CisgICAgc3RhdGljIHZvaWQgc3RhcnRGb3JQYWdlKFBhZ2UqLCBjb25zdCBT dHJpbmcmIHRpdGxlKTsKKyNpZiBFTkFCTEUoV09SS0VSUykKKyAgICBzdGF0aWMgdm9pZCBzdGFy dEZvcldvcmtlckNvbnRleHQoV29ya2VyQ29udGV4dCosIGNvbnN0IFN0cmluZyYgdGl0bGUpOwor I2VuZGlmCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U2NyaXB0UHJvZmlsZT4gc3RvcChTY3JpcHRT dGF0ZSogc3RhdGUsIGNvbnN0IFN0cmluZyYgdGl0bGUpOworICAgIHN0YXRpYyBQYXNzUmVmUHRy PFNjcmlwdFByb2ZpbGU+IHN0b3BGb3JQYWdlKFBhZ2UqLCBjb25zdCBTdHJpbmcmIHRpdGxlKTsK KyNpZiBFTkFCTEUoV09SS0VSUykKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxTY3JpcHRQcm9maWxl PiBzdG9wRm9yV29ya2VyQ29udGV4dChXb3JrZXJDb250ZXh0KiwgY29uc3QgU3RyaW5nJiB0aXRs ZSk7CisjZW5kaWYKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTY3JpcHRIZWFwU25hcHNob3Q+IHRh a2VIZWFwU25hcHNob3QoY29uc3QgU3RyaW5nJiB0aXRsZSwgSGVhcFNuYXBzaG90UHJvZ3Jlc3Mq KTsKICAgICBzdGF0aWMgYm9vbCBjYXVzZXNSZWNvbXBpbGF0aW9uKCkgeyByZXR1cm4gZmFsc2U7 IH0KICAgICBzdGF0aWMgYm9vbCBpc1NhbXBsaW5nKCkgeyByZXR1cm4gdHJ1ZTsgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclByb2ZpbGVyQWdlbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclByb2ZpbGVyQWdlbnQuY3BwCmlu ZGV4IDA4ZTllYTYzYTNkNzY1MWMxNzNjMGUzOWJjNTgxNDU3MDNjYjdmNjEuLjM4OTQ3MjJkMjZi M2IyZTg0MmMwZDJlYzE5YWFkNWZhYjAzOThmZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JQcm9maWxlckFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5jcHAKQEAgLTUwLDEwICs1MCw2IEBA CiAjaW5jbHVkZSA8d3RmL093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0NvbmNh dGVuYXRlLmg+CiAKLSNpZiBVU0UoSlNDKQotI2luY2x1ZGUgIkpTRE9NV2luZG93LmgiCi0jZW5k aWYKLQogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBuYW1lc3BhY2UgUHJvZmlsZXJBZ2VudFN0YXRl IHsKQEAgLTY1LDE1ICs2MSw2MSBAQCBzdGF0aWMgY29uc3QgY2hhciogY29uc3QgVXNlckluaXRp YXRlZFByb2ZpbGVOYW1lID0gIm9yZy53ZWJraXQucHJvZmlsZXMudXNlci1pbgogc3RhdGljIGNv bnN0IGNoYXIqIGNvbnN0IENQVVByb2ZpbGVUeXBlID0gIkNQVSI7CiBzdGF0aWMgY29uc3QgY2hh ciogY29uc3QgSGVhcFByb2ZpbGVUeXBlID0gIkhFQVAiOwogCisKK2NsYXNzIFBhZ2VQcm9maWxl ckFnZW50IDogcHVibGljIEluc3BlY3RvclByb2ZpbGVyQWdlbnQgeworcHVibGljOgorICAgIFBh Z2VQcm9maWxlckFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMs IEluc3BlY3RvckNvbnNvbGVBZ2VudCogY29uc29sZUFnZW50LCBQYWdlKiBpbnNwZWN0ZWRQYWdl LCBJbnNwZWN0b3JTdGF0ZSogc3RhdGUsIEluamVjdGVkU2NyaXB0TWFuYWdlciogaW5qZWN0ZWRT Y3JpcHRNYW5hZ2VyKQorICAgICAgICA6IEluc3BlY3RvclByb2ZpbGVyQWdlbnQoaW5zdHJ1bWVu dGluZ0FnZW50cywgY29uc29sZUFnZW50LCBzdGF0ZSwgaW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKSwg bV9pbnNwZWN0ZWRQYWdlKGluc3BlY3RlZFBhZ2UpIHsgfQorICAgIHZpcnR1YWwgflBhZ2VQcm9m aWxlckFnZW50KCkgeyB9CisKK3ByaXZhdGU6CisgICAgdmlydHVhbCB2b2lkIHN0YXJ0UHJvZmls aW5nKGNvbnN0IFN0cmluZyYgdGl0bGUpCisgICAgeworICAgICAgICBTY3JpcHRQcm9maWxlcjo6 c3RhcnRGb3JQYWdlKG1faW5zcGVjdGVkUGFnZSwgdGl0bGUpOworICAgIH0KKworICAgIHZpcnR1 YWwgUGFzc1JlZlB0cjxTY3JpcHRQcm9maWxlPiBzdG9wUHJvZmlsaW5nKGNvbnN0IFN0cmluZyYg dGl0bGUpCisgICAgeworICAgICAgICByZXR1cm4gU2NyaXB0UHJvZmlsZXI6OnN0b3BGb3JQYWdl KG1faW5zcGVjdGVkUGFnZSwgdGl0bGUpOworICAgIH0KKworICAgIFBhZ2UqIG1faW5zcGVjdGVk UGFnZTsKK307CisKIFBhc3NPd25QdHI8SW5zcGVjdG9yUHJvZmlsZXJBZ2VudD4gSW5zcGVjdG9y UHJvZmlsZXJBZ2VudDo6Y3JlYXRlKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdB Z2VudHMsIEluc3BlY3RvckNvbnNvbGVBZ2VudCogY29uc29sZUFnZW50LCBQYWdlKiBpbnNwZWN0 ZWRQYWdlLCBJbnNwZWN0b3JTdGF0ZSogaW5zcGVjdG9yU3RhdGUsIEluamVjdGVkU2NyaXB0TWFu YWdlciogaW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKQogewotICAgIHJldHVybiBhZG9wdFB0cihuZXcg SW5zcGVjdG9yUHJvZmlsZXJBZ2VudChpbnN0cnVtZW50aW5nQWdlbnRzLCBjb25zb2xlQWdlbnQs IGluc3BlY3RlZFBhZ2UsIGluc3BlY3RvclN0YXRlLCBpbmplY3RlZFNjcmlwdE1hbmFnZXIpKTsK KyAgICByZXR1cm4gYWRvcHRQdHIobmV3IFBhZ2VQcm9maWxlckFnZW50KGluc3RydW1lbnRpbmdB Z2VudHMsIGNvbnNvbGVBZ2VudCwgaW5zcGVjdGVkUGFnZSwgaW5zcGVjdG9yU3RhdGUsIGluamVj dGVkU2NyaXB0TWFuYWdlcikpOworfQorCisKK2NsYXNzIFdvcmtlclByb2ZpbGVyQWdlbnQgOiBw dWJsaWMgSW5zcGVjdG9yUHJvZmlsZXJBZ2VudCB7CitwdWJsaWM6CisgICAgV29ya2VyUHJvZmls ZXJBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBJbnNwZWN0 b3JDb25zb2xlQWdlbnQqIGNvbnNvbGVBZ2VudCwgV29ya2VyQ29udGV4dCogd29ya2VyQ29udGV4 dCwgSW5zcGVjdG9yU3RhdGUqIHN0YXRlLCBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIGluamVjdGVk U2NyaXB0TWFuYWdlcikKKyAgICAgICAgOiBJbnNwZWN0b3JQcm9maWxlckFnZW50KGluc3RydW1l bnRpbmdBZ2VudHMsIGNvbnNvbGVBZ2VudCwgc3RhdGUsIGluamVjdGVkU2NyaXB0TWFuYWdlciks IG1fd29ya2VyQ29udGV4dCh3b3JrZXJDb250ZXh0KSB7IH0KKyAgICB2aXJ0dWFsIH5Xb3JrZXJQ cm9maWxlckFnZW50KCkgeyB9CisKK3ByaXZhdGU6CisgICAgdmlydHVhbCB2b2lkIHN0YXJ0UHJv ZmlsaW5nKGNvbnN0IFN0cmluZyYgdGl0bGUpCisgICAgeworICAgICAgICBTY3JpcHRQcm9maWxl cjo6c3RhcnRGb3JXb3JrZXJDb250ZXh0KG1fd29ya2VyQ29udGV4dCwgdGl0bGUpOworICAgIH0K KworICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxTY3JpcHRQcm9maWxlPiBzdG9wUHJvZmlsaW5nKGNv bnN0IFN0cmluZyYgdGl0bGUpCisgICAgeworICAgICAgICByZXR1cm4gU2NyaXB0UHJvZmlsZXI6 OnN0b3BGb3JXb3JrZXJDb250ZXh0KG1fd29ya2VyQ29udGV4dCwgdGl0bGUpOworICAgIH0KKwor ICAgIFdvcmtlckNvbnRleHQqIG1fd29ya2VyQ29udGV4dDsKK307CisKK1Bhc3NPd25QdHI8SW5z cGVjdG9yUHJvZmlsZXJBZ2VudD4gSW5zcGVjdG9yUHJvZmlsZXJBZ2VudDo6Y3JlYXRlKEluc3Ry dW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIEluc3BlY3RvckNvbnNvbGVBZ2Vu dCogY29uc29sZUFnZW50LCBXb3JrZXJDb250ZXh0KiB3b3JrZXJDb250ZXh0LCBJbnNwZWN0b3JT dGF0ZSogaW5zcGVjdG9yU3RhdGUsIEluamVjdGVkU2NyaXB0TWFuYWdlciogaW5qZWN0ZWRTY3Jp cHRNYW5hZ2VyKQoreworICAgIHJldHVybiBhZG9wdFB0cihuZXcgV29ya2VyUHJvZmlsZXJBZ2Vu dChpbnN0cnVtZW50aW5nQWdlbnRzLCBjb25zb2xlQWdlbnQsIHdvcmtlckNvbnRleHQsIGluc3Bl Y3RvclN0YXRlLCBpbmplY3RlZFNjcmlwdE1hbmFnZXIpKTsKIH0KIAotSW5zcGVjdG9yUHJvZmls ZXJBZ2VudDo6SW5zcGVjdG9yUHJvZmlsZXJBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0 cnVtZW50aW5nQWdlbnRzLCBJbnNwZWN0b3JDb25zb2xlQWdlbnQqIGNvbnNvbGVBZ2VudCwgUGFn ZSogaW5zcGVjdGVkUGFnZSwgSW5zcGVjdG9yU3RhdGUqIGluc3BlY3RvclN0YXRlLCBJbmplY3Rl ZFNjcmlwdE1hbmFnZXIqIGluamVjdGVkU2NyaXB0TWFuYWdlcikKK0luc3BlY3RvclByb2ZpbGVy QWdlbnQ6Okluc3BlY3RvclByb2ZpbGVyQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1 bWVudGluZ0FnZW50cywgSW5zcGVjdG9yQ29uc29sZUFnZW50KiBjb25zb2xlQWdlbnQsIEluc3Bl Y3RvclN0YXRlKiBpbnNwZWN0b3JTdGF0ZSwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiBpbmplY3Rl ZFNjcmlwdE1hbmFnZXIpCiAgICAgOiBJbnNwZWN0b3JCYXNlQWdlbnQ8SW5zcGVjdG9yUHJvZmls ZXJBZ2VudD4oIlByb2ZpbGVyIiwgaW5zdHJ1bWVudGluZ0FnZW50cywgaW5zcGVjdG9yU3RhdGUp CiAgICAgLCBtX2NvbnNvbGVBZ2VudChjb25zb2xlQWdlbnQpCi0gICAgLCBtX2luc3BlY3RlZFBh Z2UoaW5zcGVjdGVkUGFnZSkKICAgICAsIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKGluamVjdGVk U2NyaXB0TWFuYWdlcikKICAgICAsIG1fZnJvbnRlbmQoMCkKICAgICAsIG1fZW5hYmxlZChmYWxz ZSkKQEAgLTMxOCwxMiArMzYwLDcgQEAgdm9pZCBJbnNwZWN0b3JQcm9maWxlckFnZW50OjpzdGFy dChFcnJvclN0cmluZyopCiAgICAgfQogICAgIG1fcmVjb3JkaW5nVXNlckluaXRpYXRlZFByb2Zp bGUgPSB0cnVlOwogICAgIFN0cmluZyB0aXRsZSA9IGdldEN1cnJlbnRVc2VySW5pdGlhdGVkUHJv ZmlsZU5hbWUodHJ1ZSk7Ci0jaWYgVVNFKEpTQykKLSAgICBKU0M6OkV4ZWNTdGF0ZSogc2NyaXB0 U3RhdGUgPSB0b0pTRE9NV2luZG93KG1faW5zcGVjdGVkUGFnZS0+bWFpbkZyYW1lKCksIGRlYnVn Z2VyV29ybGQoKSktPmdsb2JhbEV4ZWMoKTsKLSNlbHNlCi0gICAgU2NyaXB0U3RhdGUqIHNjcmlw dFN0YXRlID0gMDsKLSNlbmRpZgotICAgIFNjcmlwdFByb2ZpbGVyOjpzdGFydChzY3JpcHRTdGF0 ZSwgdGl0bGUpOworICAgIHN0YXJ0UHJvZmlsaW5nKHRpdGxlKTsKICAgICBhZGRTdGFydFByb2Zp bGluZ01lc3NhZ2VUb0NvbnNvbGUodGl0bGUsIDAsIFN0cmluZygpKTsKICAgICB0b2dnbGVSZWNv cmRCdXR0b24odHJ1ZSk7CiAgICAgbV9zdGF0ZS0+c2V0Qm9vbGVhbihQcm9maWxlckFnZW50U3Rh dGU6OnVzZXJJbml0aWF0ZWRQcm9maWxpbmcsIHRydWUpOwpAQCAtMzM1LDE0ICszNzIsNyBAQCB2 b2lkIEluc3BlY3RvclByb2ZpbGVyQWdlbnQ6OnN0b3AoRXJyb3JTdHJpbmcqKQogICAgICAgICBy ZXR1cm47CiAgICAgbV9yZWNvcmRpbmdVc2VySW5pdGlhdGVkUHJvZmlsZSA9IGZhbHNlOwogICAg IFN0cmluZyB0aXRsZSA9IGdldEN1cnJlbnRVc2VySW5pdGlhdGVkUHJvZmlsZU5hbWUoKTsKLSNp ZiBVU0UoSlNDKQotICAgIEpTQzo6RXhlY1N0YXRlKiBzY3JpcHRTdGF0ZSA9IHRvSlNET01XaW5k b3cobV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKSwgZGVidWdnZXJXb3JsZCgpKS0+Z2xvYmFs RXhlYygpOwotI2Vsc2UKLSAgICAvLyBVc2UgbnVsbCBzY3JpcHQgc3RhdGUgdG8gYXZvaWQgZmls dGVyaW5nIGJ5IGNvbnRleHQgc2VjdXJpdHkgdG9rZW4uCi0gICAgLy8gQWxsIGZ1bmN0aW9ucyBm cm9tIGFsbCBpZnJhbWVzIHNob3VsZCBiZSB2aXNpYmxlIGZyb20gSW5zcGVjdG9yIFVJLgotICAg IFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSA9IDA7Ci0jZW5kaWYKLSAgICBSZWZQdHI8U2NyaXB0 UHJvZmlsZT4gcHJvZmlsZSA9IFNjcmlwdFByb2ZpbGVyOjpzdG9wKHNjcmlwdFN0YXRlLCB0aXRs ZSk7CisgICAgUmVmUHRyPFNjcmlwdFByb2ZpbGU+IHByb2ZpbGUgPSBzdG9wUHJvZmlsaW5nKHRp dGxlKTsKICAgICBpZiAocHJvZmlsZSkKICAgICAgICAgYWRkUHJvZmlsZShwcm9maWxlLCAwLCBT dHJpbmcoKSk7CiAgICAgdG9nZ2xlUmVjb3JkQnV0dG9uKGZhbHNlKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQcm9maWxlckFnZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5oCmluZGV4IGE1NTc2ZDg5 OTkyZmM2YmUwODk3ZTZhYjRiMWZmOWIzMGI2ODJkZDQuLmM5NjQzODZmYjljNTQ1NTA0NzM2NDVi OTc4ZTUwOTE5MmE1OWM3YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JQcm9maWxlckFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclByb2ZpbGVyQWdlbnQuaApAQCAtNTIsNiArNTIsNyBAQCBjbGFzcyBJbnN0cnVtZW50 aW5nQWdlbnRzOwogY2xhc3MgUGFnZTsKIGNsYXNzIFNjcmlwdEhlYXBTbmFwc2hvdDsKIGNsYXNz IFNjcmlwdFByb2ZpbGU7CitjbGFzcyBXb3JrZXJDb250ZXh0OwogCiB0eXBlZGVmIFN0cmluZyBF cnJvclN0cmluZzsKIApAQCAtNTksNiArNjAsNyBAQCBjbGFzcyBJbnNwZWN0b3JQcm9maWxlckFn ZW50IDogcHVibGljIEluc3BlY3RvckJhc2VBZ2VudDxJbnNwZWN0b3JQcm9maWxlckFnZW50Pgog ICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEluc3BlY3RvclByb2ZpbGVyQWdlbnQpOyBXVEZfTUFL RV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc093blB0cjxJbnNwZWN0 b3JQcm9maWxlckFnZW50PiBjcmVhdGUoSW5zdHJ1bWVudGluZ0FnZW50cyosIEluc3BlY3RvckNv bnNvbGVBZ2VudCosIFBhZ2UqLCBJbnNwZWN0b3JTdGF0ZSosIEluamVjdGVkU2NyaXB0TWFuYWdl ciopOworICAgIHN0YXRpYyBQYXNzT3duUHRyPEluc3BlY3RvclByb2ZpbGVyQWdlbnQ+IGNyZWF0 ZShJbnN0cnVtZW50aW5nQWdlbnRzKiwgSW5zcGVjdG9yQ29uc29sZUFnZW50KiwgV29ya2VyQ29u dGV4dCosIEluc3BlY3RvclN0YXRlKiwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKik7CiAgICAgdmly dHVhbCB+SW5zcGVjdG9yUHJvZmlsZXJBZ2VudCgpOwogCiAgICAgdm9pZCBhZGRQcm9maWxlKFBh c3NSZWZQdHI8U2NyaXB0UHJvZmlsZT4gcHJwUHJvZmlsZSwgdW5zaWduZWQgbGluZU51bWJlciwg Y29uc3QgU3RyaW5nJiBzb3VyY2VVUkwpOwpAQCAtOTQsNiArOTYsMTEgQEAgcHVibGljOgogCiAg ICAgdmlydHVhbCB2b2lkIGdldE9iamVjdEJ5SGVhcE9iamVjdElkKEVycm9yU3RyaW5nKiwgaW50 IGlkLCBjb25zdCBTdHJpbmcqIG9iamVjdEdyb3VwLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiYg cmVzdWx0KTsKIAorcHJvdGVjdGVkOgorICAgIEluc3BlY3RvclByb2ZpbGVyQWdlbnQoSW5zdHJ1 bWVudGluZ0FnZW50cyosIEluc3BlY3RvckNvbnNvbGVBZ2VudCosIEluc3BlY3RvclN0YXRlKiwg SW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKik7CisgICAgdmlydHVhbCB2b2lkIHN0YXJ0UHJvZmlsaW5n KGNvbnN0IFN0cmluZyYgdGl0bGUpID0gMDsKKyAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8U2NyaXB0 UHJvZmlsZT4gc3RvcFByb2ZpbGluZyhjb25zdCBTdHJpbmcmIHRpdGxlKSA9IDA7CisKIHByaXZh dGU6CiAgICAgdHlwZWRlZiBIYXNoTWFwPHVuc2lnbmVkIGludCwgUmVmUHRyPFNjcmlwdFByb2Zp bGU+ID4gUHJvZmlsZXNNYXA7CiAgICAgdHlwZWRlZiBIYXNoTWFwPHVuc2lnbmVkIGludCwgUmVm UHRyPFNjcmlwdEhlYXBTbmFwc2hvdD4gPiBIZWFwU25hcHNob3RzTWFwOwpAQCAtMTAxLDEyICsx MDgsMTAgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlc2V0RnJvbnRlbmRQcm9maWxlcygpOwogICAg IHZvaWQgcmVzdG9yZUVuYWJsZW1lbnQoKTsKIAotICAgIEluc3BlY3RvclByb2ZpbGVyQWdlbnQo SW5zdHJ1bWVudGluZ0FnZW50cyosIEluc3BlY3RvckNvbnNvbGVBZ2VudCosIFBhZ2UqLCBJbnNw ZWN0b3JTdGF0ZSosIEluamVjdGVkU2NyaXB0TWFuYWdlciopOwogICAgIFBhc3NSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiBjcmVhdGVQcm9maWxlSGVhZGVyKGNvbnN0IFNjcmlwdFByb2ZpbGUmIHBy b2ZpbGUpOwogICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBjcmVhdGVTbmFwc2hvdEhl YWRlcihjb25zdCBTY3JpcHRIZWFwU25hcHNob3QmIHNuYXBzaG90KTsKIAogICAgIEluc3BlY3Rv ckNvbnNvbGVBZ2VudCogbV9jb25zb2xlQWdlbnQ7Ci0gICAgUGFnZSogbV9pbnNwZWN0ZWRQYWdl OwogICAgIEluamVjdGVkU2NyaXB0TWFuYWdlciogbV9pbmplY3RlZFNjcmlwdE1hbmFnZXI7CiAg ICAgSW5zcGVjdG9yRnJvbnRlbmQ6OlByb2ZpbGVyKiBtX2Zyb250ZW5kOwogICAgIGJvb2wgbV9l bmFibGVkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dvcmtlckluc3Bl Y3RvckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dvcmtlckluc3Bl Y3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IDc5ZGIzNWYyOTFiYjAxMDAzYTQyOTQ5M2NkZTRkMDhj NWFiNjEzNDcuLjIxOWQzOWRlNDEzZWZhNzYyZGMzMTAxYjIyYTkxNTI2OWM0ZWY0MTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV29ya2VySW5zcGVjdG9yQ29udHJv bGxlci5jcHAKQEAgLTQxLDYgKzQxLDcgQEAKICNpbmNsdWRlICJJbnNwZWN0b3JDb25zb2xlQWdl bnQuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JGcm9udGVuZC5oIgogI2luY2x1ZGUgIkluc3BlY3Rv ckZyb250ZW5kQ2hhbm5lbC5oIgorI2luY2x1ZGUgIkluc3BlY3RvclByb2ZpbGVyQWdlbnQuaCIK ICNpbmNsdWRlICJJbnNwZWN0b3JTdGF0ZS5oIgogI2luY2x1ZGUgIkluc3BlY3RvclN0YXRlQ2xp ZW50LmgiCiAjaW5jbHVkZSAiSW5zdHJ1bWVudGluZ0FnZW50cy5oIgpAQCAtOTMsMTEgKzk0LDEz IEBAIFdvcmtlckluc3BlY3RvckNvbnRyb2xsZXI6Oldvcmtlckluc3BlY3RvckNvbnRyb2xsZXIo V29ya2VyQ29udGV4dCogd29ya2VyQ29udGV4CiAgICAgLCBtX2luamVjdGVkU2NyaXB0TWFuYWdl cihJbmplY3RlZFNjcmlwdE1hbmFnZXI6OmNyZWF0ZUZvcldvcmtlcigpKQogewogCisgICAgbV9y dW50aW1lQWdlbnQgPSBXb3JrZXJSdW50aW1lQWdlbnQ6OmNyZWF0ZShtX2luc3RydW1lbnRpbmdB Z2VudHMuZ2V0KCksIG1fc3RhdGUuZ2V0KCksIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmdldCgp LCB3b3JrZXJDb250ZXh0KTsKKyAgICBtX2NvbnNvbGVBZ2VudCA9IFdvcmtlckNvbnNvbGVBZ2Vu dDo6Y3JlYXRlKG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSwgbV9zdGF0ZS5nZXQoKSwgbV9p bmplY3RlZFNjcmlwdE1hbmFnZXIuZ2V0KCkpOworCiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVC VUdHRVIpCiAgICAgbV9kZWJ1Z2dlckFnZW50ID0gV29ya2VyRGVidWdnZXJBZ2VudDo6Y3JlYXRl KG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSwgbV9zdGF0ZS5nZXQoKSwgd29ya2VyQ29udGV4 dCwgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXIuZ2V0KCkpOworICAgIG1fcHJvZmlsZXJBZ2VudCA9 IEluc3BlY3RvclByb2ZpbGVyQWdlbnQ6OmNyZWF0ZShtX2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0 KCksIG1fY29uc29sZUFnZW50LmdldCgpLCB3b3JrZXJDb250ZXh0LCBtX3N0YXRlLmdldCgpLCBt X2luamVjdGVkU2NyaXB0TWFuYWdlci5nZXQoKSk7CiAjZW5kaWYKLSAgICBtX3J1bnRpbWVBZ2Vu dCA9IFdvcmtlclJ1bnRpbWVBZ2VudDo6Y3JlYXRlKG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQo KSwgbV9zdGF0ZS5nZXQoKSwgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXIuZ2V0KCksIHdvcmtlckNv bnRleHQpOwotICAgIG1fY29uc29sZUFnZW50ID0gV29ya2VyQ29uc29sZUFnZW50OjpjcmVhdGUo bV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpLCBtX3N0YXRlLmdldCgpLCBtX2luamVjdGVkU2Ny aXB0TWFuYWdlci5nZXQoKSk7CiAKICAgICBtX2luamVjdGVkU2NyaXB0TWFuYWdlci0+aW5qZWN0 ZWRTY3JpcHRIb3N0KCktPmluaXQoMAogICAgICAgICAsIDAKQEAgLTEyNywxMSArMTMwLDEzIEBA IHZvaWQgV29ya2VySW5zcGVjdG9yQ29udHJvbGxlcjo6Y29ubmVjdEZyb250ZW5kKCkKICAgICBt X2NvbnNvbGVBZ2VudC0+cmVnaXN0ZXJJbkRpc3BhdGNoZXIobV9iYWNrZW5kRGlzcGF0Y2hlci5n ZXQoKSk7CiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCiAgICAgbV9kZWJ1Z2dlckFn ZW50LT5yZWdpc3RlckluRGlzcGF0Y2hlcihtX2JhY2tlbmREaXNwYXRjaGVyLmdldCgpKTsKKyAg ICBtX3Byb2ZpbGVyQWdlbnQtPnJlZ2lzdGVySW5EaXNwYXRjaGVyKG1fYmFja2VuZERpc3BhdGNo ZXIuZ2V0KCkpOwogI2VuZGlmCiAgICAgbV9ydW50aW1lQWdlbnQtPnJlZ2lzdGVySW5EaXNwYXRj aGVyKG1fYmFja2VuZERpc3BhdGNoZXIuZ2V0KCkpOwogCiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRf REVCVUdHRVIpCiAgICAgbV9kZWJ1Z2dlckFnZW50LT5zZXRGcm9udGVuZChtX2Zyb250ZW5kLmdl dCgpKTsKKyAgICBtX3Byb2ZpbGVyQWdlbnQtPnNldEZyb250ZW5kKG1fZnJvbnRlbmQuZ2V0KCkp OwogI2VuZGlmCiAgICAgbV9jb25zb2xlQWdlbnQtPnNldEZyb250ZW5kKG1fZnJvbnRlbmQuZ2V0 KCkpOwogfQpAQCAtMTQ3LDYgKzE1Miw3IEBAIHZvaWQgV29ya2VySW5zcGVjdG9yQ29udHJvbGxl cjo6ZGlzY29ubmVjdEZyb250ZW5kKCkKICAgICBtX3N0YXRlLT5tdXRlKCk7CiAjaWYgRU5BQkxF KEpBVkFTQ1JJUFRfREVCVUdHRVIpCiAgICAgbV9kZWJ1Z2dlckFnZW50LT5jbGVhckZyb250ZW5k KCk7CisgICAgbV9wcm9maWxlckFnZW50LT5jbGVhckZyb250ZW5kKCk7CiAjZW5kaWYKICAgICBt X2NvbnNvbGVBZ2VudC0+Y2xlYXJGcm9udGVuZCgpOwogCkBAIC0xNjIsNiArMTY4LDcgQEAgdm9p ZCBXb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyOjpyZXN0b3JlSW5zcGVjdG9yU3RhdGVGcm9tQ29v a2llKGNvbnN0IFN0cmluZyYgaW4KIAogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQog ICAgIG1fZGVidWdnZXJBZ2VudC0+cmVzdG9yZSgpOworICAgIG1fcHJvZmlsZXJBZ2VudC0+cmVz dG9yZSgpOwogI2VuZGlmCiAgICAgbV9jb25zb2xlQWdlbnQtPnJlc3RvcmUoKTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVy LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV29ya2VySW5zcGVjdG9yQ29udHJvbGxlci5o CmluZGV4IDRhNGQ0YTk4ZTUxNDc5N2RhZjFkM2ZiOGMzZGFhMWIxZWEyMWFkYWEuLjYzNzAxNzA2 Y2Y2NDAyZDQ2ODUyNTkyMTAzMmMxMTE3YzM4YWQwOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL1dvcmtlckluc3BlY3RvckNvbnRyb2xsZXIuaApAQCAtNTEsNiArNTEs NyBAQCBjbGFzcyBJbnNwZWN0b3JGcm9udGVuZDsKIGNsYXNzIEluc3BlY3RvckZyb250ZW5kQ2hh bm5lbDsKIGNsYXNzIEluc3BlY3RvckNvbnNvbGVBZ2VudDsKIGNsYXNzIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjsKK2NsYXNzIEluc3BlY3RvclByb2ZpbGVyQWdlbnQ7CiBjbGFzcyBJbnNwZWN0 b3JSdW50aW1lQWdlbnQ7CiBjbGFzcyBJbnNwZWN0b3JTdGF0ZTsKIGNsYXNzIEluc3BlY3RvclN0 YXRlQ2xpZW50OwpAQCAtODMsNiArODQsNyBAQCBwcml2YXRlOgogICAgIE93blB0cjxJbmplY3Rl ZFNjcmlwdE1hbmFnZXI+IG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOwogI2lmIEVOQUJMRShKQVZB U0NSSVBUX0RFQlVHR0VSKQogICAgIE93blB0cjxJbnNwZWN0b3JEZWJ1Z2dlckFnZW50PiBtX2Rl YnVnZ2VyQWdlbnQ7CisgICAgT3duUHRyPEluc3BlY3RvclByb2ZpbGVyQWdlbnQ+IG1fcHJvZmls ZXJBZ2VudDsKICNlbmRpZgogICAgIE93blB0cjxJbnNwZWN0b3JSdW50aW1lQWdlbnQ+IG1fcnVu dGltZUFnZW50OwogICAgIE93blB0cjxJbnNwZWN0b3JDb25zb2xlQWdlbnQ+IG1fY29uc29sZUFn ZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9m aWxlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxl c1BhbmVsLmpzCmluZGV4IDM3MjVlNWRmMDE3MjY2M2E1YmJhZTNjZTA4NTcwYjVmNDgyMzUzZDAu LjNiMTU1YTViODYwNDk5OTYxMWE1NWJmYzc2ZDQxNjliZDBjMTYzMDYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKQEAgLTE0 Miw3ICsxNDIsOCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbCA9IGZ1bmN0aW9uKCkKICAg ICB0aGlzLl9sYXVuY2hlclZpZXcuc2V0VXBFdmVudExpc3RlbmVycygpOwogCiAgICAgdGhpcy5f cmVnaXN0ZXJQcm9maWxlVHlwZShuZXcgV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVUeXBlKCkpOwot ICAgIHRoaXMuX3JlZ2lzdGVyUHJvZmlsZVR5cGUobmV3IFdlYkluc3BlY3Rvci5DU1NTZWxlY3Rv clByb2ZpbGVUeXBlKCkpOworICAgIGlmICghV2ViSW5zcGVjdG9yLldvcmtlck1hbmFnZXIuaXNX b3JrZXJGcm9udGVuZCgpKQorICAgICAgICB0aGlzLl9yZWdpc3RlclByb2ZpbGVUeXBlKG5ldyBX ZWJJbnNwZWN0b3IuQ1NTU2VsZWN0b3JQcm9maWxlVHlwZSgpKTsKICAgICBpZiAoQ2FwYWJpbGl0 aWVzLmhlYXBQcm9maWxlclByZXNlbnQpCiAgICAgICAgIHRoaXMuX3JlZ2lzdGVyUHJvZmlsZVR5 cGUobmV3IFdlYkluc3BlY3Rvci5EZXRhaWxlZEhlYXBzaG90UHJvZmlsZVR5cGUoKSk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXgg MmE3MGYzZDMwMDBhZTc5MzljNzY4OWU0MzIyZmNjNDc5ZDQ0MDQwNC4uMzdiMWYwYzljZThhM2I2 NDQxZTgzNmFhNmQ1NWRhYzcyMmM5MDIwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTM5LDYgKzM5LDcgQEAgdmFyIFdlYkluc3Bl Y3RvciA9IHsKIAogICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLldvcmtlck1hbmFnZXIuaXNXb3Jr ZXJGcm9udGVuZCgpKSB7CiAgICAgICAgICAgICB0aGlzLnBhbmVscy5zY3JpcHRzID0gbmV3IFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwodGhpcy5kZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsKTsK KyAgICAgICAgICAgIHRoaXMucGFuZWxzLnByb2ZpbGVzID0gbmV3IFdlYkluc3BlY3Rvci5Qcm9m aWxlc1BhbmVsKCk7CiAgICAgICAgICAgICB0aGlzLnBhbmVscy5jb25zb2xlID0gbmV3IFdlYklu c3BlY3Rvci5Db25zb2xlUGFuZWwoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQo=