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 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1028 if (m_webFrame->client()) | 1028 if (m_webFrame->client()) |
1029 return m_webFrame->client()->getEffectiveConnectionType(); | 1029 return m_webFrame->client()->getEffectiveConnectionType(); |
1030 return WebEffectiveConnectionType::TypeUnknown; | 1030 return WebEffectiveConnectionType::TypeUnknown; |
1031 } | 1031 } |
1032 | 1032 |
1033 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() | 1033 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() |
1034 { | 1034 { |
1035 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())-> devToolsAgentImpl(); | 1035 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())-> devToolsAgentImpl(); |
1036 } | 1036 } |
1037 | 1037 |
1038 String FrameLoaderClientImpl::OverrideFlashEmbedWithHTML(const String& url) | |
1039 { | |
1040 if (!m_webFrame->client()) | |
dcheng
2016/08/01 14:50:34
Why would we call this when client() is null? We s
kdsilva
2016/08/02 15:34:46
Done.
| |
1041 return ""; | |
dcheng
2016/08/01 14:50:34
As noted elsewhere, prefer returning the default c
kdsilva
2016/08/02 15:34:46
Done.
| |
1042 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebString(url)); | |
1043 } | |
1044 | |
1038 } // namespace blink | 1045 } // namespace blink |
OLD | NEW |