| OLD | NEW |
| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 MediaControlPanelElement::MediaControlPanelElement(MediaControls& mediaControls) | 63 MediaControlPanelElement::MediaControlPanelElement(MediaControls& mediaControls) |
| 64 : MediaControlDivElement(mediaControls, MediaControlsPanel) | 64 : MediaControlDivElement(mediaControls, MediaControlsPanel) |
| 65 , m_isDisplayed(false) | 65 , m_isDisplayed(false) |
| 66 , m_opaque(true) | 66 , m_opaque(true) |
| 67 , m_transitionTimer(this, &MediaControlPanelElement::transitionTimerFired) | 67 , m_transitionTimer(this, &MediaControlPanelElement::transitionTimerFired) |
| 68 { | 68 { |
| 69 } | 69 } |
| 70 | 70 |
| 71 PassRefPtrWillBeRawPtr<MediaControlPanelElement> MediaControlPanelElement::creat
e(MediaControls& mediaControls) | 71 PassRefPtrWillBeRawPtr<MediaControlPanelElement> MediaControlPanelElement::creat
e(MediaControls& mediaControls) |
| 72 { | 72 { |
| 73 return adoptRefWillBeRefCountedGarbageCollected(new MediaControlPanelElement
(mediaControls)); | 73 return adoptRefWillBeNoop(new MediaControlPanelElement(mediaControls)); |
| 74 } | 74 } |
| 75 | 75 |
| 76 const AtomicString& MediaControlPanelElement::shadowPseudoId() const | 76 const AtomicString& MediaControlPanelElement::shadowPseudoId() const |
| 77 { | 77 { |
| 78 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-panel", Atomi
cString::ConstructFromLiteral)); | 78 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-panel", Atomi
cString::ConstructFromLiteral)); |
| 79 return id; | 79 return id; |
| 80 } | 80 } |
| 81 | 81 |
| 82 void MediaControlPanelElement::defaultEventHandler(Event* event) | 82 void MediaControlPanelElement::defaultEventHandler(Event* event) |
| 83 { | 83 { |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 // ---------------------------- | 151 // ---------------------------- |
| 152 | 152 |
| 153 MediaControlPanelEnclosureElement::MediaControlPanelEnclosureElement(MediaContro
ls& mediaControls) | 153 MediaControlPanelEnclosureElement::MediaControlPanelEnclosureElement(MediaContro
ls& mediaControls) |
| 154 // Mapping onto same MediaControlElementType as panel element, since it has
similar properties. | 154 // Mapping onto same MediaControlElementType as panel element, since it has
similar properties. |
| 155 : MediaControlDivElement(mediaControls, MediaControlsPanel) | 155 : MediaControlDivElement(mediaControls, MediaControlsPanel) |
| 156 { | 156 { |
| 157 } | 157 } |
| 158 | 158 |
| 159 PassRefPtrWillBeRawPtr<MediaControlPanelEnclosureElement> MediaControlPanelEnclo
sureElement::create(MediaControls& mediaControls) | 159 PassRefPtrWillBeRawPtr<MediaControlPanelEnclosureElement> MediaControlPanelEnclo
sureElement::create(MediaControls& mediaControls) |
| 160 { | 160 { |
| 161 return adoptRefWillBeRefCountedGarbageCollected(new MediaControlPanelEnclosu
reElement(mediaControls)); | 161 return adoptRefWillBeNoop(new MediaControlPanelEnclosureElement(mediaControl
s)); |
| 162 } | 162 } |
| 163 | 163 |
| 164 const AtomicString& MediaControlPanelEnclosureElement::shadowPseudoId() const | 164 const AtomicString& MediaControlPanelEnclosureElement::shadowPseudoId() const |
| 165 { | 165 { |
| 166 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-enclosure", A
tomicString::ConstructFromLiteral)); | 166 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-enclosure", A
tomicString::ConstructFromLiteral)); |
| 167 return id; | 167 return id; |
| 168 } | 168 } |
| 169 | 169 |
| 170 // ---------------------------- | 170 // ---------------------------- |
| 171 | 171 |
| 172 MediaControlOverlayEnclosureElement::MediaControlOverlayEnclosureElement(MediaCo
ntrols& mediaControls) | 172 MediaControlOverlayEnclosureElement::MediaControlOverlayEnclosureElement(MediaCo
ntrols& mediaControls) |
| 173 // Mapping onto same MediaControlElementType as panel element, since it has
similar properties. | 173 // Mapping onto same MediaControlElementType as panel element, since it has
similar properties. |
| 174 : MediaControlDivElement(mediaControls, MediaControlsPanel) | 174 : MediaControlDivElement(mediaControls, MediaControlsPanel) |
| 175 { | 175 { |
| 176 } | 176 } |
| 177 | 177 |
| 178 PassRefPtrWillBeRawPtr<MediaControlOverlayEnclosureElement> MediaControlOverlayE
nclosureElement::create(MediaControls& mediaControls) | 178 PassRefPtrWillBeRawPtr<MediaControlOverlayEnclosureElement> MediaControlOverlayE
nclosureElement::create(MediaControls& mediaControls) |
| 179 { | 179 { |
| 180 return adoptRefWillBeRefCountedGarbageCollected(new MediaControlOverlayEnclo
sureElement(mediaControls)); | 180 return adoptRefWillBeNoop(new MediaControlOverlayEnclosureElement(mediaContr
ols)); |
| 181 } | 181 } |
| 182 | 182 |
| 183 const AtomicString& MediaControlOverlayEnclosureElement::shadowPseudoId() const | 183 const AtomicString& MediaControlOverlayEnclosureElement::shadowPseudoId() const |
| 184 { | 184 { |
| 185 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-overlay-enclo
sure", AtomicString::ConstructFromLiteral)); | 185 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-overlay-enclo
sure", AtomicString::ConstructFromLiteral)); |
| 186 return id; | 186 return id; |
| 187 } | 187 } |
| 188 | 188 |
| 189 // ---------------------------- | 189 // ---------------------------- |
| 190 | 190 |
| 191 MediaControlMuteButtonElement::MediaControlMuteButtonElement(MediaControls& medi
aControls) | 191 MediaControlMuteButtonElement::MediaControlMuteButtonElement(MediaControls& medi
aControls) |
| 192 : MediaControlInputElement(mediaControls, MediaMuteButton) | 192 : MediaControlInputElement(mediaControls, MediaMuteButton) |
| 193 { | 193 { |
| 194 } | 194 } |
| 195 | 195 |
| 196 PassRefPtrWillBeRawPtr<MediaControlMuteButtonElement> MediaControlMuteButtonElem
ent::create(MediaControls& mediaControls) | 196 PassRefPtrWillBeRawPtr<MediaControlMuteButtonElement> MediaControlMuteButtonElem
ent::create(MediaControls& mediaControls) |
| 197 { | 197 { |
| 198 RefPtrWillBeRawPtr<MediaControlMuteButtonElement> button = adoptRefWillBeRef
CountedGarbageCollected(new MediaControlMuteButtonElement(mediaControls)); | 198 RefPtrWillBeRawPtr<MediaControlMuteButtonElement> button = adoptRefWillBeNoo
p(new MediaControlMuteButtonElement(mediaControls)); |
| 199 button->ensureUserAgentShadowRoot(); | 199 button->ensureUserAgentShadowRoot(); |
| 200 button->setType("button"); | 200 button->setType("button"); |
| 201 return button.release(); | 201 return button.release(); |
| 202 } | 202 } |
| 203 | 203 |
| 204 void MediaControlMuteButtonElement::defaultEventHandler(Event* event) | 204 void MediaControlMuteButtonElement::defaultEventHandler(Event* event) |
| 205 { | 205 { |
| 206 if (event->type() == EventTypeNames::click) { | 206 if (event->type() == EventTypeNames::click) { |
| 207 mediaElement().setMuted(!mediaElement().muted()); | 207 mediaElement().setMuted(!mediaElement().muted()); |
| 208 event->setDefaultHandled(); | 208 event->setDefaultHandled(); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 224 | 224 |
| 225 // ---------------------------- | 225 // ---------------------------- |
| 226 | 226 |
| 227 MediaControlPlayButtonElement::MediaControlPlayButtonElement(MediaControls& medi
aControls) | 227 MediaControlPlayButtonElement::MediaControlPlayButtonElement(MediaControls& medi
aControls) |
| 228 : MediaControlInputElement(mediaControls, MediaPlayButton) | 228 : MediaControlInputElement(mediaControls, MediaPlayButton) |
| 229 { | 229 { |
| 230 } | 230 } |
| 231 | 231 |
| 232 PassRefPtrWillBeRawPtr<MediaControlPlayButtonElement> MediaControlPlayButtonElem
ent::create(MediaControls& mediaControls) | 232 PassRefPtrWillBeRawPtr<MediaControlPlayButtonElement> MediaControlPlayButtonElem
ent::create(MediaControls& mediaControls) |
| 233 { | 233 { |
| 234 RefPtrWillBeRawPtr<MediaControlPlayButtonElement> button = adoptRefWillBeRef
CountedGarbageCollected(new MediaControlPlayButtonElement(mediaControls)); | 234 RefPtrWillBeRawPtr<MediaControlPlayButtonElement> button = adoptRefWillBeNoo
p(new MediaControlPlayButtonElement(mediaControls)); |
| 235 button->ensureUserAgentShadowRoot(); | 235 button->ensureUserAgentShadowRoot(); |
| 236 button->setType("button"); | 236 button->setType("button"); |
| 237 return button.release(); | 237 return button.release(); |
| 238 } | 238 } |
| 239 | 239 |
| 240 void MediaControlPlayButtonElement::defaultEventHandler(Event* event) | 240 void MediaControlPlayButtonElement::defaultEventHandler(Event* event) |
| 241 { | 241 { |
| 242 if (event->type() == EventTypeNames::click) { | 242 if (event->type() == EventTypeNames::click) { |
| 243 mediaElement().togglePlayState(); | 243 mediaElement().togglePlayState(); |
| 244 updateDisplayType(); | 244 updateDisplayType(); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 260 | 260 |
| 261 // ---------------------------- | 261 // ---------------------------- |
| 262 | 262 |
| 263 MediaControlOverlayPlayButtonElement::MediaControlOverlayPlayButtonElement(Media
Controls& mediaControls) | 263 MediaControlOverlayPlayButtonElement::MediaControlOverlayPlayButtonElement(Media
Controls& mediaControls) |
| 264 : MediaControlInputElement(mediaControls, MediaOverlayPlayButton) | 264 : MediaControlInputElement(mediaControls, MediaOverlayPlayButton) |
| 265 { | 265 { |
| 266 } | 266 } |
| 267 | 267 |
| 268 PassRefPtrWillBeRawPtr<MediaControlOverlayPlayButtonElement> MediaControlOverlay
PlayButtonElement::create(MediaControls& mediaControls) | 268 PassRefPtrWillBeRawPtr<MediaControlOverlayPlayButtonElement> MediaControlOverlay
PlayButtonElement::create(MediaControls& mediaControls) |
| 269 { | 269 { |
| 270 RefPtrWillBeRawPtr<MediaControlOverlayPlayButtonElement> button = adoptRefWi
llBeRefCountedGarbageCollected(new MediaControlOverlayPlayButtonElement(mediaCon
trols)); | 270 RefPtrWillBeRawPtr<MediaControlOverlayPlayButtonElement> button = adoptRefWi
llBeNoop(new MediaControlOverlayPlayButtonElement(mediaControls)); |
| 271 button->ensureUserAgentShadowRoot(); | 271 button->ensureUserAgentShadowRoot(); |
| 272 button->setType("button"); | 272 button->setType("button"); |
| 273 return button.release(); | 273 return button.release(); |
| 274 } | 274 } |
| 275 | 275 |
| 276 void MediaControlOverlayPlayButtonElement::defaultEventHandler(Event* event) | 276 void MediaControlOverlayPlayButtonElement::defaultEventHandler(Event* event) |
| 277 { | 277 { |
| 278 if (event->type() == EventTypeNames::click && mediaElement().togglePlayState
WillPlay()) { | 278 if (event->type() == EventTypeNames::click && mediaElement().togglePlayState
WillPlay()) { |
| 279 mediaElement().togglePlayState(); | 279 mediaElement().togglePlayState(); |
| 280 updateDisplayType(); | 280 updateDisplayType(); |
| (...skipping 18 matching lines...) Expand all Loading... |
| 299 | 299 |
| 300 // ---------------------------- | 300 // ---------------------------- |
| 301 | 301 |
| 302 MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsB
uttonElement(MediaControls& mediaControls) | 302 MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsB
uttonElement(MediaControls& mediaControls) |
| 303 : MediaControlInputElement(mediaControls, MediaShowClosedCaptionsButton) | 303 : MediaControlInputElement(mediaControls, MediaShowClosedCaptionsButton) |
| 304 { | 304 { |
| 305 } | 305 } |
| 306 | 306 |
| 307 PassRefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> MediaContr
olToggleClosedCaptionsButtonElement::create(MediaControls& mediaControls) | 307 PassRefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> MediaContr
olToggleClosedCaptionsButtonElement::create(MediaControls& mediaControls) |
| 308 { | 308 { |
| 309 RefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> button = a
doptRefWillBeRefCountedGarbageCollected(new MediaControlToggleClosedCaptionsButt
onElement(mediaControls)); | 309 RefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> button = a
doptRefWillBeNoop(new MediaControlToggleClosedCaptionsButtonElement(mediaControl
s)); |
| 310 button->ensureUserAgentShadowRoot(); | 310 button->ensureUserAgentShadowRoot(); |
| 311 button->setType("button"); | 311 button->setType("button"); |
| 312 button->hide(); | 312 button->hide(); |
| 313 return button.release(); | 313 return button.release(); |
| 314 } | 314 } |
| 315 | 315 |
| 316 void MediaControlToggleClosedCaptionsButtonElement::updateDisplayType() | 316 void MediaControlToggleClosedCaptionsButtonElement::updateDisplayType() |
| 317 { | 317 { |
| 318 bool captionsVisible = mediaElement().closedCaptionsVisible(); | 318 bool captionsVisible = mediaElement().closedCaptionsVisible(); |
| 319 setDisplayType(captionsVisible ? MediaHideClosedCaptionsButton : MediaShowCl
osedCaptionsButton); | 319 setDisplayType(captionsVisible ? MediaHideClosedCaptionsButton : MediaShowCl
osedCaptionsButton); |
| (...skipping 20 matching lines...) Expand all Loading... |
| 340 | 340 |
| 341 // ---------------------------- | 341 // ---------------------------- |
| 342 | 342 |
| 343 MediaControlTimelineElement::MediaControlTimelineElement(MediaControls& mediaCon
trols) | 343 MediaControlTimelineElement::MediaControlTimelineElement(MediaControls& mediaCon
trols) |
| 344 : MediaControlInputElement(mediaControls, MediaSlider) | 344 : MediaControlInputElement(mediaControls, MediaSlider) |
| 345 { | 345 { |
| 346 } | 346 } |
| 347 | 347 |
| 348 PassRefPtrWillBeRawPtr<MediaControlTimelineElement> MediaControlTimelineElement:
:create(MediaControls& mediaControls) | 348 PassRefPtrWillBeRawPtr<MediaControlTimelineElement> MediaControlTimelineElement:
:create(MediaControls& mediaControls) |
| 349 { | 349 { |
| 350 RefPtrWillBeRawPtr<MediaControlTimelineElement> timeline = adoptRefWillBeRef
CountedGarbageCollected(new MediaControlTimelineElement(mediaControls)); | 350 RefPtrWillBeRawPtr<MediaControlTimelineElement> timeline = adoptRefWillBeNoo
p(new MediaControlTimelineElement(mediaControls)); |
| 351 timeline->ensureUserAgentShadowRoot(); | 351 timeline->ensureUserAgentShadowRoot(); |
| 352 timeline->setType("range"); | 352 timeline->setType("range"); |
| 353 timeline->setAttribute(stepAttr, "any"); | 353 timeline->setAttribute(stepAttr, "any"); |
| 354 return timeline.release(); | 354 return timeline.release(); |
| 355 } | 355 } |
| 356 | 356 |
| 357 void MediaControlTimelineElement::defaultEventHandler(Event* event) | 357 void MediaControlTimelineElement::defaultEventHandler(Event* event) |
| 358 { | 358 { |
| 359 if (event->isMouseEvent() && toMouseEvent(event)->button() != LeftButton) | 359 if (event->isMouseEvent() && toMouseEvent(event)->button() != LeftButton) |
| 360 return; | 360 return; |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 | 412 |
| 413 // ---------------------------- | 413 // ---------------------------- |
| 414 | 414 |
| 415 MediaControlVolumeSliderElement::MediaControlVolumeSliderElement(MediaControls&
mediaControls) | 415 MediaControlVolumeSliderElement::MediaControlVolumeSliderElement(MediaControls&
mediaControls) |
| 416 : MediaControlInputElement(mediaControls, MediaVolumeSlider) | 416 : MediaControlInputElement(mediaControls, MediaVolumeSlider) |
| 417 { | 417 { |
| 418 } | 418 } |
| 419 | 419 |
| 420 PassRefPtrWillBeRawPtr<MediaControlVolumeSliderElement> MediaControlVolumeSlider
Element::create(MediaControls& mediaControls) | 420 PassRefPtrWillBeRawPtr<MediaControlVolumeSliderElement> MediaControlVolumeSlider
Element::create(MediaControls& mediaControls) |
| 421 { | 421 { |
| 422 RefPtrWillBeRawPtr<MediaControlVolumeSliderElement> slider = adoptRefWillBeR
efCountedGarbageCollected(new MediaControlVolumeSliderElement(mediaControls)); | 422 RefPtrWillBeRawPtr<MediaControlVolumeSliderElement> slider = adoptRefWillBeN
oop(new MediaControlVolumeSliderElement(mediaControls)); |
| 423 slider->ensureUserAgentShadowRoot(); | 423 slider->ensureUserAgentShadowRoot(); |
| 424 slider->setType("range"); | 424 slider->setType("range"); |
| 425 slider->setAttribute(stepAttr, "any"); | 425 slider->setAttribute(stepAttr, "any"); |
| 426 slider->setAttribute(maxAttr, "1"); | 426 slider->setAttribute(maxAttr, "1"); |
| 427 return slider.release(); | 427 return slider.release(); |
| 428 } | 428 } |
| 429 | 429 |
| 430 void MediaControlVolumeSliderElement::defaultEventHandler(Event* event) | 430 void MediaControlVolumeSliderElement::defaultEventHandler(Event* event) |
| 431 { | 431 { |
| 432 if (event->isMouseEvent() && toMouseEvent(event)->button() != LeftButton) | 432 if (event->isMouseEvent() && toMouseEvent(event)->button() != LeftButton) |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 475 | 475 |
| 476 // ---------------------------- | 476 // ---------------------------- |
| 477 | 477 |
| 478 MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement(MediaCo
ntrols& mediaControls) | 478 MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement(MediaCo
ntrols& mediaControls) |
| 479 : MediaControlInputElement(mediaControls, MediaEnterFullscreenButton) | 479 : MediaControlInputElement(mediaControls, MediaEnterFullscreenButton) |
| 480 { | 480 { |
| 481 } | 481 } |
| 482 | 482 |
| 483 PassRefPtrWillBeRawPtr<MediaControlFullscreenButtonElement> MediaControlFullscre
enButtonElement::create(MediaControls& mediaControls) | 483 PassRefPtrWillBeRawPtr<MediaControlFullscreenButtonElement> MediaControlFullscre
enButtonElement::create(MediaControls& mediaControls) |
| 484 { | 484 { |
| 485 RefPtrWillBeRawPtr<MediaControlFullscreenButtonElement> button = adoptRefWil
lBeRefCountedGarbageCollected(new MediaControlFullscreenButtonElement(mediaContr
ols)); | 485 RefPtrWillBeRawPtr<MediaControlFullscreenButtonElement> button = adoptRefWil
lBeNoop(new MediaControlFullscreenButtonElement(mediaControls)); |
| 486 button->ensureUserAgentShadowRoot(); | 486 button->ensureUserAgentShadowRoot(); |
| 487 button->setType("button"); | 487 button->setType("button"); |
| 488 button->hide(); | 488 button->hide(); |
| 489 return button.release(); | 489 return button.release(); |
| 490 } | 490 } |
| 491 | 491 |
| 492 void MediaControlFullscreenButtonElement::defaultEventHandler(Event* event) | 492 void MediaControlFullscreenButtonElement::defaultEventHandler(Event* event) |
| 493 { | 493 { |
| 494 if (event->type() == EventTypeNames::click) { | 494 if (event->type() == EventTypeNames::click) { |
| 495 if (FullscreenElementStack::isActiveFullScreenElement(&mediaElement())) | 495 if (FullscreenElementStack::isActiveFullScreenElement(&mediaElement())) |
| (...skipping 18 matching lines...) Expand all Loading... |
| 514 | 514 |
| 515 // ---------------------------- | 515 // ---------------------------- |
| 516 | 516 |
| 517 MediaControlTimeRemainingDisplayElement::MediaControlTimeRemainingDisplayElement
(MediaControls& mediaControls) | 517 MediaControlTimeRemainingDisplayElement::MediaControlTimeRemainingDisplayElement
(MediaControls& mediaControls) |
| 518 : MediaControlTimeDisplayElement(mediaControls, MediaTimeRemainingDisplay) | 518 : MediaControlTimeDisplayElement(mediaControls, MediaTimeRemainingDisplay) |
| 519 { | 519 { |
| 520 } | 520 } |
| 521 | 521 |
| 522 PassRefPtrWillBeRawPtr<MediaControlTimeRemainingDisplayElement> MediaControlTime
RemainingDisplayElement::create(MediaControls& mediaControls) | 522 PassRefPtrWillBeRawPtr<MediaControlTimeRemainingDisplayElement> MediaControlTime
RemainingDisplayElement::create(MediaControls& mediaControls) |
| 523 { | 523 { |
| 524 return adoptRefWillBeRefCountedGarbageCollected(new MediaControlTimeRemainin
gDisplayElement(mediaControls)); | 524 return adoptRefWillBeNoop(new MediaControlTimeRemainingDisplayElement(mediaC
ontrols)); |
| 525 } | 525 } |
| 526 | 526 |
| 527 static const AtomicString& getMediaControlTimeRemainingDisplayElementShadowPseud
oId() | 527 static const AtomicString& getMediaControlTimeRemainingDisplayElementShadowPseud
oId() |
| 528 { | 528 { |
| 529 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-time-remainin
g-display", AtomicString::ConstructFromLiteral)); | 529 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-time-remainin
g-display", AtomicString::ConstructFromLiteral)); |
| 530 return id; | 530 return id; |
| 531 } | 531 } |
| 532 | 532 |
| 533 const AtomicString& MediaControlTimeRemainingDisplayElement::shadowPseudoId() co
nst | 533 const AtomicString& MediaControlTimeRemainingDisplayElement::shadowPseudoId() co
nst |
| 534 { | 534 { |
| 535 return getMediaControlTimeRemainingDisplayElementShadowPseudoId(); | 535 return getMediaControlTimeRemainingDisplayElementShadowPseudoId(); |
| 536 } | 536 } |
| 537 | 537 |
| 538 // ---------------------------- | 538 // ---------------------------- |
| 539 | 539 |
| 540 MediaControlCurrentTimeDisplayElement::MediaControlCurrentTimeDisplayElement(Med
iaControls& mediaControls) | 540 MediaControlCurrentTimeDisplayElement::MediaControlCurrentTimeDisplayElement(Med
iaControls& mediaControls) |
| 541 : MediaControlTimeDisplayElement(mediaControls, MediaCurrentTimeDisplay) | 541 : MediaControlTimeDisplayElement(mediaControls, MediaCurrentTimeDisplay) |
| 542 { | 542 { |
| 543 } | 543 } |
| 544 | 544 |
| 545 PassRefPtrWillBeRawPtr<MediaControlCurrentTimeDisplayElement> MediaControlCurren
tTimeDisplayElement::create(MediaControls& mediaControls) | 545 PassRefPtrWillBeRawPtr<MediaControlCurrentTimeDisplayElement> MediaControlCurren
tTimeDisplayElement::create(MediaControls& mediaControls) |
| 546 { | 546 { |
| 547 return adoptRefWillBeRefCountedGarbageCollected(new MediaControlCurrentTimeD
isplayElement(mediaControls)); | 547 return adoptRefWillBeNoop(new MediaControlCurrentTimeDisplayElement(mediaCon
trols)); |
| 548 } | 548 } |
| 549 | 549 |
| 550 static const AtomicString& getMediaControlCurrentTimeDisplayElementShadowPseudoI
d() | 550 static const AtomicString& getMediaControlCurrentTimeDisplayElementShadowPseudoI
d() |
| 551 { | 551 { |
| 552 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-current-time-
display", AtomicString::ConstructFromLiteral)); | 552 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-current-time-
display", AtomicString::ConstructFromLiteral)); |
| 553 return id; | 553 return id; |
| 554 } | 554 } |
| 555 | 555 |
| 556 const AtomicString& MediaControlCurrentTimeDisplayElement::shadowPseudoId() cons
t | 556 const AtomicString& MediaControlCurrentTimeDisplayElement::shadowPseudoId() cons
t |
| 557 { | 557 { |
| 558 return getMediaControlCurrentTimeDisplayElementShadowPseudoId(); | 558 return getMediaControlCurrentTimeDisplayElementShadowPseudoId(); |
| 559 } | 559 } |
| 560 | 560 |
| 561 // ---------------------------- | 561 // ---------------------------- |
| 562 | 562 |
| 563 MediaControlTextTrackContainerElement::MediaControlTextTrackContainerElement(Med
iaControls& mediaControls) | 563 MediaControlTextTrackContainerElement::MediaControlTextTrackContainerElement(Med
iaControls& mediaControls) |
| 564 : MediaControlDivElement(mediaControls, MediaTextTrackDisplayContainer) | 564 : MediaControlDivElement(mediaControls, MediaTextTrackDisplayContainer) |
| 565 , m_fontSize(0) | 565 , m_fontSize(0) |
| 566 { | 566 { |
| 567 } | 567 } |
| 568 | 568 |
| 569 PassRefPtrWillBeRawPtr<MediaControlTextTrackContainerElement> MediaControlTextTr
ackContainerElement::create(MediaControls& mediaControls) | 569 PassRefPtrWillBeRawPtr<MediaControlTextTrackContainerElement> MediaControlTextTr
ackContainerElement::create(MediaControls& mediaControls) |
| 570 { | 570 { |
| 571 RefPtrWillBeRawPtr<MediaControlTextTrackContainerElement> element = adoptRef
WillBeRefCountedGarbageCollected(new MediaControlTextTrackContainerElement(media
Controls)); | 571 RefPtrWillBeRawPtr<MediaControlTextTrackContainerElement> element = adoptRef
WillBeNoop(new MediaControlTextTrackContainerElement(mediaControls)); |
| 572 element->hide(); | 572 element->hide(); |
| 573 return element.release(); | 573 return element.release(); |
| 574 } | 574 } |
| 575 | 575 |
| 576 RenderObject* MediaControlTextTrackContainerElement::createRenderer(RenderStyle*
) | 576 RenderObject* MediaControlTextTrackContainerElement::createRenderer(RenderStyle*
) |
| 577 { | 577 { |
| 578 return new RenderTextTrackContainerElement(this); | 578 return new RenderTextTrackContainerElement(this); |
| 579 } | 579 } |
| 580 | 580 |
| 581 const AtomicString& MediaControlTextTrackContainerElement::textTrackContainerEle
mentShadowPseudoId() | 581 const AtomicString& MediaControlTextTrackContainerElement::textTrackContainerEle
mentShadowPseudoId() |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 676 float fontSize = smallestDimension * 0.05f; | 676 float fontSize = smallestDimension * 0.05f; |
| 677 if (fontSize != m_fontSize) { | 677 if (fontSize != m_fontSize) { |
| 678 m_fontSize = fontSize; | 678 m_fontSize = fontSize; |
| 679 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue:
:CSS_PX); | 679 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue:
:CSS_PX); |
| 680 } | 680 } |
| 681 } | 681 } |
| 682 | 682 |
| 683 // ---------------------------- | 683 // ---------------------------- |
| 684 | 684 |
| 685 } // namespace WebCore | 685 } // namespace WebCore |
| OLD | NEW |