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

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

Issue 2719333002: second stage
Patch Set: Need to get around resource loading without web/ Created 3 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 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 759
760 if (!webPlugin->initialize(container)) 760 if (!webPlugin->initialize(container))
761 return nullptr; 761 return nullptr;
762 762
763 if (policy != AllowDetachedPlugin && !element->layoutObject()) 763 if (policy != AllowDetachedPlugin && !element->layoutObject())
764 return nullptr; 764 return nullptr;
765 765
766 return container; 766 return container;
767 } 767 }
768 768
769 PluginClient* FrameLoaderClientImpl::createPluginClient(
770 HTMLPlugInElement* element,
771 const KURL& url,
772 const WTF::String& mimeType) {
773 return m_webFrame->createMimeHandlerView(element, url, mimeType);
774 }
775
769 std::unique_ptr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer( 776 std::unique_ptr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer(
770 HTMLMediaElement& htmlMediaElement, 777 HTMLMediaElement& htmlMediaElement,
771 const WebMediaPlayerSource& source, 778 const WebMediaPlayerSource& source,
772 WebMediaPlayerClient* client) { 779 WebMediaPlayerClient* client) {
773 WebLocalFrameImpl* webFrame = 780 WebLocalFrameImpl* webFrame =
774 WebLocalFrameImpl::fromFrame(htmlMediaElement.document().frame()); 781 WebLocalFrameImpl::fromFrame(htmlMediaElement.document().frame());
775 782
776 if (!webFrame || !webFrame->client()) 783 if (!webFrame || !webFrame->client())
777 return nullptr; 784 return nullptr;
778 785
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
1004 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { 1011 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) {
1005 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 1012 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
1006 } 1013 }
1007 1014
1008 void FrameLoaderClientImpl::setHasReceivedUserGesture() { 1015 void FrameLoaderClientImpl::setHasReceivedUserGesture() {
1009 if (m_webFrame->client()) 1016 if (m_webFrame->client())
1010 m_webFrame->client()->setHasReceivedUserGesture(); 1017 m_webFrame->client()->setHasReceivedUserGesture();
1011 } 1018 }
1012 1019
1013 } // namespace blink 1020 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698