diff options
author | John Reck <jreck@google.com> | 2018-05-03 14:40:56 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2018-05-03 15:25:19 -0700 |
commit | d9d7f127b5f07df9434aff67374a0012b1750cd4 (patch) | |
tree | 5be03d634c7b14030e4dd111aecd4b046e70b3fe /libs/hwui/utils | |
parent | ba720d098ebd6bbc1b376bb0945c76dcda3820b6 (diff) |
Delete a bunch of code
This removes the duality of DisplayList, removing a small amount of
overhead
Test: buids & hwuiunit passes
Change-Id: I8bb3a20e9ead1caec4b4a8a3e9f2c08f717a7096
Diffstat (limited to 'libs/hwui/utils')
-rw-r--r-- | libs/hwui/utils/TestWindowContext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/utils/TestWindowContext.cpp b/libs/hwui/utils/TestWindowContext.cpp index 700d3b3cf000..8ac6e1f2d39a 100644 --- a/libs/hwui/utils/TestWindowContext.cpp +++ b/libs/hwui/utils/TestWindowContext.cpp @@ -17,7 +17,6 @@ #include "AnimationContext.h" #include "IContextFactory.h" -#include "RecordingCanvas.h" #include "RenderNode.h" #include "SkTypes.h" #include "gui/BufferQueue.h" @@ -25,6 +24,7 @@ #include "gui/IGraphicBufferConsumer.h" #include "gui/IGraphicBufferProducer.h" #include "gui/Surface.h" +#include "hwui/Canvas.h" #include "renderthread/RenderProxy.h" #include <cutils/memory.h> @@ -81,7 +81,7 @@ public: android::uirenderer::Vector3 lightVector{lightX, -200.0f, 800.0f}; mProxy->setup(800.0f, 255 * 0.075f, 255 * 0.15f); mProxy->setLightCenter(lightVector); - mCanvas.reset(new android::uirenderer::RecordingCanvas(mSize.width(), mSize.height())); + mCanvas.reset(Canvas::create_recording_canvas(mSize.width(), mSize.height(), mRootNode.get())); } SkCanvas* prepareToDraw() { @@ -155,7 +155,7 @@ public: private: std::unique_ptr<android::uirenderer::RenderNode> mRootNode; std::unique_ptr<android::uirenderer::renderthread::RenderProxy> mProxy; - std::unique_ptr<android::uirenderer::RecordingCanvas> mCanvas; + std::unique_ptr<android::Canvas> mCanvas; android::sp<android::IGraphicBufferProducer> mProducer; android::sp<android::IGraphicBufferConsumer> mConsumer; android::sp<android::CpuConsumer> mCpuConsumer; |