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

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

Issue 900543003: DevTools: do not abuse inspector controller for the front-end side plumbing. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed initializer. Created 5 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 1344 matching lines...) Expand 10 before | Expand all | Expand 10 after
1355 void FrameLoader::dispatchDocumentElementAvailable() 1355 void FrameLoader::dispatchDocumentElementAvailable()
1356 { 1356 {
1357 client()->documentElementAvailable(); 1357 client()->documentElementAvailable();
1358 } 1358 }
1359 1359
1360 void FrameLoader::dispatchDidClearDocumentOfWindowObject() 1360 void FrameLoader::dispatchDidClearDocumentOfWindowObject()
1361 { 1361 {
1362 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript)) 1362 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript))
1363 return; 1363 return;
1364 1364
1365 if (Page* page = m_frame->page())
1366 page->inspectorController().didClearDocumentOfWindowObject(m_frame);
1367 InspectorInstrumentation::didClearDocumentOfWindowObject(m_frame); 1365 InspectorInstrumentation::didClearDocumentOfWindowObject(m_frame);
1368 1366
1369 // We just cleared the document, not the entire window object, but for the 1367 // We just cleared the document, not the entire window object, but for the
1370 // embedder that's close enough. 1368 // embedder that's close enough.
1371 client()->dispatchDidClearWindowObjectInMainWorld(); 1369 client()->dispatchDidClearWindowObjectInMainWorld();
1372 } 1370 }
1373 1371
1374 void FrameLoader::dispatchDidClearWindowObjectInMainWorld() 1372 void FrameLoader::dispatchDidClearWindowObjectInMainWorld()
1375 { 1373 {
1376 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript)) 1374 if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript))
(...skipping 21 matching lines...) Expand all
1398 1396
1399 // FIXME: We need a way to propagate strict mixed content checking flags to 1397 // FIXME: We need a way to propagate strict mixed content checking flags to
1400 // out-of-process frames. For now, we'll always enforce. 1398 // out-of-process frames. For now, we'll always enforce.
1401 if (!parentFrame->isLocalFrame()) 1399 if (!parentFrame->isLocalFrame())
1402 return true; 1400 return true;
1403 1401
1404 return toLocalFrame(parentFrame)->document()->shouldEnforceStrictMixedConten tChecking(); 1402 return toLocalFrame(parentFrame)->document()->shouldEnforceStrictMixedConten tChecking();
1405 } 1403 }
1406 1404
1407 } // namespace blink 1405 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorInstrumentation.idl ('k') | Source/modules/filesystem/DevToolsHostFileSystem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698