169993 2017-03-22 21:48:09 -0700 Share more code between ManifestGenerator and /api/triggerables 2017-03-23 13:56:39 -0700 1 1 1 Unclassified WebKit Perf Dashboard Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez dewei_zhu kling koivisto rniwa oldest_to_newest 1290354 0 rniwa 2017-03-22 21:48:09 -0700 Reduce the code duplication. 1290359 1 305165 rniwa 2017-03-22 21:56:48 -0700 Created attachment 305165 Cleanup 1290583 2 305165 cdumez 2017-03-23 13:51:35 -0700 Comment on attachment 305165 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=305165&action=review r=me > Websites/perf.webkit.org/ChangeLog:14 > + (ManifestGenerator::fetch_triggearables): Extracted as a static function. Also include the ID Typo: fetch_triggearables 1290587 3 rniwa 2017-03-23 13:56:39 -0700 Committed r214315: <http://trac.webkit.org/changeset/214315> 305165 2017-03-22 21:56:48 -0700 2017-03-23 13:51:35 -0700 Cleanup bug-169993-20170322215647.patch text/plain 4537 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0Mjg3CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA4YmU4ZjZmYmViODI5MTAyMzI0MDVkYTcxY2U0ODY2MjA5ZGMxYTVjLi45NDE0NGVjMzc2 ZmRiOWE3NDk3YTI5OGMxYjFjMTIxMWQ3YmFiMjFjIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxNy0wMy0yMyAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KKworICAgICAgICBTaGFyZSBtb3JlIGNvZGUgYmV0d2VlbiBNYW5pZmVzdEdl bmVyYXRvciBhbmQgL2FwaS90cmlnZ2VyYWJsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTk5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFNoYXJlZCB0aGUgY29kZSB0byBmZXRjaCB0aGUgbGlzdCBv ZiB0cmlnZ2VyYWJsZXMgZnJvbSB0aGUgZGF0YWJhc2UgYmV0d2VlbiBNYW5pZmVzdEdlbmVyYXRv cgorICAgICAgICBhbmQgL2FwaS90cmlnZ2VyYWJsZXMuCisKKyAgICAgICAgKiBwdWJsaWMvYXBp L3RyaWdnZXJhYmxlcy5waHA6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKiBwdWJsaWMvaW5j bHVkZS9tYW5pZmVzdC1nZW5lcmF0b3IucGhwOgorICAgICAgICAoTWFuaWZlc3RHZW5lcmF0b3I6 OmZldGNoX3RyaWdnZWFyYWJsZXMpOiBFeHRyYWN0ZWQgYXMgYSBzdGF0aWMgZnVuY3Rpb24uIEFs c28gaW5jbHVkZSB0aGUgSUQKKyAgICAgICAgaW4gdGhlIHRyaWdnZXJhYmxlIGRhdGEuCisKIDIw MTctMDMtMjIgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgY3Jl YXRlLXRlc3QtZ3JvdXAgc2hvdWxkIGFsbG93IGEgZGlmZmVyZW50IHNldCBvZiByZXBvc2l0b3Jp ZXMgdG8gYmUgdXNlZCBpbiBlYWNoIGNvbmZpZ3VyYXRpb24KZGlmZiAtLWdpdCBhL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvYXBpL3RyaWdnZXJhYmxlcy5waHAgYi9XZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvcHVibGljL2FwaS90cmlnZ2VyYWJsZXMucGhwCmluZGV4IDQ0ZjRjOTc5 MWNhYmQzZTBmNWNmZDg5MTc3OGU0YTFhYWEwM2M2MDQuLjljZjc1ZThiNDM2MDM3OGEzMzg5MWU1 ZmJmNGViMjgwYjc3MzY1YjIgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9w dWJsaWMvYXBpL3RyaWdnZXJhYmxlcy5waHAKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3Jn L3B1YmxpYy9hcGkvdHJpZ2dlcmFibGVzLnBocApAQCAtMSw3ICsxLDkgQEAKIDw/cGhwCiAKIHJl cXVpcmUoJy4uL2luY2x1ZGUvanNvbi1oZWFkZXIucGhwJyk7CityZXF1aXJlKCcuLi9pbmNsdWRl L21hbmlmZXN0LWdlbmVyYXRvci5waHAnKTsKIAorLy8gVjIgVUkgY29tcGF0aWJpbGl0eSAoZGV0 ZWN0LWNoYW5nZXMuanMpLgogZnVuY3Rpb24gbWFpbigkcGF0aCkgewogICAgIGlmIChjb3VudCgk cGF0aCkgPiAxKQogICAgICAgICBleGl0X3dpdGhfZXJyb3IoJ0ludmFsaWRSZXF1ZXN0Jyk7CkBA IC0xOSwxOSArMjEsNyBAQCBmdW5jdGlvbiBtYWluKCRwYXRoKSB7CiAgICAgICAgICRxdWVyeVsn aWQnXSA9ICR0cmlnZ2VyYWJsZVsnaWQnXTsKICAgICB9CiAKLSAgICAkaWRfdG9fdHJpZ2dlcmFi bGUgPSBhcnJheSgpOwotICAgIGZvcmVhY2ggKCRkYi0+c2VsZWN0X3Jvd3MoJ2J1aWxkX3RyaWdn ZXJhYmxlcycsICd0cmlnZ2VyYWJsZScsICRxdWVyeSkgYXMgJHJvdykgewotICAgICAgICAkaWQg PSAkcm93Wyd0cmlnZ2VyYWJsZV9pZCddOwotICAgICAgICAkcmVwb3NpdG9yaWVzID0gYXJyYXko KTsKLSAgICAgICAgJGlkX3RvX3RyaWdnZXJhYmxlWyRpZF0gPSBhcnJheSgnaWQnID0+ICRpZCwg J25hbWUnID0+ICRyb3dbJ3RyaWdnZXJhYmxlX25hbWUnXSwgJ2FjY2VwdGVkUmVwb3NpdG9yaWVz JyA9PiAmJHJlcG9zaXRvcmllcyk7Ci0gICAgfQotCi0gICAgZm9yZWFjaCAoJGRiLT5zZWxlY3Rf cm93cygndHJpZ2dlcmFibGVfcmVwb3NpdG9yaWVzJywgJ3RyaWdyZXBvJywgYXJyYXkoKSkgYXMg JHJvdykgewotICAgICAgICAkdHJpZ2dlcmFibGUgPSBhcnJheV9nZXQoJGlkX3RvX3RyaWdnZXJh YmxlLCAkcm93Wyd0cmlncmVwb190cmlnZ2VyYWJsZSddKTsKLSAgICAgICAgaWYgKCR0cmlnZ2Vy YWJsZSkKLSAgICAgICAgICAgIGFycmF5X3B1c2goJHRyaWdnZXJhYmxlWydhY2NlcHRlZFJlcG9z aXRvcmllcyddLCAkcm93Wyd0cmlncmVwb19yZXBvc2l0b3J5J10pOwotICAgIH0KLQorICAgICRp ZF90b190cmlnZ2VyYWJsZSA9IE1hbmlmZXN0R2VuZXJhdG9yOjpmZXRjaF90cmlnZ2VyYWJsZXMo JGRiLCAkcXVlcnkpOwogICAgIGV4aXRfd2l0aF9zdWNjZXNzKGFycmF5KCd0cmlnZ2VyYWJsZXMn ID0+IGFycmF5X3ZhbHVlcygkaWRfdG9fdHJpZ2dlcmFibGUpKSk7CiB9CiAKZGlmZiAtLWdpdCBh L1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvaW5jbHVkZS9tYW5pZmVzdC1nZW5lcmF0 b3IucGhwIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9pbmNsdWRlL21hbmlmZXN0 LWdlbmVyYXRvci5waHAKaW5kZXggZWM2MzM3MzliMTcxOTg1MTg5YTViYjgyZDMyMGU0NDQ2Y2U3 NmEyZi4uM2E3MWVkZjZiM2MyM2I0Y2NkYmQxNzNkN2NjODkzNDE5MzY1MWU2NiAxMDA2NDQKLS0t IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9pbmNsdWRlL21hbmlmZXN0LWdlbmVy YXRvci5waHAKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9pbmNsdWRlL21h bmlmZXN0LWdlbmVyYXRvci5waHAKQEAgLTE4Miw5ICsxODIsMTQgQEAgY2xhc3MgTWFuaWZlc3RH ZW5lcmF0b3IgewogICAgICAgICByZXR1cm4gJGJ1Z190cmFja2VyczsKICAgICB9CiAKLSAgICBw cml2YXRlIGZ1bmN0aW9uIHRyaWdnZXJhYmxlcygpIHsKKyAgICBwcml2YXRlIGZ1bmN0aW9uIHRy aWdnZXJhYmxlcygpCisgICAgeworICAgICAgICByZXR1cm4gTWFuaWZlc3RHZW5lcmF0b3I6OmZl dGNoX3RyaWdnZXJhYmxlcygkdGhpcy0+ZGIsIGFycmF5KCkpOworICAgIH0KIAotICAgICAgICAk dHJpZ2dlcmFibGVzID0gJHRoaXMtPmRiLT5mZXRjaF90YWJsZSgnYnVpbGRfdHJpZ2dlcmFibGVz Jyk7CisgICAgc3RhdGljIGZ1bmN0aW9uIGZldGNoX3RyaWdnZXJhYmxlcygkZGIsICRxdWVyeSkK KyAgICB7CisgICAgICAgICR0cmlnZ2VyYWJsZXMgPSAkZGItPmZldGNoX3RhYmxlKCdidWlsZF90 cmlnZ2VyYWJsZXMnKTsKICAgICAgICAgaWYgKCEkdHJpZ2dlcmFibGVzKQogICAgICAgICAgICAg cmV0dXJuIGFycmF5KCk7CiAKQEAgLTE5MiwxMiArMTk3LDEzIEBAIGNsYXNzIE1hbmlmZXN0R2Vu ZXJhdG9yIHsKICAgICAgICAgZm9yZWFjaCAoJHRyaWdnZXJhYmxlcyBhcyAkcm93KSB7CiAgICAg ICAgICAgICAkaWQgPSAkcm93Wyd0cmlnZ2VyYWJsZV9pZCddOwogICAgICAgICAgICAgJGlkX3Rv X3RyaWdnZXJhYmxlWyRpZF0gPSBhcnJheSgKKyAgICAgICAgICAgICAgICAnaWQnID0+ICRpZCwK ICAgICAgICAgICAgICAgICAnbmFtZScgPT4gJHJvd1sndHJpZ2dlcmFibGVfbmFtZSddLAogICAg ICAgICAgICAgICAgICdhY2NlcHRlZFJlcG9zaXRvcmllcycgPT4gYXJyYXkoKSwKICAgICAgICAg ICAgICAgICAnY29uZmlndXJhdGlvbnMnID0+IGFycmF5KCkpOwogICAgICAgICB9CiAKLSAgICAg ICAgJHJlcG9zaXRvcnlfbWFwID0gJHRoaXMtPmRiLT5mZXRjaF90YWJsZSgndHJpZ2dlcmFibGVf cmVwb3NpdG9yaWVzJyk7CisgICAgICAgICRyZXBvc2l0b3J5X21hcCA9ICRkYi0+ZmV0Y2hfdGFi bGUoJ3RyaWdnZXJhYmxlX3JlcG9zaXRvcmllcycpOwogICAgICAgICBpZiAoJHJlcG9zaXRvcnlf bWFwKSB7CiAgICAgICAgICAgICBmb3JlYWNoICgkcmVwb3NpdG9yeV9tYXAgYXMgJHJvdykgewog ICAgICAgICAgICAgICAgICR0cmlnZ2VyYWJsZSA9ICYkaWRfdG9fdHJpZ2dlcmFibGVbJHJvd1sn dHJpZ3JlcG9fdHJpZ2dlcmFibGUnXV07CkBAIC0yMDUsNyArMjExLDcgQEAgY2xhc3MgTWFuaWZl c3RHZW5lcmF0b3IgewogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgJGNvbmZp Z3VyYXRpb25fbWFwID0gJHRoaXMtPmRiLT5mZXRjaF90YWJsZSgndHJpZ2dlcmFibGVfY29uZmln dXJhdGlvbnMnKTsKKyAgICAgICAgJGNvbmZpZ3VyYXRpb25fbWFwID0gJGRiLT5mZXRjaF90YWJs ZSgndHJpZ2dlcmFibGVfY29uZmlndXJhdGlvbnMnKTsKICAgICAgICAgaWYgKCRjb25maWd1cmF0 aW9uX21hcCkgewogICAgICAgICAgICAgZm9yZWFjaCAoJGNvbmZpZ3VyYXRpb25fbWFwIGFzICRy b3cpIHsKICAgICAgICAgICAgICAgICAkdHJpZ2dlcmFibGUgPSAmJGlkX3RvX3RyaWdnZXJhYmxl WyRyb3dbJ3RyaWdjb25maWdfdHJpZ2dlcmFibGUnXV07Cg==