From ca10fba15464fd5625cec97cf2522d25674e9362 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 15 Jun 2010 19:52:12 +0100
Subject: Merge webkit.org at r61121: Fix conflicts.

Fix conflicts due to addition of m_pageinateDuringLayoutEnabled in Settings.cpp|h
See http://trac.webkit.org/changeset/60509

Fix conflicts in ImageSource.h due to new functions being added in the same spot as an un upstreamed Android addition.
See http://trac.webkit.org/changeset/60927

Fix conflicts due to addition of !PLATFORM(CAIRO) to guard Android has changed and not upstreamed.
See http://trac.webkit.org/changeset/60760

Fix conflicts due to a variable renaming colliding with an Android ifdef which is not upstream.
See http://trac.webkit.org/changeset/61106

Fix conflicts due to Android IDB makefile fix collising with addition of new IDB file.
See http://trac.webkit.org/changeset/61120

Fix conflicts due to un-upstreamed makefile edits colliding with an upstream change.
See http://trac.webkit.org/changeset/61000

Change-Id: I330e08850b96d7c9fb1d093663c5847b9140683d
---
 WebCore/page/Settings.cpp | 6 ++----
 WebCore/page/Settings.h   | 6 +-----
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'WebCore/page')

diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 9ee3e1f..b20f2e5 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -145,13 +145,11 @@ Settings::Settings(Page* page)
     , m_loadDeferringEnabled(true)
     , m_tiledBackingStoreEnabled(false)
     , m_html5ParserEnabled(false)
-<<<<<<< HEAD:WebCore/page/Settings.cpp
+    , m_paginateDuringLayoutEnabled(false)
 #ifdef ANDROID_PLUGINS
     , m_pluginsOnDemand(false)
 #endif
-=======
-    , m_paginateDuringLayoutEnabled(false)
->>>>>>> Webkit.org at r61121:WebCore/page/Settings.cpp
+
 {
     // A Frame may not have been created yet, so we initialize the AtomicString 
     // hash before trying to use it.
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 8e82891..1513a7a 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -483,15 +483,11 @@ namespace WebCore {
         bool m_loadDeferringEnabled : 1;
         bool m_tiledBackingStoreEnabled : 1;
         bool m_html5ParserEnabled: 1;
-<<<<<<< HEAD:WebCore/page/Settings.h
+        bool m_paginateDuringLayoutEnabled : 1;
 #ifdef ANDROID_PLUGINS
         bool m_pluginsOnDemand : 1;
 #endif
 
-=======
-        bool m_paginateDuringLayoutEnabled : 1;
-    
->>>>>>> Webkit.org at r61121:WebCore/page/Settings.h
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;
 #endif
-- 
cgit v1.1