diff options
| author | John Reck <jreck@google.com> | 2014-10-21 21:39:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 21:39:36 +0000 |
| commit | 76f24bde7816dd97ed2375ec41c9817be0330d9f (patch) | |
| tree | 9d43594953773de2f7fa76cf37b65abfdcc7fb55 /libs | |
| parent | aec33e66acbcf83a58b0e7af14c6330f48063bf8 (diff) | |
| parent | e73a54f33c029552469fcf1cda46eed2f360a38e (diff) | |
| download | frameworks_base-76f24bde7816dd97ed2375ec41c9817be0330d9f.zip frameworks_base-76f24bde7816dd97ed2375ec41c9817be0330d9f.tar.gz frameworks_base-76f24bde7816dd97ed2375ec41c9817be0330d9f.tar.bz2 | |
am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev
* commit 'e73a54f33c029552469fcf1cda46eed2f360a38e':
Surface:lockHardwareCanvas
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/renderthread/TimeLord.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/tests/main.cpp | 4 |
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; |