Title: [149423] trunk/Source
- Revision
- 149423
- Author
- [email protected]
- Date
- 2013-04-30 22:19:09 -0700 (Tue, 30 Apr 2013)
Log Message
[Mac] Remove adoptNS/retain pairs, since the two cancel each other out
https://bugs.webkit.org/show_bug.cgi?id=115426
Reviewed by Anders Carlsson.
Source/WebCore:
* platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
(PlatformCAAnimation::PlatformCAAnimation):
* platform/graphics/ca/mac/PlatformCAFiltersMac.mm:
(PlatformCAFilters::filterValueForOperation):
* platform/network/mac/ResourceResponseMac.mm:
(WebCore::ResourceResponse::nsURLResponse):
Remove adoptNS and release from code that is doing both.
Source/WebKit/mac:
* Plugins/WebNetscapePluginStream.mm:
(WebNetscapePluginStream::deliverDataToFile): Remove adoptNS and release.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149422 => 149423)
--- trunk/Source/WebCore/ChangeLog 2013-05-01 05:16:04 UTC (rev 149422)
+++ trunk/Source/WebCore/ChangeLog 2013-05-01 05:19:09 UTC (rev 149423)
@@ -1,3 +1,18 @@
+2013-04-30 Darin Adler <[email protected]>
+
+ [Mac] Remove adoptNS/retain pairs, since the two cancel each other out
+ https://bugs.webkit.org/show_bug.cgi?id=115426
+
+ Reviewed by Anders Carlsson.
+
+ * platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
+ (PlatformCAAnimation::PlatformCAAnimation):
+ * platform/graphics/ca/mac/PlatformCAFiltersMac.mm:
+ (PlatformCAFilters::filterValueForOperation):
+ * platform/network/mac/ResourceResponseMac.mm:
+ (WebCore::ResourceResponse::nsURLResponse):
+ Remove adoptNS and release from code that is doing both.
+
2013-04-29 Sam Weinig <[email protected]>
Add API to allow WebKit2 banners to get mouse events
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm (149422 => 149423)
--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm 2013-05-01 05:16:04 UTC (rev 149422)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm 2013-05-01 05:19:09 UTC (rev 149423)
@@ -162,9 +162,9 @@
: m_type(type)
{
if (type == Basic)
- m_animation = adoptNS([[CABasicAnimation animationWithKeyPath:keyPath] retain]);
+ m_animation = [CABasicAnimation animationWithKeyPath:keyPath];
else
- m_animation = adoptNS([[CAKeyframeAnimation animationWithKeyPath:keyPath] retain]);
+ m_animation = [CAKeyframeAnimation animationWithKeyPath:keyPath];
}
PlatformCAAnimation::PlatformCAAnimation(PlatformAnimationRef animation)
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm (149422 => 149423)
--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm 2013-05-01 05:16:04 UTC (rev 149422)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm 2013-05-01 05:19:09 UTC (rev 149423)
@@ -348,7 +348,7 @@
const BasicColorMatrixFilterOperation* op = static_cast<const BasicColorMatrixFilterOperation*>(operation);
amount = op->amount();
}
- value = adoptNS([[NSNumber numberWithDouble:amount] retain]);
+ value = [NSNumber numberWithDouble:amount];
break;
}
case FilterOperation::SEPIA: {
@@ -389,7 +389,7 @@
amount = op->amount();
}
- value = adoptNS([[NSNumber numberWithDouble:amount] retain]);
+ value = [NSNumber numberWithDouble:amount];
break;
}
case FilterOperation::HUE_ROTATE: {
@@ -401,7 +401,7 @@
amount = op->amount();
}
amount = deg2rad(amount);
- value = adoptNS([[NSNumber numberWithDouble:amount] retain]);
+ value = [NSNumber numberWithDouble:amount];
break;
}
case FilterOperation::INVERT: {
@@ -488,7 +488,7 @@
amount = op->amount();
}
- value = adoptNS([[NSNumber numberWithDouble:amount] retain]);
+ value = [NSNumber numberWithDouble:amount];
#endif
break;
}
@@ -502,7 +502,7 @@
amount = floatValueForLength(op->stdDeviation(), 0);
}
- value = adoptNS([[NSNumber numberWithDouble:amount] retain]);
+ value = [NSNumber numberWithDouble:amount];
break;
}
default:
Modified: trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm (149422 => 149423)
--- trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm 2013-05-01 05:16:04 UTC (rev 149422)
+++ trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm 2013-05-01 05:19:09 UTC (rev 149423)
@@ -80,7 +80,7 @@
return nil;
if (!m_nsResponse)
- m_nsResponse = adoptNS([[NSURLResponse _responseWithCFURLResponse:m_cfResponse.get()] retain]);
+ m_nsResponse = [NSURLResponse _responseWithCFURLResponse:m_cfResponse.get()];
return m_nsResponse.get();
}
Modified: trunk/Source/WebKit/mac/ChangeLog (149422 => 149423)
--- trunk/Source/WebKit/mac/ChangeLog 2013-05-01 05:16:04 UTC (rev 149422)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-05-01 05:19:09 UTC (rev 149423)
@@ -1,3 +1,13 @@
+2013-04-30 Darin Adler <[email protected]>
+
+ [Mac] Remove adoptNS/retain pairs, since the two cancel each other out
+ https://bugs.webkit.org/show_bug.cgi?id=115426
+
+ Reviewed by Anders Carlsson.
+
+ * Plugins/WebNetscapePluginStream.mm:
+ (WebNetscapePluginStream::deliverDataToFile): Remove adoptNS and release.
+
2013-04-30 Geoffrey Garen <[email protected]>
Objective-C _javascript_Core API should publicly support bridging to C
Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm (149422 => 149423)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2013-05-01 05:16:04 UTC (rev 149422)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2013-05-01 05:19:09 UTC (rev 149423)
@@ -572,7 +572,7 @@
return;
}
- m_path = adoptNS([[NSString stringWithUTF8String:temporaryFileName] retain]);
+ m_path = [NSString stringWithUTF8String:temporaryFileName];
free(temporaryFileName);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
