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

Side by Side Diff: Source/core/inspector/InspectorPageAgent.cpp

Issue 146693005: Clarify when what notifications are send when a window object is cleared (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: updates Created 6 years, 7 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 return; 822 return;
823 823
824 Settings* settings = mainFrame()->settings(); 824 Settings* settings = mainFrame()->settings();
825 if (settings) { 825 if (settings) {
826 m_ignoreScriptsEnabledNotification = true; 826 m_ignoreScriptsEnabledNotification = true;
827 settings->setScriptEnabled(!value); 827 settings->setScriptEnabled(!value);
828 m_ignoreScriptsEnabledNotification = false; 828 m_ignoreScriptsEnabledNotification = false;
829 } 829 }
830 } 830 }
831 831
832 void InspectorPageAgent::didClearWindowObjectInMainWorld(LocalFrame* frame) 832 void InspectorPageAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
833 { 833 {
834 if (frame == m_page->mainFrame()) 834 if (frame == m_page->mainFrame())
835 m_injectedScriptManager->discardInjectedScripts(); 835 m_injectedScriptManager->discardInjectedScripts();
836 836
837 if (!m_frontend) 837 if (!m_frontend)
838 return; 838 return;
839 839
840 RefPtr<JSONObject> scripts = m_state->getObject(PageAgentState::pageAgentScr iptsToEvaluateOnLoad); 840 RefPtr<JSONObject> scripts = m_state->getObject(PageAgentState::pageAgentScr iptsToEvaluateOnLoad);
841 if (scripts) { 841 if (scripts) {
842 JSONObject::const_iterator end = scripts->end(); 842 JSONObject::const_iterator end = scripts->end();
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
1261 } 1261 }
1262 1262
1263 void InspectorPageAgent::setShowViewportSizeOnResize(ErrorString*, bool show, co nst bool* showGrid) 1263 void InspectorPageAgent::setShowViewportSizeOnResize(ErrorString*, bool show, co nst bool* showGrid)
1264 { 1264 {
1265 m_state->setBoolean(PageAgentState::showSizeOnResize, show); 1265 m_state->setBoolean(PageAgentState::showSizeOnResize, show);
1266 m_state->setBoolean(PageAgentState::showGridOnResize, showGrid && *showGrid) ; 1266 m_state->setBoolean(PageAgentState::showGridOnResize, showGrid && *showGrid) ;
1267 } 1267 }
1268 1268
1269 } // namespace WebCore 1269 } // namespace WebCore
1270 1270
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698