161851 2016-09-11 15:27:55 -0700 Start using Document::pageCacheState() instead of Document::inPageCache() 2018-08-07 16:52:37 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=188329 P2 Normal --- 161812 1 cdumez cdumez commit-queue darin dbates japhet kling rniwa oldest_to_newest 1228627 0 cdumez 2016-09-11 15:27:55 -0700 Start using Document::pageCacheState() instead of Document::inPageCache() as the latter is confusing. 1228628 1 288534 cdumez 2016-09-11 15:29:40 -0700 Created attachment 288534 Patch 1228708 2 288534 commit-queue 2016-09-12 02:28:24 -0700 Comment on attachment 288534 Patch Clearing flags on attachment: 288534 Committed r205805: <http://trac.webkit.org/changeset/205805> 1228709 3 commit-queue 2016-09-12 02:28:29 -0700 All reviewed patches have been landed. Closing bug. 288534 2016-09-11 15:29:40 -0700 2016-09-12 02:28:24 -0700 Patch bug-161851-20160911152708.patch text/plain 7000 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjA1Nzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNThiMzAzYzVmZjJlMzRl YjFmM2NhZmU4MDE4ZTVhYzBiYTUxZTI2Yy4uNjEzMjY4Yzc0OTQ0NmM2MTlkY2JhNjk4NTgyZjFl MTAwYjg3MTEzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE2LTA5LTExICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU3RhcnQgdXNpbmcgRG9jdW1l bnQ6OnBhZ2VDYWNoZVN0YXRlKCkgaW5zdGVhZCBvZiBEb2N1bWVudDo6aW5QYWdlQ2FjaGUoKQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYxODUxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RhcnQgdXNp bmcgRG9jdW1lbnQ6OnBhZ2VDYWNoZVN0YXRlKCkgaW5zdGVhZCBvZiBEb2N1bWVudDo6aW5QYWdl Q2FjaGUoKQorICAgICAgICBhcyB0aGUgbGF0dGVyIG9uZSBpcyBjb25mdXNpbmcgKGdpdmVuIHRo YXQgaXQgaXMgdHJ1ZSB3aGVuIGZpcmluZyB0aGUKKyAgICAgICAgcGFnZWhpZGUgZXZlbnQsIHdo ZW4gdGhlIGRvY3VtZW50IGlzIGFib3V0IHRvIGVudGVyIHBhZ2UgY2FjaGUpLgorCisgICAgICAg ICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVy OjpjbG9zZVVSTCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2xlYXIpOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmRpc3BhdGNoVW5sb2FkRXZlbnRzKToKKyAgICAg ICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q2FjaGVkUmVzb3VyY2U6OmxvYWQpOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjppbmNyZW1lbnRGcmFtZSk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9QYWdl Lmg6CisKIDIwMTYtMDktMTAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAg ICAgICBJdCBpcyBwb3NzaWJsZSBmb3IgRG9jdW1lbnQ6Om1fZnJhbWUgcG9pbnRlciB0byBiZWNv bWUgc3RhbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IGRmOTUyYjYy NjlmYzRjMThiZmFkYTg5ZDg0MDY3NTU5YWY3YjRkZWYuLmNkZDlmNzc3ZWEwNDQ4ZjVkODFhODBi YjNiMGNjYjFmZmJmYWYzZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApA QCAtNTE3LDcgKzUxNyw3IEBAIGJvb2wgRnJhbWVMb2FkZXI6OmNsb3NlVVJMKCkKICAgICAgICAg dW5sb2FkRXZlbnRQb2xpY3kgPSBVbmxvYWRFdmVudFBvbGljeU5vbmU7CiAgICAgfSBlbHNlIHsK ICAgICAgICAgLy8gU2hvdWxkIG9ubHkgc2VuZCB0aGUgcGFnZWhpZGUgZXZlbnQgaGVyZSBpZiB0 aGUgY3VycmVudCBkb2N1bWVudCBleGlzdHMgYW5kIGhhcyBub3QgYmVlbiBwbGFjZWQgaW4gdGhl IHBhZ2UgY2FjaGUuCi0gICAgICAgIHVubG9hZEV2ZW50UG9saWN5ID0gY3VycmVudERvY3VtZW50 ICYmICFjdXJyZW50RG9jdW1lbnQtPmluUGFnZUNhY2hlKCkgPyBVbmxvYWRFdmVudFBvbGljeVVu bG9hZEFuZFBhZ2VIaWRlIDogVW5sb2FkRXZlbnRQb2xpY3lVbmxvYWRPbmx5OworICAgICAgICB1 bmxvYWRFdmVudFBvbGljeSA9IGN1cnJlbnREb2N1bWVudCAmJiBjdXJyZW50RG9jdW1lbnQtPnBh Z2VDYWNoZVN0YXRlKCkgPT0gRG9jdW1lbnQ6Ok5vdEluUGFnZUNhY2hlID8gVW5sb2FkRXZlbnRQ b2xpY3lVbmxvYWRBbmRQYWdlSGlkZSA6IFVubG9hZEV2ZW50UG9saWN5VW5sb2FkT25seTsKICAg ICB9CiAKICAgICBzdG9wTG9hZGluZyh1bmxvYWRFdmVudFBvbGljeSk7CkBAIC01OTAsNyArNTkw LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y2xlYXIoRG9jdW1lbnQqIG5ld0RvY3VtZW50LCBib29s IGNsZWFyV2luZG93UHJvcGVydGllcywgYm9vbAogICAgICAgICByZXR1cm47CiAgICAgbV9uZWVk c0NsZWFyID0gZmFsc2U7CiAgICAgCi0gICAgaWYgKCFtX2ZyYW1lLmRvY3VtZW50KCktPmluUGFn ZUNhY2hlKCkpIHsKKyAgICBpZiAobV9mcmFtZS5kb2N1bWVudCgpLT5wYWdlQ2FjaGVTdGF0ZSgp ICE9IERvY3VtZW50OjpJblBhZ2VDYWNoZSkgewogICAgICAgICBtX2ZyYW1lLmRvY3VtZW50KCkt PmNhbmNlbFBhcnNpbmcoKTsKICAgICAgICAgbV9mcmFtZS5kb2N1bWVudCgpLT5zdG9wQWN0aXZl RE9NT2JqZWN0cygpOwogICAgICAgICBib29sIGhhZExpdmluZ1JlbmRlclRyZWUgPSBtX2ZyYW1l LmRvY3VtZW50KCktPmhhc0xpdmluZ1JlbmRlclRyZWUoKTsKQEAgLTYwMyw3ICs2MDMsNyBAQCB2 b2lkIEZyYW1lTG9hZGVyOjpjbGVhcihEb2N1bWVudCogbmV3RG9jdW1lbnQsIGJvb2wgY2xlYXJX aW5kb3dQcm9wZXJ0aWVzLCBib29sCiAgICAgaWYgKGNsZWFyV2luZG93UHJvcGVydGllcykgewog ICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmZyYW1lV2luZG93RGlzY2FyZGVkKCZt X2ZyYW1lLCBtX2ZyYW1lLmRvY3VtZW50KCktPmRvbVdpbmRvdygpKTsKICAgICAgICAgbV9mcmFt ZS5kb2N1bWVudCgpLT5kb21XaW5kb3coKS0+cmVzZXRVbmxlc3NTdXNwZW5kZWRGb3JEb2N1bWVu dFN1c3BlbnNpb24oKTsKLSAgICAgICAgbV9mcmFtZS5zY3JpcHQoKS5jbGVhcldpbmRvd1NoZWxs KG5ld0RvY3VtZW50LT5kb21XaW5kb3coKSwgbV9mcmFtZS5kb2N1bWVudCgpLT5pblBhZ2VDYWNo ZSgpKTsKKyAgICAgICAgbV9mcmFtZS5zY3JpcHQoKS5jbGVhcldpbmRvd1NoZWxsKG5ld0RvY3Vt ZW50LT5kb21XaW5kb3coKSwgbV9mcmFtZS5kb2N1bWVudCgpLT5wYWdlQ2FjaGVTdGF0ZSgpID09 IERvY3VtZW50OjpBYm91dFRvRW50ZXJQYWdlQ2FjaGUpOwogICAgIH0KIAogICAgIG1fZnJhbWUu c2VsZWN0aW9uKCkucHJlcGFyZUZvckRlc3RydWN0aW9uKCk7CkBAIC0yOTI0LDEzICsyOTI0LDEz IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmRpc3BhdGNoVW5sb2FkRXZlbnRzKFVubG9hZEV2ZW50UG9s aWN5IHVubG9hZEV2ZW50UG9saWN5KQogICAgICAgICBpZiAobV9wYWdlRGlzbWlzc2FsRXZlbnRC ZWluZ0Rpc3BhdGNoZWQgPT0gUGFnZURpc21pc3NhbFR5cGU6Ok5vbmUpIHsKICAgICAgICAgICAg IGlmICh1bmxvYWRFdmVudFBvbGljeSA9PSBVbmxvYWRFdmVudFBvbGljeVVubG9hZEFuZFBhZ2VI aWRlKSB7CiAgICAgICAgICAgICAgICAgbV9wYWdlRGlzbWlzc2FsRXZlbnRCZWluZ0Rpc3BhdGNo ZWQgPSBQYWdlRGlzbWlzc2FsVHlwZTo6UGFnZUhpZGU7Ci0gICAgICAgICAgICAgICAgbV9mcmFt ZS5kb2N1bWVudCgpLT5kb21XaW5kb3coKS0+ZGlzcGF0Y2hFdmVudChQYWdlVHJhbnNpdGlvbkV2 ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnBhZ2VoaWRlRXZlbnQsIG1fZnJhbWUuZG9jdW1lbnQo KS0+aW5QYWdlQ2FjaGUoKSksIG1fZnJhbWUuZG9jdW1lbnQoKSk7CisgICAgICAgICAgICAgICAg bV9mcmFtZS5kb2N1bWVudCgpLT5kb21XaW5kb3coKS0+ZGlzcGF0Y2hFdmVudChQYWdlVHJhbnNp dGlvbkV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnBhZ2VoaWRlRXZlbnQsIG1fZnJhbWUuZG9j dW1lbnQoKS0+cGFnZUNhY2hlU3RhdGUoKSA9PSBEb2N1bWVudDo6QWJvdXRUb0VudGVyUGFnZUNh Y2hlKSwgbV9mcmFtZS5kb2N1bWVudCgpKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAg Ly8gRklYTUU6IHVwZGF0ZSBQYWdlIFZpc2liaWxpdHkgc3RhdGUgaGVyZS4KICAgICAgICAgICAg IC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTY3NzAKIAotICAg ICAgICAgICAgaWYgKCFtX2ZyYW1lLmRvY3VtZW50KCktPmluUGFnZUNhY2hlKCkpIHsKKyAgICAg ICAgICAgIGlmIChtX2ZyYW1lLmRvY3VtZW50KCktPnBhZ2VDYWNoZVN0YXRlKCkgPT0gRG9jdW1l bnQ6Ok5vdEluUGFnZUNhY2hlKSB7CiAgICAgICAgICAgICAgICAgUmVmPEV2ZW50PiB1bmxvYWRF dmVudChFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS51bmxvYWRFdmVudCwgZmFsc2UsIGZhbHNl KSk7CiAgICAgICAgICAgICAgICAgLy8gVGhlIERvY3VtZW50TG9hZGVyIChhbmQgdGh1cyBpdHMg TG9hZFRpbWluZykgbWlnaHQgZ2V0IGRlc3Ryb3llZAogICAgICAgICAgICAgICAgIC8vIHdoaWxl IGRpc3BhdGNoaW5nIHRoZSBldmVudCwgc28gcHJvdGVjdCBpdCB0byBwcmV2ZW50IHdyaXRpbmcg dGhlIGVuZApAQCAtMjk1Niw3ICsyOTU2LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hV bmxvYWRFdmVudHMoVW5sb2FkRXZlbnRQb2xpY3kgdW5sb2FkRXZlbnRQb2xpY3kpCiAgICAgaWYg KCFtX2ZyYW1lLmRvY3VtZW50KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX2ZyYW1l LmRvY3VtZW50KCktPmluUGFnZUNhY2hlKCkpCisgICAgaWYgKG1fZnJhbWUuZG9jdW1lbnQoKS0+ cGFnZUNhY2hlU3RhdGUoKSAhPSBEb2N1bWVudDo6Tm90SW5QYWdlQ2FjaGUpCiAgICAgICAgIHJl dHVybjsKIAogICAgIC8vIERvbid0IHJlbW92ZSBldmVudCBsaXN0ZW5lcnMgZnJvbSBhIHRyYW5z aXRpb25hbCBlbXB0eSBkb2N1bWVudCAoc2VlIGJ1ZyAyODcxNiBmb3IgbW9yZSBpbmZvcm1hdGlv bikuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcApp bmRleCBkYjdiZjJlZTQzYzE5YmY1OTA0MGRlMTE1MmUxNTRjNWY4MTJmZGIxLi41NWQyZTYxNWFk MTg4OWNlYTcwYWZmMzNjNjBmNGUwZmE3MTc0YjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHAKQEAgLTI2OCw5ICsyNjgsMTQgQEAgdm9pZCBD YWNoZWRSZXNvdXJjZTo6bG9hZChDYWNoZWRSZXNvdXJjZUxvYWRlciYgY2FjaGVkUmVzb3VyY2VM b2FkZXIsIGNvbnN0IFJlc28KICAgICBGcmFtZSYgZnJhbWUgPSAqY2FjaGVkUmVzb3VyY2VMb2Fk ZXIuZnJhbWUoKTsKIAogICAgIC8vIFByZXZlbnQgbmV3IGxvYWRzIGlmIHdlIGFyZSBpbiB0aGUg UGFnZUNhY2hlIG9yIGJlaW5nIGFkZGVkIHRvIHRoZSBQYWdlQ2FjaGUuCi0gICAgaWYgKGZyYW1l LnBhZ2UoKSAmJiBmcmFtZS5wYWdlKCktPmluUGFnZUNhY2hlKCkpIHsKLSAgICAgICAgZmFpbEJl Zm9yZVN0YXJ0aW5nKCk7Ci0gICAgICAgIHJldHVybjsKKyAgICAvLyBXZSBxdWVyeSB0aGUgdG9w IGRvY3VtZW50IGJlY2F1c2UgbmV3IGZyYW1lcyBtYXkgYmUgY3JlYXRlZCBpbiBwYWdlaGlkZSBl dmVudCBoYW5kbGVycworICAgIC8vIGFuZCB0aGVpciBwYWdlQ2FjaGVTdGF0ZSB3aWxsIG5vdCBy ZWZsZWN0IHRoZSBmYWN0IHRoYXQgdGhleSBhcmUgYWJvdXQgdG8gZW50ZXIgcGFnZQorICAgIC8v IGNhY2hlLgorICAgIGlmIChhdXRvKiB0b3BEb2N1bWVudCA9IGZyYW1lLm1haW5GcmFtZSgpLmRv Y3VtZW50KCkpIHsKKyAgICAgICAgaWYgKHRvcERvY3VtZW50LT5wYWdlQ2FjaGVTdGF0ZSgpICE9 IERvY3VtZW50OjpOb3RJblBhZ2VDYWNoZSkgeworICAgICAgICAgICAgZmFpbEJlZm9yZVN0YXJ0 aW5nKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KICAgICB9CiAKICAgICBGcmFt ZUxvYWRlciYgZnJhbWVMb2FkZXIgPSBmcmFtZS5sb2FkZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCmlu ZGV4IGMyYTQ1MDM3MzU4OTYzYTY5ZGRmMTI0NmNiN2YyMmI3YTYxY2ZiZWMuLjMwMTg3YTQ3M2Zl ZjY5YTZlNTBjZTgzMDZiNDZmMDMyYzk0ZmRjNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAtNTc5 LDEyICs1NzksNiBAQCB2b2lkIFBhZ2U6OnNldENhblN0YXJ0TWVkaWEoYm9vbCBjYW5TdGFydE1l ZGlhKQogICAgIH0KIH0KIAotYm9vbCBQYWdlOjppblBhZ2VDYWNoZSgpIGNvbnN0Ci17Ci0gICAg YXV0byogZG9jdW1lbnQgPSBtYWluRnJhbWUoKS5kb2N1bWVudCgpOwotICAgIHJldHVybiBkb2N1 bWVudCAmJiBkb2N1bWVudC0+aW5QYWdlQ2FjaGUoKTsKLX0KLQogc3RhdGljIEZyYW1lKiBpbmNy ZW1lbnRGcmFtZShGcmFtZSogY3VyciwgYm9vbCBmb3J3YXJkLCBib29sIHdyYXBGbGFnKQogewog ICAgIHJldHVybiBmb3J3YXJkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu aCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4IGFmODgyMzEwNzRmNmE1ZGI5ZGZl OGMxZDQ0M2Q1NDVlZmJjNmIyOWUuLjk3NTNmNzQ2YWRkNTE3NTM5ZTU2MjdlY2E2NjA1OGMwMjVm ZDAzNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC0xNjYsOCArMTY2LDYgQEAgcHVibGljOgogICAgIE1h aW5GcmFtZSYgbWFpbkZyYW1lKCkgeyByZXR1cm4gbV9tYWluRnJhbWUuZ2V0KCk7IH0KICAgICBj b25zdCBNYWluRnJhbWUmIG1haW5GcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWFpbkZyYW1lLmdl dCgpOyB9CiAKLSAgICBib29sIGluUGFnZUNhY2hlKCkgY29uc3Q7Ci0KICAgICBib29sIG9wZW5l ZEJ5RE9NKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRPcGVuZWRCeURPTSgpOwogCg==