Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1129)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/platform/graphics/paint/DisplayItemListTest.cpp

Issue 1401363003: Rename DisplayItemList to PaintController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/paint/DisplayItemList.cpp ('k') | third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/graphics/paint/DisplayItemListTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/DisplayItemListTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/DisplayItemListTest.cpp
deleted file mode 100644
index bd85b848c565007a21fbf5adee6afcc7ecda89a9..0000000000000000000000000000000000000000
--- a/third_party/WebKit/Source/platform/graphics/paint/DisplayItemListTest.cpp
+++ /dev/null
@@ -1,793 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "config.h"
-#include "platform/graphics/paint/DisplayItemList.h"
-
-#include "platform/RuntimeEnabledFeatures.h"
-#include "platform/graphics/GraphicsContext.h"
-#include "platform/graphics/paint/CachedDisplayItem.h"
-#include "platform/graphics/paint/ClipPathRecorder.h"
-#include "platform/graphics/paint/ClipRecorder.h"
-#include "platform/graphics/paint/DrawingDisplayItem.h"
-#include "platform/graphics/paint/DrawingRecorder.h"
-#include "platform/graphics/paint/SubsequenceRecorder.h"
-#include <gtest/gtest.h>
-
-namespace blink {
-
-class DisplayItemListTest : public ::testing::Test {
-public:
- DisplayItemListTest()
- : m_displayItemList(DisplayItemList::create())
- , m_originalSlimmingPaintSubsequenceCachingEnabled(RuntimeEnabledFeatures::slimmingPaintSubsequenceCachingEnabled())
- , m_originalSlimmingPaintV2Enabled(RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { }
-
-protected:
- DisplayItemList& displayItemList() { return *m_displayItemList; }
-
-private:
- void TearDown() override
- {
- RuntimeEnabledFeatures::setSlimmingPaintSubsequenceCachingEnabled(m_originalSlimmingPaintSubsequenceCachingEnabled);
- RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(m_originalSlimmingPaintV2Enabled);
- }
-
- OwnPtr<DisplayItemList> m_displayItemList;
- bool m_originalSlimmingPaintSubsequenceCachingEnabled;
- bool m_originalSlimmingPaintV2Enabled;
-};
-
-const DisplayItem::Type foregroundDrawingType = static_cast<DisplayItem::Type>(DisplayItem::DrawingPaintPhaseFirst + 4);
-const DisplayItem::Type backgroundDrawingType = DisplayItem::DrawingPaintPhaseFirst;
-const DisplayItem::Type clipType = DisplayItem::ClipFirst;
-const DisplayItem::Type subsequenceType = DisplayItem::SubsequenceNormalFlowAndPositiveZOrder;
-const DisplayItem::Type endSubsequenceType = DisplayItem::subsequenceTypeToEndSubsequenceType(subsequenceType);
-const DisplayItem::Type cachedSubsequenceType = DisplayItem::subsequenceTypeToCachedSubsequenceType(subsequenceType);
-
-class TestDisplayItemClient {
-public:
- TestDisplayItemClient(const String& name)
- : m_name(name)
- { }
-
- DisplayItemClient displayItemClient() const { return toDisplayItemClient(this); }
- String debugName() const { return m_name; }
-
-private:
- String m_name;
-};
-
-class TestDisplayItem final : public DisplayItem {
-public:
- TestDisplayItem(const TestDisplayItemClient& client, Type type) : DisplayItem(client, type, sizeof(*this)) { }
-
- void replay(GraphicsContext&) const final { ASSERT_NOT_REACHED(); }
- void appendToWebDisplayItemList(WebDisplayItemList*) const final { ASSERT_NOT_REACHED(); }
-};
-
-#ifndef NDEBUG
-#define TRACE_DISPLAY_ITEMS(i, expected, actual) \
- String trace = String::format("%d: ", (int)i) + "Expected: " + (expected).asDebugString() + " Actual: " + (actual).asDebugString(); \
- SCOPED_TRACE(trace.utf8().data());
-#else
-#define TRACE_DISPLAY_ITEMS(i, expected, actual)
-#endif
-
-#define EXPECT_DISPLAY_LIST(actual, expectedSize, ...) \
- do { \
- EXPECT_EQ((size_t)expectedSize, actual.size()); \
- if (expectedSize != actual.size()) \
- break; \
- const TestDisplayItem expected[] = { __VA_ARGS__ }; \
- for (size_t index = 0; index < std::min<size_t>(actual.size(), expectedSize); index++) { \
- TRACE_DISPLAY_ITEMS(index, expected[index], actual[index]); \
- EXPECT_EQ(expected[index].client(), actual[index].client()); \
- EXPECT_EQ(expected[index].type(), actual[index].type()); \
- } \
- } while (false);
-
-void drawRect(GraphicsContext& context, const TestDisplayItemClient& client, DisplayItem::Type type, const FloatRect& bounds)
-{
- if (DrawingRecorder::useCachedDrawingIfPossible(context, client, type))
- return;
- DrawingRecorder drawingRecorder(context, client, type, bounds);
- IntRect rect(0, 0, 10, 10);
- context.drawRect(rect);
-}
-
-void drawClippedRect(GraphicsContext& context, const TestDisplayItemClient& client, DisplayItem::Type clipType, DisplayItem::Type drawingType, const FloatRect& bound)
-{
- ClipRecorder clipRecorder(context, client, clipType, LayoutRect(1, 1, 9, 9));
- drawRect(context, client, drawingType, bound);
-}
-
-TEST_F(DisplayItemListTest, NestedRecorders)
-{
- GraphicsContext context(&displayItemList());
-
- TestDisplayItemClient client("client");
-
- drawClippedRect(context, client, clipType, backgroundDrawingType, FloatRect(100, 100, 200, 200));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 3,
- TestDisplayItem(client, clipType),
- TestDisplayItem(client, backgroundDrawingType),
- TestDisplayItem(client, DisplayItem::clipTypeToEndClipType(clipType)));
-}
-
-TEST_F(DisplayItemListTest, UpdateBasic)
-{
- TestDisplayItemClient first("first");
- TestDisplayItemClient second("second");
- GraphicsContext context(&displayItemList());
-
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 300, 300));
- drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 200, 200));
- drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 300, 300));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 3,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(second, backgroundDrawingType),
- TestDisplayItem(first, foregroundDrawingType));
-
- displayItemList().invalidate(second, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 300, 300));
- drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 300, 300));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(first, foregroundDrawingType));
-}
-
-TEST_F(DisplayItemListTest, UpdateSwapOrder)
-{
- TestDisplayItemClient first("first");
- TestDisplayItemClient second("second");
- TestDisplayItemClient unaffected("unaffected");
- GraphicsContext context(&displayItemList());
-
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 100, 100));
- drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, unaffected, backgroundDrawingType, FloatRect(300, 300, 10, 10));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 3,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(second, backgroundDrawingType),
- TestDisplayItem(unaffected, backgroundDrawingType));
-
- displayItemList().invalidate(second, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 100, 100));
- drawRect(context, unaffected, backgroundDrawingType, FloatRect(300, 300, 10, 10));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 3,
- TestDisplayItem(second, backgroundDrawingType),
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(unaffected, backgroundDrawingType));
-}
-
-TEST_F(DisplayItemListTest, UpdateNewItemInMiddle)
-{
- TestDisplayItemClient first("first");
- TestDisplayItemClient second("second");
- TestDisplayItemClient third("third");
- GraphicsContext context(&displayItemList());
-
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 100, 100));
- drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 50, 200));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(second, backgroundDrawingType));
-
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 100, 100));
- drawRect(context, third, backgroundDrawingType, FloatRect(125, 100, 200, 50));
- drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 50, 200));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 3,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(third, backgroundDrawingType),
- TestDisplayItem(second, backgroundDrawingType));
-}
-
-TEST_F(DisplayItemListTest, UpdateInvalidationWithPhases)
-{
- TestDisplayItemClient first("first");
- TestDisplayItemClient second("second");
- TestDisplayItemClient third("third");
- GraphicsContext context(&displayItemList());
-
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 100, 100));
- drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, third, backgroundDrawingType, FloatRect(300, 100, 50, 50));
- drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 100, 100));
- drawRect(context, second, foregroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, third, foregroundDrawingType, FloatRect(300, 100, 50, 50));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 6,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(second, backgroundDrawingType),
- TestDisplayItem(third, backgroundDrawingType),
- TestDisplayItem(first, foregroundDrawingType),
- TestDisplayItem(second, foregroundDrawingType),
- TestDisplayItem(third, foregroundDrawingType));
-
- displayItemList().invalidate(second, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 100, 100));
- drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, third, backgroundDrawingType, FloatRect(300, 100, 50, 50));
- drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 100, 100));
- drawRect(context, second, foregroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, third, foregroundDrawingType, FloatRect(300, 100, 50, 50));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 6,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(second, backgroundDrawingType),
- TestDisplayItem(third, backgroundDrawingType),
- TestDisplayItem(first, foregroundDrawingType),
- TestDisplayItem(second, foregroundDrawingType),
- TestDisplayItem(third, foregroundDrawingType));
-}
-
-TEST_F(DisplayItemListTest, UpdateAddFirstOverlap)
-{
- TestDisplayItemClient first("first");
- TestDisplayItemClient second("second");
- GraphicsContext context(&displayItemList());
-
- drawRect(context, second, backgroundDrawingType, FloatRect(200, 200, 50, 50));
- drawRect(context, second, foregroundDrawingType, FloatRect(200, 200, 50, 50));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
- TestDisplayItem(second, backgroundDrawingType),
- TestDisplayItem(second, foregroundDrawingType));
-
- displayItemList().invalidate(first, PaintInvalidationFull, IntRect(), IntRect());
- displayItemList().invalidate(second, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 150, 150));
- drawRect(context, second, backgroundDrawingType, FloatRect(200, 200, 50, 50));
- drawRect(context, second, foregroundDrawingType, FloatRect(200, 200, 50, 50));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 4,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(first, foregroundDrawingType),
- TestDisplayItem(second, backgroundDrawingType),
- TestDisplayItem(second, foregroundDrawingType));
-
- displayItemList().invalidate(first, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, second, backgroundDrawingType, FloatRect(200, 200, 50, 50));
- drawRect(context, second, foregroundDrawingType, FloatRect(200, 200, 50, 50));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
- TestDisplayItem(second, backgroundDrawingType),
- TestDisplayItem(second, foregroundDrawingType));
-}
-
-TEST_F(DisplayItemListTest, UpdateAddLastOverlap)
-{
- TestDisplayItemClient first("first");
- TestDisplayItemClient second("second");
- GraphicsContext context(&displayItemList());
-
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 150, 150));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(first, foregroundDrawingType));
-
- displayItemList().invalidate(first, PaintInvalidationFull, IntRect(), IntRect());
- displayItemList().invalidate(second, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 150, 150));
- drawRect(context, second, backgroundDrawingType, FloatRect(200, 200, 50, 50));
- drawRect(context, second, foregroundDrawingType, FloatRect(200, 200, 50, 50));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 4,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(first, foregroundDrawingType),
- TestDisplayItem(second, backgroundDrawingType),
- TestDisplayItem(second, foregroundDrawingType));
-
- displayItemList().invalidate(first, PaintInvalidationFull, IntRect(), IntRect());
- displayItemList().invalidate(second, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 150, 150));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(first, foregroundDrawingType));
-}
-
-TEST_F(DisplayItemListTest, UpdateClip)
-{
- TestDisplayItemClient first("first");
- TestDisplayItemClient second("second");
- GraphicsContext context(&displayItemList());
-
- {
- ClipRecorder clipRecorder(context, first, clipType, LayoutRect(1, 1, 2, 2));
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- }
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 4,
- TestDisplayItem(first, clipType),
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(second, backgroundDrawingType),
- TestDisplayItem(first, DisplayItem::clipTypeToEndClipType(clipType)));
-
- displayItemList().invalidate(first, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(second, backgroundDrawingType));
-
- displayItemList().invalidate(second, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- {
- ClipRecorder clipRecorder(context, second, clipType, LayoutRect(1, 1, 2, 2));
- drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- }
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 4,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(second, clipType),
- TestDisplayItem(second, backgroundDrawingType),
- TestDisplayItem(second, DisplayItem::clipTypeToEndClipType(clipType)));
-}
-
-TEST_F(DisplayItemListTest, CachedDisplayItems)
-{
- TestDisplayItemClient first("first");
- TestDisplayItemClient second("second");
- GraphicsContext context(&displayItemList());
-
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(second, backgroundDrawingType));
- EXPECT_TRUE(displayItemList().clientCacheIsValid(first.displayItemClient()));
- EXPECT_TRUE(displayItemList().clientCacheIsValid(second.displayItemClient()));
- const SkPicture* firstPicture = static_cast<const DrawingDisplayItem&>(displayItemList().displayItems()[0]).picture();
- const SkPicture* secondPicture = static_cast<const DrawingDisplayItem&>(displayItemList().displayItems()[1]).picture();
-
- displayItemList().invalidate(first, PaintInvalidationFull, IntRect(), IntRect());
- EXPECT_FALSE(displayItemList().clientCacheIsValid(first.displayItemClient()));
- EXPECT_TRUE(displayItemList().clientCacheIsValid(second.displayItemClient()));
-
- drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 150, 150));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(second, backgroundDrawingType));
- // The first display item should be updated.
- EXPECT_NE(firstPicture, static_cast<const DrawingDisplayItem&>(displayItemList().displayItems()[0]).picture());
- // The second display item should be cached.
- EXPECT_EQ(secondPicture, static_cast<const DrawingDisplayItem&>(displayItemList().displayItems()[1]).picture());
- EXPECT_TRUE(displayItemList().clientCacheIsValid(first.displayItemClient()));
- EXPECT_TRUE(displayItemList().clientCacheIsValid(second.displayItemClient()));
-
- displayItemList().invalidateAll();
- EXPECT_FALSE(displayItemList().clientCacheIsValid(first.displayItemClient()));
- EXPECT_FALSE(displayItemList().clientCacheIsValid(second.displayItemClient()));
-}
-
-TEST_F(DisplayItemListTest, ComplexUpdateSwapOrder)
-{
- TestDisplayItemClient container1("container1");
- TestDisplayItemClient content1("content1");
- TestDisplayItemClient container2("container2");
- TestDisplayItemClient content2("content2");
- GraphicsContext context(&displayItemList());
-
- drawRect(context, container1, backgroundDrawingType, FloatRect(100, 100, 100, 100));
- drawRect(context, content1, backgroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, content1, foregroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, container1, foregroundDrawingType, FloatRect(100, 100, 100, 100));
- drawRect(context, container2, backgroundDrawingType, FloatRect(100, 200, 100, 100));
- drawRect(context, content2, backgroundDrawingType, FloatRect(100, 200, 50, 200));
- drawRect(context, content2, foregroundDrawingType, FloatRect(100, 200, 50, 200));
- drawRect(context, container2, foregroundDrawingType, FloatRect(100, 200, 100, 100));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 8,
- TestDisplayItem(container1, backgroundDrawingType),
- TestDisplayItem(content1, backgroundDrawingType),
- TestDisplayItem(content1, foregroundDrawingType),
- TestDisplayItem(container1, foregroundDrawingType),
- TestDisplayItem(container2, backgroundDrawingType),
- TestDisplayItem(content2, backgroundDrawingType),
- TestDisplayItem(content2, foregroundDrawingType),
- TestDisplayItem(container2, foregroundDrawingType));
-
- // Simulate the situation when container1 e.g. gets a z-index that is now greater than container2.
- displayItemList().invalidate(container1, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, container2, backgroundDrawingType, FloatRect(100, 200, 100, 100));
- drawRect(context, content2, backgroundDrawingType, FloatRect(100, 200, 50, 200));
- drawRect(context, content2, foregroundDrawingType, FloatRect(100, 200, 50, 200));
- drawRect(context, container2, foregroundDrawingType, FloatRect(100, 200, 100, 100));
- drawRect(context, container1, backgroundDrawingType, FloatRect(100, 100, 100, 100));
- drawRect(context, content1, backgroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, content1, foregroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, container1, foregroundDrawingType, FloatRect(100, 100, 100, 100));
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 8,
- TestDisplayItem(container2, backgroundDrawingType),
- TestDisplayItem(content2, backgroundDrawingType),
- TestDisplayItem(content2, foregroundDrawingType),
- TestDisplayItem(container2, foregroundDrawingType),
- TestDisplayItem(container1, backgroundDrawingType),
- TestDisplayItem(content1, backgroundDrawingType),
- TestDisplayItem(content1, foregroundDrawingType),
- TestDisplayItem(container1, foregroundDrawingType));
-}
-
-TEST_F(DisplayItemListTest, CachedSubsequenceSwapOrder)
-{
- RuntimeEnabledFeatures::setSlimmingPaintSubsequenceCachingEnabled(true);
-
- TestDisplayItemClient container1("container1");
- TestDisplayItemClient content1("content1");
- TestDisplayItemClient container2("container2");
- TestDisplayItemClient content2("content2");
- GraphicsContext context(&displayItemList());
-
- {
- SubsequenceRecorder r(context, container1, subsequenceType);
- drawRect(context, container1, backgroundDrawingType, FloatRect(100, 100, 100, 100));
- drawRect(context, content1, backgroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, content1, foregroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, container1, foregroundDrawingType, FloatRect(100, 100, 100, 100));
- }
- {
- SubsequenceRecorder r(context, container2, subsequenceType);
- drawRect(context, container2, backgroundDrawingType, FloatRect(100, 200, 100, 100));
- drawRect(context, content2, backgroundDrawingType, FloatRect(100, 200, 50, 200));
- drawRect(context, content2, foregroundDrawingType, FloatRect(100, 200, 50, 200));
- drawRect(context, container2, foregroundDrawingType, FloatRect(100, 200, 100, 100));
- }
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 12,
- TestDisplayItem(container1, subsequenceType),
- TestDisplayItem(container1, backgroundDrawingType),
- TestDisplayItem(content1, backgroundDrawingType),
- TestDisplayItem(content1, foregroundDrawingType),
- TestDisplayItem(container1, foregroundDrawingType),
- TestDisplayItem(container1, endSubsequenceType),
-
- TestDisplayItem(container2, subsequenceType),
- TestDisplayItem(container2, backgroundDrawingType),
- TestDisplayItem(content2, backgroundDrawingType),
- TestDisplayItem(content2, foregroundDrawingType),
- TestDisplayItem(container2, foregroundDrawingType),
- TestDisplayItem(container2, endSubsequenceType));
-
- // Simulate the situation when container1 e.g. gets a z-index that is now greater than container2.
- EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container2, subsequenceType));
- EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container1, subsequenceType));
-
- EXPECT_DISPLAY_LIST(displayItemList().newDisplayItems(), 2,
- TestDisplayItem(container2, cachedSubsequenceType),
- TestDisplayItem(container1, cachedSubsequenceType));
-
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 12,
- TestDisplayItem(container2, subsequenceType),
- TestDisplayItem(container2, backgroundDrawingType),
- TestDisplayItem(content2, backgroundDrawingType),
- TestDisplayItem(content2, foregroundDrawingType),
- TestDisplayItem(container2, foregroundDrawingType),
- TestDisplayItem(container2, endSubsequenceType),
-
- TestDisplayItem(container1, subsequenceType),
- TestDisplayItem(container1, backgroundDrawingType),
- TestDisplayItem(content1, backgroundDrawingType),
- TestDisplayItem(content1, foregroundDrawingType),
- TestDisplayItem(container1, foregroundDrawingType),
- TestDisplayItem(container1, endSubsequenceType));
-}
-
-TEST_F(DisplayItemListTest, OutOfOrderNoCrash)
-{
- TestDisplayItemClient client("client");
- GraphicsContext context(&displayItemList());
-
- const DisplayItem::Type type1 = DisplayItem::DrawingFirst;
- const DisplayItem::Type type2 = static_cast<DisplayItem::Type>(DisplayItem::DrawingFirst + 1);
- const DisplayItem::Type type3 = static_cast<DisplayItem::Type>(DisplayItem::DrawingFirst + 2);
- const DisplayItem::Type type4 = static_cast<DisplayItem::Type>(DisplayItem::DrawingFirst + 3);
-
- drawRect(context, client, type1, FloatRect(100, 100, 100, 100));
- drawRect(context, client, type2, FloatRect(100, 100, 50, 200));
- drawRect(context, client, type3, FloatRect(100, 100, 50, 200));
- drawRect(context, client, type4, FloatRect(100, 100, 100, 100));
-
- displayItemList().commitNewDisplayItems();
-
- drawRect(context, client, type2, FloatRect(100, 100, 50, 200));
- drawRect(context, client, type3, FloatRect(100, 100, 50, 200));
- drawRect(context, client, type1, FloatRect(100, 100, 100, 100));
- drawRect(context, client, type4, FloatRect(100, 100, 100, 100));
-
- displayItemList().commitNewDisplayItems();
-}
-
-TEST_F(DisplayItemListTest, CachedNestedSubsequenceUpdate)
-{
- RuntimeEnabledFeatures::setSlimmingPaintSubsequenceCachingEnabled(true);
-
- TestDisplayItemClient container1("container1");
- TestDisplayItemClient content1("content1");
- TestDisplayItemClient container2("container2");
- TestDisplayItemClient content2("content2");
- GraphicsContext context(&displayItemList());
-
- {
- SubsequenceRecorder r(context, container1, subsequenceType);
- drawRect(context, container1, backgroundDrawingType, FloatRect(100, 100, 100, 100));
- {
- SubsequenceRecorder r(context, content1, subsequenceType);
- drawRect(context, content1, backgroundDrawingType, FloatRect(100, 100, 50, 200));
- drawRect(context, content1, foregroundDrawingType, FloatRect(100, 100, 50, 200));
- }
- drawRect(context, container1, foregroundDrawingType, FloatRect(100, 100, 100, 100));
- }
- {
- SubsequenceRecorder r(context, container2, subsequenceType);
- drawRect(context, container2, backgroundDrawingType, FloatRect(100, 200, 100, 100));
- {
- SubsequenceRecorder r(context, content2, subsequenceType);
- drawRect(context, content2, backgroundDrawingType, FloatRect(100, 200, 50, 200));
- }
- }
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 14,
- TestDisplayItem(container1, subsequenceType),
- TestDisplayItem(container1, backgroundDrawingType),
- TestDisplayItem(content1, subsequenceType),
- TestDisplayItem(content1, backgroundDrawingType),
- TestDisplayItem(content1, foregroundDrawingType),
- TestDisplayItem(content1, endSubsequenceType),
- TestDisplayItem(container1, foregroundDrawingType),
- TestDisplayItem(container1, endSubsequenceType),
-
- TestDisplayItem(container2, subsequenceType),
- TestDisplayItem(container2, backgroundDrawingType),
- TestDisplayItem(content2, subsequenceType),
- TestDisplayItem(content2, backgroundDrawingType),
- TestDisplayItem(content2, endSubsequenceType),
- TestDisplayItem(container2, endSubsequenceType));
-
- // Invalidate container1 but not content1.
- displayItemList().invalidate(container1, PaintInvalidationFull, IntRect(), IntRect());
-
- // Container2 itself now becomes empty (but still has the 'content2' child),
- // and chooses not to output subsequence info.
-
- displayItemList().invalidate(container2, PaintInvalidationFull, IntRect(), IntRect());
- displayItemList().invalidate(content2, PaintInvalidationFull, IntRect(), IntRect());
- EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container2, subsequenceType));
- EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, content2, subsequenceType));
- // Content2 now outputs foreground only.
- {
- SubsequenceRecorder r(context, content2, subsequenceType);
- drawRect(context, content2, foregroundDrawingType, FloatRect(100, 200, 50, 200));
- }
- // Repaint container1 with foreground only.
- {
- EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container1, subsequenceType));
- SubsequenceRecorder r(context, container1, subsequenceType);
- // Use cached subsequence of content1.
- EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, content1, subsequenceType));
- drawRect(context, container1, foregroundDrawingType, FloatRect(100, 100, 100, 100));
- }
- EXPECT_DISPLAY_LIST(displayItemList().newDisplayItems(), 7,
- TestDisplayItem(content2, subsequenceType),
- TestDisplayItem(content2, foregroundDrawingType),
- TestDisplayItem(content2, endSubsequenceType),
- TestDisplayItem(container1, subsequenceType),
- TestDisplayItem(content1, cachedSubsequenceType),
- TestDisplayItem(container1, foregroundDrawingType),
- TestDisplayItem(container1, endSubsequenceType));
-
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 10,
- TestDisplayItem(content2, subsequenceType),
- TestDisplayItem(content2, foregroundDrawingType),
- TestDisplayItem(content2, endSubsequenceType),
-
- TestDisplayItem(container1, subsequenceType),
- TestDisplayItem(content1, subsequenceType),
- TestDisplayItem(content1, backgroundDrawingType),
- TestDisplayItem(content1, foregroundDrawingType),
- TestDisplayItem(content1, endSubsequenceType),
- TestDisplayItem(container1, foregroundDrawingType),
- TestDisplayItem(container1, endSubsequenceType));
-}
-
-TEST_F(DisplayItemListTest, Scope)
-{
- TestDisplayItemClient multicol("multicol");
- TestDisplayItemClient content("content");
- GraphicsContext context(&displayItemList());
-
- FloatRect rect1(100, 100, 50, 50);
- FloatRect rect2(150, 100, 50, 50);
- FloatRect rect3(200, 100, 50, 50);
-
- drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 200, 100, 100));
-
- displayItemList().beginScope();
- drawRect(context, content, foregroundDrawingType, rect1);
- displayItemList().endScope();
-
- displayItemList().beginScope();
- drawRect(context, content, foregroundDrawingType, rect2);
- displayItemList().endScope();
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 3,
- TestDisplayItem(multicol, backgroundDrawingType),
- TestDisplayItem(content, foregroundDrawingType),
- TestDisplayItem(content, foregroundDrawingType));
- RefPtr<const SkPicture> picture1 = static_cast<const DrawingDisplayItem&>(displayItemList().displayItems()[1]).picture();
- RefPtr<const SkPicture> picture2 = static_cast<const DrawingDisplayItem&>(displayItemList().displayItems()[2]).picture();
- EXPECT_NE(picture1, picture2);
-
- // Draw again with nothing invalidated.
- EXPECT_TRUE(displayItemList().clientCacheIsValid(multicol.displayItemClient()));
- drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 200, 100, 100));
- displayItemList().beginScope();
- drawRect(context, content, foregroundDrawingType, rect1);
- displayItemList().endScope();
-
- displayItemList().beginScope();
- drawRect(context, content, foregroundDrawingType, rect2);
- displayItemList().endScope();
-
- EXPECT_DISPLAY_LIST(displayItemList().newDisplayItems(), 3,
- TestDisplayItem(multicol, DisplayItem::drawingTypeToCachedDrawingType(backgroundDrawingType)),
- TestDisplayItem(content, foregroundDrawingType),
- TestDisplayItem(content, foregroundDrawingType));
-
- displayItemList().commitNewDisplayItems();
-
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 3,
- TestDisplayItem(multicol, backgroundDrawingType),
- TestDisplayItem(content, foregroundDrawingType),
- TestDisplayItem(content, foregroundDrawingType));
- EXPECT_NE(picture1, static_cast<const DrawingDisplayItem&>(displayItemList().displayItems()[1]).picture());
- EXPECT_NE(picture2, static_cast<const DrawingDisplayItem&>(displayItemList().displayItems()[2]).picture());
-
- // Now the multicol becomes 3 columns and repaints.
- displayItemList().invalidate(multicol, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 100, 100, 100));
-
- displayItemList().beginScope();
- drawRect(context, content, foregroundDrawingType, rect1);
- displayItemList().endScope();
-
- displayItemList().beginScope();
- drawRect(context, content, foregroundDrawingType, rect2);
- displayItemList().endScope();
-
- displayItemList().beginScope();
- drawRect(context, content, foregroundDrawingType, rect3);
- displayItemList().endScope();
-
- // We should repaint everything on invalidation of the scope container.
- EXPECT_DISPLAY_LIST(displayItemList().newDisplayItems(), 4,
- TestDisplayItem(multicol, backgroundDrawingType),
- TestDisplayItem(content, foregroundDrawingType),
- TestDisplayItem(content, foregroundDrawingType),
- TestDisplayItem(content, foregroundDrawingType));
- EXPECT_NE(picture1, static_cast<const DrawingDisplayItem&>(displayItemList().newDisplayItems()[1]).picture());
- EXPECT_NE(picture2, static_cast<const DrawingDisplayItem&>(displayItemList().newDisplayItems()[2]).picture());
-
- displayItemList().commitNewDisplayItems();
-}
-
-TEST_F(DisplayItemListTest, OptimizeNoopPairs)
-{
- TestDisplayItemClient first("first");
- TestDisplayItemClient second("second");
- TestDisplayItemClient third("third");
-
- GraphicsContext context(&displayItemList());
- drawRect(context, first, backgroundDrawingType, FloatRect(0, 0, 100, 100));
- {
- ClipPathRecorder clipRecorder(context, second, Path());
- drawRect(context, second, backgroundDrawingType, FloatRect(0, 0, 100, 100));
- }
- drawRect(context, third, backgroundDrawingType, FloatRect(0, 0, 100, 100));
-
- displayItemList().commitNewDisplayItems();
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 5,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(second, DisplayItem::BeginClipPath),
- TestDisplayItem(second, backgroundDrawingType),
- TestDisplayItem(second, DisplayItem::EndClipPath),
- TestDisplayItem(third, backgroundDrawingType));
-
- displayItemList().invalidate(second, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, first, backgroundDrawingType, FloatRect(0, 0, 100, 100));
- {
- ClipRecorder clipRecorder(context, second, clipType, LayoutRect(1, 1, 2, 2));
- // Do not draw anything for second.
- }
- drawRect(context, third, backgroundDrawingType, FloatRect(0, 0, 100, 100));
- displayItemList().commitNewDisplayItems();
-
- // Empty clips should have been optimized out.
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(third, backgroundDrawingType));
-
- displayItemList().invalidate(second, PaintInvalidationFull, IntRect(), IntRect());
- drawRect(context, first, backgroundDrawingType, FloatRect(0, 0, 100, 100));
- {
- ClipRecorder clipRecorder(context, second, clipType, LayoutRect(1, 1, 2, 2));
- {
- ClipPathRecorder clipPathRecorder(context, second, Path());
- // Do not draw anything for second.
- }
- }
- drawRect(context, third, backgroundDrawingType, FloatRect(0, 0, 100, 100));
- displayItemList().commitNewDisplayItems();
-
- // Empty clips should have been optimized out.
- EXPECT_DISPLAY_LIST(displayItemList().displayItems(), 2,
- TestDisplayItem(first, backgroundDrawingType),
- TestDisplayItem(third, backgroundDrawingType));
-}
-
-TEST_F(DisplayItemListTest, SmallDisplayItemListHasOnePaintChunk)
-{
- RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
- TestDisplayItemClient client("test client");
-
- GraphicsContext context(&displayItemList());
- drawRect(context, client, backgroundDrawingType, FloatRect(0, 0, 100, 100));
-
- displayItemList().commitNewDisplayItems();
- const auto& paintChunks = displayItemList().paintChunks();
- ASSERT_EQ(1u, paintChunks.size());
- EXPECT_EQ(0u, paintChunks[0].beginIndex);
- EXPECT_EQ(1u, paintChunks[0].endIndex);
-}
-
-} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/paint/DisplayItemList.cpp ('k') | third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698