| 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 | 183 |
| 184 void FrameLoaderClientImpl::runScriptsAtDocumentReady(bool documentIsEmpty) { | 184 void FrameLoaderClientImpl::runScriptsAtDocumentReady(bool documentIsEmpty) { |
| 185 if (m_webFrame->client()) | 185 if (m_webFrame->client()) |
| 186 m_webFrame->client()->runScriptsAtDocumentReady(m_webFrame, | 186 m_webFrame->client()->runScriptsAtDocumentReady(m_webFrame, |
| 187 documentIsEmpty); | 187 documentIsEmpty); |
| 188 // The callback might have deleted the frame, do not use |this|! | 188 // The callback might have deleted the frame, do not use |this|! |
| 189 } | 189 } |
| 190 | 190 |
| 191 void FrameLoaderClientImpl::didCreateScriptContext( | 191 void FrameLoaderClientImpl::didCreateScriptContext( |
| 192 v8::Local<v8::Context> context, | 192 v8::Local<v8::Context> context, |
| 193 int extensionGroup, | |
| 194 int worldId) { | 193 int worldId) { |
| 195 if (m_webFrame->client()) | 194 if (m_webFrame->client()) |
| 196 m_webFrame->client()->didCreateScriptContext(m_webFrame, context, | 195 m_webFrame->client()->didCreateScriptContext(m_webFrame, context, worldId); |
| 197 extensionGroup, worldId); | |
| 198 } | 196 } |
| 199 | 197 |
| 200 void FrameLoaderClientImpl::willReleaseScriptContext( | 198 void FrameLoaderClientImpl::willReleaseScriptContext( |
| 201 v8::Local<v8::Context> context, | 199 v8::Local<v8::Context> context, |
| 202 int worldId) { | 200 int worldId) { |
| 203 if (m_webFrame->client()) | 201 if (m_webFrame->client()) |
| 204 m_webFrame->client()->willReleaseScriptContext(m_webFrame, context, | 202 m_webFrame->client()->willReleaseScriptContext(m_webFrame, context, |
| 205 worldId); | 203 worldId); |
| 206 } | 204 } |
| 207 | 205 |
| 208 bool FrameLoaderClientImpl::allowScriptExtension(const String& extensionName, | 206 bool FrameLoaderClientImpl::allowScriptExtensions() { |
| 209 int extensionGroup, | |
| 210 int worldId) { | |
| 211 if (m_webFrame->contentSettingsClient()) | |
| 212 return m_webFrame->contentSettingsClient()->allowScriptExtension( | |
| 213 extensionName, extensionGroup, worldId); | |
| 214 | |
| 215 return true; | 207 return true; |
| 216 } | 208 } |
| 217 | 209 |
| 218 void FrameLoaderClientImpl::didChangeScrollOffset() { | 210 void FrameLoaderClientImpl::didChangeScrollOffset() { |
| 219 if (m_webFrame->client()) | 211 if (m_webFrame->client()) |
| 220 m_webFrame->client()->didChangeScrollOffset(m_webFrame); | 212 m_webFrame->client()->didChangeScrollOffset(m_webFrame); |
| 221 } | 213 } |
| 222 | 214 |
| 223 void FrameLoaderClientImpl::didUpdateCurrentHistoryItem() { | 215 void FrameLoaderClientImpl::didUpdateCurrentHistoryItem() { |
| 224 if (m_webFrame->client()) | 216 if (m_webFrame->client()) |
| (...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 998 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { | 990 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { |
| 999 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) | 991 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) |
| 1000 ->devToolsAgentImpl(); | 992 ->devToolsAgentImpl(); |
| 1001 } | 993 } |
| 1002 | 994 |
| 1003 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { | 995 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { |
| 1004 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 996 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
| 1005 } | 997 } |
| 1006 | 998 |
| 1007 } // namespace blink | 999 } // namespace blink |
| OLD | NEW |