OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge WebKit at r71558: Initial merge by git.
[android-x86/external-webkit.git]
/
WebKit
/
chromium
/
src
/
WebAnimationControllerImpl.cpp
diff --git
a/WebKit/chromium/src/WebAnimationControllerImpl.cpp
b/WebKit/chromium/src/WebAnimationControllerImpl.cpp
index
15df140
..
e6eb828
100644
(file)
--- a/
WebKit/chromium/src/WebAnimationControllerImpl.cpp
+++ b/
WebKit/chromium/src/WebAnimationControllerImpl.cpp
@@
-94,7
+94,7
@@
void WebAnimationControllerImpl::suspendAnimations() const
return;
if (!m_frameImpl->frame())
return;
return;
if (!m_frameImpl->frame())
return;
- controller->suspendAnimations(
m_frameImpl->frame()->document()
);
+ controller->suspendAnimations();
}
void WebAnimationControllerImpl::resumeAnimations() const
}
void WebAnimationControllerImpl::resumeAnimations() const
@@
-104,7
+104,7
@@
void WebAnimationControllerImpl::resumeAnimations() const
return;
if (!m_frameImpl->frame())
return;
return;
if (!m_frameImpl->frame())
return;
- controller->resumeAnimations(
m_frameImpl->frame()->document()
);
+ controller->resumeAnimations();
}
} // namespace WebKit
}
} // namespace WebKit