177793 2017-10-02 16:44:06 -0700 Web Inspector: Rename methods ending in *Json() as *JSON() 2017-10-02 22:31:36 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck commit-queue inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1355602 0 joepeck 2017-10-02 16:44:06 -0700 Rename methods ending in *Json() as *JSON() 1355606 1 322471 joepeck 2017-10-02 16:45:12 -0700 Created attachment 322471 [PATCH] Proposed Fix 1355651 2 322471 mattbaker 2017-10-02 17:51:22 -0700 Comment on attachment 322471 [PATCH] Proposed Fix r=me 1355705 3 322471 commit-queue 2017-10-02 22:31:22 -0700 Comment on attachment 322471 [PATCH] Proposed Fix Clearing flags on attachment: 322471 Committed r222769: <http://trac.webkit.org/changeset/222769> 1355706 4 commit-queue 2017-10-02 22:31:23 -0700 All reviewed patches have been landed. Closing bug. 322471 2017-10-02 16:45:12 -0700 2017-10-02 22:31:22 -0700 [PATCH] Proposed Fix json-1.patch text/plain 6388 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3ZTM1OWU4NjY2OC4uYTlhZmQzNzNlOTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNy0xMC0wMiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbmFtZSBtZXRob2RzIGVuZGluZyBpbiAq SnNvbigpIGFzICpKU09OKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3Nzc5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvck5ldHdvcmtBZ2VudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JOZXR3b3JrQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yQ2FjaGVkUmVz b3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yTmV0d29ya0FnZW50Ojp3aWxsU2Vu ZFJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yTmV0d29ya0FnZW50OjpkaWRS ZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50OjpyZXNvdXJjZVR5cGVK U09OKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6Y2FjaGVkUmVzb3Vy Y2VUeXBlSlNPTik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OmJ1aWxk T2JqZWN0Rm9yRnJhbWVUcmVlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2Vu dDo6cmVzb3VyY2VUeXBlSnNvbik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JQYWdlQWdlbnQ6OmNhY2hlZFJlc291cmNlVHlwZUpzb24pOiBEZWxldGVkLgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuaDoKKwogMjAxNy0xMC0wMiAgQmFzdWtlIFN1 enVraSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CiAKICAgICAgICAgW0N1cmxdIEltcGxlbWVu dCBtaXNzaW5nIGFzeW5jIG1ldGhvZCBpbiBSZWNvdXJjZUhhbmRsZSBhbmQgbWFrZSBpdCBhY3R1 YWxseSBhc3luYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ck5ldHdvcmtBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTmV0 d29ya0FnZW50LmNwcAppbmRleCA3MmZhMWVlNGM1OS4uZTJmOTc2NGI3MWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JOZXR3b3JrQWdlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JOZXR3b3JrQWdlbnQuY3BwCkBAIC0z MDcsNyArMzA3LDcgQEAgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6Ok5ldHdvcms6OkNhY2hlZFJl c291cmNlPiBJbnNwZWN0b3JOZXR3b3JrQWdlbnQ6OmJ1aWxkT2IKIHsKICAgICBhdXRvIHJlc291 cmNlT2JqZWN0ID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6TmV0d29yazo6Q2FjaGVkUmVzb3VyY2U6 OmNyZWF0ZSgpCiAgICAgICAgIC5zZXRVcmwoY2FjaGVkUmVzb3VyY2UtPnVybCgpKQotICAgICAg ICAuc2V0VHlwZShJbnNwZWN0b3JQYWdlQWdlbnQ6OmNhY2hlZFJlc291cmNlVHlwZUpzb24oKmNh Y2hlZFJlc291cmNlKSkKKyAgICAgICAgLnNldFR5cGUoSW5zcGVjdG9yUGFnZUFnZW50OjpjYWNo ZWRSZXNvdXJjZVR5cGVKU09OKCpjYWNoZWRSZXNvdXJjZSkpCiAgICAgICAgIC5zZXRCb2R5U2l6 ZShjYWNoZWRSZXNvdXJjZS0+ZW5jb2RlZFNpemUoKSkKICAgICAgICAgLnJlbGVhc2UoKTsKIApA QCAtMzY1LDcgKzM2NSw3IEBAIHZvaWQgSW5zcGVjdG9yTmV0d29ya0FnZW50Ojp3aWxsU2VuZFJl cXVlc3QodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvCiAgICAgZm9yIChhdXRv JiBlbnRyeSA6IG1fZXh0cmFSZXF1ZXN0SGVhZGVycykKICAgICAgICAgcmVxdWVzdC5zZXRIVFRQ SGVhZGVyRmllbGQoZW50cnkua2V5LCBlbnRyeS52YWx1ZSk7CiAKLSAgICBJbnNwZWN0b3I6OlBy b3RvY29sOjpQYWdlOjpSZXNvdXJjZVR5cGUgcHJvdG9jb2xSZXNvdXJjZVR5cGUgPSBJbnNwZWN0 b3JQYWdlQWdlbnQ6OnJlc291cmNlVHlwZUpzb24odHlwZSk7CisgICAgYXV0byBwcm90b2NvbFJl c291cmNlVHlwZSA9IEluc3BlY3RvclBhZ2VBZ2VudDo6cmVzb3VyY2VUeXBlSlNPTih0eXBlKTsK IAogICAgIFJlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpOZXR3b3JrOjpJbml0aWF0b3I+IGlu aXRpYXRvck9iamVjdCA9IGJ1aWxkSW5pdGlhdG9yT2JqZWN0KGxvYWRlci5mcmFtZSgpID8gbG9h ZGVyLmZyYW1lKCktPmRvY3VtZW50KCkgOiBudWxscHRyKTsKICAgICBTdHJpbmcgdGFyZ2V0SWQg PSByZXF1ZXN0LmluaXRpYXRvcklkZW50aWZpZXIoKTsKQEAgLTQzOCw3ICs0MzgsNyBAQCB2b2lk IEluc3BlY3Rvck5ldHdvcmtBZ2VudDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgRG9jdW1lbgogICAgIG1fcmVzb3VyY2VzRGF0YS0+cmVzcG9uc2VSZWNlaXZl ZChyZXF1ZXN0SWQsIG1fcGFnZUFnZW50LT5mcmFtZUlkKGxvYWRlci5mcmFtZSgpKSwgcmVzcG9u c2UpOwogICAgIG1fcmVzb3VyY2VzRGF0YS0+c2V0UmVzb3VyY2VUeXBlKHJlcXVlc3RJZCwgdHlw ZSk7CiAKLSAgICBtX2Zyb250ZW5kRGlzcGF0Y2hlci0+cmVzcG9uc2VSZWNlaXZlZChyZXF1ZXN0 SWQsIG1fcGFnZUFnZW50LT5mcmFtZUlkKGxvYWRlci5mcmFtZSgpKSwgbV9wYWdlQWdlbnQtPmxv YWRlcklkKCZsb2FkZXIpLCB0aW1lc3RhbXAoKSwgSW5zcGVjdG9yUGFnZUFnZW50OjpyZXNvdXJj ZVR5cGVKc29uKHR5cGUpLCByZXNvdXJjZVJlc3BvbnNlKTsKKyAgICBtX2Zyb250ZW5kRGlzcGF0 Y2hlci0+cmVzcG9uc2VSZWNlaXZlZChyZXF1ZXN0SWQsIG1fcGFnZUFnZW50LT5mcmFtZUlkKGxv YWRlci5mcmFtZSgpKSwgbV9wYWdlQWdlbnQtPmxvYWRlcklkKCZsb2FkZXIpLCB0aW1lc3RhbXAo KSwgSW5zcGVjdG9yUGFnZUFnZW50OjpyZXNvdXJjZVR5cGVKU09OKHR5cGUpLCByZXNvdXJjZVJl c3BvbnNlKTsKIAogICAgIC8vIElmIHdlIHJldmFsaWRhdGVkIHRoZSByZXNvdXJjZSBhbmQgZ290 IE5vdCBtb2RpZmllZCwgc2VuZCBjb250ZW50IGxlbmd0aCBmb2xsb3dpbmcgZGlkUmVjZWl2ZVJl c3BvbnNlCiAgICAgLy8gYXMgdGhlcmUgd2lsbCBiZSBubyBjYWxscyB0byBkaWRSZWNlaXZlRGF0 YSBmcm9tIHRoZSBuZXR3b3JrIHN0YWNrLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yUGFnZUFnZW50LmNwcAppbmRleCA3OGZmNzlmNzU3MC4uNTAyMTNlYTlkNTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCkBA IC0yNDYsNyArMjQ2LDcgQEAgQ2FjaGVkUmVzb3VyY2UqIEluc3BlY3RvclBhZ2VBZ2VudDo6Y2Fj aGVkUmVzb3VyY2UoRnJhbWUqIGZyYW1lLCBjb25zdCBVUkwmIHVybCkKICAgICByZXR1cm4gY2Fj aGVkUmVzb3VyY2U7CiB9CiAKLUluc3BlY3Rvcjo6UHJvdG9jb2w6OlBhZ2U6OlJlc291cmNlVHlw ZSBJbnNwZWN0b3JQYWdlQWdlbnQ6OnJlc291cmNlVHlwZUpzb24oSW5zcGVjdG9yUGFnZUFnZW50 OjpSZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlKQorSW5zcGVjdG9yOjpQcm90b2NvbDo6UGFnZTo6 UmVzb3VyY2VUeXBlIEluc3BlY3RvclBhZ2VBZ2VudDo6cmVzb3VyY2VUeXBlSlNPTihJbnNwZWN0 b3JQYWdlQWdlbnQ6OlJlc291cmNlVHlwZSByZXNvdXJjZVR5cGUpCiB7CiAgICAgc3dpdGNoIChy ZXNvdXJjZVR5cGUpIHsKICAgICBjYXNlIERvY3VtZW50UmVzb3VyY2U6CkBAIC0zMjAsOSArMzIw LDkgQEAgSW5zcGVjdG9yUGFnZUFnZW50OjpSZXNvdXJjZVR5cGUgSW5zcGVjdG9yUGFnZUFnZW50 OjppbnNwZWN0b3JSZXNvdXJjZVR5cGUoY29uc3QKICAgICByZXR1cm4gaW5zcGVjdG9yUmVzb3Vy Y2VUeXBlKGNhY2hlZFJlc291cmNlLnR5cGUoKSk7CiB9CiAKLUluc3BlY3Rvcjo6UHJvdG9jb2w6 OlBhZ2U6OlJlc291cmNlVHlwZSBJbnNwZWN0b3JQYWdlQWdlbnQ6OmNhY2hlZFJlc291cmNlVHlw ZUpzb24oY29uc3QgQ2FjaGVkUmVzb3VyY2UmIGNhY2hlZFJlc291cmNlKQorSW5zcGVjdG9yOjpQ cm90b2NvbDo6UGFnZTo6UmVzb3VyY2VUeXBlIEluc3BlY3RvclBhZ2VBZ2VudDo6Y2FjaGVkUmVz b3VyY2VUeXBlSlNPTihjb25zdCBDYWNoZWRSZXNvdXJjZSYgY2FjaGVkUmVzb3VyY2UpCiB7Ci0g ICAgcmV0dXJuIHJlc291cmNlVHlwZUpzb24oaW5zcGVjdG9yUmVzb3VyY2VUeXBlKGNhY2hlZFJl c291cmNlKSk7CisgICAgcmV0dXJuIHJlc291cmNlVHlwZUpTT04oaW5zcGVjdG9yUmVzb3VyY2VU eXBlKGNhY2hlZFJlc291cmNlKSk7CiB9CiAKIFJlZlB0cjxUZXh0UmVzb3VyY2VEZWNvZGVyPiBJ bnNwZWN0b3JQYWdlQWdlbnQ6OmNyZWF0ZVRleHREZWNvZGVyKGNvbnN0IFN0cmluZyYgbWltZVR5 cGUsIGNvbnN0IFN0cmluZyYgdGV4dEVuY29kaW5nTmFtZSkKQEAgLTg0OSw3ICs4NDksNyBAQCBS ZWY8SW5zcGVjdG9yOjpQcm90b2NvbDo6UGFnZTo6RnJhbWVSZXNvdXJjZVRyZWU+IEluc3BlY3Rv clBhZ2VBZ2VudDo6YnVpbGRPYmplYwogICAgIGZvciAoYXV0byogY2FjaGVkUmVzb3VyY2UgOiBj YWNoZWRSZXNvdXJjZXNGb3JGcmFtZShmcmFtZSkpIHsKICAgICAgICAgYXV0byByZXNvdXJjZU9i amVjdCA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OlBhZ2U6OkZyYW1lUmVzb3VyY2U6OmNyZWF0ZSgp CiAgICAgICAgICAgICAuc2V0VXJsKGNhY2hlZFJlc291cmNlLT51cmwoKSkKLSAgICAgICAgICAg IC5zZXRUeXBlKGNhY2hlZFJlc291cmNlVHlwZUpzb24oKmNhY2hlZFJlc291cmNlKSkKKyAgICAg ICAgICAgIC5zZXRUeXBlKGNhY2hlZFJlc291cmNlVHlwZUpTT04oKmNhY2hlZFJlc291cmNlKSkK ICAgICAgICAgICAgIC5zZXRNaW1lVHlwZShjYWNoZWRSZXNvdXJjZS0+cmVzcG9uc2UoKS5taW1l VHlwZSgpKQogICAgICAgICAgICAgLnJlbGVhc2UoKTsKICAgICAgICAgaWYgKGNhY2hlZFJlc291 cmNlLT53YXNDYW5jZWxlZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclBhZ2VBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clBhZ2VBZ2VudC5oCmluZGV4IDA3M2Q3YzU1NTk1Li5hZGEwNTlkMzMxNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuaApAQCAtODUsMTAgKzg1LDEw IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgU3RyaW5nIHNvdXJjZU1hcFVSTEZvclJlc291cmNlKENh Y2hlZFJlc291cmNlKik7CiAKICAgICBzdGF0aWMgQ2FjaGVkUmVzb3VyY2UqIGNhY2hlZFJlc291 cmNlKEZyYW1lKiwgY29uc3QgVVJMJik7Ci0gICAgc3RhdGljIEluc3BlY3Rvcjo6UHJvdG9jb2w6 OlBhZ2U6OlJlc291cmNlVHlwZSByZXNvdXJjZVR5cGVKc29uKFJlc291cmNlVHlwZSk7CisgICAg c3RhdGljIEluc3BlY3Rvcjo6UHJvdG9jb2w6OlBhZ2U6OlJlc291cmNlVHlwZSByZXNvdXJjZVR5 cGVKU09OKFJlc291cmNlVHlwZSk7CiAgICAgc3RhdGljIFJlc291cmNlVHlwZSBpbnNwZWN0b3JS ZXNvdXJjZVR5cGUoQ2FjaGVkUmVzb3VyY2U6OlR5cGUpOwogICAgIHN0YXRpYyBSZXNvdXJjZVR5 cGUgaW5zcGVjdG9yUmVzb3VyY2VUeXBlKGNvbnN0IENhY2hlZFJlc291cmNlJik7Ci0gICAgc3Rh dGljIEluc3BlY3Rvcjo6UHJvdG9jb2w6OlBhZ2U6OlJlc291cmNlVHlwZSBjYWNoZWRSZXNvdXJj ZVR5cGVKc29uKGNvbnN0IENhY2hlZFJlc291cmNlJik7CisgICAgc3RhdGljIEluc3BlY3Rvcjo6 UHJvdG9jb2w6OlBhZ2U6OlJlc291cmNlVHlwZSBjYWNoZWRSZXNvdXJjZVR5cGVKU09OKGNvbnN0 IENhY2hlZFJlc291cmNlJik7CiAgICAgc3RhdGljIFJlZlB0cjxUZXh0UmVzb3VyY2VEZWNvZGVy PiBjcmVhdGVUZXh0RGVjb2Rlcihjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcm IHRleHRFbmNvZGluZ05hbWUpOwogCiAgICAgLy8gUGFnZSBBUEkgZm9yIEluc3BlY3RvckZyb250 ZW5kCg==