| Index: third_party/WebKit/Source/core/fetch/Resource.cpp
|
| diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp
|
| index 3c0259df274324b98495705f034833e988ce052f..968fa5594a8f3b4cbf8a0794991f4cf11be0ad59 100644
|
| --- a/third_party/WebKit/Source/core/fetch/Resource.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/Resource.cpp
|
| @@ -765,7 +765,7 @@ void Resource::allClientsAndObserversRemoved()
|
| unlock();
|
| }
|
|
|
| -void Resource::cancelTimerFired(Timer<Resource>* timer)
|
| +void Resource::cancelTimerFired(TimerBase* timer)
|
| {
|
| ASSERT_UNUSED(timer, timer == &m_cancelTimer);
|
| if (!hasClientsOrObservers() && m_loader)
|
|
|