Changeset 84833 in webkit

Timestamp:

Apr 25, 2011 4:30:05 PM (13 years ago)

Author:

jamesr@google.com

Message:

2011-04-25 James Robinson <​jamesr@chromium.org>

Reviewed by Adam Barth.

Fix OwnPtr strictness issues in WebCore/inspector/
​https://bugs.webkit.org/show_bug.cgi?id=59387

• inspector/InspectorAgent.cpp: (WebCore::InspectorAgent::InspectorAgent):
• inspector/InspectorController.cpp: (WebCore::InspectorController::InspectorController):
• inspector/InspectorStyleSheet.cpp: (WebCore::InspectorStyleSheet::ensureSourceData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorAgent.cpp (modified) (2 diffs)
• inspector/InspectorController.cpp (modified) (1 diff)
• inspector/InspectorStyleSheet.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-25  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Fix OwnPtr strictness issues in WebCore/inspector/
+        https://bugs.webkit.org/show_bug.cgi?id=59387
+
+        * inspector/InspectorAgent.cpp:
+        (WebCore::InspectorAgent::InspectorAgent):
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        * inspector/InspectorStyleSheet.cpp:
+        (WebCore::InspectorStyleSheet::ensureSourceData):
+
 2011-04-25  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/inspector/InspectorAgent.cpp

@@ -111 +111 @@
     , m_client(client)
     , m_frontend(0)
-    , m_instrumentingAgents(new InstrumentingAgents())
+    , m_instrumentingAgents(adoptPtr(new InstrumentingAgents))
     , m_injectedScriptManager(injectedScriptManager)
-    , m_state(new InspectorState(client))
+    , m_state(adoptPtr(new InspectorState(client)))
     , m_pageAgent(InspectorPageAgent::create(m_instrumentingAgents.get(), page, injectedScriptManager))
     , m_domAgent(InspectorDOMAgent::create(m_instrumentingAgents.get(), m_pageAgent.get(), m_client, m_state.get(), injectedScriptManager))
-    , m_cssAgent(new InspectorCSSAgent(m_instrumentingAgents.get(), m_domAgent.get()))
+    , m_cssAgent(adoptPtr(new InspectorCSSAgent(m_instrumentingAgents.get(), m_domAgent.get())))
 #if ENABLE(DATABASE)
     , m_databaseAgent(InspectorDatabaseAgent::create(m_instrumentingAgents.get(), m_state.get()))
@@ -125 +125 @@
     , m_timelineAgent(InspectorTimelineAgent::create(m_instrumentingAgents.get(), m_state.get()))
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
-    , m_applicationCacheAgent(new InspectorApplicationCacheAgent(m_instrumentingAgents.get(), page))
+    , m_applicationCacheAgent(adoptPtr(new InspectorApplicationCacheAgent(m_instrumentingAgents.get(), page)))
 #endif
     , m_resourceAgent(InspectorResourceAgent::create(m_instrumentingAgents.get(), m_pageAgent.get(), m_state.get()))
     , m_runtimeAgent(adoptPtr(new PageRuntimeAgent(m_injectedScriptManager, page)))
-    , m_consoleAgent(new InspectorConsoleAgent(m_instrumentingAgents.get(), this, m_state.get(), injectedScriptManager, m_domAgent.get()))
+    , m_consoleAgent(adoptPtr(new InspectorConsoleAgent(m_instrumentingAgents.get(), this, m_state.get(), injectedScriptManager, m_domAgent.get())))
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     , m_debuggerAgent(PageDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), page, injectedScriptManager))

trunk/Source/WebCore/inspector/InspectorController.cpp

@@ -59 +59 @@
 InspectorController::InspectorController(Page* page, InspectorClient* inspectorClient)
     : m_injectedScriptManager(InjectedScriptManager::createForPage())
-    , m_inspectorAgent(new InspectorAgent(page, inspectorClient, m_injectedScriptManager.get()))
+    , m_inspectorAgent(adoptPtr(new InspectorAgent(page, inspectorClient, m_injectedScriptManager.get())))
     , m_inspectorClient(inspectorClient)
     , m_openingFrontend(false)

trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp

@@ -959 +959 @@
     StyleRuleRangeMap ruleRangeMap;
     p.parseSheet(newStyleSheet.get(), m_parsedStyleSheet->text(), 0, &ruleRangeMap);
-    OwnPtr<ParsedStyleSheet::SourceData> rangesVector(new ParsedStyleSheet::SourceData());
+    OwnPtr<ParsedStyleSheet::SourceData> rangesVector(adoptPtr(new ParsedStyleSheet::SourceData));
 
     Vector<CSSStyleRule*> rules;