Hide overlay play button if it can't be shown without clipping

third_party/WebKit/Source/core/html/shadow/MediaControls.h

 /*
  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 65 matching lines @@
 
   // Return the internal elements, which is used by registering clicking
   // EventHandlers from MediaControlsWindowEventListener.
   MediaControlPanelElement* panelElement() { return m_panel; }
   MediaControlTimelineElement* timelineElement() { return m_timeline; }
   MediaControlCastButtonElement* castButtonElement() { return m_castButton; }
   MediaControlVolumeSliderElement* volumeSliderElement() {
     return m_volumeSlider;
   }
 
-  // Notify us that our controls enclosure has changed width.
-  void notifyPanelWidthChanged(const LayoutUnit& newWidth);
-
   // Notify us that the media element's network state has changed.
   void networkStateChanged();
 
+  // Called by LayoutMedia.
+  void onLayout(int width, int height);
+
   void toggleOverflowMenu();
 
   bool overflowMenuVisible();
 
   // TODO(mlamouri): this is temporary to notify the controls that an
   // HTMLTrackElement failed to load because there is no web exposed way to
   // be notified on the TextTrack object. See https://crbug.com/669977
   void onTrackElementFailedToLoad() { onTextTracksAddedOrRemoved(); }
 
   // TODO(mlamouri): the following methods will be able to become private when
@@ skipping 17 matching lines @@
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   friend class MediaControlsMediaEventListener;
   friend class MediaControlsOrientationLockDelegateTest;
   friend class MediaControlsTest;
 
   void invalidate(Element*);
 
+  // Need to be members of MediaControls for private member access.
   class BatchedControlUpdate;
+  class MediaControlsResizeObserverCallback;
+
+  // Notify us that our controls enclosure has changed size.
+  void notifyElementSizeChanged(int newWidth, int newHeight);
 
   explicit MediaControls(HTMLMediaElement&);
 
   void initializeControls();
 
   void makeOpaque();
   void makeTransparent();
 
   void updatePlayState();
 
   enum HideBehaviorFlags {
     IgnoreNone = 0,
     IgnoreVideoHover = 1 << 0,
     IgnoreFocus = 1 << 1,
     IgnoreControlsHover = 1 << 2,
     IgnoreWaitForTimer = 1 << 3,
   };
 
   bool shouldHideMediaControls(unsigned behaviorFlags = 0) const;
   void hideMediaControlsTimerFired(TimerBase*);
   void startHideMediaControlsTimer();
   void stopHideMediaControlsTimer();
   void resetHideMediaControlsTimer();
 
-  void panelWidthChangedTimerFired(TimerBase*);
+  void elementSizeChangedTimerFired(TimerBase*);
 
   void hideAllMenus();
 
   // Hide elements that don't fit, and show those things that we want which
-  // do fit.  This requires that m_panelWidth is current.
+  // do fit.  This requires that m_effectiveWidth and m_effectiveHeight are
+  // current.
   void computeWhichControlsFit();
 
   // Node
   bool isMediaControls() const override { return true; }
   bool willRespondToMouseMoveEvents() override { return true; }
   void defaultEventHandler(Event*) override;
   bool containsRelatedTarget(Event*);
 
   // Methods called by MediaControlsMediaEventListener.
   void onVolumeChange();
@@ skipping 40 matching lines @@
 
   Member<MediaControlsMediaEventListener> m_mediaEventListener;
   Member<MediaControlsWindowEventListener> m_windowEventListener;
   Member<MediaControlsOrientationLockDelegate> m_orientationLockDelegate;
 
   TaskRunnerTimer<MediaControls> m_hideMediaControlsTimer;
   unsigned m_hideTimerBehaviorFlags;
   bool m_isMouseOverControls : 1;
   bool m_isPausedForScrubbing : 1;
 
-  TaskRunnerTimer<MediaControls> m_panelWidthChangedTimer;
-  int m_panelWidth;
+  // Watches the video element for resize and updates media controls as
+  // necessary.
+  Member<ResizeObserver> m_resizeObserver;
+
+  // Indicates whether |m_effectiveWidth|/|m_effectiveHeight| have been set via
+  // notifyElementSizeChanged yet. Used to decide whether or not to do so on a
+  // layout.
+  bool m_sizingInitialized : 1;
+
+  TaskRunnerTimer<MediaControls> m_elementSizeChangedTimer;
+  int m_effectiveWidth;
+  int m_effectiveHeight;

[mlamouri (slow - plz ping), 2017/02/27 18:22:58]

Could you use IntSize from platform/geometry/?

[steimel, 2017/02/28 00:59:47]

Given the way they're used in computeWhichControlsFit, I think it's simpler to
have as basic ints, what do you think?

 
   bool m_keepShowingUntilTimerFires : 1;
 };
 
 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());
 
 }  // namespace blink
 
 #endif