148143 2015-08-18 14:32:10 -0700 Web Inspector: Modernize CSSStyleManager 2015-08-18 15:12:19 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1118634 0 joepeck 2015-08-18 14:32:10 -0700 * SUMMARY Modernize CSSStyleManager. - Eliminate `delete` - Use Map instead of Object for a Map. 1118636 1 259298 joepeck 2015-08-18 14:34:48 -0700 Created attachment 259298 [PATCH] Proposed Fix 1118645 2 259298 bburg 2015-08-18 15:01:08 -0700 Comment on attachment 259298 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=259298&action=review r=me > Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js:-227 > - function syleSheetsFetched() Ouch! > Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js:233 > var key = this._frameURLMapKey(frame, url); Can we move this above the callback and make it `let`? > Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js:236 > + var styleSheet = this._styleSheetFrameURLMap.get(key) || this._styleSheetFrameURLMap.get(url) || null; let? > Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js:347 > + this._ignoreResourceContentDidChangeEventForResource = null; Why null? 1118651 3 joepeck 2015-08-18 15:08:36 -0700 > > Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js:347 > > + this._ignoreResourceContentDidChangeEventForResource = null; > > Why null? I find `null` clearer here. It better signifies our intent for that property, "an object type goes here", better than undefined. 1118652 4 joepeck 2015-08-18 15:12:19 -0700 http://trac.webkit.org/changeset/188601 259298 2015-08-18 14:34:48 -0700 2015-08-18 15:08:44 -0700 [PATCH] Proposed Fix modernize-1.patch text/plain 6805 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ3MGJjYTMuLjU3MGZhMDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA4LTE4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTW9kZXJu aXplIENTU1N0eWxlTWFuYWdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTQ4MTQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NTU1N0eWxlTWFuYWdlci5q czoKKyAgICAgICAgICAtIEVsaW1pbmF0ZSBgZGVsZXRlYCBvcGVyYXRvciB1c2UuCisgICAgICAg ICAgLSBNb3ZlIGZyb20gdXNpbmcgT2JqZWN0cyBhcyBoYXNobWFwcyB0byBNYXAuCisgICAgICAg ICAgLSBGaXggdHlwb3MuCisKIDIwMTUtMDgtMTMgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBw bGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNraXAgcmVuZGVyaW5nIGZyYW1lIHJl Y29yZHMgd2l0aG91dCBjaGlsZHJlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ1NTU3R5bGVNYW5hZ2VyLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ1NTU3R5bGVNYW5hZ2VyLmpz CmluZGV4IDc0NjdmMTkuLmZhNDNkNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NTU1N0eWxlTWFuYWdlci5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DU1NTdHlsZU1hbmFn ZXIuanMKQEAgLTQzLDggKzQzLDggQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTWFuYWdlciA9IGNs YXNzIENTU1N0eWxlTWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKIAogICAgICAg ICB0aGlzLl9jb2xvckZvcm1hdFNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoImRl ZmF1bHQtY29sb3ItZm9ybWF0IiwgV2ViSW5zcGVjdG9yLkNvbG9yLkZvcm1hdC5PcmlnaW5hbCk7 CiAKLSAgICAgICAgdGhpcy5fc3R5bGVTaGVldElkZW50aWZpZXJNYXAgPSB7fTsKLSAgICAgICAg dGhpcy5fc3R5bGVTaGVldEZyYW1lVVJMTWFwID0ge307CisgICAgICAgIHRoaXMuX3N0eWxlU2hl ZXRJZGVudGlmaWVyTWFwID0gbmV3IE1hcDsKKyAgICAgICAgdGhpcy5fc3R5bGVTaGVldEZyYW1l VVJMTWFwID0gbmV3IE1hcDsKICAgICAgICAgdGhpcy5fbm9kZVN0eWxlc01hcCA9IHt9OwogICAg IH0KIApAQCAtOTUsMTEgKzk1LDEyIEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1hbmFnZXIgPSBj bGFzcyBDU1NTdHlsZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAgICBz dHlsZVNoZWV0Rm9ySWRlbnRpZmllcihpZCkKICAgICB7Ci0gICAgICAgIGlmIChpZCBpbiB0aGlz Ll9zdHlsZVNoZWV0SWRlbnRpZmllck1hcCkKLSAgICAgICAgICAgIHJldHVybiB0aGlzLl9zdHls ZVNoZWV0SWRlbnRpZmllck1hcFtpZF07CisgICAgICAgIGxldCBzdHlsZVNoZWV0ID0gdGhpcy5f c3R5bGVTaGVldElkZW50aWZpZXJNYXAuZ2V0KGlkKTsKKyAgICAgICAgaWYgKHN0eWxlU2hlZXQp CisgICAgICAgICAgICByZXR1cm4gc3R5bGVTaGVldDsKIAotICAgICAgICB2YXIgc3R5bGVTaGVl dCA9IG5ldyBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldChpZCk7Ci0gICAgICAgIHRoaXMuX3N0 eWxlU2hlZXRJZGVudGlmaWVyTWFwW2lkXSA9IHN0eWxlU2hlZXQ7CisgICAgICAgIHN0eWxlU2hl ZXQgPSBuZXcgV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQoaWQpOworICAgICAgICB0aGlzLl9z dHlsZVNoZWV0SWRlbnRpZmllck1hcC5zZXQoaWQsIHN0eWxlU2hlZXQpOwogICAgICAgICByZXR1 cm4gc3R5bGVTaGVldDsKICAgICB9CiAKQEAgLTE3Miw4ICsxNzMsOCBAQCBXZWJJbnNwZWN0b3Iu Q1NTU3R5bGVNYW5hZ2VyID0gY2xhc3MgQ1NTU3R5bGVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVj dG9yLk9iamVjdAogCiAgICAgICAgIC8vIENsZWFyIG91ciBtYXBzIHdoZW4gdGhlIG1haW4gZnJh bWUgbmF2aWdhdGVzLgogCi0gICAgICAgIHRoaXMuX3N0eWxlU2hlZXRJZGVudGlmaWVyTWFwID0g e307Ci0gICAgICAgIHRoaXMuX3N0eWxlU2hlZXRGcmFtZVVSTE1hcCA9IHt9OworICAgICAgICB0 aGlzLl9zdHlsZVNoZWV0SWRlbnRpZmllck1hcC5jbGVhcigpOworICAgICAgICB0aGlzLl9zdHls ZVNoZWV0RnJhbWVVUkxNYXAuY2xlYXIoKTsKICAgICAgICAgdGhpcy5fbm9kZVN0eWxlc01hcCA9 IHt9OwogICAgIH0KIApAQCAtMjA2LDggKzIwNyw4IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1h bmFnZXIgPSBjbGFzcyBDU1NTdHlsZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0 CiAgICAgICAgIC8vIENsZWFyIGtub3duIHN0eWxlc2hlZXRzIGZvciB0aGlzIFVSTCBhbmQgZnJh bWUuIFRoaXMgd2lsbCBjYXVzZSB0aGUgc3R5bGVzaGVldHMgdG8KICAgICAgICAgLy8gYmUgdXBk YXRlZCBuZXh0IHRpbWUgX2ZldGNoSW5mb0ZvckFsbFN0eWxlU2hlZXRzIGlzIGNhbGxlZC4KICAg ICAgICAgLy8gQ09NUEFUSUJJTElUWSAoaU9TIDYpOiBUaGUgZnJhbWUncyBpZCB3YXMgbm90IGF2 YWlsYWJsZSBmb3IgdGhlIGtleSwgc28gZGVsZXRlIGp1c3QgdGhlIHVybCB0b28uCi0gICAgICAg IGRlbGV0ZSB0aGlzLl9zdHlsZVNoZWV0RnJhbWVVUkxNYXBbdGhpcy5fZnJhbWVVUkxNYXBLZXko cmVzb3VyY2UucGFyZW50RnJhbWUsIHJlc291cmNlLnVybCldOwotICAgICAgICBkZWxldGUgdGhp cy5fc3R5bGVTaGVldEZyYW1lVVJMTWFwW3Jlc291cmNlLnVybF07CisgICAgICAgIHRoaXMuX3N0 eWxlU2hlZXRJZGVudGlmaWVyTWFwLmRlbGV0ZSh0aGlzLl9mcmFtZVVSTE1hcEtleShyZXNvdXJj ZS5wYXJlbnRGcmFtZSwgcmVzb3VyY2UudXJsKSk7CisgICAgICAgIHRoaXMuX3N0eWxlU2hlZXRJ ZGVudGlmaWVyTWFwLmRlbGV0ZShyZXNvdXJjZS51cmwpOwogICAgIH0KIAogICAgIF9mcmFtZVVS TE1hcEtleShmcmFtZSwgdXJsKQpAQCAtMjI0LDE4ICsyMjUsMTkgQEAgV2ViSW5zcGVjdG9yLkNT U1N0eWxlTWFuYWdlciA9IGNsYXNzIENTU1N0eWxlTWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rv ci5PYmplY3QKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGZyYW1lIGluc3RhbmNlb2Yg V2ViSW5zcGVjdG9yLkZyYW1lKTsKIAotICAgICAgICBmdW5jdGlvbiBzeWxlU2hlZXRzRmV0Y2hl ZCgpCisgICAgICAgIGZ1bmN0aW9uIHN0eWxlU2hlZXRzRmV0Y2hlZCgpCiAgICAgICAgIHsKLSAg ICAgICAgICAgIGNhbGxiYWNrKHRoaXMuX3N0eWxlU2hlZXRGcmFtZVVSTE1hcFtrZXldIHx8IHRo aXMuX3N0eWxlU2hlZXRGcmFtZVVSTE1hcFt1cmxdIHx8IG51bGwpOworICAgICAgICAgICAgY2Fs bGJhY2sodGhpcy5fc3R5bGVTaGVldEZyYW1lVVJMTWFwLmdldChrZXkpIHx8IHRoaXMuX3N0eWxl U2hlZXRGcmFtZVVSTE1hcC5nZXQodXJsKSB8fCBudWxsKTsKICAgICAgICAgfQogCiAgICAgICAg IHZhciBrZXkgPSB0aGlzLl9mcmFtZVVSTE1hcEtleShmcmFtZSwgdXJsKTsKIAogICAgICAgICAv LyBDT01QQVRJQklMSVRZIChpT1MgNik6IFRoZSBmcmFtZSdzIGlkIHdhcyBub3QgYXZhaWxhYmxl IGZvciB0aGUga2V5LCBzbyBjaGVjayBmb3IganVzdCB0aGUgdXJsIHRvby4KLSAgICAgICAgaWYg KGtleSBpbiB0aGlzLl9zdHlsZVNoZWV0RnJhbWVVUkxNYXAgfHwgdXJsIGluIHRoaXMuX3N0eWxl U2hlZXRGcmFtZVVSTE1hcCkKLSAgICAgICAgICAgIGNhbGxiYWNrKHRoaXMuX3N0eWxlU2hlZXRG cmFtZVVSTE1hcFtrZXldIHx8IHRoaXMuX3N0eWxlU2hlZXRGcmFtZVVSTE1hcFt1cmxdIHx8IG51 bGwpOworICAgICAgICB2YXIgc3R5bGVTaGVldCA9IHRoaXMuX3N0eWxlU2hlZXRGcmFtZVVSTE1h cC5nZXQoa2V5KSB8fCB0aGlzLl9zdHlsZVNoZWV0RnJhbWVVUkxNYXAuZ2V0KHVybCkgfHwgbnVs bDsKKyAgICAgICAgaWYgKHN0eWxlU2hlZXQpCisgICAgICAgICAgICBjYWxsYmFjayhzdHlsZVNo ZWV0KTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fZmV0Y2hJbmZvRm9yQWxsU3R5 bGVTaGVldHMoc3lsZVNoZWV0c0ZldGNoZWQuYmluZCh0aGlzKSk7CisgICAgICAgICAgICB0aGlz Ll9mZXRjaEluZm9Gb3JBbGxTdHlsZVNoZWV0cyhzdHlsZVNoZWV0c0ZldGNoZWQuYmluZCh0aGlz KSk7CiAgICAgfQogCiAgICAgX2ZldGNoSW5mb0ZvckFsbFN0eWxlU2hlZXRzKGNhbGxiYWNrKQpA QCAtMjQ0LDcgKzI0Niw3IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1hbmFnZXIgPSBjbGFzcyBD U1NTdHlsZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAgICAgICAgZnVu Y3Rpb24gcHJvY2Vzc1N0eWxlU2hlZXRzKGVycm9yLCBzdHlsZVNoZWV0cykKICAgICAgICAgewot ICAgICAgICAgICAgdGhpcy5fc3R5bGVTaGVldEZyYW1lVVJMTWFwID0ge307CisgICAgICAgICAg ICB0aGlzLl9zdHlsZVNoZWV0RnJhbWVVUkxNYXAuY2xlYXIoKTsKIAogICAgICAgICAgICAgaWYg KGVycm9yKSB7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2soKTsKQEAgLTI1OSw3ICsyNjEsNyBA QCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNYW5hZ2VyID0gY2xhc3MgQ1NTU3R5bGVNYW5hZ2VyIGV4 dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICAgICAgICAgIHN0eWxlU2hlZXQudXBk YXRlSW5mbyhzdHlsZVNoZWV0SW5mby5zb3VyY2VVUkwsIHBhcmVudEZyYW1lKTsKIAogICAgICAg ICAgICAgICAgIHZhciBrZXkgPSB0aGlzLl9mcmFtZVVSTE1hcEtleShwYXJlbnRGcmFtZSwgc3R5 bGVTaGVldEluZm8uc291cmNlVVJMKTsKLSAgICAgICAgICAgICAgICB0aGlzLl9zdHlsZVNoZWV0 RnJhbWVVUkxNYXBba2V5XSA9IHN0eWxlU2hlZXQ7CisgICAgICAgICAgICAgICAgdGhpcy5fc3R5 bGVTaGVldEZyYW1lVVJMTWFwLnNldChrZXksIHN0eWxlU2hlZXQpOwogICAgICAgICAgICAgfQog CiAgICAgICAgICAgICBjYWxsYmFjaygpOwpAQCAtMjgyLDcgKzI4NCw3IEBAIFdlYkluc3BlY3Rv ci5DU1NTdHlsZU1hbmFnZXIgPSBjbGFzcyBDU1NTdHlsZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNw ZWN0b3IuT2JqZWN0CiAgICAgICAgIHsKICAgICAgICAgICAgIGZ1bmN0aW9uIHN0eWxlU2hlZXRG b3VuZChzdHlsZVNoZWV0KQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIGRlbGV0ZSBy ZXNvdXJjZS5fX3BlbmRpbmdDaGFuZ2VUaW1lb3V0OworICAgICAgICAgICAgICAgIHJlc291cmNl Ll9fcGVuZGluZ0NoYW5nZVRpbWVvdXQgPSB1bmRlZmluZWQ7CiAKICAgICAgICAgICAgICAgICBj b25zb2xlLmFzc2VydChzdHlsZVNoZWV0KTsKICAgICAgICAgICAgICAgICBpZiAoIXN0eWxlU2hl ZXQpCkBAIC0zMTIsNyArMzE0LDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTWFuYWdlciA9IGNs YXNzIENTU1N0eWxlTWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAg ICAgIHZhciBzdHlsZVNoZWV0ID0gcGFyYW1ldGVycy5zb3VyY2VDb2RlOwogICAgICAgICAgICAg dmFyIGNvbnRlbnQgPSBwYXJhbWV0ZXJzLmNvbnRlbnQ7CiAKLSAgICAgICAgICAgIGRlbGV0ZSBz dHlsZVNoZWV0Ll9fcGVuZGluZ0NoYW5nZVRpbWVvdXQ7CisgICAgICAgICAgICBzdHlsZVNoZWV0 Ll9fcGVuZGluZ0NoYW5nZVRpbWVvdXQgPSB1bmRlZmluZWQ7CiAKICAgICAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KHN0eWxlU2hlZXQudXJsKTsKICAgICAgICAgICAgIGlmICghc3R5bGVTaGVldC51 cmwpCkBAIC0zMzYsMTMgKzMzOCwxMyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNYW5hZ2VyID0g Y2xhc3MgQ1NTU3R5bGVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAg ICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAgICAgaWYgKHJlc291cmNlLl9faWdub3JlTmV4 dFVwZGF0ZVJlc291cmNlQ29udGVudCkgewotICAgICAgICAgICAgICAgIGRlbGV0ZSByZXNvdXJj ZS5fX2lnbm9yZU5leHRVcGRhdGVSZXNvdXJjZUNvbnRlbnQ7CisgICAgICAgICAgICAgICAgcmVz b3VyY2UuX19pZ25vcmVOZXh0VXBkYXRlUmVzb3VyY2VDb250ZW50ID0gZmFsc2U7CiAgICAgICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICB0aGlzLl9pZ25v cmVSZXNvdXJjZUNvbnRlbnREaWRDaGFuZ2VFdmVudEZvclJlc291cmNlID0gcmVzb3VyY2U7CiAg ICAgICAgICAgICBXZWJJbnNwZWN0b3IuYnJhbmNoTWFuYWdlci5jdXJyZW50QnJhbmNoLnJldmlz aW9uRm9yUmVwcmVzZW50ZWRPYmplY3QocmVzb3VyY2UpLmNvbnRlbnQgPSBjb250ZW50OwotICAg ICAgICAgICAgZGVsZXRlIHRoaXMuX2lnbm9yZVJlc291cmNlQ29udGVudERpZENoYW5nZUV2ZW50 Rm9yUmVzb3VyY2U7CisgICAgICAgICAgICB0aGlzLl9pZ25vcmVSZXNvdXJjZUNvbnRlbnREaWRD aGFuZ2VFdmVudEZvclJlc291cmNlID0gbnVsbDsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0 aW9uIHN0eWxlU2hlZXRSZWFkeSgpCg==