Diff
Modified: trunk/ChangeLog (141655 => 141656)
--- trunk/ChangeLog 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/ChangeLog 2013-02-01 23:55:46 UTC (rev 141656)
@@ -1,3 +1,12 @@
+2013-02-01 Benjamin Poulain <bpoul...@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 <zdober...@igalia.com>
[GTK] Add WTFURL source files to the build
Modified: trunk/Source/WebCore/ChangeLog (141655 => 141656)
--- trunk/Source/WebCore/ChangeLog 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/WebCore/ChangeLog 2013-02-01 23:55:46 UTC (rev 141656)
@@ -1,3 +1,30 @@
+2013-02-01 Benjamin Poulain <bpoul...@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 <dmazz...@google.com>
AX: memoize expensive computation during blocks where tree doesn't change
Modified: trunk/Source/WebCore/WebCore.exp.in (141655 => 141656)
--- trunk/Source/WebCore/WebCore.exp.in 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-02-01 23:55:46 UTC (rev 141656)
@@ -541,7 +541,7 @@
__ZN7WebCore18proxyServersForURLERKNS_4KURLEPKNS_17NetworkingContextE
__ZN7WebCore19AnimationController16resumeAnimationsEv
__ZN7WebCore19AnimationController17suspendAnimationsEv
-__ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF6StringEd
+__ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF12AtomicStringEd
__ZN7WebCore19AnimationController21pauseTransitionAtTimeEPNS_12RenderObjectERKN3WTF6StringEd
__ZN7WebCore19BackForwardListImpl10removeItemEPNS_11HistoryItemE
__ZN7WebCore19BackForwardListImpl10setEnabledEb
Modified: trunk/Source/WebCore/page/animation/AnimationController.cpp (141655 => 141656)
--- trunk/Source/WebCore/page/animation/AnimationController.cpp 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/WebCore/page/animation/AnimationController.cpp 2013-02-01 23:55:46 UTC (rev 141656)
@@ -320,7 +320,7 @@
updateAnimationTimer();
}
-bool AnimationControllerPrivate::pauseAnimationAtTime(RenderObject* renderer, const String& name, double t)
+bool AnimationControllerPrivate::pauseAnimationAtTime(RenderObject* renderer, const AtomicString& name, double t)
{
if (!renderer)
return false;
@@ -561,7 +561,7 @@
m_data->receivedStartTimeResponse(startTime);
}
-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);
}
Modified: trunk/Source/WebCore/page/animation/AnimationController.h (141655 => 141656)
--- trunk/Source/WebCore/page/animation/AnimationController.h 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/WebCore/page/animation/AnimationController.h 2013-02-01 23:55:46 UTC (rev 141656)
@@ -56,7 +56,7 @@
// This is called when an accelerated animation or transition has actually started to animate.
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
Modified: trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h (141655 => 141656)
--- trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h 2013-02-01 23:55:46 UTC (rev 141656)
@@ -87,7 +87,7 @@
bool isRunningAnimationOnRenderer(RenderObject*, CSSPropertyID, bool isRunningNow) const;
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;
Modified: trunk/Source/WebCore/page/animation/CompositeAnimation.cpp (141655 => 141656)
--- trunk/Source/WebCore/page/animation/CompositeAnimation.cpp 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/WebCore/page/animation/CompositeAnimation.cpp 2013-02-01 23:55:46 UTC (rev 141656)
@@ -478,9 +478,6 @@
bool CompositeAnimation::pauseAnimationAtTime(const AtomicString& name, double t)
{
- if (!name)
- return false;
-
m_keyframeAnimations.checkConsistency();
RefPtr<KeyframeAnimation> keyframeAnim = m_keyframeAnimations.get(name.impl());
Modified: trunk/Source/WebCore/testing/Internals.cpp (141655 => 141656)
--- trunk/Source/WebCore/testing/Internals.cpp 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/WebCore/testing/Internals.cpp 2013-02-01 23:55:46 UTC (rev 141656)
@@ -424,7 +424,7 @@
return false;
}
- return frame()->animation()->pauseAnimationAtTime(pseudoElement->renderer(), animationName, pauseTime);
+ return frame()->animation()->pauseAnimationAtTime(pseudoElement->renderer(), AtomicString(animationName), pauseTime);
}
bool Internals::pauseTransitionAtTimeOnPseudoElement(const String& property, double pauseTime, Element* element, const String& pseudoId, ExceptionCode& ec)
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in (141655 => 141656)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in 2013-02-01 23:55:46 UTC (rev 141656)
@@ -381,7 +381,7 @@
??0StyleSheetContents@WebCore@@AAE@PAVStyleRuleImport@1@ABVString@WTF@@ABUCSSParserContext@1@@Z
?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
?addFromLiteralData@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PBDI@Z
@@ -768,7 +768,7 @@
??0StyleSheetContents@WebCore@@AAE@PAVStyleRuleImport@1@ABVString@WTF@@ABUCSSParserContext@1@@Z
?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
?addFromLiteralData@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PBDI@Z
@@ -1154,7 +1154,7 @@
??0StyleSheetContents@WebCore@@AAE@PAVStyleRuleImport@1@ABVString@WTF@@ABUCSSParserContext@1@@Z
?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
?addFromLiteralData@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PBDI@Z
@@ -1546,7 +1546,7 @@
??0StyleSheetContents@WebCore@@AAE@PAVStyleRuleImport@1@ABVString@WTF@@ABUCSSParserContext@1@@Z
?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
?addFromLiteralData@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PBDI@Z
Modified: trunk/Source/WebKit2/ChangeLog (141655 => 141656)
--- trunk/Source/WebKit2/ChangeLog 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-01 23:55:46 UTC (rev 141656)
@@ -1,3 +1,17 @@
+2013-02-01 Benjamin Poulain <bpoul...@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 <ander...@apple.com>
More work on UI side storage
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp (141655 => 141656)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp 2013-02-01 23:55:46 UTC (rev 141656)
@@ -99,7 +99,7 @@
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);
}
bool WKBundleFramePauseTransitionOnElementWithId(WKBundleFrameRef frameRef, WKStringRef propertyName, WKStringRef elementID, double time)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (141655 => 141656)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-02-01 23:55:46 UTC (rev 141656)
@@ -430,7 +430,7 @@
return controller->numberOfActiveAnimations(m_coreFrame->document());
}
-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)
return false;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h (141655 => 141656)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2013-02-01 23:55:46 UTC (rev 141656)
@@ -116,7 +116,7 @@
static String markerText(JSObjectRef element);
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();
void resumeAnimations();
Modified: trunk/Source/autotools/symbols.filter (141655 => 141656)
--- trunk/Source/autotools/symbols.filter 2013-02-01 23:50:41 UTC (rev 141655)
+++ trunk/Source/autotools/symbols.filter 2013-02-01 23:55:46 UTC (rev 141656)
@@ -158,7 +158,7 @@
_ZN7WebCore18ContentDistributor22ensureSelectFeatureSetEPNS_13ElementShadowE;
_ZN7WebCore19AnimationController17suspendAnimationsEv;
_ZN7WebCore19AnimationController16resumeAnimationsEv;
-_ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF6StringEd;
+_ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF12AtomicStringEd;
_ZN7WebCore19AnimationController21pauseTransitionAtTimeEPNS_12RenderObjectERKN3WTF6StringEd;
_ZN7WebCore19InspectorController18setProfilerEnabledEb;
_ZN7WebCore19InspectorController15profilerEnabledEv;
