[Chromium] Avoid aliasing global symbol monotonicallyIncreasingTime().
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Aug 2012 19:54:00 +0000 (19:54 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Aug 2012 19:54:00 +0000 (19:54 +0000)
commit4fe13c837db4c603a1f1dfb68c86909250c251a1
tree9b133affecabe5ec4ef64c6b63495db0c3f9f77d
parent5c6d3e2349085a09903a4690f222e61e8833315b
[Chromium] Avoid aliasing global symbol monotonicallyIncreasingTime().
https://bugs.webkit.org/show_bug.cgi?id=94233

Patch by David Reveman <reveman@chromium.org> on 2012-08-16
Reviewed by James Robinson.

Source/WebCore:

Rename virtual function CCDelayBasedTimeSource::monotonicallyIncreasingTime()
that exist for testing purposes to CCDelayBasedTimeSource::monotonicTimeNow().

No new tests.

* platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp:
(WebCore::CCDelayBasedTimeSource::setActive):
(WebCore::CCDelayBasedTimeSource::onTimerFired):
(WebCore::CCDelayBasedTimeSource::monotonicTimeNow):
* platform/graphics/chromium/cc/CCDelayBasedTimeSource.h:

Source/WebKit/chromium:

* tests/CCDelayBasedTimeSourceTest.cpp:
(WebKitTests::TEST):
* tests/CCFrameRateControllerTest.cpp:
(WebKitTests::TEST):
* tests/CCSchedulerTestCommon.h:
(WebKitTests::FakeCCDelayBasedTimeSource::setMonotonicTimeNow):
(WebKitTests::FakeCCDelayBasedTimeSource::FakeCCDelayBasedTimeSource):
(FakeCCDelayBasedTimeSource):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125802 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp
Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/tests/CCDelayBasedTimeSourceTest.cpp
Source/WebKit/chromium/tests/CCFrameRateControllerTest.cpp
Source/WebKit/chromium/tests/CCSchedulerTestCommon.h