Changeset 143550 in webkit

Timestamp:

Feb 20, 2013 6:25:54 PM (11 years ago)

Author:

ddkilzer@apple.com

Message:

Upstream SharedTimerIOS.mm
<​http://webkit.org/b/110161>

Reviewed by Benjamin Poulain.

• Configurations/WebCore.xcconfig:

(EXCLUDED_SOURCE_FILE_NAMES_iphoneos): Add SharedTimerMac.mm.

• WebCore.xcodeproj/project.pbxproj: Add SharedTimerIOS.mm.
• platform/ios/SharedTimerIOS.mm: Add.

(WebCore):
(-[WebCoreResumeNotifierIOS init]):
(-[WebCoreResumeNotifierIOS dealloc]):
(-[WebCoreResumeNotifierIOS didWake]):
(WebCore::setSharedTimerFiredFunction):
(WebCore::timerFired):
(WebCore::setSharedTimerFireInterval):
(WebCore::stopSharedTimer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Configurations/WebCore.xcconfig (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• platform/ios/SharedTimerIOS.mm (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-20  David Kilzer  <ddkilzer@apple.com>
+
+        Upstream SharedTimerIOS.mm
+        <http://webkit.org/b/110161>
+
+        Reviewed by Benjamin Poulain.
+
+        * Configurations/WebCore.xcconfig:
+        (EXCLUDED_SOURCE_FILE_NAMES_iphoneos): Add SharedTimerMac.mm.
+        * WebCore.xcodeproj/project.pbxproj: Add SharedTimerIOS.mm.
+        * platform/ios/SharedTimerIOS.mm: Add.
+        (WebCore):
+        (-[WebCoreResumeNotifierIOS init]):
+        (-[WebCoreResumeNotifierIOS dealloc]):
+        (-[WebCoreResumeNotifierIOS didWake]):
+        (WebCore::setSharedTimerFiredFunction):
+        (WebCore::timerFired):
+        (WebCore::setSharedTimerFireInterval):
+        (WebCore::stopSharedTimer):
+
 2013-02-20  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/Configurations/WebCore.xcconfig

@@ -106 +106 @@
 
 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME)) $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)_$(PLATFORM_NAME)) $(EXCLUDED_SOURCE_FILE_NAMES_SVG_DOM_OBJC_BINDINGS);
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png Cursor.cpp CursorMac.mm EventHandlerMac.mm HTMLConverter.mm KillRingMac.mm PlatformEventFactoryMac.mm SSLKeyGeneratorMac.cpp SearchPopupMenuMac.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm localizedStrings.js;
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png Cursor.cpp CursorMac.mm EventHandlerMac.mm HTMLConverter.mm KillRingMac.mm PlatformEventFactoryMac.mm SSLKeyGeneratorMac.cpp SearchPopupMenuMac.mm SharedTimerMac.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm localizedStrings.js;
 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
 EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp;

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

@@ -6322 +6322 @@
                 E45322AB140CE267005A0F92 /* SelectorQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45322A9140CE267005A0F92 /* SelectorQuery.cpp */; };
                 E45322AC140CE267005A0F92 /* SelectorQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = E45322AA140CE267005A0F92 /* SelectorQuery.h */; };
+                E45390460EAFD637003695C8 /* SharedTimerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390350EAFD637003695C8 /* SharedTimerIOS.mm */; };
                 E462A4A1113E71BE004A4220 /* IntPointHash.h in Headers */ = {isa = PBXBuildFile; fileRef = E462A4A0113E71BE004A4220 /* IntPointHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E47127CA163438A100ED6F5A /* StyleInvalidationAnalysis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E47A97CE163059FC005DCD99 /* StyleInvalidationAnalysis.cpp */; };
@@ -13996 +13997 @@
                 E45322A9140CE267005A0F92 /* SelectorQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectorQuery.cpp; sourceTree = "<group>"; };
                 E45322AA140CE267005A0F92 /* SelectorQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectorQuery.h; sourceTree = "<group>"; };
+                E45390350EAFD637003695C8 /* SharedTimerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SharedTimerIOS.mm; path = ios/SharedTimerIOS.mm; sourceTree = "<group>"; };
                 E462A4A0113E71BE004A4220 /* IntPointHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntPointHash.h; sourceTree = "<group>"; };
                 E4778B7D115A581A00B5D372 /* JSCustomEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomEvent.cpp; sourceTree = "<group>"; };
@@ -18841 +18843 @@
                                 265541371489811C000DFC5D /* KeyEventCodesIOS.h */,
                                 265541381489811C000DFC5D /* KeyEventIOS.mm */,
+                                E45390350EAFD637003695C8 /* SharedTimerIOS.mm */,
                         );
                         name = ios;
@@ -29258 +29261 @@
                                 512DD8E30D91E2B4000F89EE /* SharedBufferCF.cpp in Sources */,
                                 97B1F02E13B025CA00F5103F /* SharedBufferChunkReader.cpp in Sources */,
+                                E45390460EAFD637003695C8 /* SharedTimerIOS.mm in Sources */,
                                 1A4A95520B4EDCFF002D8C3C /* SharedBufferMac.mm in Sources */,
                                 93309EA2099EB78C0056E581 /* SharedTimerMac.mm in Sources */,