Changeset 84827 in webkit

Timestamp:

Apr 25, 2011 4:17:04 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-04-25 Adam Barth <​abarth@webkit.org>

Reviewed by David Levin.

Resource*.cpp should play nice with strict OwnPtrs
​https://bugs.webkit.org/show_bug.cgi?id=59383

• bridge/runtime_method.cpp: (JSC::RuntimeMethod::RuntimeMethod):
• platform/network/ResourceHandle.cpp: (WebCore::ResourceHandle::ResourceHandle):
• platform/network/ResourceResponseBase.cpp: (WebCore::ResourceResponseBase::adopt): (WebCore::ResourceResponseBase::copyData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/runtime_method.cpp (modified) (1 diff)
• platform/network/ResourceHandle.cpp (modified) (1 diff)
• platform/network/ResourceResponseBase.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-25  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by David Levin.
+
+        Resource*.cpp should play nice with strict OwnPtrs
+        https://bugs.webkit.org/show_bug.cgi?id=59383
+
+        * bridge/runtime_method.cpp:
+        (JSC::RuntimeMethod::RuntimeMethod):
+        * platform/network/ResourceHandle.cpp:
+        (WebCore::ResourceHandle::ResourceHandle):
+        * platform/network/ResourceResponseBase.cpp:
+        (WebCore::ResourceResponseBase::adopt):
+        (WebCore::ResourceResponseBase::copyData):
+
 2011-04-25  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/bridge/runtime_method.cpp

@@ -47 +47 @@
     // Callers will need to pass in the right global object corresponding to this native object "m".
     : InternalFunction(&exec->globalData(), globalObject, structure, ident)
-    , _methodList(new MethodList(m))
+    , _methodList(adoptPtr(new MethodList(m)))
 {
     ASSERT(inherits(&s_info));

trunk/Source/WebCore/platform/network/ResourceHandle.cpp

@@ -41 +41 @@
 
 ResourceHandle::ResourceHandle(const ResourceRequest& request, ResourceHandleClient* client, bool defersLoading, bool shouldContentSniff)
-    : d(new ResourceHandleInternal(this, request, client, defersLoading, shouldContentSniff && shouldContentSniffURL(request.url())))
+    : d(adoptPtr(new ResourceHandleInternal(this, request, client, defersLoading, shouldContentSniff && shouldContentSniffURL(request.url()))))
 {
     if (!request.url().isValid()) {

trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp

@@ -99 +99 @@
 PassOwnPtr<ResourceResponse> ResourceResponseBase::adopt(PassOwnPtr<CrossThreadResourceResponseData> data)
 {
-    OwnPtr<ResourceResponse> response(new ResourceResponse());
+    OwnPtr<ResourceResponse> response = adoptPtr(new ResourceResponse);
     response->setURL(data->m_url);
     response->setMimeType(data->m_mimeType);
@@ -119 +119 @@
 PassOwnPtr<CrossThreadResourceResponseData> ResourceResponseBase::copyData() const
 {
-    OwnPtr<CrossThreadResourceResponseData> data(new CrossThreadResourceResponseData());
+    OwnPtr<CrossThreadResourceResponseData> data = adoptPtr(new CrossThreadResourceResponseData);
     data->m_url = url().copy();
     data->m_mimeType = mimeType().crossThreadString();