| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 807 | 807 |
| 808 frame()->script()->evaluateInIsolatedWorld(worldID, sources, extensionGroup,
0); | 808 frame()->script()->evaluateInIsolatedWorld(worldID, sources, extensionGroup,
0); |
| 809 } | 809 } |
| 810 | 810 |
| 811 void WebFrameImpl::setIsolatedWorldSecurityOrigin(int worldID, const WebSecurity
Origin& securityOrigin) | 811 void WebFrameImpl::setIsolatedWorldSecurityOrigin(int worldID, const WebSecurity
Origin& securityOrigin) |
| 812 { | 812 { |
| 813 ASSERT(frame()); | 813 ASSERT(frame()); |
| 814 DOMWrapperWorld::setIsolatedWorldSecurityOrigin(worldID, securityOrigin.get(
)); | 814 DOMWrapperWorld::setIsolatedWorldSecurityOrigin(worldID, securityOrigin.get(
)); |
| 815 } | 815 } |
| 816 | 816 |
| 817 void WebFrameImpl::setIsolatedWorldHumanReadableName(int worldID, const WebStrin
g& humanReadableName) |
| 818 { |
| 819 ASSERT(frame()); |
| 820 DOMWrapperWorld::setIsolatedWorldHumanReadableName(worldID, humanReadableNam
e); |
| 821 } |
| 822 |
| 817 void WebFrameImpl::setIsolatedWorldContentSecurityPolicy(int worldID, const WebS
tring& policy) | 823 void WebFrameImpl::setIsolatedWorldContentSecurityPolicy(int worldID, const WebS
tring& policy) |
| 818 { | 824 { |
| 819 ASSERT(frame()); | 825 ASSERT(frame()); |
| 820 DOMWrapperWorld::setIsolatedWorldContentSecurityPolicy(worldID, policy); | 826 DOMWrapperWorld::setIsolatedWorldContentSecurityPolicy(worldID, policy); |
| 821 } | 827 } |
| 822 | 828 |
| 823 void WebFrameImpl::addMessageToConsole(const WebConsoleMessage& message) | 829 void WebFrameImpl::addMessageToConsole(const WebConsoleMessage& message) |
| 824 { | 830 { |
| 825 ASSERT(frame()); | 831 ASSERT(frame()); |
| 826 | 832 |
| (...skipping 1675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2502 | 2508 |
| 2503 // There is a possibility that the frame being detached was the only | 2509 // There is a possibility that the frame being detached was the only |
| 2504 // pending one. We need to make sure final replies can be sent. | 2510 // pending one. We need to make sure final replies can be sent. |
| 2505 flushCurrentScopingEffort(m_findRequestIdentifier); | 2511 flushCurrentScopingEffort(m_findRequestIdentifier); |
| 2506 | 2512 |
| 2507 cancelPendingScopingEffort(); | 2513 cancelPendingScopingEffort(); |
| 2508 } | 2514 } |
| 2509 } | 2515 } |
| 2510 | 2516 |
| 2511 } // namespace WebKit | 2517 } // namespace WebKit |
| OLD | NEW |