| Index: Source/core/xml/XMLHttpRequestUpload.h
|
| diff --git a/Source/core/xml/XMLHttpRequestUpload.h b/Source/core/xml/XMLHttpRequestUpload.h
|
| index 65e17e2bc5fdedf5f3a345d31fd10820aa2fe623..451a32301639c0d18c88c00e3d2693b6fac9d05a 100644
|
| --- a/Source/core/xml/XMLHttpRequestUpload.h
|
| +++ b/Source/core/xml/XMLHttpRequestUpload.h
|
| @@ -51,10 +51,7 @@ public:
|
| return adoptPtrWillBeRefCountedGarbageCollected(new XMLHttpRequestUpload(xmlHttpRequest));
|
| }
|
|
|
| -#if ENABLE(OILPAN)
|
| - using RefCountedGarbageCollected::ref;
|
| - using RefCountedGarbageCollected::deref;
|
| -#else
|
| +#if !ENABLE(OILPAN)
|
| void ref() { m_xmlHttpRequest->ref(); }
|
| void deref() { m_xmlHttpRequest->deref(); }
|
| #endif
|
| @@ -74,8 +71,10 @@ public:
|
| private:
|
| explicit XMLHttpRequestUpload(XMLHttpRequest*);
|
|
|
| +#if !ENABLE(OILPAN)
|
| virtual void refEventTarget() OVERRIDE { ref(); }
|
| virtual void derefEventTarget() OVERRIDE { deref(); }
|
| +#endif
|
|
|
| RawPtrWillBeMember<XMLHttpRequest> m_xmlHttpRequest;
|
| EventTargetData m_eventTargetData;
|
|
|