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

Side by Side Diff: Source/core/html/HTMLMediaElement.cpp

Issue 290883002: Clear hover flag after switching full-screen and inline video. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Refresh hover flag after switching full-screen and inline video Created 6 years, 6 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
« no previous file with comments | « no previous file | 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) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "core/html/HTMLTrackElement.h" 48 #include "core/html/HTMLTrackElement.h"
49 #include "core/html/MediaController.h" 49 #include "core/html/MediaController.h"
50 #include "core/html/MediaError.h" 50 #include "core/html/MediaError.h"
51 #include "core/html/MediaFragmentURIParser.h" 51 #include "core/html/MediaFragmentURIParser.h"
52 #include "core/html/TimeRanges.h" 52 #include "core/html/TimeRanges.h"
53 #include "core/html/shadow/MediaControls.h" 53 #include "core/html/shadow/MediaControls.h"
54 #include "core/html/track/InbandTextTrack.h" 54 #include "core/html/track/InbandTextTrack.h"
55 #include "core/html/track/TextTrackCueList.h" 55 #include "core/html/track/TextTrackCueList.h"
56 #include "core/html/track/TextTrackList.h" 56 #include "core/html/track/TextTrackList.h"
57 #include "core/loader/FrameLoader.h" 57 #include "core/loader/FrameLoader.h"
58 #include "core/page/EventHandler.h"
58 #include "core/rendering/RenderVideo.h" 59 #include "core/rendering/RenderVideo.h"
59 #include "core/rendering/RenderView.h" 60 #include "core/rendering/RenderView.h"
60 #include "core/rendering/compositing/RenderLayerCompositor.h" 61 #include "core/rendering/compositing/RenderLayerCompositor.h"
61 #include "platform/ContentType.h" 62 #include "platform/ContentType.h"
62 #include "platform/Language.h" 63 #include "platform/Language.h"
63 #include "platform/Logging.h" 64 #include "platform/Logging.h"
64 #include "platform/MIMETypeFromURL.h" 65 #include "platform/MIMETypeFromURL.h"
65 #include "platform/MIMETypeRegistry.h" 66 #include "platform/MIMETypeRegistry.h"
66 #include "platform/NotImplemented.h" 67 #include "platform/NotImplemented.h"
67 #include "platform/UserGestureIndicator.h" 68 #include "platform/UserGestureIndicator.h"
(...skipping 3108 matching lines...) Expand 10 before | Expand all | Expand 10 after
3176 3177
3177 FullscreenElementStack::from(document()).webkitCancelFullScreen(); 3178 FullscreenElementStack::from(document()).webkitCancelFullScreen();
3178 } 3179 }
3179 3180
3180 void HTMLMediaElement::didBecomeFullscreenElement() 3181 void HTMLMediaElement::didBecomeFullscreenElement()
3181 { 3182 {
3182 if (hasMediaControls()) 3183 if (hasMediaControls())
3183 mediaControls()->enteredFullscreen(); 3184 mediaControls()->enteredFullscreen();
3184 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isHTMLVideoEl ement(*this)) 3185 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isHTMLVideoEl ement(*this))
3185 document().renderView()->compositor()->setCompositingLayersNeedRebuild() ; 3186 document().renderView()->compositor()->setCompositingLayersNeedRebuild() ;
3187 if (document().frame())
3188 document().frame()->eventHandler().scheduleHoverStateUpdate();
3186 } 3189 }
3187 3190
3188 void HTMLMediaElement::willStopBeingFullscreenElement() 3191 void HTMLMediaElement::willStopBeingFullscreenElement()
3189 { 3192 {
3190 if (hasMediaControls()) 3193 if (hasMediaControls())
3191 mediaControls()->exitedFullscreen(); 3194 mediaControls()->exitedFullscreen();
3192 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isHTMLVideoEl ement(*this)) 3195 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isHTMLVideoEl ement(*this))
3193 document().renderView()->compositor()->setCompositingLayersNeedRebuild() ; 3196 document().renderView()->compositor()->setCompositingLayersNeedRebuild() ;
3197 if (document().frame())
3198 document().frame()->eventHandler().scheduleHoverStateUpdate();
3194 } 3199 }
3195 3200
3196 blink::WebLayer* HTMLMediaElement::platformLayer() const 3201 blink::WebLayer* HTMLMediaElement::platformLayer() const
3197 { 3202 {
3198 return m_webLayer; 3203 return m_webLayer;
3199 } 3204 }
3200 3205
3201 bool HTMLMediaElement::hasClosedCaptions() const 3206 bool HTMLMediaElement::hasClosedCaptions() const
3202 { 3207 {
3203 if (m_textTracks) { 3208 if (m_textTracks) {
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
3614 { 3619 {
3615 visitor->trace(m_currentSourceNode); 3620 visitor->trace(m_currentSourceNode);
3616 visitor->trace(m_nextChildNodeToConsider); 3621 visitor->trace(m_nextChildNodeToConsider);
3617 visitor->trace(m_textTracks); 3622 visitor->trace(m_textTracks);
3618 visitor->trace(m_textTracksWhenResourceSelectionBegan); 3623 visitor->trace(m_textTracksWhenResourceSelectionBegan);
3619 WillBeHeapSupplementable<HTMLMediaElement>::trace(visitor); 3624 WillBeHeapSupplementable<HTMLMediaElement>::trace(visitor);
3620 HTMLElement::trace(visitor); 3625 HTMLElement::trace(visitor);
3621 } 3626 }
3622 3627
3623 } 3628 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698