From db14019a23d96bc8a444b6576a5da8bd1cfbc8b0 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 4 Aug 2010 11:41:34 +0100
Subject: Merge WebKit at r64523 : Initial merge by git.

Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
---
 WebKit/chromium/WebKit.gyp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'WebKit/chromium/WebKit.gyp')

diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 97efddc..10f01e5 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -178,10 +178,10 @@
                 'public/WebIDBCallbacks.h',
                 'public/WebIDBDatabase.h',
                 'public/WebIDBDatabaseError.h',
+                'public/WebIDBFactory.h',
                 'public/WebIDBIndex.h',
                 'public/WebIDBKey.h',
                 'public/WebIDBObjectStore.h',
-                'public/WebIndexedDatabase.h',
                 'public/WebInputElement.h',
                 'public/WebInputEvent.h',
                 'public/WebKit.h',
@@ -321,12 +321,12 @@
                 'src/IDBCallbacksProxy.h',
                 'src/IDBDatabaseProxy.cpp',
                 'src/IDBDatabaseProxy.h',
-                'src/IDBIndexProxy.cpp',
-                'src/IDBIndexProxy.h',
+                'src/IDBFactoryBackendProxy.cpp',
+                'src/IDBFactoryBackendProxy.h',
+                'src/IDBIndexBackendProxy.cpp',
+                'src/IDBIndexBackendProxy.h',
                 'src/IDBObjectStoreProxy.cpp',
                 'src/IDBObjectStoreProxy.h',
-                'src/IndexedDatabaseProxy.cpp',
-                'src/IndexedDatabaseProxy.h',
                 'src/InspectorClientImpl.cpp',
                 'src/InspectorClientImpl.h',
                 'src/InspectorFrontendClientImpl.cpp',
@@ -417,6 +417,8 @@
                 'src/WebIDBDatabaseError.cpp',
                 'src/WebIDBDatabaseImpl.cpp',
                 'src/WebIDBDatabaseImpl.h',
+                'src/WebIDBFactoryImpl.cpp',
+                'src/WebIDBFactoryImpl.h',
                 'src/WebIDBIndexImpl.cpp',
                 'src/WebIDBIndexImpl.h',
                 'src/WebIDBKey.cpp',
@@ -425,8 +427,6 @@
                 'src/WebImageCG.cpp',
                 'src/WebImageDecoder.cpp',
                 'src/WebImageSkia.cpp',
-                'src/WebIndexedDatabaseImpl.cpp',
-                'src/WebIndexedDatabaseImpl.h',
                 'src/WebInputElement.cpp',
                 'src/WebInputEvent.cpp',
                 'src/WebInputEventConversion.cpp',
@@ -854,6 +854,13 @@
                     ]
                 }],
                 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+                    'dependencies': [
+                        '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
+                        '<(chromium_src_dir)/build/linux/system.gyp:gtk',
+                    ],
+                    'include_dirs': [
+                        'public/gtk',
+                    ],
                     'copies': [{
                         'destination': '<(PRODUCT_DIR)',
                         'files': [
-- 
cgit v1.1