VTTCue: Refactor display parameter handling

Source/core/html/track/vtt/VTTCue.h

 /*
  * Copyright (c) 2013, Opera Software ASA. 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 23 matching lines @@
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class Document;
 class DoubleOrAutoKeyword;
 class ExecutionContext;
 class VTTCue;
 class VTTScanner;
 
+struct VTTDisplayParameters {
+    VTTDisplayParameters();
+
+    FloatPoint position;
+    float size;
+    CSSValueID direction;
+    CSSValueID writingMode;
+};
+
 class VTTCueBox final : public HTMLDivElement {
 public:
     static PassRefPtrWillBeRawPtr<VTTCueBox> create(Document& document, VTTCue* cue)
     {
         return adoptRefWillBeNoop(new VTTCueBox(document, cue));
     }
 
     VTTCue* getCue() const { return m_cue; }
-    void applyCSSProperties(const IntSize& videoSize);
+    void applyCSSProperties(const VTTDisplayParameters&);
 
     virtual void trace(Visitor*) override;
 
 private:
     VTTCueBox(Document&, VTTCue*);
 
     virtual RenderObject* createRenderer(RenderStyle*) override;
 
     RawPtrWillBeMember<VTTCue> m_cue;
 };
@@ skipping 30 matching lines @@
     void setText(const String&);
 
     void parseSettings(const String&);
 
     PassRefPtrWillBeRawPtr<DocumentFragment> getCueAsHTML();
     PassRefPtrWillBeRawPtr<DocumentFragment> createCueRenderingTree();
 
     const String& regionId() const { return m_regionId; }
     void setRegionId(const String&);
 
-    virtual void updateDisplay(const IntSize& videoSize, HTMLDivElement& container) override;
+    virtual void updateDisplay(HTMLDivElement& container) override;
 
     virtual void updateDisplayTree(double movieTime) override;
     virtual void removeDisplayTree() override;
     virtual void notifyRegionWhenRemovingDisplayTree(bool notifyRegion) override;
 
     void markFutureAndPastNodes(ContainerNode*, double previousTimestamp, double movieTime);
 
-    float calculateComputedLinePosition();
-
-    FloatPoint getCSSPosition() const;
-
-    CSSValueID getCSSAlignment() const;
-    float getCSSSize() const;
-    CSSValueID getCSSWritingDirection() const;
-    CSSValueID getCSSWritingMode() const;
+    float calculateComputedLinePosition() const;
 
     enum WritingDirection {
         Horizontal = 0,
         VerticalGrowingLeft,
         VerticalGrowingRight,
         NumberOfWritingDirections
     };
     WritingDirection getWritingDirection() const { return m_writingDirection; }
 
     enum CueAlignment {
         Start = 0,
         Middle,
         End,
         Left,
         Right,
         NumberOfAlignments
     };
-    CueAlignment getAlignment() const { return m_cueAlignment; }
+    CueAlignment cueAlignment() const { return m_cueAlignment; }
 
     virtual ExecutionContext* executionContext() const override;
 
 #ifndef NDEBUG
     virtual String toString() const override;
 #endif
 
     virtual void trace(Visitor*) override;
 
 private:
     VTTCue(Document&, double startTime, double endTime, const String& text);
 
     Document& document() const;
 
     VTTCueBox& ensureDisplayTree();
-    PassRefPtrWillBeRawPtr<VTTCueBox> getDisplayTree(const IntSize& videoSize);
+    PassRefPtrWillBeRawPtr<VTTCueBox> getDisplayTree();
 
     virtual void cueDidChange() override;
 
     void createVTTNodeTree();
     void copyVTTNodeToDOMTree(ContainerNode* vttNode, ContainerNode* root);
 
-    FloatPoint getPositionCoordinates() const;
     bool lineIsAuto() const;
+    bool textPositionIsAuto() const;
 
-    void calculateDisplayParameters();
+    VTTDisplayParameters calculateDisplayParameters() const;
     float calculateComputedTextPosition() const;
-    bool textPositionIsAuto() const;
     CueAlignment calculateComputedCueAlignment() const;
 
     enum CueSetting {
         None,
         Vertical,
         Line,
         Position,
         Size,
         Align,
         RegionId
     };
-    CueSetting settingName(VTTScanner&);
+    CueSetting settingName(VTTScanner&) const;
 
     String m_text;
     float m_linePosition;
-    float m_computedLinePosition;
     float m_textPosition;
     float m_cueSize;
     WritingDirection m_writingDirection;
     CueAlignment m_cueAlignment;
     String m_regionId;
 
     RefPtrWillBeMember<DocumentFragment> m_vttNodeTree;
     RefPtrWillBeMember<HTMLDivElement> m_cueBackgroundBox;
     RefPtrWillBeMember<VTTCueBox> m_displayTree;
 
-    CSSValueID m_displayDirection;
-    float m_displaySize;
-    FloatPoint m_displayPosition;
-
     bool m_snapToLines : 1;
     bool m_displayTreeShouldChange : 1;
     bool m_notifyRegion : 1;
 };
 
 // VTTCue is currently the only TextTrackCue subclass.
 DEFINE_TYPE_CASTS(VTTCue, TextTrackCue, cue, true, true);
 
 } // namespace blink
 
 #endif // VTTCue_h