Changeset 106978 in webkit

Timestamp:

Feb 7, 2012 12:48:30 PM (12 years ago)

Author:

jer.noble@apple.com

Message:

Use CMClock as a timing source for PlatformClock where available.
​https://bugs.webkit.org/show_bug.cgi?id=77885

Reviewed by Eric Carlson.

Source/JavaScriptCore:

• wtf/Platform.h: Added WTF_USE_COREMEDIA.

Source/WebCore:

No new tests; performance improvement covered by existing test cases.

• WebCore.xcodeproj/project.pbxproj:
• platform/Clock.cpp:

(Clock::create): Use PlatformClockCM if available.

• platform/mac/PlatformClockCM.h: Added.

(WebCore::PlatformClockCM::playRate):
(WebCore::PlatformClockCM::isRunning):

• platform/mac/PlatformClockCM.mm: Added.

(PlatformClockCM::PlatformClockCM):
(PlatformClockCM::initializeWithTimingSource):
(PlatformClockCM::setCurrentTime):
(PlatformClockCM::currentTime):
(PlatformClockCM::setPlayRate):
(PlatformClockCM::start):
(PlatformClockCM::stop):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/Platform.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCore/platform/Clock.cpp (modified) (2 diffs)
• WebCore/platform/mac/PlatformClockCM.h (copied) (copied from trunk/Source/WebCore/platform/Clock.cpp) (2 diffs)
• WebCore/platform/mac/PlatformClockCM.mm (added)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-02-06  Jer Noble  <jer.noble@apple.com>
+
+        Use CMClock as a timing source for PlatformClock where available.
+        https://bugs.webkit.org/show_bug.cgi?id=77885
+
+        Reviewed by Eric Carlson.
+
+        * wtf/Platform.h: Added WTF_USE_COREMEDIA.
+
 2012-02-06  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/wtf/Platform.h

@@ -1142 +1142 @@
 #endif
 
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
+#define WTF_USE_COREMEDIA 1
+#endif
+
 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || (PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO)) || PLATFORM(QT)
 #define WTF_USE_REQUEST_ANIMATION_FRAME_TIMER 1

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Jer Noble  <jer.noble@apple.com>
+
+        Use CMClock as a timing source for PlatformClock where available.
+        https://bugs.webkit.org/show_bug.cgi?id=77885
+
+        Reviewed by Eric Carlson.
+
+        No new tests; performance improvement covered by existing test cases.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/Clock.cpp:
+        (Clock::create): Use PlatformClockCM if available.
+        * platform/mac/PlatformClockCM.h: Added.
+        (WebCore::PlatformClockCM::playRate):
+        (WebCore::PlatformClockCM::isRunning):
+        * platform/mac/PlatformClockCM.mm: Added.
+        (PlatformClockCM::PlatformClockCM):
+        (PlatformClockCM::initializeWithTimingSource):
+        (PlatformClockCM::setCurrentTime):
+        (PlatformClockCM::currentTime):
+        (PlatformClockCM::setPlayRate):
+        (PlatformClockCM::start):
+        (PlatformClockCM::stop):
+
 2012-02-06  Anders Carlsson  <andersca@apple.com>
 

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

@@ -5599 +5599 @@
                 CD8203101395ACE700F956C6 /* WebWindowAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = CD82030E1395ACE700F956C6 /* WebWindowAnimation.h */; };
                 CD8203111395ACE700F956C6 /* WebWindowAnimation.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD82030F1395ACE700F956C6 /* WebWindowAnimation.mm */; };
+                CDAA8D0A14D71B2E0061EA60 /* PlatformClockCM.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDAA8D0814D385600061EA60 /* PlatformClockCM.mm */; };
                 CDD525D7145B6DD0008D204D /* JSHTMLMediaElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDF65CCC145B6AFE00C4C7AA /* JSHTMLMediaElementCustom.cpp */; };
                 CDEA763014608A53008B31F1 /* PlatformClockCA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDEA762E146084DE008B31F1 /* PlatformClockCA.cpp */; };
@@ -12551 +12552 @@
                 CD82030E1395ACE700F956C6 /* WebWindowAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebWindowAnimation.h; sourceTree = "<group>"; };
                 CD82030F1395ACE700F956C6 /* WebWindowAnimation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebWindowAnimation.mm; sourceTree = "<group>"; };
+                CDAA8D0714D385600061EA60 /* PlatformClockCM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformClockCM.h; sourceTree = "<group>"; };
+                CDAA8D0814D385600061EA60 /* PlatformClockCM.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformClockCM.mm; sourceTree = "<group>"; };
                 CDBD93BA1333BD4B002570E3 /* fullscreenQuickTime.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = fullscreenQuickTime.css; sourceTree = "<group>"; };
                 CDCE5CD014633BC900D47CCA /* EventTargetFactory.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EventTargetFactory.in; sourceTree = "<group>"; };
@@ -15036 +15039 @@
                                 CDEA762E146084DE008B31F1 /* PlatformClockCA.cpp */,
                                 CDEA762F146084EE008B31F1 /* PlatformClockCA.h */,
+                                CDAA8D0714D385600061EA60 /* PlatformClockCM.h */,
+                                CDAA8D0814D385600061EA60 /* PlatformClockCM.mm */,
                                 BCAA486E14A052530088FAC4 /* PlatformEventFactoryMac.h */,
                                 BCAA486D14A052530088FAC4 /* PlatformEventFactoryMac.mm */,
@@ -27093 +27098 @@
                                 1AAADDE814DC8DF800AF64B3 /* ScrollingTreeNodeMac.mm in Sources */,
                                 7A54857F14E02D51006AE05A /* InspectorHistory.cpp in Sources */,
+                                CDAA8D0A14D71B2E0061EA60 /* PlatformClockCM.mm in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/Source/WebCore/platform/Clock.cpp

@@ -27 +27 @@
 #include "Clock.h"
 
-#if USE(COREAUDIO)
+#if USE(COREMEDIA)
+    #include "PlatformClockCM.h"
+#elif USE(COREAUDIO)
     #include "PlatformClockCA.h"
 #else
@@ -37 +39 @@
 PassRefPtr<Clock> Clock::create()
 {
-#if USE(COREAUDIO)
+#if USE(COREMEDIA)
+    return adoptRef(new PlatformClockCM());
+#elif USE(COREAUDIO)
     return adoptRef(new PlatformClockCA());
 #else

trunk/Source/WebCore/platform/mac/PlatformClockCM.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2011 Apple Inc.  All rights reserved.
+ * Copyright (C) 2012 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21 +21 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
+#ifndef PlatformClockCM_h
+#define PlatformClockCM_h
+
+#if USE(COREMEDIA)
+
 #include "Clock.h"
+#include <wtf/RetainPtr.h>
 
-#if USE(COREAUDIO)
-    #include "PlatformClockCA.h"
-#else
-    #include "ClockGeneric.h"
+typedef struct OpaqueCMTimebase* CMTimebaseRef;
+typedef struct OpaqueCMClock* CMClockRef;
+
+namespace WebCore {
+
+class PlatformClockCM : public Clock {
+public:
+    PlatformClockCM();
+    PlatformClockCM(CMClockRef);
+
+private:
+    void initializeWithTimingSource(CMClockRef);
+
+    virtual void setCurrentTime(float);
+    virtual float currentTime() const;
+
+    virtual void setPlayRate(float);
+    virtual float playRate() const { return m_rate; }
+
+    virtual void start();
+    virtual void stop();
+    virtual bool isRunning() const { return m_running; }
+
+    RetainPtr<CMTimebaseRef> m_timebase;
+    float m_rate;
+    bool m_running;
+};
+
+}
+
 #endif
 
-using namespace WebCore;
-
-PassRefPtr<Clock> Clock::create()
-{
-#if USE(COREAUDIO)
-    return adoptRef(new PlatformClockCA());
-#else
-    return adoptRef(new ClockGeneric());
 #endif
-}