Report correct touch hit rects for fullscreen HTML5 video on Android

Source/core/page/scrolling/ScrollingCoordinator.cpp

 /*
  * Copyright (C) 2011 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 772 matching lines @@
     ASSERT(document);
     if (!document->touchEventTargets())
         return;
 
     const TouchEventTargetSet* targets = document->touchEventTargets();
 
     // If there's a handler on the document, html or body element (fairly common in practice),
     // then we can quickly mark the entire document and skip looking at any other handlers.
     // Note that technically a handler on the body doesn't cover the whole document, but it's
     // reasonable to be conservative and report the whole document anyway.
-    for (TouchEventTargetSet::const_iterator iter = targets->begin(); iter != targets->end(); ++iter) {
+    //
+    // Fullscreen HTML5 video when OverlayFullscreenVideo is enabled is implemented by replacing the
+    // root cc::layer with the video layer so doing this optimization causes the compositor to think
+    // that there are no handlers, therefore skip it.
+    for (TouchEventTargetSet::const_iterator iter = targets->begin(); !document->renderView()->compositor()->inOverlayFullscreenVideo() && iter != targets->end(); ++iter) {

[Rick Byers, 2014/06/10 20:02:24]

rather than check inOverlayFullscreenVideo on each iteration of the loop, I'd
find it clearer to just have this whole section inside of it's own if statement.

         Node* target = iter->key;
         if (target == document || target == document->documentElement() || target == document->body()) {
             if (RenderView* rendererView = document->renderView()) {
                 rendererView->computeLayerHitTestRects(rects);
             }
             return;
         }
     }
 
     for (TouchEventTargetSet::const_iterator iter = targets->begin(); iter != targets->end(); ++iter) {
         const Node* target = iter->key;
         if (!target->inDocument())
             continue;
 
-        if (target->isDocumentNode()) {
-            ASSERT(target != document);
+        if (target->isDocumentNode() && target != document) {
             accumulateDocumentTouchEventTargetRects(rects, toDocument(target));
         } else if (RenderObject* renderer = target->renderer()) {
             // If the set also contains one of our ancestor nodes then processing
             // this node would be redundant.
             bool hasTouchEventTargetAncestor = false;
             for (Node* ancestor = target->parentNode(); ancestor && !hasTouchEventTargetAncestor; ancestor = ancestor->parentNode()) {
                 if (targets->contains(ancestor))
                     hasTouchEventTargetAncestor = true;
             }
             if (!hasTouchEventTargetAncestor) {
@@ skipping 157 matching lines @@
     bool frameIsScrollable = frameView && frameView->isScrollable();
     if (frameIsScrollable != m_wasFrameScrollable)
         return true;
 
     if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScrolling()) : 0)
         return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds();
     return false;
 }
 
 } // namespace WebCore