diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 20:32:42 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 20:32:42 +0000 |
| commit | 34b9de55b7843a44963efc5b0a460871a4d27a80 (patch) | |
| tree | 0a72c14bf5f227a528210239f1e385336874afca /webkit/build/WebCore | |
| parent | acbfe5da0789a704455f491978073c6ab409e268 (diff) | |
| download | chromium_src-34b9de55b7843a44963efc5b0a460871a4d27a80.zip chromium_src-34b9de55b7843a44963efc5b0a460871a4d27a80.tar.gz chromium_src-34b9de55b7843a44963efc5b0a460871a4d27a80.tar.bz2 | |
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
Diffstat (limited to 'webkit/build/WebCore')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 4 |
2 files changed, 6 insertions, 0 deletions
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 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ClipboardChromiumWin.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ClipboardUtilitiesChromium.cpp" > </File> |