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

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

Issue 2112593003: [DevTools] Remove [V8] from InspectorInstrumentation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup, moving csp event to dom debugger Created 4 years, 5 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) 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 1423 matching lines...) Expand 10 before | Expand all | Expand 10 after
1434 // beforeunload fired above, and detaching a DocumentLoader can fire 1434 // beforeunload fired above, and detaching a DocumentLoader can fire
1435 // events, which can detach this frame. 1435 // events, which can detach this frame.
1436 if (!m_frame->host()) 1436 if (!m_frame->host())
1437 return; 1437 return;
1438 1438
1439 m_provisionalDocumentLoader = client()->createDocumentLoader(m_frame, reques t, frameLoadRequest.substituteData().isValid() ? frameLoadRequest.substituteData () : defaultSubstituteDataForURL(request.url())); 1439 m_provisionalDocumentLoader = client()->createDocumentLoader(m_frame, reques t, frameLoadRequest.substituteData().isValid() ? frameLoadRequest.substituteData () : defaultSubstituteDataForURL(request.url()));
1440 m_provisionalDocumentLoader->setNavigationType(navigationType); 1440 m_provisionalDocumentLoader->setNavigationType(navigationType);
1441 m_provisionalDocumentLoader->setReplacesCurrentHistoryItem(type == FrameLoad TypeReplaceCurrentItem); 1441 m_provisionalDocumentLoader->setReplacesCurrentHistoryItem(type == FrameLoad TypeReplaceCurrentItem);
1442 m_provisionalDocumentLoader->setIsClientRedirect(frameLoadRequest.clientRedi rect() == ClientRedirectPolicy::ClientRedirect); 1442 m_provisionalDocumentLoader->setIsClientRedirect(frameLoadRequest.clientRedi rect() == ClientRedirectPolicy::ClientRedirect);
1443 1443
1444 InspectorInstrumentation::didStartProvisionalLoad(m_frame);
1445
1446 m_frame->navigationScheduler().cancel(); 1444 m_frame->navigationScheduler().cancel();
1447 m_checkTimer.stop(); 1445 m_checkTimer.stop();
1448 1446
1449 m_loadType = type; 1447 m_loadType = type;
1450 1448
1451 if (frameLoadRequest.form()) 1449 if (frameLoadRequest.form())
1452 client()->dispatchWillSubmitForm(frameLoadRequest.form()); 1450 client()->dispatchWillSubmitForm(frameLoadRequest.form());
1453 1451
1454 m_progressTracker->progressStarted(); 1452 m_progressTracker->progressStarted();
1455 if (m_provisionalDocumentLoader->isClientRedirect()) 1453 if (m_provisionalDocumentLoader->isClientRedirect())
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String()); 1616 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String());
1619 return tracedValue; 1617 return tracedValue;
1620 } 1618 }
1621 1619
1622 inline void FrameLoader::takeObjectSnapshot() const 1620 inline void FrameLoader::takeObjectSnapshot() const
1623 { 1621 {
1624 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value()); 1622 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value());
1625 } 1623 }
1626 1624
1627 } // namespace blink 1625 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698