diff options
| author | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 08:33:07 +0000 |
|---|---|---|
| committer | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 08:33:07 +0000 |
| commit | 5545d2b5cccb4b8730ae05ec1ed9d7c46f78af19 (patch) | |
| tree | c5c49b95fc844c4530d012409eb3ec3ebace338a /webkit/build | |
| parent | 2ec0393d4022b5fb97596aea34953debb23828a3 (diff) | |
| download | chromium_src-5545d2b5cccb4b8730ae05ec1ed9d7c46f78af19.zip chromium_src-5545d2b5cccb4b8730ae05ec1ed9d7c46f78af19.tar.gz chromium_src-5545d2b5cccb4b8730ae05ec1ed9d7c46f78af19.tar.bz2 | |
webkit merge 41217:41268, Chromium part
Review URL: http://codereview.chromium.org/27266
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/V8Bindings/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/V8Bindings.vcproj | 8 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 8 | ||||
| -rw-r--r-- | webkit/build/port/SConscript | 1 |
4 files changed, 14 insertions, 4 deletions
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index 7f5451a7..9e444985 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -307,6 +307,7 @@ inputs = [ '$DERIVED_DIR/V8WebKitCSSKeyframesRule.cpp', '$DERIVED_DIR/V8WebKitCSSMatrix.cpp', '$DERIVED_DIR/V8WebKitCSSTransformValue.cpp', + '$DERIVED_DIR/V8WebKitPoint.cpp', '$DERIVED_DIR/V8WebKitTransitionEvent.cpp', '$DERIVED_DIR/V8WheelEvent.cpp', '$DERIVED_DIR/V8Worker.cpp', diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj index 6b21b54..ae90fac 100644 --- a/webkit/build/V8Bindings/V8Bindings.vcproj +++ b/webkit/build/V8Bindings/V8Bindings.vcproj @@ -2340,6 +2340,14 @@ > </File> <File + RelativePath="$(IntDir)\DerivedSources\V8WebKitPoint.cpp" + > + </File> + <File + RelativePath="$(IntDir)\DerivedSources\V8WebKitPoint.h" + > + </File> + <File RelativePath="$(IntDir)\DerivedSources\V8WebKitTransitionEvent.cpp" > </File> diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 4e70e3c..c719575 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -481,6 +481,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\WebKitPoint.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\page\WindowFeatures.cpp" > </File> @@ -7242,10 +7246,6 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGResourceFilterSkia.cpp" > </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGResourceMaskerSkia.cpp" - > - </File> </Filter> </Filter> <Filter diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index 1d739d7..d05093e 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -311,6 +311,7 @@ idl_files = [ 'page/Location.idl', 'page/Navigator.idl', 'page/Screen.idl', + 'page/WebKitPoint.idl', 'page/WorkerNavigator.idl', 'inspector/InspectorController.idl', |