Implement VTTCue.region and sync the VTTRegion interface

third_party/WebKit/Source/core/html/track/vtt/VTTRegion.h

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef VTTRegion_h
 #define VTTRegion_h
 
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/ContextLifecycleObserver.h"
-#include "core/html/track/TextTrack.h"
 #include "platform/Timer.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class Document;
 class ExceptionState;
 class HTMLDivElement;
 class VTTCueBox;
 class VTTScanner;
 
 class VTTRegion final : public GarbageCollectedFinalized<VTTRegion>,
                         public ScriptWrappable {
   DEFINE_WRAPPERTYPEINFO();
 
  public:
   static VTTRegion* create() { return new VTTRegion; }
 
   virtual ~VTTRegion();
 
-  TextTrack* track() const { return m_track; }
-  void setTrack(TextTrack*);
-
   const String& id() const { return m_id; }
   void setId(const String&);
 
   double width() const { return m_width; }
   void setWidth(double, ExceptionState&);
 
-  long height() const { return m_heightInLines; }
-  void setHeight(long, ExceptionState&);
+  long lines() const { return m_lines; }
+  void setLines(long, ExceptionState&);
 
   double regionAnchorX() const { return m_regionAnchor.x(); }
   void setRegionAnchorX(double, ExceptionState&);
 
   double regionAnchorY() const { return m_regionAnchor.y(); }
   void setRegionAnchorY(double, ExceptionState&);
 
   double viewportAnchorX() const { return m_viewportAnchor.x(); }
   void setViewportAnchorX(double, ExceptionState&);
 
   double viewportAnchorY() const { return m_viewportAnchor.y(); }
   void setViewportAnchorY(double, ExceptionState&);
 
   const AtomicString scroll() const;
-  void setScroll(const AtomicString&, ExceptionState&);
+  void setScroll(const AtomicString&);
 
   void updateParametersFromRegion(VTTRegion*);
 
   const String& regionSettings() const { return m_settings; }
   void setRegionSettings(const String&);
 
   bool isScrollingRegion() { return m_scroll; }
 
   HTMLDivElement* getDisplayTree(Document&);
 
@@ skipping 25 matching lines @@
   RegionSetting scanSettingName(VTTScanner&);
   void parseSettingValue(RegionSetting, VTTScanner&);
 
   static const AtomicString& textTrackCueContainerShadowPseudoId();
   static const AtomicString& textTrackCueContainerScrollingClass();
   static const AtomicString& textTrackRegionShadowPseudoId();
 
   String m_id;
   String m_settings;
   double m_width;
-  unsigned m_heightInLines;
+  unsigned m_lines;
   FloatPoint m_regionAnchor;
   FloatPoint m_viewportAnchor;
   bool m_scroll;
 
   // The cue container is the container that is scrolled up to obtain the
   // effect of scrolling cues when this is enabled for the regions.
   Member<HTMLDivElement> m_cueContainer;
   Member<HTMLDivElement> m_regionDisplayTree;
 
-  // The member variable track can be a raw pointer as it will never
-  // reference a destroyed TextTrack, as this member variable
-  // is cleared in the TextTrack destructor and it is generally
-  // set/reset within the addRegion and removeRegion methods.
-  Member<TextTrack> m_track;
-
   // Keep track of the current numeric value of the css "top" property.
   double m_currentTop;
 
   // The timer is used to display the next cue line after the current one has
   // been displayed. It's main use is for scrolling regions and it triggers as
   // soon as the animation for rolling out one line has finished, but
   // currently it is used also for non-scrolling regions to use a single
   // code path.
   Timer<VTTRegion> m_scrollTimer;
 };
 
 }  // namespace blink
 
 #endif  // VTTRegion_h