Diff
Modified: trunk/LayoutTests/ChangeLog (120573 => 120574)
--- trunk/LayoutTests/ChangeLog 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/LayoutTests/ChangeLog 2012-06-18 07:06:39 UTC (rev 120574)
@@ -1,3 +1,19 @@
+2012-06-15 Kinuko Yasuda <kin...@chromium.org>
+
+ XHR_RESPONSE_BLOB is not enabled on some platforms
+ https://bugs.webkit.org/show_bug.cgi?id=88859
+
+ Reviewed by Adam Barth.
+
+ Removing xhr.Blob related test from Skipped files.
+
+ * platform/efl/Skipped:
+ * platform/gtk/TestExpectations:
+ * platform/mac/Skipped:
+ * platform/qt/Skipped:
+ * platform/win/Skipped:
+ * platform/wincairo/Skipped:
+
2012-06-17 Christophe Dumez <christophe.du...@intel.com>
[EFL] Add EFL baseline for fast/parser/nested-fragment-parser-crash.html
Modified: trunk/LayoutTests/platform/efl/Skipped (120573 => 120574)
--- trunk/LayoutTests/platform/efl/Skipped 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-06-18 07:06:39 UTC (rev 120574)
@@ -1175,7 +1175,3 @@
# http://webkit.org/b/35981
# Needs a text rebaseline: 30px height difference.
fast/block/basic/fieldset-stretch-to-legend.html
-
-# Fail until ENABLE_XHR_RESPONSE_BLOB is enabled after r120042
-# https://bugs.webkit.org/show_bug.cgi?id=88859
-http/tests/xmlhttprequest/response-blob-size.html
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (120573 => 120574)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2012-06-18 07:06:39 UTC (rev 120574)
@@ -324,10 +324,6 @@
// UndoManager is not yet enabled.
BUGWK87908 SKIP : editing/undomanager = PASS
-// Fail until ENABLE_XHR_RESPONSE_BLOB is enabled after r120042
-// https://bugs.webkit.org/show_bug.cgi?id=88859
-BUGWK88859 : http/tests/xmlhttprequest/response-blob-size.html = TEXT
-
// New test infrastructure required -- need isolated worlds
BUGWK31508 SKIP : http/tests/security/isolatedWorld = TEXT
BUGWK31508 BUGWK61540 SKIP : http/tests/security/isolatedWorld/cross-origin-xhr.html = TEXT
Modified: trunk/LayoutTests/platform/mac/Skipped (120573 => 120574)
--- trunk/LayoutTests/platform/mac/Skipped 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-06-18 07:06:39 UTC (rev 120574)
@@ -890,7 +890,3 @@
# https://bugs.webkit.org/show_bug.cgi?id=88736
http/tests/security/mixedContent/blob-url-in-iframe.html
-
-# Fail until ENABLE_XHR_RESPONSE_BLOB is enabled after r120042
-# https://bugs.webkit.org/show_bug.cgi?id=88859
-http/tests/xmlhttprequest/response-blob-size.html
Modified: trunk/LayoutTests/platform/qt/Skipped (120573 => 120574)
--- trunk/LayoutTests/platform/qt/Skipped 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-06-18 07:06:39 UTC (rev 120574)
@@ -2512,10 +2512,6 @@
# Needs a text rebaseline: 30px height difference.
fast/block/basic/fieldset-stretch-to-legend.html
-# Fail until ENABLE_XHR_RESPONSE_BLOB is enabled after r120042
-# https://bugs.webkit.org/show_bug.cgi?id=88859
-http/tests/xmlhttprequest/response-blob-size.html
-
# [Qt]REGRESSION(r120107): It made http/tests/xmlhttprequest/origin-exact-matching.html fails
# https://bugs.webkit.org/show_bug.cgi?id=88913
http/tests/xmlhttprequest/origin-exact-matching.html
Modified: trunk/LayoutTests/platform/win/Skipped (120573 => 120574)
--- trunk/LayoutTests/platform/win/Skipped 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/LayoutTests/platform/win/Skipped 2012-06-18 07:06:39 UTC (rev 120574)
@@ -1945,7 +1945,3 @@
svg/W3C-I18N/tspan-dirRTL-ubOverride-in-rtl-context.svg
svg/W3C-SVG-1.1-SE/linking-uri-01-b.svg
svg/W3C-SVG-1.1-SE/text-intro-05-t.svg
-
-# Fail until ENABLE_XHR_RESPONSE_BLOB is enabled after r120042
-# https://bugs.webkit.org/show_bug.cgi?id=88859
-http/tests/xmlhttprequest/response-blob-size.html
Modified: trunk/LayoutTests/platform/wincairo/Skipped (120573 => 120574)
--- trunk/LayoutTests/platform/wincairo/Skipped 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/LayoutTests/platform/wincairo/Skipped 2012-06-18 07:06:39 UTC (rev 120574)
@@ -2117,7 +2117,3 @@
# https://bugs.webkit.org/show_bug.cgi?id=86000
http/tests/security/referrer-policy-redirect-link.html
-
-# Fail until ENABLE_XHR_RESPONSE_BLOB is enabled after r120042
-# https://bugs.webkit.org/show_bug.cgi?id=88859
-http/tests/xmlhttprequest/response-blob-size.html
Modified: trunk/Source/WebCore/ChangeLog (120573 => 120574)
--- trunk/Source/WebCore/ChangeLog 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/Source/WebCore/ChangeLog 2012-06-18 07:06:39 UTC (rev 120574)
@@ -1,3 +1,35 @@
+2012-06-15 Kinuko Yasuda <kin...@chromium.org>
+
+ XHR_RESPONSE_BLOB is not enabled on some platforms
+ https://bugs.webkit.org/show_bug.cgi?id=88859
+
+ Reviewed by Adam Barth.
+
+ Removing XHR_RESPONSE_BLOB since the current implementation has
+ no platform-specific part.
+
+ Test: http/tests/xmlhttprequest/blob-response-size.html
+
+ * bindings/generic/RuntimeEnabledFeatures.cpp:
+ (WebCore):
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ (RuntimeEnabledFeatures):
+ * bindings/js/JSXMLHttpRequestCustom.cpp:
+ (WebCore::JSXMLHttpRequest::visitChildren):
+ (WebCore::JSXMLHttpRequest::response):
+ * bindings/v8/custom/V8XMLHttpRequestCustom.cpp:
+ (WebCore::V8XMLHttpRequest::responseAccessorGetter):
+ * platform/chromium/PlatformSupport.h:
+ (PlatformSupport):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::responseBlob):
+ (WebCore::XMLHttpRequest::setResponseType):
+ (WebCore::XMLHttpRequest::clearResponseBuffers):
+ (WebCore::XMLHttpRequest::didReceiveData):
+ * xml/XMLHttpRequest.h:
+ (XMLHttpRequest):
+ * xml/XMLHttpRequest.idl:
+
2012-06-17 Martin Robinson <mrobin...@igalia.com>
[TextureMapper] Reduce boilerplate code in the TextureMapperShaderManager
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (120573 => 120574)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2012-06-18 07:06:39 UTC (rev 120574)
@@ -70,10 +70,6 @@
bool RuntimeEnabledFeatures::isGamepadEnabled = false;
#endif
-#if ENABLE(XHR_RESPONSE_BLOB)
-bool RuntimeEnabledFeatures::isXHRResponseBlobEnabled = false;
-#endif
-
#if ENABLE(FILE_SYSTEM)
bool RuntimeEnabledFeatures::isFileSystemEnabled = false;
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (120573 => 120574)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2012-06-18 07:06:39 UTC (rev 120574)
@@ -169,13 +169,6 @@
static bool webkitSpeechGrammarListEnabled() { return isScriptedSpeechEnabled; }
#endif
-#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
-
#if ENABLE(FILE_SYSTEM)
static bool fileSystemEnabled();
static void setFileSystemEnabled(bool isEnabled) { isFileSystemEnabled = isEnabled; }
@@ -259,10 +252,6 @@
#if ENABLE(SCRIPTED_SPEECH)
static bool isScriptedSpeechEnabled;
#endif
-#if ENABLE(XHR_RESPONSE_BLOB)
- static bool isXHRResponseBlobEnabled;
-#endif
-
#if ENABLE(FILE_SYSTEM)
static bool isFileSystemEnabled;
#endif
Modified: trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp (120573 => 120574)
--- trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp 2012-06-18 07:06:39 UTC (rev 120574)
@@ -71,10 +71,8 @@
if (ArrayBuffer* responseArrayBuffer = thisObject->m_impl->optionalResponseArrayBuffer())
visitor.addOpaqueRoot(responseArrayBuffer);
-#if ENABLE(XHR_RESPONSE_BLOB)
if (Blob* responseBlob = thisObject->m_impl->optionalResponseBlob())
visitor.addOpaqueRoot(responseBlob);
-#endif
thisObject->m_impl->visitJSEventListeners(visitor);
}
@@ -174,7 +172,6 @@
}
case XMLHttpRequest::ResponseTypeBlob:
-#if ENABLE(XHR_RESPONSE_BLOB)
{
ExceptionCode ec = 0;
Blob* blob = impl()->responseBlob(ec);
@@ -184,9 +181,6 @@
}
return toJS(exec, globalObject(), blob);
}
-#else
- return jsUndefined();
-#endif
case XMLHttpRequest::ResponseTypeArrayBuffer:
{
Modified: trunk/Source/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp (120573 => 120574)
--- trunk/Source/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/Source/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp 2012-06-18 07:06:39 UTC (rev 120574)
@@ -80,7 +80,6 @@
}
case XMLHttpRequest::ResponseTypeBlob:
-#if ENABLE(XHR_RESPONSE_BLOB)
{
ExceptionCode ec = 0;
Blob* blob = xmlHttpRequest->responseBlob(ec);
@@ -88,9 +87,6 @@
return V8Proxy::setDOMException(ec, info.GetIsolate());
return toV8(blob, info.GetIsolate());
}
-#else
- return v8::Undefined();
-#endif
case XMLHttpRequest::ResponseTypeArrayBuffer:
{
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (120573 => 120574)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-06-18 07:06:39 UTC (rev 120574)
@@ -65,7 +65,6 @@
namespace WebCore {
-class AsyncFileSystem;
class Color;
class Cursor;
class Document;
@@ -99,10 +98,6 @@
static void deleteCookie(const Document*, const KURL&, const String& cookieName);
static bool cookiesEnabled(const Document*);
-#if ENABLE(FILE_SYSTEM)
- static PassOwnPtr<AsyncFileSystem> createAsyncFileSystem();
-#endif
-
// Font ---------------------------------------------------------------
#if OS(WINDOWS)
static bool ensureFontLoaded(HFONT);
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (120573 => 120574)
--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2012-06-18 07:06:39 UTC (rev 120574)
@@ -264,7 +264,6 @@
return m_responseDocument.get();
}
-#if ENABLE(XHR_RESPONSE_BLOB)
Blob* XMLHttpRequest::responseBlob(ExceptionCode& ec)
{
if (m_responseTypeCode != ResponseTypeBlob) {
@@ -299,7 +298,6 @@
return m_responseBlob.get();
}
-#endif
ArrayBuffer* XMLHttpRequest::responseArrayBuffer(ExceptionCode& ec)
{
@@ -342,13 +340,11 @@
m_responseTypeCode = ResponseTypeText;
else if (responseType == "document")
m_responseTypeCode = ResponseTypeDocument;
- else if (responseType == "blob") {
-#if ENABLE(XHR_RESPONSE_BLOB)
+ else if (responseType == "blob")
m_responseTypeCode = ResponseTypeBlob;
-#endif
- } else if (responseType == "arraybuffer") {
+ else if (responseType == "arraybuffer")
m_responseTypeCode = ResponseTypeArrayBuffer;
- } else
+ else
ec = SYNTAX_ERR;
}
@@ -414,18 +410,6 @@
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_responseTypeCode = value ? ResponseTypeBlob : ResponseTypeDefault;
-}
-#endif
-
bool XMLHttpRequest::isAllowedHTTPMethod(const String& method)
{
return !equalIgnoringCase(method, "TRACE")
@@ -815,9 +799,7 @@
m_responseBuilder.clear();
m_createdDocument = false;
m_responseDocument = 0;
-#if ENABLE(XHR_RESPONSE_BLOB)
m_responseBlob = 0;
-#endif
m_binaryResponseBuilder.clear();
m_responseArrayBuffer.clear();
}
@@ -1136,11 +1118,7 @@
if (useDecoder)
m_responseBuilder.append(m_decoder->decode(data, len));
- else if (m_responseTypeCode == ResponseTypeArrayBuffer
-#if ENABLE(XHR_RESPONSE_BLOB)
- || m_responseTypeCode == ResponseTypeBlob
-#endif
- ) {
+ else if (m_responseTypeCode == ResponseTypeArrayBuffer || m_responseTypeCode == ResponseTypeBlob) {
// Buffer binary data.
if (!m_binaryResponseBuilder)
m_binaryResponseBuilder = SharedBuffer::create();
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.h (120573 => 120574)
--- trunk/Source/WebCore/xml/XMLHttpRequest.h 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.h 2012-06-18 07:06:39 UTC (rev 120574)
@@ -83,10 +83,6 @@
State readyState() const;
bool withCredentials() const { return m_includeCredentials; }
void setWithCredentials(bool, ExceptionCode&);
-#if ENABLE(XHR_RESPONSE_BLOB)
- bool asBlob() const { return m_responseTypeCode == ResponseTypeBlob; }
- 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&);
@@ -105,10 +101,8 @@
String responseText(ExceptionCode&);
Document* responseXML(ExceptionCode&);
Document* optionalResponseXML() const { return m_responseDocument.get(); }
-#if ENABLE(XHR_RESPONSE_BLOB)
Blob* responseBlob(ExceptionCode&);
Blob* optionalResponseBlob() const { return m_responseBlob.get(); }
-#endif
// Expose HTTP validation methods for other untrusted requests.
static bool isAllowedHTTPMethod(const String&);
@@ -193,9 +187,7 @@
String m_mimeTypeOverride;
bool m_async;
bool m_includeCredentials;
-#if ENABLE(XHR_RESPONSE_BLOB)
RefPtr<Blob> m_responseBlob;
-#endif
RefPtr<ThreadableLoader> m_loader;
State m_state;
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.idl (120573 => 120574)
--- trunk/Source/WebCore/xml/XMLHttpRequest.idl 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.idl 2012-06-18 07:06:39 UTC (rev 120574)
@@ -58,10 +58,6 @@
readonly attribute unsigned short readyState;
- // request
- attribute [Conditional=XHR_RESPONSE_BLOB, V8EnabledAtRuntime] boolean asBlob
- setter raises(DOMException);
-
attribute boolean withCredentials
setter raises(DOMException);
@@ -97,7 +93,7 @@
getter raises(DOMException);
readonly attribute Document responseXML
getter raises(DOMException);
- readonly attribute [Conditional=XHR_RESPONSE_BLOB, V8EnabledAtRuntime] Blob responseBlob
+ readonly attribute Blob responseBlob
getter raises(DOMException);
attribute DOMString responseType
Modified: trunk/Source/WebKit/chromium/ChangeLog (120573 => 120574)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-18 07:06:39 UTC (rev 120574)
@@ -1,3 +1,18 @@
+2012-06-15 Kinuko Yasuda <kin...@chromium.org>
+
+ XHR_RESPONSE_BLOB is not enabled on some platforms
+ https://bugs.webkit.org/show_bug.cgi?id=88859
+
+ Reviewed by Adam Barth.
+
+ Removing XHR_RESPONSE_BLOB since the current implementation has
+ no platform-specific part.
+
+ * src/PlatformSupport.cpp:
+ * src/WebRuntimeFeatures.cpp:
+ (WebKit::WebRuntimeFeatures::enableXHRResponseBlob):
+ (WebKit::WebRuntimeFeatures::isXHRResponseBlobEnabled):
+
2012-06-17 MORITA Hajime <morr...@google.com>
Unreviewed build fix.
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (120573 => 120574)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-06-18 07:06:39 UTC (rev 120574)
@@ -78,7 +78,6 @@
#include "NativeImageSkia.h"
-#include "AsyncFileSystemChromium.h"
#include "BitmapImage.h"
#include "Cookie.h"
#include "Document.h"
@@ -207,15 +206,6 @@
return result;
}
-// File ------------------------------------------------------------------------
-
-#if ENABLE(FILE_SYSTEM)
-PassOwnPtr<AsyncFileSystem> PlatformSupport::createAsyncFileSystem()
-{
- return AsyncFileSystemChromium::create();
-}
-#endif
-
// Font -----------------------------------------------------------------------
#if OS(WINDOWS)
Modified: trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp (120573 => 120574)
--- trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp 2012-06-18 06:43:12 UTC (rev 120573)
+++ trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp 2012-06-18 07:06:39 UTC (rev 120574)
@@ -278,18 +278,11 @@
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
+ return true;
}
void WebRuntimeFeatures::enableFileSystem(bool enable)
