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

Side by Side Diff: Source/core/html/track/TextTrackCueGeneric.h

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 Apple Inc. All rights reserved.
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
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 double baseFontSizeRelativeToVideoHeight() const { return m_baseFontSizeRela tiveToVideoHeight; } 54 double baseFontSizeRelativeToVideoHeight() const { return m_baseFontSizeRela tiveToVideoHeight; }
55 void setBaseFontSizeRelativeToVideoHeight(double size) { m_baseFontSizeRelat iveToVideoHeight = size; } 55 void setBaseFontSizeRelativeToVideoHeight(double size) { m_baseFontSizeRelat iveToVideoHeight = size; }
56 56
57 double fontSizeMultiplier() const { return m_fontSizeMultiplier; } 57 double fontSizeMultiplier() const { return m_fontSizeMultiplier; }
58 void setFontSizeMultiplier(double size) { m_fontSizeMultiplier = size; } 58 void setFontSizeMultiplier(double size) { m_fontSizeMultiplier = size; }
59 59
60 String fontName() const { return m_fontName; } 60 String fontName() const { return m_fontName; }
61 void setFontName(String name) { m_fontName = name; } 61 void setFontName(String name) { m_fontName = name; }
62 62
63 Color foregroundColor() const { return m_foregroundColor; } 63 Color foregroundColor() const { return m_foregroundColor; }
64 void setForegroundColor(Color color) { m_foregroundColor = color; } 64
65 void setForegroundColor(RGBA32 color) { m_foregroundColor.setRGB(color); }
65 66
66 Color backgroundColor() const { return m_backgroundColor; } 67 Color backgroundColor() const { return m_backgroundColor; }
67 void setBackgroundColor(Color color) { m_backgroundColor = color; } 68 void setBackgroundColor(RGBA32 color) { m_backgroundColor.setRGB(color); }
68 69
69 virtual void videoSizeDidChange(const IntSize&); 70 virtual void videoSizeDidChange(const IntSize&);
70 71
71 virtual bool operator==(const TextTrackCue&) const OVERRIDE; 72 virtual bool operator==(const TextTrackCue&) const OVERRIDE;
72 virtual bool operator!=(const TextTrackCue& cue) const OVERRIDE 73 virtual bool operator!=(const TextTrackCue& cue) const OVERRIDE
73 { 74 {
74 return !(*this == cue); 75 return !(*this == cue);
75 } 76 }
76 77
77 virtual TextTrackCue::CueType cueType() const OVERRIDE { return TextTrackCue ::Generic; } 78 virtual TextTrackCue::CueType cueType() const OVERRIDE { return TextTrackCue ::Generic; }
78 79
79 private: 80 private:
80 TextTrackCueGeneric(ScriptExecutionContext*, double start, double end, const String&); 81 TextTrackCueGeneric(ScriptExecutionContext*, double start, double end, const String&);
81 82
82 Color m_foregroundColor; 83 Color m_foregroundColor;
83 Color m_backgroundColor; 84 Color m_backgroundColor;
84 double m_baseFontSizeRelativeToVideoHeight; 85 double m_baseFontSizeRelativeToVideoHeight;
85 double m_fontSizeMultiplier; 86 double m_fontSizeMultiplier;
86 String m_fontName; 87 String m_fontName;
87 bool m_defaultPosition; 88 bool m_defaultPosition;
88 }; 89 };
89 90
90 } // namespace WebCore 91 } // namespace WebCore
91 92
92 #endif 93 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698