projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
core
/
animation
/
AnimationNodeTest.cpp
diff --git
a/src/third_party/WebKit/Source/core/animation/AnimationNodeTest.cpp
b/src/third_party/WebKit/Source/core/animation/AnimationNodeTest.cpp
index
944c3c4
..
527fce4
100644
(file)
--- a/
src/third_party/WebKit/Source/core/animation/AnimationNodeTest.cpp
+++ b/
src/third_party/WebKit/Source/core/animation/AnimationNodeTest.cpp
@@
-33,7
+33,7
@@
#include <gtest/gtest.h>
#include <gtest/gtest.h>
-using namespace
WebCore
;
+using namespace
blink
;
namespace {
namespace {
@@
-74,7
+74,7
@@
public:
virtual void updateChildrenAndEffects() const OVERRIDE { }
void willDetach() { }
virtual void updateChildrenAndEffects() const OVERRIDE { }
void willDetach() { }
- TestAnimationNodeEventDelegate* eventDelegate() { return m_eventDelegate; }
+ TestAnimationNodeEventDelegate* eventDelegate() { return m_eventDelegate
.get()
; }
virtual double calculateTimeToEffectChange(bool forwards, double localTime, double timeToNextIteration) const OVERRIDE
{
m_localTime = localTime;
virtual double calculateTimeToEffectChange(bool forwards, double localTime, double timeToNextIteration) const OVERRIDE
{
m_localTime = localTime;
@@
-95,14
+95,20
@@
public:
return result;
}
return result;
}
+ virtual void trace(Visitor* visitor) OVERRIDE
+ {
+ visitor->trace(m_eventDelegate);
+ AnimationNode::trace(visitor);
+ }
+
private:
TestAnimationNode(const Timing& specified, TestAnimationNodeEventDelegate* eventDelegate)
private:
TestAnimationNode(const Timing& specified, TestAnimationNodeEventDelegate* eventDelegate)
- : AnimationNode(specified, adoptPtr(eventDelegate))
+ : AnimationNode(specified, adoptPtr
WillBeNoop
(eventDelegate))
, m_eventDelegate(eventDelegate)
{
}
, m_eventDelegate(eventDelegate)
{
}
-
TestAnimationNodeEventDelegate*
m_eventDelegate;
+
RawPtrWillBeMember<TestAnimationNodeEventDelegate>
m_eventDelegate;
mutable double m_localTime;
mutable double m_timeToNextIteration;
};
mutable double m_localTime;
mutable double m_timeToNextIteration;
};