Fix an issue that subtitle is not shown for native fullscreen video that is inside an iframe

Source/core/rendering/compositing/GraphicsLayerUpdater.cpp

 /*
  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Google 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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/rendering/compositing/GraphicsLayerUpdater.h"
 
+#include "core/html/HTMLMediaElement.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderLayerReflectionInfo.h"
 #include "core/rendering/RenderPart.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/compositing/CompositedLayerMapping.h"
 #include "core/rendering/compositing/RenderLayerCompositor.h"
 #include "public/platform/Platform.h"
 
 namespace WebCore {
 
@@ skipping 76 matching lines @@
                 currentCompositedLayerMapping->parentForSublayers()->addChild(overflowControlLayer);
             }
 
             if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapping->layerForScrollCorner()) {
                 overflowControlLayer->removeFromParent();
                 currentCompositedLayerMapping->parentForSublayers()->addChild(overflowControlLayer);
             }
         }
 
         childLayersOfEnclosingLayer.append(currentCompositedLayerMapping->childForSuperlayers());
+        bool appendLayer = true;
+        if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) {
+            Node* node = layer.renderer()->node();
+            if (isHTMLMediaElement(*node) && toHTMLMediaElement(node)->isFullscreen()) {
+                appendLayer = false;
+            }
+        }
+        if (appendLayer) {

[esprehn, 2014/03/05 00:22:41]

This should be refactored into a function.

if (shouldAppendLayer(...))
 
childLayersOfEnclosingLayer.append(currentCompositedLayerMapping->childForSuperlayers());

[qinmin, 2014/03/05 01:34:42]

Done.

+            childLayersOfEnclosingLayer.append(currentCompositedLayerMapping->childForSuperlayers());
+        }
     }
 
     if (!depth) {
         int percentageIncreaseInPixels = static_cast<int>(m_pixelsAddedByPromotingAllTransitions / m_pixelsWithoutPromotingAllTransitions * 100);
         blink::Platform::current()->histogramCustomCounts("Renderer.PixelIncreaseFromTransitions", percentageIncreaseInPixels, 0, 1000, 50);
     }
 }
 
 // This just updates layer geometry without changing the hierarchy.
 void GraphicsLayerUpdater::updateRecursive(RenderLayer& layer)
@@ skipping 29 matching lines @@
     mapping->updateGraphicsLayerGeometry();
 
     if (!layer.parent())
         layer.compositor()->updateRootLayerPosition();
 
     if (mapping->hasUnpositionedOverflowControlsLayers())
         layer.scrollableArea()->positionOverflowControls();
 }
 
 } // namespace WebCore