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

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, 10 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
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 1400 matching lines...) Expand 10 before | Expand all | Expand 10 after
1411 void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() 1411 void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
1412 { 1412 {
1413 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript)) 1413 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript))
1414 return; 1414 return;
1415 1415
1416 if (Page* page = m_frame->page()) 1416 if (Page* page = m_frame->page())
1417 page->inspectorController().didClearWindowObjectInMainWorld(m_frame); 1417 page->inspectorController().didClearWindowObjectInMainWorld(m_frame);
1418 InspectorInstrumentation::didClearWindowObjectInMainWorld(m_frame); 1418 InspectorInstrumentation::didClearWindowObjectInMainWorld(m_frame);
1419 1419
1420 Vector<RefPtr<DOMWrapperWorld> > worlds; 1420 Vector<RefPtr<DOMWrapperWorld> > worlds;
1421 DOMWrapperWorld::getAllWorldsInMainThread(worlds); 1421 DOMWrapperWorld::allWorldsInMainThread(worlds);
1422 for (size_t i = 0; i < worlds.size(); ++i) 1422 for (size_t i = 0; i < worlds.size(); ++i)
1423 m_client->dispatchDidClearWindowObjectInWorld(worlds[i].get()); 1423 m_client->dispatchDidClearWindowObjectInWorld(worlds[i].get());
1424 } 1424 }
1425 1425
1426 void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world) 1426 void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world)
1427 { 1427 {
1428 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript) || !m_fram e->script().existingWindowShell(world)) 1428 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript) || !m_fram e->script().existingWindowShell(world))
1429 return; 1429 return;
1430 1430
1431 m_client->dispatchDidClearWindowObjectInWorld(world); 1431 m_client->dispatchDidClearWindowObjectInWorld(world);
1432 } 1432 }
1433 1433
1434 SandboxFlags FrameLoader::effectiveSandboxFlags() const 1434 SandboxFlags FrameLoader::effectiveSandboxFlags() const
1435 { 1435 {
1436 SandboxFlags flags = m_forcedSandboxFlags; 1436 SandboxFlags flags = m_forcedSandboxFlags;
1437 if (LocalFrame* parentFrame = m_frame->tree().parent()) 1437 if (LocalFrame* parentFrame = m_frame->tree().parent())
1438 flags |= parentFrame->document()->sandboxFlags(); 1438 flags |= parentFrame->document()->sandboxFlags();
1439 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) 1439 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement())
1440 flags |= ownerElement->sandboxFlags(); 1440 flags |= ownerElement->sandboxFlags();
1441 return flags; 1441 return flags;
1442 } 1442 }
1443 1443
1444 } // namespace WebCore 1444 } // namespace WebCore
OLDNEW
« Source/bindings/v8/SerializedScriptValue.cpp ('K') | « Source/bindings/v8/V8PerIsolateData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698