Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / compositing / CompositingRequirementsUpdater.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/compositing/CompositingRequirementsUpdater.cpp b/src/third_party/WebKit/Source/core/rendering/compositing/CompositingRequirementsUpdater.cpp
index e33ec51..d26bc49 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/compositing/CompositingRequirementsUpdater.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/compositing/CompositingRequirementsUpdater.cpp
@@ -228,7 +228,7 @@ void CompositingRequirementsUpdater::updateRecursive(RenderLayer* ancestorLayer,
     // used, we must assume we overlap if there is anything composited behind us in paint-order.
     CompositingReasons overlapCompositingReason = currentRecursionData.m_subtreeIsCompositing ? CompositingReasonAssumedOverlap : CompositingReasonNone;
 
-    if (m_renderView.compositor()->acceleratedCompositingForOverflowScrollEnabled()) {
+    if (m_renderView.compositor()->preferCompositingToLCDTextEnabled()) {
         Vector<size_t> unclippedDescendantsToRemove;
         for (size_t i = 0; i < unclippedDescendants.size(); i++) {
             RenderLayer* unclippedDescendant = unclippedDescendants.at(i);
@@ -393,7 +393,7 @@ void CompositingRequirementsUpdater::updateRecursive(RenderLayer* ancestorLayer,
             // FIXME: Shouldn't we call computeCompositingRequirements to handle a reflection overlapping with another renderer?
             RenderLayer* reflectionLayer = layer->reflectionInfo()->reflectionLayer();
             CompositingReasons reflectionCompositingReason = willBeCompositedOrSquashed ? CompositingReasonReflectionOfCompositedParent : CompositingReasonNone;
-            reflectionLayer->setCompositingReasons(reflectionLayer->compositingReasons() | reflectionCompositingReason);
+            reflectionLayer->setCompositingReasons(reflectionCompositingReason, CompositingReasonReflectionOfCompositedParent);
         }
 
         if (willBeCompositedOrSquashed && layer->renderer()->hasBlendMode())