Changeset 88940 in webkit

Timestamp:

Jun 15, 2011 8:44:00 AM (13 years ago)

Author:

caseq@chromium.org

Message:

2011-06-15 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: provide unique identifiers for frames
​https://bugs.webkit.org/show_bug.cgi?id=62721

• inspector/InspectorInstrumentation.cpp: (WebCore::InspectorInstrumentation::frameDestroyedImpl):
• inspector/InspectorInstrumentation.h: (WebCore::InspectorInstrumentation::frameDestroyed):
• inspector/InspectorPageAgent.cpp: (WebCore::InspectorPageAgent::frameForId): (WebCore::InspectorPageAgent::frameId): (WebCore::InspectorPageAgent::frameDestroyed):
• inspector/InspectorPageAgent.h:
• page/Frame.cpp: (WebCore::Frame::~Frame):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• inspector/InspectorInstrumentation.h (modified) (3 diffs)
• inspector/InspectorPageAgent.cpp (modified) (3 diffs)
• inspector/InspectorPageAgent.h (modified) (3 diffs)
• page/Frame.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-15  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: provide unique identifiers for frames
+        https://bugs.webkit.org/show_bug.cgi?id=62721
+
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::frameDestroyedImpl):
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::frameDestroyed):
+        * inspector/InspectorPageAgent.cpp:
+        (WebCore::InspectorPageAgent::frameForId):
+        (WebCore::InspectorPageAgent::frameId):
+        (WebCore::InspectorPageAgent::frameDestroyed):
+        * inspector/InspectorPageAgent.h:
+        * page/Frame.cpp:
+        (WebCore::Frame::~Frame):
+
 2011-06-15  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -631 +631 @@
 }
 
+void InspectorInstrumentation::frameDestroyedImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
+{
+    if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorPageAgent())
+        inspectorPageAgent->frameDestroyed(frame);
+}
+
 InspectorInstrumentationCookie InspectorInstrumentation::willWriteHTMLImpl(InstrumentingAgents* instrumentingAgents, unsigned int length, unsigned int startLine)
 {

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -137 +137 @@
     static void frameDetachedFromParent(Frame*);
     static void didCommitLoad(Frame*, DocumentLoader*);
+    static void frameDestroyed(Frame*);
 
     static InspectorInstrumentationCookie willWriteHTML(Document*, unsigned int length, unsigned int startLine);
@@ -264 +265 @@
     static void frameDetachedFromParentImpl(InstrumentingAgents*, Frame*);
     static void didCommitLoadImpl(InstrumentingAgents*, Page*, DocumentLoader*);
+    static void frameDestroyedImpl(InstrumentingAgents*, Frame*);
 
     static InspectorInstrumentationCookie willWriteHTMLImpl(InstrumentingAgents*, unsigned int length, unsigned int startLine);
@@ -854 +856 @@
 }
 
+inline void InspectorInstrumentation::frameDestroyed(Frame* frame)
+{
+#if ENABLE(INSPECTOR)
+    Page* page = frame->page();
+    if (!page)
+        return;
+    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
+        frameDestroyedImpl(instrumentingAgents, frame);
+#endif
+}
+
 inline InspectorInstrumentationCookie InspectorInstrumentation::willWriteHTML(Document* document, unsigned int length, unsigned int startLine)
 {

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -70 +70 @@
 // This should be kept the same as the one in front-end/utilities.js
 static const char regexSpecialCharacters[] = "[](){}+-*.,?\\^$|";
+static unsigned int s_lastFrameIdentifier = 0;
 }
 
@@ -563 +564 @@
 Frame* InspectorPageAgent::frameForId(const String& frameId)
 {
-    Frame* mainFrame = m_page->mainFrame();
-    for (Frame* frame = mainFrame; frame; frame = frame->tree()->traverseNext(mainFrame)) {
-        if (pointerAsId(frame) == frameId)
-            return frame;
-    }
-    return 0;
+    bool ok = false;
+    unsigned int identifier = frameId.toUIntStrict(&ok);
+    if (!ok || !identifier)
+        return 0;
+    return m_identifierToFrame.get(identifier);
 }
 
 String InspectorPageAgent::frameId(Frame* frame)
 {
-    return pointerAsId(frame);
+    if (!frame)
+        return "";
+    unsigned int identifier = m_frameToIdentifier.get(frame);
+    if (!identifier) {
+        identifier = ++s_lastFrameIdentifier;
+        m_frameToIdentifier.set(frame, identifier);
+        m_identifierToFrame.set(identifier, frame);
+    }
+    return String::number(identifier);
 }
 
@@ -579 +587 @@
 {
     return pointerAsId(loader);
+}
+
+void InspectorPageAgent::frameDestroyed(Frame* frame)
+{
+    HashMap<Frame*, unsigned int>::iterator iterator = m_frameToIdentifier.find(frame);
+    if (iterator != m_frameToIdentifier.end()) {
+        m_identifierToFrame.remove(iterator->second);
+        m_frameToIdentifier.remove(iterator);
+    }
 }
 

trunk/Source/WebCore/inspector/InspectorPageAgent.h

@@ -34 +34 @@
 #if ENABLE(INSPECTOR)
 
+#include "Frame.h"
 #include "InspectorFrontend.h"
 #include "PlatformString.h"
+#include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
@@ -99 +101 @@
     void frameNavigated(DocumentLoader*);
     void frameDetached(Frame*);
+    void frameDestroyed(Frame*);
 
     // Inspector Controller API
@@ -121 +124 @@
     InspectorFrontend::Page* m_frontend;
     Vector<String> m_scriptsToEvaluateOnLoad;
+    HashMap<Frame*, unsigned int> m_frameToIdentifier;
+    HashMap<unsigned int, Frame*> m_identifierToFrame;
 };
 

trunk/Source/WebCore/page/Frame.cpp

@@ -58 +58 @@
 #include "HTMLTableCellElement.h"
 #include "HitTestResult.h"
+#include "InspectorInstrumentation.h"
 #include "Logging.h"
 #include "MediaFeatureNames.h"
@@ -238 +239 @@
     for (HashSet<FrameDestructionObserver*>::iterator it = m_destructionObservers.begin(); it != stop; ++it)
         (*it)->frameDestroyed();
+
+    InspectorInstrumentation::frameDestroyed(this);
 
     if (m_view) {