Changeset 84822 in webkit

Timestamp:

Apr 25, 2011 4:08:40 PM (13 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by David Levin.

Page*.cpp and objc_runtime.mm should play nice with strict OwnPtrs
​https://bugs.webkit.org/show_bug.cgi?id=59374

• bridge/objc/objc_runtime.mm: (JSC::Bindings::callObjCFallbackObject):
• page/Page.cpp: (WebCore::Page::Page): (WebCore::Page::initGroup):
• page/PageGroup.cpp: (WebCore::PageGroup::addUserScriptToWorld): (WebCore::PageGroup::addUserStyleSheetToWorld):
• page/mac/PageMac.cpp: (WebCore::Page::addSchedulePair):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/objc/objc_runtime.mm (modified) (1 diff)
• page/Page.cpp (modified) (2 diffs)
• page/PageGroup.cpp (modified) (2 diffs)
• page/mac/PageMac.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-25  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by David Levin.
+
+        Page*.cpp and objc_runtime.mm should play nice with strict OwnPtrs
+        https://bugs.webkit.org/show_bug.cgi?id=59374
+
+        * bridge/objc/objc_runtime.mm:
+        (JSC::Bindings::callObjCFallbackObject):
+        * page/Page.cpp:
+        (WebCore::Page::Page):
+        (WebCore::Page::initGroup):
+        * page/PageGroup.cpp:
+        (WebCore::PageGroup::addUserScriptToWorld):
+        (WebCore::PageGroup::addUserStyleSheetToWorld):
+        * page/mac/PageMac.cpp:
+        (WebCore::Page::addSchedulePair):
+
 2011-04-25  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/bridge/objc/objc_runtime.mm

@@ -237 +237 @@
     if ([targetObject respondsToSelector:@selector(invokeUndefinedMethodFromWebScript:withArguments:)]){
         ObjcClass* objcClass = static_cast<ObjcClass*>(objcInstance->getClass());
-        OwnPtr<ObjcMethod> fallbackMethod(new ObjcMethod(objcClass->isa(), @selector(invokeUndefinedMethodFromWebScript:withArguments:)));
+        OwnPtr<ObjcMethod> fallbackMethod(adoptPtr(new ObjcMethod(objcClass->isa(), @selector(invokeUndefinedMethodFromWebScript:withArguments:))));
         const Identifier& nameIdentifier = static_cast<ObjcFallbackObjectImp*>(exec->callee())->propertyName();
         RetainPtr<CFStringRef> name(AdoptCF, CFStringCreateWithCharacters(0, nameIdentifier.characters(), nameIdentifier.length()));

trunk/Source/WebCore/page/Page.cpp

@@ -174 +174 @@
 
     if (pageClients.pluginHalterClient) {
-        m_pluginHalter.set(new PluginHalter(pageClients.pluginHalterClient));
+        m_pluginHalter = adoptPtr(new PluginHalter(pageClients.pluginHalterClient));
         m_pluginHalter->setPluginAllowedRunTime(m_settings->pluginAllowedRunTime());
     }
@@ -377 +377 @@
     ASSERT(!m_singlePageGroup);
     ASSERT(!m_group);
-    m_singlePageGroup.set(new PageGroup(this));
+    m_singlePageGroup = adoptPtr(new PageGroup(this));
     m_group = m_singlePageGroup.get();
 }

trunk/Source/WebCore/page/PageGroup.cpp

@@ -283 +283 @@
     ASSERT_ARG(world, world);
 
-    OwnPtr<UserScript> userScript(new UserScript(source, url, whitelist, blacklist, injectionTime, injectedFrames));
+    OwnPtr<UserScript> userScript = adoptPtr(new UserScript(source, url, whitelist, blacklist, injectionTime, injectedFrames));
     if (!m_userScripts)
-        m_userScripts.set(new UserScriptMap);
+        m_userScripts = adoptPtr(new UserScriptMap);
     UserScriptVector*& scriptsInWorld = m_userScripts->add(world, 0).first->second;
     if (!scriptsInWorld)
@@ -300 +300 @@
     ASSERT_ARG(world, world);
 
-    OwnPtr<UserStyleSheet> userStyleSheet(new UserStyleSheet(source, url, whitelist, blacklist, injectedFrames, level));
+    OwnPtr<UserStyleSheet> userStyleSheet = adoptPtr(new UserStyleSheet(source, url, whitelist, blacklist, injectedFrames, level));
     if (!m_userStyleSheets)
-        m_userStyleSheets.set(new UserStyleSheetMap);
+        m_userStyleSheets = adoptPtr(new UserStyleSheetMap);
     UserStyleSheetVector*& styleSheetsInWorld = m_userStyleSheets->add(world, 0).first->second;
     if (!styleSheetsInWorld)

trunk/Source/WebCore/page/mac/PageMac.cpp

@@ -41 +41 @@
 
     if (!m_scheduledRunLoopPairs)
-        m_scheduledRunLoopPairs.set(new SchedulePairHashSet);
+        m_scheduledRunLoopPairs = adoptPtr(new SchedulePairHashSet);
     m_scheduledRunLoopPairs->add(pair);