Rework compositor touch hit testing

Source/core/testing/Internals.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 14 matching lines @@
  */
 
 #include "config.h"
 #include "Internals.h"
 
 #include "HTMLNames.h"
 #include "InspectorFrontendClientLocal.h"
 #include "InternalProfilers.h"
 #include "InternalRuntimeFlags.h"
 #include "InternalSettings.h"
+#include "LayerRect.h"
+#include "LayerRectList.h"
 #include "MallocStatistics.h"
 #include "MockPagePopupDriver.h"
 #include "RuntimeEnabledFeatures.h"
 #include "TypeConversions.h"
 #include "bindings/v8/SerializedScriptValue.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/dom/ClientRect.h"
 #include "core/dom/ClientRectList.h"
 #include "core/dom/DOMStringList.h"
 #include "core/dom/Document.h"
@@ skipping 122 matching lines @@
 
 const char* Internals::internalsId = "internals";
 
 PassRefPtr<Internals> Internals::create(Document* document)
 {
     return adoptRef(new Internals(document));
 }
 
 Internals::~Internals()
 {
+    if (m_scrollingCoordinator) {
+        m_scrollingCoordinator->removeTouchEventTargetRectsObserver(this);
+    }
 }
 
 void Internals::resetToConsistentState(Page* page)
 {
     ASSERT(page);
 
     page->setDeviceScaleFactor(1);
     page->setPageScaleFactor(1, IntPoint(0, 0));
     page->setPagination(Pagination());
     TextRun::setAllowsRoundingHacks(false);
     WebCore::overrideUserPreferredLanguages(Vector<String>());
     WebCore::Settings::setUsesOverlayScrollbars(false);
     delete s_pagePopupDriver;
     s_pagePopupDriver = 0;
     page->chrome().client()->resetPagePopupDriver();
     if (!page->mainFrame()->editor()->isContinuousSpellCheckingEnabled())
         page->mainFrame()->editor()->toggleContinuousSpellChecking();
     if (page->mainFrame()->editor()->isOverwriteModeEnabled())
         page->mainFrame()->editor()->toggleOverwriteModeEnabled();
 }
 
 Internals::Internals(Document* document)
     : ContextLifecycleObserver(document)
     , m_runtimeFlags(InternalRuntimeFlags::create())
+    , m_scrollingCoordinator(document->page()->scrollingCoordinator())
+    , m_touchEventTargetRectUpdateCount(0)
 {
+    if (m_scrollingCoordinator) {
+        m_scrollingCoordinator->addTouchEventTargetRectsObserver(this);
+    }
 }
 
 Document* Internals::contextDocument() const
 {
     return toDocument(scriptExecutionContext());
 }
 
 Frame* Internals::frame() const
 {
     if (!contextDocument())
@@ skipping 1019 matching lines @@
     const TouchEventTargetSet* touchHandlers = document->touchEventTargets();
     if (!touchHandlers)
         return 0;
 
     unsigned count = 0;
     for (TouchEventTargetSet::const_iterator iter = touchHandlers->begin(); iter != touchHandlers->end(); ++iter)
         count += iter->value;
     return count;
 }
 
-PassRefPtr<ClientRectList> Internals::touchEventTargetClientRects(Document* document, ExceptionCode& ec)
+PassRefPtr<LayerRectList> Internals::touchEventTargetLayerRects(Document* document, ExceptionCode& ec)
 {
-    if (!document || !document->view() || !document->page()) {
+    if (!document || !document->view() || !document->page() || document != contextDocument()) {
         ec = INVALID_ACCESS_ERR;
         return 0;
     }
-    if (!document->page()->scrollingCoordinator())
-        return ClientRectList::create();
 
-    document->updateLayoutIgnorePendingStylesheets();
+    // Do any pending layouts to ensure this really takes any previous changes into account.
+    document->updateLayout();
 
-    Vector<IntRect> absoluteRects;
-    document->page()->scrollingCoordinator()->computeAbsoluteTouchEventTargetRects(document, absoluteRects);
-    Vector<FloatQuad> absoluteQuads(absoluteRects.size());
+    RefPtr<LayerRectList> rects = LayerRectList::create();
 
-    for (size_t i = 0; i < absoluteRects.size(); ++i)
-        absoluteQuads[i] = FloatQuad(absoluteRects[i]);
+    for (LayerHitTestRects::const_iterator iter = m_currentTouchEventRects.begin(); iter != m_currentTouchEventRects.end(); ++iter) {
+        for (size_t i = 0; i < iter->value.size(); ++i) {
+            rects->append(iter->key->renderer()->node(), ClientRect::create(iter->value[i]));
+        }
+    }
 
-    return ClientRectList::create(absoluteQuads);
+    return rects;
+}
+
+unsigned Internals::touchEventTargetLayerRectsUpdateCount(Document* document, ExceptionCode& ec)
+{
+    if (!document || !document->view() || !document->page() || document != contextDocument()) {
+        ec = INVALID_ACCESS_ERR;
+        return 0;
+    }
+
+    // Do any pending layouts to ensure this really takes any previous changes into account.
+    document->updateLayout();
+
+    return m_touchEventTargetRectUpdateCount;
+}
+
+void Internals::touchEventTargetRectsChanged(const LayerHitTestRects& rects)
+{
+    m_touchEventTargetRectUpdateCount++;
+    m_currentTouchEventRects = rects;
 }
 
 PassRefPtr<NodeList> Internals::nodesFromRect(Document* document, int centerX, int centerY, unsigned topPadding, unsigned rightPadding,
     unsigned bottomPadding, unsigned leftPadding, bool ignoreClipping, bool allowShadowContent, bool allowChildFrameContent, ExceptionCode& ec) const
 {
     if (!document || !document->frame() || !document->frame()->view()) {
         ec = INVALID_ACCESS_ERR;
         return 0;
     }
 
@@ skipping 707 matching lines @@
 
     RenderObject* renderer = select->renderer();
     if (!renderer->isMenuList())
         return false;
 
     RenderMenuList* menuList = toRenderMenuList(renderer);
     return menuList->popupIsVisible();
 }
 
 }