Commit d4d9b103 authored by lukasza's avatar lukasza Committed by Commit bot

Automated test for dragging between same-page, cross-site frames.

BUG=666858

Review-Url: https://codereview.chromium.org/2549023003
Cr-Commit-Position: refs/heads/master@{#437739}
parent d5edba28
...@@ -1327,7 +1327,11 @@ bool DOMMessageQueue::WaitForMessage(std::string* message) { ...@@ -1327,7 +1327,11 @@ bool DOMMessageQueue::WaitForMessage(std::string* message) {
new MessageLoopRunner(MessageLoopRunner::QuitMode::IMMEDIATE); new MessageLoopRunner(MessageLoopRunner::QuitMode::IMMEDIATE);
message_loop_runner_->Run(); message_loop_runner_->Run();
} }
// The queue should not be empty, unless we were quit because of a timeout. return PopMessage(message);
}
bool DOMMessageQueue::PopMessage(std::string* message) {
DCHECK(message);
if (message_queue_.empty()) if (message_queue_.empty())
return false; return false;
*message = message_queue_.front(); *message = message_queue_.front();
......
...@@ -442,6 +442,10 @@ class DOMMessageQueue : public NotificationObserver, ...@@ -442,6 +442,10 @@ class DOMMessageQueue : public NotificationObserver,
// message. Returns true on success. // message. Returns true on success.
bool WaitForMessage(std::string* message) WARN_UNUSED_RESULT; bool WaitForMessage(std::string* message) WARN_UNUSED_RESULT;
// If there is a message in the queue, then copies it to |message| and returns
// true. Otherwise (if the queue is empty), returns false.
bool PopMessage(std::string* message) WARN_UNUSED_RESULT;
// Overridden NotificationObserver methods. // Overridden NotificationObserver methods.
void Observe(int type, void Observe(int type,
const NotificationSource& source, const NotificationSource& source,
......
# List below tests to be excluded from running. # List below tests to be excluded from running.
# This list is currently empty. Hooray! # https://crbug.com/666858: No drag-and-drop events should fire...
-*DragAndDropBrowserTest.CrossSiteDrag*
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