diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/media_controls')
6 files changed, 7 insertions, 11 deletions
diff --git a/chromium/third_party/blink/renderer/modules/media_controls/elements/media_control_input_element.cc b/chromium/third_party/blink/renderer/modules/media_controls/elements/media_control_input_element.cc index 6f563c120c9..567470afecf 100644 --- a/chromium/third_party/blink/renderer/modules/media_controls/elements/media_control_input_element.cc +++ b/chromium/third_party/blink/renderer/modules/media_controls/elements/media_control_input_element.cc @@ -206,11 +206,6 @@ void MediaControlInputElement::UpdateShownState() { parent->SetInlineStyleProperty(CSSPropertyID::kDisplay, CSSValueID::kNone); } - - // Don't update the shown state of the element if we want to hide - // icons on the overflow menu. - if (!RuntimeEnabledFeatures::OverflowIconsForMediaControlsEnabled()) - return; } MediaControlElementBase::UpdateShownState(); diff --git a/chromium/third_party/blink/renderer/modules/media_controls/elements/media_control_slider_element.cc b/chromium/third_party/blink/renderer/modules/media_controls/elements/media_control_slider_element.cc index fdd66cfb18d..94e25c143aa 100644 --- a/chromium/third_party/blink/renderer/modules/media_controls/elements/media_control_slider_element.cc +++ b/chromium/third_party/blink/renderer/modules/media_controls/elements/media_control_slider_element.cc @@ -5,6 +5,7 @@ #include "third_party/blink/renderer/modules/media_controls/elements/media_control_slider_element.h" #include "third_party/blink/renderer/core/html/html_div_element.h" +#include "third_party/blink/renderer/core/html/shadow/shadow_element_names.h" #include "third_party/blink/renderer/core/input_type_names.h" #include "third_party/blink/renderer/core/layout/layout_box.h" #include "third_party/blink/renderer/core/layout/layout_box_model_object.h" @@ -114,7 +115,8 @@ void MediaControlSliderElement::SetupBarSegments() { return; Element& track = GetTrackElement(); - track.SetShadowPseudoId("-internal-media-controls-segmented-track"); + track.SetShadowPseudoId( + shadow_element_names::kPseudoMediaControlsSegmentedTrack); // Add the following structure to #track. // diff --git a/chromium/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc b/chromium/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc index 51e5a297294..ec651f364ea 100644 --- a/chromium/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc +++ b/chromium/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc @@ -111,7 +111,7 @@ void MediaControlTimelineElement::DefaultEventHandler(Event& event) { UserMetricsAction("Media.Controls.ScrubbingBegin")); GetMediaControls().BeginScrubbing(MediaControlsImpl::IsTouchEvent(&event)); Element* thumb = UserAgentShadowRoot()->getElementById( - shadow_element_names::SliderThumb()); + shadow_element_names::kIdSliderThumb); bool started_from_thumb = thumb && thumb == event.target()->ToNode(); metrics_.StartGesture(started_from_thumb); } else if (EndScrubbingEvent(event)) { diff --git a/chromium/third_party/blink/renderer/modules/media_controls/media_controls_impl_test.cc b/chromium/third_party/blink/renderer/modules/media_controls/media_controls_impl_test.cc index 82528cb2a73..cdfdb6c926f 100644 --- a/chromium/third_party/blink/renderer/modules/media_controls/media_controls_impl_test.cc +++ b/chromium/third_party/blink/renderer/modules/media_controls/media_controls_impl_test.cc @@ -728,7 +728,7 @@ TEST_F(MediaControlsImplTest, TimelineMetricsDragFromCurrentPosition) { DOMRect* thumb_rect = TimelineElement() ->UserAgentShadowRoot() - ->getElementById(shadow_element_names::SliderThumb()) + ->getElementById(shadow_element_names::kIdSliderThumb) ->getBoundingClientRect(); gfx::PointF thumb(thumb_rect->x() + (thumb_rect->width() / 2), thumb_rect->y() + 1); diff --git a/chromium/third_party/blink/renderer/modules/media_controls/media_controls_orientation_lock_delegate_test.cc b/chromium/third_party/blink/renderer/modules/media_controls/media_controls_orientation_lock_delegate_test.cc index 9ef4ae09ef6..cd37ccb5eda 100644 --- a/chromium/third_party/blink/renderer/modules/media_controls/media_controls_orientation_lock_delegate_test.cc +++ b/chromium/third_party/blink/renderer/modules/media_controls/media_controls_orientation_lock_delegate_test.cc @@ -113,7 +113,7 @@ class MockChromeClientForOrientationLockDelegate final HeapMojoAssociatedRemote<device::mojom::blink::ScreenOrientation> screen_orientation(frame.DomWindow()); ScreenOrientationClient().BindPendingReceiver( - screen_orientation.BindNewEndpointAndPassDedicatedReceiverForTesting()); + screen_orientation.BindNewEndpointAndPassDedicatedReceiver()); ScreenOrientationController::From(*frame.DomWindow()) ->SetScreenOrientationAssociatedRemoteForTests( std::move(screen_orientation)); diff --git a/chromium/third_party/blink/renderer/modules/media_controls/media_controls_rotate_to_fullscreen_delegate_test.cc b/chromium/third_party/blink/renderer/modules/media_controls/media_controls_rotate_to_fullscreen_delegate_test.cc index 560e7e0541b..3f3b2aa2c31 100644 --- a/chromium/third_party/blink/renderer/modules/media_controls/media_controls_rotate_to_fullscreen_delegate_test.cc +++ b/chromium/third_party/blink/renderer/modules/media_controls/media_controls_rotate_to_fullscreen_delegate_test.cc @@ -56,8 +56,7 @@ class MockChromeClient : public EmptyChromeClient { EmptyChromeClient::InstallSupplements(frame); HeapMojoAssociatedRemote<device::mojom::blink::ScreenOrientation> screen_orientation(frame.DomWindow()); - ignore_result( - screen_orientation.BindNewEndpointAndPassDedicatedReceiverForTesting()); + ignore_result(screen_orientation.BindNewEndpointAndPassDedicatedReceiver()); ScreenOrientationController::From(*frame.DomWindow()) ->SetScreenOrientationAssociatedRemoteForTests( std::move(screen_orientation)); |