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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: extensions/renderer/bindings/api_event_handler_unittest.cc

Issue 2973903002: [Extensions Bindings] Introduce a supportsLazyListeners property (Closed)
Patch Set: . Created 3 years, 5 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
« extensions/renderer/bindings/api_event_handler.h ('K') | « extensions/renderer/bindings/api_event_handler.cc ('k') | extensions/renderer/bindings/api_event_listeners.h » ('j') | extensions/renderer/resources/app_window_custom_bindings.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/bindings/api_event_handler_unittest.cc
diff --git a/extensions/renderer/bindings/api_event_handler_unittest.cc b/extensions/renderer/bindings/api_event_handler_unittest.cc
index a249aafb89d1e4c048cf151b8a586f17d726f798..bcecb5016a85318ef4d4b37fbf7dc082010ef066 100644
--- a/extensions/renderer/bindings/api_event_handler_unittest.cc
+++ b/extensions/renderer/bindings/api_event_handler_unittest.cc
@@ -22,6 +22,11 @@ namespace extensions {
namespace {
+const char kAddListenerFunction[] =
+ "(function(event, listener) { event.addListener(listener); })";
+const char kRemoveListenerFunction[] =
+ "(function(event, listener) { event.removeListener(listener); })";
+
using MockEventChangeHandler = ::testing::StrictMock<
base::MockCallback<APIEventHandler::EventListenersChangedMethod>>;
@@ -77,7 +82,7 @@ TEST_F(APIEventHandlerTest, AddingRemovingAndQueryingEventListeners) {
v8::Local<v8::Context> context = MainContext();
v8::Local<v8::Object> event = handler()->CreateEventInstance(
- kEventName, false, binding::kNoListenerMax, true, context);
+ kEventName, false, true, binding::kNoListenerMax, true, context);
ASSERT_FALSE(event.IsEmpty());
EXPECT_EQ(0u, handler()->GetNumEventListenersForTesting(kEventName, context));
@@ -87,8 +92,6 @@ TEST_F(APIEventHandlerTest, AddingRemovingAndQueryingEventListeners) {
FunctionFromString(context, kListenerFunction);
ASSERT_FALSE(listener_function.IsEmpty());
- const char kAddListenerFunction[] =
- "(function(event, listener) { event.addListener(listener); })";
v8::Local<v8::Function> add_listener_function =
FunctionFromString(context, kAddListenerFunction);
@@ -147,8 +150,6 @@ TEST_F(APIEventHandlerTest, AddingRemovingAndQueryingEventListeners) {
EXPECT_TRUE(has_listeners);
}
- const char kRemoveListenerFunction[] =
- "(function(event, listener) { event.removeListener(listener); })";
v8::Local<v8::Function> remove_listener_function =
FunctionFromString(context, kRemoveListenerFunction);
{
@@ -176,9 +177,9 @@ TEST_F(APIEventHandlerTest, FiringEvents) {
v8::Local<v8::Context> context = MainContext();
v8::Local<v8::Object> alpha_event = handler()->CreateEventInstance(
- kAlphaName, false, binding::kNoListenerMax, true, context);
+ kAlphaName, false, true, binding::kNoListenerMax, true, context);
v8::Local<v8::Object> beta_event = handler()->CreateEventInstance(
- kBetaName, false, binding::kNoListenerMax, true, context);
+ kBetaName, false, true, binding::kNoListenerMax, true, context);
ASSERT_FALSE(alpha_event.IsEmpty());
ASSERT_FALSE(beta_event.IsEmpty());
@@ -208,8 +209,6 @@ TEST_F(APIEventHandlerTest, FiringEvents) {
ASSERT_FALSE(beta_listener.IsEmpty());
{
- const char kAddListenerFunction[] =
- "(function(event, listener) { event.addListener(listener); })";
v8::Local<v8::Function> add_listener_function =
FunctionFromString(context, kAddListenerFunction);
{
@@ -273,7 +272,7 @@ TEST_F(APIEventHandlerTest, EventArguments) {
const char kEventName[] = "alpha";
v8::Local<v8::Object> event = handler()->CreateEventInstance(
- kEventName, false, binding::kNoListenerMax, true, context);
+ kEventName, false, true, binding::kNoListenerMax, true, context);
ASSERT_FALSE(event.IsEmpty());
const char kListenerFunction[] =
@@ -283,8 +282,6 @@ TEST_F(APIEventHandlerTest, EventArguments) {
ASSERT_FALSE(listener_function.IsEmpty());
{
- const char kAddListenerFunction[] =
- "(function(event, listener) { event.addListener(listener); })";
v8::Local<v8::Function> add_listener_function =
FunctionFromString(context, kAddListenerFunction);
v8::Local<v8::Value> argv[] = {event, listener_function};
@@ -320,15 +317,13 @@ TEST_F(APIEventHandlerTest, MultipleContexts) {
// Create two instances of the same event in different contexts.
v8::Local<v8::Object> event_a = handler()->CreateEventInstance(
- kEventName, false, binding::kNoListenerMax, true, context_a);
+ kEventName, false, true, binding::kNoListenerMax, true, context_a);
ASSERT_FALSE(event_a.IsEmpty());
v8::Local<v8::Object> event_b = handler()->CreateEventInstance(
- kEventName, false, binding::kNoListenerMax, true, context_b);
+ kEventName, false, true, binding::kNoListenerMax, true, context_b);
ASSERT_FALSE(event_b.IsEmpty());
// Add two separate listeners to the event, one in each context.
- const char kAddListenerFunction[] =
- "(function(event, listener) { event.addListener(listener); })";
{
v8::Local<v8::Function> add_listener_a =
FunctionFromString(context_a, kAddListenerFunction);
@@ -392,7 +387,7 @@ TEST_F(APIEventHandlerTest, DifferentCallingMethods) {
const char kEventName[] = "alpha";
v8::Local<v8::Object> event = handler()->CreateEventInstance(
- kEventName, false, binding::kNoListenerMax, true, context);
+ kEventName, false, true, binding::kNoListenerMax, true, context);
ASSERT_FALSE(event.IsEmpty());
const char kAddListenerOnNull[] =
@@ -444,7 +439,7 @@ TEST_F(APIEventHandlerTest, TestDispatchFromJs) {
v8::Local<v8::Context> context = MainContext();
v8::Local<v8::Object> event = handler()->CreateEventInstance(
- "alpha", false, binding::kNoListenerMax, true, context);
+ "alpha", false, true, binding::kNoListenerMax, true, context);
ASSERT_FALSE(event.IsEmpty());
const char kListenerFunction[] =
@@ -454,8 +449,6 @@ TEST_F(APIEventHandlerTest, TestDispatchFromJs) {
v8::Local<v8::Function> listener =
FunctionFromString(context, kListenerFunction);
- const char kAddListenerFunction[] =
- "(function(event, listener) { event.addListener(listener); })";
v8::Local<v8::Function> add_listener_function =
FunctionFromString(context, kAddListenerFunction);
@@ -485,7 +478,7 @@ TEST_F(APIEventHandlerTest, RemovingListenersWhileHandlingEvent) {
const char kEventName[] = "alpha";
v8::Local<v8::Object> event = handler()->CreateEventInstance(
- kEventName, false, binding::kNoListenerMax, true, context);
+ kEventName, false, true, binding::kNoListenerMax, true, context);
ASSERT_FALSE(event.IsEmpty());
{
// Cache the event object on the global in order to allow for easy removal.
@@ -514,8 +507,6 @@ TEST_F(APIEventHandlerTest, RemovingListenersWhileHandlingEvent) {
for (size_t i = 0; i < kNumListeners; ++i)
listeners.push_back(FunctionFromString(context, kListenerFunction));
- const char kAddListenerFunction[] =
- "(function(event, listener) { event.addListener(listener); })";
v8::Local<v8::Function> add_listener_function =
FunctionFromString(context, kAddListenerFunction);
@@ -561,7 +552,7 @@ TEST_F(APIEventHandlerTest, TestEventListenersThrowingExceptions) {
const char kEventName[] = "alpha";
v8::Local<v8::Object> event = handler()->CreateEventInstance(
- kEventName, false, binding::kNoListenerMax, true, context);
+ kEventName, false, true, binding::kNoListenerMax, true, context);
ASSERT_FALSE(event.IsEmpty());
bool did_throw = false;
@@ -594,8 +585,6 @@ TEST_F(APIEventHandlerTest, TestEventListenersThrowingExceptions) {
" this.eventArgs = Array.from(arguments);\n"
"});";
- const char kAddListenerFunction[] =
- "(function(event, listener) { event.addListener(listener); })";
v8::Local<v8::Function> add_listener_function =
FunctionFromString(context, kAddListenerFunction);
@@ -635,20 +624,15 @@ TEST_F(APIEventHandlerTest, CallbackNotifications) {
const char kEventName1[] = "onFoo";
const char kEventName2[] = "onBar";
v8::Local<v8::Object> event1_a = handler()->CreateEventInstance(
- kEventName1, false, binding::kNoListenerMax, true, context_a);
+ kEventName1, false, true, binding::kNoListenerMax, true, context_a);
ASSERT_FALSE(event1_a.IsEmpty());
v8::Local<v8::Object> event2_a = handler()->CreateEventInstance(
- kEventName2, false, binding::kNoListenerMax, true, context_a);
+ kEventName2, false, true, binding::kNoListenerMax, true, context_a);
ASSERT_FALSE(event2_a.IsEmpty());
v8::Local<v8::Object> event1_b = handler()->CreateEventInstance(
- kEventName1, false, binding::kNoListenerMax, true, context_b);
+ kEventName1, false, true, binding::kNoListenerMax, true, context_b);
ASSERT_FALSE(event1_b.IsEmpty());
- const char kAddListenerFunction[] =
- "(function(event, listener) { event.addListener(listener); })";
- const char kRemoveListenerFunction[] =
- "(function(event, listener) { event.removeListener(listener); })";
-
// Add a listener to the first event. The APIEventHandler should notify
// since it's a change in state (no listeners -> listeners).
v8::Local<v8::Function> add_listener =
@@ -763,7 +747,7 @@ TEST_F(APIEventHandlerTest, TestArgumentMassagers) {
const char kEventName[] = "alpha";
v8::Local<v8::Object> event = handler()->CreateEventInstance(
- kEventName, false, binding::kNoListenerMax, true, context);
+ kEventName, false, true, binding::kNoListenerMax, true, context);
ASSERT_FALSE(event.IsEmpty());
const char kArgumentMassager[] =
@@ -782,8 +766,6 @@ TEST_F(APIEventHandlerTest, TestArgumentMassagers) {
ASSERT_FALSE(listener_function.IsEmpty());
{
- const char kAddListenerFunction[] =
- "(function(event, listener) { event.addListener(listener); })";
v8::Local<v8::Function> add_listener_function =
FunctionFromString(context, kAddListenerFunction);
v8::Local<v8::Value> argv[] = {event, listener_function};
@@ -811,7 +793,7 @@ TEST_F(APIEventHandlerTest, TestArgumentMassagersAsyncDispatch) {
const char kEventName[] = "alpha";
v8::Local<v8::Object> event = handler()->CreateEventInstance(
- kEventName, false, binding::kNoListenerMax, true, context);
+ kEventName, false, true, binding::kNoListenerMax, true, context);
ASSERT_FALSE(event.IsEmpty());
const char kArgumentMassager[] =
@@ -830,8 +812,6 @@ TEST_F(APIEventHandlerTest, TestArgumentMassagersAsyncDispatch) {
ASSERT_FALSE(listener_function.IsEmpty());
{
- const char kAddListenerFunction[] =
- "(function(event, listener) { event.addListener(listener); })";
v8::Local<v8::Function> add_listener_function =
FunctionFromString(context, kAddListenerFunction);
v8::Local<v8::Value> argv[] = {event, listener_function};
@@ -874,7 +854,7 @@ TEST_F(APIEventHandlerTest, TestArgumentMassagersNeverDispatch) {
const char kEventName[] = "alpha";
v8::Local<v8::Object> event = handler()->CreateEventInstance(
- kEventName, false, binding::kNoListenerMax, true, context);
+ kEventName, false, true, binding::kNoListenerMax, true, context);
ASSERT_FALSE(event.IsEmpty());
// A massager that never dispatches.
@@ -888,8 +868,6 @@ TEST_F(APIEventHandlerTest, TestArgumentMassagersNeverDispatch) {
FunctionFromString(context, kListenerFunction);
ASSERT_FALSE(listener_function.IsEmpty());
- const char kAddListenerFunction[] =
- "(function(event, listener) { event.addListener(listener); })";
v8::Local<v8::Function> add_listener_function =
FunctionFromString(context, kAddListenerFunction);
v8::Local<v8::Value> argv[] = {event, listener_function};
@@ -991,7 +969,7 @@ TEST_F(APIEventHandlerTest, TestUnmanagedEvents) {
const char kEventName[] = "alpha";
v8::Local<v8::Object> event = handler.CreateEventInstance(
- kEventName, false, binding::kNoListenerMax, false, context);
+ kEventName, false, true, binding::kNoListenerMax, false, context);
const char kListener[] =
"(function() {\n"
@@ -1026,4 +1004,77 @@ TEST_F(APIEventHandlerTest, TestUnmanagedEvents) {
EXPECT_EQ(0u, handler.GetNumEventListenersForTesting(kEventName, context));
}
+// Test callback notifications for events that don't support lazy listeners.
+TEST_F(APIEventHandlerTest, TestEventsWithoutLazyListeners) {
+ MockEventChangeHandler change_handler;
+ APIEventHandler handler(base::Bind(&RunFunctionOnGlobalAndIgnoreResult),
+ base::Bind(&RunFunctionOnGlobalAndReturnHandle),
+ change_handler.Get());
+
+ v8::HandleScope handle_scope(isolate());
+ v8::Local<v8::Context> context = MainContext();
+
+ const char kLazyListenersSupported[] = "supportsLazyListeners";
+ const char kLazyListenersNotSupported[] = "noLazyListeners";
+ v8::Local<v8::Object> lazy_listeners_supported =
+ handler.CreateEventInstance(kLazyListenersSupported, false, true,
+ binding::kNoListenerMax, true, context);
+ v8::Local<v8::Object> lazy_listeners_not_supported =
+ handler.CreateEventInstance(kLazyListenersNotSupported, false, false,
+ binding::kNoListenerMax, true, context);
+ ASSERT_FALSE(lazy_listeners_not_supported.IsEmpty());
+
+ v8::Local<v8::Function> add_listener =
+ FunctionFromString(context, kAddListenerFunction);
+ v8::Local<v8::Function> listener =
+ FunctionFromString(context, "(function() {})");
+ {
+ EXPECT_CALL(change_handler,
+ Run(kLazyListenersSupported,
+ binding::EventListenersChanged::HAS_LISTENERS, nullptr,
+ true, context))
+ .Times(1);
+ v8::Local<v8::Value> argv[] = {lazy_listeners_supported, listener};
+ RunFunction(add_listener, context, arraysize(argv), argv);
+ ::testing::Mock::VerifyAndClearExpectations(&change_handler);
+ }
+
+ {
+ EXPECT_CALL(change_handler,
+ Run(kLazyListenersNotSupported,
+ binding::EventListenersChanged::HAS_LISTENERS, nullptr,
+ false, context))
+ .Times(1);
+ v8::Local<v8::Value> argv[] = {lazy_listeners_not_supported, listener};
+ RunFunction(add_listener, context, arraysize(argv), argv);
+ ::testing::Mock::VerifyAndClearExpectations(&change_handler);
+ }
+
+ v8::Local<v8::Function> remove_listener =
+ FunctionFromString(context, kRemoveListenerFunction);
+ {
+ EXPECT_CALL(change_handler,
+ Run(kLazyListenersSupported,
+ binding::EventListenersChanged::NO_LISTENERS, nullptr, true,
+ context))
+ .Times(1);
+ v8::Local<v8::Value> argv[] = {lazy_listeners_supported, listener};
+ RunFunction(remove_listener, context, arraysize(argv), argv);
+ ::testing::Mock::VerifyAndClearExpectations(&change_handler);
+ }
+
+ {
+ EXPECT_CALL(change_handler,
+ Run(kLazyListenersNotSupported,
+ binding::EventListenersChanged::NO_LISTENERS, nullptr,
+ false, context))
+ .Times(1);
+ v8::Local<v8::Value> argv[] = {lazy_listeners_not_supported, listener};
+ RunFunction(remove_listener, context, arraysize(argv), argv);
+ ::testing::Mock::VerifyAndClearExpectations(&change_handler);
+ }
+
+ DisposeContext(context);
+}
+
} // namespace extensions
« extensions/renderer/bindings/api_event_handler.h ('K') | « extensions/renderer/bindings/api_event_handler.cc ('k') | extensions/renderer/bindings/api_event_listeners.h » ('j') | extensions/renderer/resources/app_window_custom_bindings.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698