Changeset 141656 in webkit

Timestamp:

Feb 1, 2013 3:55:46 PM (11 years ago)

Author:

benjamin@webkit.org

Message:

Clean the String->AtomicString conversion for AnimationController::pauseAnimationAtTime
​https://bugs.webkit.org/show_bug.cgi?id=108558

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2013-02-01
Reviewed by Dean Jackson.

.:

• Source/autotools/symbols.filter:

Source/WebCore:

This is a step torward killing the implicit conversion from String to AtomicString.

The animation name are AtomicString. The API is changed all the way to the callers
to take an AtomicString. When needed, we use explicit conversion.

• WebCore.exp.in:
• page/animation/AnimationController.cpp:

(WebCore::AnimationControllerPrivate::pauseAnimationAtTime):
(WebCore::AnimationController::pauseAnimationAtTime):

• page/animation/AnimationController.h:

(AnimationController):

• page/animation/AnimationControllerPrivate.h:

(AnimationControllerPrivate):

• page/animation/CompositeAnimation.cpp:

(WebCore::CompositeAnimation::pauseAnimationAtTime):
We should not null check the name. Getting a null name from the HashMap would be
an error from the tests, and the HashMap would never return a value anyway.

• testing/Internals.cpp:

(WebCore::Internals::pauseAnimationAtTimeOnPseudoElement):

Source/WebKit2:

• WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:

(WKBundleFramePauseAnimationOnElementWithId):

• WebProcess/WebPage/WebFrame.cpp:

(WebKit::WebFrame::pauseAnimationOnElementWithId):

• WebProcess/WebPage/WebFrame.h:

(WebFrame):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.exp.in (modified) (1 diff)
• Source/WebCore/page/animation/AnimationController.cpp (modified) (2 diffs)
• Source/WebCore/page/animation/AnimationController.h (modified) (1 diff)
• Source/WebCore/page/animation/AnimationControllerPrivate.h (modified) (1 diff)
• Source/WebCore/page/animation/CompositeAnimation.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in (modified) (4 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/WebPage/WebFrame.h (modified) (1 diff)
• Source/autotools/symbols.filter (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2013-02-01  Benjamin Poulain  <bpoulain@apple.com>
+
+        Clean the String->AtomicString conversion for AnimationController::pauseAnimationAtTime
+        https://bugs.webkit.org/show_bug.cgi?id=108558
+
+        Reviewed by Dean Jackson.
+
+        * Source/autotools/symbols.filter:
+
 2013-02-01  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-01  Benjamin Poulain  <bpoulain@apple.com>
+
+        Clean the String->AtomicString conversion for AnimationController::pauseAnimationAtTime
+        https://bugs.webkit.org/show_bug.cgi?id=108558
+
+        Reviewed by Dean Jackson.
+
+        This is a step torward killing the implicit conversion from String to AtomicString.
+
+        The animation name are AtomicString. The API is changed all the way to the callers
+        to take an AtomicString. When needed, we use explicit conversion.
+
+        * WebCore.exp.in:
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationControllerPrivate::pauseAnimationAtTime):
+        (WebCore::AnimationController::pauseAnimationAtTime):
+        * page/animation/AnimationController.h:
+        (AnimationController):
+        * page/animation/AnimationControllerPrivate.h:
+        (AnimationControllerPrivate):
+        * page/animation/CompositeAnimation.cpp:
+        (WebCore::CompositeAnimation::pauseAnimationAtTime):
+        We should not null check the name. Getting a null name from the HashMap would be
+        an error from the tests, and the HashMap would never return a value anyway.
+        * testing/Internals.cpp:
+        (WebCore::Internals::pauseAnimationAtTimeOnPseudoElement):
+
 2013-02-01  Dominic Mazzoni  <dmazzoni@google.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -542 +542 @@
 __ZN7WebCore19AnimationController16resumeAnimationsEv
 __ZN7WebCore19AnimationController17suspendAnimationsEv
-__ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF6StringEd
+__ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF12AtomicStringEd
 __ZN7WebCore19AnimationController21pauseTransitionAtTimeEPNS_12RenderObjectERKN3WTF6StringEd
 __ZN7WebCore19BackForwardListImpl10removeItemEPNS_11HistoryItemE

trunk/Source/WebCore/page/animation/AnimationController.cpp

@@ -321 +321 @@
 }
 
-bool AnimationControllerPrivate::pauseAnimationAtTime(RenderObject* renderer, const String& name, double t)
+bool AnimationControllerPrivate::pauseAnimationAtTime(RenderObject* renderer, const AtomicString& name, double t)
 {
     if (!renderer)
@@ -562 +562 @@
 }
 
-bool AnimationController::pauseAnimationAtTime(RenderObject* renderer, const String& name, double t)
+bool AnimationController::pauseAnimationAtTime(RenderObject* renderer, const AtomicString& name, double t)
 {
     return m_data->pauseAnimationAtTime(renderer, name, t);

trunk/Source/WebCore/page/animation/AnimationController.h

@@ -57 +57 @@
     void notifyAnimationStarted(RenderObject*, double startTime);
 
-    bool pauseAnimationAtTime(RenderObject*, const String& name, double t); // To be used only for testing
+    bool pauseAnimationAtTime(RenderObject*, const AtomicString& name, double t); // To be used only for testing
     bool pauseTransitionAtTime(RenderObject*, const String& property, double t); // To be used only for testing
     unsigned numberOfActiveAnimations(Document*) const; // To be used only for testing

trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h

@@ -88 +88 @@
     bool isRunningAcceleratedAnimationOnRenderer(RenderObject*, CSSPropertyID, bool isRunningNow) const;
 
-    bool pauseAnimationAtTime(RenderObject*, const String& name, double t);
+    bool pauseAnimationAtTime(RenderObject*, const AtomicString& name, double t);
     bool pauseTransitionAtTime(RenderObject*, const String& property, double t);
     unsigned numberOfActiveAnimations(Document*) const;

trunk/Source/WebCore/page/animation/CompositeAnimation.cpp

@@ -479 +479 @@
 bool CompositeAnimation::pauseAnimationAtTime(const AtomicString& name, double t)
 {
-    if (!name)
-        return false;
-
     m_keyframeAnimations.checkConsistency();
 

trunk/Source/WebCore/testing/Internals.cpp

@@ -425 +425 @@
     }
 
-    return frame()->animation()->pauseAnimationAtTime(pseudoElement->renderer(), animationName, pauseTime);
+    return frame()->animation()->pauseAnimationAtTime(pseudoElement->renderer(), AtomicString(animationName), pauseTime);
 }
 

trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in

@@ -382 +382 @@
         ?addUserSheet@DocumentStyleSheetCollection@WebCore@@QAEXV?$PassRefPtr@VStyleSheetContents@WebCore@@@WTF@@@Z
         ??1StyleSheetContents@WebCore@@QAE@XZ
-        ?pauseAnimationAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVString@WTF@@N@Z
+        ?pauseAnimationAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVAtomicString@WTF@@N@Z
         ?pseudoElement@Element@WebCore@@QBEPAVPseudoElement@2@W4PseudoId@2@@Z
         ?pauseTransitionAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVString@WTF@@N@Z
@@ -769 +769 @@
         ?addUserSheet@DocumentStyleSheetCollection@WebCore@@QAEXV?$PassRefPtr@VStyleSheetContents@WebCore@@@WTF@@@Z
         ??1StyleSheetContents@WebCore@@QAE@XZ
-        ?pauseAnimationAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVString@WTF@@N@Z
+        ?pauseAnimationAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVAtomicString@WTF@@N@Z
         ?pseudoElement@Element@WebCore@@QBEPAVPseudoElement@2@W4PseudoId@2@@Z
         ?pauseTransitionAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVString@WTF@@N@Z
@@ -1155 +1155 @@
         ?addUserSheet@DocumentStyleSheetCollection@WebCore@@QAEXV?$PassRefPtr@VStyleSheetContents@WebCore@@@WTF@@@Z
         ??1StyleSheetContents@WebCore@@QAE@XZ
-        ?pauseAnimationAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVString@WTF@@N@Z
+        ?pauseAnimationAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVAtomicString@WTF@@N@Z
         ?pseudoElement@Element@WebCore@@QBEPAVPseudoElement@2@W4PseudoId@2@@Z
         ?pauseTransitionAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVString@WTF@@N@Z
@@ -1547 +1547 @@
         ?addUserSheet@DocumentStyleSheetCollection@WebCore@@QAEXV?$PassRefPtr@VStyleSheetContents@WebCore@@@WTF@@@Z
         ??1StyleSheetContents@WebCore@@QAE@XZ
-        ?pauseAnimationAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVString@WTF@@N@Z
+        ?pauseAnimationAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVAtomicString@WTF@@N@Z
         ?pseudoElement@Element@WebCore@@QBEPAVPseudoElement@2@W4PseudoId@2@@Z
         ?pauseTransitionAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVString@WTF@@N@Z

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-01  Benjamin Poulain  <bpoulain@apple.com>
+
+        Clean the String->AtomicString conversion for AnimationController::pauseAnimationAtTime
+        https://bugs.webkit.org/show_bug.cgi?id=108558
+
+        Reviewed by Dean Jackson.
+
+        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+        (WKBundleFramePauseAnimationOnElementWithId):
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::pauseAnimationOnElementWithId):
+        * WebProcess/WebPage/WebFrame.h:
+        (WebFrame):
+
 2013-02-01  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp

@@ -100 +100 @@
 bool WKBundleFramePauseAnimationOnElementWithId(WKBundleFrameRef frameRef, WKStringRef animationName, WKStringRef elementID, double time)
 {
-    return toImpl(frameRef)->pauseAnimationOnElementWithId(toWTFString(animationName), toWTFString(elementID), time);
+    return toImpl(frameRef)->pauseAnimationOnElementWithId(AtomicString(toWTFString(animationName)), toWTFString(elementID), time);
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp

@@ -431 +431 @@
 }
 
-bool WebFrame::pauseAnimationOnElementWithId(const String& animationName, const String& elementID, double time)
+bool WebFrame::pauseAnimationOnElementWithId(const AtomicString& animationName, const String& elementID, double time)
 {
     if (!m_coreFrame)

trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h

@@ -117 +117 @@
 
     unsigned numberOfActiveAnimations() const;
-    bool pauseAnimationOnElementWithId(const String& animationName, const String& elementID, double time);
+    bool pauseAnimationOnElementWithId(const AtomicString& animationName, const String& elementID, double time);
     bool pauseTransitionOnElementWithId(const String& propertyName, const String& elementID, double time);
     void suspendAnimations();

trunk/Source/autotools/symbols.filter

@@ -159 +159 @@
 _ZN7WebCore19AnimationController17suspendAnimationsEv;
 _ZN7WebCore19AnimationController16resumeAnimationsEv;
-_ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF6StringEd;
+_ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF12AtomicStringEd;
 _ZN7WebCore19AnimationController21pauseTransitionAtTimeEPNS_12RenderObjectERKN3WTF6StringEd;
 _ZN7WebCore19InspectorController18setProfilerEnabledEb;