summaryrefslogtreecommitdiffstats
path: root/libs/hwui/tests/main.cpp
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2014-10-21 23:34:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-10-21 23:34:46 +0000
commit7ab73f1e983cf2be077d147d0542974a8f768431 (patch)
treea131b368015eff93a4a302193ea1eadc76c50fbe /libs/hwui/tests/main.cpp
parent013ccb64302e18d4b6461351448a1fd6b9a7c53d (diff)
parent76f24bde7816dd97ed2375ec41c9817be0330d9f (diff)
downloadframeworks_base-7ab73f1e983cf2be077d147d0542974a8f768431.zip
frameworks_base-7ab73f1e983cf2be077d147d0542974a8f768431.tar.gz
frameworks_base-7ab73f1e983cf2be077d147d0542974a8f768431.tar.bz2
am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev
automerge: 76f24bd * commit '76f24bde7816dd97ed2375ec41c9817be0330d9f': Surface:lockHardwareCanvas
Diffstat (limited to 'libs/hwui/tests/main.cpp')
-rw-r--r--libs/hwui/tests/main.cpp4
1 files changed, 2 insertions, 2 deletions
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;