Chromium Code Reviews| Index: Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h |
| diff --git a/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h b/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h |
| index 0db04423dc5fa5b862f8579630996730ee34ef3d..f7a7e4dff9a1d8d9f2f31fcb419f6400f2221fef 100644 |
| --- a/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h |
| +++ b/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h |
| @@ -26,96 +26,26 @@ |
| #ifndef InbandTextTrackPrivateClient_h |
| #define InbandTextTrackPrivateClient_h |
| -#include "Color.h" |
| -#include <wtf/Noncopyable.h> |
| -#include <wtf/text/WTFString.h> |
| +namespace WTF { |
| +class String; |
| +} |
| namespace WebCore { |
| class InbandTextTrackPrivate; |
| - |
| -class GenericCueData { |
| - WTF_MAKE_NONCOPYABLE(GenericCueData); WTF_MAKE_FAST_ALLOCATED; |
| -public: |
| - GenericCueData() |
| - : m_startTime(0) |
| - , m_endTime(0) |
| - , m_line(-1) |
| - , m_position(-1) |
| - , m_size(-1) |
| - , m_align(None) |
| - , m_baseFontSize(0) |
| - , m_relativeFontSize(0) |
| - { |
| - } |
| - virtual ~GenericCueData() { } |
| - |
| - double startTime() const { return m_startTime; } |
| - void setStartTime(double startTime) { m_startTime = startTime; } |
| - |
| - double endTime() const { return m_endTime; } |
| - void setEndTime(double endTime) { m_endTime = endTime; } |
| - |
| - String id() const { return m_id; } |
| - void setId(String id) { m_id = id; } |
| - |
| - String content() const { return m_content; } |
| - void setContent(String content) { m_content = content; } |
| - |
| - double line() const { return m_line; } |
| - void setLine(double line) { m_line = line; } |
| - |
| - double position() const { return m_position; } |
| - void setPosition(double position) { m_position = position; } |
| - |
| - double size() const { return m_size; } |
| - void setSize(double size) { m_size = size; } |
| - |
| - enum Alignment { |
| - None, |
| - Start, |
| - Middle, |
| - End |
| - }; |
| - Alignment align() const { return m_align; } |
| - void setAlign(Alignment align) { m_align = align; } |
| - |
| - String fontName() const { return m_fontName; } |
| - void setFontName(String fontName) { m_fontName = fontName; } |
| - |
| - double baseFontSize() const { return m_baseFontSize; } |
| - void setBaseFontSize(double baseFontSize) { m_baseFontSize = baseFontSize; } |
| - |
| - double relativeFontSize() const { return m_relativeFontSize; } |
| - void setRelativeFontSize(double relativeFontSize) { m_relativeFontSize = relativeFontSize; } |
| - |
| - Color foregroundColor() const { return m_foregroundColor; } |
| - void setForegroundColor(RGBA32 color) { m_foregroundColor.setRGB(color); } |
| - |
| - Color backgroundColor() const { return m_backgroundColor; } |
| - void setBackgroundColor(RGBA32 color) { m_backgroundColor.setRGB(color); } |
| - |
| -private: |
| - double m_startTime; |
| - double m_endTime; |
| - String m_id; |
| - String m_content; |
| - double m_line; |
| - double m_position; |
| - double m_size; |
| - Alignment m_align; |
| - String m_fontName; |
| - double m_baseFontSize; |
| - double m_relativeFontSize; |
| - Color m_foregroundColor; |
| - Color m_backgroundColor; |
| -}; |
| +class GenericCueData; |
| class InbandTextTrackPrivateClient { |
| public: |
| virtual ~InbandTextTrackPrivateClient() { } |
| - virtual void addWebVTTCue(InbandTextTrackPrivate*, double /*start*/, double /*end*/, const String& /*id*/, const String& /*content*/, const String& /*settings*/) = 0; |
| + virtual void addWebVTTCue(InbandTextTrackPrivate*, |
| + double start, |
|
acolwell GONE FROM CHROMIUM
2013/04/17 00:13:56
nit: Remove extra trailing whitespace
Matthew Heaney (Chromium)
2013/04/18 23:15:42
Done.
|
| + double end, |
| + const WTF::String& id, |
| + const WTF::String& content, |
| + const WTF::String& settings) = 0; |
| + |
| virtual void addGenericCue(InbandTextTrackPrivate*, GenericCueData*) = 0; |
| }; |