OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
8 * Copyright (C) 2011 Google Inc. All rights reserved. | 8 * Copyright (C) 2011 Google Inc. All rights reserved. |
9 * | 9 * |
10 * Redistribution and use in source and binary forms, with or without | 10 * Redistribution and use in source and binary forms, with or without |
(...skipping 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1440 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript)) | 1440 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript)) |
1441 return; | 1441 return; |
1442 | 1442 |
1443 if (Page* page = m_frame->page()) | 1443 if (Page* page = m_frame->page()) |
1444 page->inspectorController().didClearWindowObjectInMainWorld(m_frame); | 1444 page->inspectorController().didClearWindowObjectInMainWorld(m_frame); |
1445 InspectorInstrumentation::didClearWindowObjectInMainWorld(m_frame); | 1445 InspectorInstrumentation::didClearWindowObjectInMainWorld(m_frame); |
1446 | 1446 |
1447 Vector<RefPtr<DOMWrapperWorld> > worlds; | 1447 Vector<RefPtr<DOMWrapperWorld> > worlds; |
1448 DOMWrapperWorld::allWorldsInMainThread(worlds); | 1448 DOMWrapperWorld::allWorldsInMainThread(worlds); |
1449 for (size_t i = 0; i < worlds.size(); ++i) | 1449 for (size_t i = 0; i < worlds.size(); ++i) |
1450 m_client->dispatchDidClearWindowObjectInWorld(worlds[i].get()); | 1450 m_client->dispatchDidClearWindowObjectInWorld(*worlds[i]); |
1451 } | 1451 } |
1452 | 1452 |
1453 void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world) | 1453 void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world) |
1454 { | 1454 { |
1455 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript) || !m_fram
e->script().existingWindowShell(world)) | 1455 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript) || !m_fram
e->script().existingWindowShell(world)) |
1456 return; | 1456 return; |
1457 | 1457 |
1458 m_client->dispatchDidClearWindowObjectInWorld(world); | 1458 m_client->dispatchDidClearWindowObjectInWorld(world); |
1459 } | 1459 } |
1460 | 1460 |
1461 SandboxFlags FrameLoader::effectiveSandboxFlags() const | 1461 SandboxFlags FrameLoader::effectiveSandboxFlags() const |
1462 { | 1462 { |
1463 SandboxFlags flags = m_forcedSandboxFlags; | 1463 SandboxFlags flags = m_forcedSandboxFlags; |
1464 if (LocalFrame* parentFrame = m_frame->tree().parent()) | 1464 if (LocalFrame* parentFrame = m_frame->tree().parent()) |
1465 flags |= parentFrame->document()->sandboxFlags(); | 1465 flags |= parentFrame->document()->sandboxFlags(); |
1466 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) | 1466 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) |
1467 flags |= ownerElement->sandboxFlags(); | 1467 flags |= ownerElement->sandboxFlags(); |
1468 return flags; | 1468 return flags; |
1469 } | 1469 } |
1470 | 1470 |
1471 } // namespace WebCore | 1471 } // namespace WebCore |
OLD | NEW |