Enable WebVTT regions for runtime testing, updated tests and minor fixes

Source/core/html/track/TextTrackRegion.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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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 TextTrackRegion_h
 #define TextTrackRegion_h
 
-#if ENABLE(WEBVTT_REGIONS)
-
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/dom/Document.h"
 #include "core/html/track/TextTrack.h"
 #include "platform/geometry/FloatPoint.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefCounted.h"
 
 namespace WebCore {
 
 class ExceptionState;
@@ skipping 44 matching lines @@
     bool isScrollingRegion() { return m_scroll; }
 
     PassRefPtr<HTMLDivElement> getDisplayTree();
 
     void appendTextTrackCueBox(PassRefPtr<TextTrackCueBox>);
     void displayLastTextTrackCueBox();
     void willRemoveTextTrackCueBox(TextTrackCueBox*);
 
 private:
     TextTrackRegion(ExecutionContext*);
-    Document* ownerDocument() { return toDocument(m_executionContext); }
+    Document* ownerDocument() { return toDocument(executionContext()); }
 
     void prepareRegionDisplayTree();
 
     // The timer is needed to continue processing when cue scrolling ended.
     void startTimer();
     void stopTimer();
     void scrollTimerFired(Timer<TextTrackRegion>*);
 
     enum RegionSetting {
         None,
         Id,
         Width,
         Height,
         RegionAnchor,
         ViewportAnchor,
         Scroll
     };
-
     RegionSetting getSettingFromString(const String&);
-
     void parseSettingValue(RegionSetting, const String&);
     void parseSetting(const String&, unsigned*);
 
     static const AtomicString& textTrackCueContainerShadowPseudoId();
     static const AtomicString& textTrackCueContainerScrollingClass();
     static const AtomicString& textTrackRegionShadowPseudoId();
 
     String m_id;
     String m_settings;
-
     double m_width;
     unsigned m_heightInLines;
-
     FloatPoint m_regionAnchor;
     FloatPoint m_viewportAnchor;
-
     bool m_scroll;
 
-    RefPtr<HTMLDivElement> m_regionDisplayTree;
-
     // The cue container is the container that is scrolled up to obtain the
     // effect of scrolling cues when this is enabled for the regions.
     RefPtr<HTMLDivElement> m_cueContainer;
+    RefPtr<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.
     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<TextTrackRegion> m_scrollTimer;
 };
 
 } // namespace WebCore
-
 #endif
-#endif