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

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

Issue 1166493003: Prevent reentrancy of WebFrameClient::didClearWindowObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fxied android compile Created 5 years, 6 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 | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | 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 1347 matching lines...) Expand 10 before | Expand all | Expand 10 after
1358 client()->documentElementAvailable(); 1358 client()->documentElementAvailable();
1359 } 1359 }
1360 1360
1361 void FrameLoader::dispatchDidClearDocumentOfWindowObject() 1361 void FrameLoader::dispatchDidClearDocumentOfWindowObject()
1362 { 1362 {
1363 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript)) 1363 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript))
1364 return; 1364 return;
1365 1365
1366 InspectorInstrumentation::didClearDocumentOfWindowObject(m_frame); 1366 InspectorInstrumentation::didClearDocumentOfWindowObject(m_frame);
1367 1367
1368 if (m_dispatchingDidClearWindowObjectInMainWorld)
1369 return;
1370 TemporaryChange<bool>
1371 inDidClearWindowObject(m_dispatchingDidClearWindowObjectInMainWorld, tru e);
1368 // We just cleared the document, not the entire window object, but for the 1372 // We just cleared the document, not the entire window object, but for the
1369 // embedder that's close enough. 1373 // embedder that's close enough.
1370 client()->dispatchDidClearWindowObjectInMainWorld(); 1374 client()->dispatchDidClearWindowObjectInMainWorld();
1371 } 1375 }
1372 1376
1373 void FrameLoader::dispatchDidClearWindowObjectInMainWorld() 1377 void FrameLoader::dispatchDidClearWindowObjectInMainWorld()
1374 { 1378 {
1375 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript)) 1379 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript))
1376 return; 1380 return;
1377 1381
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
1433 // FIXME: We need a way to propagate insecure requests policy flags to 1437 // FIXME: We need a way to propagate insecure requests policy flags to
1434 // out-of-process frames. For now, we'll always use default behavior. 1438 // out-of-process frames. For now, we'll always use default behavior.
1435 if (!parentFrame->isLocalFrame()) 1439 if (!parentFrame->isLocalFrame())
1436 return nullptr; 1440 return nullptr;
1437 1441
1438 ASSERT(toLocalFrame(parentFrame)->document()); 1442 ASSERT(toLocalFrame(parentFrame)->document());
1439 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1443 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1440 } 1444 }
1441 1445
1442 } // namespace blink 1446 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698