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

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

Issue 2447503002: Remove newMediaPlaybackUi flag from content/ and Blink. (Closed)
Patch Set: fix mistake caught by tests Created 4 years, 1 month 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 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
3 * reserved. 3 * 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 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 3657 matching lines...) Expand 10 before | Expand all | Expand 10 after
3668 3668
3669 void HTMLMediaElement::setAudioSourceNode( 3669 void HTMLMediaElement::setAudioSourceNode(
3670 AudioSourceProviderClient* sourceNode) { 3670 AudioSourceProviderClient* sourceNode) {
3671 DCHECK(isMainThread()); 3671 DCHECK(isMainThread());
3672 m_audioSourceNode = sourceNode; 3672 m_audioSourceNode = sourceNode;
3673 3673
3674 AudioSourceProviderClientLockScope scope(*this); 3674 AudioSourceProviderClientLockScope scope(*this);
3675 getAudioSourceProvider().setClient(m_audioSourceNode); 3675 getAudioSourceProvider().setClient(m_audioSourceNode);
3676 } 3676 }
3677 3677
3678 void HTMLMediaElement::setAllowHiddenVolumeControls(bool allow) {
3679 ensureMediaControls();
3680 mediaControls()->setAllowHiddenVolumeControls(allow);
3681 }
3682
3683 WebMediaPlayer::CORSMode HTMLMediaElement::corsMode() const { 3678 WebMediaPlayer::CORSMode HTMLMediaElement::corsMode() const {
3684 const AtomicString& crossOriginMode = fastGetAttribute(crossoriginAttr); 3679 const AtomicString& crossOriginMode = fastGetAttribute(crossoriginAttr);
3685 if (crossOriginMode.isNull()) 3680 if (crossOriginMode.isNull())
3686 return WebMediaPlayer::CORSModeUnspecified; 3681 return WebMediaPlayer::CORSModeUnspecified;
3687 if (equalIgnoringCase(crossOriginMode, "use-credentials")) 3682 if (equalIgnoringCase(crossOriginMode, "use-credentials"))
3688 return WebMediaPlayer::CORSModeUseCredentials; 3683 return WebMediaPlayer::CORSModeUseCredentials;
3689 return WebMediaPlayer::CORSModeAnonymous; 3684 return WebMediaPlayer::CORSModeAnonymous;
3690 } 3685 }
3691 3686
3692 void HTMLMediaElement::setWebLayer(WebLayer* webLayer) { 3687 void HTMLMediaElement::setWebLayer(WebLayer* webLayer) {
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
4092 4087
4093 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() 4088 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect()
4094 const { 4089 const {
4095 IntRect result; 4090 IntRect result;
4096 if (LayoutObject* object = m_element->layoutObject()) 4091 if (LayoutObject* object = m_element->layoutObject())
4097 result = object->absoluteBoundingBoxRect(); 4092 result = object->absoluteBoundingBoxRect();
4098 return result; 4093 return result;
4099 } 4094 }
4100 4095
4101 } // namespace blink 4096 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLMediaElement.h ('k') | third_party/WebKit/Source/core/html/shadow/MediaControls.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698