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

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

Issue 302603003: Cleanup tests related to controls hiding/fading in/out (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Tweaks. Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.cpp ('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 18 matching lines...) Expand all
29 29
30 #include "bindings/v8/ExceptionStatePlaceholder.h" 30 #include "bindings/v8/ExceptionStatePlaceholder.h"
31 #include "core/events/MouseEvent.h" 31 #include "core/events/MouseEvent.h"
32 #include "core/frame/Settings.h" 32 #include "core/frame/Settings.h"
33 #include "core/html/HTMLMediaElement.h" 33 #include "core/html/HTMLMediaElement.h"
34 #include "core/html/MediaController.h" 34 #include "core/html/MediaController.h"
35 #include "core/rendering/RenderTheme.h" 35 #include "core/rendering/RenderTheme.h"
36 36
37 namespace WebCore { 37 namespace WebCore {
38 38
39 // If you change this value, then also update the corresponding value in
40 // LayoutTests/media/media-controls.js.
39 static const double timeWithoutMouseMovementBeforeHidingMediaControls = 3; 41 static const double timeWithoutMouseMovementBeforeHidingMediaControls = 3;
40 42
41 MediaControls::MediaControls(HTMLMediaElement& mediaElement) 43 MediaControls::MediaControls(HTMLMediaElement& mediaElement)
42 : HTMLDivElement(mediaElement.document()) 44 : HTMLDivElement(mediaElement.document())
43 , m_mediaElement(&mediaElement) 45 , m_mediaElement(&mediaElement)
44 , m_panel(nullptr) 46 , m_panel(nullptr)
45 , m_textDisplayContainer(nullptr) 47 , m_textDisplayContainer(nullptr)
46 , m_overlayPlayButton(nullptr) 48 , m_overlayPlayButton(nullptr)
47 , m_overlayEnclosure(nullptr) 49 , m_overlayEnclosure(nullptr)
48 , m_playButton(nullptr) 50 , m_playButton(nullptr)
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 visitor->trace(m_muteButton); 472 visitor->trace(m_muteButton);
471 visitor->trace(m_volumeSlider); 473 visitor->trace(m_volumeSlider);
472 visitor->trace(m_toggleClosedCaptionsButton); 474 visitor->trace(m_toggleClosedCaptionsButton);
473 visitor->trace(m_fullScreenButton); 475 visitor->trace(m_fullScreenButton);
474 visitor->trace(m_durationDisplay); 476 visitor->trace(m_durationDisplay);
475 visitor->trace(m_enclosure); 477 visitor->trace(m_enclosure);
476 HTMLDivElement::trace(visitor); 478 HTMLDivElement::trace(visitor);
477 } 479 }
478 480
479 } 481 }
OLDNEW
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698