Changeset 35842 in webkit

Timestamp:

Aug 19, 2008 11:33:27 AM (16 years ago)

Author:

timothy@apple.com

Message:

Added support for console.count in the inspector.

Reviewed by Geoff Garen.

• page/Console.cpp: (WebCore::Console::count):
• page/Console.h:
• page/Console.idl: Added console.count.
• page/InspectorController.cpp: (WebCore::InspectorController::didCommitLoad): Clears m_counts. (WebCore::InspectorController::count): Updates the count number sing "title@source:line" as the identifier, and adds a message to the console.
• page/InspectorController.h: Added m_counts.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Console.cpp (modified) (1 diff)
• page/Console.h (modified) (1 diff)
• page/Console.idl (modified) (1 diff)
• page/InspectorController.cpp (modified) (2 diffs)
• page/InspectorController.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-08-19  Keishi Hattori  <casey.hattori@gmail.com>
+
+        Added support for console.count in the inspector.
+
+        Reviewed by Geoff Garen.
+
+        * page/Console.cpp:
+        (WebCore::Console::count):
+        * page/Console.h:
+        * page/Console.idl: Added console.count.
+        * page/InspectorController.cpp:
+        (WebCore::InspectorController::didCommitLoad): Clears m_counts.
+        (WebCore::InspectorController::count): Updates the count number
+        sing "title@source:line" as the identifier, and adds a
+        message to the console.
+        * page/InspectorController.h: Added m_counts.
+
 2008-08-19  Keishi Hattori  <casey.hattori@gmail.com>
 

trunk/WebCore/page/Console.cpp

@@ -262 +262 @@
 }
 
+void Console::count(const UString& title)
+{
+    if (!m_frame)
+        return;
+
+    Page* page = m_frame->page();
+    if (!page)
+        return;
+
+    // FIXME: pass the file and line number to the InspectorController
+    // when we have this information.
+    page->inspectorController()->count(title, 0, String());
+}
+
 void Console::profile(ExecState* exec, const ArgList& args)
 {

trunk/WebCore/page/Console.h

@@ -81 +81 @@
         void dir(KJS::ExecState*, const KJS::ArgList& arguments);
         void assertCondition(bool condition, KJS::ExecState*, const KJS::ArgList& arguments);
+        void count(const KJS::UString& title);
         void profile(KJS::ExecState*, const KJS::ArgList& arguments);
         void profileEnd(KJS::ExecState*, const KJS::ArgList& arguments);

trunk/WebCore/page/Console.idl

@@ -37 +37 @@
         [Custom] void dir();
         [Custom, ImplementationFunction=assertCondition] void assert(in boolean condition);
+        void count(in [ConvertUndefinedOrNullToNullString] DOMString title);
 
         [Custom] void profile(in DOMString title);

trunk/WebCore/page/InspectorController.cpp

@@ -2087 +2087 @@
 
         m_times.clear();
+        m_counts.clear();
         m_profiles.clear();
 
@@ -2564 +2565 @@
 }
 
+void InspectorController::count(const UString& title, unsigned lineNumber, const String& sourceID)
+{
+    String identifier = String(title) + String::format("@%s:%d", sourceID.utf8().data(), lineNumber);
+    HashMap<String, unsigned>::iterator it = m_counts.find(identifier);
+    int count;
+    if (it == m_counts.end())
+        count = 1;
+    else {
+        count = it->second + 1;
+        m_counts.remove(it);
+    }
+
+    m_counts.add(identifier, count);
+
+    String message = String::format("%s: %d", title.UTF8String().c_str(), count);
+    addMessageToConsole(JSMessageSource, LogMessageLevel, message, lineNumber, sourceID);
+}
+
 void InspectorController::startTiming(const UString& title)
 {

trunk/WebCore/page/InspectorController.h

@@ -178 +178 @@
     void drawNodeHighlight(GraphicsContext&) const;
     
+    void count(const KJS::UString& title, unsigned lineNumber, const String& sourceID);
+
     void startTiming(const KJS::UString& title);
     bool stopTiming(const KJS::UString& title, double& elapsed);
@@ -234 +236 @@
     Vector<RefPtr<KJS::Profile> > m_profiles;
     HashMap<String, double> m_times;
+    HashMap<String, unsigned> m_counts;
 #if ENABLE(DATABASE)
     DatabaseResourcesSet m_databaseResources;