CONTINUED Make FrameSelection to hold non-canonicalized positions

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
index bf203b4571dceb89135ecc6d412ddf2f908d6194..4760345c44d207ba7f3da0d00651bc1ef7a6f5f7 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
@@ -846,13 +846,15 @@ void CompositedLayerMapping::updateSquashingLayerGeometry(
     compositingContainerOffsetFromParentGraphicsLayer +=
         compositingContainer->subpixelAccumulation();
 
-#if DCHECK_IS_ON()
-  const PaintLayer* commonTransformAncestor = nullptr;
-  if (compositingContainer && compositingContainer->transform())
-    commonTransformAncestor = compositingContainer;
-  else if (compositingContainer)
-    commonTransformAncestor = compositingContainer->transformAncestor();
-#endif
+  // TODO(trchen): We should enable this for below comment out |DCHECK()| once
+  // we have simple reproduce case and fix it. See http://crbug.com/646437 for
+  // details.
+  // const PaintLayer* commonTransformAncestor = nullptr;
+  // if (compositingContainer && compositingContainer->transform())
+  //   commonTransformAncestor = compositingContainer;
+  // else if (compositingContainer)
+  //   commonTransformAncestor = compositingContainer->transformAncestor();
+
   // FIXME: Cache these offsets.
   LayoutPoint compositingContainerOffsetFromTransformedAncestor;
   if (compositingContainer && !compositingContainer->transform())
@@ -867,10 +869,10 @@ void CompositedLayerMapping::updateSquashingLayerGeometry(
     // Store the local bounds of the Layer subtree before applying the offset.
     layers[i].compositedBounds = squashedBounds;
 
-#if DCHECK_IS_ON()
-    DCHECK(layers[i].paintLayer->transformAncestor() ==
-           commonTransformAncestor);
-#endif
+    // TODO(trchen): We should enable this |DCHECK()| once we have simple
+    // reproduce case and fix it. See http://crbug.com/646437 for details.
+    // DCHECK(layers[i].paintLayer->transformAncestor() ==
+    //        commonTransformAncestor);
     LayoutPoint squashedLayerOffsetFromTransformedAncestor =
         layers[i].paintLayer->computeOffsetFromTransformedAncestor();
     LayoutSize squashedLayerOffsetFromCompositingContainer =