From 06ea8e899e48f1f2f396b70e63fae369f2f23232 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Mon, 28 Jun 2010 16:42:48 +0100
Subject: Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
---
 WebKit/chromium/WebKit.gyp | 9 +++++++++
 1 file changed, 9 insertions(+)

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

diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 83ae631..a53dd28 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -77,6 +77,7 @@
                 'public/linux/WebRenderTheme.h',
                 'public/x11/WebScreenInfoFactory.h',
                 'public/mac/WebInputEventFactory.h',
+                'public/mac/WebSandboxSupport.h',
                 'public/mac/WebScreenInfoFactory.h',
                 'public/WebAccessibilityCache.h',
                 'public/WebAccessibilityObject.h',
@@ -93,6 +94,7 @@
                 'public/WebCommon.h',
                 'public/WebCommonWorkerClient.h',
                 'public/WebCompositionCommand.h',
+                'public/WebCompositionUnderline.h',
                 'public/WebConsoleMessage.h',
                 'public/WebContextMenuData.h',
                 'public/WebCookie.h',
@@ -110,6 +112,7 @@
                 'public/WebDevToolsFrontend.h',
                 'public/WebDevToolsFrontendClient.h',
                 'public/WebDevToolsMessageData.h',
+                'public/WebDevToolsMessageTransport.h',
                 'public/WebDocument.h',
                 'public/WebDragData.h',
                 'public/WebEditingAction.h',
@@ -205,6 +208,7 @@
                 'public/WebTextAffinity.h',
                 'public/WebTextCaseSensitivity.h',
                 'public/WebTextDirection.h',
+                'public/WebTextInputType.h',
                 'public/WebThemeEngine.h',
                 'public/WebURL.h',
                 'public/WebURLError.h',
@@ -240,6 +244,9 @@
                 'src/ChromiumBridge.cpp',
                 'src/ChromiumCurrentTime.cpp',
                 'src/ChromiumThreading.cpp',
+                'src/CompositionUnderlineBuilder.h',
+                'src/CompositionUnderlineVectorBuilder.cpp',
+                'src/CompositionUnderlineVectorBuilder.h',
                 'src/ContextMenuClientImpl.cpp',
                 'src/ContextMenuClientImpl.h',
                 'src/DatabaseObserver.cpp',
@@ -254,6 +261,8 @@
                 'src/DOMUtilitiesPrivate.h',
                 'src/DragClientImpl.cpp',
                 'src/DragClientImpl.h',
+                'src/DragScrollTimer.cpp',
+                'src/DragScrollTimer.h',
                 'src/EditorClientImpl.cpp',
                 'src/EditorClientImpl.h',
                 'src/EventListenerWrapper.cpp',
-- 
cgit v1.1