diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 17:56:05 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 17:56:05 +0000 |
| commit | f9228b5e375b0778f6eaa40d95f2da88b5a99b7c (patch) | |
| tree | 706ebd5881ec588be0eddd9eed3b7dc3c6cd62c6 /webkit/build/WebCore | |
| parent | 68fd131d06eec40cc25b343998da4f4db2238a90 (diff) | |
| download | chromium_src-f9228b5e375b0778f6eaa40d95f2da88b5a99b7c.zip chromium_src-f9228b5e375b0778f6eaa40d95f2da88b5a99b7c.tar.gz chromium_src-f9228b5e375b0778f6eaa40d95f2da88b5a99b7c.tar.bz2 | |
Reverting 9383.
Try again to land webkit merge.
Review URL: http://codereview.chromium.org/21173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/WebCore')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 3 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 24 |
2 files changed, 18 insertions, 9 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index ceea840..4302b4d 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', @@ -542,6 +541,8 @@ input_files = [ '$WEBCORE_DIR/platform/image-decoders/skia/PNGImageDecoder.cpp', '$WEBCORE_DIR/platform/image-decoders/skia/XBMImageDecoder.cpp', + '$WEBCORE_DIR/platform/image-encoders/skia/PNGImageEncoder.cpp', + '$WEBCORE_DIR/platform/network/AuthenticationChallengeBase.cpp', '$WEBCORE_DIR/platform/network/Credential.cpp', '$WEBCORE_DIR/platform/network/FormData.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> |