Commit 6c6fb4b5 authored by andersca@apple.com's avatar andersca@apple.com

<rdar://problem/6952336>

CrashTracer: [USER] 3 crashes in Safari at com.apple.WebCore • WebCore::SecurityOrigin::canAccess const + 27

Reviewed by Sam Weinig.

Make sure to set the security origin before calling dispatchWindowObjectAvailable.
        
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::begin):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@47151 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6b60a145
2009-08-12 Anders Carlsson <andersca@apple.com>
Reviewed by Sam Weinig.
<rdar://problem/6952336>
CrashTracer: [USER] 3 crashes in Safari at com.apple.WebCore • WebCore::SecurityOrigin::canAccess const + 27
Make sure to set the security origin before calling dispatchWindowObjectAvailable.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::begin):
2009-08-12 Xiaomei Ji <xji@chromium.org>
Reviewed by Eric Seidel.
......@@ -919,9 +919,6 @@ void FrameLoader::begin(const KURL& url, bool dispatch, SecurityOrigin* origin)
m_frame->setDocument(document);
if (dispatch)
dispatchWindowObjectAvailable();
document->setURL(m_URL);
if (m_decoder)
document->setDecoder(m_decoder.get());
......@@ -931,6 +928,9 @@ void FrameLoader::begin(const KURL& url, bool dispatch, SecurityOrigin* origin)
m_frame->domWindow()->setURL(document->url());
m_frame->domWindow()->setSecurityOrigin(document->securityOrigin());
if (dispatch)
dispatchWindowObjectAvailable();
updateFirstPartyForCookies();
Settings* settings = document->settings();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment