Remove unused flags and dirty rects
bug:17209071
Also update DisplayList->RenderNode naming in Editor
Change-Id: I1d505640ba7388a0b0042d9c787f859e45a24da5
diff --git a/libs/hwui/tests/main.cpp b/libs/hwui/tests/main.cpp
index 61ad082..62782af 100644
--- a/libs/hwui/tests/main.cpp
+++ b/libs/hwui/tests/main.cpp
@@ -111,15 +111,13 @@
public:
std::vector< sp<RenderNode> > cards;
void createContent(int width, int height, DisplayListCanvas* renderer) override {
- android::uirenderer::Rect DUMMY;
-
renderer->drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
renderer->insertReorderBarrier(true);
for (int x = dp(16); x < (width - dp(116)); x += dp(116)) {
for (int y = dp(16); y < (height - dp(116)); y += dp(116)) {
sp<RenderNode> card = createCard(x, y, dp(100), dp(100));
- renderer->drawRenderNode(card.get(), DUMMY, 0);
+ renderer->drawRenderNode(card.get());
cards.push_back(card);
}
}
@@ -153,13 +151,11 @@
public:
sp<RenderNode> card;
void createContent(int width, int height, DisplayListCanvas* renderer) override {
- android::uirenderer::Rect DUMMY;
-
renderer->drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
renderer->insertReorderBarrier(true);
card = createCard(40, 40, 200, 200);
- renderer->drawRenderNode(card.get(), DUMMY, 0);
+ renderer->drawRenderNode(card.get());
renderer->insertReorderBarrier(false);
}
@@ -202,13 +198,11 @@
public:
sp<RenderNode> card;
void createContent(int width, int height, DisplayListCanvas* renderer) override {
- android::uirenderer::Rect DUMMY;
-
renderer->drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
renderer->insertReorderBarrier(true);
card = createCard(40, 40, 400, 400);
- renderer->drawRenderNode(card.get(), DUMMY, 0);
+ renderer->drawRenderNode(card.get());
renderer->insertReorderBarrier(false);
}