summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2014-10-21 10:09:36 -0700
committerJohn Reck <jreck@google.com>2014-10-21 13:23:56 -0700
commitbb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2 (patch)
tree661b6c6d833d545fc3f91fab7810ab73febc21a5 /libs
parentea6f0ae86d62cff88d63b926578c588a956d0512 (diff)
downloadframeworks_base-bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2.zip
frameworks_base-bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2.tar.gz
frameworks_base-bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2.tar.bz2
Surface:lockHardwareCanvas
Bug: 17440886 Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/renderthread/TimeLord.cpp2
-rw-r--r--libs/hwui/tests/main.cpp4
2 files changed, 3 insertions, 3 deletions
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;