diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 01:24:27 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 01:24:27 +0000 |
| commit | c702f03c0d09b937aaa6958ac4f5ff4bb33cf335 (patch) | |
| tree | e63f2742f4aefce956d4dbcf1334b60cb281fb45 /webkit/build/WebCore | |
| parent | 309d3a2b575538181ce48091794324b8a97fdc77 (diff) | |
| download | chromium_src-c702f03c0d09b937aaa6958ac4f5ff4bb33cf335.zip chromium_src-c702f03c0d09b937aaa6958ac4f5ff4bb33cf335.tar.gz chromium_src-c702f03c0d09b937aaa6958ac4f5ff4bb33cf335.tar.bz2 | |
WebKit merge 40668:40722 part 2.
Review URL: http://codereview.chromium.org/20151
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9380 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/WebCore')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 24 |
2 files changed, 16 insertions, 9 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index ceea840..d0b49d7 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -128,7 +128,6 @@ input_files = [ '$WEBCORE_DIR/dom/Event.cpp', '$WEBCORE_DIR/dom/EventNames.cpp', '$WEBCORE_DIR/dom/EventTarget.cpp', - '$WEBCORE_DIR/dom/EventTargetNode.cpp', '$WEBCORE_DIR/dom/ExceptionBase.cpp', '$WEBCORE_DIR/dom/ExceptionCode.cpp', '$WEBCORE_DIR/dom/FormControlElementWithState.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 5b31d6d..45a64da 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -2395,6 +2395,22 @@ Name="skia" > <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-encoders\skia\PNGImageEncoder.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-encoders\skia\PNGImageEncoder.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="image-decoders" + > + <Filter + Name="skia" + > + <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\BMPImageDecoder.cpp" > </File> @@ -4441,14 +4457,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\dom\EventTargetNode.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\dom\EventTargetNode.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\dom\ExceptionBase.cpp" > </File> |