Title: [231488] trunk/Source/WebCore
- Revision
- 231488
- Author
- [email protected]
- Date
- 2018-05-08 09:34:07 -0700 (Tue, 08 May 2018)
Log Message
More cleanup of XMLHttpRequestUpload
https://bugs.webkit.org/show_bug.cgi?id=185409
Patch by Sam Weinig <[email protected]> on 2018-05-08
Reviewed by Alex Christensen.
- Remove unneeded #includes
- Rename m_xmlHttpRequest to m_request
- Make some overloaded some methods private, and mark them as final rather
than override.
* xml/XMLHttpRequestUpload.cpp:
(WebCore::XMLHttpRequestUpload::XMLHttpRequestUpload):
* xml/XMLHttpRequestUpload.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (231487 => 231488)
--- trunk/Source/WebCore/ChangeLog 2018-05-08 16:31:04 UTC (rev 231487)
+++ trunk/Source/WebCore/ChangeLog 2018-05-08 16:34:07 UTC (rev 231488)
@@ -1,3 +1,19 @@
+2018-05-08 Sam Weinig <[email protected]>
+
+ More cleanup of XMLHttpRequestUpload
+ https://bugs.webkit.org/show_bug.cgi?id=185409
+
+ Reviewed by Alex Christensen.
+
+ - Remove unneeded #includes
+ - Rename m_xmlHttpRequest to m_request
+ - Make some overloaded some methods private, and mark them as final rather
+ than override.
+
+ * xml/XMLHttpRequestUpload.cpp:
+ (WebCore::XMLHttpRequestUpload::XMLHttpRequestUpload):
+ * xml/XMLHttpRequestUpload.h:
+
2018-05-08 Zalan Bujtas <[email protected]>
[LFC] Start using BlockMarginCollapse
Modified: trunk/Source/WebCore/xml/XMLHttpRequestUpload.cpp (231487 => 231488)
--- trunk/Source/WebCore/xml/XMLHttpRequestUpload.cpp 2018-05-08 16:31:04 UTC (rev 231487)
+++ trunk/Source/WebCore/xml/XMLHttpRequestUpload.cpp 2018-05-08 16:34:07 UTC (rev 231488)
@@ -26,7 +26,6 @@
#include "config.h"
#include "XMLHttpRequestUpload.h"
-#include "Event.h"
#include "EventNames.h"
#include "XMLHttpRequestProgressEvent.h"
#include <wtf/Assertions.h>
@@ -34,8 +33,8 @@
namespace WebCore {
-XMLHttpRequestUpload::XMLHttpRequestUpload(XMLHttpRequest& xmlHttpRequest)
- : m_xmlHttpRequest(xmlHttpRequest)
+XMLHttpRequestUpload::XMLHttpRequestUpload(XMLHttpRequest& request)
+ : m_request(request)
{
}
@@ -61,5 +60,4 @@
dispatchEvent(XMLHttpRequestProgressEvent::create(type, m_lengthComputable, m_loaded, m_total));
}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/xml/XMLHttpRequestUpload.h (231487 => 231488)
--- trunk/Source/WebCore/xml/XMLHttpRequestUpload.h 2018-05-08 16:31:04 UTC (rev 231487)
+++ trunk/Source/WebCore/xml/XMLHttpRequestUpload.h 2018-05-08 16:34:07 UTC (rev 231488)
@@ -27,8 +27,6 @@
#include "XMLHttpRequest.h"
#include <wtf/Forward.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
namespace WebCore {
@@ -37,13 +35,9 @@
public:
explicit XMLHttpRequestUpload(XMLHttpRequest&);
- void ref() { m_xmlHttpRequest.ref(); }
- void deref() { m_xmlHttpRequest.deref(); }
- XMLHttpRequest& xmlHttpRequest() const { return m_xmlHttpRequest; }
+ void ref() { m_request.ref(); }
+ void deref() { m_request.deref(); }
- 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);
@@ -51,7 +45,10 @@
void refEventTarget() final { ref(); }
void derefEventTarget() final { deref(); }
- XMLHttpRequest& m_xmlHttpRequest;
+ EventTargetInterface eventTargetInterface() const final { return XMLHttpRequestUploadEventTargetInterfaceType; }
+ ScriptExecutionContext* scriptExecutionContext() const final { return m_request.scriptExecutionContext(); }
+
+ XMLHttpRequest& m_request;
bool m_lengthComputable { false };
unsigned long long m_loaded { 0 };
unsigned long long m_total { 0 };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
