Commit 31ebfa39 authored by Ted Meyer's avatar Ted Meyer Committed by Commit Bot

Send event as a string if it has no dict

The play / pause events were missing, because they have no key/value pairs

Change-Id: I7944aafa504070ef75a99fad0ec7ee299dc6ff73
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1808314Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697443}
parent 4bd70f0f
......@@ -54,6 +54,14 @@ void InspectorMediaEventHandler::SendQueuedMediaEvents(
event.type == media::MediaLogEvent::MEDIA_DEBUG_LOG_ENTRY) {
event_type = blink::InspectorPlayerEvent::MESSAGE_EVENT;
}
if (event.params.size() == 0) {
blink::InspectorPlayerEvent ev = {
blink::InspectorPlayerEvent::PLAYBACK_EVENT, event.time,
blink::WebString::FromUTF8("Event"),
blink::WebString::FromUTF8(
media::MediaLog::EventTypeToString(event.type))};
events.emplace_back(ev);
}
for (auto&& itr : event.params.DictItems()) {
blink::InspectorPlayerEvent ev = {event_type, event.time,
blink::WebString::FromUTF8(itr.first),
......
......@@ -203,4 +203,26 @@ TEST_F(InspectorMediaEventHandlerTest, ConvertsEventsAndProperties) {
handler_->SendQueuedMediaEvents(events);
}
TEST_F(InspectorMediaEventHandlerTest, PassesPlayAndPauseEvents) {
std::vector<media::MediaLogEvent> events = {
CreateEvent(media::MediaLogEvent::PLAY),
CreateEvent(media::MediaLogEvent::PAUSE)};
blink::InspectorPlayerEvents expected_events;
blink::InspectorPlayerEvent play = {
blink::InspectorPlayerEvent::PLAYBACK_EVENT, base::TimeTicks(),
blink::WebString::FromUTF8("Event"), blink::WebString::FromUTF8("PLAY")};
blink::InspectorPlayerEvent pause = {
blink::InspectorPlayerEvent::PLAYBACK_EVENT, base::TimeTicks(),
blink::WebString::FromUTF8("Event"), blink::WebString::FromUTF8("PAUSE")};
expected_events.emplace_back(play);
expected_events.emplace_back(pause);
EXPECT_CALL(*mock_context_,
MockNotifyPlayerEvents(EventsEqualTo(expected_events)))
.Times(1);
handler_->SendQueuedMediaEvents(events);
}
} // namespace content
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