Changeset 52415 in webkit

Timestamp:

Dec 20, 2009 4:41:02 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2009-12-20 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Darin Adler.

Web Inspector: Constrain the number of messages the inspector shows.

​https://bugs.webkit.org/show_bug.cgi?id=20919

• English.lproj/localizedStrings.js:
• inspector/InspectorController.cpp: (WebCore::InspectorController::InspectorController): (WebCore::InspectorController::addConsoleMessage): (WebCore::InspectorController::clearConsoleMessages): (WebCore::InspectorController::populateScriptObjects):
• inspector/InspectorController.h:
• inspector/InspectorFrontend.cpp: (WebCore::InspectorFrontend::updateConsoleMessageExpiredCount):
• inspector/InspectorFrontend.h:
• inspector/front-end/inspector.js: (WebInspector.updateConsoleMessageExpiredCount):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• inspector/InspectorController.cpp (modified) (6 diffs)
• inspector/InspectorController.h (modified) (1 diff)
• inspector/InspectorFrontend.cpp (modified) (2 diffs)
• inspector/InspectorFrontend.h (modified) (1 diff)
• inspector/front-end/inspector.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-20  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Web Inspector: Constrain the number of messages the inspector shows.
+
+        https://bugs.webkit.org/show_bug.cgi?id=20919
+
+        * English.lproj/localizedStrings.js:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        (WebCore::InspectorController::addConsoleMessage):
+        (WebCore::InspectorController::clearConsoleMessages):
+        (WebCore::InspectorController::populateScriptObjects):
+        * inspector/InspectorController.h:
+        * inspector/InspectorFrontend.cpp:
+        (WebCore::InspectorFrontend::updateConsoleMessageExpiredCount):
+        * inspector/InspectorFrontend.h:
+        * inspector/front-end/inspector.js:
+        (WebInspector.updateConsoleMessageExpiredCount):
+
 2009-12-20  Andrei Popescu  <andreip@google.com>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -122 +122 @@
 static const float minimumAttachedHeight = 250.0f;
 static const float maximumAttachedHeightRatio = 0.75f;
+static const unsigned maximumConsoleMessages = 1000;
+static const unsigned expireConsoleMessagesStep = 100;
 
 static unsigned s_inspectorControllerCount;
@@ -129 +131 @@
     , m_client(client)
     , m_page(0)
+    , m_expiredConsoleMessageCount(0)
     , m_scriptState(0)
     , m_windowVisible(false)
@@ -356 +359 @@
             m_previousMessage->addToConsole(m_frontend.get());
     }
+
+    if (!windowVisible() && m_consoleMessages.size() >= maximumConsoleMessages) {
+        m_expiredConsoleMessageCount += expireConsoleMessagesStep;
+        for (size_t i = 0; i < expireConsoleMessagesStep; ++i)
+            delete m_consoleMessages[i];
+        m_consoleMessages.remove(0, expireConsoleMessagesStep);
+    }
 }
 
@@ -362 +372 @@
     deleteAllValues(m_consoleMessages);
     m_consoleMessages.clear();
+    m_expiredConsoleMessageCount = 0;
     m_previousMessage = 0;
     m_groupLevel = 0;
@@ -653 +664 @@
         it->second->updateScriptObject(m_frontend.get());
 
+    if (m_expiredConsoleMessageCount)
+        m_frontend->updateConsoleMessageExpiredCount(m_expiredConsoleMessageCount);
     unsigned messageCount = m_consoleMessages.size();
     for (unsigned i = 0; i < messageCount; ++i)
@@ -1042 +1055 @@
     // thing by the Inspector. They should be made into distinct types.
     resource->setXMLHttpResponseText(ScriptString(sourceString));
-    
+
     if (windowVisible())
         resource->updateScriptObject(m_frontend.get());

trunk/WebCore/inspector/InspectorController.h

@@ -324 +324 @@
     FrameResourcesMap m_frameResources;
     Vector<ConsoleMessage*> m_consoleMessages;
+    unsigned m_expiredConsoleMessageCount;
     HashMap<String, double> m_times;
     HashMap<String, unsigned> m_counts;

trunk/WebCore/inspector/InspectorFrontend.cpp

@@ -78 +78 @@
 }
 
+void InspectorFrontend::updateConsoleMessageExpiredCount(unsigned count)
+{
+    ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch"); 
+    function.appendArgument("updateConsoleMessageExpiredCount");
+    function.appendArgument(count);
+    function.call();
+}
+
 void InspectorFrontend::addConsoleMessage(const ScriptObject& messageObj, const Vector<ScriptString>& frames, const Vector<ScriptValue> wrappedArguments, const String& message)
 {
@@ -94 +102 @@
 }
 
-void InspectorFrontend::updateConsoleMessageRepeatCount(const int count)
+void InspectorFrontend::updateConsoleMessageRepeatCount(unsigned count)
 {
     ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch"); 

trunk/WebCore/inspector/InspectorFrontend.h

@@ -64 +64 @@
 
         void didCommitLoad();
+
+        void updateConsoleMessageExpiredCount(unsigned count);
         void addConsoleMessage(const ScriptObject& messageObj, const Vector<ScriptString>& frames, const Vector<ScriptValue> wrappedArguments, const String& message);
-        void updateConsoleMessageRepeatCount(const int count);
+        void updateConsoleMessageRepeatCount(unsigned count);
         void clearConsoleMessages();
 

trunk/WebCore/inspector/front-end/inspector.js

@@ -1236 +1236 @@
     // Cleanup elements panel early on inspected page refresh.
     WebInspector.setDocument(null);
+}
+
+WebInspector.updateConsoleMessageExpiredCount = function(count)
+{
+    var message = String.sprintf(WebInspector.UIString("%d console messages are not shown."), count);
+    WebInspector.console.addMessage(new WebInspector.ConsoleTextMessage(message, WebInspector.ConsoleMessage.MessageLevel.Warning));
 }