Bug 89242 – [File API] FileReader should work in sandbox iframe

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Jian Li]

Now FileReader works in file URL document. We should also make it work in sandbox iframe.

[Jian Li]

Created attachment 147887 [details]
Patch

[Adam Barth]

Comment on attachment 147887 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=147887&action=review

> Source/WebCore/page/SecurityOrigin.cpp:307
> +        RefPtr<SecurityOrigin> targetOrigin = SecurityOrigin::create(url);

Should we really declare RefPtr<SecurityOrigin> here?

[Adam Barth]

Won't that shadow the outer declaration?

[Jian Li]

(In reply to comment #3)
> Won't that shadow the outer declaration?

My bad. Should remove this.

[Jian Li]

Created attachment 147894 [details]
Patch

[Adam Barth]

Comment on attachment 147887 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=147887&action=review

> Source/WebCore/page/SecurityOrigin.cpp:302
> +    RefPtr<SecurityOrigin> targetOrigin = getCachedOrigin(url);

I would actually write this function slightly different.  Here's what I would do:

if (m_universalAccess)
    return true;

if (getCachedOrigin(url) == this)
    return true;

... then leave the rest of the function the same.

[Adam Barth]

That's the smallest change to this function that has the desired effect.

[Jian Li]

Created attachment 147897 [details]
Patch

Thanks for suggestion.

[Adam Barth]

Comment on attachment 147897 [details]
Patch

Thanks!

[Ahmad Saleem]

Landed and didn't backed out - https://github.com/WebKit/WebKit/commit/b9a27eaf7dd51ffc2fd80742bc435d179d80f17e

Marking this as "RESOLVED FIXED".