diff options
| author | amanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 01:01:52 +0000 |
|---|---|---|
| committer | amanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 01:01:52 +0000 |
| commit | 8860e4f513e757810afecfb62a2bd282cd731ed9 (patch) | |
| tree | a1905994c55ee794c1e4d3e450ba009f8d5f65f1 /webkit | |
| parent | 2d896aedfc2630ee7a7c973e84d69f5099104767 (diff) | |
| download | chromium_src-8860e4f513e757810afecfb62a2bd282cd731ed9.zip chromium_src-8860e4f513e757810afecfb62a2bd282cd731ed9.tar.gz chromium_src-8860e4f513e757810afecfb62a2bd282cd731ed9.tar.bz2 | |
Update WebKit to 45111 and Skia to 239
Review URL: http://codereview.chromium.org/147121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/port/bindings/scripts/CodeGeneratorV8.pm | 1 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_index.cpp | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_index.h | 2 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 6 |
4 files changed, 11 insertions, 0 deletions
diff --git a/webkit/port/bindings/scripts/CodeGeneratorV8.pm b/webkit/port/bindings/scripts/CodeGeneratorV8.pm index 19ced9d..bcd29e8 100644 --- a/webkit/port/bindings/scripts/CodeGeneratorV8.pm +++ b/webkit/port/bindings/scripts/CodeGeneratorV8.pm @@ -1713,6 +1713,7 @@ my %typeCanFailConversion = ( "AtomicString" => 0, "Attr" => 1, "CompareHow" => 0, + "DataGridColumn" => 0, "DOMString" => 0, "DOMWindow" => 0, "DocumentType" => 0, diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp index ed2497a..d00e491 100644 --- a/webkit/port/bindings/v8/v8_index.cpp +++ b/webkit/port/bindings/v8/v8_index.cpp @@ -62,6 +62,8 @@ #include "V8CSSStyleSheet.h" #include "V8CSSVariablesDeclaration.h" #include "V8CSSVariablesRule.h" +#include "V8DataGridColumn.h" +#include "V8DataGridColumnList.h" #include "V8Database.h" #include "V8Document.h" #include "V8DocumentFragment.h" diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h index 0b5f0e2b..9768d56 100644 --- a/webkit/port/bindings/v8/v8_index.h +++ b/webkit/port/bindings/v8/v8_index.h @@ -45,6 +45,8 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); V(CDATASECTION, CDATASection) \ V(COMMENT, Comment) \ V(DOCUMENT, Document) \ + V(DATAGRIDCOLUMN, DataGridColumn) \ + V(DATAGRIDCOLUMNLIST, DataGridColumnList) \ V(DOCUMENTFRAGMENT, DocumentFragment) \ V(DOCUMENTTYPE, DocumentType) \ V(ELEMENT, Element) \ diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index b87edea..7da230e 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -734,6 +734,8 @@ '../third_party/WebKit/WebCore/html/CanvasPattern.idl', '../third_party/WebKit/WebCore/html/CanvasPixelArray.idl', '../third_party/WebKit/WebCore/html/CanvasRenderingContext2D.idl', + '../third_party/WebKit/WebCore/html/DataGridColumn.idl', + '../third_party/WebKit/WebCore/html/DataGridColumnList.idl', '../third_party/WebKit/WebCore/html/File.idl', '../third_party/WebKit/WebCore/html/FileList.idl', '../third_party/WebKit/WebCore/html/HTMLAnchorElement.idl', @@ -1660,6 +1662,10 @@ '../third_party/WebKit/WebCore/html/CollectionCache.cpp', '../third_party/WebKit/WebCore/html/CollectionCache.h', '../third_party/WebKit/WebCore/html/CollectionType.h', + '../third_party/WebKit/WebCore/html/DataGridColumn.cpp', + '../third_party/WebKit/WebCore/html/DataGridColumn.h', + '../third_party/WebKit/WebCore/html/DataGridColumnList.cpp', + '../third_party/WebKit/WebCore/html/DataGridColumnList.h', '../third_party/WebKit/WebCore/html/File.cpp', '../third_party/WebKit/WebCore/html/File.h', '../third_party/WebKit/WebCore/html/FileList.cpp', |