Detached FrameLoader should not log snapshot trace events

third_party/WebKit/Source/core/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 183 matching lines @@
 
 FrameLoader::FrameLoader(LocalFrame* frame)
     : m_frame(frame),
       m_progressTracker(ProgressTracker::create(frame)),
       m_inStopAllLoaders(false),
       m_checkTimer(TaskRunnerHelper::get(TaskType::Networking, frame),
                    this,
                    &FrameLoader::checkTimerFired),
       m_forcedSandboxFlags(SandboxNone),
       m_dispatchingDidClearWindowObjectInMainWorld(false),
-      m_protectProvisionalLoader(false) {
+      m_protectProvisionalLoader(false),
+      m_detached(false) {
   DCHECK(m_frame);
   TRACE_EVENT_OBJECT_CREATED_WITH_ID("loading", "FrameLoader", this);
   takeObjectSnapshot();
 }
 
 FrameLoader::~FrameLoader() {
-  // Verify that this FrameLoader has been detached.
-  DCHECK(!m_progressTracker);
+  DCHECK(m_detached);
 }
 
 DEFINE_TRACE(FrameLoader) {
   visitor->trace(m_frame);
   visitor->trace(m_progressTracker);
   visitor->trace(m_documentLoader);
   visitor->trace(m_provisionalDocumentLoader);
   visitor->trace(m_currentItem);
   visitor->trace(m_provisionalItem);
   visitor->trace(m_deferredHistoryLoad);
@@ skipping 1150 matching lines @@
 
   Frame* parent = m_frame->tree().parent();
   if (parent && parent->isLocalFrame())
     toLocalFrame(parent)->loader().scheduleCheckCompleted();
   if (m_progressTracker) {
     m_progressTracker->dispose();
     m_progressTracker.clear();
   }
 
   TRACE_EVENT_OBJECT_DELETED_WITH_ID("loading", "FrameLoader", this);
+  m_detached = true;
 }
 
 void FrameLoader::loadFailed(DocumentLoader* loader,
                              const ResourceError& error) {
   if (!error.isCancellation() && m_frame->owner()) {
     // FIXME: For now, fallback content doesn't work cross process.
     if (m_frame->owner()->isLocal())
       m_frame->deprecatedLocalOwner()->renderFallbackContent();
   }
 
@@ skipping 484 matching lines @@
   tracedValue->setString("provisionalDocumentLoaderURL",
                          m_provisionalDocumentLoader
                              ? m_provisionalDocumentLoader->url()
                              : String());
   tracedValue->setString("documentLoaderURL",
                          m_documentLoader ? m_documentLoader->url() : String());
   return tracedValue;
 }
 
 inline void FrameLoader::takeObjectSnapshot() const {
+  if (m_detached) {
+    // We already logged TRACE_EVENT_OBJECT_DELETED_WITH_ID in detach().
+    return;
+  }
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
                                       toTracedValue());
 }
 
 DocumentLoader* FrameLoader::createDocumentLoader(
     const ResourceRequest& request,
     const FrameLoadRequest& frameLoadRequest,
     FrameLoadType loadType,
     NavigationType navigationType) {
   DocumentLoader* loader = client()->createDocumentLoader(
       m_frame, request, frameLoadRequest.substituteData().isValid()
                             ? frameLoadRequest.substituteData()
                             : defaultSubstituteDataForURL(request.url()),
       frameLoadRequest.clientRedirect());
 
   loader->setLoadType(loadType);
   loader->setNavigationType(navigationType);
   loader->setReplacesCurrentHistoryItem(loadType ==
                                         FrameLoadTypeReplaceCurrentItem);
   return loader;
 }
 
 }  // namespace blink