diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-16 06:39:01 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-16 06:39:01 +0000 |
| commit | c67811d2be7273e9f13c5dbbae62bc87622aad63 (patch) | |
| tree | 7a5fa0aa3544028608e9ca1d3654a18940d18ba7 /webkit/build | |
| parent | 43fb6e79242354cdf09d66024ae826eaebb4585c (diff) | |
| download | chromium_src-c67811d2be7273e9f13c5dbbae62bc87622aad63.zip chromium_src-c67811d2be7273e9f13c5dbbae62bc87622aad63.tar.gz chromium_src-c67811d2be7273e9f13c5dbbae62bc87622aad63.tar.bz2 | |
WebKit merge 41660:41709 (Chromium side).
webkit\tools\webcore_unit_tests\TransparencyWin_unittest.cpp
were necessary due to http://trac.webkit.org/changeset/41692
LayoutTests\editing\pasteboard\paste-blockquote-into-blockquote-4.html
LayoutTests\editing\pasteboard\paste-blockquote-into-blockquote.html
were rebaselined due to http://trac.webkit.org/changeset/41677
chrome\fast\dom\Window\window-lookup-precedence.html
was rebaselined due to http://trac.webkit.org/changeset/41671
Many layout tests were rebaselined due to the skia change in
http://trac.webkit.org/changeset/41683
Review URL: http://codereview.chromium.org/46099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/V8Bindings/SConscript | 8 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/V8Bindings.vcproj | 64 |
2 files changed, 36 insertions, 36 deletions
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index c6acdca..73f8911 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -335,6 +335,10 @@ inputs = [ '$WEBCORE_DIR/bindings/v8/ScriptCallStack.cpp', '$WEBCORE_DIR/bindings/v8/ScriptInstance.cpp', '$WEBCORE_DIR/bindings/v8/ScriptValue.cpp', + '$WEBCORE_DIR/bindings/v8/V8AbstractEventListener.cpp', + '$WEBCORE_DIR/bindings/v8/V8LazyEventListener.cpp', + '$WEBCORE_DIR/bindings/v8/V8ObjectEventListener.cpp', + '$WEBCORE_DIR/bindings/v8/V8WorkerContextEventListener.cpp', '$PORT_DIR/bindings/v8/v8_custom.cpp', '$PORT_DIR/bindings/v8/v8_helpers.cpp', '$PORT_DIR/bindings/v8/v8_index.cpp', @@ -350,7 +354,6 @@ inputs = [ '$PORT_DIR/bindings/v8/WorkerContextExecutionProxy.cpp', '$PORT_DIR/bindings/v8/WorkerScriptController.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8AbstractEventListener.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8ClipboardCustom.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp', @@ -369,7 +372,6 @@ inputs = [ '$WEBCORE_DIR/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8HTMLSelectElementCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8LazyEventListener.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8LocationCustom.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8MessageChannelConstructor.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8NamedNodeMapCustom.cpp', @@ -379,14 +381,12 @@ inputs = [ '$WEBCORE_DIR/bindings/v8/custom/V8NodeFilterCustom.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8NodeIteratorCustom.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8NodeListCustom.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8ObjectEventListener.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8StyleSheetListCustom.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8SVGElementInstanceCustom.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8SVGLengthCustom.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8SVGMatrixCustom.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8TreeWalkerCustom.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp', - '$WEBCORE_DIR/bindings/v8/custom/V8WorkerContextEventListener.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8XMLSerializerConstructor.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8XPathEvaluatorConstructor.cpp', '$WEBCORE_DIR/bindings/v8/custom/V8XSLTProcessorCustom.cpp', diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj index 7fdf9b33..0ae35829 100644 --- a/webkit/build/V8Bindings/V8Bindings.vcproj +++ b/webkit/build/V8Bindings/V8Bindings.vcproj @@ -128,14 +128,6 @@ Name="custom" > <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8AbstractEventListener.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8AbstractEventListener.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8CanvasRenderingContext2DCustom.cpp" > </File> @@ -220,14 +212,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8LazyEventListener.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8LazyEventListener.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8LocationCustom.cpp" > </File> @@ -268,14 +252,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8ObjectEventListener.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8ObjectEventListener.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8StyleSheetListCustom.cpp" > </File> @@ -300,14 +276,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8WorkerContextEventListener.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8WorkerContextEventListener.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8XMLSerializerConstructor.cpp" > </File> @@ -2901,6 +2869,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8AbstractEventListener.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8AbstractEventListener.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8Binding.h" > </File> @@ -2909,10 +2885,26 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8LazyEventListener.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8LazyEventListener.h" + > + </File> + <File RelativePath="..\..\port\bindings\v8\V8MessagePortCustom.cpp" > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8ObjectEventListener.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8ObjectEventListener.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8Proxy.h" > </File> @@ -2921,6 +2913,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8WorkerContextEventListener.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8WorkerContextEventListener.h" + > + </File> + <File RelativePath="..\..\port\bindings\v8\V8WorkerCustom.cpp" > </File> |