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

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

Issue 2345863002: [Blink, RemotePlayback] Rename connect() to prompt() (Closed)
Patch Set: Rebase Created 4 years, 2 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) 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 2991 matching lines...) Expand 10 before | Expand all | Expand 10 after
3002 m_playingRemotely = false; 3002 m_playingRemotely = false;
3003 if (mediaControls()) 3003 if (mediaControls())
3004 mediaControls()->stoppedCasting(); 3004 mediaControls()->stoppedCasting();
3005 if (remotePlaybackClient()) 3005 if (remotePlaybackClient())
3006 remotePlaybackClient()->stateChanged(WebRemotePlaybackState::Disconnecte d); 3006 remotePlaybackClient()->stateChanged(WebRemotePlaybackState::Disconnecte d);
3007 } 3007 }
3008 3008
3009 void HTMLMediaElement::cancelledRemotePlaybackRequest() 3009 void HTMLMediaElement::cancelledRemotePlaybackRequest()
3010 { 3010 {
3011 if (remotePlaybackClient()) 3011 if (remotePlaybackClient())
3012 remotePlaybackClient()->connectCancelled(); 3012 remotePlaybackClient()->promptCancelled();
3013 } 3013 }
3014 3014
3015 void HTMLMediaElement::requestReload(const WebURL& newUrl) 3015 void HTMLMediaElement::requestReload(const WebURL& newUrl)
3016 { 3016 {
3017 DCHECK(webMediaPlayer()); 3017 DCHECK(webMediaPlayer());
3018 DCHECK(!m_srcObject); 3018 DCHECK(!m_srcObject);
3019 DCHECK(newUrl.isValid()); 3019 DCHECK(newUrl.isValid());
3020 DCHECK(isSafeToLoadURL(newUrl, Complain)); 3020 DCHECK(isSafeToLoadURL(newUrl, Complain));
3021 resetMediaPlayerAndMediaSource(); 3021 resetMediaPlayerAndMediaSource();
3022 startPlayerLoad(newUrl); 3022 startPlayerLoad(newUrl);
(...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after
4027 4027
4028 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst 4028 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst
4029 { 4029 {
4030 IntRect result; 4030 IntRect result;
4031 if (LayoutObject* object = m_element->layoutObject()) 4031 if (LayoutObject* object = m_element->layoutObject())
4032 result = object->absoluteBoundingBoxRect(); 4032 result = object->absoluteBoundingBoxRect();
4033 return result; 4033 return result;
4034 } 4034 }
4035 4035
4036 } // namespace blink 4036 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698