60863 2011-05-15 17:45:40 -0700 Pass the document URL and toplevel document URL when creating a plug-in 2011-05-15 17:54:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 404231 0 andersca 2011-05-15 17:45:40 -0700 Pass the document URL and toplevel document URL when creating a plug-in 404234 1 93596 andersca 2011-05-15 17:48:23 -0700 Created attachment 93596 Patch 404237 2 andersca 2011-05-15 17:54:05 -0700 Committed r86516: <http://trac.webkit.org/changeset/86516> 93596 2011-05-15 17:48:23 -0700 2011-05-15 17:52:00 -0700 Patch bug-60863-20110515174822.patch text/plain 4578 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NTE1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDUtMTUgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBQYXNzIHRoZSBkb2N1bWVudCBVUkwgYW5kIHRvcGxldmVs IGRvY3VtZW50IFVSTCB3aGVuIGNyZWF0aW5nIGEgcGx1Zy1pbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA4NjMKKworICAgICAgICBUaGlzIGlzIHRo ZSBmaXJzdCBvZiBhIHNlcmllcyBvZiBwYXRjaGVzIGludGVuZGVkIHRvIHJlZHVjZSB0aGUgSVBD IHRyYWZmaWMKKyAgICAgICAgZHVyaW5nIHBsdWctaW4gaW5zdGFudGlhdGlvbi4KKworICAgICAg ICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVn aW46OlBhcmFtZXRlcnM6OmVuY29kZSk6CisgICAgICAgIEVuY29kZSB0aGUgVVJMcy4KKworICAg ICAgICAoV2ViS2l0OjpQbHVnaW46OlBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgIERlY29k ZSB0aGUgVVJMcy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uaDoKKyAg ICAgICAgQWRkIHRoZSBkb2N1bWVudCBhbmQgdG9wbGV2ZWwgZG9jdW1lbnQgVVJMcy4KKworICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6Y3JlYXRlUGx1Z2luKToK KyAgICAgICAgSW5pdGlhbGl6ZSB0aGUgZG9jdW1lbnQgYW5kIHRvcGxldmVsIGRvY3VtZW50IFVS THMuCisKIDIwMTEtMDUtMTMgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uY3BwCShyZXZpc2lvbiA4NjUxNCkKKysrIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zOSw2ICszOSw4IEBAIHZvaWQgUGx1Z2luOjpQYXJhbWV0ZXJzOjplbmNvZGUoQ29yZUlQQzoK ICAgICBlbmNvZGVyLT5lbmNvZGUodmFsdWVzKTsKICAgICBlbmNvZGVyLT5lbmNvZGUobWltZVR5 cGUpOwogICAgIGVuY29kZXItPmVuY29kZShsb2FkTWFudWFsbHkpOworICAgIGVuY29kZXItPmVu Y29kZShkb2N1bWVudFVSTCk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKHRvcGxldmVsRG9jdW1lbnRV UkwpOwogfQogCiBib29sIFBsdWdpbjo6UGFyYW1ldGVyczo6ZGVjb2RlKENvcmVJUEM6OkFyZ3Vt ZW50RGVjb2RlciogZGVjb2RlciwgUGFyYW1ldGVycyYgcGFyYW1ldGVycykKQEAgLTU3LDYgKzU5 LDEwIEBAIGJvb2wgUGx1Z2luOjpQYXJhbWV0ZXJzOjpkZWNvZGUoQ29yZUlQQzoKICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMubG9hZE1h bnVhbGx5KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rlci0+ZGVjb2Rl KHBhcmFtZXRlcnMuZG9jdW1lbnRVUkwpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYg KCFkZWNvZGVyLT5kZWNvZGUocGFyYW1ldGVycy50b3BsZXZlbERvY3VtZW50VVJMKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKHBhcmFtZXRlcnMubmFtZXMuc2l6ZSgpICE9IHBh cmFtZXRlcnMudmFsdWVzLnNpemUoKSkgewogICAgICAgICBkZWNvZGVyLT5tYXJrSW52YWxpZCgp OwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uaAkocmV2 aXNpb24gODY1MTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu LmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDEzIEBAIHB1YmxpYzoKICAgICAgICAgU3Ry aW5nIG1pbWVUeXBlOwogICAgICAgICBib29sIGxvYWRNYW51YWxseTsKIAorICAgICAgICAvLyBU aGUgVVJMIG9mIHRoZSBkb2N1bWVudCB0aGF0IHRoZSBwbHVnLWluIGlzIGluLgorICAgICAgICBT dHJpbmcgZG9jdW1lbnRVUkw7CisKKyAgICAgICAgLy8gVGhlIFVSTCBvZiB0aGUgZG9jdW1lbnQg aW4gdGhlIG1haW4gZnJhbWUuIFdpbGwgYmUgbnVsbCBpZiB0aGUgZG9jdW1lbnQgdGhlIHBsdWct aW4KKyAgICAgICAgLy8gZG9lc24ndCBoYXZlIGFjY2VzcyB0byB0aGUgbWFpbiBmcmFtZSBkb2N1 bWVudC4KKyAgICAgICAgU3RyaW5nIHRvcGxldmVsRG9jdW1lbnRVUkw7CisKICAgICAgICAgdm9p ZCBlbmNvZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyKikgY29uc3Q7CiAgICAgICAgIHN0YXRp YyBib29sIGRlY29kZShDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqLCBQYXJhbWV0ZXJzJik7CiAg ICAgfTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi RnJhbWVMb2FkZXJDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCShyZXZpc2lvbiA4 NjUxNCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJh bWVMb2FkZXJDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTk4LDYgKzExOTgsMTIgQEAg dm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNmZXJMb2FkaQogICAgIG5vdEltcGxlbWVu dGVkKCk7CiB9CiAKK3N0YXRpYyBTdHJpbmcgZG9jdW1lbnRVUkwoRnJhbWUqIGZyYW1lKQorewor ICAgIGNvbnN0IEtVUkwmIHVybCA9IGZyYW1lLT5kb2N1bWVudCgpLT51cmwoKTsKKyAgICByZXR1 cm4gdXJsLmhhc1BhdGgoKSA/IHVybC5wcmV0dHlVUkwoKSA6IHVybC5wcmV0dHlVUkwoKSArICIv IjsKK30KKwogUGFzc1JlZlB0cjxXaWRnZXQ+IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVQ bHVnaW4oY29uc3QgSW50U2l6ZSYsIEhUTUxQbHVnSW5FbGVtZW50KiBwbHVnaW5FbGVtZW50LCBj b25zdCBLVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBW ZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wg bG9hZE1hbnVhbGx5KQogewogICAgIEFTU0VSVChwYXJhbU5hbWVzLnNpemUoKSA9PSBwYXJhbVZh bHVlcy5zaXplKCkpOwpAQCAtMTIxMSw2ICsxMjE3LDE1IEBAIFBhc3NSZWZQdHI8V2lkZ2V0PiBX ZWJGcmFtZUxvYWRlckNsaWVudDoKICAgICBwYXJhbWV0ZXJzLnZhbHVlcyA9IHBhcmFtVmFsdWVz OwogICAgIHBhcmFtZXRlcnMubWltZVR5cGUgPSBtaW1lVHlwZTsKICAgICBwYXJhbWV0ZXJzLmxv YWRNYW51YWxseSA9IGxvYWRNYW51YWxseTsKKyAgICBwYXJhbWV0ZXJzLmRvY3VtZW50VVJMID0g ZG9jdW1lbnRVUkwobV9mcmFtZS0+Y29yZUZyYW1lKCkpOworCisgICAgRnJhbWUqIG1haW5GcmFt ZSA9IHdlYlBhZ2UtPm1haW5GcmFtZSgpLT5jb3JlRnJhbWUoKTsKKyAgICBpZiAobV9mcmFtZS0+ Y29yZUZyYW1lKCkgPT0gbWFpbkZyYW1lKQorICAgICAgICBwYXJhbWV0ZXJzLnRvcGxldmVsRG9j dW1lbnRVUkwgPSBwYXJhbWV0ZXJzLmRvY3VtZW50VVJMOworICAgIGVsc2UgaWYgKG1fZnJhbWUt PmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLT5jYW5BY2Nlc3MobWFp bkZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpKSkgeworICAgICAgICAvLyBXZSBv bmx5IHdhbnQgdG8gc2V0IHRoZSB0b3BsZXZlbCBkb2N1bWVudCBVUkwgaWYgdGhlIHBsdWctaW4g aGFzIGFjY2VzcyB0byBpdC4KKyAgICAgICAgcGFyYW1ldGVycy50b3BsZXZlbERvY3VtZW50VVJM ID0gZG9jdW1lbnRVUkwobWFpbkZyYW1lKTsKKyAgICB9CiAKICAgICAvLyA8cmRhcjovL3Byb2Js ZW0vODQ0MDkwMz46IEFwcGxlQ29ubmVjdCBoYXMgYSBidWcgd2hlcmUgaXQgZG9lcyBub3QKICAg ICAvLyB1bmRlcnN0YW5kIHRoZSBwYXJhbWV0ZXIgbmFtZXMgc3BlY2lmaWVkIGluIHRoZSA8b2Jq ZWN0PiBlbGVtZW50IHRoYXQK