Changeset 181923 in webkit

Timestamp:

Mar 24, 2015, 5:55:11 PM (10 years ago)

Author:

Chris Dumez

Message:

[Mac] Use .cpp file extension instead of .mm for SharedTimerCF and PowerObserverMac
​https://bugs.webkit.org/show_bug.cgi?id=143026

Reviewed by Andy Estes.

Use .cpp file extension instead of .mm for SharedTimerCF and
PowerObserverMac.

• WebCore.xcodeproj/project.pbxproj:
• platform/cf/SharedTimerCF.cpp: Renamed from Source/WebCore/platform/cf/SharedTimerCF.mm.

(WebCore::timerFired):
Use WTF::AutodrainedPool instead of @autoreleasepool {}.

• platform/mac/PowerObserverMac.cpp: Renamed from Source/WebCore/platform/mac/PowerObserverMac.mm.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (8 diffs)
• platform/cf/SharedTimerCF.cpp (moved) (moved from trunk/Source/WebCore/platform/cf/SharedTimerCF.mm ) (3 diffs)
• platform/mac/PowerObserverMac.cpp (moved) (moved from trunk/Source/WebCore/platform/mac/PowerObserverMac.mm )

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-24  Chris Dumez  <cdumez@apple.com>
+
+        [Mac] Use .cpp file extension instead of .mm for SharedTimerCF and PowerObserverMac
+        https://bugs.webkit.org/show_bug.cgi?id=143026
+
+        Reviewed by Andy Estes.
+
+        Use .cpp file extension instead of .mm for SharedTimerCF and
+        PowerObserverMac.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/cf/SharedTimerCF.cpp: Renamed from Source/WebCore/platform/cf/SharedTimerCF.mm.
+        (WebCore::timerFired):
+        Use WTF::AutodrainedPool instead of @autoreleasepool {}.
+
+        * platform/mac/PowerObserverMac.cpp: Renamed from Source/WebCore/platform/mac/PowerObserverMac.mm.
+
 2015-03-24  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1639 +1639 @@
                 45FEA5CF156DDE8C00654101 /* Decimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45FEA5CD156DDE8C00654101 /* Decimal.cpp */; };
                 45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */ = {isa = PBXBuildFile; fileRef = 45FEA5CE156DDE8C00654101 /* Decimal.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                4634592C1AC2271000ECB71C /* PowerObserverMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4634592B1AC2271000ECB71C /* PowerObserverMac.cpp */; };
+                4634592E1AC2273C00ECB71C /* SharedTimerCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4634592D1AC2273C00ECB71C /* SharedTimerCF.cpp */; };
                 4689F1AF1267BAE100E8D380 /* FileMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 4689F1AE1267BAE100E8D380 /* FileMetadata.h */; };
                 46C83EFD1A9BBE2900A79A41 /* GeoNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46C83EFB1A9BBE2900A79A41 /* GeoNotifier.cpp */; };
                 46C83EFE1A9BBE2900A79A41 /* GeoNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 46C83EFC1A9BBE2900A79A41 /* GeoNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                46D791141AB89A9B001B696B /* SharedTimerCF.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46D791131AB89A9B001B696B /* SharedTimerCF.mm */; };
                 46DBB6501AB8C96F00D9A813 /* PowerObserverMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 46DBB64E1AB8C96F00D9A813 /* PowerObserverMac.h */; };
-                46DBB6511AB8C96F00D9A813 /* PowerObserverMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46DBB64F1AB8C96F00D9A813 /* PowerObserverMac.mm */; };
                 46FCB6181A70820E00C5A21E /* DiagnosticLoggingKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = CD37B37515C1A7E1006DC898 /* DiagnosticLoggingKeys.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 490707E61219C04300D90E51 /* ANGLEWebKitBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 490707E41219C04300D90E51 /* ANGLEWebKitBridge.cpp */; };
@@ -8780 +8780 @@
                 45FEA5CD156DDE8C00654101 /* Decimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Decimal.cpp; sourceTree = "<group>"; };
                 45FEA5CE156DDE8C00654101 /* Decimal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decimal.h; sourceTree = "<group>"; };
+                4634592B1AC2271000ECB71C /* PowerObserverMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PowerObserverMac.cpp; sourceTree = "<group>"; };
+                4634592D1AC2273C00ECB71C /* SharedTimerCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedTimerCF.cpp; sourceTree = "<group>"; };
                 4689F1AE1267BAE100E8D380 /* FileMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileMetadata.h; path = platform/FileMetadata.h; sourceTree = "<group>"; };
                 46C83EFB1A9BBE2900A79A41 /* GeoNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeoNotifier.cpp; sourceTree = "<group>"; };
                 46C83EFC1A9BBE2900A79A41 /* GeoNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeoNotifier.h; sourceTree = "<group>"; };
-                46D791131AB89A9B001B696B /* SharedTimerCF.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SharedTimerCF.mm; sourceTree = "<group>"; };
                 46DBB64E1AB8C96F00D9A813 /* PowerObserverMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PowerObserverMac.h; sourceTree = "<group>"; };
-                46DBB64F1AB8C96F00D9A813 /* PowerObserverMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PowerObserverMac.mm; sourceTree = "<group>"; };
                 490707E41219C04300D90E51 /* ANGLEWebKitBridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ANGLEWebKitBridge.cpp; sourceTree = "<group>"; };
                 490707E51219C04300D90E51 /* ANGLEWebKitBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANGLEWebKitBridge.h; sourceTree = "<group>"; };
@@ -15234 +15234 @@
                                 2D76BB801945632400CFD29A /* RunLoopObserver.h */,
                                 512DD8E20D91E2B4000F89EE /* SharedBufferCF.cpp */,
-                                46D791131AB89A9B001B696B /* SharedTimerCF.mm */,
+                                4634592D1AC2273C00ECB71C /* SharedTimerCF.cpp */,
                                 1A98956A0AA78F80005EF5EF /* URLCF.cpp */,
                                 5CBC8DAA1AAA302200E1C803 /* MediaAccessibilitySoftLink.cpp */,
@@ -16691 +16691 @@
                                 BC94D1070C274F88006BC617 /* PlatformScreenMac.mm */,
                                 29E4D8E016B0959800C84704 /* PlatformSpeechSynthesizerMac.mm */,
+                                4634592B1AC2271000ECB71C /* PowerObserverMac.cpp */,
                                 46DBB64E1AB8C96F00D9A813 /* PowerObserverMac.h */,
-                                46DBB64F1AB8C96F00D9A813 /* PowerObserverMac.mm */,
                                 0081FEFE16B0A2B6008AAA7A /* PublicSuffixMac.mm */,
                                 BCAE1FA512939DB7004CB026 /* ScrollAnimatorMac.h */,
@@ -27534 +27534 @@
                                 E47B4BE90E71241600038854 /* CachedResourceHandle.cpp in Sources */,
                                 BCB16C290979C3BD00467741 /* CachedResourceLoader.cpp in Sources */,
+                                4634592C1AC2271000ECB71C /* PowerObserverMac.cpp in Sources */,
                                 5081E3C33CE580C16EF8B48B /* CachedResourceRequest.cpp in Sources */,
                                 93D200F21AB8F81F0025E851 /* JSWebKitMouseForceEvent.cpp in Sources */,
@@ -28017 +28018 @@
                                 4B3043CC0AE0373B00A82647 /* Editor.cpp in Sources */,
                                 93A38B4B0D0E5808006872C2 /* EditorCommand.cpp in Sources */,
-                                46D791141AB89A9B001B696B /* SharedTimerCF.mm in Sources */,
                                 0760C17A1AA8FC7D009ED7B8 /* MediaPlaybackTargetMac.mm in Sources */,
                                 FED13D3A0CEA934600D89466 /* EditorIOS.mm in Sources */,
@@ -28750 +28750 @@
                                 BC3C39B60C0D3D8D005F4D7A /* JSMediaList.cpp in Sources */,
                                 D3A94A46122DC40F00A37BBC /* JSMediaQueryList.cpp in Sources */,
+                                4634592E1AC2273C00ECB71C /* SharedTimerCF.cpp in Sources */,
                                 7C5343FC17B74B63004232F0 /* JSMediaQueryListListener.cpp in Sources */,
                                 319848021A1D818100A13318 /* AnimationEvent.cpp in Sources */,
@@ -29384 +29385 @@
                                 A88DD4890B4629B000C02990 /* PathTraversalState.cpp in Sources */,
                                 A8FA6E5E0E4CFDED00D5CF49 /* Pattern.cpp in Sources */,
-                                46DBB6511AB8C96F00D9A813 /* PowerObserverMac.mm in Sources */,
                                 A80A38FE0E50CC8200A25EBC /* PatternCG.cpp in Sources */,
                                 B27535640B053814002CE64F /* PDFDocumentImage.cpp in Sources */,

trunk/Source/WebCore/platform/cf/SharedTimerCF.cpp

@@ -26 +26 @@
 #import "config.h"
 #import "SharedTimer.h"
+
+#include <wtf/AutodrainedPool.h>
 
 #if PLATFORM(MAC)
@@ -63 +65 @@
         registeredForApplicationNotification = true;
         CFNotificationCenterRef notificationCenter = CFNotificationCenterGetLocalCenter();
-        CFNotificationCenterAddObserver(notificationCenter, 0, applicationDidBecomeActive, CFSTR("UIApplicationDidBecomeActiveNotification"), NULL, CFNotificationSuspensionBehaviorCoalesce);
+        CFNotificationCenterAddObserver(notificationCenter, nullptr, applicationDidBecomeActive, CFSTR("UIApplicationDidBecomeActiveNotification"), nullptr, CFNotificationSuspensionBehaviorCoalesce);
     }
 #endif
@@ -77 +79 @@
 static void timerFired(CFRunLoopTimerRef, void*)
 {
-    @autoreleasepool {
-        sharedTimerFiredFunction();
-    }
+    AutodrainedPool pool;
+    sharedTimerFiredFunction();
 }