diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 21:41:45 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 21:41:45 +0000 |
| commit | 6ec02ed85b306d6e599f4f3c46c1adf29858a370 (patch) | |
| tree | 316e297c1ea9e8483719b8d8a37c8f6915927eeb /webkit/port | |
| parent | 1f1a29aac426314e525b15ae859ebccf094410cf (diff) | |
| download | chromium_src-6ec02ed85b306d6e599f4f3c46c1adf29858a370.zip chromium_src-6ec02ed85b306d6e599f4f3c46c1adf29858a370.tar.gz chromium_src-6ec02ed85b306d6e599f4f3c46c1adf29858a370.tar.bz2 | |
WebKit Merge 43346:43361, Chromium side.
R=darin
BUG=0
TEST=layout tests
Review URL: http://codereview.chromium.org/113117
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
| -rw-r--r-- | webkit/port/bindings/scripts/CodeGeneratorV8.pm | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_custom.h | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_proxy.cpp | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/webkit/port/bindings/scripts/CodeGeneratorV8.pm b/webkit/port/bindings/scripts/CodeGeneratorV8.pm index f3cb9aa..2afd27e 100644 --- a/webkit/port/bindings/scripts/CodeGeneratorV8.pm +++ b/webkit/port/bindings/scripts/CodeGeneratorV8.pm @@ -997,7 +997,7 @@ sub GenerateBatchedAttributeData $hasCustomSetter = 1; # Handle the special case of window.top being marked upstream as Replaceable. - # TODO(dglazkov): Investigate why Replaceable is not marked as ReadOnly + # TODO(dglazkov): Investigate why [Replaceable] is not marked as ReadOnly # upstream and reach parity. if (!($interfaceName eq "DOMWindow" and $attrName eq "top")) { $propAttr .= "|v8::ReadOnly"; diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h index a2783c5..63e9b8a 100644 --- a/webkit/port/bindings/v8/v8_custom.h +++ b/webkit/port/bindings/v8/v8_custom.h @@ -319,6 +319,8 @@ DECLARE_CALLBACK(DOMWindowClearTimeout) DECLARE_CALLBACK(DOMWindowClearInterval) DECLARE_CALLBACK(DOMParserConstructor) +DECLARE_CALLBACK(HTMLImageElementConstructor) +DECLARE_CALLBACK(HTMLOptionElementConstructor) DECLARE_CALLBACK(MessageChannelConstructor) DECLARE_CALLBACK(WebKitCSSMatrixConstructor) DECLARE_CALLBACK(WebKitPointConstructor) diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp index 5b8b478..5685375 100644 --- a/webkit/port/bindings/v8/v8_proxy.cpp +++ b/webkit/port/bindings/v8/v8_proxy.cpp @@ -1545,6 +1545,12 @@ v8::Persistent<v8::FunctionTemplate> V8Proxy::GetTemplate( case V8ClassIndex::DOMPARSER: desc->SetCallHandler(USE_CALLBACK(DOMParserConstructor)); break; + case V8ClassIndex::HTMLIMAGEELEMENT: + desc->SetCallHandler(USE_CALLBACK(HTMLImageElementConstructor)); + break; + case V8ClassIndex::HTMLOPTIONELEMENT: + desc->SetCallHandler(USE_CALLBACK(HTMLOptionElementConstructor)); + break; case V8ClassIndex::WEBKITCSSMATRIX: desc->SetCallHandler(USE_CALLBACK(WebKitCSSMatrixConstructor)); break; |