summaryrefslogtreecommitdiffstats
path: root/webkit/webkit.gyp
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-16 06:39:01 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-16 06:39:01 +0000
commitc67811d2be7273e9f13c5dbbae62bc87622aad63 (patch)
tree7a5fa0aa3544028608e9ca1d3654a18940d18ba7 /webkit/webkit.gyp
parent43fb6e79242354cdf09d66024ae826eaebb4585c (diff)
downloadchromium_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/webkit.gyp')
-rw-r--r--webkit/webkit.gyp16
1 files changed, 8 insertions, 8 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 60775bb..1215acf 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -962,8 +962,6 @@
'port/bindings/v8/UndetectableHTMLCollection.idl',
# V8 bindings not generated from .idl source.
- '../third_party/WebKit/WebCore/bindings/v8/custom/V8AbstractEventListener.cpp',
- '../third_party/WebKit/WebCore/bindings/v8/custom/V8AbstractEventListener.h',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8ClipboardCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp',
@@ -996,8 +994,6 @@
'../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.h',
- '../third_party/WebKit/WebCore/bindings/v8/custom/V8LazyEventListener.cpp',
- '../third_party/WebKit/WebCore/bindings/v8/custom/V8LazyEventListener.h',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8LocationCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8MessageChannelConstructor.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8NamedNodeMapCustom.cpp',
@@ -1008,8 +1004,6 @@
'../third_party/WebKit/WebCore/bindings/v8/custom/V8NodeFilterCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8NodeIteratorCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8NodeListCustom.cpp',
- '../third_party/WebKit/WebCore/bindings/v8/custom/V8ObjectEventListener.cpp',
- '../third_party/WebKit/WebCore/bindings/v8/custom/V8ObjectEventListener.h',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8SQLResultSetRowListCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8SVGElementInstanceCustom.cpp',
@@ -1018,8 +1012,6 @@
'../third_party/WebKit/WebCore/bindings/v8/custom/V8StyleSheetListCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8TreeWalkerCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp',
- '../third_party/WebKit/WebCore/bindings/v8/custom/V8WorkerContextEventListener.cpp',
- '../third_party/WebKit/WebCore/bindings/v8/custom/V8WorkerContextEventListener.h',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8XMLSerializerConstructor.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8XPathEvaluatorConstructor.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8XSLTProcessorCustom.cpp',
@@ -1037,8 +1029,16 @@
'../third_party/WebKit/WebCore/bindings/v8/ScriptString.h',
'../third_party/WebKit/WebCore/bindings/v8/ScriptValue.cpp',
'../third_party/WebKit/WebCore/bindings/v8/ScriptValue.h',
+ '../third_party/WebKit/WebCore/bindings/v8/V8AbstractEventListener.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/V8AbstractEventListener.h',
'../third_party/WebKit/WebCore/bindings/v8/V8Binding.h',
+ '../third_party/WebKit/WebCore/bindings/v8/V8LazyEventListener.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/V8LazyEventListener.h',
+ '../third_party/WebKit/WebCore/bindings/v8/V8ObjectEventListener.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/V8ObjectEventListener.h',
'../third_party/WebKit/WebCore/bindings/v8/V8Proxy.h',
+ '../third_party/WebKit/WebCore/bindings/v8/V8WorkerContextEventListener.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/V8WorkerContextEventListener.h',
'extensions/v8/gc_extension.cc',
'extensions/v8/gc_extension.h',
'extensions/v8/gears_extension.cc',