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

Side by Side Diff: Source/core/html/shadow/MediaControls.cpp

Issue 1153383002: Rearrange MediaControls members to match DOM structure (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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
« no previous file with comments | « Source/core/html/shadow/MediaControls.h ('k') | no next file » | 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) 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 static const double timeWithoutMouseMovementBeforeHidingMediaControls = 3; 43 static const double timeWithoutMouseMovementBeforeHidingMediaControls = 3;
44 44
45 static bool fullscreenIsSupported(const Document& document) 45 static bool fullscreenIsSupported(const Document& document)
46 { 46 {
47 return !document.settings() || document.settings()->fullscreenSupported(); 47 return !document.settings() || document.settings()->fullscreenSupported();
48 } 48 }
49 49
50 MediaControls::MediaControls(HTMLMediaElement& mediaElement) 50 MediaControls::MediaControls(HTMLMediaElement& mediaElement)
51 : HTMLDivElement(mediaElement.document()) 51 : HTMLDivElement(mediaElement.document())
52 , m_mediaElement(&mediaElement) 52 , m_mediaElement(&mediaElement)
53 , m_overlayEnclosure(nullptr)
54 , m_overlayPlayButton(nullptr)
55 , m_overlayCastButton(nullptr)
56 , m_enclosure(nullptr)
53 , m_panel(nullptr) 57 , m_panel(nullptr)
54 , m_overlayPlayButton(nullptr)
55 , m_overlayEnclosure(nullptr)
56 , m_playButton(nullptr) 58 , m_playButton(nullptr)
59 , m_timeline(nullptr)
57 , m_currentTimeDisplay(nullptr) 60 , m_currentTimeDisplay(nullptr)
58 , m_timeline(nullptr) 61 , m_durationDisplay(nullptr)
59 , m_muteButton(nullptr) 62 , m_muteButton(nullptr)
60 , m_volumeSlider(nullptr) 63 , m_volumeSlider(nullptr)
61 , m_toggleClosedCaptionsButton(nullptr) 64 , m_toggleClosedCaptionsButton(nullptr)
65 , m_castButton(nullptr)
62 , m_fullScreenButton(nullptr) 66 , m_fullScreenButton(nullptr)
63 , m_castButton(nullptr)
64 , m_overlayCastButton(nullptr)
65 , m_durationDisplay(nullptr)
66 , m_enclosure(nullptr)
67 , m_hideMediaControlsTimer(this, &MediaControls::hideMediaControlsTimerFired ) 67 , m_hideMediaControlsTimer(this, &MediaControls::hideMediaControlsTimerFired )
68 , m_hideTimerBehaviorFlags(IgnoreNone) 68 , m_hideTimerBehaviorFlags(IgnoreNone)
69 , m_isMouseOverControls(false) 69 , m_isMouseOverControls(false)
70 , m_isPausedForScrubbing(false) 70 , m_isPausedForScrubbing(false)
71 { 71 {
72 } 72 }
73 73
74 PassRefPtrWillBeRawPtr<MediaControls> MediaControls::create(HTMLMediaElement& me diaElement) 74 PassRefPtrWillBeRawPtr<MediaControls> MediaControls::create(HTMLMediaElement& me diaElement)
75 { 75 {
76 RefPtrWillBeRawPtr<MediaControls> controls = adoptRefWillBeNoop(new MediaCon trols(mediaElement)); 76 RefPtrWillBeRawPtr<MediaControls> controls = adoptRefWillBeNoop(new MediaCon trols(mediaElement));
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 visitor->trace(m_toggleClosedCaptionsButton); 533 visitor->trace(m_toggleClosedCaptionsButton);
534 visitor->trace(m_fullScreenButton); 534 visitor->trace(m_fullScreenButton);
535 visitor->trace(m_durationDisplay); 535 visitor->trace(m_durationDisplay);
536 visitor->trace(m_enclosure); 536 visitor->trace(m_enclosure);
537 visitor->trace(m_castButton); 537 visitor->trace(m_castButton);
538 visitor->trace(m_overlayCastButton); 538 visitor->trace(m_overlayCastButton);
539 HTMLDivElement::trace(visitor); 539 HTMLDivElement::trace(visitor);
540 } 540 }
541 541
542 } 542 }
OLDNEW
« no previous file with comments | « Source/core/html/shadow/MediaControls.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698