summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpaul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-22 22:22:38 +0000
committerpaul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-22 22:22:38 +0000
commitc6b20fa7be447131bd6643dbda3a4965db988a04 (patch)
treeb91e0b66577f14e84c806fb57ce86a500478c18a /webkit
parent6d1c4648e4a9966482d10ad1b212f78d575b5e39 (diff)
downloadchromium_src-c6b20fa7be447131bd6643dbda3a4965db988a04.zip
chromium_src-c6b20fa7be447131bd6643dbda3a4965db988a04.tar.gz
chromium_src-c6b20fa7be447131bd6643dbda3a4965db988a04.tar.bz2
WebKit merge 44928:44943.
Test=none BUG=none Review URL: http://codereview.chromium.org/144007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/port/bindings/v8/DOMObjectsInclude.h1
-rw-r--r--webkit/port/bindings/v8/v8_index.cpp2
-rw-r--r--webkit/port/bindings/v8/v8_index.h2
-rw-r--r--webkit/webkit.gyp7
4 files changed, 5 insertions, 7 deletions
diff --git a/webkit/port/bindings/v8/DOMObjectsInclude.h b/webkit/port/bindings/v8/DOMObjectsInclude.h
index 8f6fec4..505e2d3 100644
--- a/webkit/port/bindings/v8/DOMObjectsInclude.h
+++ b/webkit/port/bindings/v8/DOMObjectsInclude.h
@@ -37,7 +37,6 @@
#include "DOMImplementation.h"
#include "DOMParser.h"
#include "DOMSelection.h"
-#include "DOMStringList.h"
#include "DOMWindow.h"
#include "Entity.h"
#include "EventListener.h"
diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp
index 8b43fca..14c44d7 100644
--- a/webkit/port/bindings/v8/v8_index.cpp
+++ b/webkit/port/bindings/v8/v8_index.cpp
@@ -91,6 +91,7 @@
#include "V8HTMLModElement.h"
#include "V8HTMLDataGridColElement.h"
#include "V8HTMLDataGridElement.h"
+#include "V8HTMLDataGridRowElement.h"
#include "V8HTMLDirectoryElement.h"
#include "V8HTMLDivElement.h"
#include "V8HTMLDListElement.h"
@@ -154,7 +155,6 @@
#include "V8TextEvent.h"
#include "V8DOMCoreException.h"
#include "V8DOMParser.h"
-#include "V8DOMStringList.h"
#include "V8DOMWindow.h"
#include "V8Event.h"
#include "V8EventException.h"
diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h
index 16e07d2..42b83ae 100644
--- a/webkit/port/bindings/v8/v8_index.h
+++ b/webkit/port/bindings/v8/v8_index.h
@@ -68,6 +68,7 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
V(HTMLCANVASELEMENT, HTMLCanvasElement) \
V(HTMLDATAGRIDCOLELEMENT, HTMLDataGridColElement) \
V(HTMLDATAGRIDELEMENT, HTMLDataGridElement) \
+ V(HTMLDATAGRIDROWELEMENT, HTMLDataGridRowElement) \
V(HTMLDIRECTORYELEMENT, HTMLDirectoryElement) \
V(HTMLDIVELEMENT, HTMLDivElement) \
V(HTMLDLISTELEMENT, HTMLDListElement) \
@@ -274,7 +275,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
V(DOMIMPLEMENTATION, DOMImplementation) \
V(DOMPARSER, DOMParser) \
V(DOMSELECTION, DOMSelection) \
- V(DOMSTRINGLIST, DOMStringList) \
V(DOMWINDOW, DOMWindow) \
V(EVENT, Event) \
V(EVENTEXCEPTION, EventException) \
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 8286806..78032fe 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -696,7 +696,6 @@
'../third_party/WebKit/WebCore/dom/Comment.idl',
'../third_party/WebKit/WebCore/dom/DOMCoreException.idl',
'../third_party/WebKit/WebCore/dom/DOMImplementation.idl',
- '../third_party/WebKit/WebCore/dom/DOMStringList.idl',
'../third_party/WebKit/WebCore/dom/Document.idl',
'../third_party/WebKit/WebCore/dom/DocumentFragment.idl',
'../third_party/WebKit/WebCore/dom/DocumentType.idl',
@@ -752,6 +751,7 @@
'../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/HTMLDataGridRowElement.idl',
'../third_party/WebKit/WebCore/html/HTMLDirectoryElement.idl',
'../third_party/WebKit/WebCore/html/HTMLDivElement.idl',
'../third_party/WebKit/WebCore/html/HTMLDocument.idl',
@@ -1028,7 +1028,6 @@
'../third_party/WebKit/WebCore/bindings/v8/custom/V8DatabaseCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8DocumentLocationCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8DOMParserConstructor.cpp',
- '../third_party/WebKit/WebCore/bindings/v8/custom/V8DOMStringListCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8DocumentCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8ElementCustom.cpp',
@@ -1390,8 +1389,6 @@
'../third_party/WebKit/WebCore/dom/DOMCoreException.h',
'../third_party/WebKit/WebCore/dom/DOMImplementation.cpp',
'../third_party/WebKit/WebCore/dom/DOMImplementation.h',
- '../third_party/WebKit/WebCore/dom/DOMStringList.cpp',
- '../third_party/WebKit/WebCore/dom/DOMStringList.h',
'../third_party/WebKit/WebCore/dom/DocPtr.h',
'../third_party/WebKit/WebCore/dom/Document.cpp',
'../third_party/WebKit/WebCore/dom/Document.h',
@@ -1696,6 +1693,8 @@
'../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/HTMLDataGridRowElement.cpp',
+ '../third_party/WebKit/WebCore/html/HTMLDataGridRowElement.h',
'../third_party/WebKit/WebCore/html/HTMLDirectoryElement.cpp',
'../third_party/WebKit/WebCore/html/HTMLDirectoryElement.h',
'../third_party/WebKit/WebCore/html/HTMLDivElement.cpp',