[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[yurys at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 41db20cfdb85f0a2f65677366510b8441bde7edf
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 10:06:07 2010 +0000

    2010-07-14  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: use OwnPtr to manage ConsoleMessages in InspectorController
            https://bugs.webkit.org/show_bug.cgi?id=42243
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::~InspectorController):
            (WebCore::InspectorController::addConsoleMessage):
            (WebCore::InspectorController::clearConsoleMessages):
            * inspector/InspectorController.h:
            (WebCore::InspectorController::consoleMessages):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63303 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 888c402..caead01 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-14  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: use OwnPtr to manage ConsoleMessages in InspectorController
+        https://bugs.webkit.org/show_bug.cgi?id=42243
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::~InspectorController):
+        (WebCore::InspectorController::addConsoleMessage):
+        (WebCore::InspectorController::clearConsoleMessages):
+        * inspector/InspectorController.h:
+        (WebCore::InspectorController::consoleMessages):
+
 2010-07-14  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 4fef302..0e48902 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -216,7 +216,6 @@ InspectorController::~InspectorController()
     ASSERT(!m_highlightedNode);
 
     deleteAllValues(m_frameResources);
-    deleteAllValues(m_consoleMessages);
 
     ASSERT(s_inspectorControllerCount);
     --s_inspectorControllerCount;
@@ -341,18 +340,17 @@ void InspectorController::addMessageToConsole(MessageSource source, MessageType
     addConsoleMessage(0, new ConsoleMessage(source, type, level, message, lineNumber, sourceID, m_groupLevel));
 }
 
-void InspectorController::addConsoleMessage(ScriptState* scriptState, ConsoleMessage* consoleMessage)
+void InspectorController::addConsoleMessage(ScriptState* scriptState, PassOwnPtr<ConsoleMessage> consoleMessage)
 {
     ASSERT(enabled());
     ASSERT_ARG(consoleMessage, consoleMessage);
 
-    if (m_previousMessage && m_previousMessage->isEqual(scriptState, consoleMessage)) {
+    if (m_previousMessage && m_previousMessage->isEqual(scriptState, consoleMessage.get())) {
         m_previousMessage->incrementCount();
-        delete consoleMessage;
         if (m_frontend)
             m_previousMessage->updateRepeatCountInConsole(m_frontend.get());
     } else {
-        m_previousMessage = consoleMessage;
+        m_previousMessage = consoleMessage.get();
         m_consoleMessages.append(consoleMessage);
         if (m_frontend)
             m_previousMessage->addToFrontend(m_frontend.get(), m_injectedScriptHost.get());
@@ -360,15 +358,12 @@ void InspectorController::addConsoleMessage(ScriptState* scriptState, ConsoleMes
 
     if (!m_frontend && m_consoleMessages.size() >= maximumConsoleMessages) {
         m_expiredConsoleMessageCount += expireConsoleMessagesStep;
-        for (size_t i = 0; i < expireConsoleMessagesStep; ++i)
-            delete m_consoleMessages[i];
         m_consoleMessages.remove(0, expireConsoleMessagesStep);
     }
 }
 
 void InspectorController::clearConsoleMessages()
 {
-    deleteAllValues(m_consoleMessages);
     m_consoleMessages.clear();
     m_expiredConsoleMessageCount = 0;
     m_previousMessage = 0;
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index ee0c9d6..c87baeb 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -149,7 +149,7 @@ public:
     void addMessageToConsole(MessageSource, MessageType, MessageLevel, ScriptCallStack*);
     void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID);
     void clearConsoleMessages();
-    const Vector<ConsoleMessage*>& consoleMessages() const { return m_consoleMessages; }
+    const Vector<OwnPtr<ConsoleMessage> >& consoleMessages() const { return m_consoleMessages; }
 
     bool searchingForNodeInPage() const { return m_searchingForNode; }
     void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
@@ -319,7 +319,7 @@ private:
 
     void focusNode();
 
-    void addConsoleMessage(ScriptState*, ConsoleMessage*);
+    void addConsoleMessage(ScriptState*, PassOwnPtr<ConsoleMessage>);
 
     void addResource(InspectorResource*);
     void removeResource(InspectorResource*);
@@ -359,7 +359,7 @@ private:
     ResourcesMap m_resources;
     HashSet<String> m_knownResources;
     FrameResourcesMap m_frameResources;
-    Vector<ConsoleMessage*> m_consoleMessages;
+    Vector<OwnPtr<ConsoleMessage> > m_consoleMessages;
     unsigned m_expiredConsoleMessageCount;
     HashMap<String, double> m_times;
     HashMap<String, unsigned> m_counts;

-- 
WebKit Debian packaging