diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-08 02:42:05 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-08 02:42:05 +0000 |
| commit | 9d4c3c8e4856869241863889a86e64cf048a64bb (patch) | |
| tree | 7a1f483e6f2147dfc7c342816ff5a3107acc9845 | |
| parent | 5d70b2eb21a13d12b9aa866570db70bfa9579fb7 (diff) | |
| download | chromium_src-9d4c3c8e4856869241863889a86e64cf048a64bb.zip chromium_src-9d4c3c8e4856869241863889a86e64cf048a64bb.tar.gz chromium_src-9d4c3c8e4856869241863889a86e64cf048a64bb.tar.bz2 | |
Chrome side of WEbKit merge 42244:42287.
Review URL: http://codereview.chromium.org/63110
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13337 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/scripts/CodeGeneratorV8.pm | 12 |
3 files changed, 13 insertions, 5 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "42244", + "webkit_revision": "42287", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@13316", + "/trunk/deps/third_party/WebKit@13332", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13083", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index af394ff..f077115 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@42244
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@42287
\ No newline at end of file diff --git a/webkit/port/bindings/scripts/CodeGeneratorV8.pm b/webkit/port/bindings/scripts/CodeGeneratorV8.pm index 5bb69cb..94a4ec4 100644 --- a/webkit/port/bindings/scripts/CodeGeneratorV8.pm +++ b/webkit/port/bindings/scripts/CodeGeneratorV8.pm @@ -946,13 +946,21 @@ sub GenerateBatchedAttributeData $propAttr = "v8::ReadOnly"; # EventListeners - } elsif ($attrExt->{"ProtectedListener"}) { + } elsif ($attribute->signature->type eq "EventListener") { if ($interfaceName eq "DOMWindow") { $getter = "V8Custom::v8DOMWindowEventHandlerAccessorGetter"; $setter = "V8Custom::v8DOMWindowEventHandlerAccessorSetter"; - } else { + } elsif ($interfaceName eq "Node" || $interfaceName eq "SVGElementInstance") { $getter = "V8Custom::v8ElementEventHandlerAccessorGetter"; $setter = "V8Custom::v8ElementEventHandlerAccessorSetter"; + } else { + $getter = "V8Custom::v8${customAccessor}AccessorGetter"; + if ($interfaceName eq "WorkerContext" and $attrName eq "self") { + $setter = "0"; + $propAttr = "v8::ReadOnly"; + } else { + $setter = "V8Custom::v8${customAccessor}AccessorSetter"; + } } # Custom Getter and Setter |