Make Inspector aware of RemoteFrames in FrameTree

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 292 matching lines @@
     if (m_enabled)
         return true;
     *errorString = "Canvas agent is not enabled";
     return false;
 }
 
 void InspectorCanvasAgent::didCommitLoad(LocalFrame*, DocumentLoader* loader)
 {
     if (!m_enabled)
         return;
-    LocalFrame* frame = loader->frame();
+    Frame* frame = loader->frame();
     if (frame == m_pageAgent->mainFrame()) {
         for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it)
             it->value = false;
         m_frontend->traceLogsRemoved(0, 0);
     } else {
         while (frame) {
-            if (m_framesWithUninstrumentedCanvases.contains(frame))
-                m_framesWithUninstrumentedCanvases.set(frame, false);
-            if (m_pageAgent->hasIdForFrame(frame)) {
-                String frameId = m_pageAgent->frameId(frame);
-                m_frontend->traceLogsRemoved(&frameId, 0);
+            if (frame->isLocalFrame()) {
+                if (m_framesWithUninstrumentedCanvases.contains(toLocalFrame(frame)))

[yurys, 2014/06/02 07:56:27]

Please extract toLocalFrame(frame) into a variable.

[kenrb, 2014/06/02 15:20:48]

Done.

+                    m_framesWithUninstrumentedCanvases.set(toLocalFrame(frame), false);
+                if (m_pageAgent->hasIdForFrame(toLocalFrame(frame))) {
+                    String frameId = m_pageAgent->frameId(toLocalFrame(frame));
+                    m_frontend->traceLogsRemoved(&frameId, 0);
+                }
             }
             frame = frame->tree().traverseNext();
         }
     }
 }
 
 void InspectorCanvasAgent::frameDetachedFromParent(LocalFrame* frame)
 {
     if (m_enabled)
         m_framesWithUninstrumentedCanvases.remove(frame);
 }
 
 void InspectorCanvasAgent::didBeginFrame()
 {
     if (!m_enabled)
         return;
     ErrorString error;
     for (FramesWithUninstrumentedCanvases::const_iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) {
         InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, ScriptState::forMainWorld(it->key));
         if (!module.isEmpty())
             module.markFrameEnd();
     }
 }
 
 } // namespace WebCore