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

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

Issue 1192283003: DevTools: clear pending script to evaluate on load upon page agent being disabled (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | 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) 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 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 return; 420 return;
421 m_inspectorResourceContentLoader->dispose(); 421 m_inspectorResourceContentLoader->dispose();
422 m_inspectorResourceContentLoader.clear(); 422 m_inspectorResourceContentLoader.clear();
423 } 423 }
424 424
425 void InspectorPageAgent::disable(ErrorString*) 425 void InspectorPageAgent::disable(ErrorString*)
426 { 426 {
427 m_enabled = false; 427 m_enabled = false;
428 m_state->setBoolean(PageAgentState::pageAgentEnabled, false); 428 m_state->setBoolean(PageAgentState::pageAgentEnabled, false);
429 m_state->remove(PageAgentState::pageAgentScriptsToEvaluateOnLoad); 429 m_state->remove(PageAgentState::pageAgentScriptsToEvaluateOnLoad);
430 m_scriptToEvaluateOnLoadOnce = String();
431 m_pendingScriptToEvaluateOnLoadOnce = String();
430 m_instrumentingAgents->setInspectorPageAgent(0); 432 m_instrumentingAgents->setInspectorPageAgent(0);
431 if (m_inspectorResourceContentLoader) { 433 if (m_inspectorResourceContentLoader) {
432 m_inspectorResourceContentLoader->dispose(); 434 m_inspectorResourceContentLoader->dispose();
433 m_inspectorResourceContentLoader.clear(); 435 m_inspectorResourceContentLoader.clear();
434 } 436 }
435 437
436 setShowViewportSizeOnResize(0, false, 0); 438 setShowViewportSizeOnResize(0, false, 0);
437 stopScreencast(0); 439 stopScreencast(0);
438 440
439 finishReload(); 441 finishReload();
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 { 890 {
889 visitor->trace(m_inspectedFrame); 891 visitor->trace(m_inspectedFrame);
890 visitor->trace(m_debuggerAgent); 892 visitor->trace(m_debuggerAgent);
891 visitor->trace(m_cssAgent); 893 visitor->trace(m_cssAgent);
892 visitor->trace(m_overlay); 894 visitor->trace(m_overlay);
893 visitor->trace(m_inspectorResourceContentLoader); 895 visitor->trace(m_inspectorResourceContentLoader);
894 InspectorBaseAgent::trace(visitor); 896 InspectorBaseAgent::trace(visitor);
895 } 897 }
896 898
897 } // namespace blink 899 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698