Title: [149853] trunk/Source/WebCore
- Revision
- 149853
- Author
- [email protected]
- Date
- 2013-05-09 16:21:25 -0700 (Thu, 09 May 2013)
Log Message
Remove m_securityOrigin from XMLHttpRequest
https://bugs.webkit.org/show_bug.cgi?id=115881
Reviewed by Alexey Proskuryakov.
The security origin passed to XMLHttpRequest::create was always null, so just get rid of the member variable completely.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::create):
(WebCore::XMLHttpRequest::XMLHttpRequest):
(WebCore::XMLHttpRequest::securityOrigin):
* xml/XMLHttpRequest.h:
(XMLHttpRequest):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149852 => 149853)
--- trunk/Source/WebCore/ChangeLog 2013-05-09 23:03:06 UTC (rev 149852)
+++ trunk/Source/WebCore/ChangeLog 2013-05-09 23:21:25 UTC (rev 149853)
@@ -1,3 +1,19 @@
+2013-05-09 Anders Carlsson <[email protected]>
+
+ Remove m_securityOrigin from XMLHttpRequest
+ https://bugs.webkit.org/show_bug.cgi?id=115881
+
+ Reviewed by Alexey Proskuryakov.
+
+ The security origin passed to XMLHttpRequest::create was always null, so just get rid of the member variable completely.
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::create):
+ (WebCore::XMLHttpRequest::XMLHttpRequest):
+ (WebCore::XMLHttpRequest::securityOrigin):
+ * xml/XMLHttpRequest.h:
+ (XMLHttpRequest):
+
2013-05-09 Christophe Dumez <[email protected]>
[NoInterfaceObject] extended attribute should be removed for several interfaces
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (149852 => 149853)
--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2013-05-09 23:03:06 UTC (rev 149852)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2013-05-09 23:21:25 UTC (rev 149853)
@@ -49,7 +49,6 @@
#include "ScriptCallStack.h"
#include "ScriptController.h"
#include "ScriptProfile.h"
-#include "SecurityOrigin.h"
#include "Settings.h"
#include "SharedBuffer.h"
#include "TextResourceDecoder.h"
@@ -167,15 +166,15 @@
context->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message);
}
-PassRefPtr<XMLHttpRequest> XMLHttpRequest::create(ScriptExecutionContext* context, PassRefPtr<SecurityOrigin> securityOrigin)
+PassRefPtr<XMLHttpRequest> XMLHttpRequest::create(ScriptExecutionContext* context)
{
- RefPtr<XMLHttpRequest> xmlHttpRequest(adoptRef(new XMLHttpRequest(context, securityOrigin)));
+ RefPtr<XMLHttpRequest> xmlHttpRequest(adoptRef(new XMLHttpRequest(context)));
xmlHttpRequest->suspendIfNeeded();
return xmlHttpRequest.release();
}
-XMLHttpRequest::XMLHttpRequest(ScriptExecutionContext* context, PassRefPtr<SecurityOrigin> securityOrigin)
+XMLHttpRequest::XMLHttpRequest(ScriptExecutionContext* context)
: ActiveDOMObject(context)
, m_async(true)
, m_includeCredentials(false)
@@ -193,7 +192,6 @@
, m_exceptionCode(0)
, m_progressEventThrottle(this)
, m_responseTypeCode(ResponseTypeDefault)
- , m_securityOrigin(securityOrigin)
{
initializeXMLHttpRequestStaticData();
#ifndef NDEBUG
@@ -216,7 +214,7 @@
SecurityOrigin* XMLHttpRequest::securityOrigin() const
{
- return m_securityOrigin ? m_securityOrigin.get() : scriptExecutionContext()->securityOrigin();
+ return scriptExecutionContext()->securityOrigin();
}
#if ENABLE(DASHBOARD_SUPPORT)
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.h (149852 => 149853)
--- trunk/Source/WebCore/xml/XMLHttpRequest.h 2013-05-09 23:03:06 UTC (rev 149852)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.h 2013-05-09 23:21:25 UTC (rev 149853)
@@ -29,7 +29,6 @@
#include "FormData.h"
#include "ResourceResponse.h"
#include "ScriptWrappable.h"
-#include "SecurityOrigin.h"
#include "ThreadableLoaderClient.h"
#include "XMLHttpRequestProgressEventThrottle.h"
#include <wtf/OwnPtr.h>
@@ -50,7 +49,7 @@
class XMLHttpRequest : public ScriptWrappable, public RefCounted<XMLHttpRequest>, public EventTarget, private ThreadableLoaderClient, public ActiveDOMObject {
WTF_MAKE_FAST_ALLOCATED;
public:
- static PassRefPtr<XMLHttpRequest> create(ScriptExecutionContext*, PassRefPtr<SecurityOrigin> = 0);
+ static PassRefPtr<XMLHttpRequest> create(ScriptExecutionContext*);
~XMLHttpRequest();
// These exact numeric values are important because JS expects them.
@@ -150,7 +149,7 @@
using RefCounted<XMLHttpRequest>::deref;
private:
- XMLHttpRequest(ScriptExecutionContext*, PassRefPtr<SecurityOrigin>);
+ XMLHttpRequest(ScriptExecutionContext*);
virtual void refEventTarget() { ref(); }
virtual void derefEventTarget() { deref(); }
@@ -243,8 +242,6 @@
// An enum corresponding to the allowed string values for the responseType attribute.
ResponseTypeCode m_responseTypeCode;
-
- RefPtr<SecurityOrigin> m_securityOrigin;
};
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
