Merge 147389 "Hide non-coordinated scrollbars for Android M26"

Source/WebCore/platform/ScrollView.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 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 898 matching lines @@
     if (scrollbarRect.size() == graphicsLayer->size())
         return;
 
     graphicsLayer->setSize(scrollbarRect.size());
 
     if (graphicsLayer->hasContentsLayer()) {
         graphicsLayer->setContentsRect(IntRect(0, 0, scrollbarRect.width(), scrollbarRect.height()));
         return;
     }
 
+#if OS(ANDROID)
+    graphicsLayer->setDrawsContent(false);
+#else
     graphicsLayer->setDrawsContent(true);
+#endif
     graphicsLayer->setNeedsDisplay();
 }
 
 static void positionScrollCornerLayer(GraphicsLayer* graphicsLayer, const IntRect& cornerRect)
 {
     if (!graphicsLayer)
         return;
     graphicsLayer->setDrawsContent(!cornerRect.isEmpty());
     graphicsLayer->setPosition(cornerRect.location());
     if (cornerRect.size() != graphicsLayer->size())
@@ skipping 501 matching lines @@
 }
 
 bool ScrollView::platformIsOffscreen() const
 {
     return false;
 }
 
 #endif
 
 }