summaryrefslogtreecommitdiffstats
path: root/webkit/port
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-26 21:19:06 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-26 21:19:06 +0000
commite0a5b89284138c0242312385bbde55328a5904ed (patch)
treecd350a56dc1cc327dec973d6f3d9c8c7cde66d45 /webkit/port
parent2d843e6d7063bb3cd743b0924a95ddf429bff19f (diff)
downloadchromium_src-e0a5b89284138c0242312385bbde55328a5904ed.zip
chromium_src-e0a5b89284138c0242312385bbde55328a5904ed.tar.gz
chromium_src-e0a5b89284138c0242312385bbde55328a5904ed.tar.bz2
src/webkit side of webKit merge 38625:38653
Review URL: http://codereview.chromium.org/12690 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-rw-r--r--webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp10
-rw-r--r--webkit/port/bindings/v8/v8_custom.h1
2 files changed, 11 insertions, 0 deletions
diff --git a/webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp b/webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp
index b40d659..91b048bd 100644
--- a/webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp
+++ b/webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp
@@ -350,6 +350,16 @@ ACCESSOR_SETTER(XMLHttpRequestOnreadystatechange)
}
}
+ACCESSOR_GETTER(XMLHttpRequestResponseText)
+{
+ // This is only needed because webkit set this getter as custom.
+ // So we need a custom method to avoid forking the IDL file.
+ INC_STATS("DOM.XMLHttpRequest.responsetext._get");
+ XMLHttpRequest* imp = V8Proxy::ToNativeObject<XMLHttpRequest>(
+ V8ClassIndex::XMLHTTPREQUEST, info.Holder());
+ return v8StringOrNull(imp->responseText());
+}
+
CALLBACK_FUNC_DECL(XMLHttpRequestAddEventListener)
{
INC_STATS("DOM.XMLHttpRequest.addEventListener()");
diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h
index de64bd7..8199fe9 100644
--- a/webkit/port/bindings/v8/v8_custom.h
+++ b/webkit/port/bindings/v8/v8_custom.h
@@ -316,6 +316,7 @@ DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnload)
DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnloadstart)
DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnprogress)
DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnreadystatechange)
+DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestResponseText)
DECLARE_CALLBACK(XMLHttpRequestAddEventListener)
DECLARE_CALLBACK(XMLHttpRequestRemoveEventListener)
DECLARE_CALLBACK(XMLHttpRequestOpen)