Changeset 84806 in webkit

Timestamp:

Apr 25, 2011 3:28:32 PM (13 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by David Levin.

Fix strict OwnPtr issues in Media*.cpp
​https://bugs.webkit.org/show_bug.cgi?id=59354

There's still a tricky case in MediaPlayer.cpp, but we'll worry about
that later.

• css/MediaQueryMatcher.cpp: (WebCore::MediaQueryMatcher::addListener):
• dom/Document.cpp:
• platform/graphics/MediaPlayer.cpp: (WebCore::createNullMediaPlayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/MediaQueryMatcher.cpp (modified) (1 diff)
• dom/Document.cpp (modified) (3 diffs)
• platform/graphics/MediaPlayer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-25  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by David Levin.
+
+        Fix strict OwnPtr issues in Media*.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=59354
+
+        There's still a tricky case in MediaPlayer.cpp, but we'll worry about
+        that later.
+
+        * css/MediaQueryMatcher.cpp:
+        (WebCore::MediaQueryMatcher::addListener):
+        * dom/Document.cpp:
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::createNullMediaPlayer):
+
 2011-04-25  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/css/MediaQueryMatcher.cpp

@@ -121 +121 @@
     }
 
-    m_listeners.append(new Listener(listener, query));
+    m_listeners.append(adoptPtr(new Listener(listener, query)));
 }
 

trunk/Source/WebCore/dom/Document.cpp

@@ -402 +402 @@
     , m_savedRenderer(0)
     , m_designMode(inherit)
-#if ENABLE(SVG)
-    , m_svgExtensions(0)
-#endif
 #if ENABLE(DASHBOARD_SUPPORT)
     , m_hasDashboardRegions(false)
@@ -1669 +1666 @@
     if (Settings* docSettings = settings())
         matchAuthorAndUserStyles = docSettings->authorAndUserStylesEnabled();
-    m_styleSelector.set(new CSSStyleSelector(this, m_styleSheets.get(), m_mappedElementSheet.get(), pageUserSheet(), pageGroupUserSheets(), 
-                                             !inQuirksMode(), matchAuthorAndUserStyles));
+    m_styleSelector = adoptPtr(new CSSStyleSelector(this, m_styleSheets.get(), m_mappedElementSheet.get(), pageUserSheet(), pageGroupUserSheets(), 
+                                                    !inQuirksMode(), matchAuthorAndUserStyles));
     // Delay resetting the flags until after next style recalc since unapplying the style may not work without these set (this is true at least with before/after).
     m_usesSiblingRules = m_usesSiblingRules || m_styleSelector->usesSiblingRules();
@@ -2397 +2394 @@
             parsedSheet->parseString(sheet->source(), !inQuirksMode());
             if (!m_pageGroupUserSheets)
-                m_pageGroupUserSheets.set(new Vector<RefPtr<CSSStyleSheet> >);
+                m_pageGroupUserSheets = adoptPtr(new Vector<RefPtr<CSSStyleSheet> >);
             m_pageGroupUserSheets->append(parsedSheet.release());
         }

trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

@@ -144 +144 @@
 };
 
-static MediaPlayerPrivateInterface* createNullMediaPlayer(MediaPlayer* player) 
+static PassOwnPtr<MediaPlayerPrivateInterface> createNullMediaPlayer(MediaPlayer* player) 
 { 
-    return new NullMediaPlayerPrivate(player); 
+    return adoptPtr(new NullMediaPlayerPrivate(player)); 
 }