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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/web/tests/WebViewTest.cpp

Issue 206603002: Add EventHandlerRegistry (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add test for external handlers. Created 6 years, 9 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
« Source/core/page/scrolling/ScrollingCoordinator.cpp ('K') | « Source/web/WebViewImpl.cpp ('k') | public/platform/WebLayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/WebViewTest.cpp
diff --git a/Source/web/tests/WebViewTest.cpp b/Source/web/tests/WebViewTest.cpp
index b4c496a7819f60c9d8e5e4062c102dd985d9aef5..fb725fc316bcef7d289eac0c2f89336abdf21f43 100644
--- a/Source/web/tests/WebViewTest.cpp
+++ b/Source/web/tests/WebViewTest.cpp
@@ -51,6 +51,7 @@
#include "WebWidget.h"
#include "core/dom/Document.h"
#include "core/dom/Element.h"
+#include "core/dom/EventHandlerRegistry.h"
#include "core/html/HTMLDocument.h"
#include "core/html/HTMLIFrameElement.h"
#include "core/html/HTMLInputElement.h"
@@ -1536,15 +1537,17 @@ private:
int m_hasTouchEventHandlerCount[2];
};
-// This test verifies that WebWidgetClient::hasTouchEventHandlers is called accordingly for various
-// calls to Document::did{Add|Remove|Clear}TouchEventHandler. Verifying that those calls are made
-// correctly is the job of LayoutTests/fast/events/touch/touch-handler-count.html.
+// This test verifies that WebWidgetClient::hasTouchEventHandlers is called
+// accordingly for various calls to EventHandlerRegistry::did{Add|Remove|
+// RemoveAll}EventHandler(..., TouchEvent). Verifying that those calls are made
+// correctly is the job of LayoutTests/fast/events/event-handler-count.html.
TEST_F(WebViewTest, HasTouchEventHandlers)
{
TouchEventHandlerWebViewClient client;
std::string url = m_baseURL + "has_touch_event_handlers.html";
URLTestHelpers::registerMockedURLLoad(toKURL(url), "has_touch_event_handlers.html");
WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true, 0, &client);
+ const WebCore::EventHandlerRegistry::EventHandlerClass touchEvent = WebCore::EventHandlerRegistry::TouchEvent;
// The page is initialized with at least one no-handlers call.
// In practice we get two such calls because WebViewHelper::initializeAndLoad first
@@ -1555,100 +1558,156 @@ TEST_F(WebViewTest, HasTouchEventHandlers)
// Adding the first document handler results in a has-handlers call.
WebCore::Document* document = webViewImpl->mainFrameImpl()->frame()->document();
- document->didAddTouchEventHandler(document);
+ WebCore::EventHandlerRegistry* registry = WebCore::EventHandlerRegistry::from(*document);
+ registry->didAddEventHandler(*document, touchEvent);
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(true));
// Adding another handler has no effect.
- document->didAddTouchEventHandler(document);
+ registry->didAddEventHandler(*document, touchEvent);
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
// Removing the duplicate handler has no effect.
- document->didRemoveTouchEventHandler(document);
+ registry->didRemoveEventHandler(*document, touchEvent);
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
// Removing the final handler results in a no-handlers call.
- document->didRemoveTouchEventHandler(document);
+ registry->didRemoveEventHandler(*document, touchEvent);
EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
// Adding a handler on a div results in a has-handlers call.
WebCore::Element* parentDiv = document->getElementById("parentdiv");
ASSERT(parentDiv);
- document->didAddTouchEventHandler(parentDiv);
+ registry->didAddEventHandler(*parentDiv, touchEvent);
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(true));
// Adding a duplicate handler on the div, clearing all document handlers
// (of which there are none) and removing the extra handler on the div
// all have no effect.
- document->didAddTouchEventHandler(parentDiv);
- document->didClearTouchEventHandlers(document);
- document->didRemoveTouchEventHandler(parentDiv);
+ registry->didAddEventHandler(*parentDiv, touchEvent);
+ registry->didRemoveAllEventHandlers(*document);
+ registry->didRemoveEventHandler(*parentDiv, touchEvent);
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
// Removing the final handler on the div results in a no-handlers call.
- document->didRemoveTouchEventHandler(parentDiv);
+ registry->didRemoveEventHandler(*parentDiv, touchEvent);
EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
// Adding two handlers then clearing them in a single call results in a
// has-handlers then no-handlers call.
- document->didAddTouchEventHandler(parentDiv);
+ registry->didAddEventHandler(*parentDiv, touchEvent);
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(true));
- document->didAddTouchEventHandler(parentDiv);
+ registry->didAddEventHandler(*parentDiv, touchEvent);
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
- document->didClearTouchEventHandlers(parentDiv);
+ registry->didRemoveAllEventHandlers(*parentDiv);
EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
+}
+
+TEST_F(WebViewTest, HasTouchEventHandlersInChildDocument)
+{
+ TouchEventHandlerWebViewClient client;
+ std::string url = m_baseURL + "has_touch_event_handlers.html";
+ URLTestHelpers::registerMockedURLLoad(toKURL(url), "has_touch_event_handlers.html");
+ WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true, 0, &client);
+ const WebCore::EventHandlerRegistry::EventHandlerClass touchEvent = WebCore::EventHandlerRegistry::TouchEvent;
+
+ // The page is initialized with at least one no-handlers call.
+ // In practice we get two such calls because WebViewHelper::initializeAndLoad first
+ // initializes and empty frame, and then loads a document into it, so there are two
+ // FrameLoader::commitProvisionalLoad calls.
+ EXPECT_GE(client.getAndResetHasTouchEventHandlerCallCount(false), 1);
+ EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
// Adding a handler inside of a child iframe results in a has-handlers call.
+ WebCore::Document* document = webViewImpl->mainFrameImpl()->frame()->document();
+ WebCore::EventHandlerRegistry* registry = WebCore::EventHandlerRegistry::from(*document);
WebCore::Element* childFrame = document->getElementById("childframe");
ASSERT(childFrame);
WebCore::Document* childDocument = toHTMLIFrameElement(childFrame)->contentDocument();
+ WebCore::EventHandlerRegistry* childRegistry = WebCore::EventHandlerRegistry::from(*childDocument);
WebCore::Element* childDiv = childDocument->getElementById("childdiv");
ASSERT(childDiv);
- childDocument->didAddTouchEventHandler(childDiv);
+ childRegistry->didAddEventHandler(*childDiv, touchEvent);
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(true));
// Adding and clearing handlers in the parent doc or elsewhere in the child doc
// has no impact.
- document->didAddTouchEventHandler(document);
- document->didAddTouchEventHandler(childFrame);
- childDocument->didAddTouchEventHandler(childDocument);
- document->didClearTouchEventHandlers(document);
- document->didClearTouchEventHandlers(childFrame);
- childDocument->didClearTouchEventHandlers(childDocument);
+ registry->didAddEventHandler(*document, touchEvent);
+ registry->didAddEventHandler(*childFrame, touchEvent);
+ childRegistry->didAddEventHandler(*childDocument, touchEvent);
+ registry->didRemoveAllEventHandlers(*document);
+ registry->didRemoveAllEventHandlers(*childFrame);
+ childRegistry->didRemoveAllEventHandlers(*childDocument);
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
// Removing the final handler inside the child frame results in a no-handlers call.
- childDocument->didRemoveTouchEventHandler(childDiv);
+ childRegistry->didRemoveAllEventHandlers(*childDiv);
EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
// Adding a handler inside the child frame results in a has-handlers call.
- childDocument->didAddTouchEventHandler(childDocument);
+ childRegistry->didAddEventHandler(*childDocument, touchEvent);
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(true));
// Adding a handler in the parent document and removing the one in the frame
// has no effect.
- document->didAddTouchEventHandler(childFrame);
- childDocument->didRemoveTouchEventHandler(childDocument);
- childDocument->didClearTouchEventHandlers(childDocument);
- document->didClearTouchEventHandlers(document);
+ registry->didAddEventHandler(*childFrame, touchEvent);
+ childRegistry->didRemoveEventHandler(*childDocument, touchEvent);
+ childRegistry->didRemoveAllEventHandlers(*childDocument);
+ registry->didRemoveAllEventHandlers(*document);
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
// Now removing the handler in the parent document results in a no-handlers call.
- document->didRemoveTouchEventHandler(childFrame);
+ registry->didRemoveEventHandler(*childFrame, touchEvent);
+ EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(false));
+ EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
+}
+
+// This test verifies that WebWidgetClient::hasTouchEventHandlers is called
+// accordingly for various calls to EventHandlerRegistry::did{Add|Remove|
+// RemoveAll}ExternalEventHandler(TouchEvent).
+TEST_F(WebViewTest, HasExternalTouchEventHandlers)
+{
+ TouchEventHandlerWebViewClient client;
+ WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad("about:blank", true, 0, &client);
+ const AtomicString& touchstart = WebCore::EventTypeNames::touchstart;
+
+ // See comment in WebViewTest::HasTouchHandlers.
+ EXPECT_GE(client.getAndResetHasTouchEventHandlerCallCount(false), 1);
+ EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
+
+ // Adding the first document handler results in a has-handlers call.
+ WebCore::Document* document = webViewImpl->mainFrameImpl()->frame()->document();
+ WebCore::EventHandlerRegistry* registry = WebCore::EventHandlerRegistry::from(*document);
+ registry->didAddExternalEventHandler(touchstart);
+ EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
+ EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(true));
+
+ // Adding another handler has no effect.
+ registry->didAddExternalEventHandler(touchstart);
+ EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
+ EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
+
+ // Removing the duplicate handler has no effect.
+ registry->didRemoveExternalEventHandler(touchstart);
+ EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
+ EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
+
+ // Removing the final handler results in a no-handlers call.
+ registry->didRemoveExternalEventHandler(touchstart);
EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(false));
EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
}
« Source/core/page/scrolling/ScrollingCoordinator.cpp ('K') | « Source/web/WebViewImpl.cpp ('k') | public/platform/WebLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698