Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 918 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 929 static_cast<WebContentSecurityPolicyType>(type), | 929 static_cast<WebContentSecurityPolicyType>(type), |
| 930 static_cast<WebContentSecurityPolicySource>(source)); | 930 static_cast<WebContentSecurityPolicySource>(source)); |
| 931 } | 931 } |
| 932 } | 932 } |
| 933 | 933 |
| 934 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(HTMLFrameElementBase* frameElement) | 934 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(HTMLFrameElementBase* frameElement) |
| 935 { | 935 { |
| 936 if (!m_webFrame->client()) | 936 if (!m_webFrame->client()) |
| 937 return; | 937 return; |
| 938 | 938 |
| 939 m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(fram eElement->contentFrame()), WebFrameOwnerProperties(frameElement->scrollingMode() , frameElement->marginWidth(), frameElement->marginHeight(), frameElement->allow Fullscreen())); | 939 m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(fram eElement->contentFrame()), WebFrameOwnerProperties(frameElement->scrollingMode() , frameElement->marginWidth(), frameElement->marginHeight(), frameElement->allow Fullscreen(), *frameElement->delegatedPermissions())); |
|
tkent
2016/06/23 04:57:28
Can frameElement->delegatedPermissions() be nullpt
raymes
2016/06/27 08:09:50
I think so now that I look at it closely. I've add
| |
| 940 } | 940 } |
| 941 | 941 |
| 942 void FrameLoaderClientImpl::dispatchWillOpenWebSocket(WebSocketHandle* handle) | 942 void FrameLoaderClientImpl::dispatchWillOpenWebSocket(WebSocketHandle* handle) |
| 943 { | 943 { |
| 944 m_webFrame->client()->willOpenWebSocket(handle); | 944 m_webFrame->client()->willOpenWebSocket(handle); |
| 945 } | 945 } |
| 946 | 946 |
| 947 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler) | 947 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler) |
| 948 { | 948 { |
| 949 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); | 949 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1029 } | 1029 } |
| 1030 | 1030 |
| 1031 WebEffectiveConnectionType FrameLoaderClientImpl::getEffectiveConnectionType() | 1031 WebEffectiveConnectionType FrameLoaderClientImpl::getEffectiveConnectionType() |
| 1032 { | 1032 { |
| 1033 if (m_webFrame->client()) | 1033 if (m_webFrame->client()) |
| 1034 return m_webFrame->client()->getEffectiveConnectionType(); | 1034 return m_webFrame->client()->getEffectiveConnectionType(); |
| 1035 return WebEffectiveConnectionType::TypeUnknown; | 1035 return WebEffectiveConnectionType::TypeUnknown; |
| 1036 } | 1036 } |
| 1037 | 1037 |
| 1038 } // namespace blink | 1038 } // namespace blink |
| OLD | NEW |