Changeset 85162 in webkit

Timestamp:

Apr 27, 2011 11:08:16 PM (13 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by David Levin.

Fix five strict PassOwnPtr violations in WebCore
​https://bugs.webkit.org/show_bug.cgi?id=59640

• css/MediaList.cpp: (WebCore::MediaList::deleteMedium): (WebCore::MediaList::setMediaText): (WebCore::MediaList::appendMedium):
• css/MediaQuery.h:
• dom/MessagePort.cpp: (WebCore::MessagePort::disentanglePorts): (WebCore::MessagePort::entanglePorts):
• inspector/InspectorStyleSheet.cpp: (ParsedStyleSheet::setText):
• rendering/RenderTheme.cpp: (WebCore::RenderTheme::adjustStyle): (WebCore::RenderTheme::adjustMeterStyle):
• rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::adjustMenuListStyle): (WebCore::RenderThemeMac::adjustSliderTrackStyle): (WebCore::RenderThemeMac::adjustSliderThumbStyle): (WebCore::RenderThemeMac::adjustSearchFieldStyle): (WebCore::RenderThemeMac::adjustSearchFieldCancelButtonStyle): (WebCore::RenderThemeMac::adjustSearchFieldDecorationStyle): (WebCore::RenderThemeMac::adjustSearchFieldResultsDecorationStyle): (WebCore::RenderThemeMac::adjustSearchFieldResultsButtonStyle):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/MediaList.cpp (modified) (3 diffs)
• css/MediaQuery.h (modified) (2 diffs)
• dom/MessagePort.cpp (modified) (6 diffs)
• inspector/InspectorStyleSheet.cpp (modified) (1 diff)
• rendering/RenderTheme.cpp (modified) (2 diffs)
• rendering/RenderThemeMac.mm (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-27  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by David Levin.
+
+        Fix five strict PassOwnPtr violations in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=59640
+
+        * css/MediaList.cpp:
+        (WebCore::MediaList::deleteMedium):
+        (WebCore::MediaList::setMediaText):
+        (WebCore::MediaList::appendMedium):
+        * css/MediaQuery.h:
+        * dom/MessagePort.cpp:
+        (WebCore::MessagePort::disentanglePorts):
+        (WebCore::MessagePort::entanglePorts):
+        * inspector/InspectorStyleSheet.cpp:
+        (ParsedStyleSheet::setText):
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::adjustStyle):
+        (WebCore::RenderTheme::adjustMeterStyle):
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::adjustMenuListStyle):
+        (WebCore::RenderThemeMac::adjustSliderTrackStyle):
+        (WebCore::RenderThemeMac::adjustSliderThumbStyle):
+        (WebCore::RenderThemeMac::adjustSearchFieldStyle):
+        (WebCore::RenderThemeMac::adjustSearchFieldCancelButtonStyle):
+        (WebCore::RenderThemeMac::adjustSearchFieldDecorationStyle):
+        (WebCore::RenderThemeMac::adjustSearchFieldResultsDecorationStyle):
+        (WebCore::RenderThemeMac::adjustSearchFieldResultsButtonStyle):
+
 2011-04-27  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/css/MediaList.cpp

@@ -132 +132 @@
         String medium = parseMediaDescriptor(oldMedium);
         if (!medium.isNull()) {
-            createdQuery = adoptPtr(new MediaQuery(MediaQuery::None, medium, 0));
+            createdQuery = adoptPtr(new MediaQuery(MediaQuery::None, medium, PassOwnPtr<MediaQuery::ExpressionVector>()));
             oldQuery = createdQuery.get();
         }
@@ -187 +187 @@
                     String mediaDescriptor = parseMediaDescriptor(medium);
                     if (!mediaDescriptor.isNull())
-                        tempMediaList->m_queries.append(new MediaQuery(MediaQuery::None, mediaDescriptor, 0));
+                        tempMediaList->m_queries.append(new MediaQuery(MediaQuery::None, mediaDescriptor, PassOwnPtr<MediaQuery::ExpressionVector>()));
                 } else {
                     ec = SYNTAX_ERR;
@@ -233 +233 @@
         String medium = parseMediaDescriptor(newMedium);
         if (!medium.isNull()) {
-            m_queries.append(new MediaQuery(MediaQuery::None, medium, 0));
+            m_queries.append(new MediaQuery(MediaQuery::None, medium, PassOwnPtr<MediaQuery::ExpressionVector>()));
             ec = 0;
         }

trunk/Source/WebCore/css/MediaQuery.h

@@ -45 +45 @@
     };
 
-    MediaQuery(Restrictor, const String& mediaType, PassOwnPtr<Vector<OwnPtr<MediaQueryExp> > > exprs);
+    typedef Vector<OwnPtr<MediaQueryExp> > ExpressionVector;
+
+    MediaQuery(Restrictor, const String& mediaType, PassOwnPtr<ExpressionVector> exprs);
     ~MediaQuery();
 
@@ -58 +60 @@
     Restrictor m_restrictor;
     String m_mediaType;
-    OwnPtr<Vector<OwnPtr<MediaQueryExp> > > m_expressions;
+    OwnPtr<ExpressionVector> m_expressions;
     bool m_ignored;
     String m_serializationCache;

trunk/Source/WebCore/dom/MessagePort.cpp

@@ -207 +207 @@
 {
     if (!ports || !ports->size())
-        return 0;
+        return PassOwnPtr<MessagePortChannelArray>();
 
     // HashSet used to efficiently check for duplicates in the passed-in array.
@@ -217 +217 @@
         if (!port || port->isCloned() || portSet.contains(port)) {
             ec = INVALID_STATE_ERR;
-            return 0;
+            return PassOwnPtr<MessagePortChannelArray>();
         }
         portSet.add(port);
@@ -223 +223 @@
 
     // Passed-in ports passed validity checks, so we can disentangle them.
-    MessagePortChannelArray* portArray = new MessagePortChannelArray(ports->size());
+    OwnPtr<MessagePortChannelArray> portArray = adoptPtr(new MessagePortChannelArray(ports->size()));
     for (unsigned int i = 0 ; i < ports->size() ; ++i) {
         OwnPtr<MessagePortChannel> channel = (*ports)[i]->disentangle(ec);
@@ -229 +229 @@
         (*portArray)[i] = channel.release();
     }
-    return portArray;
+    return portArray.release();
 }
 
@@ -235 +235 @@
 {
     if (!channels || !channels->size())
-        return 0;
-
-    MessagePortArray* portArray = new MessagePortArray(channels->size());
+        return PassOwnPtr<MessagePortArray>();
+
+    OwnPtr<MessagePortArray> portArray = adoptPtr(new MessagePortArray(channels->size()));
     for (unsigned int i = 0; i < channels->size(); ++i) {
         RefPtr<MessagePort> port = MessagePort::create(context);
@@ -243 +243 @@
         (*portArray)[i] = port.release();
     }
-    return portArray;
+    return portArray.release();
 }
 

trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp

@@ -86 +86 @@
     m_hasText = true;
     m_text = text;
-    setSourceData(0);
+    setSourceData(PassOwnPtr<SourceData>());
 }
 

trunk/Source/WebCore/rendering/RenderTheme.cpp

@@ -94 +94 @@
 
     // Never support box-shadow on native controls.
-    style->setBoxShadow(0);
+    style->setBoxShadow(PassOwnPtr<ShadowData>());
     
 #if USE(NEW_THEME)
@@ -930 +930 @@
 void RenderTheme::adjustMeterStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
 {
-    style->setBoxShadow(0);
+    style->setBoxShadow(PassOwnPtr<ShadowData>());
 }
 

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -1165 +1165 @@
     setFontFromControlSize(selector, style, controlSize);
 
-    style->setBoxShadow(0);
+    style->setBoxShadow(PassOwnPtr<ShadowData>());
 }
 
@@ -1251 +1251 @@
 void RenderThemeMac::adjustSliderTrackStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
 {
-    style->setBoxShadow(0);
+    style->setBoxShadow(PassOwnPtr<ShadowData>());
 }
 
@@ -1292 +1292 @@
 void RenderThemeMac::adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
 {
-    style->setBoxShadow(0);
+    style->setBoxShadow(PassOwnPtr<ShadowData>());
 }
 
@@ -1444 +1444 @@
     setFontFromControlSize(selector, style, controlSize);
 
-    style->setBoxShadow(0);
+    style->setBoxShadow(PassOwnPtr<ShadowData>());
 }
 
@@ -1503 +1503 @@
     style->setWidth(Length(size.width(), Fixed));
     style->setHeight(Length(size.height(), Fixed));
-    style->setBoxShadow(0);
+    style->setBoxShadow(PassOwnPtr<ShadowData>());
 }
 
@@ -1518 +1518 @@
     style->setWidth(Length(size.width() - emptyResultsOffset, Fixed));
     style->setHeight(Length(size.height(), Fixed));
-    style->setBoxShadow(0);
+    style->setBoxShadow(PassOwnPtr<ShadowData>());
 }
 
@@ -1531 +1531 @@
     style->setWidth(Length(size.width(), Fixed));
     style->setHeight(Length(size.height(), Fixed));
-    style->setBoxShadow(0);
+    style->setBoxShadow(PassOwnPtr<ShadowData>());
 }
 
@@ -1564 +1564 @@
     style->setWidth(Length(size.width() + resultsArrowWidth, Fixed));
     style->setHeight(Length(size.height(), Fixed));
-    style->setBoxShadow(0);
+    style->setBoxShadow(PassOwnPtr<ShadowData>());
 }