Merge WebKit at r78450: Fix remaining conflicts

- Document.cpp
  Conflict due to AX object cache disabled on Android
  See http://trac.webkit.org/changeset/78314

- CachedResourceLoader.cpp/h
  Conflict due to ANDROID_BLOCK_NETWORK_IMAGE
  See http://trac.webkit.org/changeset/76701

- Source/WebCore/page/ChromeClient.h
  Conflict due to ANDROID_INSTALLABLE_WEB_APPS
  See http://trac.webkit.org/changeset/77509

- FrameView.cpp
  Conflict due to Android FrameView::updatePositionedObjects()
  See http://trac.webkit.org/changeset/77274

- ScrollView.h
  Conflict due to Android
  ScrollView::actualWidth/Height/ScrollX/ScrollY()
  See http://trac.webkit.org/changeset/76831

- TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp
  conflict due to Android stubbed out
  MIMETypeRegistry::getMIMETypeForExtension()
  See http://trac.webkit.org/changeset/77368 and
  https://android-git.corp.google.com/g/#change,37272

- ImageDecoder.cpp
  Conflict due to Android excluding code
  See http://trac.webkit.org/changeset/77427

- ImageDecoder.h
  Conflict due to ANDROID guard upstreamed as SKIA guard
  See http://trac.webkit.org/changeset/77946

- InlineTextBox.cpp
  Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
  See http://trac.webkit.org/changeset/76743 and
  http://trac.webkit.org/changeset/77286

- RenderBlockLineLayout.cpp
  Conflict due to ANDROID_LAYOUT
  See http://trac.webkit.org/changeset/77062

Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859

2 files changed, 6 insertions, 9 deletions

diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
index 211ab85..10c1b6c 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
@@ -80,16 +80,13 @@ static CachedResource* createResource(CachedResource::Type type, const KURL& url
 CachedResourceLoader::CachedResourceLoader(Document* document)
     : m_document(document)
     , m_requestCount(0)
-<<<<<<< HEAD
-#ifdef ANDROID_BLOCK_NETWORK_IMAGE
-    , m_blockNetworkImage(false)
-#endif
-=======
     , m_loadDoneActionTimer(this, &CachedResourceLoader::loadDoneActionTimerFired)
->>>>>>> webkit.org at r78450
     , m_autoLoadImages(true)
     , m_loadFinishing(false)
     , m_allowStaleResources(false)
+#ifdef ANDROID_BLOCK_NETWORK_IMAGE
+    , m_blockNetworkImage(false)
+#endif
 {
 }
 
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.h b/Source/WebCore/loader/cache/CachedResourceLoader.h
index bd2bfec..881ad2f 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.h
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.h
@@ -150,12 +150,12 @@ private:
     Timer<CachedResourceLoader> m_loadDoneActionTimer;
     
     //29 bits left
-#ifdef ANDROID_BLOCK_NETWORK_IMAGE
-    bool m_blockNetworkImage : 1;
-#endif
     bool m_autoLoadImages : 1;
     bool m_loadFinishing : 1;
     bool m_allowStaleResources : 1;
+#ifdef ANDROID_BLOCK_NETWORK_IMAGE
+    bool m_blockNetworkImage : 1;
+#endif
 };
 
 }