diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebKit2/GNUmakefile.am | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebKit2/GNUmakefile.am')
| -rw-r--r-- | Source/WebKit2/GNUmakefile.am | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am index 837165d..2d6ad7e 100644 --- a/Source/WebKit2/GNUmakefile.am +++ b/Source/WebKit2/GNUmakefile.am @@ -93,13 +93,13 @@ libWebKit2_la_SOURCES = \ Source/WebKit2/Platform/CoreIPC/CoreIPCMessageKinds.h \ Source/WebKit2/Platform/CoreIPC/DataReference.cpp \ Source/WebKit2/Platform/CoreIPC/DataReference.h \ - Source/WebKit2/Platform/CoreIPC/gtk/ConnectionGtk.cpp \ Source/WebKit2/Platform/CoreIPC/HandleMessage.h \ Source/WebKit2/Platform/CoreIPC/MessageID.h \ Source/WebKit2/Platform/CoreIPC/MessageSender.h \ + Source/WebKit2/Platform/CoreIPC/unix/AttachmentUnix.cpp \ + Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp \ Source/WebKit2/Platform/gtk/ModuleGtk.cpp \ Source/WebKit2/Platform/gtk/RunLoopGtk.cpp \ - Source/WebKit2/Platform/gtk/SharedMemoryGtk.cpp \ Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp \ Source/WebKit2/Platform/Logging.cpp \ Source/WebKit2/Platform/Logging.h \ @@ -109,6 +109,7 @@ libWebKit2_la_SOURCES = \ Source/WebKit2/Platform/RunLoop.cpp \ Source/WebKit2/Platform/RunLoop.h \ Source/WebKit2/Platform/SharedMemory.h \ + Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp \ Source/WebKit2/Platform/WorkItem.h \ Source/WebKit2/Platform/WorkQueue.cpp \ Source/WebKit2/Platform/WorkQueue.h \ @@ -182,11 +183,12 @@ libWebKit2_la_SOURCES = \ Source/WebKit2/Shared/CoreIPCSupport/InjectedBundleMessageKinds.h \ Source/WebKit2/Shared/CoreIPCSupport/WebContextMessageKinds.h \ Source/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h \ - Source/WebKit2/Shared/CoreIPCSupport/WebProcessProxyMessageKinds.h \ Source/WebKit2/Shared/DrawingAreaInfo.h \ + Source/WebKit2/Shared/EditorState.h \ Source/WebKit2/Shared/FontSmoothingLevel.h \ Source/WebKit2/Shared/gtk/ShareableBitmapGtk.cpp \ Source/WebKit2/Shared/gtk/NativeWebKeyboardEventGtk.cpp \ + Source/WebKit2/Shared/gtk/NativeWebMouseEventGtk.cpp \ Source/WebKit2/Shared/gtk/PlatformCertificateInfo.h \ Source/WebKit2/Shared/gtk/UpdateChunk.cpp \ Source/WebKit2/Shared/gtk/UpdateChunk.h \ @@ -204,6 +206,7 @@ libWebKit2_la_SOURCES = \ Source/WebKit2/Shared/MutableDictionary.cpp \ Source/WebKit2/Shared/MutableDictionary.h \ Source/WebKit2/Shared/NativeWebKeyboardEvent.h \ + Source/WebKit2/Shared/NativeWebMouseEvent.h \ Source/WebKit2/Shared/OriginAndDatabases.cpp \ Source/WebKit2/Shared/OriginAndDatabases.h \ Source/WebKit2/Shared/PlatformPopupMenuData.cpp \ @@ -212,6 +215,7 @@ libWebKit2_la_SOURCES = \ Source/WebKit2/Shared/PrintInfo.h \ Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp \ Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h \ + Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp \ Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp \ Source/WebKit2/Shared/Plugins/NPIdentifierData.cpp \ Source/WebKit2/Shared/Plugins/NPIdentifierData.h \ @@ -230,7 +234,6 @@ libWebKit2_la_SOURCES = \ Source/WebKit2/Shared/SandboxExtension.h \ Source/WebKit2/Shared/SecurityOriginData.h \ Source/WebKit2/Shared/SecurityOriginData.cpp \ - Source/WebKit2/Shared/SelectionState.h \ Source/WebKit2/Shared/SessionState.cpp \ Source/WebKit2/Shared/SessionState.h \ Source/WebKit2/Shared/StringPairVector.h \ @@ -454,6 +457,8 @@ libWebKit2_la_SOURCES = \ Source/WebKit2/UIProcess/WebHistoryClient.h \ Source/WebKit2/UIProcess/WebIconDatabase.cpp \ Source/WebKit2/UIProcess/WebIconDatabase.h \ + Source/WebKit2/UIProcess/WebIconDatabaseClient.cpp \ + Source/WebKit2/UIProcess/WebIconDatabaseClient.h \ Source/WebKit2/UIProcess/WebInspectorProxy.cpp \ Source/WebKit2/UIProcess/WebInspectorProxy.h \ Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.cpp \ @@ -588,6 +593,7 @@ libWebKit2_la_SOURCES = \ Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h \ Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp \ Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h \ + Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp \ Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp \ Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h \ Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp \ @@ -611,6 +617,7 @@ libWebKit2_la_SOURCES = \ Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h \ Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp \ Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp \ + Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp \ Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp \ Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h \ Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp \ @@ -651,6 +658,7 @@ libWebKit2_la_SOURCES = \ Source/WebKit2/WebProcess/WebPage/FindController.h \ Source/WebKit2/WebProcess/WebPage/gtk/ChunkedUpdateDrawingAreaGtk.cpp \ Source/WebKit2/WebProcess/WebPage/gtk/WebInspectorGtk.cpp \ + Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp \ Source/WebKit2/WebProcess/WebPage/PageOverlay.cpp \ Source/WebKit2/WebProcess/WebPage/PageOverlay.h \ Source/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp \ |