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

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

Issue 2284473002: Move WebSocketHandleImpl into Blink (take 2) (Closed)
Patch Set: Rebase Created 4 years, 3 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 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 } 902 }
903 903
904 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(HTMLFrameElementBase* frameElement) 904 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(HTMLFrameElementBase* frameElement)
905 { 905 {
906 if (!m_webFrame->client()) 906 if (!m_webFrame->client())
907 return; 907 return;
908 908
909 m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(fram eElement->contentFrame()), WebFrameOwnerProperties(frameElement->scrollingMode() , frameElement->marginWidth(), frameElement->marginHeight(), frameElement->allow Fullscreen(), frameElement->delegatedPermissions())); 909 m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(fram eElement->contentFrame()), WebFrameOwnerProperties(frameElement->scrollingMode() , frameElement->marginWidth(), frameElement->marginHeight(), frameElement->allow Fullscreen(), frameElement->delegatedPermissions()));
910 } 910 }
911 911
912 void FrameLoaderClientImpl::dispatchWillOpenWebSocket(WebSocketHandle* handle)
913 {
914 m_webFrame->client()->willOpenWebSocket(handle);
915 }
916
917 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler) 912 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler)
918 { 913 {
919 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); 914 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler);
920 } 915 }
921 916
922 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) 917 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings)
923 { 918 {
924 if (m_webFrame->client()) 919 if (m_webFrame->client())
925 return m_webFrame->client()->allowWebGL(enabledPerSettings); 920 return m_webFrame->client()->allowWebGL(enabledPerSettings);
926 921
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 { 1004 {
1010 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())-> devToolsAgentImpl(); 1005 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())-> devToolsAgentImpl();
1011 } 1006 }
1012 1007
1013 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) 1008 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url)
1014 { 1009 {
1015 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 1010 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
1016 } 1011 }
1017 1012
1018 } // namespace blink 1013 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/Source/web/WebSharedWorkerImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698