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

Side by Side Diff: third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp

Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink (Closed)
Patch Set: Created 3 years, 10 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 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 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 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 } 260 }
261 261
262 EventDispatchHandlingState* 262 EventDispatchHandlingState*
263 MediaControlOverlayEnclosureElement::preDispatchEventHandler(Event* event) { 263 MediaControlOverlayEnclosureElement::preDispatchEventHandler(Event* event) {
264 // When the media element is clicked or touched we want to make the overlay 264 // When the media element is clicked or touched we want to make the overlay
265 // cast button visible (if the other requirements are right) even if 265 // cast button visible (if the other requirements are right) even if
266 // JavaScript is doing its own handling of the event. Doing it in 266 // JavaScript is doing its own handling of the event. Doing it in
267 // preDispatchEventHandler prevents any interference from JavaScript. 267 // preDispatchEventHandler prevents any interference from JavaScript.
268 // Note that we can't simply test for click, since JS handling of touch events 268 // Note that we can't simply test for click, since JS handling of touch events
269 // can prevent their translation to click events. 269 // can prevent their translation to click events.
270 if (event && (event->type() == EventTypeNames::click || 270 if (event &&
271 event->type() == EventTypeNames::touchstart)) 271 (event->type() == EventTypeNames::click ||
272 event->type() == EventTypeNames::touchstart))
272 mediaControls().showOverlayCastButtonIfNeeded(); 273 mediaControls().showOverlayCastButtonIfNeeded();
273 return MediaControlDivElement::preDispatchEventHandler(event); 274 return MediaControlDivElement::preDispatchEventHandler(event);
274 } 275 }
275 276
276 // ---------------------------- 277 // ----------------------------
277 278
278 MediaControlMuteButtonElement::MediaControlMuteButtonElement( 279 MediaControlMuteButtonElement::MediaControlMuteButtonElement(
279 MediaControls& mediaControls) 280 MediaControls& mediaControls)
280 : MediaControlInputElement(mediaControls, MediaMuteButton) {} 281 : MediaControlInputElement(mediaControls, MediaMuteButton) {}
281 282
(...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 MediaControlCurrentTimeDisplayElement* 1042 MediaControlCurrentTimeDisplayElement*
1042 MediaControlCurrentTimeDisplayElement::create(MediaControls& mediaControls) { 1043 MediaControlCurrentTimeDisplayElement::create(MediaControls& mediaControls) {
1043 MediaControlCurrentTimeDisplayElement* element = 1044 MediaControlCurrentTimeDisplayElement* element =
1044 new MediaControlCurrentTimeDisplayElement(mediaControls); 1045 new MediaControlCurrentTimeDisplayElement(mediaControls);
1045 element->setShadowPseudoId( 1046 element->setShadowPseudoId(
1046 AtomicString("-webkit-media-controls-current-time-display")); 1047 AtomicString("-webkit-media-controls-current-time-display"));
1047 return element; 1048 return element;
1048 } 1049 }
1049 1050
1050 } // namespace blink 1051 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698