Merge DevTools Refactor CL to Blink36

Source/core/inspector/InspectorCanvasAgent.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 231 matching lines @@
         *errorString = "Internal error: original ScriptObject has no value";
         return InjectedScriptCanvasModule();
     }
     return injectedScriptCanvasModule(errorString, scriptObject.scriptState());
 }
 
 InjectedScriptCanvasModule InspectorCanvasAgent::injectedScriptCanvasModule(ErrorString* errorString, const String& objectId)
 {
     if (!checkIsEnabled(errorString))
         return InjectedScriptCanvasModule();
-    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
+    InjectedScript& injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
     if (injectedScript.isEmpty()) {
         *errorString = "Inspected frame has gone";
         return InjectedScriptCanvasModule();
     }
     return injectedScriptCanvasModule(errorString, injectedScript.scriptState());
 }
 
 void InspectorCanvasAgent::findFramesWithUninstrumentedCanvases()
 {
     class NodeVisitor FINAL : public WrappedNodeVisitor {
@@ skipping 78 matching lines @@
     ErrorString error;
     for (FramesWithUninstrumentedCanvases::const_iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) {
         InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, V8ScriptState::forMainWorld(it->key));
         if (!module.isEmpty())
             module.markFrameEnd();
     }
 }
 
 } // namespace WebCore