diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 17:12:48 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 17:12:48 +0000 |
| commit | 0b8a5349d939bc0d05b9b53547f033ee5f0be02a (patch) | |
| tree | a41278d5fadde026ea905fceb74425d9ef45a475 | |
| parent | f711c5e2e17977fa49ef51776a2a918f7c70cb01 (diff) | |
| download | chromium_src-0b8a5349d939bc0d05b9b53547f033ee5f0be02a.zip chromium_src-0b8a5349d939bc0d05b9b53547f033ee5f0be02a.tar.gz chromium_src-0b8a5349d939bc0d05b9b53547f033ee5f0be02a.tar.bz2 | |
Chrome-side of WebKit merge 43321:43346
Only interesting change is in v8_custom.cpp to account for recently upstreamed
V8 bindings.
R=dglazkov,japhet
Review URL: http://codereview.chromium.org/115090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15556 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_custom.cpp | 22 |
3 files changed, 3 insertions, 25 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "43321", + "webkit_revision": "43346", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@243", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@15521", + "/trunk/deps/third_party/WebKit@15555", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13472", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 4c18c91..637cc8a 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@43321
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@43346
\ No newline at end of file diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp index f3a1c4a..bf8cefc 100644 --- a/webkit/port/bindings/v8/v8_custom.cpp +++ b/webkit/port/bindings/v8/v8_custom.cpp @@ -74,7 +74,6 @@ #include "HTMLCanvasElement.h" #include "HTMLDocument.h" #include "HTMLEmbedElement.h" -#include "HTMLFormElement.h" #include "HTMLFrameElement.h" #include "HTMLFrameElementBase.h" #include "HTMLFrameSetElement.h" @@ -157,17 +156,6 @@ ACCESSOR_GETTER(DocumentImplementation) { } -INDEXED_PROPERTY_GETTER(HTMLFormElement) { - INC_STATS("DOM.HTMLFormElement.IndexedPropertyGetter"); - HTMLFormElement* form = - V8Proxy::DOMWrapperToNode<HTMLFormElement>(info.Holder()); - - RefPtr<Node> result = form->elements()->item(index); - if (!result) return v8::Handle<v8::Value>(); - return V8Proxy::NodeToV8Object(result.get()); -} - - INDEXED_PROPERTY_GETTER(HTMLOptionsCollection) { INC_STATS("DOM.HTMLOptionsCollection.IndexedPropertyGetter"); HTMLOptionsCollection* collection = @@ -996,16 +984,6 @@ CALLBACK_FUNC_DECL(DOMWindowNOP) } -CALLBACK_FUNC_DECL(HTMLFormElementSubmit) { - INC_STATS("DOM.HTMLFormElement.submit()"); - - HTMLFormElement* form = - V8Proxy::DOMWrapperToNative<HTMLFormElement>(args.Holder()); - - form->submit(0, false, false); - return v8::Undefined(); -} - static String EventNameFromAttributeName(const String& name) { ASSERT(name.startsWith("on")); String event_type = name.substring(2); |