121440 2013-09-16 09:47:17 -0700 Web Inspector: Hit InspectorTypeBuilder enums with a less ugly stick 2013-09-16 11:20:02 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 929769 0 timothy 2013-09-16 09:47:17 -0700 Enums for C++ are currently like this: struct StyleSheetOrigin { enum Enum { User = 51, User_agent = 52, Inspector = 53, Regular = 54, }; }; // struct StyleSheetOrigin They should be like this: struct StyleSheetOrigin { enum Enum { User = 51, UserAgent = 52, Inspector = 53, Regular = 54, }; }; // struct StyleSheetOrigin 929770 1 webkit-bug-importer 2013-09-16 09:47:50 -0700 <rdar://problem/14999581> 929773 2 211805 timothy 2013-09-16 09:50:22 -0700 Created attachment 211805 Patch 929825 3 211805 commit-queue 2013-09-16 11:20:00 -0700 Comment on attachment 211805 Patch Clearing flags on attachment: 211805 Committed r155886: <http://trac.webkit.org/changeset/155886> 929826 4 commit-queue 2013-09-16 11:20:02 -0700 All reviewed patches have been landed. Closing bug. 211805 2013-09-16 09:50:22 -0700 2013-09-16 11:20:00 -0700 Patch bug-121440-20130916095028.patch text/plain 11296 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1NzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTMxMTIyNWJhOTFkZTgw MGQ5MGI3MmZmYjE4NDRiNGQ4MzAzN2ZjZC4uMTFiZDA4MzA0OGJmM2Y2OThjODE0MjRmNzVmNGZk MDBmMjM4NGU3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTA5LTE2ICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIEluc3BlY3Rv clR5cGVCdWlsZGVyIGdlbmVyYXRlIGJldHRlciBlbnVtcyBpbiBDKysuCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTQ0MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0NvZGVHZW5l cmF0b3JJbnNwZWN0b3IucHk6CisgICAgICAgIChmaXhfY2FtZWxfY2FzZSk6IEFkZCBtb3JlIGFi YnJpdmF0aW9ucy4KKyAgICAgICAgKFR5cGVCaW5kaW5ncy5jcmVhdGVfdHlwZV9kZWNsYXJhdGlv bl8uRW51bUJpbmRpbmcuZ2V0X2NvZGVfZ2VuZXJhdG9yLkNvZGVHZW5lcmF0b3IuZ2VuZXJhdGVf dHlwZV9idWlsZGVyKTogVXNlIGZpeF9jYW1lbF9jYXNlCisgICAgICAgICogaW5zcGVjdG9yL0Nv bnNvbGVNZXNzYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1lc3NhZ2VTb3VyY2VWYWx1ZSk6 CisgICAgICAgIChXZWJDb3JlOjptZXNzYWdlVHlwZVZhbHVlKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NT QWdlbnQ6OmRldGVjdE9yaWdpbik6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRp bWVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSdW50aW1lQWdlbnQ6OnBh cnNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JTdHlsZVNoZWV0OjpyZXNvdXJjZVN0eWxlU2hlZXRUZXh0 KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5oOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yU3R5bGVTaGVldDo6Y2FuQmluZCk6CisKIDIwMTMtMDktMTQgIERh cmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFNocmluayB0aGUgbmFtZVRv UHNldWRvVHlwZU1hcCBmdW5jdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXggNWVkZjcx YjQ1YzMwMWNmZjY0ZjBkOGRlNDcyMmY0OGFkYjllYzAwNC4uYzcyZjQ1Mzk4MDg1NTBiZDM5NmY0 Mzc1NTc3ZWEzOTgyNGY2YWQyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTMgQEAKKzIwMTMtMDktMTYgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgor CisgICAgICAgIE1ha2UgSW5zcGVjdG9yVHlwZUJ1aWxkZXIgZ2VuZXJhdGUgYmV0dGVyIGVudW1z IGluIEMrKy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIxNDQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qczogVXBkYXRlZCB0 byBtYWtlIENzcyBiZSBDU1MuCisKIDIwMTMtMDktMTMgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAg PGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY29tPgogCiAgICAgICAgIFtHVEtdIE1vdmUgdG8g dGhlIG5ldyB3ZWIgaW5zcGVjdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9D b2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CmluZGV4IDE4NjIzYzI4ZmY1YzA4YTBjOGY1NWI2ZGMx NDNiZDQ4YjY2NTRmZDYuLjhjMTFiM2FkM2MwYzMyMmQ2OWM2MWJmYTQxNzJjMWE5NjkwYTRkNDcg MTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVj dG9yLnB5CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVj dG9yLnB5CkBAIC0xMTEsNyArMTExLDcgQEAgZGVmIGRhc2hfdG9fY2FtZWxjYXNlKHdvcmQpOgog ZGVmIGZpeF9jYW1lbF9jYXNlKG5hbWUpOgogICAgIHJlZmluZWQgPSByZS5zdWIocictKFx3KScs IGxhbWJkYSBwYXQ6IHBhdC5ncm91cCgxKS51cHBlcigpLCBuYW1lKQogICAgIHJlZmluZWQgPSB0 b190aXRsZV9jYXNlKHJlZmluZWQpCi0gICAgcmV0dXJuIHJlLnN1YihyJyg/aSlIVE1MfFhNTHxX TUx8QVBJJywgbGFtYmRhIHBhdDogcGF0Lmdyb3VwKDApLnVwcGVyKCksIHJlZmluZWQpCisgICAg cmV0dXJuIHJlLnN1YihyJyg/aSlIVE1MfFhNTHxXTUx8QVBJfEdDfFhIUnxET018Q1NTJywgbGFt YmRhIHBhdDogcGF0Lmdyb3VwKDApLnVwcGVyKCksIHJlZmluZWQpCiAKIAogZGVmIHRvX3RpdGxl X2Nhc2UobmFtZSk6CkBAIC05MTYsOCArOTE2LDcgQEAgY2xhc3MgVHlwZUJpbmRpbmdzOgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmb3IgZW51bV9pdGVtIGluIGVudW06CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnVtX3BvcyA9IEVudW1Db25zdGFudHMu YWRkX2NvbnN0YW50KGVudW1faXRlbSkKIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaXRlbV9jX25hbWUgPSBlbnVtX2l0ZW0ucmVwbGFjZSgnLScsICdfJykKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGl0ZW1fY19uYW1lID0gQ2FwaXRhbGl6ZXIubG93 ZXJfY2FtZWxfY2FzZV90b191cHBlcihpdGVtX2NfbmFtZSkKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGl0ZW1fY19uYW1lID0gZml4X2NhbWVsX2Nhc2UoZW51bV9pdGVtKQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgaXRlbV9jX25hbWUgaW4gVFlQ RV9OQU1FX0ZJWF9NQVA6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg aXRlbV9jX25hbWUgPSBUWVBFX05BTUVfRklYX01BUFtpdGVtX2NfbmFtZV0KICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHdyaXRlci5uZXdsaW5lKCIgICAgICAgICIpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcAppbmRleCBiNDYyOTc2YTJk NThjZTY1MjFjZjZiNjUxMzk1MDkyMDE1YjhmZDBkLi4zYTIzY2ZhZmI1MzIwNTc4MmFlYzUzYzcz YzdlODU2MWRlYjMwOGVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29u c29sZU1lc3NhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db25zb2xlTWVz c2FnZS5jcHAKQEAgLTE0MywxNCArMTQzLDE0IEBAIHZvaWQgQ29uc29sZU1lc3NhZ2U6OmF1dG9n ZW5lcmF0ZU1ldGFkYXRhKGJvb2wgY2FuR2VuZXJhdGVDYWxsU3RhY2ssIEpTQzo6RXhlY1N0CiBz dGF0aWMgVHlwZUJ1aWxkZXI6OkNvbnNvbGU6OkNvbnNvbGVNZXNzYWdlOjpTb3VyY2U6OkVudW0g bWVzc2FnZVNvdXJjZVZhbHVlKE1lc3NhZ2VTb3VyY2Ugc291cmNlKQogewogICAgIHN3aXRjaCAo c291cmNlKSB7Ci0gICAgY2FzZSBYTUxNZXNzYWdlU291cmNlOiByZXR1cm4gVHlwZUJ1aWxkZXI6 OkNvbnNvbGU6OkNvbnNvbGVNZXNzYWdlOjpTb3VyY2U6OlhtbDsKKyAgICBjYXNlIFhNTE1lc3Nh Z2VTb3VyY2U6IHJldHVybiBUeXBlQnVpbGRlcjo6Q29uc29sZTo6Q29uc29sZU1lc3NhZ2U6OlNv dXJjZTo6WE1MOwogICAgIGNhc2UgSlNNZXNzYWdlU291cmNlOiByZXR1cm4gVHlwZUJ1aWxkZXI6 OkNvbnNvbGU6OkNvbnNvbGVNZXNzYWdlOjpTb3VyY2U6OkphdmFzY3JpcHQ7CiAgICAgY2FzZSBO ZXR3b3JrTWVzc2FnZVNvdXJjZTogcmV0dXJuIFR5cGVCdWlsZGVyOjpDb25zb2xlOjpDb25zb2xl TWVzc2FnZTo6U291cmNlOjpOZXR3b3JrOwotICAgIGNhc2UgQ29uc29sZUFQSU1lc3NhZ2VTb3Vy Y2U6IHJldHVybiBUeXBlQnVpbGRlcjo6Q29uc29sZTo6Q29uc29sZU1lc3NhZ2U6OlNvdXJjZTo6 Q29uc29sZV9hcGk7CisgICAgY2FzZSBDb25zb2xlQVBJTWVzc2FnZVNvdXJjZTogcmV0dXJuIFR5 cGVCdWlsZGVyOjpDb25zb2xlOjpDb25zb2xlTWVzc2FnZTo6U291cmNlOjpDb25zb2xlQVBJOwog ICAgIGNhc2UgU3RvcmFnZU1lc3NhZ2VTb3VyY2U6IHJldHVybiBUeXBlQnVpbGRlcjo6Q29uc29s ZTo6Q29uc29sZU1lc3NhZ2U6OlNvdXJjZTo6U3RvcmFnZTsKICAgICBjYXNlIEFwcENhY2hlTWVz c2FnZVNvdXJjZTogcmV0dXJuIFR5cGVCdWlsZGVyOjpDb25zb2xlOjpDb25zb2xlTWVzc2FnZTo6 U291cmNlOjpBcHBjYWNoZTsKICAgICBjYXNlIFJlbmRlcmluZ01lc3NhZ2VTb3VyY2U6IHJldHVy biBUeXBlQnVpbGRlcjo6Q29uc29sZTo6Q29uc29sZU1lc3NhZ2U6OlNvdXJjZTo6UmVuZGVyaW5n OwotICAgIGNhc2UgQ1NTTWVzc2FnZVNvdXJjZTogcmV0dXJuIFR5cGVCdWlsZGVyOjpDb25zb2xl OjpDb25zb2xlTWVzc2FnZTo6U291cmNlOjpDc3M7CisgICAgY2FzZSBDU1NNZXNzYWdlU291cmNl OiByZXR1cm4gVHlwZUJ1aWxkZXI6OkNvbnNvbGU6OkNvbnNvbGVNZXNzYWdlOjpTb3VyY2U6OkNT UzsKICAgICBjYXNlIFNlY3VyaXR5TWVzc2FnZVNvdXJjZTogcmV0dXJuIFR5cGVCdWlsZGVyOjpD b25zb2xlOjpDb25zb2xlTWVzc2FnZTo6U291cmNlOjpTZWN1cml0eTsKICAgICBjYXNlIE90aGVy TWVzc2FnZVNvdXJjZTogcmV0dXJuIFR5cGVCdWlsZGVyOjpDb25zb2xlOjpDb25zb2xlTWVzc2Fn ZTo6U291cmNlOjpPdGhlcjsKICAgICB9CkBAIC0xNjMsNyArMTYzLDcgQEAgc3RhdGljIFR5cGVC dWlsZGVyOjpDb25zb2xlOjpDb25zb2xlTWVzc2FnZTo6VHlwZTo6RW51bSBtZXNzYWdlVHlwZVZh bHVlKE1lc3NhZ2UKICAgICBjYXNlIExvZ01lc3NhZ2VUeXBlOiByZXR1cm4gVHlwZUJ1aWxkZXI6 OkNvbnNvbGU6OkNvbnNvbGVNZXNzYWdlOjpUeXBlOjpMb2c7CiAgICAgY2FzZSBDbGVhck1lc3Nh Z2VUeXBlOiByZXR1cm4gVHlwZUJ1aWxkZXI6OkNvbnNvbGU6OkNvbnNvbGVNZXNzYWdlOjpUeXBl OjpDbGVhcjsKICAgICBjYXNlIERpck1lc3NhZ2VUeXBlOiByZXR1cm4gVHlwZUJ1aWxkZXI6OkNv bnNvbGU6OkNvbnNvbGVNZXNzYWdlOjpUeXBlOjpEaXI7Ci0gICAgY2FzZSBEaXJYTUxNZXNzYWdl VHlwZTogcmV0dXJuIFR5cGVCdWlsZGVyOjpDb25zb2xlOjpDb25zb2xlTWVzc2FnZTo6VHlwZTo6 RGlyeG1sOworICAgIGNhc2UgRGlyWE1MTWVzc2FnZVR5cGU6IHJldHVybiBUeXBlQnVpbGRlcjo6 Q29uc29sZTo6Q29uc29sZU1lc3NhZ2U6OlR5cGU6OkRpclhNTDsKICAgICBjYXNlIFRhYmxlTWVz c2FnZVR5cGU6IHJldHVybiBUeXBlQnVpbGRlcjo6Q29uc29sZTo6Q29uc29sZU1lc3NhZ2U6OlR5 cGU6OlRhYmxlOwogICAgIGNhc2UgVHJhY2VNZXNzYWdlVHlwZTogcmV0dXJuIFR5cGVCdWlsZGVy OjpDb25zb2xlOjpDb25zb2xlTWVzc2FnZTo6VHlwZTo6VHJhY2U7CiAgICAgY2FzZSBTdGFydEdy b3VwTWVzc2FnZVR5cGU6IHJldHVybiBUeXBlQnVpbGRlcjo6Q29uc29sZTo6Q29uc29sZU1lc3Nh Z2U6OlR5cGU6OlN0YXJ0R3JvdXA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNTU0FnZW50LmNwcAppbmRleCBiNzk4NTE3NWJjMjVmYTIwNWFmM2Y3MWQ1Y2I1YTM0YzZj ODJiYzU2Li4wOGFiMzkyMzljZTBhNzEzYTVlMmJiYWU5NmFjN2I0ZTEzMmExZWQxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKQEAgLTEyNTcs NyArMTI1Nyw3IEBAIFR5cGVCdWlsZGVyOjpDU1M6OlN0eWxlU2hlZXRPcmlnaW46OkVudW0gSW5z cGVjdG9yQ1NTQWdlbnQ6OmRldGVjdE9yaWdpbihDU1NTdHlsCiB7CiAgICAgVHlwZUJ1aWxkZXI6 OkNTUzo6U3R5bGVTaGVldE9yaWdpbjo6RW51bSBvcmlnaW4gPSBUeXBlQnVpbGRlcjo6Q1NTOjpT dHlsZVNoZWV0T3JpZ2luOjpSZWd1bGFyOwogICAgIGlmIChwYWdlU3R5bGVTaGVldCAmJiAhcGFn ZVN0eWxlU2hlZXQtPm93bmVyTm9kZSgpICYmIHBhZ2VTdHlsZVNoZWV0LT5ocmVmKCkuaXNFbXB0 eSgpKQotICAgICAgICBvcmlnaW4gPSBUeXBlQnVpbGRlcjo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2lu OjpVc2VyX2FnZW50OworICAgICAgICBvcmlnaW4gPSBUeXBlQnVpbGRlcjo6Q1NTOjpTdHlsZVNo ZWV0T3JpZ2luOjpVc2VyQWdlbnQ7CiAgICAgZWxzZSBpZiAocGFnZVN0eWxlU2hlZXQgJiYgcGFn ZVN0eWxlU2hlZXQtPm93bmVyTm9kZSgpICYmIHBhZ2VTdHlsZVNoZWV0LT5vd25lck5vZGUoKS0+ bm9kZU5hbWUoKSA9PSAiI2RvY3VtZW50IikKICAgICAgICAgb3JpZ2luID0gVHlwZUJ1aWxkZXI6 OkNTUzo6U3R5bGVTaGVldE9yaWdpbjo6VXNlcjsKICAgICBlbHNlIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKaW5kZXggODBjYTgx ZTY3M2RiZTg5ODE2MGY4YTc2ZGIwODRkYWY4YWY3MzVkMC4uYjYwYjRmYzczYWM1M2VlZTE5MDIw NmNkMDA5MmZlZmZmMjRhODVmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKQEAgLTEwNiw3ICsxMDYsNyBAQCB2b2lkIEluc3Bl Y3RvclJ1bnRpbWVBZ2VudDo6cGFyc2UoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIGV4cHJl c3Npb24sIFR5cGVCdQogICAgICAgICAqcmVzdWx0ID0gVHlwZUJ1aWxkZXI6OlJ1bnRpbWU6OlN5 bnRheEVycm9yVHlwZTo6SXJyZWNvdmVyYWJsZTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBQ YXJzZXJFcnJvcjo6U3ludGF4RXJyb3JVbnRlcm1pbmF0ZWRMaXRlcmFsOgotICAgICAgICAqcmVz dWx0ID0gVHlwZUJ1aWxkZXI6OlJ1bnRpbWU6OlN5bnRheEVycm9yVHlwZTo6VW50ZXJtaW5hdGVk X2xpdGVyYWw7CisgICAgICAgICpyZXN1bHQgPSBUeXBlQnVpbGRlcjo6UnVudGltZTo6U3ludGF4 RXJyb3JUeXBlOjpVbnRlcm1pbmF0ZWRMaXRlcmFsOwogICAgICAgICBicmVhazsKICAgICBjYXNl IFBhcnNlckVycm9yOjpTeW50YXhFcnJvclJlY292ZXJhYmxlOgogICAgICAgICAqcmVzdWx0ID0g VHlwZUJ1aWxkZXI6OlJ1bnRpbWU6OlN5bnRheEVycm9yVHlwZTo6UmVjb3ZlcmFibGU7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAKaW5kZXgg MTllMmY3YWY3YjM3ZGNhNWIyYjExOTcyZTE4ODE1MGRhMjViMGQ4MC4uMzlmY2ZiYTYwY2QwYWIz NGEzOTk1NzZhYmNiNzgzNWVkNDI5OWQyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcApAQCAtMTM3NCw3ICsxMzc0LDcgQEAgYm9vbCBJ bnNwZWN0b3JTdHlsZVNoZWV0OjpvcmlnaW5hbFN0eWxlU2hlZXRUZXh0KFN0cmluZyogcmVzdWx0 KSBjb25zdAogCiBib29sIEluc3BlY3RvclN0eWxlU2hlZXQ6OnJlc291cmNlU3R5bGVTaGVldFRl eHQoU3RyaW5nKiByZXN1bHQpIGNvbnN0CiB7Ci0gICAgaWYgKG1fb3JpZ2luID09IFR5cGVCdWls ZGVyOjpDU1M6OlN0eWxlU2hlZXRPcmlnaW46OlVzZXIgfHwgbV9vcmlnaW4gPT0gVHlwZUJ1aWxk ZXI6OkNTUzo6U3R5bGVTaGVldE9yaWdpbjo6VXNlcl9hZ2VudCkKKyAgICBpZiAobV9vcmlnaW4g PT0gVHlwZUJ1aWxkZXI6OkNTUzo6U3R5bGVTaGVldE9yaWdpbjo6VXNlciB8fCBtX29yaWdpbiA9 PSBUeXBlQnVpbGRlcjo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2luOjpVc2VyQWdlbnQpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgIGlmICghbV9wYWdlU3R5bGVTaGVldCB8fCAhb3duZXJEb2N1 bWVudCgpIHx8ICFvd25lckRvY3VtZW50KCktPmZyYW1lKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5oIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuaAppbmRleCA5YjhhODMwYzRjMWU1OGI1MGEz ZWQzZWQ5MGEyMmM3YTAzM2MyZDgxLi4xOGFmZGUzYWM4ZTljYTRlODY3YzY1YmVhN2JiMWIxZGVk MTYxNGVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5 bGVTaGVldC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNo ZWV0LmgKQEAgLTIxNSw3ICsyMTUsNyBAQCBwdWJsaWM6CiBwcm90ZWN0ZWQ6CiAgICAgSW5zcGVj dG9yU3R5bGVTaGVldChJbnNwZWN0b3JQYWdlQWdlbnQqLCBjb25zdCBTdHJpbmcmIGlkLCBQYXNz UmVmUHRyPENTU1N0eWxlU2hlZXQ+IHBhZ2VTdHlsZVNoZWV0LCBUeXBlQnVpbGRlcjo6Q1NTOjpT dHlsZVNoZWV0T3JpZ2luOjpFbnVtLCBjb25zdCBTdHJpbmcmIGRvY3VtZW50VVJMLCBMaXN0ZW5l ciopOwogCi0gICAgYm9vbCBjYW5CaW5kKCkgY29uc3QgeyByZXR1cm4gbV9vcmlnaW4gIT0gVHlw ZUJ1aWxkZXI6OkNTUzo6U3R5bGVTaGVldE9yaWdpbjo6VXNlcl9hZ2VudCAmJiBtX29yaWdpbiAh PSBUeXBlQnVpbGRlcjo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2luOjpVc2VyOyB9CisgICAgYm9vbCBj YW5CaW5kKCkgY29uc3QgeyByZXR1cm4gbV9vcmlnaW4gIT0gVHlwZUJ1aWxkZXI6OkNTUzo6U3R5 bGVTaGVldE9yaWdpbjo6VXNlckFnZW50ICYmIG1fb3JpZ2luICE9IFR5cGVCdWlsZGVyOjpDU1M6 OlN0eWxlU2hlZXRPcmlnaW46OlVzZXI7IH0KICAgICBJbnNwZWN0b3JDU1NJZCBydWxlT3JTdHls ZUlkKENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlKSBjb25zdDsKICAgICB2aXJ0dWFsIERvY3Vt ZW50KiBvd25lckRvY3VtZW50KCkgY29uc3Q7CiAgICAgdmlydHVhbCBSZWZQdHI8Q1NTUnVsZVNv dXJjZURhdGE+IHJ1bGVTb3VyY2VEYXRhRm9yKENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlKSBj b25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0lu c3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcwppbmRleCAxNzJhZjNhMWFlNGJjZDc5 OWMxOTYwYjMwNjQ0NTlmYWFjMTQ2MGYyLi4wZjdkYjRhMmQzOGYyNDU1MGYyMjk3ODk0NWQ1MGMy NmFjZDA2MjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCkBAIC05MCw3ICs5MCw3 IEBAIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDb21tYW5kKCJSdW50aW1lLmRpc2FibGUiLCBb XSwgW10pOwogCiAvLyBDb25zb2xlLgogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbnNvbGVE aXNwYXRjaGVyID0gSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIuYmlu ZChJbnNwZWN0b3JCYWNrZW5kLCAiQ29uc29sZSIpOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rl ckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VTb3VyY2UiLCB7WE1MOiAieG1sIiwgSmF2YXNj cmlwdDogImphdmFzY3JpcHQiLCBOZXR3b3JrOiAibmV0d29yayIsIENvbnNvbGVBUEk6ICJjb25z b2xlLWFwaSIsIFN0b3JhZ2U6ICJzdG9yYWdlIiwgQXBwY2FjaGU6ICJhcHBjYWNoZSIsIFJlbmRl cmluZzogInJlbmRlcmluZyIsIENzczogImNzcyIsIFNlY3VyaXR5OiAic2VjdXJpdHkiLCBPdGhl cjogIm90aGVyIn0pOworSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29u c29sZU1lc3NhZ2VTb3VyY2UiLCB7WE1MOiAieG1sIiwgSmF2YXNjcmlwdDogImphdmFzY3JpcHQi LCBOZXR3b3JrOiAibmV0d29yayIsIENvbnNvbGVBUEk6ICJjb25zb2xlLWFwaSIsIFN0b3JhZ2U6 ICJzdG9yYWdlIiwgQXBwY2FjaGU6ICJhcHBjYWNoZSIsIFJlbmRlcmluZzogInJlbmRlcmluZyIs IENTUzogImNzcyIsIFNlY3VyaXR5OiAic2VjdXJpdHkiLCBPdGhlcjogIm90aGVyIn0pOwogSW5z cGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VMZXZlbCIs IHtMb2c6ICJsb2ciLCBXYXJuaW5nOiAid2FybmluZyIsIEVycm9yOiAiZXJyb3IiLCBEZWJ1Zzog ImRlYnVnIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29s ZU1lc3NhZ2VUeXBlIiwge0xvZzogImxvZyIsIERpcjogImRpciIsIERpclhNTDogImRpcnhtbCIs IFRhYmxlOiAidGFibGUiLCBUcmFjZTogInRyYWNlIiwgQ2xlYXI6ICJjbGVhciIsIFN0YXJ0R3Jv dXA6ICJzdGFydEdyb3VwIiwgU3RhcnRHcm91cENvbGxhcHNlZDogInN0YXJ0R3JvdXBDb2xsYXBz ZWQiLCBFbmRHcm91cDogImVuZEdyb3VwIiwgQXNzZXJ0OiAiYXNzZXJ0IiwgVGltaW5nOiAidGlt aW5nIiwgUHJvZmlsZTogInByb2ZpbGUiLCBQcm9maWxlRW5kOiAicHJvZmlsZUVuZCJ9KTsKIElu c3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudCgiQ29uc29sZS5tZXNzYWdlQWRkZWQiLCBbIm1l c3NhZ2UiXSk7Cg==