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

Side by Side Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple 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 are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * 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 800 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 WebMediaPlayerClient* client) 811 WebMediaPlayerClient* client)
812 { 812 {
813 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame( 813 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(
814 htmlMediaElement.document().frame()); 814 htmlMediaElement.document().frame());
815 815
816 if (!webFrame || !webFrame->client()) 816 if (!webFrame || !webFrame->client())
817 return nullptr; 817 return nullptr;
818 818
819 WebMediaSession* webMediaSession = nullptr; 819 WebMediaSession* webMediaSession = nullptr;
820 if (MediaSession* mediaSession = HTMLMediaElementMediaSession::session(htmlM ediaElement)) 820 if (MediaSession* mediaSession = HTMLMediaElementMediaSession::session(htmlM ediaElement))
821 webMediaSession = mediaSession->webMediaSession(); 821 webMediaSession = mediaSession->getWebMediaSession();
822 822
823 HTMLMediaElementEncryptedMedia& encryptedMedia = HTMLMediaElementEncryptedMe dia::from(htmlMediaElement); 823 HTMLMediaElementEncryptedMedia& encryptedMedia = HTMLMediaElementEncryptedMe dia::from(htmlMediaElement);
824 WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement) ); 824 WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement) );
825 return adoptPtr(webFrame->client()->createMediaPlayer(loadType, url, 825 return adoptPtr(webFrame->client()->createMediaPlayer(loadType, url,
826 client, &encryptedMedia, 826 client, &encryptedMedia,
827 encryptedMedia.contentDecryptionModule(), sinkId, webMediaSession)); 827 encryptedMedia.contentDecryptionModule(), sinkId, webMediaSession));
828 } 828 }
829 829
830 PassOwnPtr<WebMediaSession> FrameLoaderClientImpl::createWebMediaSession() 830 PassOwnPtr<WebMediaSession> FrameLoaderClientImpl::createWebMediaSession()
831 { 831 {
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 1023
1024 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) 1024 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type)
1025 { 1025 {
1026 if (m_webFrame->client()) { 1026 if (m_webFrame->client()) {
1027 m_webFrame->client()->suddenTerminationDisablerChanged( 1027 m_webFrame->client()->suddenTerminationDisablerChanged(
1028 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); 1028 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type));
1029 } 1029 }
1030 } 1030 }
1031 1031
1032 } // namespace blink 1032 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/ContextMenuClientImpl.cpp ('k') | third_party/WebKit/Source/web/IndexedDBClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698