diff options
| author | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 23:25:34 +0000 |
|---|---|---|
| committer | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 23:25:34 +0000 |
| commit | 143f5f41c37362350380185fadc2f1a6021fabd2 (patch) | |
| tree | 46db8d975d9998fbbda00eceffe792cc78277ac3 | |
| parent | 00a120e07ad005f243c2833a8249e1600cfcac0e (diff) | |
| download | chromium_src-143f5f41c37362350380185fadc2f1a6021fabd2.zip chromium_src-143f5f41c37362350380185fadc2f1a6021fabd2.tar.gz chromium_src-143f5f41c37362350380185fadc2f1a6021fabd2.tar.bz2 | |
WebKit merge r44837:r44872.
Review URL: http://codereview.chromium.org/141005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18875 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_index.cpp | 1 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_index.h | 1 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 6 |
4 files changed, 9 insertions, 1 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "44837", + "webkit_revision": "44872", } diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp index 39eb0cf..8b43fca 100644 --- a/webkit/port/bindings/v8/v8_index.cpp +++ b/webkit/port/bindings/v8/v8_index.cpp @@ -89,6 +89,7 @@ #include "V8HTMLButtonElement.h" #include "V8HTMLCanvasElement.h" #include "V8HTMLModElement.h" +#include "V8HTMLDataGridColElement.h" #include "V8HTMLDataGridElement.h" #include "V8HTMLDirectoryElement.h" #include "V8HTMLDivElement.h" diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h index 52c4e89..16e07d2 100644 --- a/webkit/port/bindings/v8/v8_index.h +++ b/webkit/port/bindings/v8/v8_index.h @@ -66,6 +66,7 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); V(HTMLBRELEMENT, HTMLBRElement) \ V(HTMLBUTTONELEMENT, HTMLButtonElement) \ V(HTMLCANVASELEMENT, HTMLCanvasElement) \ + V(HTMLDATAGRIDCOLELEMENT, HTMLDataGridColElement) \ V(HTMLDATAGRIDELEMENT, HTMLDataGridElement) \ V(HTMLDIRECTORYELEMENT, HTMLDirectoryElement) \ V(HTMLDIVELEMENT, HTMLDivElement) \ diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 759aa14..9b03435 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -749,6 +749,7 @@ '../third_party/WebKit/WebCore/html/HTMLCanvasElement.idl', '../third_party/WebKit/WebCore/html/HTMLCollection.idl', '../third_party/WebKit/WebCore/html/HTMLDListElement.idl', + '../third_party/WebKit/WebCore/html/HTMLDataGridColElement.idl', '../third_party/WebKit/WebCore/html/HTMLDataGridElement.idl', '../third_party/WebKit/WebCore/html/HTMLDirectoryElement.idl', '../third_party/WebKit/WebCore/html/HTMLDivElement.idl', @@ -1686,6 +1687,9 @@ '../third_party/WebKit/WebCore/html/HTMLCollection.h', '../third_party/WebKit/WebCore/html/HTMLDListElement.cpp', '../third_party/WebKit/WebCore/html/HTMLDListElement.h', + '../third_party/WebKit/WebCore/html/HTMLDataGridColElement.cpp', + '../third_party/WebKit/WebCore/html/HTMLDataGridColElement.h', + '../third_party/WebKit/WebCore/html/HTMLDataGridElement.cpp', '../third_party/WebKit/WebCore/html/HTMLDataGridElement.h', '../third_party/WebKit/WebCore/html/HTMLDirectoryElement.cpp', '../third_party/WebKit/WebCore/html/HTMLDirectoryElement.h', @@ -2088,6 +2092,8 @@ '../third_party/WebKit/WebCore/page/WindowFeatures.h', '../third_party/WebKit/WebCore/page/WorkerNavigator.cpp', '../third_party/WebKit/WebCore/page/WorkerNavigator.h', + '../third_party/WebKit/WebCore/page/XSSAuditor.cpp', + '../third_party/WebKit/WebCore/page/XSSAuditor.h', '../third_party/WebKit/WebCore/platform/animation/Animation.cpp', '../third_party/WebKit/WebCore/platform/animation/Animation.h', '../third_party/WebKit/WebCore/platform/animation/AnimationList.cpp', |