diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-15 01:46:22 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-15 01:46:22 +0000 |
| commit | 2b88c1810672ba8671da85b115089f8a562cf17f (patch) | |
| tree | 47613a385df7c3ec00375ddb927b7e80b9c56213 /webkit/build | |
| parent | 3ef033d5dfc74064b75780ec16580705b46b81af (diff) | |
| download | chromium_src-2b88c1810672ba8671da85b115089f8a562cf17f.zip chromium_src-2b88c1810672ba8671da85b115089f8a562cf17f.tar.gz chromium_src-2b88c1810672ba8671da85b115089f8a562cf17f.tar.bz2 | |
Chromium side of WebKit merge 39894:39913 plus a one-line fix from a more
recent WebKit revision in XMLTokenizerLibxml2.cpp to make it compile.
Review URL: http://codereview.chromium.org/18075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 3 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index d905cd4..43cace8 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -171,6 +171,8 @@ input_files = [ '$WEBCORE_DIR/dom/XMLTokenizer.cpp', '$WEBCORE_DIR/dom/XMLTokenizerLibxml2.cpp', + '$WEBCORE_DIR/editing/chromium/EditorChromium.cpp', + '$WEBCORE_DIR/editing/AppendNodeCommand.cpp', '$WEBCORE_DIR/editing/ApplyStyleCommand.cpp', '$WEBCORE_DIR/editing/BreakBlockquoteCommand.cpp', @@ -468,7 +470,6 @@ input_files = [ '$WEBCORE_DIR/platform/chromium/CursorChromium.cpp', '$WEBCORE_DIR/platform/chromium/DragDataChromium.cpp', '$WEBCORE_DIR/platform/chromium/DragImageChromium.cpp', - '$WEBCORE_DIR/platform/chromium/EditorChromium.cpp', '$WEBCORE_DIR/platform/chromium/FileChooserChromium.cpp', '$WEBCORE_DIR/platform/chromium/FileSystemChromium.cpp', '$WEBCORE_DIR/platform/chromium/FramelessScrollView.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 29e7cbf..cfe2651 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -2237,10 +2237,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\EditorChromium.cpp" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\FileChooserChromium.cpp" > </File> @@ -4818,6 +4814,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\editing\chromium\EditorChromium.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\editing\EditorCommand.cpp" > </File> |