[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 12:37:32 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 235961d131a86d388f16f08e8eea3d6a324f19b8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 26 04:02:18 2010 +0000
2010-08-25 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r66074.
http://trac.webkit.org/changeset/66074
https://bugs.webkit.org/show_bug.cgi?id=44660
Chromium canary turned red (Requested by yuzo on #webkit).
* bindings/generic/RuntimeEnabledFeatures.cpp:
* bindings/generic/RuntimeEnabledFeatures.h:
* bindings/js/JSXMLHttpRequestCustom.cpp:
(WebCore::JSXMLHttpRequest::responseText):
* bindings/v8/custom/V8XMLHttpRequestCustom.cpp:
(WebCore::V8XMLHttpRequest::responseTextAccessorGetter):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::responseText):
(WebCore::XMLHttpRequest::responseXML):
(WebCore::XMLHttpRequest::open):
(WebCore::XMLHttpRequest::abort):
(WebCore::XMLHttpRequest::clearResponse):
(WebCore::XMLHttpRequest::didFinishLoading):
* xml/XMLHttpRequest.h:
* xml/XMLHttpRequest.idl:
2010-08-25 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r66074.
http://trac.webkit.org/changeset/66074
https://bugs.webkit.org/show_bug.cgi?id=44660
Chromium canary turned red (Requested by yuzo on #webkit).
* features.gypi:
* public/WebRuntimeFeatures.h:
* src/WebRuntimeFeatures.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66079 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5a3ee40..90f722c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2010-08-25 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r66074.
+ http://trac.webkit.org/changeset/66074
+ https://bugs.webkit.org/show_bug.cgi?id=44660
+
+ Chromium canary turned red (Requested by yuzo on #webkit).
+
+ * bindings/generic/RuntimeEnabledFeatures.cpp:
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ * bindings/js/JSXMLHttpRequestCustom.cpp:
+ (WebCore::JSXMLHttpRequest::responseText):
+ * bindings/v8/custom/V8XMLHttpRequestCustom.cpp:
+ (WebCore::V8XMLHttpRequest::responseTextAccessorGetter):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::responseText):
+ (WebCore::XMLHttpRequest::responseXML):
+ (WebCore::XMLHttpRequest::open):
+ (WebCore::XMLHttpRequest::abort):
+ (WebCore::XMLHttpRequest::clearResponse):
+ (WebCore::XMLHttpRequest::didFinishLoading):
+ * xml/XMLHttpRequest.h:
+ * xml/XMLHttpRequest.idl:
+
2010-08-25 Mark Rowe <mrowe at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
index 66de0f9..94e984f 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
@@ -51,10 +51,6 @@ bool RuntimeEnabledFeatures::isDeviceMotionEnabled = true;
bool RuntimeEnabledFeatures::isDeviceOrientationEnabled = true;
bool RuntimeEnabledFeatures::isSpeechInputEnabled = true;
-#if ENABLE(XHR_RESPONSE_BLOB)
-bool RuntimeEnabledFeatures::isXHRResponseBlobEnabled = false;
-#endif
-
#if ENABLE(VIDEO)
bool RuntimeEnabledFeatures::audioEnabled()
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
index 6a036bc..fd7308e 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.h
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
@@ -128,13 +128,6 @@ public:
static bool speechInputEnabled() { return isSpeechInputEnabled; }
static bool speechEnabled() { return isSpeechInputEnabled; }
-#if ENABLE(XHR_RESPONSE_BLOB)
- static bool xhrResponseBlobEnabled() { return isXHRResponseBlobEnabled; }
- static void setXHRResponseBlobEnabled(bool isEnabled) { isXHRResponseBlobEnabled = isEnabled; }
- static bool responseBlobEnabled() { return isXHRResponseBlobEnabled; }
- static bool asBlobEnabled() { return isXHRResponseBlobEnabled; }
-#endif
-
private:
// Never instantiate.
RuntimeEnabledFeatures() { }
@@ -151,7 +144,6 @@ private:
static bool isDeviceMotionEnabled;
static bool isDeviceOrientationEnabled;
static bool isSpeechInputEnabled;
- static bool isXHRResponseBlobEnabled;
};
} // namespace WebCore
diff --git a/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp b/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp
index 2da3771..da75139 100644
--- a/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp
+++ b/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp
@@ -124,13 +124,7 @@ JSValue JSXMLHttpRequest::send(ExecState* exec)
JSValue JSXMLHttpRequest::responseText(ExecState* exec) const
{
- ExceptionCode ec = 0;
- const ScriptString& text = impl()->responseText(ec);
- if (ec) {
- setDOMException(exec, ec);
- return jsUndefined();
- }
- return jsOwnedStringOrNull(exec, text);
+ return jsOwnedStringOrNull(exec, impl()->responseText());
}
EncodedJSValue JSC_HOST_CALL JSXMLHttpRequestConstructor::constructJSXMLHttpRequest(ExecState* exec)
diff --git a/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp b/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp
index cfeb503..3da664f 100644
--- a/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp
@@ -49,11 +49,7 @@ v8::Handle<v8::Value> V8XMLHttpRequest::responseTextAccessorGetter(v8::Local<v8:
{
INC_STATS("DOM.XMLHttpRequest.responsetext._get");
XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toNative(info.Holder());
- ExceptionCode ec = 0;
- const ScriptString& text = xmlHttpRequest->responseText(ec);
- if (ec)
- return throwError(ec);
- return text.v8StringOrNull();
+ return xmlHttpRequest->responseText().v8StringOrNull();
}
v8::Handle<v8::Value> V8XMLHttpRequest::openCallback(const v8::Arguments& args)
diff --git a/WebCore/xml/XMLHttpRequest.cpp b/WebCore/xml/XMLHttpRequest.cpp
index 04ac1d9..3e76407 100644
--- a/WebCore/xml/XMLHttpRequest.cpp
+++ b/WebCore/xml/XMLHttpRequest.cpp
@@ -48,7 +48,6 @@
#include <wtf/text/CString.h>
#include <wtf/StdLibExtras.h>
#include <wtf/RefCountedLeakCounter.h>
-#include <wtf/UnusedParam.h>
#if USE(JSC)
#include "JSDOMBinding.h"
@@ -226,28 +225,13 @@ XMLHttpRequest::State XMLHttpRequest::readyState() const
return m_state;
}
-const ScriptString& XMLHttpRequest::responseText(ExceptionCode& ec) const
+const ScriptString& XMLHttpRequest::responseText() const
{
-#if ENABLE(XHR_RESPONSE_BLOB)
- if (m_asBlob)
- ec = INVALID_STATE_ERR;
-#else
- UNUSED_PARAM(ec);
-#endif
return m_responseText;
}
-Document* XMLHttpRequest::responseXML(ExceptionCode& ec) const
+Document* XMLHttpRequest::responseXML() const
{
-#if ENABLE(XHR_RESPONSE_BLOB)
- if (m_asBlob) {
- ec = INVALID_STATE_ERR;
- return 0;
- }
-#else
- UNUSED_PARAM(ec);
-#endif
-
if (m_state != DONE)
return 0;
@@ -272,17 +256,6 @@ Document* XMLHttpRequest::responseXML(ExceptionCode& ec) const
return m_responseXML.get();
}
-#if ENABLE(XHR_RESPONSE_BLOB)
-Blob* XMLHttpRequest::responseBlob(ExceptionCode& ec) const
-{
- if (!m_asBlob) {
- ec = INVALID_STATE_ERR;
- return 0;
- }
- return m_responseBlob.get();
-}
-#endif
-
XMLHttpRequestUpload* XMLHttpRequest::upload()
{
if (!m_upload)
@@ -345,18 +318,6 @@ void XMLHttpRequest::setWithCredentials(bool value, ExceptionCode& ec)
m_includeCredentials = value;
}
-#if ENABLE(XHR_RESPONSE_BLOB)
-void XMLHttpRequest::setAsBlob(bool value, ExceptionCode& ec)
-{
- if (m_state != OPENED || m_loader) {
- ec = INVALID_STATE_ERR;
- return;
- }
-
- m_asBlob = value;
-}
-#endif
-
void XMLHttpRequest::open(const String& method, const KURL& url, ExceptionCode& ec)
{
open(method, url, true, ec);
@@ -368,9 +329,7 @@ void XMLHttpRequest::open(const String& method, const KURL& url, bool async, Exc
State previousState = m_state;
m_state = UNSENT;
m_error = false;
-#if ENABLE(XHR_RESPONSE_BLOB)
- m_asBlob = false;
-#endif
+
m_uploadComplete = false;
// clear stuff from possible previous load
@@ -635,9 +594,6 @@ void XMLHttpRequest::abort()
m_responseText = "";
m_createdDocument = false;
m_responseXML = 0;
-#if ENABLE(XHR_RESPONSE_BLOB)
- m_responseBlob = 0;
-#endif
// Clear headers as required by the spec
m_requestHeaders.clear();
@@ -684,9 +640,6 @@ void XMLHttpRequest::clearResponse()
m_responseText = "";
m_createdDocument = false;
m_responseXML = 0;
-#if ENABLE(XHR_RESPONSE_BLOB)
- m_responseBlob = 0;
-#endif
}
void XMLHttpRequest::clearRequest()
@@ -949,10 +902,6 @@ void XMLHttpRequest::didFinishLoading(unsigned long identifier)
if (m_decoder)
m_responseText += m_decoder->flush();
-#if ENABLE(XHR_RESPONSE_BLOB)
- // FIXME: Set m_responseBlob to something here in the m_asBlob case.
-#endif
-
#if ENABLE(INSPECTOR)
if (InspectorController* inspector = scriptExecutionContext()->inspectorController())
inspector->resourceRetrievedByXMLHttpRequest(identifier, m_responseText, m_url, m_lastSendURL, m_lastSendLineNumber);
diff --git a/WebCore/xml/XMLHttpRequest.h b/WebCore/xml/XMLHttpRequest.h
index d25f63f..2947b46 100644
--- a/WebCore/xml/XMLHttpRequest.h
+++ b/WebCore/xml/XMLHttpRequest.h
@@ -70,10 +70,6 @@ public:
State readyState() const;
bool withCredentials() const { return m_includeCredentials; }
void setWithCredentials(bool, ExceptionCode&);
-#if ENABLE(XHR_RESPONSE_BLOB)
- bool asBlob() const { return m_asBlob; }
- void setAsBlob(bool, ExceptionCode&);
-#endif
void open(const String& method, const KURL&, ExceptionCode&);
void open(const String& method, const KURL&, bool async, ExceptionCode&);
void open(const String& method, const KURL&, bool async, const String& user, ExceptionCode&);
@@ -88,11 +84,8 @@ public:
void overrideMimeType(const String& override);
String getAllResponseHeaders(ExceptionCode&) const;
String getResponseHeader(const AtomicString& name, ExceptionCode&) const;
- const ScriptString& responseText(ExceptionCode&) const;
- Document* responseXML(ExceptionCode&) const;
-#if ENABLE(XHR_RESPONSE_BLOB)
- Blob* responseBlob(ExceptionCode&) const;
-#endif
+ const ScriptString& responseText() const;
+ Document* responseXML() const;
void setLastSendLineNumber(unsigned lineNumber) { m_lastSendLineNumber = lineNumber; }
void setLastSendURL(const String& url) { m_lastSendURL = url; }
@@ -162,10 +155,6 @@ private:
String m_mimeTypeOverride;
bool m_async;
bool m_includeCredentials;
-#if ENABLE(XHR_RESPONSE_BLOB)
- bool m_asBlob;
- RefPtr<Blob> m_responseBlob;
-#endif
RefPtr<ThreadableLoader> m_loader;
State m_state;
diff --git a/WebCore/xml/XMLHttpRequest.idl b/WebCore/xml/XMLHttpRequest.idl
index 59997f8..58413ff 100644
--- a/WebCore/xml/XMLHttpRequest.idl
+++ b/WebCore/xml/XMLHttpRequest.idl
@@ -57,11 +57,6 @@ module xml {
readonly attribute unsigned short readyState;
// request
-#if defined(ENABLE_XHR_RESPONSE_BLOB) && ENABLE_XHR_RESPONSE_BLOB
- attribute [EnabledAtRuntime] boolean asBlob
- setter raises(DOMException);
-#endif
-
attribute boolean withCredentials
setter raises(DOMException);
// void open(in DOMString method, in DOMString url);
@@ -87,14 +82,8 @@ module xml {
raises(DOMException);
[RequiresAllArguments=Raise, ConvertNullStringTo=Null] DOMString getResponseHeader(in DOMString header)
raises(DOMException);
- readonly attribute [CustomGetter] DOMString responseText // The custom getter implements ConvertNullStringTo=Null
- getter raises(DOMException);
- readonly attribute Document responseXML
- getter raises(DOMException);
-#if defined(ENABLE_XHR_RESPONSE_BLOB) && ENABLE_XHR_RESPONSE_BLOB
- readonly attribute [EnabledAtRuntime] Blob responseBlob
- getter raises(DOMException);
-#endif
+ readonly attribute [CustomGetter] DOMString responseText; // The custom getter implements ConvertNullStringTo=Null
+ readonly attribute Document responseXML;
readonly attribute unsigned short status
getter raises(DOMException);
readonly attribute DOMString statusText
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 1c47848..6b0b3fa 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-25 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r66074.
+ http://trac.webkit.org/changeset/66074
+ https://bugs.webkit.org/show_bug.cgi?id=44660
+
+ Chromium canary turned red (Requested by yuzo on #webkit).
+
+ * features.gypi:
+ * public/WebRuntimeFeatures.h:
+ * src/WebRuntimeFeatures.cpp:
+
2010-08-25 Michael Nordman <michaeln at google.com>
Reviewed by David Levin.
diff --git a/WebKit/chromium/features.gypi b/WebKit/chromium/features.gypi
index 7c85195..61e5806 100644
--- a/WebKit/chromium/features.gypi
+++ b/WebKit/chromium/features.gypi
@@ -81,7 +81,6 @@
'ENABLE_WEB_SOCKETS=1',
'ENABLE_WEB_TIMING=1',
'ENABLE_WORKERS=1',
- 'ENABLE_XHR_RESPONSE_BLOB=1',
'ENABLE_XPATH=1',
'ENABLE_XSLT=1',
],
diff --git a/WebKit/chromium/public/WebRuntimeFeatures.h b/WebKit/chromium/public/WebRuntimeFeatures.h
index e282864..9aa1f4f 100644
--- a/WebKit/chromium/public/WebRuntimeFeatures.h
+++ b/WebKit/chromium/public/WebRuntimeFeatures.h
@@ -86,9 +86,6 @@ public:
WEBKIT_API static void enableSpeechInput(bool);
WEBKIT_API static bool isSpeechInputEnabled();
- WEBKIT_API static void enableXHRResponseBlob(bool);
- WEBKIT_API static bool isXHRResponseBlobEnabled();
-
private:
WebRuntimeFeatures();
};
diff --git a/WebKit/chromium/src/WebRuntimeFeatures.cpp b/WebKit/chromium/src/WebRuntimeFeatures.cpp
index 9e1e4de..9e21d58 100644
--- a/WebKit/chromium/src/WebRuntimeFeatures.cpp
+++ b/WebKit/chromium/src/WebRuntimeFeatures.cpp
@@ -256,20 +256,4 @@ bool WebRuntimeFeatures::isSpeechInputEnabled()
return RuntimeEnabledFeatures::speechInputEnabled();
}
-void WebRuntimeFeatures::enableXHRResponseBlob(bool enable)
-{
-#if ENABLE(XHR_RESPONSE_BLOB)
- RuntimeEnabledFeatures::setXHRResponseBlobEnabled(enable);
-#endif
-}
-
-bool WebRuntimeFeatures::isXHRResponseBlobEnabled()
-{
-#if ENABLE(XHR_RESPONSE_BLOB)
- return RuntimeEnabledFeatures::xhrResponseBlobEnabled();
-#else
- return false;
-#endif
-}
-
} // namespace WebKit
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list