115505 2013-05-01 22:41:25 -0700 REGRESSION (r149422): -[WKBrowsingContextController loadFileURL:restrictToFilesWithin:] broken when second argument is nil 2013-05-02 09:55:48 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap oldest_to_newest 883727 0 ap 2013-05-01 22:41:25 -0700 assumeReadAccessToBaseURL takes a URL string, not a path. <rdar://problem/13787297> 883728 1 200301 ap 2013-05-01 22:47:30 -0700 Created attachment 200301 proposed fix 883810 2 200301 darin 2013-05-02 09:11:14 -0700 Comment on attachment 200301 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=200301&action=review > Source/WebKit2/UIProcess/WebPageProxy.cpp:744 > if (!resourceDirectoryURLString.isNull()) { I would put the null case first since it’s shorter, and then the non-null case. > Source/WebKit2/UIProcess/WebPageProxy.cpp:749 > + resourceDirectoryURL = KURL(ParsedURLString, "file:///"); Should be KURL(ParsedURLString, ASCIILiteral("file:///")). 883820 3 ap 2013-05-02 09:55:48 -0700 Committed <http://trac.webkit.org/changeset/149488>. 200301 2013-05-01 22:47:30 -0700 2013-05-02 09:11:13 -0700 proposed fix URLString.txt text/plain 2258 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0OTQ4MikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA1LTAxICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIxNDk0 MjIpOiAtW1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciBsb2FkRmlsZVVSTDpyZXN0cmljdFRv RmlsZXNXaXRoaW46XQorICAgICAgICBicm9rZW4gd2hlbiBzZWNvbmQgYXJndW1lbnQgaXMgbmls CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU1MDUK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEzNzg3Mjk3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6 IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZEZpbGUpOiBQYXNzIGEgVVJMIHN0cmluZworICAg ICAgICB0byBhc3N1bWVSZWFkQWNjZXNzVG9CYXNlVVJMLCBhcyB0aGlzIGlzIHdoYXQgaXQgdGFr ZXMuCisKIDIwMTMtMDUtMDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgW01hY10gV2ViS2l0IGRvZXNuJ3QgZW5hYmxlIG9yIGRpc2FibGUgYXV0b2NvcnJlY3Rp b25zIHdoZW4gc3lzdGVtIHByZWZlcmVuY2VzIGFyZSBjaGFuZ2VkCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMTQ5NDgyKQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTc0MCwxOCArNzQwLDE5IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkRmlsZShjb25zdCBTdHJp bmcKICAgICBpZiAoIWZpbGVVUkwuaXNMb2NhbEZpbGUoKSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgU3RyaW5nIHJlc291cmNlRGlyZWN0b3J5UGF0aDsKKyAgICBLVVJMIHJlc291cmNlRGlyZWN0 b3J5VVJMOwogICAgIGlmICghcmVzb3VyY2VEaXJlY3RvcnlVUkxTdHJpbmcuaXNOdWxsKCkpIHsK LSAgICAgICAgS1VSTCByZXNvdXJjZURpcmVjdG9yeVVSTCA9IEtVUkwoS1VSTCgpLCByZXNvdXJj ZURpcmVjdG9yeVVSTFN0cmluZyk7CisgICAgICAgIHJlc291cmNlRGlyZWN0b3J5VVJMID0gS1VS TChLVVJMKCksIHJlc291cmNlRGlyZWN0b3J5VVJMU3RyaW5nKTsKICAgICAgICAgaWYgKCFyZXNv dXJjZURpcmVjdG9yeVVSTC5pc0xvY2FsRmlsZSgpKQogICAgICAgICAgICAgcmV0dXJuOwotICAg ICAgICByZXNvdXJjZURpcmVjdG9yeVBhdGggPSByZXNvdXJjZURpcmVjdG9yeVVSTC5maWxlU3lz dGVtUGF0aCgpOwogICAgIH0gZWxzZQotICAgICAgICByZXNvdXJjZURpcmVjdG9yeVBhdGggPSBB U0NJSUxpdGVyYWwoIi8iKTsKKyAgICAgICAgcmVzb3VyY2VEaXJlY3RvcnlVUkwgPSBLVVJMKFBh cnNlZFVSTFN0cmluZywgImZpbGU6Ly8vIik7CisKKyAgICBTdHJpbmcgcmVzb3VyY2VEaXJlY3Rv cnlQYXRoID0gcmVzb3VyY2VEaXJlY3RvcnlVUkwuZmlsZVN5c3RlbVBhdGgoKTsKIAogICAgIFNh bmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlOwogICAgIFNhbmRi b3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZShyZXNvdXJjZURpcmVjdG9yeVBhdGgsIFNhbmRib3hF eHRlbnNpb246OlJlYWRPbmx5LCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKLSAgICBtX3Byb2Nl c3MtPmFzc3VtZVJlYWRBY2Nlc3NUb0Jhc2VVUkwocmVzb3VyY2VEaXJlY3RvcnlQYXRoKTsKKyAg ICBtX3Byb2Nlc3MtPmFzc3VtZVJlYWRBY2Nlc3NUb0Jhc2VVUkwocmVzb3VyY2VEaXJlY3RvcnlV UkwpOwogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6TG9hZFVSTChmaWxl VVJMLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKSwgbV9wYWdlSUQpOwogICAgIG1fcHJvY2Vzcy0+ cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOwogfQo=