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

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

Issue 1156473002: Refactor FrameLoader loading interface (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase 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
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 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 } 451 }
452 scripts->remove(identifier); 452 scripts->remove(identifier);
453 } 453 }
454 454
455 void InspectorPageAgent::reload(ErrorString*, const bool* const optionalIgnoreCa che, const String* optionalScriptToEvaluateOnLoad) 455 void InspectorPageAgent::reload(ErrorString*, const bool* const optionalIgnoreCa che, const String* optionalScriptToEvaluateOnLoad)
456 { 456 {
457 m_pendingScriptToEvaluateOnLoadOnce = optionalScriptToEvaluateOnLoad ? *opti onalScriptToEvaluateOnLoad : ""; 457 m_pendingScriptToEvaluateOnLoadOnce = optionalScriptToEvaluateOnLoad ? *opti onalScriptToEvaluateOnLoad : "";
458 ErrorString unused; 458 ErrorString unused;
459 m_debuggerAgent->setSkipAllPauses(&unused, true); 459 m_debuggerAgent->setSkipAllPauses(&unused, true);
460 m_reloading = true; 460 m_reloading = true;
461 inspectedFrame()->reload(asBool(optionalIgnoreCache) ? EndToEndReload : Norm alReload, NotClientRedirect); 461 inspectedFrame()->reload(asBool(optionalIgnoreCache) ? FrameLoadTypeReloadFr omOrigin : FrameLoadTypeReload, NotClientRedirect);
462 } 462 }
463 463
464 void InspectorPageAgent::navigate(ErrorString*, const String& url, String* outFr ameId) 464 void InspectorPageAgent::navigate(ErrorString*, const String& url, String* outFr ameId)
465 { 465 {
466 *outFrameId = frameId(inspectedFrame()); 466 *outFrameId = frameId(inspectedFrame());
467 } 467 }
468 468
469 static void cachedResourcesForDocument(Document* document, Vector<Resource*>& re sult, bool skipXHRs) 469 static void cachedResourcesForDocument(Document* document, Vector<Resource*>& re sult, bool skipXHRs)
470 { 470 {
471 const ResourceFetcher::DocumentResourceMap& allResources = document->fetcher ()->allResources(); 471 const ResourceFetcher::DocumentResourceMap& allResources = document->fetcher ()->allResources();
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 { 873 {
874 visitor->trace(m_inspectedFrame); 874 visitor->trace(m_inspectedFrame);
875 visitor->trace(m_debuggerAgent); 875 visitor->trace(m_debuggerAgent);
876 visitor->trace(m_cssAgent); 876 visitor->trace(m_cssAgent);
877 visitor->trace(m_overlay); 877 visitor->trace(m_overlay);
878 visitor->trace(m_inspectorResourceContentLoader); 878 visitor->trace(m_inspectorResourceContentLoader);
879 InspectorBaseAgent::trace(visitor); 879 InspectorBaseAgent::trace(visitor);
880 } 880 }
881 881
882 } // namespace blink 882 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/RemoteFrameClient.h ('k') | Source/core/inspector/InspectorResourceContentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698