Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(728)

Unified Diff: Source/core/frame/DOMWindow.cpp

Issue 209363002: Keep the user gesture when postMessage() across frames. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/dom/Window/window-postmessage-user-gesture-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/DOMWindow.cpp
diff --git a/Source/core/frame/DOMWindow.cpp b/Source/core/frame/DOMWindow.cpp
index 8f7eac8816bcb91436b3f7127a9d3476776ce4b8..0cddec643fcf6dd002b3d06d61527eadd2f291b1 100644
--- a/Source/core/frame/DOMWindow.cpp
+++ b/Source/core/frame/DOMWindow.cpp
@@ -111,7 +111,7 @@ namespace WebCore {
class PostMessageTimer FINAL : public SuspendableTimer {
public:
- PostMessageTimer(DOMWindow& window, PassRefPtr<SerializedScriptValue> message, const String& sourceOrigin, PassRefPtrWillBeRawPtr<DOMWindow> source, PassOwnPtr<MessagePortChannelArray> channels, SecurityOrigin* targetOrigin, PassRefPtr<ScriptCallStack> stackTrace)
+ PostMessageTimer(DOMWindow& window, PassRefPtr<SerializedScriptValue> message, const String& sourceOrigin, PassRefPtrWillBeRawPtr<DOMWindow> source, PassOwnPtr<MessagePortChannelArray> channels, SecurityOrigin* targetOrigin, PassRefPtr<ScriptCallStack> stackTrace, UserGestureToken* userGestureToken)
: SuspendableTimer(window.document())
, m_window(&window)
, m_message(message)
@@ -120,6 +120,7 @@ public:
, m_channels(channels)
, m_targetOrigin(targetOrigin)
, m_stackTrace(stackTrace)
+ , m_userGestureToken(userGestureToken)
{
}
@@ -130,6 +131,7 @@ public:
}
SecurityOrigin* targetOrigin() const { return m_targetOrigin.get(); }
ScriptCallStack* stackTrace() const { return m_stackTrace.get(); }
+ UserGestureToken* userGestureToken() const { return m_userGestureToken.get(); }
private:
virtual void fired() OVERRIDE
@@ -145,6 +147,7 @@ private:
OwnPtr<MessagePortChannelArray> m_channels;
RefPtr<SecurityOrigin> m_targetOrigin;
RefPtr<ScriptCallStack> m_stackTrace;
+ RefPtr<UserGestureToken> m_userGestureToken;
};
static void disableSuddenTermination()
@@ -851,7 +854,7 @@ void DOMWindow::postMessage(PassRefPtr<SerializedScriptValue> message, const Mes
stackTrace = createScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture, true);
// Schedule the message.
- PostMessageTimer* timer = new PostMessageTimer(*this, message, sourceOrigin, source, channels.release(), target.get(), stackTrace.release());
+ PostMessageTimer* timer = new PostMessageTimer(*this, message, sourceOrigin, source, channels.release(), target.get(), stackTrace.release(), UserGestureIndicator::currentToken());
timer->startOneShot(0, FROM_HERE);
timer->suspendIfNeeded();
}
@@ -871,6 +874,8 @@ void DOMWindow::postMessageTimerFired(PassOwnPtr<PostMessageTimer> t)
if (m_frame->loader().client()->willCheckAndDispatchMessageEvent(timer->targetOrigin(), event.get()))
Charlie Reis 2014/03/28 16:22:38 What about cross-process postMessage? Seems like
return;
+ UserGestureIndicator gestureIndicator(timer->userGestureToken());
+
event->entangleMessagePorts(document());
dispatchMessageEventWithOriginCheck(timer->targetOrigin(), event, timer->stackTrace());
}
« no previous file with comments | « LayoutTests/fast/dom/Window/window-postmessage-user-gesture-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698