139869 2014-12-22 11:08:35 -0800 [iOS] Log using FeatureCounter when a PacheCache entry is not reused because it expired 2014-12-22 12:13:30 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez barraclough commit-queue japhet kling koivisto oldest_to_newest 1057407 0 cdumez 2014-12-22 11:08:35 -0800 Log using FeatureCounter when a PacheCache entry is not reused because it expired. Radar: <rdar://problem/19255690> 1057409 1 243628 cdumez 2014-12-22 11:13:08 -0800 Created attachment 243628 Patch 1057427 2 243628 commit-queue 2014-12-22 12:13:25 -0800 Comment on attachment 243628 Patch Clearing flags on attachment: 243628 Committed r177647: <http://trac.webkit.org/changeset/177647> 1057428 3 commit-queue 2014-12-22 12:13:30 -0800 All reviewed patches have been landed. Closing bug. 243628 2014-12-22 11:13:08 -0800 2014-12-22 12:13:25 -0800 Patch bug-139869-20141222111309.patch text/plain 7201 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NjMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzlkYmY3MDA4MzlkZGI2 ZTc0MWE4N2ZjZjcwMjQ1OGY1Y2NlNWEyYS4uZjEzYzFhNjZkZTIzYjM4NTUwNDIxZGI4ZGU0Y2Y3 YmY3NWJlOGMzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE0LTEyLTIyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW2lPU10gTG9nIHVzaW5nIEZl YXR1cmVDb3VudGVyIHdoZW4gYSBQYWNoZUNhY2hlIGVudHJ5IGlzIG5vdCByZXVzZWQgYmVjYXVz ZSBpdCBleHBpcmVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzk4NjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5MjU1NjkwPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExvZyB1c2luZyBGZWF0dXJl Q291bnRlciB3aGVuIGEgUGFjaGVDYWNoZSBlbnRyeSBpcyBub3QgcmV1c2VkIGJlY2F1c2UKKyAg ICAgICAgaXQgZXhwaXJlZC4KKworICAgICAgICAqIGhpc3RvcnkvUGFnZUNhY2hlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBhZ2VDYWNoZTo6dGFrZSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdl Q2FjaGU6OmdldCk6CisgICAgICAgICogaGlzdG9yeS9QYWdlQ2FjaGUuaDoKKyAgICAgICAgKiBs b2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNv bW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9h ZERpZmZlcmVudERvY3VtZW50SXRlbSk6CisgICAgICAgICogbG9hZGVyL0hpc3RvcnlDb250cm9s bGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlDb250cm9sbGVyOjppbnZhbGlkYXRl Q3VycmVudEl0ZW1DYWNoZWRQYWdlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9GZWF0dXJlQ291bnRl cktleXMuaDoKKworMjAxNC0xMi0yMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgor CiAgICAgICAgIE1vdmUgIkF1dG8iIENTUyBwcm9wZXJ0aWVzIHRvIHRoZSBuZXcgU3R5bGVCdWls ZGVyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk4 NTgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwIGIv U291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwCmluZGV4IDgwNTg4MzMwZWUxMDYy NzgzNDI5ZDU2YTNkYTEwY2E3ZTdhOGQ1NWMuLjMxMWVhMTRmYzBmYzk5MjNjYzVlMDEyYTY3OWM5 OGM0OTYxYTNjYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvUGFnZUNhY2hl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5jcHAKQEAgLTQ1MSw3 ICs0NTEsNyBAQCB2b2lkIFBhZ2VDYWNoZTo6YWRkKFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+IHBy cEl0ZW0sIFBhZ2UmIHBhZ2UpCiAgICAgcHJ1bmUoKTsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPENh Y2hlZFBhZ2U+IFBhZ2VDYWNoZTo6dGFrZShIaXN0b3J5SXRlbSogaXRlbSkKK3N0ZDo6dW5pcXVl X3B0cjxDYWNoZWRQYWdlPiBQYWdlQ2FjaGU6OnRha2UoSGlzdG9yeUl0ZW0qIGl0ZW0sIFBhZ2Uq IHBhZ2UpCiB7CiAgICAgaWYgKCFpdGVtKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKQEAgLTQ2 OCwyNSArNDY4LDI3IEBAIHN0ZDo6dW5pcXVlX3B0cjxDYWNoZWRQYWdlPiBQYWdlQ2FjaGU6OnRh a2UoSGlzdG9yeUl0ZW0qIGl0ZW0pCiAKICAgICBpZiAoY2FjaGVkUGFnZS0+aGFzRXhwaXJlZCgp KSB7CiAgICAgICAgIExPRyhQYWdlQ2FjaGUsICJOb3QgcmVzdG9yaW5nIHBhZ2UgZm9yICVzIGZy b20gYmFjay9mb3J3YXJkIGNhY2hlIGJlY2F1c2UgY2FjaGUgZW50cnkgaGFzIGV4cGlyZWQiLCBp dGVtLT51cmwoKS5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSk7CisgICAgICAgIEZFQVRVUkVfQ09V TlRFUl9JTkNSRU1FTlRfS0VZKHBhZ2UsIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZUV4 cGlyZWRLZXkpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKICAgICByZXR1cm4g Y2FjaGVkUGFnZTsKIH0KIAotQ2FjaGVkUGFnZSogUGFnZUNhY2hlOjpnZXQoSGlzdG9yeUl0ZW0q IGl0ZW0pCitDYWNoZWRQYWdlKiBQYWdlQ2FjaGU6OmdldChIaXN0b3J5SXRlbSogaXRlbSwgUGFn ZSogcGFnZSkKIHsKICAgICBpZiAoIWl0ZW0pCi0gICAgICAgIHJldHVybiAwOworICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKIAogICAgIGlmIChDYWNoZWRQYWdlKiBjYWNoZWRQYWdlID0gaXRlbS0+ bV9jYWNoZWRQYWdlLmdldCgpKSB7CiAgICAgICAgIGlmICghY2FjaGVkUGFnZS0+aGFzRXhwaXJl ZCgpKQogICAgICAgICAgICAgcmV0dXJuIGNhY2hlZFBhZ2U7CiAgICAgICAgIAogICAgICAgICBM T0coUGFnZUNhY2hlLCAiTm90IHJlc3RvcmluZyBwYWdlIGZvciAlcyBmcm9tIGJhY2svZm9yd2Fy ZCBjYWNoZSBiZWNhdXNlIGNhY2hlIGVudHJ5IGhhcyBleHBpcmVkIiwgaXRlbS0+dXJsKCkuc3Ry aW5nKCkuYXNjaWkoKS5kYXRhKCkpOworICAgICAgICBGRUFUVVJFX0NPVU5URVJfSU5DUkVNRU5U X0tFWShwYWdlLCBGZWF0dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1cmVFeHBpcmVkS2V5KTsKICAg ICAgICAgcGFnZUNhY2hlKCktPnJlbW92ZShpdGVtKTsKICAgICB9Ci0gICAgcmV0dXJuIDA7Cisg ICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKIHZvaWQgUGFnZUNhY2hlOjpyZW1vdmUoSGlzdG9yeUl0 ZW0qIGl0ZW0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5o IGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuaAppbmRleCBjZWQ0ZDYyZjVkYzFm YzMzYmRjNGNmMjAzMDQyM2RjMzU3ZDUxOGIwLi5jOTZmNDdhZGMyY2QyM2ExODcyZTVkY2I2NTNh ZDQ4ZWI3YjY5NGFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNo ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvUGFnZUNhY2hlLmgKQEAgLTUwLDggKzUw LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAKICAgICAgICAgdm9pZCBhZGQoUGFz c1JlZlB0cjxIaXN0b3J5SXRlbT4sIFBhZ2UmKTsgLy8gUHJ1bmVzIGlmIGNhcGFjaXR5KCkgaXMg ZXhjZWVkZWQuCiAgICAgICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVtb3ZlKEhpc3RvcnlJdGVt Kik7Ci0gICAgICAgIENhY2hlZFBhZ2UqIGdldChIaXN0b3J5SXRlbSogaXRlbSk7Ci0gICAgICAg IHN0ZDo6dW5pcXVlX3B0cjxDYWNoZWRQYWdlPiB0YWtlKEhpc3RvcnlJdGVtKik7CisgICAgICAg IENhY2hlZFBhZ2UqIGdldChIaXN0b3J5SXRlbSosIFBhZ2UqKTsKKyAgICAgICAgc3RkOjp1bmlx dWVfcHRyPENhY2hlZFBhZ2U+IHRha2UoSGlzdG9yeUl0ZW0qLCBQYWdlKik7CiAKICAgICAgICAg aW50IHBhZ2VDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fc2l6ZTsgfQogICAgICAgICBXRUJDT1JF X0VYUE9SVCBpbnQgZnJhbWVDb3VudCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAKaW5kZXggZjMzMjMxMDFjM2Q4M2QxY2ViZWNjYzQxZWYzYzg1ZWRmNGMwYmUzOC4u ODdmOTQ1MzJlNTRiYWIxZmI0ZDA1MmRhN2I5YjNmOGI1ZWQzNjRkOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0xNzQ5LDcgKzE3NDksNyBAQCB2b2lkIEZyYW1lTG9h ZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQoKQogCiAgICAgc3RkOjp1bmlxdWVfcHRyPENhY2hl ZFBhZ2U+IGNhY2hlZFBhZ2U7CiAgICAgaWYgKG1fbG9hZGluZ0Zyb21DYWNoZWRQYWdlKQotICAg ICAgICBjYWNoZWRQYWdlID0gcGFnZUNhY2hlKCktPnRha2UoaGlzdG9yeSgpLnByb3Zpc2lvbmFs SXRlbSgpKTsKKyAgICAgICAgY2FjaGVkUGFnZSA9IHBhZ2VDYWNoZSgpLT50YWtlKGhpc3Rvcnko KS5wcm92aXNpb25hbEl0ZW0oKSwgbV9mcmFtZS5wYWdlKCkpOwogCiAgICAgTE9HKFBhZ2VDYWNo ZSwgIldlYkNvcmVMb2FkaW5nICVzOiBBYm91dCB0byBjb21taXQgcHJvdmlzaW9uYWwgbG9hZCBm cm9tIHByZXZpb3VzIFVSTCAnJXMnIHRvIG5ldyBVUkwgJyVzJyIsIG1fZnJhbWUudHJlZSgpLnVu aXF1ZU5hbWUoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLAogICAgICAgICBtX2ZyYW1lLmRvY3Vt ZW50KCkgPyBtX2ZyYW1lLmRvY3VtZW50KCktPnVybCgpLnN0cmluZ0NlbnRlckVsbGlwc2l6ZWRU b0xlbmd0aCgpLnV0ZjgoKS5kYXRhKCkgOiAiIiwKQEAgLTMxNzUsNyArMzE3NSw3IEBAIHZvaWQg RnJhbWVMb2FkZXI6OmxvYWREaWZmZXJlbnREb2N1bWVudEl0ZW0oSGlzdG9yeUl0ZW0qIGl0ZW0s IEZyYW1lTG9hZFR5cGUgbG9hCiAgICAgLy8gUmVtZW1iZXIgdGhpcyBpdGVtIHNvIHdlIGNhbiB0 cmF2ZXJzZSBhbnkgY2hpbGQgaXRlbXMgYXMgY2hpbGQgZnJhbWVzIGxvYWQKICAgICBoaXN0b3J5 KCkuc2V0UHJvdmlzaW9uYWxJdGVtKGl0ZW0pOwogCi0gICAgaWYgKENhY2hlZFBhZ2UqIGNhY2hl ZFBhZ2UgPSBwYWdlQ2FjaGUoKS0+Z2V0KGl0ZW0pKSB7CisgICAgaWYgKENhY2hlZFBhZ2UqIGNh Y2hlZFBhZ2UgPSBwYWdlQ2FjaGUoKS0+Z2V0KGl0ZW0sIG1fZnJhbWUucGFnZSgpKSkgewogICAg ICAgICBhdXRvIGRvY3VtZW50TG9hZGVyID0gY2FjaGVkUGFnZS0+ZG9jdW1lbnRMb2FkZXIoKTsK ICAgICAgICAgZG9jdW1lbnRMb2FkZXItPnNldFRyaWdnZXJpbmdBY3Rpb24oTmF2aWdhdGlvbkFj dGlvbihkb2N1bWVudExvYWRlci0+cmVxdWVzdCgpLCBsb2FkVHlwZSwgZmFsc2UpKTsKICAgICAg ICAgZG9jdW1lbnRMb2FkZXItPnNldExhc3RDaGVja2VkUmVxdWVzdChSZXNvdXJjZVJlcXVlc3Qo KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcAppbmRleCA5 NmRmNTBhZWRhZDk0NDI1ZWQ3MGE4MmQ3OGE2Yjk1NTA1NzE2MDJlLi5iNzFjNWI1M2RkNTdlNjg3 Nzk4Y2FmMzQxNTViMGNhMTI0YzVjMzM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0 b3J5Q29udHJvbGxlci5jcHAKQEAgLTIzNSwxMCArMjM1LDEwIEBAIHZvaWQgSGlzdG9yeUNvbnRy b2xsZXI6OnJlc3RvcmVEb2N1bWVudFN0YXRlKCkKIHZvaWQgSGlzdG9yeUNvbnRyb2xsZXI6Omlu dmFsaWRhdGVDdXJyZW50SXRlbUNhY2hlZFBhZ2UoKQogewogICAgIC8vIFdoZW4gd2UgYXJlIHBy ZS1jb21taXQsIHRoZSBjdXJyZW50SXRlbSBpcyB3aGVyZSBhbnkgcGFnZSBjYWNoZSBkYXRhIHJl c2lkZXMuCi0gICAgaWYgKCFwYWdlQ2FjaGUoKS0+Z2V0KGN1cnJlbnRJdGVtKCkpKQorICAgIGlm ICghcGFnZUNhY2hlKCktPmdldChjdXJyZW50SXRlbSgpLCBtX2ZyYW1lLnBhZ2UoKSkpCiAgICAg ICAgIHJldHVybjsKIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxDYWNoZWRQYWdlPiBjYWNoZWRQYWdl ID0gcGFnZUNhY2hlKCktPnRha2UoY3VycmVudEl0ZW0oKSk7CisgICAgc3RkOjp1bmlxdWVfcHRy PENhY2hlZFBhZ2U+IGNhY2hlZFBhZ2UgPSBwYWdlQ2FjaGUoKS0+dGFrZShjdXJyZW50SXRlbSgp LCBtX2ZyYW1lLnBhZ2UoKSk7CiAKICAgICAvLyBGSVhNRTogVGhpcyBpcyBhIGdyb3Rlc3F1ZSBo YWNrIHRvIGZpeCA8cmRhcjovL3Byb2JsZW0vNDA1OTA1OT4gQ3Jhc2ggaW4gUmVuZGVyRmxvdzo6 ZGV0YWNoCiAgICAgLy8gU29tZWhvdyB0aGUgUGFnZVN0YXRlIG9iamVjdCBpcyBub3QgcHJvcGVy bHkgdXBkYXRlZCwgYW5kIGlzIGhvbGRpbmcgb250byBhIHN0YWxlIGRvY3VtZW50LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmVhdHVyZUNvdW50ZXJLZXlzLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaAppbmRleCAxZjljMzFjYjBk MzRlOGI4YzJlMTVlMmZiZGUzZGQ2MmVhZDViNTNhLi4yZWJmNGU3OTc4NDlkZWI1M2Q2OTI0MzU2 YzRjZGI2OGQ5M2ZmNWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GZWF0 dXJlQ291bnRlcktleXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GZWF0dXJlQ291 bnRlcktleXMuaApAQCAtNTgsNiArNTgsNyBAQCBzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291 bnRlclBhZ2VDYWNoZUZhaWx1cmVEZXZpY2VQcm94aW1pdHlLZXlbXSA9ICJjb20uYXBwbAogc3Rh dGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJQYWdlQ2FjaGVGYWlsdXJlUmVsb2FkS2V5W10g PSAiY29tLmFwcGxlLldlYktpdC5wYWdlQ2FjaGUuZmFpbHVyZS5yZWxvYWQiOwogc3RhdGljIGNv bnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJQYWdlQ2FjaGVGYWlsdXJlUmVsb2FkRnJvbU9yaWdpbktl eVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFnZUNhY2hlLmZhaWx1cmUucmVsb2FkRnJvbU9yaWdp biI7CiBzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1cmVTYW1l TG9hZEtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFnZUNhY2hlLmZhaWx1cmUuc2FtZUxvYWQi Oworc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJQYWdlQ2FjaGVGYWlsdXJlRXhwaXJl ZEtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFnZUNhY2hlLmZhaWx1cmUuZXhwaXJlZCI7CiBz dGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1cmVLZXlbXSA9ICJj b20uYXBwbGUuV2ViS2l0LnBhZ2VDYWNoZS5mYWlsdXJlIjsKIHN0YXRpYyBjb25zdCBjaGFyIEZl YXR1cmVDb3VudGVyUGFnZUNhY2hlU3VjY2Vzc0tleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFn ZUNhY2hlLnN1Y2Nlc3MiOwogCg==