diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-13 18:40:32 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-13 18:40:32 +0000 |
| commit | c2d3052594e4efb4adfb71c2dcecd5fcd9ee1ea1 (patch) | |
| tree | 486e8f3c53d599401d39c3dd4a81cea38c97e367 /webkit/build | |
| parent | 2fb6d466842f445078962a2f5aa4fa7af49d2313 (diff) | |
| download | chromium_src-c2d3052594e4efb4adfb71c2dcecd5fcd9ee1ea1.zip chromium_src-c2d3052594e4efb4adfb71c2dcecd5fcd9ee1ea1.tar.gz chromium_src-c2d3052594e4efb4adfb71c2dcecd5fcd9ee1ea1.tar.bz2 | |
WebKit merge 40847-40875 Chrome side.
Review URL: http://codereview.chromium.org/21351
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9767 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/SConscript | 11 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 24 |
4 files changed, 31 insertions, 13 deletions
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index 54696d3..602322a 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -34,6 +34,7 @@ else: inputs = [ '$DERIVED_DIR/CSSGrammar.cpp', + '$DERIVED_DIR/HTMLElementFactory.cpp', '$DERIVED_DIR/HTMLNames.cpp', '$DERIVED_DIR/SVGElementFactory.cpp', '$DERIVED_DIR/SVGNames.cpp', diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj index 40de847..a2168ab 100644 --- a/webkit/build/V8Bindings/V8Bindings.vcproj +++ b/webkit/build/V8Bindings/V8Bindings.vcproj @@ -196,6 +196,14 @@ > </File> <File + RelativePath="$(IntDir)\DerivedSources\HTMLElementFactory.cpp" + > + </File> + <File + RelativePath="$(IntDir)\DerivedSources\HTMLElementFactory.h" + > + </File> + <File RelativePath="$(IntDir)\DerivedSources\HTMLNames.cpp" > </File> diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index bf5edf6..161f7b5 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -266,7 +266,6 @@ input_files = [ '$WEBCORE_DIR/html/HTMLDListElement.cpp', '$WEBCORE_DIR/html/HTMLDocument.cpp', '$WEBCORE_DIR/html/HTMLElement.cpp', - '$WEBCORE_DIR/html/HTMLElementFactory.cpp', '$WEBCORE_DIR/html/HTMLEmbedElement.cpp', '$WEBCORE_DIR/html/HTMLFieldSetElement.cpp', '$WEBCORE_DIR/html/HTMLFontElement.cpp', @@ -511,12 +510,14 @@ input_files = [ '$WEBCORE_DIR/platform/graphics/chromium/ColorChromium.cpp', '$WEBCORE_DIR/platform/graphics/chromium/FontCustomPlatformData.cpp', - '$WEBCORE_DIR/platform/graphics/transforms/ScaleTransformOperation.cpp', - '$WEBCORE_DIR/platform/graphics/transforms/TranslateTransformOperation.cpp', - '$WEBCORE_DIR/platform/graphics/transforms/RotateTransformOperation.cpp', - '$WEBCORE_DIR/platform/graphics/transforms/TransformOperations.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/Matrix3DTransformOperation.cpp', '$WEBCORE_DIR/platform/graphics/transforms/MatrixTransformOperation.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/PerspectiveTransformOperation.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/RotateTransformOperation.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/ScaleTransformOperation.cpp', '$WEBCORE_DIR/platform/graphics/transforms/SkewTransformOperation.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/TransformOperations.cpp', + '$WEBCORE_DIR/platform/graphics/transforms/TranslateTransformOperation.cpp', '$WEBCORE_DIR/platform/graphics/transforms/TransformationMatrix.cpp', '$WEBCORE_DIR/platform/graphics/skia/FloatPointSkia.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index a31e744..87a4149 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -1495,6 +1495,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\Matrix3DTransformOperation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\Matrix3DTransformOperation.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\MatrixTransformOperation.cpp" > </File> @@ -1503,6 +1511,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\PerspectiveTransformOperation.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\PerspectiveTransformOperation.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\RotateTransformOperation.cpp" > </File> @@ -5521,14 +5537,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\html\HTMLElementFactory.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\html\HTMLElementFactory.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\html\HTMLEmbedElement.cpp" > </File> |