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

Side by Side Diff: Source/WebCore/html/shadow/MediaControlElements.h

Issue 10412040: Merge 116900 - Volume slider needs to be displayed below the mute button (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2010, 2011 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 }; 154 };
155 155
156 // ---------------------------- 156 // ----------------------------
157 157
158 class MediaControlVolumeSliderContainerElement : public MediaControlElement { 158 class MediaControlVolumeSliderContainerElement : public MediaControlElement {
159 public: 159 public:
160 static PassRefPtr<MediaControlVolumeSliderContainerElement> create(Document* ); 160 static PassRefPtr<MediaControlVolumeSliderContainerElement> create(Document* );
161 161
162 private: 162 private:
163 MediaControlVolumeSliderContainerElement(Document*); 163 MediaControlVolumeSliderContainerElement(Document*);
164 virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
164 virtual void defaultEventHandler(Event*); 165 virtual void defaultEventHandler(Event*);
165 virtual MediaControlElementType displayType() const; 166 virtual MediaControlElementType displayType() const;
166 virtual const AtomicString& shadowPseudoId() const; 167 virtual const AtomicString& shadowPseudoId() const;
167 }; 168 };
168 169
169 // ---------------------------- 170 // ----------------------------
170 171
171 class MediaControlStatusDisplayElement : public MediaControlElement { 172 class MediaControlStatusDisplayElement : public MediaControlElement {
172 public: 173 public:
173 static PassRefPtr<MediaControlStatusDisplayElement> create(Document*); 174 static PassRefPtr<MediaControlStatusDisplayElement> create(Document*);
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 }; 518 };
518 519
519 #endif 520 #endif
520 // ---------------------------- 521 // ----------------------------
521 522
522 } // namespace WebCore 523 } // namespace WebCore
523 524
524 #endif // ENABLE(VIDEO) 525 #endif // ENABLE(VIDEO)
525 526
526 #endif // MediaControlElements_h 527 #endif // MediaControlElements_h
OLDNEW
« no previous file with comments | « Source/WebCore/css/mediaControlsQuickTime.css ('k') | Source/WebCore/html/shadow/MediaControlElements.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698