Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Side by Side Diff: Source/core/rendering/RenderVTTCue.h

Issue 77853002: Move VTT functionality from TextTrackCue.* to VTTCue.* (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address nits. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderTextTrackCue.cpp ('k') | Source/core/rendering/RenderVTTCue.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 RenderVTTCue_h
27 #define RenderTextTrackCue_h 27 #define RenderVTTCue_h
28 28
29 #include "core/rendering/RenderBlockFlow.h" 29 #include "core/rendering/RenderBlockFlow.h"
30 #include "core/rendering/RenderInline.h" 30 #include "core/rendering/RenderInline.h"
31 #include "platform/geometry/FloatPoint.h" 31 #include "platform/geometry/FloatPoint.h"
32 32
33 namespace WebCore { 33 namespace WebCore {
34 34
35 class TextTrackCueBox; 35 class VTTCue;
36 class VTTCueBox;
36 37
37 class RenderTextTrackCue FINAL : public RenderBlockFlow { 38 class RenderVTTCue FINAL : public RenderBlockFlow {
38 public: 39 public:
39 explicit RenderTextTrackCue(TextTrackCueBox*); 40 explicit RenderVTTCue(VTTCueBox*);
40 41
41 private: 42 private:
42 virtual void layout() OVERRIDE; 43 virtual void layout() OVERRIDE;
43 virtual bool supportsPartialLayout() const OVERRIDE { return false; } 44 virtual bool supportsPartialLayout() const OVERRIDE { return false; }
44 45
45 bool isOutside() const; 46 bool isOutside() const;
46 bool isOverlapping() const; 47 bool isOverlapping() const;
47 bool shouldSwitchDirection(InlineFlowBox*, LayoutUnit) const; 48 bool shouldSwitchDirection(InlineFlowBox*, LayoutUnit) const;
48 49
49 void moveBoxesByStep(LayoutUnit); 50 void moveBoxesByStep(LayoutUnit);
50 bool switchDirection(bool&, LayoutUnit&); 51 bool switchDirection(bool&, LayoutUnit&);
51 52
52 bool findFirstLineBox(InlineFlowBox*&); 53 bool findFirstLineBox(InlineFlowBox*&);
53 bool initializeLayoutParameters(InlineFlowBox*, LayoutUnit&, LayoutUnit&); 54 bool initializeLayoutParameters(InlineFlowBox*, LayoutUnit&, LayoutUnit&);
54 void placeBoxInDefaultPosition(LayoutUnit, bool&); 55 void placeBoxInDefaultPosition(LayoutUnit, bool&);
55 void repositionCueSnapToLinesSet(); 56 void repositionCueSnapToLinesSet();
56 void repositionCueSnapToLinesNotSet(); 57 void repositionCueSnapToLinesNotSet();
57 58
58 TextTrackCue* m_cue; 59 VTTCue* m_cue;
59 FloatPoint m_fallbackPosition; 60 FloatPoint m_fallbackPosition;
60 }; 61 };
61 62
62 } // namespace WebCore 63 } // namespace WebCore
63 64
64 #endif // RenderTextTrackCue_h 65 #endif // RenderVTTCue_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTextTrackCue.cpp ('k') | Source/core/rendering/RenderVTTCue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698