aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/MessageBusTest.cpp
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2018-07-11 20:01:19 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-11 20:01:28 +0000
commit143cf8e5994c54aa8c1b721f7af1d3fc9fd83602 (patch)
tree3fd8ad986ffb3bf0739532b05d0df10f863e41a9 /tests/MessageBusTest.cpp
parentf4c5bb9aba485aa47c27b15905d81992b7cf4707 (diff)
Revert "Make GPU cache invalidation SkMessageBus messages go to one GrContext."
This reverts commit f4c5bb9aba485aa47c27b15905d81992b7cf4707. Reason for revert: Accidentally submitted without CQ Original change's description: > Make GPU cache invalidation SkMessageBus messages go to one GrContext. > > Makes it so the template param to SkMessageBus must implement: > bool shouldSend(uint32_t inboxID) const > > Updates all GPU backend message types to only go to the GrContext that > is adding a cache entry. > > Bug: skia: > Change-Id: I3e8a4eb90654b7b8ac57cac9fb508c0ef1d51058 > Reviewed-on: https://skia-review.googlesource.com/140220 > Reviewed-by: Robert Phillips <robertphillips@google.com> > Reviewed-by: Jim Van Verth <jvanverth@google.com> TBR=jvanverth@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: Iadb667d8027341703d254325320ddaa528fb33a1 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/140800 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests/MessageBusTest.cpp')
-rw-r--r--tests/MessageBusTest.cpp43
1 files changed, 0 insertions, 43 deletions
diff --git a/tests/MessageBusTest.cpp b/tests/MessageBusTest.cpp
index 145176ba1b..163addf8f0 100644
--- a/tests/MessageBusTest.cpp
+++ b/tests/MessageBusTest.cpp
@@ -8,15 +8,10 @@
#include "SkMessageBus.h"
#include "Test.h"
-namespace {
struct TestMessage {
- bool shouldSend(uint32_t inboxID) const { return true; }
- TestMessage(int i, float f) : x(i), y(f) {}
-
int x;
float y;
};
-}
DECLARE_SKMESSAGEBUS_MESSAGE(TestMessage)
DEF_TEST(MessageBus, r) {
@@ -55,42 +50,4 @@ DEF_TEST(MessageBus, r) {
REPORTER_ASSERT(r, 1 == messages[2].x);
}
-namespace {
-struct AddressedMessage {
- uint32_t fInboxID;
-
- bool shouldSend(uint32_t inboxID) const {
- SkASSERT(inboxID);
- if (!fInboxID) {
- return true;
- }
- return inboxID == fInboxID;
- }
-};
-}
-DECLARE_SKMESSAGEBUS_MESSAGE(AddressedMessage)
-
-DEF_TEST(MessageBus_shouldSend, r) {
- SkMessageBus<AddressedMessage>::Inbox inbox1(1), inbox2(2);
-
- SkMessageBus<AddressedMessage>::Post({0}); // Should go to both
- SkMessageBus<AddressedMessage>::Post({1}); // Should go to inbox1
- SkMessageBus<AddressedMessage>::Post({2}); // Should go to inbox2
- SkMessageBus<AddressedMessage>::Post({3}); // Should go nowhere
-
- SkTArray<AddressedMessage> messages;
- inbox1.poll(&messages);
- REPORTER_ASSERT(r, messages.count() == 2);
- if (messages.count() == 2) {
- REPORTER_ASSERT(r, messages[0].fInboxID == 0);
- REPORTER_ASSERT(r, messages[1].fInboxID == 1);
- }
- inbox2.poll(&messages);
- REPORTER_ASSERT(r, messages.count() == 2);
- if (messages.count() == 2) {
- REPORTER_ASSERT(r, messages[0].fInboxID == 0);
- REPORTER_ASSERT(r, messages[1].fInboxID == 2);
- }
-}
-
// Multithreaded tests tbd.