| 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 if (m_webFrame->contentSettingsClient()) | 205 if (m_webFrame->contentSettingsClient()) |
| 206 return m_webFrame->contentSettingsClient()->allowScriptExtension(extensi
onName, extensionGroup, worldId); | 206 return m_webFrame->contentSettingsClient()->allowScriptExtension(extensi
onName, extensionGroup, worldId); |
| 207 | 207 |
| 208 return true; | 208 return true; |
| 209 } | 209 } |
| 210 | 210 |
| 211 void FrameLoaderClientImpl::didChangeScrollOffset() | 211 void FrameLoaderClientImpl::didChangeScrollOffset() |
| 212 { | 212 { |
| 213 if (m_webFrame->client()) | 213 if (m_webFrame->client()) |
| 214 m_webFrame->client()->didChangeScrollOffset(m_webFrame); | 214 m_webFrame->client()->didChangeScrollOffset(m_webFrame); |
| 215 | |
| 216 if (m_webFrame->parent()) | |
| 217 return; | |
| 218 | |
| 219 if (WebViewImpl* webview = m_webFrame->viewImpl()) | |
| 220 webview->devToolsEmulator()->viewportChanged(); | |
| 221 } | 215 } |
| 222 | 216 |
| 223 void FrameLoaderClientImpl::didUpdateCurrentHistoryItem() | 217 void FrameLoaderClientImpl::didUpdateCurrentHistoryItem() |
| 224 { | 218 { |
| 225 if (m_webFrame->client()) | 219 if (m_webFrame->client()) |
| 226 m_webFrame->client()->didUpdateCurrentHistoryItem(m_webFrame); | 220 m_webFrame->client()->didUpdateCurrentHistoryItem(m_webFrame); |
| 227 } | 221 } |
| 228 | 222 |
| 229 // TODO(dglazkov): Can this be plumbing be streamlined out? | 223 // TODO(dglazkov): Can this be plumbing be streamlined out? |
| 230 void FrameLoaderClientImpl::didRemoveAllPendingStylesheet() | 224 void FrameLoaderClientImpl::didRemoveAllPendingStylesheet() |
| (...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1026 | 1020 |
| 1027 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) | 1021 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) |
| 1028 { | 1022 { |
| 1029 if (m_webFrame->client()) { | 1023 if (m_webFrame->client()) { |
| 1030 m_webFrame->client()->suddenTerminationDisablerChanged( | 1024 m_webFrame->client()->suddenTerminationDisablerChanged( |
| 1031 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); | 1025 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); |
| 1032 } | 1026 } |
| 1033 } | 1027 } |
| 1034 | 1028 |
| 1035 } // namespace blink | 1029 } // namespace blink |
| OLD | NEW |