DevTools: disable DOMAgent when profiler is active

Source/core/inspector/InspectorDOMAgent.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 258 matching lines @@
     hideHighlight(&error);
 
     m_frontend = 0;
     m_instrumentingAgents->setInspectorDOMAgent(0);
     disable(0);
     reset();
 }
 
 void InspectorDOMAgent::restore()
 {
+    if (!enabled())

[pfeldman, 2014/06/27 11:35:23]

restore should always be

if (m_state->getBoolean(DOMAgentState::domAgentEnabled))
    innerEnable();

+        return;
     // Reset document to avoid early return from setDocument.
     m_document = nullptr;
     setDocument(m_pageAgent->mainFrame()->document());
 }
 
 Vector<Document*> InspectorDOMAgent::documents()
 {
     Vector<Document*> result;
     for (Frame* frame = m_document->frame(); frame; frame = frame->tree().traverseNext()) {
         if (!frame->isLocalFrame())
@@ skipping 190 matching lines @@
     }
 
     if (element->isPseudoElement()) {
         *errorString = "Cannot edit pseudo elements";
         return 0;
     }
 
     return element;
 }
 
-void InspectorDOMAgent::enable(ErrorString*)
+void InspectorDOMAgent::innerEnable()
 {
     if (enabled())

[pfeldman, 2014/06/27 11:35:23]

innerEnable should not check for enabled, enable should.

         return;
     m_state->setBoolean(DOMAgentState::domAgentEnabled, true);
     if (m_listener)
         m_listener->domAgentWasEnabled();
 }
 
+void InspectorDOMAgent::enable(ErrorString*)
+{
+    innerEnable();
+    m_document = nullptr;
+    setDocument(m_pageAgent->mainFrame()->document());

[pfeldman, 2014/06/27 11:35:23]

This should be a part of innerEnable.

+}
+
 bool InspectorDOMAgent::enabled() const
 {
     return m_state->getBoolean(DOMAgentState::domAgentEnabled);
 }
 
 void InspectorDOMAgent::disable(ErrorString*)
 {
     if (!enabled())
         return;
     m_state->setBoolean(DOMAgentState::domAgentEnabled, false);
     reset();
     if (m_listener)
         m_listener->domAgentWasDisabled();
 }
 
 void InspectorDOMAgent::getDocument(ErrorString* errorString, RefPtr<TypeBuilder::DOM::Node>& root)
 {
     // Backward compatibility. Mark agent as enabled when it requests document.
-    enable(errorString);
+    innerEnable();
 
     if (!m_document) {
         *errorString = "Document is not available";
         return;
     }
 
     discardFrontendBindings();
 
     root = buildObjectForNode(m_document.get(), 2, m_documentNodeToIdMap.get());
 }
@@ skipping 1574 matching lines @@
     if (!m_documentNodeToIdMap->contains(m_document.get())) {
         RefPtr<TypeBuilder::DOM::Node> root;
         getDocument(errorString, root);
         return errorString->isEmpty();
     }
     return true;
 }
 
 } // namespace WebCore