Title: [231398] trunk/Source/WebCore
- Revision
- 231398
- Author
- [email protected]
- Date
- 2018-05-05 16:45:15 -0700 (Sat, 05 May 2018)
Log Message
Cleanup XMLHttpRequestUpload a little
https://bugs.webkit.org/show_bug.cgi?id=185344
Patch by Sam Weinig <[email protected]> on 2018-05-05
Reviewed by Yusuke Suzuki.
* bindings/js/JSXMLHttpRequestCustom.cpp:
(WebCore::JSXMLHttpRequest::visitAdditionalChildren):
Use auto to reduce redundancy.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::upload):
* xml/XMLHttpRequest.h:
Switch upload() to return a reference.
* xml/XMLHttpRequestUpload.cpp:
(WebCore::XMLHttpRequestUpload::XMLHttpRequestUpload):
(WebCore::XMLHttpRequestUpload::dispatchProgressEvent):
* xml/XMLHttpRequestUpload.h:
Cleanup formatting, modernize and switch XMLHttpRequest member from a pointer
to a reference.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (231397 => 231398)
--- trunk/Source/WebCore/ChangeLog 2018-05-05 22:42:35 UTC (rev 231397)
+++ trunk/Source/WebCore/ChangeLog 2018-05-05 23:45:15 UTC (rev 231398)
@@ -1,3 +1,26 @@
+2018-05-05 Sam Weinig <[email protected]>
+
+ Cleanup XMLHttpRequestUpload a little
+ https://bugs.webkit.org/show_bug.cgi?id=185344
+
+ Reviewed by Yusuke Suzuki.
+
+ * bindings/js/JSXMLHttpRequestCustom.cpp:
+ (WebCore::JSXMLHttpRequest::visitAdditionalChildren):
+ Use auto to reduce redundancy.
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::upload):
+ * xml/XMLHttpRequest.h:
+ Switch upload() to return a reference.
+
+ * xml/XMLHttpRequestUpload.cpp:
+ (WebCore::XMLHttpRequestUpload::XMLHttpRequestUpload):
+ (WebCore::XMLHttpRequestUpload::dispatchProgressEvent):
+ * xml/XMLHttpRequestUpload.h:
+ Cleanup formatting, modernize and switch XMLHttpRequest member from a pointer
+ to a reference.
+
2018-05-05 Dean Jackson <[email protected]>
Draw a drop-shadow behind the system preview badge
Modified: trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp (231397 => 231398)
--- trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp 2018-05-05 22:42:35 UTC (rev 231397)
+++ trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp 2018-05-05 23:45:15 UTC (rev 231398)
@@ -43,10 +43,10 @@
void JSXMLHttpRequest::visitAdditionalChildren(SlotVisitor& visitor)
{
- if (XMLHttpRequestUpload* upload = wrapped().optionalUpload())
+ if (auto* upload = wrapped().optionalUpload())
visitor.addOpaqueRoot(upload);
- if (Document* responseDocument = wrapped().optionalResponseXML())
+ if (auto* responseDocument = wrapped().optionalResponseXML())
visitor.addOpaqueRoot(responseDocument);
}
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (231397 => 231398)
--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2018-05-05 22:42:35 UTC (rev 231397)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2018-05-05 23:45:15 UTC (rev 231398)
@@ -59,7 +59,6 @@
#include <_javascript_Core/ArrayBufferView.h>
#include <_javascript_Core/JSCInlines.h>
#include <_javascript_Core/JSLock.h>
-#include <mutex>
#include <wtf/RefCountedLeakCounter.h>
#include <wtf/StdLibExtras.h>
#include <wtf/text/CString.h>
@@ -280,11 +279,11 @@
return responseURL.string();
}
-XMLHttpRequestUpload* XMLHttpRequest::upload()
+XMLHttpRequestUpload& XMLHttpRequest::upload()
{
if (!m_upload)
- m_upload = std::make_unique<XMLHttpRequestUpload>(this);
- return m_upload.get();
+ m_upload = std::make_unique<XMLHttpRequestUpload>(*this);
+ return *m_upload;
}
void XMLHttpRequest::changeState(State newState)
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.h (231397 => 231398)
--- trunk/Source/WebCore/xml/XMLHttpRequest.h 2018-05-05 22:42:35 UTC (rev 231397)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.h 2018-05-05 23:45:15 UTC (rev 231398)
@@ -108,7 +108,7 @@
String responseURL() const;
- XMLHttpRequestUpload* upload();
+ XMLHttpRequestUpload& upload();
XMLHttpRequestUpload* optionalUpload() const { return m_upload.get(); }
const ResourceResponse& resourceResponse() const { return m_response; }
Modified: trunk/Source/WebCore/xml/XMLHttpRequestUpload.cpp (231397 => 231398)
--- trunk/Source/WebCore/xml/XMLHttpRequestUpload.cpp 2018-05-05 22:42:35 UTC (rev 231397)
+++ trunk/Source/WebCore/xml/XMLHttpRequestUpload.cpp 2018-05-05 23:45:15 UTC (rev 231398)
@@ -34,11 +34,8 @@
namespace WebCore {
-XMLHttpRequestUpload::XMLHttpRequestUpload(XMLHttpRequest* xmlHttpRequest)
+XMLHttpRequestUpload::XMLHttpRequestUpload(XMLHttpRequest& xmlHttpRequest)
: m_xmlHttpRequest(xmlHttpRequest)
- , m_lengthComputable(false)
- , m_loaded(0)
- , m_total(0)
{
}
@@ -51,7 +48,7 @@
dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().progressEvent, lengthComputable, loaded, total));
}
-void XMLHttpRequestUpload::dispatchProgressEvent(const AtomicString &type)
+void XMLHttpRequestUpload::dispatchProgressEvent(const AtomicString& type)
{
ASSERT(type == eventNames().loadstartEvent || type == eventNames().progressEvent || type == eventNames().loadEvent || type == eventNames().loadendEvent || type == eventNames().abortEvent || type == eventNames().errorEvent || type == eventNames().timeoutEvent);
Modified: trunk/Source/WebCore/xml/XMLHttpRequestUpload.h (231397 => 231398)
--- trunk/Source/WebCore/xml/XMLHttpRequestUpload.h 2018-05-05 22:42:35 UTC (rev 231397)
+++ trunk/Source/WebCore/xml/XMLHttpRequestUpload.h 2018-05-05 23:45:15 UTC (rev 231398)
@@ -32,32 +32,29 @@
namespace WebCore {
- class ScriptExecutionContext;
- class XMLHttpRequest;
+class XMLHttpRequestUpload final : public XMLHttpRequestEventTarget {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ explicit XMLHttpRequestUpload(XMLHttpRequest&);
- class XMLHttpRequestUpload final : public XMLHttpRequestEventTarget {
- WTF_MAKE_FAST_ALLOCATED;
- public:
- explicit XMLHttpRequestUpload(XMLHttpRequest*);
+ void ref() { m_xmlHttpRequest.ref(); }
+ void deref() { m_xmlHttpRequest.deref(); }
+ XMLHttpRequest& xmlHttpRequest() const { return m_xmlHttpRequest; }
- void ref() { m_xmlHttpRequest->ref(); }
- void deref() { m_xmlHttpRequest->deref(); }
- XMLHttpRequest* xmlHttpRequest() const { return m_xmlHttpRequest; }
+ EventTargetInterface eventTargetInterface() const override { return XMLHttpRequestUploadEventTargetInterfaceType; }
+ ScriptExecutionContext* scriptExecutionContext() const override { return m_xmlHttpRequest.scriptExecutionContext(); }
- EventTargetInterface eventTargetInterface() const override { return XMLHttpRequestUploadEventTargetInterfaceType; }
- ScriptExecutionContext* scriptExecutionContext() const override { return m_xmlHttpRequest->scriptExecutionContext(); }
+ void dispatchThrottledProgressEvent(bool lengthComputable, unsigned long long loaded, unsigned long long total);
+ void dispatchProgressEvent(const AtomicString& type);
- void dispatchThrottledProgressEvent(bool lengthComputable, unsigned long long loaded, unsigned long long total);
- void dispatchProgressEvent(const AtomicString &type);
+private:
+ void refEventTarget() final { ref(); }
+ void derefEventTarget() final { deref(); }
- private:
- void refEventTarget() final { ref(); }
- void derefEventTarget() final { deref(); }
-
- XMLHttpRequest* m_xmlHttpRequest;
- bool m_lengthComputable;
- unsigned long long m_loaded;
- unsigned long long m_total;
- };
+ XMLHttpRequest& m_xmlHttpRequest;
+ bool m_lengthComputable { false };
+ unsigned long long m_loaded { 0 };
+ unsigned long long m_total { 0 };
+};
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
