From bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2 Mon Sep 17 00:00:00 2001 From: John Reck Date: Tue, 21 Oct 2014 10:09:36 -0700 Subject: Surface:lockHardwareCanvas Bug: 17440886 Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a --- libs/hwui/renderthread/TimeLord.cpp | 2 +- libs/hwui/tests/main.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libs') diff --git a/libs/hwui/renderthread/TimeLord.cpp b/libs/hwui/renderthread/TimeLord.cpp index cf3d039..9bd4eae 100644 --- a/libs/hwui/renderthread/TimeLord.cpp +++ b/libs/hwui/renderthread/TimeLord.cpp @@ -20,7 +20,7 @@ namespace uirenderer { namespace renderthread { TimeLord::TimeLord() - : mFrameIntervalNanos(0) + : mFrameIntervalNanos(milliseconds_to_nanoseconds(16)) , mFrameTimeNanos(0) { } diff --git a/libs/hwui/tests/main.cpp b/libs/hwui/tests/main.cpp index 3e9a86f..2b80d56 100644 --- a/libs/hwui/tests/main.cpp +++ b/libs/hwui/tests/main.cpp @@ -81,8 +81,8 @@ int main(int argc, char* argv[]) { rootNode->mutateStagingProperties().setClipToBounds(false); rootNode->setPropertyFieldsDirty(RenderNode::GENERIC); - RenderProxy* proxy = new RenderProxy(false, rootNode, new ContextFactory()); - proxy->setFrameInterval(milliseconds_to_nanoseconds(16)); + ContextFactory factory; + RenderProxy* proxy = new RenderProxy(false, rootNode, &factory); proxy->loadSystemProperties(); proxy->initialize(surface); float lightX = width / 2.0; -- cgit v1.1