[Blink] Don't center images in Android WebViews

third_party/WebKit/Source/core/html/ImageDocument.cpp

Index: third_party/WebKit/Source/core/html/ImageDocument.cpp
diff --git a/third_party/WebKit/Source/core/html/ImageDocument.cpp b/third_party/WebKit/Source/core/html/ImageDocument.cpp
index 5a716aa9331096f846fcd571083c1446490fd60f..06ee1efe7b7fac4073ffbda6ec98e93140755ff8 100644
--- a/third_party/WebKit/Source/core/html/ImageDocument.cpp
+++ b/third_party/WebKit/Source/core/html/ImageDocument.cpp
@@ -48,6 +48,7 @@
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/resource/ImageResource.h"
+#include "core/page/Page.h"
 #include "platform/HostWindow.h"
 #include "wtf/text/StringBuilder.h"
 #include <limits>
@@ -594,7 +595,12 @@ ImageResource* ImageDocument::cachedImageResourceDeprecated() {
 }
 
 bool ImageDocument::shouldShrinkToFit() const {
-  return frame()->isMainFrame();
+  // WebView automatically resizes to match the contents, causing an infinite
+  // loop as the contents then resize to match the window. To prevent this,
+  // disallow images from shrinking to fit for WebViews.
+  bool isWrapContentWebView =
+      page() ? page()->settings().getForceZeroLayoutHeight() : false;
+  return frame()->isMainFrame() && !isWrapContentWebView;
 }
 
 DEFINE_TRACE(ImageDocument) {