61609 2011-05-26 23:48:24 -0700 FrameLoader cannot be null 2011-05-26 23:54:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth darin oldest_to_newest 411216 0 abarth 2011-05-26 23:48:24 -0700 FrameLoader cannot be null 411218 1 95125 abarth 2011-05-26 23:50:09 -0700 Created attachment 95125 Patch 411220 2 abarth 2011-05-26 23:54:25 -0700 Committed r87479: <http://trac.webkit.org/changeset/87479> 95125 2011-05-26 23:50:09 -0700 2011-05-26 23:53:06 -0700 Patch bug-61609-20110526235007.patch text/plain 4917 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NDc4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDUtMjYgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBGcmFtZUxvYWRlciBjYW5ub3QgYmUgbnVsbAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE2MDkKKworICAgICAgICBUaGlz IGNvZGUgaGFzIGEgYnVuY2ggb2YgY2FyZ28tY3VsdCBudWxsIGNoZWNraW5nLgorCisgICAgICAg ICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnQ6OmNyZWF0ZVJlbmRlcmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVs ZW1lbnQ6OmF0dGFjaCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpsb2Fk UmVzb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6Z2V0UGx1Z2lu UHJveHlQYXJhbXMpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6Y3JlYXRl TWVkaWFQbGF5ZXJQcm94eSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp1 cGRhdGVXaWRnZXQpOgorCiAyMDExLTA1LTI2ICBTaGFuZSBTdGVwaGVucyAgPHNoYW5lc3RlcGhl bnNAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gODc0 NzMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zMzUsMTAgKzMzNSw4IEBAIFJlbmRlck9iamVjdCogSFRNTE1lZGlhRWxlbWVu dDo6Y3JlYXRlUmUKICAgICBpZiAobV9wcm94eVdpZGdldCkgewogICAgICAgICBtZWRpYVJlbmRl cmVyLT5zZXRXaWRnZXQobV9wcm94eVdpZGdldCk7CiAKLSAgICAgICAgRnJhbWUqIGZyYW1lID0g ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKLSAgICAgICAgRnJhbWVMb2FkZXIqIGxvYWRlciA9IGZyYW1l ID8gZnJhbWUtPmxvYWRlcigpIDogMDsKLSAgICAgICAgaWYgKGxvYWRlcikKLSAgICAgICAgICAg IGxvYWRlci0+c2hvd01lZGlhUGxheWVyUHJveHlQbHVnaW4obV9wcm94eVdpZGdldC5nZXQoKSk7 CisgICAgICAgIGlmIChGcmFtZSogZnJhbWUgPSBkb2N1bWVudCgpLT5mcmFtZSgpKQorICAgICAg ICAgICAgZnJhbWUtPmxvYWRlcigpLT5zaG93TWVkaWFQbGF5ZXJQcm94eVBsdWdpbihtX3Byb3h5 V2lkZ2V0LmdldCgpKTsKICAgICB9CiAgICAgcmV0dXJuIG1lZGlhUmVuZGVyZXI7CiAjZWxzZQpA QCAtMzc4LDEwICszNzYsOCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmF0dGFjaCgpCiAgICAg ICAgIHJlbmRlcmVyKCktPnVwZGF0ZUZyb21FbGVtZW50KCk7CiAjaWYgRU5BQkxFKFBMVUdJTl9Q Uk9YWV9GT1JfVklERU8pCiAgICAgZWxzZSBpZiAobV9wcm94eVdpZGdldCkgewotICAgICAgICBG cmFtZSogZnJhbWUgPSBkb2N1bWVudCgpLT5mcmFtZSgpOwotICAgICAgICBGcmFtZUxvYWRlciog bG9hZGVyID0gZnJhbWUgPyBmcmFtZS0+bG9hZGVyKCkgOiAwOwotICAgICAgICBpZiAobG9hZGVy KQotICAgICAgICAgICAgbG9hZGVyLT5oaWRlTWVkaWFQbGF5ZXJQcm94eVBsdWdpbihtX3Byb3h5 V2lkZ2V0LmdldCgpKTsKKyAgICAgICAgaWYgKEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50KCktPmZy YW1lKCkpCisgICAgICAgICAgICBmcmFtZS0+bG9hZGVyKCktPmhpZGVNZWRpYVBsYXllclByb3h5 UGx1Z2luKG1fcHJveHlXaWRnZXQuZ2V0KCkpOwogICAgIH0KICNlbmRpZgogfQpAQCAtNjg5LDEy ICs2ODUsOSBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmxvYWRSZXNvdXJjZShjb25zCiAgICAg RnJhbWUqIGZyYW1lID0gZG9jdW1lbnQoKS0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQogICAg ICAgICByZXR1cm47Ci0gICAgRnJhbWVMb2FkZXIqIGxvYWRlciA9IGZyYW1lLT5sb2FkZXIoKTsK LSAgICBpZiAoIWxvYWRlcikKLSAgICAgICAgcmV0dXJuOwogCi0gICAgS1VSTCB1cmwoaW5pdGlh bFVSTCk7Ci0gICAgaWYgKCFsb2FkZXItPndpbGxMb2FkTWVkaWFFbGVtZW50VVJMKHVybCkpCisg ICAgS1VSTCB1cmwgPSBpbml0aWFsVVJMOworICAgIGlmICghZnJhbWUtPmxvYWRlcigpLT53aWxs TG9hZE1lZGlhRWxlbWVudFVSTCh1cmwpKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBUaGUg cmVzb3VyY2UgZmV0Y2ggYWxnb3JpdGhtIApAQCAtMjQzOSwxMSArMjQzMiwxMCBAQCB2b2lkIEhU TUxNZWRpYUVsZW1lbnQ6OnNldE1lZGlhUGxheWVyUHJvCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OmdldFBsdWdpblByb3h5UGFyYW1zKEtVUkwmIHVybCwgVmVjdG9yPFN0cmluZz4mIG5hbWVzLCBW ZWN0b3I8U3RyaW5nPiYgdmFsdWVzKQogewogICAgIEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50KCkt PmZyYW1lKCk7Ci0gICAgRnJhbWVMb2FkZXIqIGxvYWRlciA9IGZyYW1lID8gZnJhbWUtPmxvYWRl cigpIDogMDsKIAogICAgIGlmIChpc1ZpZGVvKCkpIHsKICAgICAgICAgS1VSTCBwb3N0ZXJVUkwg PSBnZXROb25FbXB0eVVSTEF0dHJpYnV0ZShwb3N0ZXJBdHRyKTsKLSAgICAgICAgaWYgKCFwb3N0 ZXJVUkwuaXNFbXB0eSgpICYmIGxvYWRlciAmJiBsb2FkZXItPndpbGxMb2FkTWVkaWFFbGVtZW50 VVJMKHBvc3RlclVSTCkpIHsKKyAgICAgICAgaWYgKCFwb3N0ZXJVUkwuaXNFbXB0eSgpICYmIGZy YW1lICYmIGZyYW1lLT5sb2FkZXIoKS0+d2lsbExvYWRNZWRpYUVsZW1lbnRVUkwocG9zdGVyVVJM KSkgewogICAgICAgICAgICAgbmFtZXMuYXBwZW5kKCJfbWVkaWFfZWxlbWVudF9wb3N0ZXJfIik7 CiAgICAgICAgICAgICB2YWx1ZXMuYXBwZW5kKHBvc3RlclVSTC5zdHJpbmcoKSk7CiAgICAgICAg IH0KQEAgLTI0NTksNyArMjQ1MSw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6Z2V0UGx1Z2lu UHJveHlQYXIKICAgICAgICAgdXJsID0gc2VsZWN0TmV4dFNvdXJjZUNoaWxkKDAsIERvTm90aGlu Zyk7CiAKICAgICBtX2N1cnJlbnRTcmMgPSB1cmwuc3RyaW5nKCk7Ci0gICAgaWYgKHVybC5pc1Zh bGlkKCkgJiYgbG9hZGVyICYmIGxvYWRlci0+d2lsbExvYWRNZWRpYUVsZW1lbnRVUkwodXJsKSkg eworICAgIGlmICh1cmwuaXNWYWxpZCgpICYmIGZyYW1lICYmIGZyYW1lLT5sb2FkZXIoKS0+d2ls bExvYWRNZWRpYUVsZW1lbnRVUkwodXJsKSkgewogICAgICAgICBuYW1lcy5hcHBlbmQoIl9tZWRp YV9lbGVtZW50X3NyY18iKTsKICAgICAgICAgdmFsdWVzLmFwcGVuZChtX2N1cnJlbnRTcmMpOwog ICAgIH0KQEAgLTI0ODAsOCArMjQ3Miw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6Y3JlYXRl TWVkaWFQbGF5ZXIKICAgICAgICAgcmV0dXJuOwogCiAgICAgRnJhbWUqIGZyYW1lID0gZG9jdW1l bnQoKS0+ZnJhbWUoKTsKLSAgICBGcmFtZUxvYWRlciogbG9hZGVyID0gZnJhbWUgPyBmcmFtZS0+ bG9hZGVyKCkgOiAwOwotICAgIGlmICghbG9hZGVyKQorICAgIGlmICghZnJhbWUpCiAgICAgICAg IHJldHVybjsKIAogICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZU1lZGlh UGxheWVyUHJveHkiKTsKQEAgLTI0OTQsNyArMjQ4NSw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVu dDo6Y3JlYXRlTWVkaWFQbGF5ZXIKICAgICAKICAgICAvLyBIYW5nIG9udG8gdGhlIHByb3h5IHdp ZGdldCBzbyBpdCB3b24ndCBiZSBkZXN0cm95ZWQgaWYgdGhlIHBsdWctaW4gaXMgc2V0IHRvCiAg ICAgLy8gZGlzcGxheTpub25lCi0gICAgbV9wcm94eVdpZGdldCA9IGxvYWRlci0+c3ViZnJhbWVM b2FkZXIoKS0+bG9hZE1lZGlhUGxheWVyUHJveHlQbHVnaW4odGhpcywgdXJsLCBwYXJhbU5hbWVz LCBwYXJhbVZhbHVlcyk7CisgICAgbV9wcm94eVdpZGdldCA9IGZyYW1lLT5sb2FkZXIoKS0+c3Vi ZnJhbWVMb2FkZXIoKS0+bG9hZE1lZGlhUGxheWVyUHJveHlQbHVnaW4odGhpcywgdXJsLCBwYXJh bU5hbWVzLCBwYXJhbVZhbHVlcyk7CiAgICAgaWYgKG1fcHJveHlXaWRnZXQpCiAgICAgICAgIG1f bmVlZFdpZGdldFVwZGF0ZSA9IGZhbHNlOwogfQpAQCAtMjUwNSw5ICsyNDk2LDExIEBAIHZvaWQg SFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlV2lkZ2V0KFBsdWcKIAogICAgIFZlY3RvcjxTdHJpbmc+ IHBhcmFtTmFtZXM7CiAgICAgVmVjdG9yPFN0cmluZz4gcGFyYW1WYWx1ZXM7CisgICAgLy8gRklY TUU6IFJlbmFtZSBrdXJsIHRvIHNvbWV0aGluZyBtb3JlIHNlbnNpYmxlLgogICAgIEtVUkwga3Vy bDsKLSAgICAKKwogICAgIG1lZGlhRWxlbWVudC0+Z2V0UGx1Z2luUHJveHlQYXJhbXMoa3VybCwg cGFyYW1OYW1lcywgcGFyYW1WYWx1ZXMpOworICAgIC8vIEZJWE1FOiBXaGF0IGlmIGRvY3VtZW50 KCktPmZyYW1lKCkgaXMgMD8KICAgICBTdWJmcmFtZUxvYWRlciogbG9hZGVyID0gZG9jdW1lbnQo KS0+ZnJhbWUoKS0+bG9hZGVyKCktPnN1YmZyYW1lTG9hZGVyKCk7CiAgICAgbG9hZGVyLT5sb2Fk TWVkaWFQbGF5ZXJQcm94eVBsdWdpbihtZWRpYUVsZW1lbnQsIGt1cmwsIHBhcmFtTmFtZXMsIHBh cmFtVmFsdWVzKTsKIH0K