Changeset 44098 in webkit

Timestamp:

May 23, 2009 10:16:24 AM (15 years ago)

Author:

ddkilzer@apple.com

Message:

Windows build fix for PassOwnPtr

• WebHistory.cpp: (WebHistory::visitedURL): Changed std::auto_ptr<Vector<String> >() to 0.
• WebHistoryItem.cpp: (WebHistoryItem::initFromDictionaryRepresentation): Changed type of redirectURLsVector from std::auto_ptr<Vector<String> > to OwnPtr<Vector<String> >.

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebHistory.cpp (modified) (1 diff)
• WebHistoryItem.cpp (modified) (3 diffs)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2009-05-23  David Kilzer  <ddkilzer@apple.com>
+
+        Windows build fix for PassOwnPtr
+
+        * WebHistory.cpp:
+        (WebHistory::visitedURL): Changed
+        std::auto_ptr<Vector<String> >() to 0.
+        * WebHistoryItem.cpp:
+        (WebHistoryItem::initFromDictionaryRepresentation): Changed type
+        of redirectURLsVector from std::auto_ptr<Vector<String> > to
+        OwnPtr<Vector<String> >.
+
 2009-05-23  David Kilzer  <ddkilzer@apple.com>
 

trunk/WebKit/win/WebHistory.cpp

@@ -741 +741 @@
 
     COMPtr<WebHistoryItem> item(Query, entry);
-    item->historyItem()->setRedirectURLs(std::auto_ptr<Vector<String> >());
+    item->historyItem()->setRedirectURLs(0);
 
     CFDictionaryPropertyBag* userInfo = createUserInfoFromHistoryItem(

trunk/WebKit/win/WebHistoryItem.cpp

@@ -40 +40 @@
 #pragma warning(pop)
 
+#include <wtf/PassOwnPtr.h>
 #include <wtf/RetainPtr.h>
 
@@ -144 +145 @@
     bool lastVisitWasHTTPNonGet = lastVisitWasHTTPNonGetRef && CFBooleanGetValue(lastVisitWasHTTPNonGetRef);
 
-    std::auto_ptr<Vector<String> > redirectURLsVector;
+    OwnPtr<Vector<String> > redirectURLsVector;
     if (CFArrayRef redirectURLsRef = static_cast<CFArrayRef>(CFDictionaryGetValue(dictionaryRef, redirectURLsKey))) {
         CFIndex size = CFArrayGetCount(redirectURLsRef);
-        redirectURLsVector.reset(new Vector<String>(size));
+        redirectURLsVector = PassOwnPtr<Vector<String> >(new Vector<String>(size));
         for (CFIndex i = 0; i < size; ++i)
             (*redirectURLsVector)[i] = String(static_cast<CFStringRef>(CFArrayGetValueAtIndex(redirectURLsRef, i)));
@@ -194 +195 @@
         m_historyItem->setLastVisitWasHTTPNonGet(true);
 
-    if (redirectURLsVector.get())
-        m_historyItem->setRedirectURLs(redirectURLsVector);
+    if (redirectURLsVector)
+        m_historyItem->setRedirectURLs(redirectURLsVector.release());
 
     if (dailyVector.get())