174234 2017-07-06 19:54:58 -0700 Drop unnecessary uses of targetStatistics.dataRecordsRemoved in ResourceLoadObserver 2017-07-06 21:15:14 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez bfulgham buildbot commit-queue dbates japhet wilander oldest_to_newest 1326320 0 cdumez 2017-07-06 19:54:58 -0700 Drop unnecessary uses of targetStatistics.dataRecordsRemoved in ResourceLoadObserver. It is always 0 since this member is only initialized later on, in the UIProcess. 1326331 1 314800 cdumez 2017-07-06 20:14:29 -0700 Created attachment 314800 Patch 1326344 2 314800 bfulgham 2017-07-06 20:40:43 -0700 Comment on attachment 314800 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314800&action=review Much tidier. Thank you for cleaning this up! > Source/WebCore/loader/ResourceLoadObserver.cpp:146 > { Do we need this scope? I think it might have been here to support locking, which we don't do anymore. 1326345 3 314800 cdumez 2017-07-06 20:41:54 -0700 Comment on attachment 314800 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314800&action=review >> Source/WebCore/loader/ResourceLoadObserver.cpp:146 >> { > > Do we need this scope? I think it might have been here to support locking, which we don't do anymore. I added it to make sure people do not use targetStatistics later on in this function since the reference gets invalidated by the later call to ensureResourceStatisticsForPrimaryDomain() in this function. 1326364 4 314800 commit-queue 2017-07-06 21:15:12 -0700 Comment on attachment 314800 Patch Clearing flags on attachment: 314800 Committed r219236: <http://trac.webkit.org/changeset/219236> 1326365 5 commit-queue 2017-07-06 21:15:14 -0700 All reviewed patches have been landed. Closing bug. 314800 2017-07-06 20:14:29 -0700 2017-07-06 21:15:12 -0700 Patch bug-174234-20170706201425.patch text/plain 5076 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDgzZjE0OTI1ZGIzNzdj MTMyNjk5OWVlZDMwNjE1ZjhkNGZiZDY0ZS4uZDBlMzU5MDAzYjUwNmEyZmZiYWNkZGU4YTgxNmNi N2NjYjgwMWVjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDE3LTA3LTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRHJvcCB1bm5lY2Vzc2FyeSB1 c2VzIG9mIHRhcmdldFN0YXRpc3RpY3MuZGF0YVJlY29yZHNSZW1vdmVkIGluIFJlc291cmNlTG9h ZE9ic2VydmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzQyMzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBEcm9wIHVubmVjZXNzYXJ5IHVzZXMgb2YgdGFyZ2V0U3RhdGlzdGljcy5kYXRhUmVjb3Jkc1Jl bW92ZWQgaW4gUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuIEl0IGlzCisgICAgICAgIGFsd2F5cyAwIHNp bmNlIHRoaXMgbWVtYmVyIGlzIG9ubHkgaW5pdGlhbGl6ZWQgbGF0ZXIgb24sIGluIHRoZSBVSVBy b2Nlc3MuCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ0ZyYW1lTmF2aWdhdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nU3VicmVzb3VyY2VM b2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dXZWJT b2NrZXRMb2FkaW5nKToKKworMjAxNy0wNy0wNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu Y29tPgorCiAgICAgICAgIERyb3AgdW51c2VkIFJlc291cmNlTG9hZFN0YXRpc3RpY3MgbWVtYmVy cwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MjI2 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwCmlu ZGV4IDYwMjk3ZGNiNmE4NzVjZDMwM2YwZDdmNDE4YWZiNjk3MzRhMTZiY2QuLjM5ZTUzMTQ1MDNi ODE2ZGI3NjEzNzc3YTNhNGIwYjFhZjRhMmZmNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcApAQCAtODQsNiArODQsOSBAQCB2b2lkIFJlc291 cmNlTG9hZE9ic2VydmVyOjpsb2dGcmFtZU5hdmlnYXRpb24oY29uc3QgRnJhbWUmIGZyYW1lLCBj b25zdCBGcmFtZSYgdAogICAgIEFTU0VSVChmcmFtZS5kb2N1bWVudCgpKTsKICAgICBBU1NFUlQo dG9wRnJhbWUuZG9jdW1lbnQoKSk7CiAgICAgQVNTRVJUKHRvcEZyYW1lLnBhZ2UoKSk7CisKKyAg ICBpZiAoZnJhbWUuaXNNYWluRnJhbWUoKSkKKyAgICAgICAgcmV0dXJuOwogICAgIAogICAgIGlm ICghc2hvdWxkTG9nKHRvcEZyYW1lLnBhZ2UoKSkpCiAgICAgICAgIHJldHVybjsKQEAgLTEwOSwx OCArMTEyLDggQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nRnJhbWVOYXZpZ2F0aW9u KGNvbnN0IEZyYW1lJiBmcmFtZSwgY29uc3QgRnJhbWUmIHQKICAgICAgICAgcmV0dXJuOwogCiAg ICAgYXV0byYgdGFyZ2V0U3RhdGlzdGljcyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclBy aW1hcnlEb21haW4odGFyZ2V0UHJpbWFyeURvbWFpbik7Ci0KLSAgICAvLyBBbHdheXMgZmlyZSBp ZiB3ZSBoYXZlIHByZXZpb3VzbHkgcmVtb3ZlZCBkYXRhIHJlY29yZHMgZm9yIHRoaXMgZG9tYWlu Ci0gICAgLy8gRklYTUU6IHRhcmdldFN0YXRpc3RpY3MuZGF0YVJlY29yZHNSZW1vdmVkIGlzIGFs d2F5cyAwIGluIFdlYkNvcmUgYXMgaXQgZ2V0cyBwb3B1bGF0ZWQgaW4gdGhlIFVJUHJvY2Vzcy4K LSAgICBib29sIHNob3VsZENhbGxOb3RpZmljYXRpb25DYWxsYmFjayA9IHRhcmdldFN0YXRpc3Rp Y3MuZGF0YVJlY29yZHNSZW1vdmVkID4gMDsKLQotICAgIGlmICghZnJhbWUuaXNNYWluRnJhbWUo KSkgewotICAgICAgICBhdXRvIHN1YmZyYW1lVW5kZXJUb3BGcmFtZU9yaWdpbnNSZXN1bHQgPSB0 YXJnZXRTdGF0aXN0aWNzLnN1YmZyYW1lVW5kZXJUb3BGcmFtZU9yaWdpbnMuYWRkKG1haW5GcmFt ZVByaW1hcnlEb21haW4pOwotICAgICAgICBpZiAoc3ViZnJhbWVVbmRlclRvcEZyYW1lT3JpZ2lu c1Jlc3VsdC5pc05ld0VudHJ5KQotICAgICAgICAgICAgc2hvdWxkQ2FsbE5vdGlmaWNhdGlvbkNh bGxiYWNrID0gdHJ1ZTsKLSAgICB9Ci0KLSAgICBpZiAoc2hvdWxkQ2FsbE5vdGlmaWNhdGlvbkNh bGxiYWNrKQorICAgIGF1dG8gc3ViZnJhbWVVbmRlclRvcEZyYW1lT3JpZ2luc1Jlc3VsdCA9IHRh cmdldFN0YXRpc3RpY3Muc3ViZnJhbWVVbmRlclRvcEZyYW1lT3JpZ2lucy5hZGQobWFpbkZyYW1l UHJpbWFyeURvbWFpbik7CisgICAgaWYgKHN1YmZyYW1lVW5kZXJUb3BGcmFtZU9yaWdpbnNSZXN1 bHQuaXNOZXdFbnRyeSkKICAgICAgICAgc2NoZWR1bGVOb3RpZmljYXRpb25JZk5lZWRlZCgpOwog fQogICAgIApAQCAtMTUwLDIzICsxNDMsMTUgQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6 bG9nU3VicmVzb3VyY2VMb2FkaW5nKGNvbnN0IEZyYW1lKiBmcmFtZSwgY29uc3QgUmVzb3UKICAg ICAgICAgcmV0dXJuOwogCiAgICAgYm9vbCBzaG91bGRDYWxsTm90aWZpY2F0aW9uQ2FsbGJhY2sg PSBmYWxzZTsKLQogICAgIHsKICAgICAgICAgYXV0byYgdGFyZ2V0U3RhdGlzdGljcyA9IGVuc3Vy ZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4odGFyZ2V0UHJpbWFyeURvbWFpbik7 Ci0KLSAgICAgICAgLy8gQWx3YXlzIGZpcmUgaWYgd2UgaGF2ZSBwcmV2aW91c2x5IHJlbW92ZWQg ZGF0YSByZWNvcmRzIGZvciB0aGlzIGRvbWFpbgotICAgICAgICAvLyBGSVhNRTogdGFyZ2V0U3Rh dGlzdGljcy5kYXRhUmVjb3Jkc1JlbW92ZWQgaXMgYWx3YXlzIDAgaW4gV2ViQ29yZSBhcyBpdCBn ZXRzIHBvcHVsYXRlZCBpbiB0aGUgVUlQcm9jZXNzLgotICAgICAgICBzaG91bGRDYWxsTm90aWZp Y2F0aW9uQ2FsbGJhY2sgPSB0YXJnZXRTdGF0aXN0aWNzLmRhdGFSZWNvcmRzUmVtb3ZlZCA+IDA7 Ci0KLSAgICAgICAgYXV0byBzdWJyZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zUmVzdWx0ID0g dGFyZ2V0U3RhdGlzdGljcy5zdWJyZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zLmFkZChtYWlu RnJhbWVQcmltYXJ5RG9tYWluKTsKLSAgICAgICAgaWYgKHN1YnJlc291cmNlVW5kZXJUb3BGcmFt ZU9yaWdpbnNSZXN1bHQuaXNOZXdFbnRyeSkKKyAgICAgICAgaWYgKHRhcmdldFN0YXRpc3RpY3Mu c3VicmVzb3VyY2VVbmRlclRvcEZyYW1lT3JpZ2lucy5hZGQobWFpbkZyYW1lUHJpbWFyeURvbWFp bikuaXNOZXdFbnRyeSkKICAgICAgICAgICAgIHNob3VsZENhbGxOb3RpZmljYXRpb25DYWxsYmFj ayA9IHRydWU7CiAgICAgfQogCiAgICAgaWYgKGlzUmVkaXJlY3QpIHsKICAgICAgICAgYXV0byYg cmVkaXJlY3RpbmdPcmlnaW5TdGF0aXN0aWNzID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9y UHJpbWFyeURvbWFpbihzb3VyY2VQcmltYXJ5RG9tYWluKTsKLSAgICAgICAgYXV0byBzdWJyZXNv dXJjZVVuaXF1ZVJlZGlyZWN0c1RvUmVzdWx0ID0gcmVkaXJlY3RpbmdPcmlnaW5TdGF0aXN0aWNz LnN1YnJlc291cmNlVW5pcXVlUmVkaXJlY3RzVG8uYWRkKHRhcmdldFByaW1hcnlEb21haW4pOwot ICAgICAgICBpZiAoc3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUb1Jlc3VsdC5pc05ld0VudHJ5 KQorICAgICAgICBpZiAocmVkaXJlY3RpbmdPcmlnaW5TdGF0aXN0aWNzLnN1YnJlc291cmNlVW5p cXVlUmVkaXJlY3RzVG8uYWRkKHRhcmdldFByaW1hcnlEb21haW4pLmlzTmV3RW50cnkpCiAgICAg ICAgICAgICBzaG91bGRDYWxsTm90aWZpY2F0aW9uQ2FsbGJhY2sgPSB0cnVlOwogICAgIH0KIApA QCAtMTk5LDE2ICsxODQsNyBAQCB2b2lkIFJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dXZWJTb2Nr ZXRMb2FkaW5nKGNvbnN0IEZyYW1lKiBmcmFtZSwgY29uc3QgVVJMJiB0YQogICAgICAgICByZXR1 cm47CiAKICAgICBhdXRvJiB0YXJnZXRTdGF0aXN0aWNzID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0 aWNzRm9yUHJpbWFyeURvbWFpbih0YXJnZXRQcmltYXJ5RG9tYWluKTsKLQotICAgIC8vIEFsd2F5 cyBmaXJlIGlmIHdlIGhhdmUgcHJldmlvdXNseSByZW1vdmVkIGRhdGEgcmVjb3JkcyBmb3IgdGhp cyBkb21haW4KLSAgICAvLyBGSVhNRTogdGFyZ2V0U3RhdGlzdGljcy5kYXRhUmVjb3Jkc1JlbW92 ZWQgaXMgYWx3YXlzIDAgaW4gV2ViQ29yZSBhcyBpdCBnZXRzIHBvcHVsYXRlZCBpbiB0aGUgVUlQ cm9jZXNzLgotICAgIGJvb2wgc2hvdWxkQ2FsbE5vdGlmaWNhdGlvbkNhbGxiYWNrID0gdGFyZ2V0 U3RhdGlzdGljcy5kYXRhUmVjb3Jkc1JlbW92ZWQgPiAwOwotCi0gICAgYXV0byBzdWJyZXNvdXJj ZVVuZGVyVG9wRnJhbWVPcmlnaW5zUmVzdWx0ID0gdGFyZ2V0U3RhdGlzdGljcy5zdWJyZXNvdXJj ZVVuZGVyVG9wRnJhbWVPcmlnaW5zLmFkZChtYWluRnJhbWVQcmltYXJ5RG9tYWluKTsKLSAgICBp ZiAoc3VicmVzb3VyY2VVbmRlclRvcEZyYW1lT3JpZ2luc1Jlc3VsdC5pc05ld0VudHJ5KQotICAg ICAgICBzaG91bGRDYWxsTm90aWZpY2F0aW9uQ2FsbGJhY2sgPSB0cnVlOwotCi0gICAgaWYgKHNo b3VsZENhbGxOb3RpZmljYXRpb25DYWxsYmFjaykKKyAgICBpZiAodGFyZ2V0U3RhdGlzdGljcy5z dWJyZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zLmFkZChtYWluRnJhbWVQcmltYXJ5RG9tYWlu KS5pc05ld0VudHJ5KQogICAgICAgICBzY2hlZHVsZU5vdGlmaWNhdGlvbklmTmVlZGVkKCk7CiB9 CiAK