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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 } // anonymous namespace 97 } // anonymous namespace
98 98
99 MediaControlPanelElement::MediaControlPanelElement(MediaControls& mediaControls) 99 MediaControlPanelElement::MediaControlPanelElement(MediaControls& mediaControls)
100 : MediaControlDivElement(mediaControls, MediaControlsPanel) 100 : MediaControlDivElement(mediaControls, MediaControlsPanel)
101 , m_isDisplayed(false) 101 , m_isDisplayed(false)
102 , m_opaque(true) 102 , m_opaque(true)
103 , m_transitionTimer(this, &MediaControlPanelElement::transitionTimerFired) 103 , m_transitionTimer(this, &MediaControlPanelElement::transitionTimerFired)
104 { 104 {
105 } 105 }
106 106
107 PassRefPtrWillBeRawPtr<MediaControlPanelElement> MediaControlPanelElement::creat e(MediaControls& mediaControls) 107 RawPtr<MediaControlPanelElement> MediaControlPanelElement::create(MediaControls& mediaControls)
108 { 108 {
109 RefPtrWillBeRawPtr<MediaControlPanelElement> panel = adoptRefWillBeNoop(new MediaControlPanelElement(mediaControls)); 109 RawPtr<MediaControlPanelElement> panel = new MediaControlPanelElement(mediaC ontrols);
110 panel->setShadowPseudoId(AtomicString("-webkit-media-controls-panel", Atomic String::ConstructFromLiteral)); 110 panel->setShadowPseudoId(AtomicString("-webkit-media-controls-panel", Atomic String::ConstructFromLiteral));
111 return panel.release(); 111 return panel.release();
112 } 112 }
113 113
114 void MediaControlPanelElement::defaultEventHandler(Event* event) 114 void MediaControlPanelElement::defaultEventHandler(Event* event)
115 { 115 {
116 // Suppress the media element activation behavior (toggle play/pause) when 116 // Suppress the media element activation behavior (toggle play/pause) when
117 // any part of the control panel is clicked. 117 // any part of the control panel is clicked.
118 if (event->type() == EventTypeNames::click) { 118 if (event->type() == EventTypeNames::click) {
119 event->setDefaultHandled(); 119 event->setDefaultHandled();
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 } 194 }
195 195
196 // ---------------------------- 196 // ----------------------------
197 197
198 MediaControlPanelEnclosureElement::MediaControlPanelEnclosureElement(MediaContro ls& mediaControls) 198 MediaControlPanelEnclosureElement::MediaControlPanelEnclosureElement(MediaContro ls& mediaControls)
199 // Mapping onto same MediaControlElementType as panel element, since it has similar properties. 199 // Mapping onto same MediaControlElementType as panel element, since it has similar properties.
200 : MediaControlDivElement(mediaControls, MediaControlsPanel) 200 : MediaControlDivElement(mediaControls, MediaControlsPanel)
201 { 201 {
202 } 202 }
203 203
204 PassRefPtrWillBeRawPtr<MediaControlPanelEnclosureElement> MediaControlPanelEnclo sureElement::create(MediaControls& mediaControls) 204 RawPtr<MediaControlPanelEnclosureElement> MediaControlPanelEnclosureElement::cre ate(MediaControls& mediaControls)
205 { 205 {
206 RefPtrWillBeRawPtr<MediaControlPanelEnclosureElement> enclosure = adoptRefWi llBeNoop(new MediaControlPanelEnclosureElement(mediaControls)); 206 RawPtr<MediaControlPanelEnclosureElement> enclosure = new MediaControlPanelE nclosureElement(mediaControls);
207 enclosure->setShadowPseudoId(AtomicString("-webkit-media-controls-enclosure" , AtomicString::ConstructFromLiteral)); 207 enclosure->setShadowPseudoId(AtomicString("-webkit-media-controls-enclosure" , AtomicString::ConstructFromLiteral));
208 return enclosure.release(); 208 return enclosure.release();
209 } 209 }
210 210
211 // ---------------------------- 211 // ----------------------------
212 212
213 MediaControlOverlayEnclosureElement::MediaControlOverlayEnclosureElement(MediaCo ntrols& mediaControls) 213 MediaControlOverlayEnclosureElement::MediaControlOverlayEnclosureElement(MediaCo ntrols& mediaControls)
214 // Mapping onto same MediaControlElementType as panel element, since it has similar properties. 214 // Mapping onto same MediaControlElementType as panel element, since it has similar properties.
215 : MediaControlDivElement(mediaControls, MediaControlsPanel) 215 : MediaControlDivElement(mediaControls, MediaControlsPanel)
216 { 216 {
217 } 217 }
218 218
219 PassRefPtrWillBeRawPtr<MediaControlOverlayEnclosureElement> MediaControlOverlayE nclosureElement::create(MediaControls& mediaControls) 219 RawPtr<MediaControlOverlayEnclosureElement> MediaControlOverlayEnclosureElement: :create(MediaControls& mediaControls)
220 { 220 {
221 RefPtrWillBeRawPtr<MediaControlOverlayEnclosureElement> enclosure = adoptRef WillBeNoop(new MediaControlOverlayEnclosureElement(mediaControls)); 221 RawPtr<MediaControlOverlayEnclosureElement> enclosure = new MediaControlOver layEnclosureElement(mediaControls);
222 enclosure->setShadowPseudoId(AtomicString("-webkit-media-controls-overlay-en closure", AtomicString::ConstructFromLiteral)); 222 enclosure->setShadowPseudoId(AtomicString("-webkit-media-controls-overlay-en closure", AtomicString::ConstructFromLiteral));
223 return enclosure.release(); 223 return enclosure.release();
224 } 224 }
225 225
226 void* MediaControlOverlayEnclosureElement::preDispatchEventHandler(Event* event) 226 void* MediaControlOverlayEnclosureElement::preDispatchEventHandler(Event* event)
227 { 227 {
228 // When the media element is clicked or touched we want to make the overlay cast button visible 228 // When the media element is clicked or touched we want to make the overlay cast button visible
229 // (if the other requirements are right) even if JavaScript is doing its own handling of the event. 229 // (if the other requirements are right) even if JavaScript is doing its own handling of the event.
230 // Doing it in preDispatchEventHandler prevents any interference from JavaSc ript. 230 // Doing it in preDispatchEventHandler prevents any interference from JavaSc ript.
231 // Note that we can't simply test for click, since JS handling of touch even ts can prevent their translation to click events. 231 // Note that we can't simply test for click, since JS handling of touch even ts can prevent their translation to click events.
232 if (event && (event->type() == EventTypeNames::click || event->type() == Eve ntTypeNames::touchstart)) 232 if (event && (event->type() == EventTypeNames::click || event->type() == Eve ntTypeNames::touchstart))
233 mediaControls().showOverlayCastButtonIfNeeded(); 233 mediaControls().showOverlayCastButtonIfNeeded();
234 return MediaControlDivElement::preDispatchEventHandler(event); 234 return MediaControlDivElement::preDispatchEventHandler(event);
235 } 235 }
236 236
237 237
238 // ---------------------------- 238 // ----------------------------
239 239
240 MediaControlMuteButtonElement::MediaControlMuteButtonElement(MediaControls& medi aControls) 240 MediaControlMuteButtonElement::MediaControlMuteButtonElement(MediaControls& medi aControls)
241 : MediaControlInputElement(mediaControls, MediaMuteButton) 241 : MediaControlInputElement(mediaControls, MediaMuteButton)
242 { 242 {
243 } 243 }
244 244
245 PassRefPtrWillBeRawPtr<MediaControlMuteButtonElement> MediaControlMuteButtonElem ent::create(MediaControls& mediaControls) 245 RawPtr<MediaControlMuteButtonElement> MediaControlMuteButtonElement::create(Medi aControls& mediaControls)
246 { 246 {
247 RefPtrWillBeRawPtr<MediaControlMuteButtonElement> button = adoptRefWillBeNoo p(new MediaControlMuteButtonElement(mediaControls)); 247 RawPtr<MediaControlMuteButtonElement> button = new MediaControlMuteButtonEle ment(mediaControls);
248 button->ensureUserAgentShadowRoot(); 248 button->ensureUserAgentShadowRoot();
249 button->setType(InputTypeNames::button); 249 button->setType(InputTypeNames::button);
250 button->setShadowPseudoId(AtomicString("-webkit-media-controls-mute-button", AtomicString::ConstructFromLiteral)); 250 button->setShadowPseudoId(AtomicString("-webkit-media-controls-mute-button", AtomicString::ConstructFromLiteral));
251 return button.release(); 251 return button.release();
252 } 252 }
253 253
254 void MediaControlMuteButtonElement::defaultEventHandler(Event* event) 254 void MediaControlMuteButtonElement::defaultEventHandler(Event* event)
255 { 255 {
256 if (event->type() == EventTypeNames::click) { 256 if (event->type() == EventTypeNames::click) {
257 mediaElement().setMuted(!mediaElement().muted()); 257 mediaElement().setMuted(!mediaElement().muted());
258 event->setDefaultHandled(); 258 event->setDefaultHandled();
259 } 259 }
260 260
261 HTMLInputElement::defaultEventHandler(event); 261 HTMLInputElement::defaultEventHandler(event);
262 } 262 }
263 263
264 void MediaControlMuteButtonElement::updateDisplayType() 264 void MediaControlMuteButtonElement::updateDisplayType()
265 { 265 {
266 setDisplayType(mediaElement().muted() ? MediaUnMuteButton : MediaMuteButton) ; 266 setDisplayType(mediaElement().muted() ? MediaUnMuteButton : MediaMuteButton) ;
267 } 267 }
268 268
269 // ---------------------------- 269 // ----------------------------
270 270
271 MediaControlPlayButtonElement::MediaControlPlayButtonElement(MediaControls& medi aControls) 271 MediaControlPlayButtonElement::MediaControlPlayButtonElement(MediaControls& medi aControls)
272 : MediaControlInputElement(mediaControls, MediaPlayButton) 272 : MediaControlInputElement(mediaControls, MediaPlayButton)
273 { 273 {
274 } 274 }
275 275
276 PassRefPtrWillBeRawPtr<MediaControlPlayButtonElement> MediaControlPlayButtonElem ent::create(MediaControls& mediaControls) 276 RawPtr<MediaControlPlayButtonElement> MediaControlPlayButtonElement::create(Medi aControls& mediaControls)
277 { 277 {
278 RefPtrWillBeRawPtr<MediaControlPlayButtonElement> button = adoptRefWillBeNoo p(new MediaControlPlayButtonElement(mediaControls)); 278 RawPtr<MediaControlPlayButtonElement> button = new MediaControlPlayButtonEle ment(mediaControls);
279 button->ensureUserAgentShadowRoot(); 279 button->ensureUserAgentShadowRoot();
280 button->setType(InputTypeNames::button); 280 button->setType(InputTypeNames::button);
281 button->setShadowPseudoId(AtomicString("-webkit-media-controls-play-button", AtomicString::ConstructFromLiteral)); 281 button->setShadowPseudoId(AtomicString("-webkit-media-controls-play-button", AtomicString::ConstructFromLiteral));
282 return button.release(); 282 return button.release();
283 } 283 }
284 284
285 void MediaControlPlayButtonElement::defaultEventHandler(Event* event) 285 void MediaControlPlayButtonElement::defaultEventHandler(Event* event)
286 { 286 {
287 if (event->type() == EventTypeNames::click) { 287 if (event->type() == EventTypeNames::click) {
288 // Allow play attempts for plain src= media to force a reload in the err or state. This allows potential 288 // Allow play attempts for plain src= media to force a reload in the err or state. This allows potential
(...skipping 14 matching lines...) Expand all
303 setDisplayType(mediaElement().paused() ? MediaPlayButton : MediaPauseButton) ; 303 setDisplayType(mediaElement().paused() ? MediaPlayButton : MediaPauseButton) ;
304 } 304 }
305 305
306 // ---------------------------- 306 // ----------------------------
307 307
308 MediaControlOverlayPlayButtonElement::MediaControlOverlayPlayButtonElement(Media Controls& mediaControls) 308 MediaControlOverlayPlayButtonElement::MediaControlOverlayPlayButtonElement(Media Controls& mediaControls)
309 : MediaControlInputElement(mediaControls, MediaOverlayPlayButton) 309 : MediaControlInputElement(mediaControls, MediaOverlayPlayButton)
310 { 310 {
311 } 311 }
312 312
313 PassRefPtrWillBeRawPtr<MediaControlOverlayPlayButtonElement> MediaControlOverlay PlayButtonElement::create(MediaControls& mediaControls) 313 RawPtr<MediaControlOverlayPlayButtonElement> MediaControlOverlayPlayButtonElemen t::create(MediaControls& mediaControls)
314 { 314 {
315 RefPtrWillBeRawPtr<MediaControlOverlayPlayButtonElement> button = adoptRefWi llBeNoop(new MediaControlOverlayPlayButtonElement(mediaControls)); 315 RawPtr<MediaControlOverlayPlayButtonElement> button = new MediaControlOverla yPlayButtonElement(mediaControls);
316 button->ensureUserAgentShadowRoot(); 316 button->ensureUserAgentShadowRoot();
317 button->setType(InputTypeNames::button); 317 button->setType(InputTypeNames::button);
318 button->setShadowPseudoId(AtomicString("-webkit-media-controls-overlay-play- button", AtomicString::ConstructFromLiteral)); 318 button->setShadowPseudoId(AtomicString("-webkit-media-controls-overlay-play- button", AtomicString::ConstructFromLiteral));
319 return button.release(); 319 return button.release();
320 } 320 }
321 321
322 void MediaControlOverlayPlayButtonElement::defaultEventHandler(Event* event) 322 void MediaControlOverlayPlayButtonElement::defaultEventHandler(Event* event)
323 { 323 {
324 if (event->type() == EventTypeNames::click && mediaElement().paused()) { 324 if (event->type() == EventTypeNames::click && mediaElement().paused()) {
325 mediaElement().play(); 325 mediaElement().play();
(...skipping 13 matching lines...) Expand all
339 } 339 }
340 340
341 341
342 // ---------------------------- 342 // ----------------------------
343 343
344 MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsB uttonElement(MediaControls& mediaControls) 344 MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsB uttonElement(MediaControls& mediaControls)
345 : MediaControlInputElement(mediaControls, MediaShowClosedCaptionsButton) 345 : MediaControlInputElement(mediaControls, MediaShowClosedCaptionsButton)
346 { 346 {
347 } 347 }
348 348
349 PassRefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> MediaContr olToggleClosedCaptionsButtonElement::create(MediaControls& mediaControls) 349 RawPtr<MediaControlToggleClosedCaptionsButtonElement> MediaControlToggleClosedCa ptionsButtonElement::create(MediaControls& mediaControls)
350 { 350 {
351 RefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> button = a doptRefWillBeNoop(new MediaControlToggleClosedCaptionsButtonElement(mediaControl s)); 351 RawPtr<MediaControlToggleClosedCaptionsButtonElement> button = new MediaCont rolToggleClosedCaptionsButtonElement(mediaControls);
352 button->ensureUserAgentShadowRoot(); 352 button->ensureUserAgentShadowRoot();
353 button->setType(InputTypeNames::button); 353 button->setType(InputTypeNames::button);
354 button->setShadowPseudoId(AtomicString("-webkit-media-controls-toggle-closed -captions-button", AtomicString::ConstructFromLiteral)); 354 button->setShadowPseudoId(AtomicString("-webkit-media-controls-toggle-closed -captions-button", AtomicString::ConstructFromLiteral));
355 button->setIsWanted(false); 355 button->setIsWanted(false);
356 return button.release(); 356 return button.release();
357 } 357 }
358 358
359 void MediaControlToggleClosedCaptionsButtonElement::updateDisplayType() 359 void MediaControlToggleClosedCaptionsButtonElement::updateDisplayType()
360 { 360 {
361 bool captionsVisible = mediaElement().closedCaptionsVisible(); 361 bool captionsVisible = mediaElement().closedCaptionsVisible();
(...skipping 13 matching lines...) Expand all
375 HTMLInputElement::defaultEventHandler(event); 375 HTMLInputElement::defaultEventHandler(event);
376 } 376 }
377 377
378 // ---------------------------- 378 // ----------------------------
379 379
380 MediaControlTimelineElement::MediaControlTimelineElement(MediaControls& mediaCon trols) 380 MediaControlTimelineElement::MediaControlTimelineElement(MediaControls& mediaCon trols)
381 : MediaControlInputElement(mediaControls, MediaSlider) 381 : MediaControlInputElement(mediaControls, MediaSlider)
382 { 382 {
383 } 383 }
384 384
385 PassRefPtrWillBeRawPtr<MediaControlTimelineElement> MediaControlTimelineElement: :create(MediaControls& mediaControls) 385 RawPtr<MediaControlTimelineElement> MediaControlTimelineElement::create(MediaCon trols& mediaControls)
386 { 386 {
387 RefPtrWillBeRawPtr<MediaControlTimelineElement> timeline = adoptRefWillBeNoo p(new MediaControlTimelineElement(mediaControls)); 387 RawPtr<MediaControlTimelineElement> timeline = new MediaControlTimelineEleme nt(mediaControls);
388 timeline->ensureUserAgentShadowRoot(); 388 timeline->ensureUserAgentShadowRoot();
389 timeline->setType(InputTypeNames::range); 389 timeline->setType(InputTypeNames::range);
390 timeline->setAttribute(stepAttr, "any"); 390 timeline->setAttribute(stepAttr, "any");
391 timeline->setShadowPseudoId(AtomicString("-webkit-media-controls-timeline", AtomicString::ConstructFromLiteral)); 391 timeline->setShadowPseudoId(AtomicString("-webkit-media-controls-timeline", AtomicString::ConstructFromLiteral));
392 return timeline.release(); 392 return timeline.release();
393 } 393 }
394 394
395 void MediaControlTimelineElement::defaultEventHandler(Event* event) 395 void MediaControlTimelineElement::defaultEventHandler(Event* event)
396 { 396 {
397 if (event->isMouseEvent() && toMouseEvent(event)->button() != LeftButton) 397 if (event->isMouseEvent() && toMouseEvent(event)->button() != LeftButton)
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 return isUserInteractionEventForSlider(event, layoutObject()); 450 return isUserInteractionEventForSlider(event, layoutObject());
451 } 451 }
452 452
453 // ---------------------------- 453 // ----------------------------
454 454
455 MediaControlVolumeSliderElement::MediaControlVolumeSliderElement(MediaControls& mediaControls) 455 MediaControlVolumeSliderElement::MediaControlVolumeSliderElement(MediaControls& mediaControls)
456 : MediaControlInputElement(mediaControls, MediaVolumeSlider) 456 : MediaControlInputElement(mediaControls, MediaVolumeSlider)
457 { 457 {
458 } 458 }
459 459
460 PassRefPtrWillBeRawPtr<MediaControlVolumeSliderElement> MediaControlVolumeSlider Element::create(MediaControls& mediaControls) 460 RawPtr<MediaControlVolumeSliderElement> MediaControlVolumeSliderElement::create( MediaControls& mediaControls)
461 { 461 {
462 RefPtrWillBeRawPtr<MediaControlVolumeSliderElement> slider = adoptRefWillBeN oop(new MediaControlVolumeSliderElement(mediaControls)); 462 RawPtr<MediaControlVolumeSliderElement> slider = new MediaControlVolumeSlide rElement(mediaControls);
463 slider->ensureUserAgentShadowRoot(); 463 slider->ensureUserAgentShadowRoot();
464 slider->setType(InputTypeNames::range); 464 slider->setType(InputTypeNames::range);
465 slider->setAttribute(stepAttr, "any"); 465 slider->setAttribute(stepAttr, "any");
466 slider->setAttribute(maxAttr, "1"); 466 slider->setAttribute(maxAttr, "1");
467 slider->setShadowPseudoId(AtomicString("-webkit-media-controls-volume-slider ", AtomicString::ConstructFromLiteral)); 467 slider->setShadowPseudoId(AtomicString("-webkit-media-controls-volume-slider ", AtomicString::ConstructFromLiteral));
468 return slider.release(); 468 return slider.release();
469 } 469 }
470 470
471 void MediaControlVolumeSliderElement::defaultEventHandler(Event* event) 471 void MediaControlVolumeSliderElement::defaultEventHandler(Event* event)
472 { 472 {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 return isUserInteractionEventForSlider(event, layoutObject()); 513 return isUserInteractionEventForSlider(event, layoutObject());
514 } 514 }
515 515
516 // ---------------------------- 516 // ----------------------------
517 517
518 MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement(MediaCo ntrols& mediaControls) 518 MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement(MediaCo ntrols& mediaControls)
519 : MediaControlInputElement(mediaControls, MediaEnterFullscreenButton) 519 : MediaControlInputElement(mediaControls, MediaEnterFullscreenButton)
520 { 520 {
521 } 521 }
522 522
523 PassRefPtrWillBeRawPtr<MediaControlFullscreenButtonElement> MediaControlFullscre enButtonElement::create(MediaControls& mediaControls) 523 RawPtr<MediaControlFullscreenButtonElement> MediaControlFullscreenButtonElement: :create(MediaControls& mediaControls)
524 { 524 {
525 RefPtrWillBeRawPtr<MediaControlFullscreenButtonElement> button = adoptRefWil lBeNoop(new MediaControlFullscreenButtonElement(mediaControls)); 525 RawPtr<MediaControlFullscreenButtonElement> button = new MediaControlFullscr eenButtonElement(mediaControls);
526 button->ensureUserAgentShadowRoot(); 526 button->ensureUserAgentShadowRoot();
527 button->setType(InputTypeNames::button); 527 button->setType(InputTypeNames::button);
528 button->setShadowPseudoId(AtomicString("-webkit-media-controls-fullscreen-bu tton", AtomicString::ConstructFromLiteral)); 528 button->setShadowPseudoId(AtomicString("-webkit-media-controls-fullscreen-bu tton", AtomicString::ConstructFromLiteral));
529 button->setIsWanted(false); 529 button->setIsWanted(false);
530 return button.release(); 530 return button.release();
531 } 531 }
532 532
533 void MediaControlFullscreenButtonElement::defaultEventHandler(Event* event) 533 void MediaControlFullscreenButtonElement::defaultEventHandler(Event* event)
534 { 534 {
535 if (event->type() == EventTypeNames::click) { 535 if (event->type() == EventTypeNames::click) {
(...skipping 14 matching lines...) Expand all
550 // ---------------------------- 550 // ----------------------------
551 551
552 MediaControlCastButtonElement::MediaControlCastButtonElement(MediaControls& medi aControls, bool isOverlayButton) 552 MediaControlCastButtonElement::MediaControlCastButtonElement(MediaControls& medi aControls, bool isOverlayButton)
553 : MediaControlInputElement(mediaControls, MediaCastOnButton), m_isOverlayBut ton(isOverlayButton) 553 : MediaControlInputElement(mediaControls, MediaCastOnButton), m_isOverlayBut ton(isOverlayButton)
554 { 554 {
555 if (m_isOverlayButton) 555 if (m_isOverlayButton)
556 recordMetrics(CastOverlayMetrics::Created); 556 recordMetrics(CastOverlayMetrics::Created);
557 setIsPlayingRemotely(false); 557 setIsPlayingRemotely(false);
558 } 558 }
559 559
560 PassRefPtrWillBeRawPtr<MediaControlCastButtonElement> MediaControlCastButtonElem ent::create(MediaControls& mediaControls, bool isOverlayButton) 560 RawPtr<MediaControlCastButtonElement> MediaControlCastButtonElement::create(Medi aControls& mediaControls, bool isOverlayButton)
561 { 561 {
562 RefPtrWillBeRawPtr<MediaControlCastButtonElement> button = adoptRefWillBeNoo p(new MediaControlCastButtonElement(mediaControls, isOverlayButton)); 562 RawPtr<MediaControlCastButtonElement> button = new MediaControlCastButtonEle ment(mediaControls, isOverlayButton);
563 button->ensureUserAgentShadowRoot(); 563 button->ensureUserAgentShadowRoot();
564 button->setType(InputTypeNames::button); 564 button->setType(InputTypeNames::button);
565 return button.release(); 565 return button.release();
566 } 566 }
567 567
568 void MediaControlCastButtonElement::defaultEventHandler(Event* event) 568 void MediaControlCastButtonElement::defaultEventHandler(Event* event)
569 { 569 {
570 if (event->type() == EventTypeNames::click) { 570 if (event->type() == EventTypeNames::click) {
571 if (m_isOverlayButton && !m_clickUseCounted) { 571 if (m_isOverlayButton && !m_clickUseCounted) {
572 m_clickUseCounted = true; 572 m_clickUseCounted = true;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 overlayHistogram.count(static_cast<int>(metric)); 634 overlayHistogram.count(static_cast<int>(metric));
635 } 635 }
636 636
637 // ---------------------------- 637 // ----------------------------
638 638
639 MediaControlTimeRemainingDisplayElement::MediaControlTimeRemainingDisplayElement (MediaControls& mediaControls) 639 MediaControlTimeRemainingDisplayElement::MediaControlTimeRemainingDisplayElement (MediaControls& mediaControls)
640 : MediaControlTimeDisplayElement(mediaControls, MediaTimeRemainingDisplay) 640 : MediaControlTimeDisplayElement(mediaControls, MediaTimeRemainingDisplay)
641 { 641 {
642 } 642 }
643 643
644 PassRefPtrWillBeRawPtr<MediaControlTimeRemainingDisplayElement> MediaControlTime RemainingDisplayElement::create(MediaControls& mediaControls) 644 RawPtr<MediaControlTimeRemainingDisplayElement> MediaControlTimeRemainingDisplay Element::create(MediaControls& mediaControls)
645 { 645 {
646 RefPtrWillBeRawPtr<MediaControlTimeRemainingDisplayElement> element = adoptR efWillBeNoop(new MediaControlTimeRemainingDisplayElement(mediaControls)); 646 RawPtr<MediaControlTimeRemainingDisplayElement> element = new MediaControlTi meRemainingDisplayElement(mediaControls);
647 element->setShadowPseudoId(AtomicString("-webkit-media-controls-time-remaini ng-display", AtomicString::ConstructFromLiteral)); 647 element->setShadowPseudoId(AtomicString("-webkit-media-controls-time-remaini ng-display", AtomicString::ConstructFromLiteral));
648 return element.release(); 648 return element.release();
649 } 649 }
650 650
651 // ---------------------------- 651 // ----------------------------
652 652
653 MediaControlCurrentTimeDisplayElement::MediaControlCurrentTimeDisplayElement(Med iaControls& mediaControls) 653 MediaControlCurrentTimeDisplayElement::MediaControlCurrentTimeDisplayElement(Med iaControls& mediaControls)
654 : MediaControlTimeDisplayElement(mediaControls, MediaCurrentTimeDisplay) 654 : MediaControlTimeDisplayElement(mediaControls, MediaCurrentTimeDisplay)
655 { 655 {
656 } 656 }
657 657
658 PassRefPtrWillBeRawPtr<MediaControlCurrentTimeDisplayElement> MediaControlCurren tTimeDisplayElement::create(MediaControls& mediaControls) 658 RawPtr<MediaControlCurrentTimeDisplayElement> MediaControlCurrentTimeDisplayElem ent::create(MediaControls& mediaControls)
659 { 659 {
660 RefPtrWillBeRawPtr<MediaControlCurrentTimeDisplayElement> element = adoptRef WillBeNoop(new MediaControlCurrentTimeDisplayElement(mediaControls)); 660 RawPtr<MediaControlCurrentTimeDisplayElement> element = new MediaControlCurr entTimeDisplayElement(mediaControls);
661 element->setShadowPseudoId(AtomicString("-webkit-media-controls-current-time -display", AtomicString::ConstructFromLiteral)); 661 element->setShadowPseudoId(AtomicString("-webkit-media-controls-current-time -display", AtomicString::ConstructFromLiteral));
662 return element.release(); 662 return element.release();
663 } 663 }
664 664
665 } // namespace blink 665 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698