Revert "Disable local background equivalence when we have a box shadow due to painting bug."

third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
index d35fc7fd00589fa1d285cc7816a2ed03aad14416..f4b697bd895f7b7d4ba53b1babfd3342e5520374 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
@@ -129,12 +129,6 @@ BackgroundPaintLocation LayoutBoxModelObject::backgroundPaintLocation() const {
   if (!style()->hasAutoClip())
     return BackgroundPaintInGraphicsLayer;
 
-  // TODO(flackr): Remove this when box shadows are still painted correctly when
-  // painting into the composited scrolling contents layer.
-  // https://crbug.com/646464
-  if (style()->boxShadow())
-    return BackgroundPaintInGraphicsLayer;
-
   // Assume optimistically that the background can be painted in the scrolling
   // contents until we find otherwise.
   BackgroundPaintLocation paintLocation = BackgroundPaintInScrollingContents;