Changeset 143328 in webkit

Timestamp:

Feb 19, 2013 7:13:42 AM (11 years ago)

Author:

aandrey@chromium.org

Message:

Web Inspector: [Canvas] use timeline's didBeginFrame for marking frame end calls
​https://bugs.webkit.org/show_bug.cgi?id=110130

Reviewed by Pavel Feldman.

In Web Inspector canvas profiler use timeline's didBeginFrame for marking frame end calls instead of an ad-hoc timeout-based solution.

• inspector/InjectedScriptCanvasModule.cpp:

(WebCore::InjectedScriptCanvasModule::markFrameEnd):
(WebCore):

• inspector/InjectedScriptCanvasModule.h:

(InjectedScriptCanvasModule):

• inspector/InjectedScriptCanvasModuleSource.js:

(.):

• inspector/InspectorCanvasAgent.cpp:

(WebCore::InspectorCanvasAgent::hasUninstrumentedCanvases):
(WebCore::InspectorCanvasAgent::notifyRenderingContextWasWrapped):
(WebCore::InspectorCanvasAgent::findFramesWithUninstrumentedCanvases):
(WebCore::InspectorCanvasAgent::frameNavigated):
(WebCore::InspectorCanvasAgent::didBeginFrame):
(WebCore):

• inspector/InspectorCanvasAgent.h:

(InspectorCanvasAgent):

• inspector/InspectorController.cpp:

(WebCore::InspectorController::didBeginFrame):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InjectedScriptCanvasModule.cpp (modified) (1 diff)
• inspector/InjectedScriptCanvasModule.h (modified) (1 diff)
• inspector/InjectedScriptCanvasModuleSource.js (modified) (6 diffs)
• inspector/InspectorCanvasAgent.cpp (modified) (7 diffs)
• inspector/InspectorCanvasAgent.h (modified) (3 diffs)
• inspector/InspectorController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-19  Andrey Adaikin  <aandrey@chromium.org>
+
+        Web Inspector: [Canvas] use timeline's didBeginFrame for marking frame end calls
+        https://bugs.webkit.org/show_bug.cgi?id=110130
+
+        Reviewed by Pavel Feldman.
+
+        In Web Inspector canvas profiler use timeline's didBeginFrame for marking frame end calls instead of an ad-hoc timeout-based solution.
+
+        * inspector/InjectedScriptCanvasModule.cpp:
+        (WebCore::InjectedScriptCanvasModule::markFrameEnd):
+        (WebCore):
+        * inspector/InjectedScriptCanvasModule.h:
+        (InjectedScriptCanvasModule):
+        * inspector/InjectedScriptCanvasModuleSource.js:
+        (.):
+        * inspector/InspectorCanvasAgent.cpp:
+        (WebCore::InspectorCanvasAgent::hasUninstrumentedCanvases):
+        (WebCore::InspectorCanvasAgent::notifyRenderingContextWasWrapped):
+        (WebCore::InspectorCanvasAgent::findFramesWithUninstrumentedCanvases):
+        (WebCore::InspectorCanvasAgent::frameNavigated):
+        (WebCore::InspectorCanvasAgent::didBeginFrame):
+        (WebCore):
+        * inspector/InspectorCanvasAgent.h:
+        (InspectorCanvasAgent):
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::didBeginFrame):
+
 2013-02-19  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/inspector/InjectedScriptCanvasModule.cpp

@@ -92 +92 @@
 }
 
+void InjectedScriptCanvasModule::markFrameEnd()
+{
+    ScriptFunctionCall function(injectedScriptObject(), "markFrameEnd");
+    RefPtr<InspectorValue> resultValue;
+    makeCall(function, &resultValue);
+    ASSERT(resultValue);
+}
+
 void InjectedScriptCanvasModule::captureFrame(ErrorString* errorString, TraceLogId* traceLogId)
 {

trunk/Source/WebCore/inspector/InjectedScriptCanvasModule.h

@@ -55 +55 @@
     ScriptObject wrapWebGLContext(const ScriptObject&);
 #endif
+    void markFrameEnd();
 
     void captureFrame(ErrorString*, TypeBuilder::Canvas::TraceLogId*);

trunk/Source/WebCore/inspector/InjectedScriptCanvasModuleSource.js

@@ -2867 +2867 @@
 /**
  * @constructor
- * @param {function()} callback
- */
-function ZeroTimeoutCallback(callback)
-{
-    this._callback = callback;
-    this._scheduled = false;
-}
-
-ZeroTimeoutCallback.prototype = {
-    schedule: function()
-    {
-        if (this._scheduled)
-            return;
-        this._scheduled = true;
-        var callback = this._onCallback.bind(this);
-        // We need a fastest async callback, whatever fires first.
-        // Usually a postMessage should be faster than a setTimeout(0).
-        var channel = new MessageChannel();
-        channel.port1.onmessage = callback;
-        channel.port2.postMessage("");
-        inspectedWindow.setTimeout(callback, 0);
-    },
-
-    cancel: function()
-    {
-        this._scheduled = false;
-    },
-
-    _onCallback: function()
-    {
-        if (!this._scheduled)
-            return;
-        this._scheduled = false;
-        this._callback();
-    }
-}
-
-/**
- * @constructor
  */
 function ResourceTrackingManager()
@@ -2912 +2873 @@
     this._stopCapturingOnFrameEnd = false;
     this._lastTraceLog = null;
-    this._frameEndScheduler = new ZeroTimeoutCallback(this.markFrameEnd.bind(this));
 }
 
@@ -2957 +2917 @@
         this._capturing = false;
         this._stopCapturingOnFrameEnd = false;
-        this._frameEndScheduler.cancel();
         if (this._lastTraceLog)
             this._lastTraceLog.addFrameEndMark();
@@ -3003 +2962 @@
             return;
         this._lastTraceLog.addCall(call);
-        this._frameEndScheduler.schedule();
     },
 
@@ -3011 +2969 @@
             return;
         this._lastTraceLog.addFrameEndMark();
-        if (this._stopCapturingOnFrameEnd)
+        if (this._stopCapturingOnFrameEnd && this._lastTraceLog.size())
             this.stopCapturing(this._lastTraceLog);
     }
@@ -3068 +3026 @@
     {
         return this._callStartCapturingFunction(this._manager.startCapturing);
+    },
+
+    markFrameEnd: function()
+    {
+        this._manager.markFrameEnd();
     },
 

trunk/Source/WebCore/inspector/InspectorCanvasAgent.cpp

@@ -128 +128 @@
     if (!checkIsEnabled(errorString))
         return;
-    *result = !m_framesWithUninstrumentedCanvases.isEmpty();
+    for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) {
+        if (it->value) {
+            *result = true;
+            return;
+        }
+    }
+    *result = false;
 }
 
@@ -212 +218 @@
     DOMWindow* domWindow = scriptState ? domWindowFromScriptState(scriptState) : 0;
     Frame* frame = domWindow ? domWindow->frame() : 0;
+    if (frame && !m_framesWithUninstrumentedCanvases.contains(frame))
+        m_framesWithUninstrumentedCanvases.set(frame, false);
     String frameId = m_pageAgent->frameId(frame);
     if (!frameId.isEmpty())
@@ -258 +266 @@
     class NodeVisitor : public WrappedNodeVisitor {
     public:
-        NodeVisitor(Page* page, HashSet<Frame*>& result)
+        NodeVisitor(Page* page, FramesWithUninstrumentedCanvases& result)
             : m_page(page)
             , m_framesWithUninstrumentedCanvases(result)
@@ -275 +283 @@
             HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(node);
             if (canvas->renderingContext())
-                m_framesWithUninstrumentedCanvases.add(frame);
+                m_framesWithUninstrumentedCanvases.set(frame, true);
         }
 
     private:
         Page* m_page;
-        HashSet<Frame*>& m_framesWithUninstrumentedCanvases;
+        FramesWithUninstrumentedCanvases& m_framesWithUninstrumentedCanvases;
     } nodeVisitor(m_pageAgent->page(), m_framesWithUninstrumentedCanvases);
 
@@ -286 +294 @@
     ScriptProfiler::visitNodeWrappers(&nodeVisitor);
 
-    for (HashSet<Frame*>::iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) {
-        String frameId = m_pageAgent->frameId(*it);
+    for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) {
+        String frameId = m_pageAgent->frameId(it->key);
         if (!frameId.isEmpty())
             m_frontend->contextCreated(frameId);
@@ -306 +314 @@
         return;
     if (frame == m_pageAgent->mainFrame()) {
-        m_framesWithUninstrumentedCanvases.clear();
+        for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it)
+            m_framesWithUninstrumentedCanvases.set(it->key, false);
         m_frontend->traceLogsRemoved(0, 0);
     } else {
         while (frame) {
-            m_framesWithUninstrumentedCanvases.remove(frame);
+            if (m_framesWithUninstrumentedCanvases.contains(frame))
+                m_framesWithUninstrumentedCanvases.set(frame, false);
             if (m_pageAgent->hasIdForFrame(frame)) {
                 String frameId = m_pageAgent->frameId(frame);
@@ -326 +336 @@
 }
 
+void InspectorCanvasAgent::didBeginFrame()
+{
+    if (!m_enabled)
+        return;
+    ErrorString error;
+    for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) {
+        InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, mainWorldScriptState(it->key));
+        if (!module.hasNoValue())
+            module.markFrameEnd();
+    }
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/inspector/InspectorCanvasAgent.h

@@ -38 +38 @@
 #include "InspectorTypeBuilder.h"
 #include "ScriptState.h"
-#include <wtf/HashSet.h>
+#include <wtf/HashMap.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
@@ -67 +67 @@
     virtual void restore();
 
-    // Called from InspectorInstrumentation
     void frameNavigated(Frame*);
     void frameDetached(Frame*);
+    void didBeginFrame();
 
-    // Called from InspectorCanvasInstrumentation
+    // Called from InspectorCanvasInstrumentation.
     ScriptObject wrapCanvas2DRenderingContextForInstrumentation(const ScriptObject&);
 #if ENABLE(WEBGL)
@@ -105 +105 @@
     InspectorFrontend::Canvas* m_frontend;
     bool m_enabled;
-    HashSet<Frame*> m_framesWithUninstrumentedCanvases;
+    // Contains all frames with canvases, value is true only for frames that have an uninstrumented canvas.
+    typedef HashMap<Frame*, bool> FramesWithUninstrumentedCanvases;
+    FramesWithUninstrumentedCanvases m_framesWithUninstrumentedCanvases;
 };
 

trunk/Source/WebCore/inspector/InspectorController.cpp

@@ -451 +451 @@
     if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
         timelineAgent->didBeginFrame();
+    if (InspectorCanvasAgent* canvasAgent = m_instrumentingAgents->inspectorCanvasAgent())
+        canvasAgent->didBeginFrame();
 }