summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 08:02:26 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 08:02:26 +0000
commit6a4bdfdacd60d421fa6207f3ded76b3c860be7bd (patch)
treedd8e8c7d6ae4b3d70bfd393621a6c062cefe8247
parent55a2c99dcdcf2a01e4462d73d6f0139a6370e82e (diff)
downloadchromium_src-6a4bdfdacd60d421fa6207f3ded76b3c860be7bd.zip
chromium_src-6a4bdfdacd60d421fa6207f3ded76b3c860be7bd.tar.gz
chromium_src-6a4bdfdacd60d421fa6207f3ded76b3c860be7bd.tar.bz2
WebKit merge 44773:44798
The one change is to add HTMLDataGridElement support due to change http://trac.webkit.org/changeset/44778 TBR=paul@chromium.org BUG=None TEST=The data grid element is new but it is still under development. Review URL: http://codereview.chromium.org/126310 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18698 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/port/bindings/v8/v8_index.cpp1
-rw-r--r--webkit/port/bindings/v8/v8_index.h1
-rw-r--r--webkit/webkit.gyp2
4 files changed, 5 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 4065a04..eebb6a6 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "44773",
+ "webkit_revision": "44798",
}
diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp
index 7e057ad..39eb0cf 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 "V8HTMLDataGridElement.h"
#include "V8HTMLDirectoryElement.h"
#include "V8HTMLDivElement.h"
#include "V8HTMLDListElement.h"
diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h
index f80eb5e..52c4e89 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(HTMLDATAGRIDELEMENT, HTMLDataGridElement) \
V(HTMLDIRECTORYELEMENT, HTMLDirectoryElement) \
V(HTMLDIVELEMENT, HTMLDivElement) \
V(HTMLDLISTELEMENT, HTMLDListElement) \
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 2a83688..9747e3f 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/HTMLDataGridElement.idl',
'../third_party/WebKit/WebCore/html/HTMLDirectoryElement.idl',
'../third_party/WebKit/WebCore/html/HTMLDivElement.idl',
'../third_party/WebKit/WebCore/html/HTMLDocument.idl',
@@ -1685,6 +1686,7 @@
'../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/HTMLDataGridElement.h',
'../third_party/WebKit/WebCore/html/HTMLDirectoryElement.cpp',
'../third_party/WebKit/WebCore/html/HTMLDirectoryElement.h',
'../third_party/WebKit/WebCore/html/HTMLDivElement.cpp',