Changeset 83532 in webkit

Timestamp:

Apr 11, 2011 4:31:47 PM (13 years ago)

Author:

cmarrin@apple.com

Message:

2011-04-11 Chris Marrin <​cmarrin@apple.com>

Rubberstamped by Dan Bernstein.

xhr.responseType = 'arraybuffer' works on Mac but not on Windows
​https://bugs.webkit.org/show_bug.cgi?id=50334

Got rid of guards around arraybuffer logic in XHR. ArrayBuffer and friends
are always turned on now, so there's not need for the guard. I reenabled the
test that was Skipped on Windows and it works now.

• bindings/js/JSXMLHttpRequestCustom.cpp: (WebCore::JSXMLHttpRequest::markChildren): (WebCore::JSXMLHttpRequest::send): (WebCore::JSXMLHttpRequest::response):
• xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::responseArrayBuffer): (WebCore::XMLHttpRequest::setResponseType): (WebCore::XMLHttpRequest::send): (WebCore::XMLHttpRequest::clearResponseBuffers): (WebCore::XMLHttpRequest::didReceiveData):
• xml/XMLHttpRequest.h: (WebCore::XMLHttpRequest::optionalResponseArrayBuffer):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• LayoutTests/platform/win/fast/xmlhttprequest/xmlhttprequest-responsetype-abort-expected.txt (deleted)
• LayoutTests/platform/win/fast/xmlhttprequest/xmlhttprequest-responsetype-arraybuffer-expected.txt (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp (modified) (4 diffs)
• Source/WebCore/xml/XMLHttpRequest.cpp (modified) (8 diffs)
• Source/WebCore/xml/XMLHttpRequest.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-11  Chris Marrin  <cmarrin@apple.com>
+
+        Rubberstamped by Dan Bernstein.
+
+        xhr.responseType = 'arraybuffer' works on Mac but not on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=50334
+
+        Unskipped the XHR ArrayBuffer test for Windows. I also got rid of a couple of bogus expected
+        results. These had errors in them for what Windows used to be returning. Now the non-platform
+        specific results files are correct for Windows.
+
+        * platform/win/Skipped:
+        * platform/win/fast/xmlhttprequest/xmlhttprequest-responsetype-abort-expected.txt: Removed.
+        * platform/win/fast/xmlhttprequest/xmlhttprequest-responsetype-arraybuffer-expected.txt: Removed.
+
 2011-02-03  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/platform/win/Skipped

@@ -1173 +1173 @@
 fast/js/i18n-bindings-locale.html
 
-# For https://bugs.webkit.org/show_bug.cgi?id=54519
-fast/xmlhttprequest/xmlhttprequest-responsetype-arraybuffer.html
-
 # https://bugs.webkit.org/show_bug.cgi?id=55921
 # Windows port doesn't support HTML in pastes.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-11  Chris Marrin  <cmarrin@apple.com>
+
+        Rubberstamped by Dan Bernstein.
+
+        xhr.responseType = 'arraybuffer' works on Mac but not on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=50334
+
+        Got rid of guards around arraybuffer logic in XHR. ArrayBuffer and friends
+        are always turned on now, so there's not need for the guard. I reenabled the
+        test that was Skipped on Windows and it works now.
+
+        * bindings/js/JSXMLHttpRequestCustom.cpp:
+        (WebCore::JSXMLHttpRequest::markChildren):
+        (WebCore::JSXMLHttpRequest::send):
+        (WebCore::JSXMLHttpRequest::response):
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::responseArrayBuffer):
+        (WebCore::XMLHttpRequest::setResponseType):
+        (WebCore::XMLHttpRequest::send):
+        (WebCore::XMLHttpRequest::clearResponseBuffers):
+        (WebCore::XMLHttpRequest::didReceiveData):
+        * xml/XMLHttpRequest.h:
+        (WebCore::XMLHttpRequest::optionalResponseArrayBuffer):
+
 2011-04-11  Anna Cavender  <annacc@chromium.org>
 

trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp

@@ -65 +65 @@
         markDOMObjectWrapper(markStack, *Heap::heap(this)->globalData(), responseDocument);
 
-#if ENABLE(WEBGL) || ENABLE(BLOB)
     if (ArrayBuffer* responseArrayBuffer = m_impl->optionalResponseArrayBuffer())
         markDOMObjectWrapper(markStack, *Heap::heap(this)->globalData(), responseArrayBuffer);
-#endif
 
 #if ENABLE(XHR_RESPONSE_BLOB)
@@ -125 +123 @@
         else if (val.inherits(&JSDOMFormData::s_info))
             impl()->send(toDOMFormData(val), ec);
-#if ENABLE(WEBGL) || ENABLE(BLOB)
         else if (val.inherits(&JSArrayBuffer::s_info))
             impl()->send(toArrayBuffer(val), ec);
-#endif
         else
             impl()->send(ustringToString(val.toString(exec)), ec);
@@ -190 +186 @@
 
     case XMLHttpRequest::ResponseTypeArrayBuffer:
-#if ENABLE(WEBGL) || ENABLE(BLOB)
         {
             ExceptionCode ec = 0;
@@ -200 +195 @@
             return toJS(exec, globalObject(), arrayBuffer);
         }
-#else
-        return jsUndefined();
-#endif
     }
 

trunk/Source/WebCore/xml/XMLHttpRequest.cpp

@@ -272 +272 @@
 #endif
 
-#if ENABLE(WEBGL) || ENABLE(BLOB)
 ArrayBuffer* XMLHttpRequest::responseArrayBuffer(ExceptionCode& ec)
 {
@@ -293 +292 @@
     return 0;
 }
-#endif
 
 void XMLHttpRequest::setResponseType(const String& responseType, ExceptionCode& ec)
@@ -313 +311 @@
 #endif
     } else if (responseType == "arraybuffer") {
-#if ENABLE(WEBGL) || ENABLE(BLOB)
         m_responseTypeCode = ResponseTypeArrayBuffer;
-#endif
     } else
         ec = SYNTAX_ERR;
@@ -587 +583 @@
 }
 
-#if ENABLE(WEBGL) || ENABLE(BLOB)
 void XMLHttpRequest::send(ArrayBuffer* body, ExceptionCode& ec)
 {
@@ -601 +596 @@
     createRequest(ec);
 }
-#endif
 
 void XMLHttpRequest::createRequest(ExceptionCode& ec)
@@ -740 +734 @@
     m_responseBlob = 0;
 #endif
-#if ENABLE(WEBGL) || ENABLE(BLOB)
     m_binaryResponseBuilder.clear();
     m_responseArrayBuffer.clear();
-#endif
 }
 
@@ -1077 +1069 @@
     if (useDecoder)
         m_responseBuilder.append(m_decoder->decode(data, len));
-#if ENABLE(WEBGL) || ENABLE(BLOB)
     else if (responseTypeCode() == ResponseTypeArrayBuffer) {
         // Buffer binary data.
@@ -1084 +1075 @@
         m_binaryResponseBuilder->append(data, len);
     }
-#endif
 
     if (!m_error) {

trunk/Source/WebCore/xml/XMLHttpRequest.h

@@ -96 +96 @@
     void send(Blob*, ExceptionCode&);
     void send(DOMFormData*, ExceptionCode&);
-#if ENABLE(WEBGL) || ENABLE(BLOB)
     void send(ArrayBuffer*, ExceptionCode&);
-#endif
     void abort();
     void setRequestHeader(const AtomicString& name, const String& value, ExceptionCode&);
@@ -116 +114 @@
     ResponseTypeCode responseTypeCode() const { return m_responseTypeCode; }
     
-#if ENABLE(WEBGL) || ENABLE(BLOB)
     // response attribute has custom getter.
     ArrayBuffer* responseArrayBuffer(ExceptionCode&);
     ArrayBuffer* optionalResponseArrayBuffer() const { return m_responseArrayBuffer.get(); }
-#endif
 
     void setLastSendLineNumber(unsigned lineNumber) { m_lastSendLineNumber = lineNumber; }
@@ -208 +204 @@
     mutable RefPtr<Document> m_responseXML;
     
-#if ENABLE(WEBGL) || ENABLE(BLOB)
     RefPtr<SharedBuffer> m_binaryResponseBuilder;
     mutable RefPtr<ArrayBuffer> m_responseArrayBuffer;
-#endif
 
     bool m_error;