Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1428)

Unified Diff: third_party/WebKit/Source/platform/graphics/BitmapImage.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp b/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
index 5cd759c6dbf5937ca00aefae778bc9e647accec9..a88de5a1b28ca5a826977dd8af152bb46ff06973 100644
--- a/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
+++ b/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
@@ -490,7 +490,7 @@ void BitmapImage::startAnimation(CatchUpAnimation catchUpIfNecessary) {
if (catchUpIfNecessary == DoNotCatchUp || time < m_desiredFrameStartTime) {
// Haven't yet reached time for next frame to start; delay until then.
- m_frameTimer = wrapUnique(
+ m_frameTimer = WTF::wrapUnique(
new Timer<BitmapImage>(this, &BitmapImage::advanceAnimation));
m_frameTimer->startOneShot(std::max(m_desiredFrameStartTime - time, 0.),
BLINK_FROM_HERE);
@@ -521,7 +521,7 @@ void BitmapImage::startAnimation(CatchUpAnimation catchUpIfNecessary) {
// may be in the past, meaning the next time through this function we'll
// kick off the next advancement sooner than this frame's duration would
// suggest.
- m_frameTimer = wrapUnique(new Timer<BitmapImage>(
+ m_frameTimer = WTF::wrapUnique(new Timer<BitmapImage>(
this, &BitmapImage::advanceAnimationWithoutCatchUp));
m_frameTimer->startOneShot(0, BLINK_FROM_HERE);
}
@@ -604,7 +604,7 @@ bool BitmapImage::internalAdvanceAnimation(AnimationAdvancement advancement) {
// last frame. Skipping frames occurs while painting so we do not
// synchronously notify the observer which could cause a layout.
if (advancement == SkipFramesToCatchUp) {
- m_frameTimer = wrapUnique(new Timer<BitmapImage>(
+ m_frameTimer = WTF::wrapUnique(new Timer<BitmapImage>(
this, &BitmapImage::notifyObserversOfAnimationAdvance));
m_frameTimer->startOneShot(0, BLINK_FROM_HERE);
}

Powered by Google App Engine
This is Rietveld 408576698