| Index: Source/web/FrameLoaderClientImpl.cpp
|
| diff --git a/Source/web/FrameLoaderClientImpl.cpp b/Source/web/FrameLoaderClientImpl.cpp
|
| index 096eb4f301f0fb68f767a65f58e36d0d29b90ffb..b76693c6ca71a02fbe1b40291fde72537da8624c 100644
|
| --- a/Source/web/FrameLoaderClientImpl.cpp
|
| +++ b/Source/web/FrameLoaderClientImpl.cpp
|
| @@ -739,16 +739,12 @@ WebCookieJar* FrameLoaderClientImpl::cookieJar() const
|
| }
|
|
|
| bool FrameLoaderClientImpl::willCheckAndDispatchMessageEvent(
|
| - SecurityOrigin* target, MessageEvent* event) const
|
| + SecurityOrigin* target, MessageEvent* event, LocalFrame* sourceFrame) const
|
| {
|
| if (!m_webFrame->client())
|
| return false;
|
| -
|
| - WebLocalFrame* source = 0;
|
| - if (event && event->source() && event->source()->toDOMWindow() && event->source()->toDOMWindow()->document())
|
| - source = WebLocalFrameImpl::fromFrame(event->source()->toDOMWindow()->document()->frame());
|
| return m_webFrame->client()->willCheckAndDispatchMessageEvent(
|
| - source, m_webFrame, WebSecurityOrigin(target), WebDOMMessageEvent(event));
|
| + WebLocalFrameImpl::fromFrame(sourceFrame), m_webFrame, WebSecurityOrigin(target), WebDOMMessageEvent(event));
|
| }
|
|
|
| void FrameLoaderClientImpl::didChangeName(const String& name)
|
|
|