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

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

Issue 2224713002: Move WebSocketHandleImpl into Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix issue w/ Java bindings missing a dependency Created 4 years, 4 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 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 } 922 }
923 923
924 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(HTMLFrameElementBase* frameElement) 924 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(HTMLFrameElementBase* frameElement)
925 { 925 {
926 if (!m_webFrame->client()) 926 if (!m_webFrame->client())
927 return; 927 return;
928 928
929 m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(fram eElement->contentFrame()), WebFrameOwnerProperties(frameElement->scrollingMode() , frameElement->marginWidth(), frameElement->marginHeight(), frameElement->allow Fullscreen(), frameElement->delegatedPermissions())); 929 m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(fram eElement->contentFrame()), WebFrameOwnerProperties(frameElement->scrollingMode() , frameElement->marginWidth(), frameElement->marginHeight(), frameElement->allow Fullscreen(), frameElement->delegatedPermissions()));
930 } 930 }
931 931
932 void FrameLoaderClientImpl::dispatchWillOpenWebSocket(WebSocketHandle* handle)
933 {
934 m_webFrame->client()->willOpenWebSocket(handle);
935 }
936
937 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler) 932 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler)
938 { 933 {
939 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); 934 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler);
940 } 935 }
941 936
942 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) 937 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings)
943 { 938 {
944 if (m_webFrame->client()) 939 if (m_webFrame->client())
945 return m_webFrame->client()->allowWebGL(enabledPerSettings); 940 return m_webFrame->client()->allowWebGL(enabledPerSettings);
946 941
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
1029 { 1024 {
1030 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())-> devToolsAgentImpl(); 1025 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())-> devToolsAgentImpl();
1031 } 1026 }
1032 1027
1033 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) 1028 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url)
1034 { 1029 {
1035 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 1030 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
1036 } 1031 }
1037 1032
1038 } // namespace blink 1033 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698