Bug 115505

Summary:

REGRESSION (r149422): -[WKBrowsingContextController loadFileURL:restrictToFilesWithin:] broken when second argument is nil

Product:

WebKit

Reporter:

Alexey Proskuryakov <ap>

Component:

WebKit2

Assignee:

Alexey Proskuryakov <ap>

Status:

RESOLVED FIXED

Severity:

Normal

Keywords:

InRadar

Priority:

Version:

528+ (Nightly build)

Hardware:

Unspecified

OS:

Unspecified

Attachments:

Description	Flags
proposed fix	darin: review+

Description Alexey Proskuryakov 2013-05-01 22:41:25 PDT

assumeReadAccessToBaseURL takes a URL string, not a path.

<rdar://problem/13787297>

Comment 1 Alexey Proskuryakov 2013-05-01 22:47:30 PDT

Created attachment 200301 [details]
proposed fix

Comment 2 Darin Adler 2013-05-02 09:11:14 PDT

Comment on attachment 200301 [details]
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:///")).

Comment 3 Alexey Proskuryakov 2013-05-02 09:55:48 PDT

Committed <http://trac.webkit.org/changeset/149488>.