| 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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 } | 257 } |
| 258 | 258 |
| 259 bool FrameLoaderClientImpl::allowMedia(const KURL& mediaURL) | 259 bool FrameLoaderClientImpl::allowMedia(const KURL& mediaURL) |
| 260 { | 260 { |
| 261 if (m_webFrame->contentSettingsClient()) | 261 if (m_webFrame->contentSettingsClient()) |
| 262 return m_webFrame->contentSettingsClient()->allowMedia(mediaURL); | 262 return m_webFrame->contentSettingsClient()->allowMedia(mediaURL); |
| 263 | 263 |
| 264 return true; | 264 return true; |
| 265 } | 265 } |
| 266 | 266 |
| 267 bool FrameLoaderClientImpl::allowDisplayingInsecureContent(bool enabledPerSettin
gs, SecurityOrigin* context, const KURL& url) | 267 bool FrameLoaderClientImpl::allowDisplayingInsecureContent(bool enabledPerSettin
gs, const KURL& url) |
| 268 { | 268 { |
| 269 if (m_webFrame->contentSettingsClient()) | 269 if (m_webFrame->contentSettingsClient()) |
| 270 return m_webFrame->contentSettingsClient()->allowDisplayingInsecureConte
nt(enabledPerSettings, WebSecurityOrigin(context), WebURL(url)); | 270 return m_webFrame->contentSettingsClient()->allowDisplayingInsecureConte
nt(enabledPerSettings, WebURL(url)); |
| 271 | 271 |
| 272 return enabledPerSettings; | 272 return enabledPerSettings; |
| 273 } | 273 } |
| 274 | 274 |
| 275 bool FrameLoaderClientImpl::allowRunningInsecureContent(bool enabledPerSettings,
SecurityOrigin* context, const KURL& url) | 275 bool FrameLoaderClientImpl::allowRunningInsecureContent(bool enabledPerSettings,
SecurityOrigin* context, const KURL& url) |
| 276 { | 276 { |
| 277 if (m_webFrame->contentSettingsClient()) | 277 if (m_webFrame->contentSettingsClient()) |
| 278 return m_webFrame->contentSettingsClient()->allowRunningInsecureContent(
enabledPerSettings, WebSecurityOrigin(context), WebURL(url)); | 278 return m_webFrame->contentSettingsClient()->allowRunningInsecureContent(
enabledPerSettings, WebSecurityOrigin(context), WebURL(url)); |
| 279 | 279 |
| 280 return enabledPerSettings; | 280 return enabledPerSettings; |
| (...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1001 | 1001 |
| 1002 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) | 1002 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) |
| 1003 { | 1003 { |
| 1004 if (m_webFrame->client()) { | 1004 if (m_webFrame->client()) { |
| 1005 m_webFrame->client()->suddenTerminationDisablerChanged( | 1005 m_webFrame->client()->suddenTerminationDisablerChanged( |
| 1006 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); | 1006 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); |
| 1007 } | 1007 } |
| 1008 } | 1008 } |
| 1009 | 1009 |
| 1010 } // namespace blink | 1010 } // namespace blink |
| OLD | NEW |