Chromium Code Reviews Chromium Code Reviews
Issue 77853002:
Move VTT functionality from TextTrackCue.* to VTTCue.* (Closed)
Base URL: svn://svn.chromium.org/blink/trunk| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Victor Carbune (victor@rosedu.org) | 2 * Copyright (C) 2012 Victor Carbune (victor@rosedu.org) |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #ifndef RenderTextTrackCue_h | 26 #ifndef RenderTextTrackCue_h |
| 27 #define RenderTextTrackCue_h | 27 #define RenderTextTrackCue_h |
| 28 | 28 |
| 29 #include "core/rendering/RenderBlockFlow.h" | 29 #include "core/rendering/RenderBlockFlow.h" |
| 30 #include "core/rendering/RenderInline.h" | |
| 31 #include "platform/geometry/FloatPoint.h" | |
| 32 | 30 |
| 33 namespace WebCore { | 31 namespace WebCore { |
| 34 | 32 |
| 35 class TextTrackCueBox; | 33 class TextTrackCueBox; |
| 36 | 34 |
| 37 class RenderTextTrackCue FINAL : public RenderBlockFlow { | 35 class RenderTextTrackCue : public RenderBlockFlow { |
|
acolwell GONE FROM CHROMIUM
2013/11/20 18:38:45
I think we should just remove this object and have
gasubic
2013/11/21 03:07:38
Done.
| |
| 38 public: | 36 public: |
| 39 explicit RenderTextTrackCue(TextTrackCueBox*); | 37 explicit RenderTextTrackCue(TextTrackCueBox*); |
| 40 | 38 |
| 41 private: | 39 private: |
| 42 virtual void layout() OVERRIDE; | |
| 43 virtual bool supportsPartialLayout() const OVERRIDE { return false; } | 40 virtual bool supportsPartialLayout() const OVERRIDE { return false; } |
| 44 | |
| 45 bool isOutside() const; | |
| 46 bool isOverlapping() const; | |
| 47 bool shouldSwitchDirection(InlineFlowBox*, LayoutUnit) const; | |
| 48 | |
| 49 void moveBoxesByStep(LayoutUnit); | |
| 50 bool switchDirection(bool&, LayoutUnit&); | |
| 51 | |
| 52 bool findFirstLineBox(InlineFlowBox*&); | |
| 53 bool initializeLayoutParameters(InlineFlowBox*, LayoutUnit&, LayoutUnit&); | |
| 54 void placeBoxInDefaultPosition(LayoutUnit, bool&); | |
| 55 void repositionCueSnapToLinesSet(); | |
| 56 void repositionCueSnapToLinesNotSet(); | |
| 57 | |
| 58 TextTrackCue* m_cue; | |
| 59 FloatPoint m_fallbackPosition; | |
| 60 }; | 41 }; |
| 61 | 42 |
| 62 } // namespace WebCore | 43 } // namespace WebCore |
| 63 | 44 |
| 64 #endif // RenderTextTrackCue_h | 45 #endif // RenderTextTrackCue_h |
| OLD | NEW |
