Merge DevTools Refactor CL to Blink36

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 1188 matching lines @@
     highlightConfig->contentOutline = parseColor(outlineColor);
     m_overlay->highlightQuad(quad, *highlightConfig);
 }
 
 void InspectorDOMAgent::highlightNode(ErrorString* errorString, const RefPtr<JSONObject>& highlightInspectorObject, const int* nodeId, const String* objectId)
 {
     Node* node = 0;
     if (nodeId) {
         node = assertNode(errorString, *nodeId);
     } else if (objectId) {
-        InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(*objectId);
+        InjectedScript& injectedScript = m_injectedScriptManager->injectedScriptForObjectId(*objectId);
         node = injectedScript.nodeForObjectId(*objectId);
         if (!node)
             *errorString = "Node for given objectId not found";
     } else
         *errorString = "Either nodeId or objectId must be specified";
 
     if (!node)
         return;
 
     OwnPtr<HighlightConfig> highlightConfig = highlightConfigFromInspectorObject(errorString, highlightInspectorObject.get());
@@ skipping 185 matching lines @@
 {
     Element* element = assertElement(errorString, nodeId);
     if (!element)
         return;
 
     result = buildArrayForElementAttributes(element);
 }
 
 void InspectorDOMAgent::requestNode(ErrorString*, const String& objectId, int* nodeId)
 {
-    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
+    InjectedScript& injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
     Node* node = injectedScript.nodeForObjectId(objectId);
     if (node)
         *nodeId = pushNodePathToFrontend(node);
     else
         *nodeId = 0;
 }
 
 // static
 String InspectorDOMAgent::documentURLString(Document* document)
 {
@@ skipping 197 matching lines @@
         .setNodeId(pushNodePathToFrontend(node))
         .setHandlerBody(eventListenerHandlerBody(&document, eventListener.get()))
         .setLocation(location);
     if (objectGroupId) {
         ScriptValue functionValue = eventListenerHandler(&document, eventListener.get());
         if (!functionValue.isEmpty()) {
             LocalFrame* frame = document.frame();
             if (frame) {
                 ScriptState* scriptState = eventListenerHandlerScriptState(frame, eventListener.get());
                 if (scriptState) {
-                    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
+                    InjectedScript& injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
                     if (!injectedScript.isEmpty()) {
                         RefPtr<TypeBuilder::Runtime::RemoteObject> valueJson = injectedScript.wrapObject(functionValue, *objectGroupId);
                         value->setHandler(valueJson);
                     }
                 }
             }
         }
     }
     if (!sourceName.isEmpty())
         value->setSourceName(sourceName);
@@ skipping 401 matching lines @@
     *relayoutBoundaryNodeId = pushNodePathToFrontend(resultNode);
 }
 
 PassRefPtr<TypeBuilder::Runtime::RemoteObject> InspectorDOMAgent::resolveNode(Node* node, const String& objectGroup)
 {
     Document* document = node->isDocumentNode() ? &node->document() : node->ownerDocument();
     LocalFrame* frame = document ? document->frame() : 0;
     if (!frame)
         return nullptr;
 
-    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(V8ScriptState::forMainWorld(frame));
-    if (injectedScript.isEmpty())
+    V8InjectedScript* injectedScript = static_cast<V8InjectedScript*>(&m_injectedScriptManager->injectedScriptFor(V8ScriptState::forMainWorld(frame)));
+    if (injectedScript->isEmpty())
         return nullptr;
 
-    return injectedScript.wrapNode(node, objectGroup);
+    return injectedScript->wrapNode(node, objectGroup);
 }
 
 bool InspectorDOMAgent::pushDocumentUponHandlelessOperation(ErrorString* errorString)
 {
     if (!m_documentNodeToIdMap.contains(m_document)) {
         RefPtr<TypeBuilder::DOM::Node> root;
         getDocument(errorString, root);
         return errorString->isEmpty();
     }
     return true;
 }
 
 } // namespace WebCore