Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: Source/core/loader/FrameLoader.cpp

Issue 182513003: Remove m_domDataStoreList from V8PerIsolateData (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/bindings/v8/WorkerScriptController.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1425 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() 1436 void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
1437 { 1437 {
1438 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript)) 1438 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript))
1439 return; 1439 return;
1440 1440
1441 if (Page* page = m_frame->page()) 1441 if (Page* page = m_frame->page())
1442 page->inspectorController().didClearWindowObjectInMainWorld(m_frame); 1442 page->inspectorController().didClearWindowObjectInMainWorld(m_frame);
1443 InspectorInstrumentation::didClearWindowObjectInMainWorld(m_frame); 1443 InspectorInstrumentation::didClearWindowObjectInMainWorld(m_frame);
1444 1444
1445 Vector<RefPtr<DOMWrapperWorld> > worlds; 1445 Vector<RefPtr<DOMWrapperWorld> > worlds;
1446 DOMWrapperWorld::getAllWorldsInMainThread(worlds); 1446 DOMWrapperWorld::allWorldsInMainThread(worlds);
1447 for (size_t i = 0; i < worlds.size(); ++i) 1447 for (size_t i = 0; i < worlds.size(); ++i)
1448 m_client->dispatchDidClearWindowObjectInWorld(worlds[i].get()); 1448 m_client->dispatchDidClearWindowObjectInWorld(worlds[i].get());
1449 } 1449 }
1450 1450
1451 void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world) 1451 void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world)
1452 { 1452 {
1453 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript) || !m_fram e->script().existingWindowShell(world)) 1453 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript) || !m_fram e->script().existingWindowShell(world))
1454 return; 1454 return;
1455 1455
1456 m_client->dispatchDidClearWindowObjectInWorld(world); 1456 m_client->dispatchDidClearWindowObjectInWorld(world);
1457 } 1457 }
1458 1458
1459 SandboxFlags FrameLoader::effectiveSandboxFlags() const 1459 SandboxFlags FrameLoader::effectiveSandboxFlags() const
1460 { 1460 {
1461 SandboxFlags flags = m_forcedSandboxFlags; 1461 SandboxFlags flags = m_forcedSandboxFlags;
1462 if (LocalFrame* parentFrame = m_frame->tree().parent()) 1462 if (LocalFrame* parentFrame = m_frame->tree().parent())
1463 flags |= parentFrame->document()->sandboxFlags(); 1463 flags |= parentFrame->document()->sandboxFlags();
1464 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) 1464 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement())
1465 flags |= ownerElement->sandboxFlags(); 1465 flags |= ownerElement->sandboxFlags();
1466 return flags; 1466 return flags;
1467 } 1467 }
1468 1468
1469 } // namespace WebCore 1469 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/WorkerScriptController.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698