From 34b9de55b7843a44963efc5b0a460871a4d27a80 Mon Sep 17 00:00:00 2001 From: "tc@google.com" Date: Tue, 24 Feb 2009 20:32:42 +0000 Subject: chrome side of the webkit merge - Add platform specific chromiumclipboard files. - Some methods got renamed in renderlayer, so change some method names in our glue code. Review URL: http://codereview.chromium.org/27096 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10286 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/build/WebCore/SConscript | 2 ++ webkit/build/WebCore/WebCore.vcproj | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'webkit/build') diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 3c1ba65..f2c9f57 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -923,6 +923,7 @@ if env.Bit('windows'): '$WEBCORE_DIR/platform/chromium/SoundChromiumWin.cpp', '$WEBCORE_DIR/platform/chromium/WindowsVersion.cpp', + '$WEBCORE_DIR/platform/chromium/ClipboardChromiumWin.cpp', '$WEBCORE_DIR/platform/graphics/chromium/FontCacheChromiumWin.cpp', '$WEBCORE_DIR/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp', '$WEBCORE_DIR/platform/graphics/chromium/FontUtilsChromiumWin.cpp', @@ -948,6 +949,7 @@ if env.Bit('linux'): '$WEBCORE_DIR/platform/chromium/ScrollbarThemeChromiumLinux.cpp', '$WEBCORE_DIR/platform/chromium/SoundChromiumPosix.cpp', + '$WEBCORE_DIR/platform/chromium/ClipboardChromiumLinux.cpp', '$WEBCORE_DIR/platform/graphics/chromium/FontCacheLinux.cpp', '$WEBCORE_DIR/platform/graphics/chromium/FontLinux.cpp', '$WEBCORE_DIR/platform/graphics/chromium/FontPlatformDataLinux.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index c477ceb..fdbc5f1 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -2248,6 +2248,10 @@ > + + -- cgit v1.1