Changeset 87657 in webkit
- Timestamp:
- May 29, 2011 5:19:51 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r87655 r87657 1 2011-05-29 Dan Bernstein <mitz@apple.com> 2 3 Reviewed by Darin Adler. 4 5 <rdar://problem/9515650> 30 second rewind button obscured in fullscreen controller when video uses custom inline controls 6 https://bugs.webkit.org/show_bug.cgi?id=61714 7 8 * dom/Document.cpp: 9 (WebCore::Document::webkitDidEnterFullScreenForElement): Call didBecomeFullscreenElement() on the 10 new full screen element. 11 (WebCore::Document::webkitWillExitFullScreenForElement): Call willStopBeingFullscreenElement() on 12 the full screen element. 13 * dom/Element.h: 14 (WebCore::Element::didBecomeFullscreenElement): Added with a default implementation that does nothing. 15 (WebCore::Element::willStopBeingFullscreenElement): Ditto. 16 * html/HTMLMediaElement.cpp: 17 (WebCore::HTMLMediaElement::didBecomeFullscreenElement): Added this override, which calls 18 MediaControls::enteredFullscreen(). 19 (WebCore::HTMLMediaElement::willStopBeingFullscreenElement): Added this override, which calls 20 MediaControls::exitedFullscreen(). 21 * html/HTMLMediaElement.h: 22 * html/shadow/MediaControlElements.cpp: 23 (WebCore::MediaControlFullscreenButtonElement::preDispatchEventHandler): Removed calls to 24 enteredFullscreen() and exitedFullscreen() from here, since they are now called in response to 25 changes to the fullscreen-ness of the element. 26 1 27 2011-05-29 Darin Adler <darin@apple.com> 2 28 -
trunk/Source/WebCore/dom/Document.cpp
r87643 r87657 4906 4906 void Document::webkitDidEnterFullScreenForElement(Element*) 4907 4907 { 4908 ASSERT(m_fullScreenElement);4908 m_fullScreenElement->didBecomeFullscreenElement(); 4909 4909 4910 4910 if (m_fullScreenRenderer) { … … 4925 4925 setContainsFullScreenElementRecursively(ownerElement(), false); 4926 4926 4927 m_fullScreenElement->willStopBeingFullscreenElement(); 4928 4927 4929 if (m_fullScreenRenderer) { 4928 4930 setAnimatingFullScreen(true); -
trunk/Source/WebCore/dom/Element.h
r86491 r87657 280 280 virtual void privateBrowsingStateDidChange() { } 281 281 282 virtual void didBecomeFullscreenElement() { } 283 virtual void willStopBeingFullscreenElement() { } 284 282 285 bool isFinishedParsingChildren() const { return isParsingChildrenFinished(); } 283 286 virtual void finishParsingChildren(); -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r87539 r87657 2557 2557 } 2558 2558 2559 void HTMLMediaElement::didBecomeFullscreenElement() 2560 { 2561 if (hasMediaControls()) 2562 mediaControls()->enteredFullscreen(); 2563 } 2564 2565 void HTMLMediaElement::willStopBeingFullscreenElement() 2566 { 2567 if (hasMediaControls()) 2568 mediaControls()->exitedFullscreen(); 2569 } 2570 2559 2571 PlatformMedia HTMLMediaElement::platformMedia() const 2560 2572 { -
trunk/Source/WebCore/html/HTMLMediaElement.h
r87539 r87657 228 228 229 229 virtual void defaultEventHandler(Event*); 230 230 231 virtual void didBecomeFullscreenElement(); 232 virtual void willStopBeingFullscreenElement(); 233 231 234 // ActiveDOMObject functions. 232 235 virtual bool canSuspend() const; -
trunk/Source/WebCore/html/shadow/MediaControlElements.cpp
r87655 r87657 809 809 // screen behavior. 810 810 if (document()->settings() && document()->settings()->fullScreenEnabled()) { 811 if (document()->webkitIsFullScreen() && document()->webkitCurrentFullScreenElement() == mediaElement()) {811 if (document()->webkitIsFullScreen() && document()->webkitCurrentFullScreenElement() == mediaElement()) 812 812 document()->webkitCancelFullScreen(); 813 m_controls->exitedFullscreen(); 814 } else { 813 else 815 814 document()->requestFullScreenForElement(mediaElement(), 0, Document::ExemptIFrameAllowFulScreenRequirement); 816 m_controls->enteredFullscreen();817 }818 815 } else 819 816 #endif
Note: See TracChangeset
for help on using the changeset viewer.