Changeset 84883 in webkit

Timestamp:

Apr 25, 2011 11:24:56 PM (13 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by David Levin.

WebKit1 should build cleanly with strict OwnPtrs
​https://bugs.webkit.org/show_bug.cgi?id=59424

• History/WebHistoryItem.mm: (-[WebHistoryItem initFromDictionaryRepresentation:]):
• Plugins/WebNetscapePluginEventHandler.h:
• Plugins/WebNetscapePluginEventHandler.mm: (WebNetscapePluginEventHandler::create):
• Plugins/WebNetscapePluginView.mm: (-[WebNetscapePluginView createPlugin]):
• WebView/WebDeviceOrientationProviderMock.mm:
• WebView/WebTextIterator.mm: (-[WebTextIterator initWithRange:]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• History/WebHistoryItem.mm (modified) (1 diff)
• Plugins/WebNetscapePluginEventHandler.h (modified) (1 diff)
• Plugins/WebNetscapePluginEventHandler.mm (modified) (1 diff)
• Plugins/WebNetscapePluginView.mm (modified) (1 diff)
• WebView/WebDeviceOrientationProviderMock.mm (modified) (2 diffs)
• WebView/WebTextIterator.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-04-25  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by David Levin.
+
+        WebKit1 should build cleanly with strict OwnPtrs
+        https://bugs.webkit.org/show_bug.cgi?id=59424
+
+        * History/WebHistoryItem.mm:
+        (-[WebHistoryItem initFromDictionaryRepresentation:]):
+        * Plugins/WebNetscapePluginEventHandler.h:
+        * Plugins/WebNetscapePluginEventHandler.mm:
+        (WebNetscapePluginEventHandler::create):
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView createPlugin]):
+        * WebView/WebDeviceOrientationProviderMock.mm:
+        * WebView/WebTextIterator.mm:
+        (-[WebTextIterator initWithRange:]):
+
 2011-04-25  Jon Lee  <jonlee@apple.com>
 

trunk/Source/WebKit/mac/History/WebHistoryItem.mm

@@ -379 +379 @@
     if (NSArray *redirectURLs = [dict _webkit_arrayForKey:redirectURLsKey]) {
         NSUInteger size = [redirectURLs count];
-        OwnPtr<Vector<String> > redirectURLsVector(new Vector<String>(size));
+        OwnPtr<Vector<String> > redirectURLsVector = adoptPtr(new Vector<String>(size));
         for (NSUInteger i = 0; i < size; ++i)
             (*redirectURLsVector)[i] = String([redirectURLs _webkit_stringAtIndex:i]);

trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandler.h

@@ -38 +38 @@
 class WebNetscapePluginEventHandler {
 public:
-    static WebNetscapePluginEventHandler* create(WebNetscapePluginView*);
+    static PassOwnPtr<WebNetscapePluginEventHandler> create(WebNetscapePluginView*);
     virtual ~WebNetscapePluginEventHandler() { }
     

trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandler.mm

@@ -29 +29 @@
 
 #import <wtf/Assertions.h>
+#import <wtf/PassOwnPtr.h>
 #import "WebNetscapePluginView.h"
 #import "WebNetscapePluginEventHandlerCarbon.h"
 #import "WebNetscapePluginEventHandlerCocoa.h"
 
-WebNetscapePluginEventHandler* WebNetscapePluginEventHandler::create(WebNetscapePluginView* pluginView)
+PassOwnPtr<WebNetscapePluginEventHandler> WebNetscapePluginEventHandler::create(WebNetscapePluginView* pluginView)
 {
     switch ([pluginView eventModel]) {
 #ifndef NP_NO_CARBON
         case NPEventModelCarbon:
-            return new WebNetscapePluginEventHandlerCarbon(pluginView);
+            return adoptPtr(new WebNetscapePluginEventHandlerCarbon(pluginView));
 #endif // NP_NO_CARBON
         case NPEventModelCocoa:
-            return new WebNetscapePluginEventHandlerCocoa(pluginView);
+            return adoptPtr(new WebNetscapePluginEventHandlerCocoa(pluginView));
         default:
             ASSERT_NOT_REACHED();
-            return 0;
+            return PassOwnPtr<WebNetscapePluginEventHandler>();
     }
 }

trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm

@@ -1130 +1130 @@
     
     // Create the event handler
-    _eventHandler.set(WebNetscapePluginEventHandler::create(self));
-        
+    _eventHandler = WebNetscapePluginEventHandler::create(self);
+
     return YES;
 }

trunk/Source/WebKit/mac/WebView/WebDeviceOrientationProviderMock.mm

@@ -26 +26 @@
 #import "WebDeviceOrientationProviderMockInternal.h"
 
+#import <wtf/PassOwnPtr.h>
 #import "WebDeviceOrientationInternal.h"
 
@@ -37 +38 @@
     if (!self)
         return nil;
-    m_core.set(new DeviceOrientationClientMock());
+    m_core = adoptPtr(new DeviceOrientationClientMock());
     return self;
 }

trunk/Source/WebKit/mac/WebView/WebTextIterator.mm

@@ -72 +72 @@
     
     _private = [[WebTextIteratorPrivate alloc] init];
-    _private->_textIterator.set(new TextIterator(core(range)));
+    _private->_textIterator = adoptPtr(new TextIterator(core(range)));
     return self;
 }