159797 2016-07-14 17:30:41 -0700 Return the correct value from Heap::externalMemorySize 2016-07-14 22:00:02 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue ggaren joepeck keith_miller kling mark.lam mattbaker msaboff nvasilyev saam timothy webkit-bug-importer oldest_to_newest 1211261 0 joepeck 2016-07-14 17:30:41 -0700 Return the correct value from Heap::externalMemorySize. In practice this wasn't noticed because: m_externalMemorySize < m_extraMemorySize < Heap::extraMemorySize() ^ extra, deprecatedExtra, and ArrayBuffers And the difference between m_externalMemorySize and m_extraMemorySize is relatively small. So this didn't cause any issues in the ResourceUsageOverlay / Web Inspector Memory Timeline. Still, we should use the correct value! 1211263 1 webkit-bug-importer 2016-07-14 17:31:23 -0700 <rdar://problem/27362446> 1211266 2 283716 joepeck 2016-07-14 17:34:02 -0700 Created attachment 283716 [PATCH] Proposed Fix 1211330 3 283716 commit-queue 2016-07-14 21:59:57 -0700 Comment on attachment 283716 [PATCH] Proposed Fix Clearing flags on attachment: 283716 Committed r203268: <http://trac.webkit.org/changeset/203268> 1211331 4 commit-queue 2016-07-14 22:00:02 -0700 All reviewed patches have been landed. Closing bug. 283716 2016-07-14 17:34:02 -0700 2016-07-14 21:59:57 -0700 [PATCH] Proposed Fix fix-external-1.patch text/plain 1534 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGFiYzU1NWEuLmYxZjhiMDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTA3LTE0ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgUmV0dXJuIHRoZSBjb3JyZWN0IHZh bHVlIGZyb20gSGVhcDo6ZXh0ZXJuYWxNZW1vcnlTaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk3OTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzI3MzYyNDQ2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogaGVhcC9IZWFwLmg6CisgICAgICAgIChKU0M6OkhlYXA6OmV4dGVybmFsTWVtb3J5U2l6 ZSk6CisgICAgICAgIFdlIHNob3VsZCBoYXZlIGJlZW4gcmV0dXJuaW5nIG1fZXh0ZXJuYWxNZW1v cnlTaXplIHdoaWNoIGlzIGEgc3Vic2V0CisgICAgICAgIG9mIG1fZXh0cmFNZW1vcnlTaXplLiBJ biBwcmFjdGljZSB0aGUgZGlmZmVyZW5jZSBjYW4gYmUgc21hbGwuIEEgbWFqb3IKKyAgICAgICAg ZGlmZmVyZW5jZSBpbiAiZXh0cmEgbWVtb3J5IHNpemUiIG1heSBiZSBmcm9tIGRlcHJlY2F0ZWQg bWVtb3J5IHNpemUKKyAgICAgICAgYW5kIGFycmF5IGJ1ZmZlciBzaXplcy4KKwogMjAxNi0wNy0x NCAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFTU0VSVElP TiBGQUlMRUQ6IDogdGhpcyAhPSByZXBsYWNlbWVudCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaGVhcC9IZWFwLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFw LmgKaW5kZXggMWE5NjM1ZC4uZmVmZGJiMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2hlYXAvSGVhcC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaApA QCAtMTgyLDcgKzE4Miw3IEBAIHB1YmxpYzoKICNpZiBFTkFCTEUoUkVTT1VSQ0VfVVNBR0UpCiAg ICAgLy8gVXNlIHRoaXMgQVBJIHRvIHJlcG9ydCB0aGUgc3Vic2V0IG9mIGV4dHJhIG1lbW9yeSB0 aGF0IGxpdmVzIG91dHNpZGUgdGhpcyBwcm9jZXNzLgogICAgIHZvaWQgcmVwb3J0RXh0ZXJuYWxN ZW1vcnlWaXNpdGVkKENlbGxTdGF0ZSBjZWxsU3RhdGVCZWZvcmVWaXNpdGluZywgc2l6ZV90KTsK LSAgICBzaXplX3QgZXh0ZXJuYWxNZW1vcnlTaXplKCkgeyByZXR1cm4gbV9leHRyYU1lbW9yeVNp emU7IH0KKyAgICBzaXplX3QgZXh0ZXJuYWxNZW1vcnlTaXplKCkgeyByZXR1cm4gbV9leHRlcm5h bE1lbW9yeVNpemU7IH0KICNlbmRpZgogCiAgICAgLy8gVXNlIHRoaXMgQVBJIHRvIHJlcG9ydCBu b24tR0MgbWVtb3J5IGlmIHlvdSBjYW4ndCB1c2UgdGhlIGJldHRlciBBUEkgYWJvdmUuCg==