From e684a3455bcc29a6e3e66a004e352dea4e1141e7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 13 Feb 2019 15:05:36 +0100 Subject: BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922 Reviewed-by: Michael Brüning --- .../html_media_element_remote_playback.cc | 6 ++--- .../modules/remoteplayback/remote_playback.cc | 27 +++++++++++++--------- .../modules/remoteplayback/remote_playback.h | 10 ++++---- .../modules/remoteplayback/remote_playback_test.cc | 23 +++++++++--------- 4 files changed, 35 insertions(+), 31 deletions(-) (limited to 'chromium/third_party/blink/renderer/modules/remoteplayback') diff --git a/chromium/third_party/blink/renderer/modules/remoteplayback/html_media_element_remote_playback.cc b/chromium/third_party/blink/renderer/modules/remoteplayback/html_media_element_remote_playback.cc index b77769d5b29..617d273383b 100644 --- a/chromium/third_party/blink/renderer/modules/remoteplayback/html_media_element_remote_playback.cc +++ b/chromium/third_party/blink/renderer/modules/remoteplayback/html_media_element_remote_playback.cc @@ -16,7 +16,7 @@ namespace blink { bool HTMLMediaElementRemotePlayback::FastHasAttribute( const QualifiedName& name, const HTMLMediaElement& element) { - DCHECK(name == HTMLNames::disableremoteplaybackAttr); + DCHECK(name == html_names::kDisableremoteplaybackAttr); return element.FastHasAttribute(name); } @@ -25,7 +25,7 @@ void HTMLMediaElementRemotePlayback::SetBooleanAttribute( const QualifiedName& name, HTMLMediaElement& element, bool value) { - DCHECK(name == HTMLNames::disableremoteplaybackAttr); + DCHECK(name == html_names::kDisableremoteplaybackAttr); element.SetBooleanAttribute(name, value); HTMLMediaElementRemotePlayback& self = @@ -41,7 +41,7 @@ HTMLMediaElementRemotePlayback& HTMLMediaElementRemotePlayback::From( Supplement::From( element); if (!supplement) { - supplement = new HTMLMediaElementRemotePlayback(); + supplement = MakeGarbageCollected(); ProvideTo(element, supplement); } return *supplement; diff --git a/chromium/third_party/blink/renderer/modules/remoteplayback/remote_playback.cc b/chromium/third_party/blink/renderer/modules/remoteplayback/remote_playback.cc index d20885bc586..bc20e505cbb 100644 --- a/chromium/third_party/blink/renderer/modules/remoteplayback/remote_playback.cc +++ b/chromium/third_party/blink/renderer/modules/remoteplayback/remote_playback.cc @@ -19,6 +19,7 @@ #include "third_party/blink/renderer/modules/presentation/presentation_controller.h" #include "third_party/blink/renderer/modules/remoteplayback/availability_callback_wrapper.h" #include "third_party/blink/renderer/platform/memory_coordinator.h" +#include "third_party/blink/renderer/platform/wtf/std_lib_extras.h" #include "third_party/blink/renderer/platform/wtf/text/base64.h" namespace blink { @@ -58,8 +59,8 @@ KURL GetAvailabilityUrl(const WebURL& source, bool is_source_supported) { // remote-playback:// where |encoded-data| is base64 URL // encoded string representation of the source URL. std::string source_string = source.GetString().Utf8(); - String encoded_source = - WTF::Base64URLEncode(source_string.data(), source_string.length()); + String encoded_source = WTF::Base64URLEncode( + source_string.data(), SafeCast(source_string.length())); return KURL("remote-playback://" + encoded_source); } @@ -72,7 +73,7 @@ bool IsBackgroundAvailabilityMonitoringDisabled() { // static RemotePlayback* RemotePlayback::Create(HTMLMediaElement& element) { - return new RemotePlayback(element); + return MakeGarbageCollected(element); } RemotePlayback::RemotePlayback(HTMLMediaElement& element) @@ -86,7 +87,7 @@ RemotePlayback::RemotePlayback(HTMLMediaElement& element) presentation_connection_binding_(this) {} const AtomicString& RemotePlayback::InterfaceName() const { - return EventTargetNames::RemotePlayback; + return event_target_names::kRemotePlayback; } ExecutionContext* RemotePlayback::GetExecutionContext() const { @@ -99,7 +100,8 @@ ScriptPromise RemotePlayback::watchAvailability( ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state); ScriptPromise promise = resolver->Promise(); - if (media_element_->FastHasAttribute(HTMLNames::disableremoteplaybackAttr)) { + if (media_element_->FastHasAttribute( + html_names::kDisableremoteplaybackAttr)) { resolver->Reject( DOMException::Create(DOMExceptionCode::kInvalidStateError, "disableRemotePlayback attribute is present.")); @@ -129,7 +131,8 @@ ScriptPromise RemotePlayback::cancelWatchAvailability(ScriptState* script_state, ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state); ScriptPromise promise = resolver->Promise(); - if (media_element_->FastHasAttribute(HTMLNames::disableremoteplaybackAttr)) { + if (media_element_->FastHasAttribute( + html_names::kDisableremoteplaybackAttr)) { resolver->Reject( DOMException::Create(DOMExceptionCode::kInvalidStateError, "disableRemotePlayback attribute is present.")); @@ -152,7 +155,8 @@ ScriptPromise RemotePlayback::cancelWatchAvailability( ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state); ScriptPromise promise = resolver->Promise(); - if (media_element_->FastHasAttribute(HTMLNames::disableremoteplaybackAttr)) { + if (media_element_->FastHasAttribute( + html_names::kDisableremoteplaybackAttr)) { resolver->Reject( DOMException::Create(DOMExceptionCode::kInvalidStateError, "disableRemotePlayback attribute is present.")); @@ -170,7 +174,8 @@ ScriptPromise RemotePlayback::prompt(ScriptState* script_state) { ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state); ScriptPromise promise = resolver->Promise(); - if (media_element_->FastHasAttribute(HTMLNames::disableremoteplaybackAttr)) { + if (media_element_->FastHasAttribute( + html_names::kDisableremoteplaybackAttr)) { resolver->Reject( DOMException::Create(DOMExceptionCode::kInvalidStateError, "disableRemotePlayback attribute is present.")); @@ -348,7 +353,7 @@ void RemotePlayback::StateChanged(WebRemotePlaybackState state) { state_ = state; switch (state_) { case WebRemotePlaybackState::kConnecting: - DispatchEvent(*Event::Create(EventTypeNames::connecting)); + DispatchEvent(*Event::Create(event_type_names::kConnecting)); if (RuntimeEnabledFeatures::NewRemotePlaybackPipelineEnabled()) { if (media_element_->IsHTMLVideoElement()) { // TODO(xjz): Pass the remote device name. @@ -358,10 +363,10 @@ void RemotePlayback::StateChanged(WebRemotePlaybackState state) { } break; case WebRemotePlaybackState::kConnected: - DispatchEvent(*Event::Create(EventTypeNames::connect)); + DispatchEvent(*Event::Create(event_type_names::kConnect)); break; case WebRemotePlaybackState::kDisconnected: - DispatchEvent(*Event::Create(EventTypeNames::disconnect)); + DispatchEvent(*Event::Create(event_type_names::kDisconnect)); if (RuntimeEnabledFeatures::NewRemotePlaybackPipelineEnabled()) { if (media_element_->IsHTMLVideoElement()) { ToHTMLVideoElement(media_element_) diff --git a/chromium/third_party/blink/renderer/modules/remoteplayback/remote_playback.h b/chromium/third_party/blink/renderer/modules/remoteplayback/remote_playback.h index 9e5a48d9ada..bed56ca4273 100644 --- a/chromium/third_party/blink/renderer/modules/remoteplayback/remote_playback.h +++ b/chromium/third_party/blink/renderer/modules/remoteplayback/remote_playback.h @@ -57,6 +57,8 @@ class MODULES_EXPORT RemotePlayback final static RemotePlayback* Create(HTMLMediaElement&); + explicit RemotePlayback(HTMLMediaElement&); + // Notifies this object that disableRemotePlayback attribute was set on the // corresponding media element. void RemotePlaybackDisabled(); @@ -124,9 +126,9 @@ class MODULES_EXPORT RemotePlayback final // ContextLifecycleObserver implementation. void ContextDestroyed(ExecutionContext*) override; - DEFINE_ATTRIBUTE_EVENT_LISTENER(connecting); - DEFINE_ATTRIBUTE_EVENT_LISTENER(connect); - DEFINE_ATTRIBUTE_EVENT_LISTENER(disconnect); + DEFINE_ATTRIBUTE_EVENT_LISTENER(connecting, kConnecting); + DEFINE_ATTRIBUTE_EVENT_LISTENER(connect, kConnect); + DEFINE_ATTRIBUTE_EVENT_LISTENER(disconnect, kDisconnect); void Trace(blink::Visitor*) override; @@ -135,8 +137,6 @@ class MODULES_EXPORT RemotePlayback final friend class RemotePlaybackTest; friend class MediaControlsImplTest; - explicit RemotePlayback(HTMLMediaElement&); - // Calls the specified availability callback with the current availability. // Need a void() method to post it as a task. void NotifyInitialAvailability(int callback_id); diff --git a/chromium/third_party/blink/renderer/modules/remoteplayback/remote_playback_test.cc b/chromium/third_party/blink/renderer/modules/remoteplayback/remote_playback_test.cc index f283e8f2561..4c000cc6816 100644 --- a/chromium/third_party/blink/renderer/modules/remoteplayback/remote_playback_test.cc +++ b/chromium/third_party/blink/renderer/modules/remoteplayback/remote_playback_test.cc @@ -47,7 +47,7 @@ class MockEventListenerForRemotePlayback : public EventListener { return this == &other; } - MOCK_METHOD2(handleEvent, void(ExecutionContext* executionContext, Event*)); + MOCK_METHOD2(Invoke, void(ExecutionContext* executionContext, Event*)); }; class MockPresentationController final : public PresentationController { @@ -199,17 +199,16 @@ TEST_F(RemotePlaybackTest, StateChangeEvents) { auto* disconnect_handler = new testing::StrictMock(); - remote_playback->addEventListener(EventTypeNames::connecting, + remote_playback->addEventListener(event_type_names::kConnecting, connecting_handler); - remote_playback->addEventListener(EventTypeNames::connect, connect_handler); - remote_playback->addEventListener(EventTypeNames::disconnect, + remote_playback->addEventListener(event_type_names::kConnect, + connect_handler); + remote_playback->addEventListener(event_type_names::kDisconnect, disconnect_handler); - EXPECT_CALL(*connecting_handler, handleEvent(testing::_, testing::_)) - .Times(1); - EXPECT_CALL(*connect_handler, handleEvent(testing::_, testing::_)).Times(1); - EXPECT_CALL(*disconnect_handler, handleEvent(testing::_, testing::_)) - .Times(1); + EXPECT_CALL(*connecting_handler, Invoke(testing::_, testing::_)).Times(1); + EXPECT_CALL(*connect_handler, Invoke(testing::_, testing::_)).Times(1); + EXPECT_CALL(*disconnect_handler, Invoke(testing::_, testing::_)).Times(1); SetState(remote_playback, WebRemotePlaybackState::kConnecting); SetState(remote_playback, WebRemotePlaybackState::kConnecting); @@ -248,7 +247,7 @@ TEST_F(RemotePlaybackTest, remote_playback->prompt(scope.GetScriptState()) .Then(resolve->Bind(), reject->Bind()); HTMLMediaElementRemotePlayback::SetBooleanAttribute( - HTMLNames::disableremoteplaybackAttr, *element, true); + html_names::kDisableremoteplaybackAttr, *element, true); // Runs pending promises. v8::MicrotasksScope::PerformCheckpoint(scope.GetIsolate()); @@ -289,7 +288,7 @@ TEST_F(RemotePlaybackTest, DisableRemotePlaybackCancelsAvailabilityCallbacks) { .Then(resolve->Bind(), reject->Bind()); HTMLMediaElementRemotePlayback::SetBooleanAttribute( - HTMLNames::disableremoteplaybackAttr, *element, true); + html_names::kDisableremoteplaybackAttr, *element, true); // Runs pending promises. v8::MicrotasksScope::PerformCheckpoint(scope.GetIsolate()); @@ -386,7 +385,7 @@ TEST_F(RemotePlaybackTest, IsListening) { LocalFrame& frame = page_holder->GetFrame(); MockPresentationController* mock_controller = - new MockPresentationController(frame); + MakeGarbageCollected(frame); Supplement::ProvideTo( frame, static_cast(mock_controller)); -- cgit v1.2.1