124316 2013-11-13 15:28:57 -0800 Move more state tracking to FrameLoadState 2013-11-13 15:53:11 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 950415 0 andersca 2013-11-13 15:28:57 -0800 Move more state tracking to FrameLoadState 950416 1 216873 andersca 2013-11-13 15:29:28 -0800 Created attachment 216873 Patch 950426 2 andersca 2013-11-13 15:53:11 -0800 Committed r159255: <http://trac.webkit.org/changeset/159255> 216873 2013-11-13 15:29:28 -0800 2013-11-13 15:48:42 -0800 Patch bug-124316-20131113152927.patch text/plain 6317 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5MjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGZlY2MwYWZhNDg3MGNi N2Q3YjI4MGI4MzdkMTQzOTQ4Y2JlODBmNC4uYjk4ZGUwNThkNzhiYzQzYjZjOGZiZmUxYzMwOGZm NDI1MzhmN2UzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDEzLTExLTEzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSBtb3JlIHN0 YXRlIHRyYWNraW5nIHRvIEZyYW1lTG9hZFN0YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQzMTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9GcmFtZUxvYWRTdGF0ZS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZFN0YXRlOjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZCk6 CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZFN0YXRlOjpkaWRSZWNlaXZlU2VydmVyUmVkaXJl Y3RGb3JQcm92aXNpb25hbExvYWQpOgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRTdGF0ZTo6 ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZCk6CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZFN0YXRl OjpkaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkU3RhdGU6OmRpZEZp bmlzaExvYWQpOgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRTdGF0ZTo6ZGlkRmFpbExvYWQp OgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRTdGF0ZTo6ZGlkU2FtZURvY3VtZW50Tm90aWZp Y2F0aW9uKToKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkU3RhdGU6OnNldFVucmVhY2hhYmxl VVJMKToKKyAgICAgICAgKiBVSVByb2Nlc3MvRnJhbWVMb2FkU3RhdGUuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lUHJv eHk6OmRpZENvbW1pdExvYWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVByb3h5OjpkaWRG aW5pc2hMb2FkKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQcm94eTo6ZGlkRmFpbExvYWQp OgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVByb3h5OjpkaWRTYW1lRG9jdW1lbnROYXZpZ2F0 aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQcm94eTo6c2V0VW5yZWFjaGFibGVVUkwp OgorCisyMDEzLTExLTEzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisK ICAgICAgICAgUGx1Zy1pbiBwcm9jZXNzZXMgaGFuZyBhcm91bmQgZm9yIDEwIHNlYyBhZnRlciBT YWZhcmkgcXVpdHMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyNDMxNAogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTU0NjA2MTM+CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRnJhbWVMb2FkU3RhdGUuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0ZyYW1lTG9hZFN0YXRlLmNwcAppbmRleCAzNDVjOTBjNjBmNDBiMGM4 ZmE5OTAzZjgxY2VjMGJlZGY1NmMyMjU5Li5lZDM0YzMzMjJlZjI4OTg2MmI3ZWRhOWFmYjViNWE0 OWY5ZDEyOGJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRnJhbWVMb2Fk U3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9GcmFtZUxvYWRTdGF0ZS5j cHAKQEAgLTQwLDYgKzQwLDcgQEAgRnJhbWVMb2FkU3RhdGU6On5GcmFtZUxvYWRTdGF0ZSgpCiB2 b2lkIEZyYW1lTG9hZFN0YXRlOjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZChjb25zdCBTdHJpbmcm IHVybCkKIHsKICAgICBBU1NFUlQobV9wcm92aXNpb25hbFVSTC5pc0VtcHR5KCkpOworCiAgICAg bV9sb2FkU3RhdGUgPSBMb2FkU3RhdGVQcm92aXNpb25hbDsKICAgICBtX3Byb3Zpc2lvbmFsVVJM ID0gdXJsOwogfQpAQCAtNDcsMTUgKzQ4LDUzIEBAIHZvaWQgRnJhbWVMb2FkU3RhdGU6OmRpZFN0 YXJ0UHJvdmlzaW9uYWxMb2FkKGNvbnN0IFN0cmluZyYgdXJsKQogdm9pZCBGcmFtZUxvYWRTdGF0 ZTo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFN0cmlu ZyYgdXJsKQogewogICAgIEFTU0VSVChtX2xvYWRTdGF0ZSA9PSBMb2FkU3RhdGVQcm92aXNpb25h bCk7CisKICAgICBtX3Byb3Zpc2lvbmFsVVJMID0gdXJsOwogfQogCiB2b2lkIEZyYW1lTG9hZFN0 YXRlOjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkKCkKIHsKICAgICBBU1NFUlQobV9sb2FkU3RhdGUg PT0gTG9hZFN0YXRlUHJvdmlzaW9uYWwpOworCiAgICAgbV9sb2FkU3RhdGUgPSBMb2FkU3RhdGVG aW5pc2hlZDsKICAgICBtX3Byb3Zpc2lvbmFsVVJMID0gU3RyaW5nKCk7CiAgICAgbV91bnJlYWNo YWJsZVVSTCA9IG1fbGFzdFVucmVhY2hhYmxlVVJMOwogfQogCit2b2lkIEZyYW1lTG9hZFN0YXRl OjpkaWRDb21taXRMb2FkKCkKK3sKKyAgICBBU1NFUlQobV9sb2FkU3RhdGUgPT0gTG9hZFN0YXRl UHJvdmlzaW9uYWwpOworCisgICAgbV9sb2FkU3RhdGUgPSBMb2FkU3RhdGVDb21taXR0ZWQ7Cisg ICAgbV91cmwgPSBtX3Byb3Zpc2lvbmFsVVJMOworICAgIG1fcHJvdmlzaW9uYWxVUkwgPSBTdHJp bmcoKTsKK30KKwordm9pZCBGcmFtZUxvYWRTdGF0ZTo6ZGlkRmluaXNoTG9hZCgpCit7CisgICAg QVNTRVJUKG1fbG9hZFN0YXRlID09IExvYWRTdGF0ZUNvbW1pdHRlZCk7CisgICAgQVNTRVJUKG1f cHJvdmlzaW9uYWxVUkwuaXNFbXB0eSgpKTsKKworICAgIG1fbG9hZFN0YXRlID0gTG9hZFN0YXRl RmluaXNoZWQ7Cit9CisKK3ZvaWQgRnJhbWVMb2FkU3RhdGU6OmRpZEZhaWxMb2FkKCkKK3sKKyAg ICBBU1NFUlQobV9sb2FkU3RhdGUgPT0gTG9hZFN0YXRlQ29tbWl0dGVkKTsKKyAgICBBU1NFUlQo bV9wcm92aXNpb25hbFVSTC5pc0VtcHR5KCkpOworCisgICAgbV9sb2FkU3RhdGUgPSBMb2FkU3Rh dGVGaW5pc2hlZDsKK30KKwordm9pZCBGcmFtZUxvYWRTdGF0ZTo6ZGlkU2FtZURvY3VtZW50Tm90 aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdXJsKQoreworICAgIG1fdXJsID0gdXJsOworfQorCit2 b2lkIEZyYW1lTG9hZFN0YXRlOjpzZXRVbnJlYWNoYWJsZVVSTChjb25zdCBTdHJpbmcmIHVucmVh Y2hhYmxlVVJMKQoreworICAgIG1fbGFzdFVucmVhY2hhYmxlVVJMID0gbV91bnJlYWNoYWJsZVVS TDsKKyAgICBtX3VucmVhY2hhYmxlVVJMID0gdW5yZWFjaGFibGVVUkw7Cit9CisKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0ZyYW1l TG9hZFN0YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRnJhbWVMb2FkU3RhdGUuaApp bmRleCAxZmNhYzc2ZjA4YTI2MTc3ZmNmNWE0ZTBhYTgwM2Q2Mzg3ZGQ4YzJlLi5jNGYxNDEyYWRk OGMyMGQ3NGQwZDQ2MmIzZGM4MmM4NzA0MTNiYjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvRnJhbWVMb2FkU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvRnJhbWVMb2FkU3RhdGUuaApAQCAtNDUsNiArNDUsMTQgQEAgcHVibGljOgogICAgIHZvaWQg ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFN0cmluZyYg dXJsKTsKICAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWQoKTsKIAorICAgIHZvaWQgZGlk Q29tbWl0TG9hZCgpOworICAgIHZvaWQgZGlkRmluaXNoTG9hZCgpOworICAgIHZvaWQgZGlkRmFp bExvYWQoKTsKKworICAgIHZvaWQgZGlkU2FtZURvY3VtZW50Tm90aWZpY2F0aW9uKGNvbnN0IFN0 cmluZyYpOworCisgICAgdm9pZCBzZXRVbnJlYWNoYWJsZVVSTChjb25zdCBTdHJpbmcmKTsKKwog ICAgIC8vIEZJWE1FOiBUaGVzZSBzaG91bGQgYWxsIGJlIHByaXZhdGUsIGFuZCBGcmFtZUxvYWRT dGF0ZSBzaG91bGQKICAgICAvLyBwcm92aWRlIHN0YXRlIHRyYW5zaXRpb24gbWVtYmVyIGZ1bmN0 aW9ucy4KICAgICBMb2FkU3RhdGUgbV9sb2FkU3RhdGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViRnJhbWVQcm94eS5jcHAKaW5kZXggODgzNzEzYzJkOTU3NDc3Y2U4OGE3MmJhOWZlMWU0 OGExN2VlMGE4NS4uNDcyNjZlNTcxNDQ3Y2JiYzA1NzM3YTRhZWQyNjViMzQyYzE4Zjc0MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcApAQCAtMTMzLDEwICsx MzMsOCBAQCB2b2lkIFdlYkZyYW1lUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWQoKQogCiB2 b2lkIFdlYkZyYW1lUHJveHk6OmRpZENvbW1pdExvYWQoY29uc3QgU3RyaW5nJiBjb250ZW50VHlw ZSwgY29uc3QgUGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbykKIHsKLSAg ICBBU1NFUlQobV9mcmFtZUxvYWRTdGF0ZS5tX2xvYWRTdGF0ZSA9PSBGcmFtZUxvYWRTdGF0ZTo6 TG9hZFN0YXRlUHJvdmlzaW9uYWwpOwotICAgIG1fZnJhbWVMb2FkU3RhdGUubV9sb2FkU3RhdGUg PSBGcmFtZUxvYWRTdGF0ZTo6TG9hZFN0YXRlQ29tbWl0dGVkOwotICAgIG1fZnJhbWVMb2FkU3Rh dGUubV91cmwgPSBtX2ZyYW1lTG9hZFN0YXRlLm1fcHJvdmlzaW9uYWxVUkw7Ci0gICAgbV9mcmFt ZUxvYWRTdGF0ZS5tX3Byb3Zpc2lvbmFsVVJMID0gU3RyaW5nKCk7CisgICAgbV9mcmFtZUxvYWRT dGF0ZS5kaWRDb21taXRMb2FkKCk7CisKICAgICBtX3RpdGxlID0gU3RyaW5nKCk7CiAgICAgbV9N SU1FVHlwZSA9IGNvbnRlbnRUeXBlOwogICAgIG1faXNGcmFtZVNldCA9IGZhbHNlOwpAQCAtMTQ1 LDIxICsxNDMsMTcgQEAgdm9pZCBXZWJGcmFtZVByb3h5OjpkaWRDb21taXRMb2FkKGNvbnN0IFN0 cmluZyYgY29udGVudFR5cGUsIGNvbnN0IFBsYXRmb3JtQ2VydGkKIAogdm9pZCBXZWJGcmFtZVBy b3h5OjpkaWRGaW5pc2hMb2FkKCkKIHsKLSAgICBBU1NFUlQobV9mcmFtZUxvYWRTdGF0ZS5tX2xv YWRTdGF0ZSA9PSBGcmFtZUxvYWRTdGF0ZTo6TG9hZFN0YXRlQ29tbWl0dGVkKTsKLSAgICBBU1NF UlQobV9mcmFtZUxvYWRTdGF0ZS5tX3Byb3Zpc2lvbmFsVVJMLmlzRW1wdHkoKSk7Ci0gICAgbV9m cmFtZUxvYWRTdGF0ZS5tX2xvYWRTdGF0ZSA9IEZyYW1lTG9hZFN0YXRlOjpMb2FkU3RhdGVGaW5p c2hlZDsKKyAgICBtX2ZyYW1lTG9hZFN0YXRlLmRpZEZpbmlzaExvYWQoKTsKIH0KIAogdm9pZCBX ZWJGcmFtZVByb3h5OjpkaWRGYWlsTG9hZCgpCiB7Ci0gICAgQVNTRVJUKG1fZnJhbWVMb2FkU3Rh dGUubV9sb2FkU3RhdGUgPT0gRnJhbWVMb2FkU3RhdGU6OkxvYWRTdGF0ZUNvbW1pdHRlZCk7Ci0g ICAgQVNTRVJUKG1fZnJhbWVMb2FkU3RhdGUubV9wcm92aXNpb25hbFVSTC5pc0VtcHR5KCkpOwot ICAgIG1fZnJhbWVMb2FkU3RhdGUubV9sb2FkU3RhdGUgPSBGcmFtZUxvYWRTdGF0ZTo6TG9hZFN0 YXRlRmluaXNoZWQ7CisgICAgbV9mcmFtZUxvYWRTdGF0ZS5kaWRGYWlsTG9hZCgpOwogfQogCiB2 b2lkIFdlYkZyYW1lUHJveHk6OmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb24oY29uc3QgU3RyaW5n JiB1cmwpCiB7Ci0gICAgbV9mcmFtZUxvYWRTdGF0ZS5tX3VybCA9IHVybDsKKyAgICBtX2ZyYW1l TG9hZFN0YXRlLmRpZFNhbWVEb2N1bWVudE5vdGlmaWNhdGlvbih1cmwpOwogfQogCiB2b2lkIFdl YkZyYW1lUHJveHk6OmRpZENoYW5nZVRpdGxlKGNvbnN0IFN0cmluZyYgdGl0bGUpCkBAIC0yMjUs OCArMjE5LDcgQEAgdm9pZCBXZWJGcmFtZVByb3h5OjpnZXRSZXNvdXJjZURhdGEoV2ViVVJMKiBy ZXNvdXJjZVVSTCwgUGFzc1JlZlB0cjxEYXRhQ2FsbGJhY2sKIAogdm9pZCBXZWJGcmFtZVByb3h5 OjpzZXRVbnJlYWNoYWJsZVVSTChjb25zdCBTdHJpbmcmIHVucmVhY2hhYmxlVVJMKQogewotICAg IG1fZnJhbWVMb2FkU3RhdGUubV9sYXN0VW5yZWFjaGFibGVVUkwgPSBtX2ZyYW1lTG9hZFN0YXRl Lm1fdW5yZWFjaGFibGVVUkw7Ci0gICAgbV9mcmFtZUxvYWRTdGF0ZS5tX3VucmVhY2hhYmxlVVJM ID0gdW5yZWFjaGFibGVVUkw7CisgICAgbV9mcmFtZUxvYWRTdGF0ZS5zZXRVbnJlYWNoYWJsZVVS TCh1bnJlYWNoYWJsZVVSTCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=