summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpaul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 00:30:14 +0000
committerpaul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 00:30:14 +0000
commit70b340dae988354ac3e5722224ebb02a66bd55ae (patch)
treea858023e544297fec32086c1e2d4e6d924ea1310
parenta36366f796233d0678cf8d7ee47a52c4344530ed (diff)
downloadchromium_src-70b340dae988354ac3e5722224ebb02a66bd55ae.zip
chromium_src-70b340dae988354ac3e5722224ebb02a66bd55ae.tar.gz
chromium_src-70b340dae988354ac3e5722224ebb02a66bd55ae.tar.bz2
WebKit merge 44943:44946.
BUG=none TEST=none Review URL: http://codereview.chromium.org/145015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18995 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.gyp3
4 files changed, 6 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index b0753b0f..2e6e735 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "44944",
+ "webkit_revision": "44946",
}
diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp
index 14c44d7..ed2497a 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 "V8HTMLDataGridCellElement.h"
#include "V8HTMLDataGridColElement.h"
#include "V8HTMLDataGridElement.h"
#include "V8HTMLDataGridRowElement.h"
diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h
index 42b83ae..0b5f0e2b 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(HTMLDATAGRIDCELLELEMENT, HTMLDataGridCellElement) \
V(HTMLDATAGRIDCOLELEMENT, HTMLDataGridColElement) \
V(HTMLDATAGRIDELEMENT, HTMLDataGridElement) \
V(HTMLDATAGRIDROWELEMENT, HTMLDataGridRowElement) \
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 78032fe..de19940 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/HTMLDataGridCellElement.idl',
'../third_party/WebKit/WebCore/html/HTMLDataGridColElement.idl',
'../third_party/WebKit/WebCore/html/HTMLDataGridElement.idl',
'../third_party/WebKit/WebCore/html/HTMLDataGridRowElement.idl',
@@ -1689,6 +1690,8 @@
'../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/HTMLDataGridCellElement.cpp',
+ '../third_party/WebKit/WebCore/html/HTMLDataGridCellElement.h',
'../third_party/WebKit/WebCore/html/HTMLDataGridColElement.cpp',
'../third_party/WebKit/WebCore/html/HTMLDataGridColElement.h',
'../third_party/WebKit/WebCore/html/HTMLDataGridElement.cpp',